diff --git a/.eslintignore b/.eslintignore
index 38bc5b5bf..f28e67b54 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,6 +3,9 @@ apps/banglerun/rollup.config.js
 apps/schoolCalendar/fullcalendar/main.js
 apps/authentiwatch/qr_packed.js
 apps/qrcode/qr-scanner.umd.min.js
-apps/gipy/pkg/gpconv.js
+apps/gipy/pkg/gps.js
 apps/health/chart.min.js
 *.test.js
+
+# typescript/generated files
+apps/btadv/*.js
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..e2fbf5609
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/README.md b/README.md
index aa8afdbca..066ad0ad0 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ This is the best way to test...
 
 **Note:** It's a great idea to get a local copy of the repository on your PC,
 then run `bin/sanitycheck.js` - it'll run through a bunch of common issues
-that there might be. To get the project running locally, you have to initialize and update the git submodules first: `git submodule --init && git submodule update`.
+that there might be. To get the project running locally, you have to initialize and update the git submodules first: `git submodule update --init`.
 
 Be aware of the delay between commits and updates on github.io - it can take a few minutes (and a 'hard refresh' of your browser) for changes to take effect.
 
@@ -277,7 +277,7 @@ and which gives information about the app for the Launcher.
                               //   'game' - a game
                               //   'bluetooth' - uses Bluetooth LE
                               //   'system' - used by the system
-                              //   'clkinfo' - provides or uses clock_info module for data on your clock face (see modules/clock_info.js)
+                              //   'clkinfo' - provides or uses clock_info module for data on your clock face or clocks that support it (see apps/clock_info/README.md)
   "supports": ["BANGLEJS2"],  // List of device IDs supported, either BANGLEJS or BANGLEJS2
   "dependencies" : { "notify":"type" } // optional, app 'types' we depend on (see "type" above)
   "dependencies" : { "messages":"app" } // optional, depend on a specific app ID
diff --git a/android.html b/android.html
index 8a70a46e9..48b41e72b 100644
--- a/android.html
+++ b/android.html
@@ -20,9 +20,6 @@
     <title>Bangle.js App Loader</title>
   </head>
   <body>
-<!--<button id="test">Test</button>
-<div id="status"></div>-->
-
     <header class="navbar-primary navbar">
       <section class="navbar-section" >
         <a href="https://banglejs.com" target="_blank" class="navbar-brand mr-2" ><img src="img/banglejs-logo-sml.png" alt="Bangle.js">
@@ -76,20 +73,26 @@
           </ul>
         </div>
         <div class="filter-nav">
-          <label class="chip active" filterid="">Default</label>
-          <label class="chip" filterid="clock">Clocks</label>
-          <label class="chip" filterid="game">Games</label>
-          <label class="chip" filterid="tool">Tools</label>
-          <label class="chip" filterid="widget">Widgets</label>
-          <label class="chip" filterid="bluetooth">Bluetooth</label>
-          <label class="chip" filterid="outdoors">Outdoors</label>
-          <label class="chip" filterid="favourites">Favourites</label>
+          <label class="chip active" filterid="" data-tooltip="Show all apps">All</label>
+          <label class="chip tooltip" filterid="clock" data-tooltip="To tell the time!">Clocks</label>
+          <label class="chip tooltip" filterid="launch" data-tooltip="Choose which apps to launch">Launchers</label>
+          <label class="chip tooltip" filterid="game" data-tooltip="Have fun!">Games</label>
+          <label class="chip tooltip" filterid="tool" data-tooltip="Useful applications">Tools</label>
+          <label class="chip tooltip" filterid="textinput" data-tooltip="To allow you to enter text">Keyboards</label>
+          <label class="chip tooltip" filterid="widget" data-tooltip="Appear in the top bar of Bangle.js apps">Widgets</label>
+          <label class="chip tooltip" filterid="bluetooth" data-tooltip="Using Bluetooth Functionality">Bluetooth</label>
+          <label class="chip tooltip" filterid="outdoors" data-tooltip="For outdoor use">Outdoors</label>
+          <label class="chip tooltip" filterid="ram" data-tooltip="Apps that don't save anything to flash memory">Online</label>
+          <label class="chip tooltip" filterid="clkinfo" data-tooltip="Info displayed on clocks, or clocks with info">Clock Info</label>
+          <label class="chip tooltip" filterid="favourites" data-tooltip="Apps that you've liked ❤️">Favourites</label>
         </div>
         <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 tooltip" sortid="created"  data-tooltip="Most recent apps">New</label>
+          <label class="chip hidden tooltip" sortid="modified" data-tooltip="Most recently changed">Updated</label>
+          <label class="chip hidden tooltip" sortid="installs" data-tooltip="Most installed by users">Installed</label>
+          <label class="chip hidden tooltip" sortid="favourites" data-tooltip="Most liked by users">Favourited</label>
         </div>
       </div>
 
@@ -130,13 +133,19 @@
         <p>Using <a href="https://espruino.com/" target="_blank">Espruino</a>, Icons from <a href="https://icons8.com/" target="_blank">icons8.com</a></p>
 
         <h3>Utilities</h3>
-        <p><button class="btn" id="settime">Set Bangle.js Time</button>
-           <button class="btn" id="removeall" data-tooltip="Delete everything from your Bangle, leaving it blank">Remove all Apps</button>
-           <button class="btn" id="reinstallall" data-tooltip="Remove and re-install every app, leaving all other data intact">Reinstall apps</button>
-           <button class="btn" id="installdefault">Install default apps</button>
-           <button class="btn" id="installfavourite" data-tooltip="Delete everything, install apps you've marked as favourites">Install favourite apps</button></p>
-        <p><button class="btn tooltip tooltip-right" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
-           <button class="btn tooltip tooltip-right" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button></p>
+        <p>
+           <button class="btn tooltip" id="settime" data-tooltip="Set the Bangle's time to your Browser's time">Set Bangle.js Time</button>
+           <button class="btn tooltip" id="removeall" data-tooltip="Delete everything, leave it blank">Remove all Apps</button>
+           <button class="btn tooltip" id="reinstallall" data-tooltip="Re-install every app, leave all data">Reinstall apps</button>
+           <button class="btn tooltip" id="installdefault" data-tooltip="Delete everything, install default apps">Install default apps</button>
+           <button class="btn tooltip" id="installfavourite" data-tooltip="Delete everything, install your favourites">Install favourite apps</button>
+        </p><p>
+           <button class="btn tooltip" id="newGithubIssue" data-tooltip="Create a new issue on GitHub">New issue on GitHub</button>
+           <button class="btn tooltip" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
+           <button class="btn tooltip" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button>
+           <button class="btn tooltip" id="defaultbanglesettings" data-tooltip="Reset your Bangle's settings to the defaults">Reset Settings</button>
+           <button class="btn tooltip" id="webideremote" data-tooltip="Enable the Web IDE remote server">Web IDE Remote</button>
+        </p>
         <h3>Settings</h3>
         <div class="form-group">
           <label class="form-switch">
@@ -147,12 +156,24 @@
             <input type="checkbox" id="settings-settime">
             <i class="form-icon"></i> Always update time when we connect
           </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).<br/>
+              <small>Used for 'Sort by Installed/Favourited' functionality. See the <a href="http://www.espruino.com/Privacy">privacy policy</a></small>.
+          </label>
           <div class="form-group">
             <select class="form-select form-inline"  id="settings-lang" style="width: 10em">
               <option value="">None (English)</option>
             </select>&nbsp;&nbsp;<span>Translations (<a href="https://github.com/espruino/BangleApps/issues/1311" target="_blank">BETA - more info</a>). Any apps that are uploaded to Bangle.js after changing this will have any text automatically translated.</span>
           </div>
-          <button class="btn" id="defaultsettings">Default settings</button>
+          <details>
+            <summary>Advanced Options</summary>
+            <label class="form-switch">
+              <input type="checkbox" id="settings-minify">
+              <i class="form-icon"></i> Minify apps before upload (⚠️DANGER⚠️: Not recommended. Uploads smaller, faster apps but this <b>will</b> break many apps)
+            </label>
+            <button class="btn" id="defaultsettings">Reset to default App Loader settings</button>
+          </details>
         </div>
         <div id="more-deviceinfo" style="display:none">
         <h3>Device info</h3>
@@ -183,6 +204,9 @@
     <script src="core/js/appinfo.js"></script>
     <script src="core/js/index.js"></script>
     <script src="core/js/pwa.js" defer></script>
+    <!-- FIXME - use espruino.com/ide, github -->
+    <script src="https://espruino.github.io/EspruinoWebIDE/js/libs/peerjs.min.js"></script>
+    <script src="https://espruino.github.io/EspruinoWebIDE/EspruinoTools/libs/webrtc-connection.js"></script>
 <script>
 /*Android = {
   bangleTx : function(data) {
@@ -208,8 +232,10 @@ if (typeof Android!=="undefined") {
       if (writecb) setTimeout(writecb,10);
     },
     close : function() {},
+    on : function(evt,cb) { connection.handlers[evt] = cb; },
     received : "",
-    hadData : false
+    hadData : false,
+    handlers : []
   }
 
   function bangleRx(data) {
@@ -217,6 +243,9 @@ if (typeof Android!=="undefined") {
     connection.received += data;
     connection.hadData = true;
     if (connection.cb)  connection.cb(data);
+    // call data event
+    if (connection.handlers["data"])
+      connection.handlers["data"](data);
   }
 
   function log(level, s) {
@@ -301,6 +330,7 @@ if (typeof Android!=="undefined") {
 
   // ----------------------------------------------------------
 
+
   Puck = {
     /// Are we writing debug information? 0 is no, 1 is some, 2 is more, 3 is all.
     debug : Puck.debug,
@@ -311,7 +341,8 @@ if (typeof Android!=="undefined") {
     /// Called with the current send progress or undefined when done - you can replace this with your own function
     writeProgress : Puck.writeProgress,
     connect : function(callback) {
-      setTimeout(callback, 10);
+      setTimeout(callback, 10, connection);
+      return connection;
     },
     write : write,
     eval : function(expr, cb) {
@@ -346,7 +377,57 @@ if (typeof Android!=="undefined") {
       if ("object"==typeof err) console.log(err.stack);
     });
   }, 500);
+} else {
+  showToast("You're running the App Loader version for Gadgetbridge, but you don't seem to be in Gadgetbridge!","error");
 }
+
+function showWebRTCID(id) {
+  showToast("Bridge's Peer ID: "+id);
+      showPrompt("Web IDE Remote Access",`
+Remote access enabled. Peer ID:
+<br/><br/>
+<b>${id}</b>
+<br/><br/>
+Go to <b>espruino.com/ide</b> on your
+desktop and enter this code under
+<b>Remote Connection Bridge Peer ID</b> in Settings.
+Then connect to the <b>Android</b> device.
+`,{ok:1},false/*shouldEscapeHtml*/).then(() => {
+      }, function() { /* cancelled */ });
+}
+
+// Button to Enable Remote Web IDE
+var el = document.getElementById("webideremote");
+var webrtc;
+if (el) el.addEventListener("click", event=>{
+  if (webrtc) showWebRTCID(webrtc.peerId);
+  else {
+    webrtc = webrtcInit({
+      bridge:true, 
+      onStatus : function(s) {
+        showToast(s);
+      },
+      onPeerID : function(id) {
+        showWebRTCID(id);
+      },
+      onGetPorts : function(cb) {
+        cb([{path:"Android",description:"Remote Device Connection",type:"socket"}]);
+        },
+      onPortConnect : function(serialPort, cb) {
+        cb(); // we're already connected...
+      },
+      onPortDisconnect : function(serialPort) {
+      },
+      onPortWrite : function(data, cb) {
+        Puck.write(data, cb);        
+      }
+    });
+    connection.on("data", function(d) {
+      webrtc.onPortReceived(d);
+    });
+  }
+});
+
 </script>
   </body>
 </html>
diff --git a/apps/3dclock/README.md b/apps/3dclock/README.md
new file mode 100644
index 000000000..4efb43901
--- /dev/null
+++ b/apps/3dclock/README.md
@@ -0,0 +1,6 @@
+A simple clock with perspective scaling.
+Battery drainer, performance tester, show-off piece work-in-progress.
+
+Demo. 
+
+
diff --git a/apps/3dclock/app-icon.js b/apps/3dclock/app-icon.js
new file mode 100644
index 000000000..ac09d6113
--- /dev/null
+++ b/apps/3dclock/app-icon.js
@@ -0,0 +1 @@
+atob("MDAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJmZCZmZAAAAAAAAAAAAAAAAAAAAAAAAAACZAAkJkJAAAAAAAAAAAAAAAAAAAAAACQkJmZmQCZkAAAAAAAAAAAAAAAAAAAAACQAAAAAJmQmZAAAAAAAAAAAAAAAAAAAAAAAAAAAJkAAJkAAAAAAAAAAAAAAAAAAAAAAAAAAJCZkACQAAAAAAAAAAAAAAAJAAAAAAAAAACZAACZAAAAAAAAAAAAAAAAAAAAAAAAAAmZAJmZkAAAAAAAAAAAAAAAAAAAAACQmQkAmQAJmQAAAAAAAAAAAAAAAAAAAAmZAJkAAAkJmQAAAAAAAAAAAAAAAAkAAAAA///wAAAJmf///wAAAAmQAAAAAAAJAAD/////8AAJD/////AAAAAAAAAJAAAJCQD//////wCZ//////AAAJAAAAAJAAD//w//8AAP/wCf//kAD/AAAAkAAAAAAAD5CQ8J8AAP/wCZkJkAAPAAAJCQAAAAAJn//w//mQAP/wAAmQCQAPAAAAAAAA//CQ///w8J+ZAP/wAACQCQD/AAAACQAP//CQDw/58P/////wAACQAA//AAAJCQAAD/AAAP+QDwn///8AAAAAAP//AACQAAAAD/AAAP8JCZn////wAAmZ///wAAAACZAJD/AACfCQmZkJmf/wAAAP//8AAAAJkAkAD/AACfAJCQmZCf/wkJD//wAAAAAAAJAP//8ADwCQCZmZmf/wAA//8AAAAAAACQkAAJAJAACQ//mZmf/wAA//CQAAAAAAkAmQAACQAACQn//////5mf//////AAAAkACQAACQAACQn/////8AkP//////AAAAAJkACQAJAJkJAJ////AJmf//////AAAAmQAAAAmZCZmZmZkJmZkJAJCZAAAAAAAAAAAACZCZmZmZmQCZmQmQAJAAAAAAAAAACQkAAJmZmZmZmZmZmZkJmZkAAAAAAAAAAJkJCZkJmZmZmZmQkJCZmQAAAAAAAAAAAAAJAACZmZmZmZmQmZkJmZAAAAAAAAAAAACQkJmZmZmZmZmZmZCZkAAAAAAAAAAAAAAAAAkJmZmZmZkJmQkJkAAAAAAAAAAAAAAJmQmZCZmQCZmZmZAAAAAAAAAAAAAAAAAACQmZmZmZAJkJkJAAAAAAAAAAAAAAAAAAAJmQmZkJkACQkAAAAAAAAAAAAAAAAAAAAAAACZmZmQmZkAAAAAAAAAAAAAAAAAAAAAAAAJkAAJkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
\ No newline at end of file
diff --git a/apps/3dclock/app.js b/apps/3dclock/app.js
new file mode 100644
index 000000000..89275c84f
--- /dev/null
+++ b/apps/3dclock/app.js
@@ -0,0 +1,70 @@
+// 3d clock by gm / ainegil based on Anton Clock 
+
+
+{ // 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;
+  
+  var moonimg = {
+  width : 176, height : 167, bpp : 3,
+  buffer : atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJJJJJJJJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJJJJJJJJJJJJJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJJJJIJJIBIIJJJJJJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIBJAJJJIJIJBJJJJJJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIJBJABJIIAIIBBBAIJJJJJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIBBAABABBBABIAJJIJJJJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBAAABBBBAIAJIIBBBBIBJJJJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAIJAAIBIIJIAABIJBJJJJIJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIIAAJAJIJABJJBBAAAIIIABAJAIJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJJJIJIJIBJABAJABIBBBABJJJIJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJJJABJBAIIJJJBJJJBJAAABBJJJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBIBIAAAAJIAAAIABIJIAABIABIBJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAIAIAAABAAAABABBBABIJAIAJIBAIIJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAJAAAAAAAAABAIJJBBBABIBJJJJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAJBIAAAAAAAAAAAAAAIAJJBABAIIJBJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABABIABAAAAAAABAAABAAJBJIIIJABAIAJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAJJIJBJJAAAAAJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAJAJJAAIAJBAAJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIIJBABIAAJBAJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAJBJBIAJBBIAAAJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIABJJABBBIAIAIBJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAABABIIJJJJJJJBIAABJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAIAAAAAIAABJJJAIJJIBJJJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABJIBBJJJBIBAIIBJBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIAAAAAAAAAAAAAAAAAABAAAIIJIJBAIBJJIBIIAJIIJIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAABIAAAAAAAAAAAAAAAAAAAAABABBBAAAJBJBBBBBAIAJIJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABABJIBJJJAAJAIBJJJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAJBAAAAAAAAAAAAAAAAAAAAAAAAAIAIJJJIBJBIBIABIJJAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAIAIAAAAAAAAAAAAAAAAIAAAAAIIABBJIIIJIAJJIIJJJIJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBJABBJJBBAJBBJBIBBJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAIAAIJIBAAIAAIAABJAIABABIJJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAJAAABAAAIIIIIAAAAABIBBBABJJIAJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAAIJIIBABAABAAIAIBAIBABJJJAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAIAAIAAAAAAAAAAIABAJABIIAAIAAIIBBBBBAJIAJAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIBBBAIABAAAAAABBAAABBAJJJJIAIAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAABAAAAABAAAAAAAAABAAABBBAIBIIABAAAAAAAAAAIIJJJJAABAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAABAAAAAAAAABAAAAABABIJJBBAIIBAAAAAAAAAABIAIJAIBJBAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAAAAAAABAAAAAIAIIAAAAIAAAAABIAAAAAAAAIAAAAAAIBBAIJJJJAIIAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAABBBAAAAABAAAAAIAIAIAIBAAAABABAAAJIAIJBAJJIIAAAAAAAAAAAAAAAAAAAAAAAJIAAAAAAAAAAAAAAIAAAAAAAIABAABAAAAAAABJBAIJAAAAAAAAAAAJJIIBJJJIIJAAAAAAAAAAAAAAAAAAAAAAAIAIAAAAAAAAAAAAAAAAABJIAIAAAAABAAAAAAJBJJJIIAAAAAAAAAAIJAJJJJBIJJAAAAAAAAAAAAAAAAAAAAAAABBAAAAAAAAAAAABAAAAAIJBAIBIIBBIBBAAAABJBBIJAAAAAAAAIAAAAJJBJIJJJIIAAAAAAAAAAAAAAAAAAAAAJIAAAAAAAAAAAAAAIAAAAIJABBABBIIAAAAAIJIABBIAAAAAAAAAAAAAJJJIJBJJJJIAAAAAAAAAAAAAAAAAAAAAJJBAAAAAAAAAAAAAIAAAABAAAIBJAABIAIAABIAIBBIIAAAAAAAAAAAABIJJBBBAJBIAAAAAAAAAAAAAAAAAAAAABABAAAAAAAAAAAABIIAAABABBBIAABJIJAIBIIABJAIIAAAAAAAIAAAAJAJIIJIJJJBAAAAAAAAAAAAAAAAAAAAAJIJIAAAAAAAAAABBIBAAAAJAAABJBBAAAAABAJIABAAAAAAAAAIAAAAABJJBBIJJJJAAAAAAAAAAAAAAAAAAAAABJIAAAAAAAAAAAAABIIAAAAIAJIJIIAIIIAAAABBBABAAAAAAAAAAAAAABJIJBJIBJIJAAAAAAAAAAAAAAAAAAAABAIAAAAAAAAAAAABBAAIABAAJIJJJABJBAAAABAAIAAIAIAAAAAAAAAAAJJJJJJJIJJAIAAAAAAAAAAAAAAAAAAAIBIBAAAAAAAAAAAAAJAAAIAAIBJJIBAJIAABAAAAAABAIAIAAAAAAAAABABJJJBJJJIJAAAAAAAAAAAAAAAAAAAAAIJBAAAAAAAAAAAABIAAAAAAABJJBAAAABAAAAABAAAAAAAAAAAAAAAAAAAJJJIBJJJAIAAAAAAAAAAAAAAAAAABBJABAAAAAAAAAAAAAIAAAJIJAIBJBAAAIIAAAAAAAAAAAAIAAAAIAAAAAAAIJBBJAJBABAAAAAAAAAAAAAAAAAABIAJAAAAAAAAAAAAABAABABAAABIAAAJIABAAAAAAAAAABIIAAAAAAAAAAAJIJJJIJIBJJAAAAAAAAAAAAAAAAAAABIAIAAAAAAAAAAAAIAABAAAJAAIBAIAIIAAAAAAAAAAABIAIAIAAAAAAAAIIJBJIJABJJIAAAAAAAAAAAAAAAAAJIJIAAAAAAAAAAAAAAABAAAIIJAIIAAAAAAAAAAAAAAAAAJAAAJIAAAAABJJJJJJBIIBJAIAAAAAAAAAAAAAAAAAAABIAAAAAAAAAAAAAAAAAAAAIBAABAAIIIAAAAIBBAAAAAIAAAIIIAAAAAAJIBJIAAJJJJIAAAAAAAAAAAAAAAAAIAJBIAAAAAAAAAAAAAAAAIABBBIAAAAAAAAAAIBBBBAAABBAAIBBBAAAAAAAIBIAJJBIJJBAAAAAAAAAAAAAAAAAIIJAAAAAAAAAAAAAAAAAIAABAAIAIAAAAAAAAIIIJAAAAAAAAAIIAAIAAAIIBBJJJJJJIAJAAAAAAAAAAAAAAAAAAAIAIAAAAAAAAAAAAAAAAAAAIIBIAAAAAAAAABBIJAIAAAAABBIAAAAAAAAAAAJJIJABIBJAAAAAAAAAAAAAAAABIIAABAAAAAAAAAAAAAAAAAIIBBBBBAAIAAAABBJBJIBIAAIAABAAAAAAAAAABAAJIIIAABJAAAAAAAAAAAAAAAABBAAAIAAAAAAAAAAAAAAAAAAAIABIAAABAAAAAAJIIJBAAIBJBJAAAAAAAAAAAABBIIIIAIBAAAAAAAAAAAAAAAAAJIABJAAAAAAAAAAAAAABAAIAAAAIAAAAAAAAAIBBIJAAIABJIBAAAAAAAAAAAAABJBAAAIBAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAIAAAAAJABAAAIAAAIJJIAJJABJJAAAAAAAAAAABAABJJJIIIAJAAAAAAAAAAAAAAAAABBAAAAAAAAAAAAAAAAAAAIAAAABABAAIAAAIAIAJBJJIBIIAIJAAAAAAAAAAAAIAJJAAABJIAAAAAAAAAAAAAAAABIAAJAAAAAAAAAAAAAAAAAAAAAABBAIAIABABAIBAJJBJIIJBIAAAAAIAAAAAABIBJIAAAAAAAAAAAAAAAAAAAAIBBAJAAAAAAAAAAAAAAAAIAAAAAJIABAAAJAIAABABIABJBIBAAAAAAAAAAAAAAAAJIAIAAAIAAAAAAAAAAAAAAABIAAIJAAAAAAAAAAAAAAAAJAAAABAAAABBBJJIAAAABBJBJIJBBAAAAAAAAAAAABBJIIAAAAIAAAAAAAAAAAAAAAAIJAJAAAAAAAAAAAAAAAJBAAABBBIJABBBIAAAIBBAIJJJJBIJAAAAAAAAAAAAAAJBJAAAAAJAAAAAAAAAAAAAAAAJIBAIIAAAAAAAAAAAAABJAAABABAAAJBIIJABAABBJBJJJJABAAAAAAAAAAAAAAJJJAAAABAAAAAAAAAAAAAAAAIIIJBBJAAAAAAAAAAAABABAAAAAAAIIAJJBJBAIJJJJJJJJJJIIAAAAAAAAAAAAAABJAAAAAIAAAAAAAAAAAAAAAABIIABIAAAAAAAAAAAAABIAAAABAAIABJJABIJIBIBJIJJJJJJIIAAAAAAAAAAAAABBBAAAAIAAAAAAAAAAAAAAABIIAABIIIAAAAAAAAAAAAAAAAAAAJBBABJBJJJBAABBJJJJJIJBAAAAAAAAAAAAABBIBAAAIIAAAAAAAAAAAAAAABAAAAAIIAAAAAABAAAAAAAAAAAABBIABJIJJJJJJJJIJJJJBJAIIAAAAAAAAAAABBBJIAAAIAAAAAAAAAAAAAAAAIIIIBBABBAIIABIAAAAAAAAAAAABJAAABIJJJJBBJJJJBBBBBAABAAAAAAAAAABIAJBJIAAIBAAAAAAAAAAAAAAAJBAAAAIAIAABABAIAAAAAAAAAAAIAIAABBIJIJJIJBJJIBBBJIAIAAAAAAAAAAAAIAJBIABBAAAAAAAAAAAAAAAAAIBAJAAAAAAAIABAAAAAAAAAAAAAJAAAABBAJIBIIJJJBBBIJJBIAAAAAAAAAAAABBBIIIJAIAAAAAAAAAAAAAAAAAAIIJAAAIIAAIBAIAAAAAAAAAAIJAAAAJBJABJBIJJJJJJBJIJJBAAAAIAAAAAAIAIBBIIJAAAAAAAAAAAAAAAAABBIJBABABAABIAAAAAAAAAAAAABAAIAAIJAJJJJJBJJBJJJJJIJJAAAAAIAAAIABABJIJIAAAAAAAAAAAAAAAAABBBIIAAAIIBAIIIAAAAAAABABAIAAABAIJBJJJAIIBJJJJBBJJJJBIAAAAIJAAAIBABJBABJIAAAAAAAAAAAAAAAABJBBJABBBBAAAAAAAAAAAAAAAAAIAAAIJBJBABIIJJJIJIJJJJJJIIBABJAAABBAAAJJIABAAAAAAAAAAAAAAAABAABJJJBBABJAAAAAAAAAIAAAAAAAAAAAIJBIABBJJJJJJJBBJJJJIAABBJABAIIAAAJIAIAAAAAAAAAAAAAAAAABAIJJABIAIIAAAAAAAAAABBAAAABAIAABABJAIJJIJJJJJIIJJJJIIAABBJIAABAAAAAIJAAAAAAAAAAAAAAAAAAAJABJJBIAAAAAAAAAAIIIBAAAAAAAAAIABBJAJJBBJJJBBJBJJJJIIAAJIIAIBAAAAAAABIIAAAAAAAAAAAAAAAABABJBIIAIBIAAAAAAAIIBAAAABAAAAAAAAJIBJIIIJJIJJJJJJJJIAAIJBAJJIAAAAABJAIBAAAAAAAAAAAAAAAAAAABJJJBAIIAAAAAAAJAIAABAAAABAABBBBJBIBBJJJIJJJIJJJAIABBBBIJJAAAAAAAAJIJAAAAAAAAAAAAAAAABAAABIBBAABAAAAAAAAAIAAIAIAAAAAAAJBAIBJJJBIBJBJJJJJIABIBAAAIIAAAAAAAABBAAAAAAAAAAAAAAAAAAIIIAJBAJIBAAAAAABAAAAAAAAAAAAAABJJIJAJBIJIJJBJJJJIJJBAABJJIIBAAAAAAABBBAAAAAAAAAAAAAAAAABABJIBABIAAAAAAAAABAAAIAAAAAAABJBAIJJJJIIBJJJJJJJJBJAAAIBJJJIAAAAAAAAABAAAAAAAAAAAAAAAAAAAABJJIBIJAAAAAAABAAAAAIAAAAAABJJJBBIJJJJJJJJJJJJJJBBABJAIAIBAAAAAABABBAAAAAAAAAAAAAAAAAABIABBBBBIIAAAAAAAAAIAAABAAAIAAJBIJJJJAJJJIBJJJBJJJJJAJJJJJAAAIAAAABABAAAAAAAAAAAAAAAAAABBBBBAJJIAAAAAAAAAAAAIAAAIAAAABIIJIJJIIIJIJJIJJJJJJIJBJJJJIIBAAAAAAAIAAAAAAAAAAAAAAAAAAAJBBABAAIJBJBAAAAAAJAAAAAAAAAABBJJBIIIJJBIJJJJJJJJJJJJIJBBJJJAAAAAAAIBIAAAAAAAAAAAAAAAAAAIBBBIAIIJJIIAAAAIAIAAIAAAAAAAAAIJBABJIJJJJJJJBIIJJBJIJABJJJBAAAAAAIAIIAAAAAAAAAAAAAAAAAABBIAIABABAJAAAAAAAIAAIAAAAAAAAAJBJIIJJJBAIJIJBBJJJJJIBAAABJBAAAAAAABAIAAAAAAAAAAAAAAAAAAABAIIBBIBBJAAAIAIIAAAAAAAAAAAABAJJBBBJJJIJJBJBJBJJJJBBAIAJJABAAAAAAIJBAAAAAAAAAAAAAAAAAAABBABBAJIJAIBAAIBAABABBAAAAAABIBJJJJJJIIJAIJJJJJJJJJIIIBAJJIBAAAAAAAAAAAAAAAAAAAAAAAAAAAABBJAAABAJIBAAAAJABAIJAAAAAAAABJJAAJJBBIJIIJJIJIJJJJJAABABJAAAAAABIIAAAAAAAAAAAAAAAAAAAAAJAABAIIIIIBIBBAAAAIJBAIAAAAAAJJJBJBJBJJBJBJJBJBJJJAIIBAIAJJABAAABIBBIAAAAAAAAAAAAAAAAAAABBBAIAIAIBABIIJAAAAABBIAAAIIABJJJJJIJBJJIJJBBJJBJJJJBAAABAAAAAAAJBBAAAAAAAAAAAAAAAAAAAAAAABIBBIIBAABABBAAAAABIJABAABJJJBJJIBIJJJIJBBJIJJJJIABAAIJJBIBAIBAIAIAAAAAAAAAAAAAAAAAAAAABAABJBAAAIAIIJIAJAAAJAIIAJJBJJJJJJBJBJJJJJJIIIJJIJIAAABAJBIBAAAJAAIAAAAAAAAAAAAAAAAAAAAAIIIAJIABAAAIBABAAAABJJJJJJJJJJBJJIJJJJBJJIIJJJIIJIAAAABJIBJJABBJJBIAAAAAAAAAAAAAAAAAAAAABIIABBBABIIAJAAIAIJJJJBIJJJJJJJJJJIJJJJBJJJBJJBIIJBAAABAABJBJAIIJIIAAAAAAAAAAAAAAAAAAAAABABBAABABBBIJIBIBIJJBJAJBJJJJJJJJJJJJJJJJBIJBBBJJAIABBJIJIBBABBJIIAAAAAAAAAAAAAAAAAAAAAAABIIBAIIIAAIJBJIIJJJAJJJJJJJJJJJJJJJJJIJAJJJJJJJBJAIAABJIAJAAAIJBBAAAAAAAAAAAAAAAAAAAAAAABIAIIAAIIJBJAIIIJJIIJJJJJJJJJJJJJJIJJJAIJBIJJJJIJIBABIBIIAAABBAIAAAAAAAAAAAAAAAAAAAAAAAAAIBBBAAJAIAJJIIIIJBJJBJJJJJJJJBJJJBIIBJBBJJJJJJIJJJJAJBAABAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIBAIBBJABBJJJJJJJJJJJJJJJJJBIIBIIJIJJJAIJIBIIAAIAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAIABAAAAAJIAJJBIIJJJJJJJJJJJJJJJJJJIJJJJJJJJBJJJJJAJAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAJAAAJBJBJBAJJIJJJJJJJJJJJJJIJJAJJJJJJIIJIJJIAJABIBAAJBAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAIAJBAIAAAIIJJJJJJJJJJJJJJJJJJJJJIJJJBJIIJIJIJJJBBJJBIBBJIJBAAAAAAAAAAAAAAAAAAAAAAAAAAAABIIIAAABAAJBJBJJAJJJJJJJJJJJJJJJJBJJJJIIJJBBJIIIABBAIIIAIABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAIIIIBAIIJBJJIJBJIJJJJJJJJJJJJJJJJJJJIJAJJBABJJJJIAJIAAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAIAABABJAJBBJJJJJJJJJJJJJJBJJJJJJJBJJJIJBBJIBJJJBIJJJAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIIBABIAABBJAJJBJJJJJJJJJJJJJJJJJJJJJIJBBJIIJBAAJAJJIBAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAIBIAAJAABBJJJIJJJJJJJJJJJIIIJJIIIBJIIJIAIBJBJBJABIJBABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAIJAAIBJIBJBBJJJJJJJJJJJJJJBIJJJBBJJJJJJBJJJJJBJJJJIBABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAAIAIBBJBBJBJJJBBJJJJJJJJJJJJJJIBBJJBAIIIJJAJJBJJIIJAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABIIAIIABAIIJIJJJJJJJJJJJJJBIJJJJJABBIJABBIJAJJJBBIJBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIBAIBBJIAIIJBJJJJJJJJJJJJBJJIJJIJJIJAJJBBJBJBJIJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIIABIABBIJAIJIJJJJJJJJJJJJJJJJBBJJJBJJAJJJJJJBJIJBAJBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIIBJAAABJJJJIJJJJJJJJJJJJBBBJJJJJJIJJABAJJAJJJJJIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAIAAABBIIBJJBJJJJJJJJJBJIJAJAJJBJAAIJJIJIBBJIJJABBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAJBAJIBJIIJJJJJJJJJJJJIBJBBJIBJJJBIJAAJAJJJJBBIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBIIJJAIIIBJIBBJJJJJJJJJJJJJBJBIBJIIJJBJAJJBJJJJJIIAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAJABAIJABIJJJJJJJJJJBJBJJIJJJJBJIJIJIIBIJABIJBIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBJBJIJIJJJJJJJIJJJJJJJJJJBIAJBIJIJBJIJJIJJJBBIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBJAIIBBJJJJJJJJJBAJJBJJBJIBIAJJJBJJJJBBJAJJJIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBABABIBIJJJJBJJIIJJJBIJJIJJJJAJJJJJJJIIJJBJIJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIJJJIAAJBJJJIJJJJJJJJBBIJJIJJIJJJIJIJIJJAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBBJBAAIBJJJJJJBBJIJJIJJIJBJJAIIJJJIJIAJABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAJBJJJBIJJJJBJBIBJBAAIJJIJJIJBJJJBJBJAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBJIBIBIJJJJJAJAJJJJIIIIJBBJJAJJBIAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJJAAJJJJJJJJBIIJJJBBJBBBBIJJIBAIAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJBIBIJJJBJIJIJJJBBJIIJBJIJBABIBBABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAJAIJBIJIIJBJJJJBBIJIIJJJJJJBJBIJJBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBJJJJBJJBBBBJJABIJIIJIJAIIIBBBIJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAIAJIJJIBBJJBJIJJJBJIIJJJIIBIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAIJAJIBJBBBIJIJIIBJJJJJBAJBAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJIJJJAJJBIIJJIIIIIJJJBAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIAIIJJJJJJJJIJABJIJIBJJIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIIIJJIJJAJBJAJJBAJJIJBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAJJBIJJJJJIJBBBIIJIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJJJJIAJBIAIAJBIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJBAJJIIJBJJBIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJIIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
+};
+g.reset().clearRect(0,0,175,175); // clear whole background (w/o widgets)
+// Actually draw the watch face
+let draw = function() {
+  var x = g.getWidth() / 2;
+  var y = g.getHeight() / 2;
+  var date = new Date();
+  var hour = date.getHours();
+  var minute = date.getMinutes();
+  var second = date.getSeconds();
+  var millisec = date.getMilliseconds();
+  var depth = 600;
+  var startd = 60;
+  var focal = 350;
+  var basesize = 24;
+  var poszs =  startd + depth * millisec / 1000;
+  var posys = -12;
+  var poszm =  startd + depth-depth * second / 60;
+  var poszh =  startd + startd + depth * minute / 180;
+  var scales = focal / poszs;
+  var scalem = focal / poszm;
+  var scaleh = focal / poszh;
+  var ys = posys * scales;
+  var fsizes = basesize * scales;
+  var fsizem = basesize * scalem;
+  var fsizeh = basesize * scaleh;
+  
+  g.drawImage(moonimg,0,0);
+  g.setColor(0,0,0);
+  g.fillRect(0,175-32,175,175);
+ // g.reset().clearRect(Bangle.appRect); // clear whole background (w/o widgets)
+  g.setColor(1,1,1);
+  g.setFontAlign(1, 0).setFont("Vector",fsizeh).drawString(hour, x, y); 
+  g.setFontAlign(-1, 0).setFont("Vector",fsizem).drawString(minute, x, y);
+    g.setFontAlign(0,0).setFont("Vector",fsizes).drawString(second, x, y+ys);
+
+  //g.setFontAlign(0, 0).setFont("6x8", 2).drawString("blahblah", x, y+48);
+
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 50 - (Date.now() % 50));
+};
+
+// 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/3dclock/app.png b/apps/3dclock/app.png
new file mode 100644
index 000000000..934ffdaea
Binary files /dev/null and b/apps/3dclock/app.png differ
diff --git a/apps/3dclock/metadata.json b/apps/3dclock/metadata.json
new file mode 100644
index 000000000..266a1faa6
--- /dev/null
+++ b/apps/3dclock/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "3dclock",
+  "name": "3D Clock",
+  "shortName":"3DClock",
+  "icon": "app.png",
+  "version":"0.01",
+  "description": "This is a simple 3D scalig demo based on Anton Clock",
+ "screenshots" : [ { "url":"screenshot.png" }],
+ "type":"clock",   
+  "tags": "clock",
+  "readme": "README.md", 
+ "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"3dclock.app.js","url":"app.js"},
+    {"name":"3dclock.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/3dclock/screenshot.png b/apps/3dclock/screenshot.png
new file mode 100644
index 000000000..ebe675d8f
Binary files /dev/null and b/apps/3dclock/screenshot.png differ
diff --git a/apps/90sclk/metadata.json b/apps/90sclk/metadata.json
index bfbb6b080..b4b320a1b 100644
--- a/apps/90sclk/metadata.json
+++ b/apps/90sclk/metadata.json
@@ -14,5 +14,6 @@
     {"name":"90sclk.app.js","url":"app.js"},
     {"name":"90sclk.img","url":"app-icon.js","evaluate":true},
     {"name":"90sclk.settings.js","url":"settings.js"}
-  ]
+  ],
+  "data": [{"name":"90sclk.setting.json"}]
 }
diff --git a/apps/Uke/ChangeLog b/apps/Uke/ChangeLog
new file mode 100644
index 000000000..ef5ffa3fe
--- /dev/null
+++ b/apps/Uke/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App!
+0.02: Increased Legibility, GUI rework
+0.03: 13 new chords
diff --git a/apps/Uke/README.md b/apps/Uke/README.md
new file mode 100644
index 000000000..b6236e307
--- /dev/null
+++ b/apps/Uke/README.md
@@ -0,0 +1,12 @@
+# Uke Chords
+
+An app that simply describes finger placements on a Ukulele to form common chords.
+
+## Usage
+
+Select a chord to view.
+Use the button to return to the chord selection menu.
+
+## Creator
+
+NovaDawn999
diff --git a/apps/Uke/app-icon.js b/apps/Uke/app-icon.js
new file mode 100644
index 000000000..17b77ab32
--- /dev/null
+++ b/apps/Uke/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwgtqiAXWiMRDKsBolBCqcQilEoQwTiMUoMkkJGUiQwUFwVCGCcUoVEkJ5SgJ2CAQMROyIsBoVDoIXQgMSiJ2EPB4uBdwMieCMBCoIZCDoJdQAAMSUYUBLqIXBIhxCBCAJdDIZwPBTgIAEFxrOCAAIuTCwVELoQuToIuRgIuDCoUiFxjNCFwq7BC5YWBFoZdDAQIXLCwpdEogXKLYgWBXYZ9BC5SKDCwQYCkIHBC5IuFFQIYBiQhCC5JdFCoIYBBIYXJIwlEFwUUBIYXOLgIYDA4ReJC4i4BI4RODOxj/CAQIyBFwSOMoIYCagQ4BCxQXEigrBiS7CLpRHGAIMiMwYXMQoYwCSogXKU4gwCC6gwCC6ApEUoIFDRxR4Fd4QXReAgcEC5hIFLyAwJFxwwIiIWODATbDCyIYCAAQWSACY"))
diff --git a/apps/Uke/app.js b/apps/Uke/app.js
new file mode 100644
index 000000000..095477f3f
--- /dev/null
+++ b/apps/Uke/app.js
@@ -0,0 +1,261 @@
+const stringInterval = 30;
+const stringLength = 131;
+const fretHeight = 35;
+const fingerOffset = 17;
+const x = 44;
+const y = 32;
+
+//chords
+const cc = [
+  "C",
+  "x",
+  "x",
+  "x",
+  "33"
+];
+
+const dd = [
+  "D",
+  "22",
+  "23",
+  "24",
+  "x"
+];
+
+var ee = [
+  "E",
+  "33",
+  "32",
+  "34",
+  "11"
+];
+
+const ff = [
+  "F",
+  "22",
+  "x",
+  "11",
+  "x"
+];
+
+const gg = [
+  "G",
+  "x",
+  "21",
+  "33",
+  "22",
+];
+
+const aa = [
+  "A",
+  "22",
+  "11",
+  "x",
+  "x"
+];
+
+const bb = [
+  "B",
+  "42",
+  "43",
+  "44",
+  "21"
+];
+
+const cm = [
+  "Cm",
+  "11",
+  "x",
+  "12",
+  "34"
+];
+
+const dm = [
+  "Dm",
+  "x",
+  "22",
+  "33",
+  "11"
+];
+
+const em = [
+  "Em",
+  "x",
+  "43",
+  "32",
+  "21"
+];
+
+const fm = [
+  "Fm",
+  "33",
+  "11",
+  "11",
+  "11"
+];
+
+const gm = [
+  "Gm",
+  "x",
+  "22",
+  "33",
+  "11"
+];
+
+const am = [
+  "Am",
+  "22",
+  "23",
+  "11",
+  "x"
+];
+
+const bm = [
+  "Bm",
+  "x",
+  "43",
+  "32",
+  "21"
+];
+
+const c7 = [
+  "C7",
+  "22",
+  "33",
+  "11",
+  "x"
+];
+
+const d7 = [
+  "D7",
+  "x",
+  "22",
+  "11",
+  "23"
+];
+
+const e7 = [
+  "E7",
+  "x",
+  "11",
+  "x",
+  "x"
+];
+
+const f7 = [
+  "F7",
+  "11",
+  "22",
+  "11",
+  "11"
+];
+
+const g7 = [
+  "G7",
+  "x",
+  "x",
+  "x",
+  "11"
+];
+
+const a7 = [
+  "A7",
+  "21",
+  "21",
+  "21",
+  "32"
+];
+
+const b7 = [
+  "B7",
+  "11",
+  "22",
+  "x",
+  "23"
+];
+
+
+
+var index = 0;
+var chords = [];
+var menu = {
+  "" : { "title" : "Uke Chords" },
+  "C" : function() { draw(cc); },
+  "D" : function() { draw(dd); },
+  "E" : function() { draw(ee); },
+  "F" : function() { draw(ff); },
+  "G" : function() { draw(gg); },
+  "A" : function() { draw(aa); },
+  "B" : function() { draw(bb); },
+  "C7" : function() { draw(c7); },
+  "D7" : function() { draw(d7); },
+  "E7" : function() { draw(e7); },
+  "F7" : function() { draw(f7); },
+  "G7" : function() { draw(g7); },
+  "A7" : function() { draw(a7); },
+  "B7" : function() { draw(b7); },
+  "Cm" : function() { draw(cm); },
+  "Dm" : function() { draw(dm); },
+  "Em" : function() { draw(em); },
+  "Fm" : function() { draw(fm); },
+  "Gm" : function() { draw(gm); },
+  "Am" : function() { draw(am); },
+  "Bm" : function() { draw(bm); },
+  "About" : function() {
+      E.showMessage(
+          "Created By:\nNovaDawn999", {
+            title:"About"
+          }
+      );
+  }
+};
+
+
+
+function drawBase() {
+  for (let i = 0; i < 4; i++) {
+    g.drawLine(x + i * stringInterval, y, x + i * stringInterval, y + stringLength);
+    g.fillRect(x- 1, y + i * fretHeight - 1, x + stringInterval * 3 + 1, y + i * fretHeight + 1);
+  }
+}
+
+function drawChord(chord) {
+  g.drawString(chord[0], g.getWidth() * 0.5 - (chord[0].length * 5), 16);
+    for (let i = 0; i < chord.length; i++) {
+        if (i === 0 || chord[i][0] === "x") {
+            continue;
+        }
+        if (chord[i][0] === "0") {
+            g.drawString(chord[i][1], x + (i - 1) * stringInterval - 5, y + fretHeight * chord[i][0] + 2, true);
+            g.drawCircle(x + (i - 1) * stringInterval -1, y + fretHeight * chord[i][0], 10);
+        }
+        else {
+            g.drawString(chord[i][1], x + (i - 1) * stringInterval -5, y -fingerOffset + fretHeight * chord[i][0] + 2, true);
+            g.drawCircle(x + (i - 1) * stringInterval -1, y -fingerOffset + fretHeight * chord[i][0], 10);
+        }
+    }
+}
+
+function buttonPress() {
+  setWatch(() => {
+    buttonPress();
+    }, BTN);
+  E.showMenu(menu);
+}
+
+function draw(chord) {
+  g.clear();
+  drawBase();
+  drawChord(chord);
+}
+
+
+
+function main() {
+  E.showMenu(menu);
+  setWatch(() => {
+    buttonPress();
+    }, BTN);
+}
+
+main();
diff --git a/apps/Uke/app.png b/apps/Uke/app.png
new file mode 100644
index 000000000..7a6dd67ea
Binary files /dev/null and b/apps/Uke/app.png differ
diff --git a/apps/Uke/metadata.json b/apps/Uke/metadata.json
new file mode 100644
index 000000000..ef31e3663
--- /dev/null
+++ b/apps/Uke/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "Uke",
+  "name": "Uke Chords",
+  "shortName":"Uke",
+  "version":"0.03",
+  "description": "Wrist mounted ukulele chords",
+  "icon": "app.png",
+  "tags": "uke, chords",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"Uke.app.js","url":"app.js"},
+    {"name":"Uke.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/_example_app/README.md b/apps/_example_app/README.md
index dc139bc9a..eff3919c6 100644
--- a/apps/_example_app/README.md
+++ b/apps/_example_app/README.md
@@ -1,5 +1,10 @@
 # App Name
 
+More information on making apps:
+
+* http://www.espruino.com/Bangle.js+First+App
+* http://www.espruino.com/Bangle.js+App+Loader
+
 Describe the app...
 
 Add screen shots (if possible) to the app folder and link then into this file with ![](<name>.png)
diff --git a/apps/_example_clkinfo/ChangeLog b/apps/_example_clkinfo/ChangeLog
new file mode 100644
index 000000000..4c21f3ace
--- /dev/null
+++ b/apps/_example_clkinfo/ChangeLog
@@ -0,0 +1 @@
+0.01: New Widget!
diff --git a/apps/_example_clkinfo/README.md b/apps/_example_clkinfo/README.md
new file mode 100644
index 000000000..3d5970e39
--- /dev/null
+++ b/apps/_example_clkinfo/README.md
@@ -0,0 +1,27 @@
+# Clock Info Name
+
+More info on making Clock Infos and what they are: http://www.espruino.com/Bangle.js+Clock+Info
+
+Describe the clock info...
+
+Add screen shots (if possible) to the app folder and link then  into this file with ![](<name>.png)
+
+## Usage
+
+Describe how to use it
+
+## Features
+
+Name the function
+
+## Controls
+
+Name the buttons and what they are used for
+
+## Requests
+
+Name who should be contacted for support/update requests
+
+## Creator
+
+Your name
diff --git a/apps/_example_clkinfo/clkinfo.js b/apps/_example_clkinfo/clkinfo.js
new file mode 100644
index 000000000..b653709ce
--- /dev/null
+++ b/apps/_example_clkinfo/clkinfo.js
@@ -0,0 +1,16 @@
+(function() {
+  return {
+    name: "Bangle",
+    // img: 24x24px image for this list of items. The default "Bangle" list has its own image so this is not needed
+    items: [
+      { name : "Item1",
+        get : function() { return { text : "TextOfItem1",
+                       // v : 10, min : 0, max : 100, - optional
+                      img : atob("GBiBAAAAAAAAAAAYAAD/AAOBwAYAYAwAMAgAEBgAGBAACBCBCDHDjDCBDBAACBAACBhCGAh+EAwYMAYAYAOBwAD/AAAYAAAAAAAAAA==") }},
+        show : function() {},
+        hide : function() {},
+        // run : function() {} optional (called when tapped)
+      }
+    ]
+  };
+}) // must not have a semi-colon!
\ No newline at end of file
diff --git a/apps/_example_widget/widget.png b/apps/_example_clkinfo/icon.png
similarity index 100%
rename from apps/_example_widget/widget.png
rename to apps/_example_clkinfo/icon.png
diff --git a/apps/_example_clkinfo/metadata.json b/apps/_example_clkinfo/metadata.json
new file mode 100644
index 000000000..83b8184d8
--- /dev/null
+++ b/apps/_example_clkinfo/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "7chname",
+  "name": "My clock info's human readable name",
+  "shortName":"Short Name",
+  "version":"0.01",
+  "description": "A detailed description of my clock info",
+  "icon": "icon.png",
+  "type": "clkinfo",
+  "tags": "clkinfo",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"7chname.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/_example_widget/README.md b/apps/_example_widget/README.md
index a909e9e7e..c786d3be8 100644
--- a/apps/_example_widget/README.md
+++ b/apps/_example_widget/README.md
@@ -1,5 +1,7 @@
 # Widget Name
 
+More info on making Widgets and what they are: http://www.espruino.com/Bangle.js+Widgets
+
 Describe the app...
 
 Add screen shots (if possible) to the app folder and link then  into this file with ![](<name>.png)
diff --git a/apps/_example_widget/icon.png b/apps/_example_widget/icon.png
new file mode 100644
index 000000000..582cb2e08
Binary files /dev/null and b/apps/_example_widget/icon.png differ
diff --git a/apps/_example_widget/metadata.json b/apps/_example_widget/metadata.json
index ad4b7537d..8dc7c75c6 100644
--- a/apps/_example_widget/metadata.json
+++ b/apps/_example_widget/metadata.json
@@ -3,7 +3,7 @@
   "shortName":"Short Name",
   "version":"0.01",
   "description": "A detailed description of my great widget",
-  "icon": "widget.png",  
+  "icon": "icon.png",
   "type": "widget",
   "tags": "widget",
   "supports" : ["BANGLEJS2"],
diff --git a/apps/_example_widget/widget.js b/apps/_example_widget/widget.js
index 226aea589..198be7b07 100644
--- a/apps/_example_widget/widget.js
+++ b/apps/_example_widget/widget.js
@@ -1,16 +1,14 @@
-/* run widgets in their own function scope so they don't interfere with
-currently-running apps */
+/* run widgets in their own function scope if they need to define local
+variables so they don't interfere with currently-running apps */
 (() => {
-  function draw() {
-    g.reset(); // reset the graphics context to defaults (color/font/etc)
-    // add your code
-    g.drawString("X", this.x, this.y);
-  }
-
   // add your widget
   WIDGETS["mywidget"]={
     area:"tl", // tl (top left), tr (top right), bl (bottom left), br (bottom right), be aware that not all apps support widgets at the bottom of the screen
     width: 28, // how wide is the widget? You can change this and call Bangle.drawWidgets() to re-layout
-    draw:draw // called to draw the widget
+    draw:function() {
+      g.reset(); // reset the graphics context to defaults (color/font/etc)
+      // add your code
+      g.drawString("X", this.x, this.y);
+    } // called to draw the widget
   };
 })()
diff --git a/apps/accellog/ChangeLog b/apps/accellog/ChangeLog
index 94241c7a7..45469da5c 100644
--- a/apps/accellog/ChangeLog
+++ b/apps/accellog/ChangeLog
@@ -3,3 +3,4 @@
 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
+0.06: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/accellog/app.js b/apps/accellog/app.js
index 147f7503f..ee82f435f 100644
--- a/apps/accellog/app.js
+++ b/apps/accellog/app.js
@@ -26,8 +26,7 @@ function showMenu() {
       viewLogs();
     },
     /*LANG*/"Log raw data" : {
-      value : logRawData,
-      format : v => v?/*LANG*/"Yes":/*LANG*/"No",
+      value : !!logRawData,
       onchange : v => { logRawData=v; }
     },
   };
diff --git a/apps/accellog/metadata.json b/apps/accellog/metadata.json
index 903c57903..907828c7f 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.05",
+  "version": "0.06",
   "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/accelrec/ChangeLog b/apps/accelrec/ChangeLog
index 7327ae25f..6dd2c8a59 100644
--- a/apps/accelrec/ChangeLog
+++ b/apps/accelrec/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Increase record time to 5 second
       Calculate the time moving in graph display
       Trigger on 1.04g now, and record 10 samples before trigger
+0.03: Bangle.js 2 compatibility
\ No newline at end of file
diff --git a/apps/accelrec/app.js b/apps/accelrec/app.js
index 65f2a63ca..4312258b8 100644
--- a/apps/accelrec/app.js
+++ b/apps/accelrec/app.js
@@ -102,7 +102,7 @@ function showData() {
   g.drawString("FINISH",g.getWidth()-4,g.getHeight()/2);
   setWatch(function() {
     showMenu();
-  }, BTN2);
+  }, global.BTN2?BTN2:BTN);
 }
 
 function showBig(txt) {
diff --git a/apps/accelrec/metadata.json b/apps/accelrec/metadata.json
index 8b082c8bc..fa6030f6d 100644
--- a/apps/accelrec/metadata.json
+++ b/apps/accelrec/metadata.json
@@ -2,11 +2,11 @@
   "id": "accelrec",
   "name": "Acceleration Recorder",
   "shortName": "Accel Rec",
-  "version": "0.02",
+  "version": "0.03",
   "description": "This app puts the Bangle's accelerometer into 100Hz mode and reads 2 seconds worth of data after movement starts. The data can then be exported back to the PC.",
   "icon": "app.png",
   "tags": "",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "interface": "interface.html",
   "storage": [
diff --git a/apps/activepedom/metadata.json b/apps/activepedom/metadata.json
index 81bafb573..fa1044d85 100644
--- a/apps/activepedom/metadata.json
+++ b/apps/activepedom/metadata.json
@@ -14,5 +14,6 @@
     {"name":"activepedom.settings.js","url":"settings.js"},
     {"name":"activepedom.img","url":"app-icon.js","evaluate":true},
     {"name":"activepedom.app.js","url":"app.js"}
-  ]
+  ],
+  "data":[{"name":"activepedom.settings.json"}]
 }
diff --git a/apps/activityreminder/ChangeLog b/apps/activityreminder/ChangeLog
index 3811425ac..76f0945c8 100644
--- a/apps/activityreminder/ChangeLog
+++ b/apps/activityreminder/ChangeLog
@@ -8,3 +8,4 @@
 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
+0.11: Add setting to unlock screen
diff --git a/apps/activityreminder/alert.js b/apps/activityreminder/alert.js
index 96a9b76c4..8b359a073 100644
--- a/apps/activityreminder/alert.js
+++ b/apps/activityreminder/alert.js
@@ -26,6 +26,12 @@
     if (!(storage.readJSON('setting.json', 1) || {}).quiet) {
       Bangle.buzz(400);
     }
+
+    if ((storage.readJSON('activityreminder.s.json', 1) || {}).unlock) {
+      Bangle.setLocked(false);
+      Bangle.setLCDPower(1);
+    }
+
     setTimeout(load, 20000);
   }
 
@@ -34,4 +40,4 @@
   Bangle.drawWidgets();
   run();
 
-})();
\ No newline at end of file
+})();
diff --git a/apps/activityreminder/metadata.json b/apps/activityreminder/metadata.json
index a7fb0c487..a5df15a26 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.10",
+  "version":"0.11",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,activity",
diff --git a/apps/activityreminder/settings.js b/apps/activityreminder/settings.js
index 051c0dcd8..28082a8a0 100644
--- a/apps/activityreminder/settings.js
+++ b/apps/activityreminder/settings.js
@@ -75,7 +75,14 @@
           settings.tempThreshold = v;
           activityreminder.writeSettings(settings);
         }
-      }
+      },
+      'Unlock on alarm': {
+        value: !!settings.unlock,
+        onchange: v => {
+          settings.unlock = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
     };
 
     return mainMenu;
diff --git a/apps/advcasio/ChangeLog b/apps/advcasio/ChangeLog
index fd37c324e..bc4850635 100644
--- a/apps/advcasio/ChangeLog
+++ b/apps/advcasio/ChangeLog
@@ -1,4 +1,5 @@
 0.01: AdvCasio first version
 0.02: Remove un-needed fonts to improve memory usage
 0.03: Tell clock widgets to hide.
-0.04: Swipe down to see widgets, step counter now just uses getHealthStatus 
+0.04: Swipe down to see widgets, step counter now just uses getHealthStatus
+0.05: Report latest HRM rather than HRM 10 minutes ago (fix #2395)
\ No newline at end of file
diff --git a/apps/advcasio/app.js b/apps/advcasio/app.js
index 9d246b7ef..d951da4cc 100644
--- a/apps/advcasio/app.js
+++ b/apps/advcasio/app.js
@@ -122,7 +122,7 @@ function draw() {
   g.setFontAlign(0,-1);
   g.setFont("8x12", 2);
   g.drawString(getTemperature(), 155, 132);
-  g.drawString(Math.round(Bangle.getHealthStatus("last").bpm), 109, 98);
+  g.drawString(Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm), 109, 98);
   g.drawString(getSteps(), 158, 98);
 
   g.setFontAlign(-1,-1);
diff --git a/apps/advcasio/metadata.json b/apps/advcasio/metadata.json
index 25dc1243a..32f5de7d3 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.04",
+  "version":"0.05",
   "description": "An over-engineered clock inspired by Casio watches. It has a 4 days weather, a  timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
   "icon": "app.png",
   "tags": "clock",
diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog
index 99c44a2b1..836810638 100644
--- a/apps/agenda/ChangeLog
+++ b/apps/agenda/ChangeLog
@@ -12,3 +12,5 @@
 0.11: Setting to use "Today" and "Yesterday" instead of dates
       Added dynamic, short and range fields to clkinfo
 0.12: Added color field and updating clkinfo periodically (running events)
+0.13: Show day of the week in date
+0.14: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones
diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js
index 8afca95a9..814525a2e 100644
--- a/apps/agenda/agenda.js
+++ b/apps/agenda/agenda.js
@@ -34,19 +34,19 @@ function getDate(timestamp) {
   return new Date(timestamp*1000);
 }
 function formatDay(date) {
+  let formattedDate = Locale.dow(date,1) + " " + Locale.date(date).replace(/\d\d\d\d/,"");
   if (!settings.useToday) {
-    return Locale.date(date);
+    return formattedDate;
   }
-  const dateformatted = date.toISOString().split('T')[0]; // yyyy-mm-dd
-  const today = new Date(Date.now()).toISOString().split('T')[0]; // yyyy-mm-dd
-  if (dateformatted == today) {
+  const today = new Date(Date.now());
+  if (date.getDay() == today.getDay() && date.getMonth() == today.getMonth())
      return /*LANG*/"Today ";
-  } else {
-    const tomorrow = new Date(Date.now() + 86400 * 1000).toISOString().split('T')[0]; // yyyy-mm-dd
-    if (dateformatted == tomorrow) {
+  else {
+    const tomorrow = new Date(Date.now() + 86400 * 1000);
+    if (date.getDay() == tomorrow.getDay() && date.getMonth() == tomorrow.getMonth()) {
        return /*LANG*/"Tomorrow ";
     }
-    return Locale.date(date);
+    return formattedDate;
   }
 }
 function formatDateLong(date, includeDay, allDay) {
@@ -58,7 +58,7 @@ function formatDateLong(date, includeDay, allDay) {
   return shortTime;
 }
 function formatDateShort(date, allDay) {
-  return formatDay(date).replace(/\d\d\d\d/,"")+(allDay?"":Locale.time(date,1)+Locale.meridian(date));
+  return formatDay(date)+(allDay?"":Locale.time(date,1)+Locale.meridian(date));
 }
 
 var lines = [];
@@ -75,25 +75,29 @@ 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 || ev.allDay) {
+  if(includeDay && ev.allDay) {
+    //single day all day (average to avoid getting previous day)
     lines = lines.concat(
-      /*LANG*/"Start:",
+      g.wrapString(formatDateLong(new Date((start+end)/2), includeDay, ev.allDay), g.getWidth()-10));
+  } else if(includeDay || ev.allDay) {
+    lines = lines.concat(
+      /*LANG*/"Start"+":",
       g.wrapString(formatDateLong(start, includeDay, ev.allDay), g.getWidth()-10),
-      /*LANG*/"End:",
+      /*LANG*/"End"+":",
       g.wrapString(formatDateLong(end, includeDay, ev.allDay), g.getWidth()-10));
   } else {
     lines = lines.concat(
-      g.wrapString(Locale.date(start), g.getWidth()-10),
+      g.wrapString(formatDateShort(start,true), 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("",/*LANG*/"Location"+": ", g.wrapString(ev.location, g.getWidth()-10));
+  if(ev.description && ev.description.trim())
     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"]);
+    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
     c : lines.length, // number of menu items
@@ -120,7 +124,7 @@ function showList() {
     CALENDAR = CALENDAR.filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000);
   }
   if(CALENDAR.length == 0) {
-    E.showMessage("No events");
+    E.showMessage(/*LANG*/"No events");
     return;
   }
   E.showScroller({
diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json
index 88dd2c1bc..2d5864145 100644
--- a/apps/agenda/metadata.json
+++ b/apps/agenda/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "0.12",
+  "version": "0.14",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
diff --git a/apps/aiclock/ChangeLog b/apps/aiclock/ChangeLog
index 6d6eeb55e..c8c5c75cb 100644
--- a/apps/aiclock/ChangeLog
+++ b/apps/aiclock/ChangeLog
@@ -4,4 +4,6 @@
 0.04: Use widget_utils module.
 0.05: Support for clkinfo.
 0.06: ClockInfo Fix: Use .get instead of .show as .show is not implemented for weather etc.
-0.07: Use clock_info.addInteractive instead of a custom implementation
\ No newline at end of file
+0.07: Use clock_info.addInteractive instead of a custom implementation
+0.08: Use clock_info module as an app
+0.09: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/aiclock/aiclock.app.js b/apps/aiclock/aiclock.app.js
index 350832367..8d76bc9fe 100644
--- a/apps/aiclock/aiclock.app.js
+++ b/apps/aiclock/aiclock.app.js
@@ -193,6 +193,7 @@ function queueDraw() {
  */
 let clockInfoItems = clock_info.load();
 let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
+  app : "aiclock",
   x : 0,
   y: 0,
   w: W,
diff --git a/apps/aiclock/metadata.json b/apps/aiclock/metadata.json
index 4c01ecaa9..66f5de664 100644
--- a/apps/aiclock/metadata.json
+++ b/apps/aiclock/metadata.json
@@ -3,12 +3,13 @@
   "name": "AI Clock",
   "shortName":"AI Clock",
   "icon": "aiclock.png",
-  "version":"0.07",
+  "version":"0.09",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
   "description": "A watch face that was designed by an AI (stable diffusion) and implemented by a human.",
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "screenshots": [
     {"url":"orig.png"},
     {"url":"impl.png"},
diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index bb8a292a0..6f306f61a 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -38,3 +38,9 @@
 0.35: Add automatic translation of more strings
 0.36: alarm widget moved out of app
 0.37: add message input and dated Events
+0.38: Display date in locale
+      When switching 'repeat' from 'Workdays', 'Weekends' to 'Custom' preset Custom menu with previous selection
+      Display alarm label in delete prompt
+0.39: Dated event repeat option
+0.40: Use substring of message when it's longer than fits the designated menu entry.
+0.41: Fix a menu bug affecting alarms with empty messages.
diff --git a/apps/alarm/README.md b/apps/alarm/README.md
index 0298e0836..9da142dab 100644
--- a/apps/alarm/README.md
+++ b/apps/alarm/README.md
@@ -13,6 +13,7 @@ It uses the [`sched` library](https://github.com/espruino/BangleApps/blob/master
     - `Repeat` &rarr; Select when the alarm will fire. You can select a predefined option (_Once_, _Every Day_, _Workdays_ or _Weekends_ or you can configure the days freely)
   - `New Timer` &rarr; Configure a new timer (triggered based on amount of time elapsed in hours/minutes/seconds)
   - `New Event` &rarr; Configure a new event (triggered based on time and date)
+    - `Repeat` &rarr; Alarm can be be fired only once or repeated (every X number of _days_, _weeks_, _months_ or _years_)
 - `Advanced`
   - `Scheduler settings` &rarr; Open the [Scheduler](https://github.com/espruino/BangleApps/tree/master/apps/sched) settings page, see its [README](https://github.com/espruino/BangleApps/blob/master/apps/sched/README.md) for details
   - `Enable All` &rarr; Enable _all_ disabled alarms & timers
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index 74007d04b..f8ed0322e 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -3,9 +3,11 @@ Bangle.drawWidgets();
 
 // 0 = Sunday (default), 1 = Monday
 const firstDayOfWeek = (require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0;
-const WORKDAYS = 62
+const WORKDAYS = 62;
 const WEEKEND = firstDayOfWeek ? 192 : 65;
 const EVERY_DAY = firstDayOfWeek ? 254 : 127;
+const INTERVALS = ["day", "week", "month", "year"];
+const INTERVAL_LABELS = [/*LANG*/"Day", /*LANG*/"Week", /*LANG*/"Month", /*LANG*/"Year"];
 
 const iconAlarmOn = "\0" + atob("GBiBAAAAAAAAAAYAYA4AcBx+ODn/nAP/wAf/4A/n8A/n8B/n+B/n+B/n+B/n+B/h+B/4+A/+8A//8Af/4AP/wAH/gAB+AAAAAAAAAA==");
 const iconAlarmOff = "\0" + (g.theme.dark
@@ -40,6 +42,30 @@ function handleFirstDayOfWeek(dow) {
 // Check the first day of week and update the dow field accordingly (alarms only!)
 alarms.filter(e => e.timer === undefined).forEach(a => a.dow = handleFirstDayOfWeek(a.dow));
 
+function getLabel(e) {
+  const dateStr = e.date && require("locale").date(new Date(e.date), 1);
+  return (e.timer
+      ? require("time_utils").formatDuration(e.timer)
+      : (dateStr ? `${dateStr}${e.rp?"*":""} ${require("time_utils").formatTime(e.t)}` : require("time_utils").formatTime(e.t) + (e.rp ? ` ${decodeRepeat(e)}` : ""))
+      ) + (e.msg ? ` ${e.msg}` : "");
+}
+
+function trimLabel(label, maxLength) {
+  return (label.length > maxLength
+      ? label.substring(0,maxLength-3) + "..."
+      : label.substring(0,maxLength));
+}
+
+function formatAlarmMessage(msg) {
+  if (msg == null) {
+    return msg;
+  } else if (msg.length > 7) {
+    return msg.substring(0,6)+"...";
+  } else {
+    return msg.substring(0,7);
+  }
+}
+
 function showMainMenu() {
   const menu = {
     "": { "title": /*LANG*/"Alarms & Timers" },
@@ -48,11 +74,7 @@ function showMainMenu() {
   };
 
   alarms.forEach((e, index) => {
-    var label = (e.timer
-      ? require("time_utils").formatDuration(e.timer)
-      : (e.date ? `${e.date.substring(5,10)} ${require("time_utils").formatTime(e.t)}` : require("time_utils").formatTime(e.t) + (e.rp ? ` ${decodeDOW(e)}` : ""))
-      ) + (e.msg ? " " + e.msg : "");
-    menu[label] = {
+    menu[trimLabel(getLabel(e),40)] = {
       value: e.on ? (e.timer ? iconTimerOn : iconAlarmOn) : (e.timer ? iconTimerOff : iconAlarmOff),
       onchange: () => setTimeout(e.timer ? showEditTimerMenu : showEditAlarmMenu, 10, e, index)
     };
@@ -133,6 +155,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) {
     },
     /*LANG*/"Message": {
       value: alarm.msg,
+      format: formatAlarmMessage,
       onchange: () => {
         setTimeout(() => {
           keyboard.input({text:alarm.msg}).then(result => {
@@ -148,8 +171,8 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) {
       onchange: v => alarm.on = v
     },
     /*LANG*/"Repeat": {
-      value: decodeDOW(alarm),
-      onchange: () => setTimeout(showEditRepeatMenu, 100, alarm.rp, alarm.dow, (repeat, dow) => {
+      value: decodeRepeat(alarm),
+      onchange: () => setTimeout(showEditRepeatMenu, 100, alarm.rp, date || alarm.dow, (repeat, dow) => {
         alarm.rp = repeat;
         alarm.dow = dow;
         prepareAlarmForSave(alarm, alarmIndex, time, date, true);
@@ -174,9 +197,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) {
   };
 
   if (!keyboard) delete menu[/*LANG*/"Message"];
-  if (alarm.date || withDate) {
-    delete menu[/*LANG*/"Repeat"];
-  } else {
+  if (!alarm.date) {
     delete menu[/*LANG*/"Day"];
     delete menu[/*LANG*/"Month"];
     delete menu[/*LANG*/"Year"];
@@ -184,7 +205,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) {
 
   if (!isNew) {
     menu[/*LANG*/"Delete"] = () => {
-      E.showPrompt(/*LANG*/"Are you sure?", { title: /*LANG*/"Delete Alarm" }).then((confirm) => {
+      E.showPrompt(getLabel(alarm) + "\n" + /*LANG*/"Are you sure?", { title: /*LANG*/"Delete Alarm" }).then((confirm) => {
         if (confirm) {
           alarms.splice(alarmIndex, 1);
           saveAndReload();
@@ -225,49 +246,77 @@ function saveAndReload() {
   alarms.filter(e => e.timer === undefined).forEach(a => a.dow = handleFirstDayOfWeek(a.dow));
 }
 
-function decodeDOW(alarm) {
+function decodeRepeat(alarm) {
   return alarm.rp
-    ? require("date_utils")
-      .dows(firstDayOfWeek, 2)
-      .map((day, index) => alarm.dow & (1 << (index + firstDayOfWeek)) ? day : "_")
-      .join("")
-      .toLowerCase()
-    : /*LANG*/"Once"
+    ? (alarm.date
+       ? `${alarm.rp.num}*${INTERVAL_LABELS[INTERVALS.indexOf(alarm.rp.interval)]}`
+       : require("date_utils")
+        .dows(firstDayOfWeek, 2)
+        .map((day, index) => alarm.dow & (1 << (index + firstDayOfWeek)) ? day : "_")
+        .join("")
+        .toLowerCase())
+    : /*LANG*/"Once";
 }
 
-function showEditRepeatMenu(repeat, dow, dowChangeCallback) {
+function showEditRepeatMenu(repeat, day, dowChangeCallback) {
   var originalRepeat = repeat;
-  var originalDow = dow;
-  var isCustom = repeat && dow != WORKDAYS && dow != WEEKEND && dow != EVERY_DAY;
+  var dow;
 
   const menu = {
     "": { "title": /*LANG*/"Repeat Alarm" },
     "< Back": () => dowChangeCallback(repeat, dow),
-    /*LANG*/"Once": {
+    /*LANG*/"Only Once": () => dowChangeCallback(false, EVERY_DAY)
       // The alarm will fire once. Internally it will be saved
       // as "fire every days" BUT the repeat flag is false so
       // we avoid messing up with the scheduler.
-      value: !repeat,
-      onchange: () => dowChangeCallback(false, EVERY_DAY)
-    },
-    /*LANG*/"Workdays": {
-      value: repeat && dow == WORKDAYS,
-      onchange: () => dowChangeCallback(true, WORKDAYS)
-    },
-    /*LANG*/"Weekends": {
-      value: repeat && dow == WEEKEND,
-      onchange: () => dowChangeCallback(true, WEEKEND)
-    },
-    /*LANG*/"Every Day": {
-      value: repeat && dow == EVERY_DAY,
-      onchange: () => dowChangeCallback(true, EVERY_DAY)
-    },
-    /*LANG*/"Custom": {
-      value: isCustom ? decodeDOW({ rp: true, dow: dow }) : false,
-      onchange: () => setTimeout(showCustomDaysMenu, 10, isCustom ? dow : EVERY_DAY, dowChangeCallback, originalRepeat, originalDow)
-    }
   };
 
+  let restOfMenu;
+  if (typeof day === "number") {
+    dow = day;
+    var originalDow = dow;
+    var isCustom = repeat && dow != WORKDAYS && dow != WEEKEND && dow != EVERY_DAY;
+
+    restOfMenu = {
+      /*LANG*/"Workdays": {
+        value: repeat && dow == WORKDAYS,
+        onchange: () => dowChangeCallback(true, WORKDAYS)
+      },
+      /*LANG*/"Weekends": {
+        value: repeat && dow == WEEKEND,
+        onchange: () => dowChangeCallback(true, WEEKEND)
+      },
+      /*LANG*/"Every Day": {
+        value: repeat && dow == EVERY_DAY,
+        onchange: () => dowChangeCallback(true, EVERY_DAY)
+      },
+      /*LANG*/"Custom": {
+        value: isCustom ? decodeRepeat({ rp: true, dow: dow }) : false,
+        onchange: () => setTimeout(showCustomDaysMenu, 10, dow, dowChangeCallback, originalRepeat, originalDow)
+      }
+    };
+  } else {
+    // var date = day; // eventually: detect day of date and configure a repeat e.g. 3rd Monday of Month
+    dow = EVERY_DAY;
+    repeat = repeat || {interval: "month", num: 1};
+
+    restOfMenu = {
+      /*LANG*/"Every": {
+        value: repeat.num,
+        min: 1,
+        onchange: v => repeat.num = v
+      },
+      /*LANG*/"Interval": {
+        value: INTERVALS.indexOf(repeat.interval),
+        format: v => INTERVAL_LABELS[v],
+        min: 0,
+        max: INTERVALS.length - 1,
+        onchange: v => repeat.interval = INTERVALS[v]
+      }
+    };
+  }
+
+  Object.assign(menu, restOfMenu);
   E.showMenu(menu);
 }
 
@@ -278,7 +327,7 @@ function showCustomDaysMenu(dow, dowChangeCallback, originalRepeat, originalDow)
       // If the user unchecks all the days then we assume repeat = once
       // and we force the dow to every day.
       var repeat = dow > 0;
-      dowChangeCallback(repeat, repeat ? dow : EVERY_DAY)
+      dowChangeCallback(repeat, repeat ? dow : EVERY_DAY);
     }
   };
 
@@ -289,7 +338,7 @@ function showCustomDaysMenu(dow, dowChangeCallback, originalRepeat, originalDow)
     };
   });
 
-  menu[/*LANG*/"Cancel"] = () => setTimeout(showEditRepeatMenu, 10, originalRepeat, originalDow, dowChangeCallback)
+  menu[/*LANG*/"Cancel"] = () => setTimeout(showEditRepeatMenu, 10, originalRepeat, originalDow, dowChangeCallback);
 
   E.showMenu(menu);
 }
@@ -338,6 +387,7 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
     },
     /*LANG*/"Message": {
       value: timer.msg,
+      format: formatAlarmMessage,
       onchange: () => {
         setTimeout(() => {
           keyboard.input({text:timer.msg}).then(result => {
@@ -372,14 +422,14 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
   if (!keyboard) delete menu[/*LANG*/"Message"];
   if (!isNew) {
     menu[/*LANG*/"Delete"] = () => {
-      E.showPrompt(/*LANG*/"Are you sure?", { title: /*LANG*/"Delete Timer" }).then((confirm) => {
+      E.showPrompt(getLabel(timer) + "\n" + /*LANG*/"Are you sure?", { title: /*LANG*/"Delete Timer" }).then((confirm) => {
         if (confirm) {
           alarms.splice(timerIndex, 1);
           saveAndReload();
           showMainMenu();
         } else {
           timer.timer = require("time_utils").encodeTime(time);
-          setTimeout(showEditTimerMenu, 10, timer, timerIndex)
+          setTimeout(showEditTimerMenu, 10, timer, timerIndex);
         }
       });
     };
@@ -426,9 +476,9 @@ function enableAll(on) {
           alarm.on = on;
           if (on) {
             if (alarm.timer) {
-              prepareTimerForSave(alarm, i, require("time_utils").decodeTime(alarm.timer))
+              prepareTimerForSave(alarm, i, require("time_utils").decodeTime(alarm.timer));
             } else {
-              prepareAlarmForSave(alarm, i, require("time_utils").decodeTime(alarm.t))
+              prepareAlarmForSave(alarm, i, require("time_utils").decodeTime(alarm.t));
             }
           }
         });
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index 29e71b3d9..b986512bc 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.37",
+  "version": "0.41",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm",
diff --git a/apps/altimeter/ChangeLog b/apps/altimeter/ChangeLog
index 29388520e..8d21cf797 100644
--- a/apps/altimeter/ChangeLog
+++ b/apps/altimeter/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Actually upload correct code
+0.03: Display sea-level pressure, too, and allow calibration
diff --git a/apps/altimeter/app.js b/apps/altimeter/app.js
index cac4e80fd..de664af39 100644
--- a/apps/altimeter/app.js
+++ b/apps/altimeter/app.js
@@ -1,4 +1,4 @@
-Bangle.setBarometerPower(true, "app");
+Bangle.setBarometerPower(true, "altimeter");
 
 g.clear(1);
 Bangle.loadWidgets();
@@ -10,21 +10,62 @@ var MEDIANLENGTH = 20;
 var avr = [], median;
 var value = 0;
 
+function getStandardPressure(altitude) {
+  const P0 = 1013.25; // standard pressure at sea level in hPa
+  const T0 = 288.15; // standard temperature at sea level in K
+  const g0 = 9.80665; // standard gravitational acceleration in m/s^2
+  const R = 8.31432; // gas constant in J/(mol*K)
+  const M = 0.0289644; // molar mass of air in kg/mol
+  const L = -0.0065; // temperature lapse rate in K/m
+
+  const temperature = T0 + L * altitude; // temperature at the given altitude
+  const pressure = P0 * Math.pow((temperature / T0), (-g0 * M) / (R * L)); // pressure at the given altitude
+
+  return pressure;
+}
+
+function convertToSeaLevelPressure(pressure, altitude) {
+  return 1013.25 * (pressure / getStandardPressure(altitude));
+}
+
 Bangle.on('pressure', function(e) {
   while (avr.length>MEDIANLENGTH) avr.pop();
   avr.unshift(e.altitude);
   median = avr.slice().sort();
-  g.reset().clearRect(0,y-30,g.getWidth()-10,y+30);
+  g.reset().clearRect(0,y-30,g.getWidth()-10,R.h);
   if (median.length>10) {
     var mid = median.length>>1;
     value = E.sum(median.slice(mid-4,mid+5)) / 9;
-    g.setFont("Vector",50).setFontAlign(0,0).drawString((value-zero).toFixed(1), g.getWidth()/2, y);
+    t = value-zero;
+    if ((t > -100) && (t < 1000))
+      t = t.toFixed(1);
+    else
+      t = t.toFixed(0);
+    g.setFont("Vector",50).setFontAlign(0,0).drawString(t, g.getWidth()/2, y);
+    sea = convertToSeaLevelPressure(e.pressure, value-zero);
+    t = sea.toFixed(1) + " " + e.temperature.toFixed(1);
+    if (0) {
+      print("alt raw:", value.toFixed(1));
+      print("temperature:", e.temperature);
+      print("pressure:", e.pressure);
+      print("sea pressure:", sea);
+      print("std pressure:", getStandardPressure(value-zero));
+    }
+    g.setFont("Vector",25).setFontAlign(-1,0).drawString(t,
+                                                        10, R.y+R.h - 35);
   }
 });
 
+print(g.getFonts());
 g.reset();
-g.setFont("6x8").setFontAlign(0,0).drawString(/*LANG*/"ALTITUDE (m)", g.getWidth()/2, y-40);
+g.setFont("Vector:15");
+g.setFontAlign(0,0);
+g.drawString(/*LANG*/"ALTITUDE (m)", g.getWidth()/2, y-40);
+g.drawString(/*LANG*/"SEA L (hPa) TEMP (C)", g.getWidth()/2, y+62);
+g.flip();
 g.setFont("6x8").setFontAlign(0,0,3).drawString(/*LANG*/"ZERO", g.getWidth()-5, g.getHeight()/2);
-setWatch(function() {
-  zero = value;
-}, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat:true});
+Bangle.setUI("updown", btn=> {
+  if (!btn) zero=value;
+  if (btn<0) zero-=5;
+  if (btn>0) zero+=5;
+});
diff --git a/apps/altimeter/metadata.json b/apps/altimeter/metadata.json
index 8bdbf3022..8bf3772ed 100644
--- a/apps/altimeter/metadata.json
+++ b/apps/altimeter/metadata.json
@@ -1,6 +1,6 @@
 { "id": "altimeter",
   "name": "Altimeter",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Simple altimeter that can display height changed using Bangle.js 2's built in pressure sensor.",
   "icon": "app.png",
   "tags": "tool,outdoors",
diff --git a/apps/alyxclock/ChangeLog b/apps/alyxclock/ChangeLog
new file mode 100644
index 000000000..9db0e26c5
--- /dev/null
+++ b/apps/alyxclock/ChangeLog
@@ -0,0 +1 @@
+0.01: first release
diff --git a/apps/alyxclock/README.md b/apps/alyxclock/README.md
new file mode 100644
index 000000000..7765a878f
--- /dev/null
+++ b/apps/alyxclock/README.md
@@ -0,0 +1,4 @@
+# Half-Life Alyx Style clock
+
+![](screenshot_alyxclock.png)
+
diff --git a/apps/alyxclock/alyxclock.app.js b/apps/alyxclock/alyxclock.app.js
new file mode 100644
index 000000000..57b7d7f48
--- /dev/null
+++ b/apps/alyxclock/alyxclock.app.js
@@ -0,0 +1,174 @@
+const icoH = [
+    [0,1,1,0,0,1,1,0],
+    [1,1,1,1,1,1,1,1],
+    [1,1,1,1,1,1,1,1],
+    [1,1,1,1,1,1,1,1],
+    [0,1,1,1,1,1,1,0],
+    [0,0,1,1,1,1,0,0],
+    [0,0,0,1,1,0,0,0],
+    [0,0,0,0,0,0,0,0],
+]
+
+const icoR = [
+    [0,0,0,0,1,1,1,1,0,0,0,0],
+    [0,0,1,1,0,0,0,0,1,1,0,0],
+    [0,1,1,1,1,0,0,1,1,0,1,0],
+    [0,1,1,0,0,0,0,0,0,0,1,0],
+    [1,1,1,1,1,1,1,1,0,0,0,1],
+    [1,1,0,0,1,0,0,0,0,0,0,1],
+    [1,1,1,1,1,1,1,0,1,1,0,1],
+    [1,1,1,1,1,1,0,0,0,0,1,1],
+    [0,1,1,1,1,1,1,1,1,1,1,0],
+    [0,1,1,1,1,1,1,1,1,1,1,0],
+    [0,0,1,1,1,1,1,1,1,1,0,0],
+    [0,0,0,0,1,1,1,1,0,0,0,0],
+]
+
+let idTimeout = null;
+
+function icon (icon, x, y, size, gap) {
+  const color = g.getColor();
+  for (let r=0; r<icon.length; r++) {
+    for (let c=0; c<icon[r].length; c++) {
+      if (icon[r][c]===1){
+        g.setColor(color);
+        g.fillRect(c * size + x, r * size + y, (c+1) * size - gap + x, (r+1)*size - gap + y);
+        g.setColor('#fff');
+        g.drawLine(c * size + x + size/2 - 1, r * size + y + size/2 - 1, c * size + x + size/2 - 1, r * size + y + size/2 - 1, )
+      }
+    }
+  }
+  g.setColor(color);
+}
+
+function ohmA(x, y) {
+  g.setColor('#666');
+  g.fillRect(x, y, x+8, y+15);
+  g.setColor('#00f');
+  g.drawLine(x, y + 4, x + 8, y + 4);
+  g.setColor('#f00');
+  g.drawLine(x, y + 6, x + 8, y + 6);
+  g.setColor('#0f0');
+  g.drawLine(x, y + 8, x + 8, y + 8);
+}
+
+function ohmB(x, y) {
+  g.setColor('#666');
+  g.fillRect(x, y, x+15, y+8);
+  g.setColor('#00f');
+  g.drawLine(x + 4, y + 8, x + 4, y);
+  g.setColor('#f00');
+  g.drawLine(x + 6, y + 8, x + 6, y);
+  g.setColor('#0f0');
+  g.drawLine(x + 8, y + 8, x + 8, y);
+}
+
+function heart (x, y) {
+  g.setColor('#000');
+  g.fillRect(x-2, y-2, x + 32, y + 32)
+  g.setColor('#666');
+  g.drawRect(x-2, y-2, x + 32, y + 32)
+  g.setColor('#f00');
+  icon(icoH, x, y, 4, 2);
+}
+
+function resin() {
+  let d = Date();
+  let h = d.getHours();
+  let m = d.getMinutes();
+
+  const resinPosX = 25;
+  const resinPosY = 130;
+  g.setColor('#000');
+  g.fillRect(resinPosX - 3, resinPosY - 3, Bangle.appRect.w - resinPosX + 2, resinPosY + 40);
+  g.setColor('#666');
+  g.drawRect(resinPosX - 3, resinPosY - 3, Bangle.appRect.w - resinPosX + 2, resinPosY + 40);
+  g.setColor('#6ff');
+  icon(icoR, resinPosX, resinPosY, 3, 1);
+  g.setFont('6x8', 5);
+  g.setFontAlign(-1, -1);
+  g.drawString('_' + (m<10?'0':'')+m, resinPosX + 40, resinPosY - 5);
+
+  g.setFontAlign(1, -1);
+  g.setFont('6x8', 2);
+  g.drawString(h, resinPosX + 66, resinPosY);
+}
+
+function screw(x, y) {
+  g.setColor('#666').fillCircle(x, y, 4).setColor('#000').drawLine(x - 4, y, x + 4, y)
+}
+
+function led(x,y) {
+  g.setColor('#0f0').fillCircle(x, y, 8).setColor('#fff').fillCircle(x-3, y-3, 3);
+}
+
+
+function drawTime() {
+  const R = Bangle.appRect;
+  g.setBgColor('#000');
+  g.clear();
+  Bangle.drawWidgets();
+  g.reset();
+
+  // pcb
+  g.setColor('#030').fillRect(R.x, R.y, R.x2, R.y2);
+  screw(R.x + 8, R.y + 8)
+  screw(R.x2 - 8, R.y + 8)
+  screw(R.x + 8, R.y2 - 8)
+  screw(R.x2 - 8, R.y2 - 8)
+  for(let i=0; i<6; i++) {
+    g.setColor('#fff');
+    g.drawLine(24 + i * 9, 70, 24 + i * 9, 110);
+    g.drawLine(24 + i * 9, 110, 54 + i * 9, 140);
+  }
+  ohmA(29, 90);
+  ohmA(56, 90);
+  ohmB(80, 90);
+  screw(90, 110)
+  // led
+  led(50, R.y+10);
+  led(70, R.y+10);
+  ohmB(20, R.y + 10);
+  ohmB(90, R.y + 2);
+  ohmB(90, R.y + 14);
+
+  heart(10, 52);
+  heart(50, 52);
+  heart(90, 52);
+
+
+
+  g.setColor('#666');
+  for (let i=0; i<6; i++) {
+    g.fillCircle(110 + i*10, 80+10, 3);
+    g.fillCircle(110 + i*10, 110+10, 3);
+  }
+  g.setColor('#000');
+  g.fillRect(110, 80+10, 170, 110+10);
+  g.setColor('#666');
+  g.drawRect(110, 80+10, 170, 110+10);
+  g.setFont('6x8').setColor('#666').drawString('AH-118080\n0WT 18-001', 112, 85+10);
+
+
+  resin();
+
+  let d = Date();
+  let t = d.getSeconds()*1000 + d.getMilliseconds();
+  idTimeout = setTimeout(drawTime, 60000 - t); // time till next minute
+}
+
+// special function to handle display switch on
+Bangle.on('lcdPower', function(on){
+  if (on) {
+    drawTime();
+  } else {
+    if(idTimeout) {
+      clearTimeout(idTimeout);
+    }
+  }
+});
+
+// Show launcher when button pressed
+Bangle.setUI("clock");
+Bangle.loadWidgets();
+drawTime();
diff --git a/apps/alyxclock/alyxclock.icon.js b/apps/alyxclock/alyxclock.icon.js
new file mode 100644
index 000000000..4a75b5715
--- /dev/null
+++ b/apps/alyxclock/alyxclock.icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkAqoA/AHlUmYADC69FC601C600C60yC6x4SAANTPCgyFkowTSCgACkZ4TAAVDPCwvCPCaqEPCSnDPCZeDmc0Uyh4TqQXFPCBGEPCQWFPCClEPCSlDmjZDdiUlMYZ4NIwg0EPBpGEDoh4NIIYpCPCDqGMoUydh4oDPB5GGPCBGGG4h4CGQ6HDN4gIEqkjSY4+DBYreDSZINDHYpoDKYw9FTww5DC5BGJPAg8MQQw6DBpBGJWIsyCwtUkQABZhA7CkjYKfJIsGAB9UCqgA/ACQ"))
diff --git a/apps/alyxclock/alyxclock.png b/apps/alyxclock/alyxclock.png
new file mode 100644
index 000000000..ba6d65163
Binary files /dev/null and b/apps/alyxclock/alyxclock.png differ
diff --git a/apps/alyxclock/metadata.json b/apps/alyxclock/metadata.json
new file mode 100644
index 000000000..b188c48d8
--- /dev/null
+++ b/apps/alyxclock/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "alyxclock",
+  "name": "Alyx Clock",
+  "version": "0.01",
+  "description": "A clock in the style of half-life alyx gravity gloves",
+  "icon": "alyxclock.png",
+  "screenshots": [{"url":"screenshot_alyxclock.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "allow_emulator": true,
+  "storage": [
+    {"name":"alyxclock.app.js","url":"alyxclock.app.js"},
+    {"name":"alyxclock.img","url":"alyxclock.icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/alyxclock/screenshot_alyxclock.png b/apps/alyxclock/screenshot_alyxclock.png
new file mode 100644
index 000000000..309ff972a
Binary files /dev/null and b/apps/alyxclock/screenshot_alyxclock.png differ
diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog
index a651c1747..d966c1440 100644
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@@ -22,3 +22,9 @@
 0.21: Fix broken 'Messages' button in menu
 0.22: Handle connection events for GPS forwarding from phone
 0.23: Handle 'act' Gadgetbridge messages for realtime activity monitoring
+0.24: Handle new 'nav' event for navigation
+0.25: Added option to 'ignore' an app from the message
+0.26: Change handling of GPS status to depend on GPS events instead of connection events
+0.27: Issue newline before GB commands (solves issue with console.log and ignored commands)
+0.28: Navigation messages no longer launch the Maps view unless they're new
+0.29: Support for http request xpath return format
\ No newline at end of file
diff --git a/apps/android/boot.js b/apps/android/boot.js
index 81975182d..7988c378f 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -6,6 +6,7 @@
   var lastMsg; // for music messages - may not be needed now...
   var actInterval; // Realtime activity reporting interval when `act` is true
   var actHRMHandler; // For Realtime activity reporting
+  var gpsState = {}; // keep information on GPS via Gadgetbridge
 
   // this settings var is deleted after this executes to save memory
   var settings = require("Storage").readJSON("android.settings.json",1)||{};
@@ -137,16 +138,38 @@
       },
       // {t:"gps", lat, lon, alt, speed, course, time, satellites, hdop, externalSource:true }
       "gps": function() {
-        const settings = require("Storage").readJSON("android.settings.json",1)||{};
         if (!settings.overwriteGps) return;
+        // modify event for using it as Bangle GPS event
         delete event.t;
-        event.satellites = NaN;
+        if (!isFinite(event.satellites)) event.satellites = NaN;
         if (!isFinite(event.course)) event.course = NaN;
         event.fix = 1;
         if (event.long!==undefined) { // for earlier Gadgetbridge implementations
           event.lon = event.long;
           delete event.long;
         }
+        if (event.time){
+          event.time = new Date(event.time);
+        }
+
+        if (!gpsState.lastGPSEvent) {
+          // this is the first event, save time of arrival and deactivate internal GPS
+          Bangle.moveGPSPower(0);
+        } else {
+          // this is the second event, store the intervall for expecting the next GPS event
+          gpsState.interval = Date.now() - gpsState.lastGPSEvent;
+        }
+        gpsState.lastGPSEvent = Date.now();
+        // in any case, cleanup the GPS state in case no new events arrive
+        if (gpsState.timeoutGPS) clearTimeout(gpsState.timeoutGPS);
+        gpsState.timeoutGPS = setTimeout(()=>{
+          // reset state
+          gpsState.lastGPSEvent = undefined;
+          gpsState.timeoutGPS = undefined;
+          gpsState.interval = undefined;
+          // did not get an expected GPS event but have GPS clients, switch back to internal GPS
+          if (Bangle.isGPSOn()) Bangle.moveGPSPower(1);
+        }, (gpsState.interval || 10000) + 1000);
         Bangle.emit('GPS', event);
       },
       // {t:"is_gps_active"}
@@ -173,6 +196,19 @@
           gbSend({ t: "act", stp: steps-lastSteps, hrm: lastBPM });
           lastSteps = steps;
         }, event.int*1000);
+      },
+      "nav": function() {
+        event.id="nav";
+        if (event.instr) {
+          event.t="add";
+          event.src="maps"; // for the icon
+          event.title="Navigation";
+          if (require("messages").getMessages().find(m=>m.id=="nav"))
+            event.t = "modify";
+        } else {
+          event.t="remove";
+        }
+        require("messages").pushMessage(event);
       }
     };
     var h = HANDLERS[event.t];
@@ -195,6 +231,7 @@
     //send the request
     var req = {t: "http", url:url, id:options.id};
     if (options.xpath) req.xpath = options.xpath;
+    if (options.return) req.return = options.return; // for xpath
     if (options.method) req.method = options.method;
     if (options.body) req.body = options.body;
     if (options.headers) req.headers = options.headers;
@@ -243,11 +280,13 @@
     if (isFinite(msg.id)) return gbSend({ t: "notify", n:response?"OPEN":"DISMISS", id: msg.id });
     // error/warn here?
   };
+  Bangle.messageIgnore = msg => {
+    if (isFinite(msg.id)) return gbSend({ t: "notify", n:"MUTE", id: msg.id });
+  };
   // GPS overwrite logic
-  if (settings.overwriteGps) { // if the overwrite option is set../
+  if (settings.overwriteGps) { // if the overwrite option is set..
     const origSetGPSPower = Bangle.setGPSPower;
-    // migrate all GPS clients to the other variant on connection events
-    let handleConnection = (state) => {
+    Bangle.moveGPSPower = (state) => {
       if (Bangle.isGPSOn()){
         let orig = Bangle._PWR.GPS;
         delete Bangle._PWR.GPS;
@@ -255,39 +294,45 @@
         Bangle._PWR.GPS = orig;
       }
     };
-    NRF.on('connect', ()=>{handleConnection(0);});
-    NRF.on('disconnect', ()=>{handleConnection(1);});
 
-    // Work around Serial1 for GPS not working when connected to something
+    // work around Serial1 for GPS not working when connected to something
     let serialTimeout;
     let wrap = function(f){
       return (s)=>{
         if (serialTimeout) clearTimeout(serialTimeout);
-        handleConnection(1);
+        origSetGPSPower(1, "androidgpsserial");
         f(s);
         serialTimeout = setTimeout(()=>{
           serialTimeout = undefined;
-          if (NRF.getSecurityStatus().connected) handleConnection(0);
+          origSetGPSPower(0, "androidgpsserial");
         }, 10000);
       };
     };
     Serial1.println = wrap(Serial1.println);
     Serial1.write = wrap(Serial1.write);
 
-    // Replace set GPS power logic to suppress activation of gps (and instead request it from the phone)
-    Bangle.setGPSPower = (isOn, appID) => {
-      // if not connected use internal GPS power function
-      if (!NRF.getSecurityStatus().connected) return origSetGPSPower(isOn, appID);
-      if (!Bangle._PWR) Bangle._PWR={};
-      if (!Bangle._PWR.GPS) Bangle._PWR.GPS=[];
-      if (!appID) appID="?";
-      if (isOn && !Bangle._PWR.GPS.includes(appID)) Bangle._PWR.GPS.push(appID);
-      if (!isOn && Bangle._PWR.GPS.includes(appID)) Bangle._PWR.GPS.splice(Bangle._PWR.GPS.indexOf(appID),1);
-      let pwr = Bangle._PWR.GPS.length>0;
+    // replace set GPS power logic to suppress activation of gps (and instead request it from the phone)
+    Bangle.setGPSPower = ((isOn, appID) => {
+      let pwr;
+      if (!this.lastGPSEvent){
+        // use internal GPS power function if no gps event has arrived from GadgetBridge
+        pwr = origSetGPSPower(isOn, appID);
+      } else {
+        // we are currently expecting the next GPS event from GadgetBridge, keep track of GPS state per app
+        if (!Bangle._PWR) Bangle._PWR={};
+        if (!Bangle._PWR.GPS) Bangle._PWR.GPS=[];
+        if (!appID) appID="?";
+        if (isOn && !Bangle._PWR.GPS.includes(appID)) Bangle._PWR.GPS.push(appID);
+        if (!isOn && Bangle._PWR.GPS.includes(appID)) Bangle._PWR.GPS.splice(Bangle._PWR.GPS.indexOf(appID),1);
+        pwr = Bangle._PWR.GPS.length>0;
+        // stop internal GPS, no clients left
+        if (!pwr) origSetGPSPower(0);
+      }
+      // always update Gadgetbridge on current power state
       gbSend({ t: "gps_power", status: pwr });
       return pwr;
-    };
-    // Allow checking for GPS via GadgetBridge
+    }).bind(gpsState);
+    // allow checking for GPS via GadgetBridge
     Bangle.isGPSOn = () => {
       return !!(Bangle._PWR && Bangle._PWR.GPS && Bangle._PWR.GPS.length>0);
     };
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index f8ea3521a..8489570f7 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.23",
+  "version": "0.29",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",
diff --git a/apps/android/settings.js b/apps/android/settings.js
index 0abb32249..82883a68d 100644
--- a/apps/android/settings.js
+++ b/apps/android/settings.js
@@ -1,8 +1,6 @@
 (function(back) {
-
-
-
-  function gb(j) {
+  function gbSend(j) {
+    Bluetooth.println("");
     Bluetooth.println(JSON.stringify(j));
   }
   var settings = require("Storage").readJSON("android.settings.json",1)||{};
@@ -12,12 +10,12 @@
   var mainmenu = {
     "" : { "title" : "Android" },
     "< Back" : back,
-    /*LANG*/"Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
+    /*LANG*/"Connected" : { value : NRF.getSecurityStatus().connected?/*LANG*/"Yes":/*LANG*/"No" },
     /*LANG*/"Find Phone" : () => E.showMenu({
         "" : { "title" : /*LANG*/"Find Phone" },
         "< Back" : ()=>E.showMenu(mainmenu),
-        /*LANG*/"On" : _=>gb({t:"findPhone",n:true}),
-        /*LANG*/"Off" : _=>gb({t:"findPhone",n:false}),
+        /*LANG*/"On" : _=>gbSend({t:"findPhone",n:true}),
+        /*LANG*/"Off" : _=>gbSend({t:"findPhone",n:false}),
       }),
     /*LANG*/"Keep Msgs" : {
       value : !!settings.keep,
diff --git a/apps/android/test.js b/apps/android/test.js
index 88a7c0566..007b06fc7 100644
--- a/apps/android/test.js
+++ b/apps/android/test.js
@@ -28,11 +28,12 @@ let sec = {
 };
 
 NRF.getSecurityStatus = () => sec;
+// add an empty starting point to make the asserts work
+Bangle._PWR={};
 
-setTimeout(() => {
-  // add an empty starting point to make the asserts work
-  Bangle._PWR={};
+let teststeps = [];
 
+teststeps.push(()=>{
   print("Not connected, should use internal GPS");
   assertTrue(!NRF.getSecurityStatus().connected, "Not connected");
 
@@ -51,6 +52,9 @@ setTimeout(() => {
   assertFalse(Bangle.isGPSOn(), "isGPSOn");
   assertFalse(internalOn(), "Internal GPS off");
 
+});
+
+teststeps.push(()=>{
   print("Connected, should use GB GPS");
   sec.connected = true;
 
@@ -60,67 +64,90 @@ setTimeout(() => {
   assertFalse(Bangle.isGPSOn(), "isGPSOn");
   assertFalse(internalOn(), "Internal GPS off");
 
+
+  print("Internal GPS stays on until the first GadgetBridge event arrives");
   assertTrue(Bangle.setGPSPower(1, "test"), "Switch GPS on");
 
   assertNotEmpty(Bangle._PWR.GPS, "GPS");
   assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
+  assertTrue(internalOn(), "Internal GPS on");
 
+  print("Send minimal GadgetBridge GPS event to trigger switch");
+  GB({t:"gps"});
+});
+
+teststeps.push(()=>{
+  print("GPS should be on, internal off");
+
+  assertNotEmpty(Bangle._PWR.GPS, "GPS");
+  assertTrue(Bangle.isGPSOn(), "isGPSOn");
+  assertFalse(internalOn(), "Internal GPS off");
+});
+
+teststeps.push(()=>{
+  print("Switching GPS off turns both GadgetBridge as well as internal off");
   assertFalse(Bangle.setGPSPower(0, "test"), "Switch GPS off");
 
   assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
   assertFalse(Bangle.isGPSOn(), "isGPSOn");
   assertFalse(internalOn(), "Internal GPS off");
+});
 
-  print("Connected, then reconnect cycle");
-  sec.connected = true;
+teststeps.push(()=>{
+  print("Wait for all timeouts to run out");
+  return 12000;
+});
 
-  assertTrue(NRF.getSecurityStatus().connected, "Connected");
-
-  assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-  assertFalse(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
+teststeps.push(()=>{
+  print("Check auto switch when no GPS event arrives");
 
   assertTrue(Bangle.setGPSPower(1, "test"), "Switch GPS on");
 
+  assertNotEmpty(Bangle._PWR.GPS, "GPS");
+  assertTrue(Bangle.isGPSOn(), "isGPSOn");
+  assertTrue(internalOn(), "Internal GPS on");
+
+  print("Send minimal GadgetBridge GPS event to trigger switch");
+  GB({t:"gps"});
+
+  print("Internal should be switched off now");
+
   assertNotEmpty(Bangle._PWR.GPS, "GPS");
   assertTrue(Bangle.isGPSOn(), "isGPSOn");
   assertFalse(internalOn(), "Internal GPS off");
 
-  NRF.emit("disconnect", {});
-  print("disconnect");
-  sec.connected = false;
+  //wait on next test
+  return 12000;
+});
 
-  setTimeout(() => {
+teststeps.push(()=>{
+  print("Check state and disable GPS, internal should be on");
 
-    assertNotEmpty(Bangle._PWR.GPS, "GPS");
-    assertTrue(Bangle.isGPSOn(), "isGPSOn");
-    assertTrue(internalOn(), "Internal GPS on");
+  assertNotEmpty(Bangle._PWR.GPS, "GPS");
+  assertTrue(Bangle.isGPSOn(), "isGPSOn");
+  assertTrue(internalOn(), "Internal GPS on");
 
-    print("connect");
-    sec.connected = true;
-    NRF.emit("connect", {});
+  assertFalse(Bangle.setGPSPower(0, "test"), "Switch GPS off");
+});
 
-    setTimeout(() => {
-      assertNotEmpty(Bangle._PWR.GPS, "GPS");
-      assertTrue(Bangle.isGPSOn(), "isGPSOn");
-      assertFalse(internalOn(), "Internal GPS off");
+teststeps.push(()=>{
+  print("Result Overall is " + (result ? "OK" : "FAIL"));
+});
 
-      assertFalse(Bangle.setGPSPower(0, "test"), "Switch GPS off");
+let wrap = (functions) => {
+  if (functions.length > 0) {
+    setTimeout(()=>{
+      let waitingTime = functions.shift()();
+      if (waitingTime){
+        print("WAITING: ", waitingTime);
+        setTimeout(()=>{wrap(functions);}, waitingTime);
+      } else
+        wrap(functions);
+    },0);
+  }
+};
 
-      assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-      assertFalse(Bangle.isGPSOn(), "isGPSOn");
-      assertFalse(internalOn(), "Internal GPS off");
+setTimeout(()=>{
+  wrap(teststeps);
+}, 5000);
 
-      setTimeout(() => {
-        print("Test disconnect without gps on");
-
-        assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-        assertFalse(Bangle.isGPSOn(), "isGPSOn");
-        assertFalse(internalOn(), "Internal GPS off");
-
-        print("Result Overall is " + (result ? "OK" : "FAIL"));
-      }, 0);
-    }, 0);
-  }, 0);
-}, 5000);
\ No newline at end of file
diff --git a/apps/assistedgps/ChangeLog b/apps/assistedgps/ChangeLog
index ff2de6f67..13f928f18 100644
--- a/apps/assistedgps/ChangeLog
+++ b/apps/assistedgps/ChangeLog
@@ -2,3 +2,5 @@
 0.02: Update to work with Bangle.js 2
 0.03: Select GNSS systems to use for Bangle.js 2
 0.04: Now turns GPS off after upload
+0.05: Fix regression in 0.04 that caused AGPS data not to get loaded
+0.06: Auto-set GPS output sentences - newer Bangle.js 2 don't include RMC (GPS direction + time) by default
\ No newline at end of file
diff --git a/apps/assistedgps/custom.html b/apps/assistedgps/custom.html
index 75a4ecf32..30cdb3eed 100644
--- a/apps/assistedgps/custom.html
+++ b/apps/assistedgps/custom.html
@@ -147,7 +147,10 @@
           for (var i=0; i<radios.length; i++)
             if (radios[i].checked)
               gnss_select=radios[i].value;
+          js += `\x10var t=getTime()+0.5;while (getTime()<t);\n`; // This is nasty - but we just wait here until the GPS has had time to boot
           js += `\x10Serial1.println("${CASIC_CHECKSUM("$PCAS04,"+gnss_select)}")\n`; // set GNSS mode
+          js += `\x10Serial1.println("${CASIC_CHECKSUM("$PCAS03,1,0,0,1,1,0,0,0")}")\n`; // enable GGA,GSV,RMC packets (new Bangle.js 2 GPS firmwares don't include RMC by default!)
+          // Serial1.println("$PCAS06,0*1B") gets the current firmware version
           // What about:
           // NAV-TIMEUTC (0x01 0x10)
           // NAV-PV (0x01 0x03)
@@ -158,7 +161,7 @@
           var chunk = bin.substr(i,chunkSize);
           js += `\x10Serial1.write(atob("${btoa(chunk)}"))\n`;
         }
-         js = "\x10setTimeout(() => Bangle.setGPSPower(0,'agps'), 1000);\n"; // turn GPS off after a delay
+        js += "\x10setTimeout(() => Bangle.setGPSPower(0,'agps'), 1000);\n"; // turn GPS off after a delay
         return js;
       }
 
diff --git a/apps/assistedgps/metadata.json b/apps/assistedgps/metadata.json
index ac9fe5725..8d4e07fa3 100644
--- a/apps/assistedgps/metadata.json
+++ b/apps/assistedgps/metadata.json
@@ -1,14 +1,16 @@
 {
   "id": "assistedgps",
   "name": "Assisted GPS Updater (AGPS)",
-  "version": "0.04",
+  "shortName": "AGPS",
+  "version": "0.06",
   "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,gps,a-gps",
+  "tags": "tool,outdoors,agps,gps,a-gps,agps",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "custom": "custom.html",
   "customConnect": true,
-  "storage": []
+  "storage": [],
+  "sortorder": -1
 }
diff --git a/apps/backswipe/ChangeLog b/apps/backswipe/ChangeLog
index 5560f00bc..1e5479d6e 100644
--- a/apps/backswipe/ChangeLog
+++ b/apps/backswipe/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Don't fire if the app uses swipes already.
diff --git a/apps/backswipe/README.md b/apps/backswipe/README.md
new file mode 100644
index 000000000..21aa357b3
--- /dev/null
+++ b/apps/backswipe/README.md
@@ -0,0 +1,23 @@
+Service that allows you to use an app's back button using left to right swipe gesture.
+
+## Settings
+
+Mode: Blacklist/Whitelist/Always On/Disabled
+App List: Black-/whitelisted apps
+Standard # of swipe handlers: 0-10 (Default: 0, must be changed for backswipe to work at all)
+Standard # of drag handlers: 0-10 (Default: 0, must be changed for backswipe to work at all)
+
+
+Standard # of handlers settings are used to fine tune when backswipe should trigger the back function. E.g. when using a keyboard that works on drags, we don't want the backswipe to trigger when we just wanted to select a letter. This might not be able to cover all cases however.
+
+To get an indication for standard # of handlers `Bangle["#onswipe"]` and `Bangle["#ondrag"]` can be entered in the [Espruino Web IDE](https://www.espruino.com/ide) console field. They return `undefined` if no handler is active, a function if one is active, or a list of functions if multiple are active. Calling this on the clock app is a good start.
+
+## TODO
+
+- Possibly add option to tweak standard # of handlers on per app basis. 
+
+## Creator
+Kedlub
+
+## Contributors
+thyttan
diff --git a/apps/backswipe/boot.js b/apps/backswipe/boot.js
index 523149e8c..e46f902eb 100644
--- a/apps/backswipe/boot.js
+++ b/apps/backswipe/boot.js
@@ -15,18 +15,28 @@
 
     var currentFile = global.__FILE__ || "";
 
-    if(global.BACK) delete global.BACK;
+    if (global.BACK) delete global.BACK;
     if (options && options.back && enabledForApp(currentFile)) {
       global.BACK = options.back;
     }
     setUI(mode, cb);
   };
 
-  function goBack(lr, ud) {
+  function countHandlers(eventType) {
+    if (Bangle["#on"+eventType] === undefined) {
+      return 0;
+    } else if (Bangle["#on"+eventType] instanceof Array) {
+      return Bangle["#on"+eventType].length;
+    } else if (Bangle["#on"+eventType] !== undefined) {
+      return 1;
+    }
+  }
+
+  function goBack(lr, _) {
     // if it is a left to right swipe
     if (lr === 1) {
       // if we're in an app that has a back button, run the callback for it
-      if (global.BACK) {
+      if (global.BACK && countHandlers("swipe")<=settings.standardNumSwipeHandlers && countHandlers("drag")<=settings.standardNumDragHandlers) {
         global.BACK();
       }
     }
diff --git a/apps/backswipe/metadata.json b/apps/backswipe/metadata.json
index 7aa9f6247..c7cb2185f 100644
--- a/apps/backswipe/metadata.json
+++ b/apps/backswipe/metadata.json
@@ -1,11 +1,12 @@
 { "id": "backswipe",
   "name": "Back Swipe",
   "shortName":"BackSwipe",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Service that allows you to use an app's back button using left to right swipe gesture",
   "icon": "app.png",
   "tags": "back,gesture,swipe",
   "supports" : ["BANGLEJS2"],
+  "readme":"README.md",
   "type": "bootloader",
   "storage": [
     {"name":"backswipe.boot.js","url":"boot.js"},
diff --git a/apps/backswipe/settings.js b/apps/backswipe/settings.js
index 2c29e86f8..42ca7ae7d 100644
--- a/apps/backswipe/settings.js
+++ b/apps/backswipe/settings.js
@@ -4,19 +4,21 @@
   // Apps is an array of app info objects, where all the apps that are there are either blocked or allowed, depending on the mode
   var DEFAULTS = {
     'mode': 0,
-    'apps': []
+    'apps': [],
+    'standardNumSwipeHandlers': 0,
+    'standardNumDragHandlers': 0
   };
-  
+
   var settings = {};
-  
+
   var loadSettings = function() {
     settings = require('Storage').readJSON(FILE, 1) || DEFAULTS;
-  }
-  
+  };
+
   var saveSettings = function(settings) {
     require('Storage').write(FILE, settings);
-  }
-  
+  };
+
   // Get all app info files
   var getApps = function() {
     var apps = require('Storage').list(/\.info$/).map(appInfoFileName => {
@@ -35,8 +37,8 @@
       return 0;
     });
     return apps;
-  }
-  
+  };
+
   var showMenu = function() {
     var menu = {
       '': { 'title': 'Backswipe' },
@@ -55,11 +57,31 @@
       },
       'App List': () => {
         showAppSubMenu();
+      },
+      'Standard # of swipe handlers' : { // If more than this many handlers are present backswipe will not go back
+        value: 0|settings.standardNumSwipeHandlers,
+        min: 0,
+        max: 10,
+        format: v=>v,
+        onchange: v => {
+          settings.standardNumSwipeHandlers = v;
+          saveSettings(settings);
+        },
+      },
+      'Standard # of drag handlers' : { // If more than this many handlers are present backswipe will not go back
+        value: 0|settings.standardNumDragHandlers,
+        min: 0,
+        max: 10,
+        format: v=>v,
+        onchange: v => {
+          settings.standardNumDragHandlers = v;
+          saveSettings(settings);
+        },
       }
     };
-    
+
     E.showMenu(menu);
-  }
+  };
   
   var showAppSubMenu = function() {
     var menu = {
@@ -101,4 +123,4 @@
   
   loadSettings();
   showMenu();
-})
\ No newline at end of file
+})
diff --git a/apps/batchart/ChangeLog b/apps/batchart/ChangeLog
index 31c386684..394622c78 100644
--- a/apps/batchart/ChangeLog
+++ b/apps/batchart/ChangeLog
@@ -7,4 +7,6 @@
 0.07: Improve logging and charting of component states and add widget icon
 0.08: Fix for Home button in the app and README added.
 0.09: Fix failing dismissal of Gadgetbridge notifications, record (coarse) bluetooth state
-0.10: Remove widget icon and improve listener and setInterval handling for widget (might help with https://github.com/espruino/BangleApps/issues/381)
\ No newline at end of file
+0.10: Remove widget icon and improve listener and setInterval handling for widget (might help with https://github.com/espruino/BangleApps/issues/381)
+0.11: Initial port to the BangleJS2
+0.12: Remove debug log
diff --git a/apps/batchart/app.js b/apps/batchart/app.js
index 472fb3a8a..8d700d0a1 100644
--- a/apps/batchart/app.js
+++ b/apps/batchart/app.js
@@ -1,9 +1,13 @@
+
+
+const board = process.env.BOARD;
+const isBangle2 = board === "BANGLEJS2" || board === "EMSCRIPTEN2";
 const GraphXZero = 40;
-const GraphYZero = 180;
-const GraphY100 = 80;
+const GraphYZero = isBangle2? g.getHeight() - (g.getHeight() * 0.1): 180;
+const GraphY100 = isBangle2? 50: 80;
+const MaxValueCount = g.getWidth() - (GraphXZero * 2); // 144
 
 const GraphMarkerOffset = 5;
-const MaxValueCount = 144;
 const GraphXMax = GraphXZero + MaxValueCount;
 
 const GraphLcdY = GraphYZero + 10;
@@ -12,9 +16,11 @@ const GraphBluetoothY = GraphYZero + 22;
 const GraphGpsY = GraphYZero + 28;
 const GraphHrmY = GraphYZero + 34;
 
+
 const Storage = require("Storage");
 
 function renderCoordinateSystem() {
+  g.setBgColor(0,0,0);
   g.setFont("6x8", 1);
   
   // Left Y axis (Battery)
@@ -36,7 +42,12 @@ function renderCoordinateSystem() {
   g.drawLine(GraphXZero - GraphMarkerOffset, GraphYZero, GraphXMax + GraphMarkerOffset, GraphYZero);
   
   // Right Y axis (Temperature)
-  g.setColor(0.4, 0.4, 1);
+  if (isBangle2) {
+    g.setColor(1, 0, 0);
+  } else {
+    g.setColor(0.4, 0.4, 1);
+  }
+
   g.drawLine(GraphXMax, GraphYZero + GraphMarkerOffset, GraphXMax, GraphY100);
   g.drawString("°C", GraphXMax + GraphMarkerOffset, GraphY100 - 10);
   g.setFontAlign(-1, -1, 0);
@@ -62,6 +73,10 @@ function loadData() {
   let logFileName = "bclog" + startingDay;
   
   let dataLines = loadLinesFromFile(MaxValueCount, logFileName);
+  if (!dataLines) {
+    console.log("Cannot load lines from file");
+    dataLines = [];
+  }
   
   // Top up to MaxValueCount from previous days as required
   let previousDay = decrementDay(startingDay);
@@ -235,8 +250,12 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
-setWatch(switchOffApp, BTN2, {edge:"falling", debounce:50, repeat:true});
-
+if (isBangle2) {
+  setWatch(switchOffApp, BTN1, {edge:"falling", debounce:50, repeat:true});
+  g.setBgColor(0,0,0);
+} else {
+  setWatch(switchOffApp, BTN2, {edge:"falling", debounce:50, repeat:true});
+}
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
diff --git a/apps/batchart/metadata.json b/apps/batchart/metadata.json
index f2ed9f0b6..be01ca767 100644
--- a/apps/batchart/metadata.json
+++ b/apps/batchart/metadata.json
@@ -2,11 +2,11 @@
   "id": "batchart",
   "name": "Battery Chart",
   "shortName": "Battery Chart",
-  "version": "0.10",
+  "version": "0.12",
   "description": "A widget and an app for recording and visualizing battery percentage over time.",
   "icon": "app.png",
   "tags": "app,widget,battery,time,record,chart,tool",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"batchart.wid.js","url":"widget.js"},
diff --git a/apps/batchart/widget.js b/apps/batchart/widget.js
index d6e00b283..b1234f377 100644
--- a/apps/batchart/widget.js
+++ b/apps/batchart/widget.js
@@ -1,7 +1,7 @@
 (() => {
   let recordingInterval = null;
   const Storage = require("Storage");
-  
+
   const switchableConsumers = {
     none: 0,
     lcd: 1,
@@ -96,15 +96,14 @@
       let logPercent = E.getBattery();
       let logTemperature = E.getTemperature();
       let logConsumers = getEnabledConsumersValue();
-      
+
       let logString = [logTime, logPercent, logTemperature, logConsumers].join(",");
-      
+
       bcLogFileA.write(logString + "\n");
     }
   }
 
   function reload() {
-    console.log("Reloading BatteryChart widget");
     WIDGETS["batchart"].width = 0;
 
     if (recordingInterval) {
@@ -121,4 +120,4 @@
   };
 
   reload();
-})();
\ No newline at end of file
+})();
diff --git a/apps/bikespeedo/ChangeLog b/apps/bikespeedo/ChangeLog
index 10752ee2b..52459d312 100644
--- a/apps/bikespeedo/ChangeLog
+++ b/apps/bikespeedo/ChangeLog
@@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Barometer altitude adjustment setting
 0.03: Use default Bangle formatter for booleans
+0.04: Add options for units in locale and recording GPS
+0.05: Allow toggling of "max" values (screen tap) and recording (button press)
diff --git a/apps/bikespeedo/app.js b/apps/bikespeedo/app.js
index a62a429e5..327f1c754 100644
--- a/apps/bikespeedo/app.js
+++ b/apps/bikespeedo/app.js
@@ -12,7 +12,7 @@ const fontFactorB2 = 2/3;
 const colfg=g.theme.fg, colbg=g.theme.bg;
 const col1=colfg, colUncertain="#88f"; // if (lf.fix) g.setColor(col1); else g.setColor(colUncertain);
 
-var altiGPS=0, altiBaro=0;
+var altiBaro=0;
 var hdngGPS=0, hdngCompass=0, calibrateCompass=false;
 
 /*kalmanjs, Wouter Bulten, MIT, https://github.com/wouterbulten/kalmanjs */
@@ -183,7 +183,6 @@ var KalmanFilter = (function () {
 
 var lf = {fix:0,satellites:0};
 var showMax = 0;        // 1 = display the max values. 0 = display the cur fix
-var canDraw = 1;
 var time = '';    // Last time string displayed. Re displayed in background colour to remove before drawing new time.
 var sec; // actual seconds for testing purposes
 
@@ -194,30 +193,9 @@ max.n = 0;    // counter. Only start comparing for max after a certain number of
 
 var emulator = (process.env.BOARD=="EMSCRIPTEN" || process.env.BOARD=="EMSCRIPTEN2")?1:0;  // 1 = running in emulator. Supplies test values;
 
-var wp = {};        // Waypoint to use for distance from cur position.
 var SATinView = 0;
 
-function radians(a) {
-  return a*Math.PI/180;
-}
-
-function distance(a,b){
-  var x = radians(a.lon-b.lon) * Math.cos(radians((a.lat+b.lat)/2));
-  var y = radians(b.lat-a.lat);
-
-  // Distance in selected units
-  var d = Math.sqrt(x*x + y*y) * 6371000;
-  d = (d/parseFloat(cfg.dist)).toFixed(2);
-  if ( d >= 100 ) d = parseFloat(d).toFixed(1);
-  if ( d >= 1000 ) d = parseFloat(d).toFixed(0);
-
-  return d;
-}
-
 function drawFix(dat) {
-
-  if (!canDraw) return;
-
   g.clearRect(0,screenYstart,screenW,screenH);
 
   var v = '';
@@ -227,7 +205,7 @@ function drawFix(dat) {
   v = (cfg.primSpd)?dat.speed.toString():dat.alt.toString();
 
   // Primary Units
-  u = (cfg.primSpd)?cfg.spd_unit:dat.alt_units;
+  u = (showMax ? 'max ' : '') + (cfg.primSpd?cfg.spd_unit:dat.alt_units);
 
   drawPrimary(v,u);
 
@@ -260,14 +238,6 @@ function drawFix(dat) {
 }
 
 
-function drawClock() {
-  if (!canDraw) return;
-  g.clearRect(0,screenYstart,screenW,screenH);
-  drawTime();
-  g.reset();
-}
-
-
 function drawPrimary(n,u) {
   //if(emulator)console.log("\n1: " + n +" "+ u);
   var s=40;    // Font size
@@ -337,16 +307,6 @@ function drawSats(sats) {
   g.setFont("6x8", 2);
   g.setFontAlign(1,1); //right, bottom
   g.drawString(sats,screenW,screenH);
-
-  g.setFontVector(18);
-  g.setColor(col1);
-
-  if ( cfg.modeA == 1 ) {
-    if ( showMax ) {
-      g.setFontAlign(0,1); //centre, bottom
-      g.drawString('MAX',120,164);
-    }
-  }
 }
 
 function onGPS(fix) {
@@ -367,7 +327,6 @@ function onGPS(fix) {
 
   var sp = '---';
   var al = '---';
-  var di = '---';
   var age = '---';
 
   if (fix.fix) lf = fix;
@@ -403,6 +362,8 @@ function onGPS(fix) {
 
     if ( sp < 10 ) sp = sp.toFixed(1);
     else sp = Math.round(sp);
+    if (isNaN(sp)) sp = '---';
+
     if (parseFloat(sp) > parseFloat(max.spd) && max.n > 15 ) max.spd = parseFloat(sp);
 
     // Altitude
@@ -410,12 +371,14 @@ function onGPS(fix) {
     al = Math.round(parseFloat(al)/parseFloat(cfg.alt));
     if (parseFloat(al) > parseFloat(max.alt) && max.n > 15 ) max.alt = parseFloat(al);
 
-    // Distance to waypoint
-    di = distance(lf,wp);
-    if (isNaN(di)) di = 0;
-
     // Age of last fix (secs)
     age = Math.max(0,Math.round(getTime())-(lf.time.getTime()/1000));
+  } else {
+    // populate spd_unit
+    if (cfg.spd == 0) {
+      m = require("locale").speed(0).match(/[0-9,\.]+(.*)/);
+      cfg.spd_unit = m[1];
+    }
   }
 
   if ( cfg.modeA == 1 ) {
@@ -440,15 +403,7 @@ function onGPS(fix) {
   }
 }
 
-function setButtons(){
-  setWatch(_=>load(), BTN1);
-
-onGPS(lf);
-}
-
-
 function updateClock() {
-  if (!canDraw) return;
   drawTime();
   g.reset();
 
@@ -465,7 +420,7 @@ function updateClock() {
 // Read settings.
 let cfg = require('Storage').readJSON('bikespeedo.json',1)||{};
 
-cfg.spd = 1;  // Multiplier for speed unit conversions. 0 = use the locale values for speed
+cfg.spd = !cfg.localeUnits;  // Multiplier for speed unit conversions. 0 = use the locale values for speed
 cfg.spd_unit = 'km/h';  // Displayed speed unit
 cfg.alt = 1; // Multiplier for altitude unit conversions. (feet:'0.3048')
 cfg.alt_unit = 'm';  // Displayed altitude units ('feet')
@@ -499,14 +454,6 @@ function onPressure(dat) {
   altiBaro = Number(dat.altitude.toFixed(0)) + Number(cfg.altDiff);
 }
 
-Bangle.setBarometerPower(1); // needs some time...
-g.clearRect(0,screenYstart,screenW,screenH);
-onGPS(lf);
-Bangle.setGPSPower(1);
-Bangle.on('GPS', onGPS);
-Bangle.on('pressure', onPressure);
-
-Bangle.setCompassPower(1);
 var CALIBDATA = require("Storage").readJSON("magnav.json",1)||null;
 if (!CALIBDATA) calibrateCompass = true;
 function Compass_tiltfixread(O,S){
@@ -544,11 +491,58 @@ function Compass_reading() {
   Compass_heading = Compass_newHeading(d,Compass_heading);
   hdngCompass = Compass_heading.toFixed(0);
 }
-if (!calibrateCompass) setInterval(Compass_reading,200);
 
-setButtons();
-if (emulator) setInterval(updateClock, 2000);
-else setInterval(updateClock, 10000);
+function nextMode() {
+  showMax = 1 - showMax;
+}
+
+function start() {
+  Bangle.setBarometerPower(1); // needs some time...
+  g.clearRect(0,screenYstart,screenW,screenH);
+  onGPS(lf);
+  Bangle.setGPSPower(1);
+  Bangle.on('GPS', onGPS);
+  Bangle.on('pressure', onPressure);
+
+  Bangle.setCompassPower(1);
+  if (!calibrateCompass) setInterval(Compass_reading,200);
+
+  if (emulator) setInterval(updateClock, 2000);
+  else setInterval(updateClock, 10000);
+
+  let createdRecording = false;
+  Bangle.setUI({
+    mode: "custom",
+    touch: nextMode,
+    btn: () => {
+      const rec = WIDGETS["recorder"];
+      if(rec){
+        const active = rec.isRecording();
+        if(active){
+          createdRecording = true;
+          rec.setRecording(false);
+        }else{
+          rec.setRecording(true, { force: createdRecording ? "append" : "new" });
+        }
+      }else{
+        nextMode();
+      }
+    },
+  });
+
+  // can't delay loadWidgets til here - need to have already done so for recorder
+  Bangle.drawWidgets();
+}
 
 Bangle.loadWidgets();
-Bangle.drawWidgets();
+if (cfg.record && WIDGETS["recorder"]) {
+  WIDGETS["recorder"]
+    .setRecording(true)
+    .then(start);
+
+  if (cfg.recordStopOnExit)
+    E.on('kill', () => WIDGETS["recorder"].setRecording(false));
+
+} else {
+  start();
+}
diff --git a/apps/bikespeedo/metadata.json b/apps/bikespeedo/metadata.json
index 80b91427c..87c0ed542 100644
--- a/apps/bikespeedo/metadata.json
+++ b/apps/bikespeedo/metadata.json
@@ -2,7 +2,7 @@
   "id": "bikespeedo",
   "name": "Bike Speedometer (beta)",
   "shortName": "Bike Speedometer",
-  "version": "0.03",
+  "version": "0.05",
   "description": "Shows GPS speed, GPS heading, Compass heading, GPS altitude and Barometer altitude from internal sources",
   "icon": "app.png",
   "screenshots": [{"url":"Screenshot.png"}],
diff --git a/apps/bikespeedo/settings.js b/apps/bikespeedo/settings.js
index f41524263..bb943c081 100644
--- a/apps/bikespeedo/settings.js
+++ b/apps/bikespeedo/settings.js
@@ -11,9 +11,34 @@
     '< Back': back,
     '< Load Bike Speedometer': ()=>{load('bikespeedo.app.js');},
     'Barometer Altitude adjustment' : function() { E.showMenu(altdiffMenu); },
-    'Kalman Filters' : function() { E.showMenu(kalMenu); }
+    'Kalman Filters' : function() { E.showMenu(kalMenu); },
+    'Speed units': {
+      value: !!settings.localeUnits,
+      format: b => b ? "Locale" : "km/h",
+      onchange: b => {
+        settings.localeUnits = b;
+        writeSettings();
+      }
+    },
   };
 
+  if (global.WIDGETS && WIDGETS["recorder"]) {
+    appMenu[/*LANG*/"Record rides"] = {
+      value : !!settings.record,
+      onchange : v => {
+        settings.record = v;
+        writeSettings();
+      }
+    };
+    appMenu[/*LANG*/"Stop record on exit"] = {
+      value : !!settings.recordStopOnExit,
+      onchange : v => {
+        settings.recordStopOnExit = v;
+        writeSettings();
+      }
+    };
+  }
+
   const altdiffMenu = {
     '': { 'title': 'Altitude adjustment' },
     '< Back': function() { E.showMenu(appMenu); },
diff --git a/apps/blescanner/ChangeLog b/apps/blescanner/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/blescanner/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/blescanner/app-icon.js b/apps/blescanner/app-icon.js
new file mode 100644
index 000000000..a08a17ae4
--- /dev/null
+++ b/apps/blescanner/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AH4ARkQAHBwsBiIACiAHBgQXIkAXJiIuKGAwWEC4cjmYABn//AAMyC63yC653FC6HwC5aQBC5ybIC44WChGAWxMgC44rCxGIZxYXFIoYXBGAQNCAAQXILYYXBGAUDBoK0EC5AsBC4QwEC5wAEC853BhAWDI6CPCFwp3OX4ouCC8xHXCAJ3VX94XCwBHVGIiPTU4oNCAAQWBX5gDBgQRCAAoXGGAUIFwQXHkAXHJIgABCw4IBC5sAiIAEiAgHAAQXLHBAYIC+6wJQYIADgIXGGBJ3FC4iOBAH4A/ACAA=="))
diff --git a/apps/blescanner/app.js b/apps/blescanner/app.js
new file mode 100644
index 000000000..7cbf80d7e
--- /dev/null
+++ b/apps/blescanner/app.js
@@ -0,0 +1,41 @@
+E.showMessage("Scanning...");
+var devices = [];
+
+setInterval(function() {
+  NRF.findDevices(function(devs) {
+    devs.forEach(dev=>{
+      var existing = devices.find(d=>d.id==dev.id);
+      if (existing) {
+        existing.timeout = 0;
+        existing.rssi = (existing.rssi*3 + dev.rssi)/4;
+      } else {
+        dev.timeout = 0;
+        dev.new = 0;
+        devices.push(dev);
+      }
+    });
+    devices.forEach(d=>{d.timeout++;d.new++});
+    devices = devices.filter(dev=>dev.timeout<8);
+    devices.sort((a,b)=>b.rssi - a.rssi);
+    g.clear(1).setFont("12x20");
+    var wasNew = false;
+    devices.forEach((d,y)=>{
+      y*=20;
+      var n = d.name;
+      if (!n) n=d.id.substr(0,22);
+      if (d.new<4) {
+        g.fillRect(0,y,g.getWidth(),y+19);
+        g.setColor(g.theme.bg);
+        if (d.rssi > -70) wasNew = true;
+      } else {
+        g.setColor(g.theme.fg);
+      }
+      g.setFontAlign(-1,-1);
+      g.drawString(n,0,y);
+      g.setFontAlign(1,-1);
+      g.drawString(0|d.rssi,g.getWidth()-1,y);
+    });
+    g.flip();
+    Bangle.setLCDBrightness(wasNew);
+  }, 1200);
+}, 1500);
diff --git a/apps/blescanner/app.png b/apps/blescanner/app.png
new file mode 100644
index 000000000..8665f24ad
Binary files /dev/null and b/apps/blescanner/app.png differ
diff --git a/apps/blescanner/metadata.json b/apps/blescanner/metadata.json
new file mode 100644
index 000000000..54cde3ede
--- /dev/null
+++ b/apps/blescanner/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "blescanner",
+  "name": "BLE Scanner",
+  "shortName":"BLE Scan",
+  "version":"0.01",
+  "description": "Scans for bluetooth devices nearby and shows their names on the screen ordered by signal strength. The most recently discovered items are highlighted.",
+  "icon": "app.png",
+  "screenshots" : [ { "url":"screenshot.png" } ],
+  "tags": "tool,bluetooth",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"blescanner.app.js","url":"app.js"},
+    {"name":"blescanner.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/blescanner/screenshot.png b/apps/blescanner/screenshot.png
new file mode 100644
index 000000000..55bd44a52
Binary files /dev/null and b/apps/blescanner/screenshot.png differ
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index 780d9cc7d..d7405e763 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -64,3 +64,6 @@
 0.55: Add toLocalISOString polyfill for pre-2v15 firmwares
       Only add boot info comments if settings.bootDebug was set
       If settings.bootDebug is set, output timing for each section of .boot0
+0.56: Settings.log = 0,1,2,3 for off,display, log, both
+0.57: Handle the whitelist being disabled
+0.58: "Make Connectable" temporarily bypasses the whitelist
diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js
index 112dfeba8..a12d41e1b 100644
--- a/apps/boot/bootupdate.js
+++ b/apps/boot/bootupdate.js
@@ -32,14 +32,12 @@ if (s.ble!==false) {
     boot += `bleServiceOptions.hid=Bangle.HID;\n`;
   }
 }
-if (s.log==2) { // logging to file
-    boot += `_DBGLOG=require("Storage").open("log.txt","a");
-`;
-} if (s.blerepl===false) { // If not programmable, force terminal off Bluetooth
-  if (s.log==2) boot += `_DBGLOG=require("Storage").open("log.txt","a");
-LoopbackB.on('data',function(d) {_DBGLOG.write(d);Terminal.write(d);});
+// settings.log 0-off, 1-display, 2-log, 3-both
+if (s.blerepl===false) { // If not programmable, force terminal off Bluetooth
+  if (s.log>=2) { boot += `_DBGLOG=require("Storage").open("log.txt","a");
+LoopbackB.on('data',function(d) {_DBGLOG.write(d);${(s.log==3)?"Terminal.write(d);":""}});
 LoopbackA.setConsole(true);\n`;
-  else if (s.log) boot += `Terminal.setConsole(true);\n`; // if showing debug, force REPL onto terminal
+  } else if (s.log==1) boot += `Terminal.setConsole(true);\n`; // if showing debug, force REPL onto terminal
   else boot += `E.setConsole(null,{force:true});\n`; // on new (2v05+) firmware we have E.setConsole which allows a 'null' console
   /* If not programmable add our own handler for Bluetooth data
   to allow Gadgetbridge commands to be received*/
@@ -56,10 +54,10 @@ Bluetooth.on('line',function(l) {
     try { global.GB(JSON.parse(l.slice(3,-1))); } catch(e) {}
 });\n`;
 } else {
-  if (s.log==2) boot += `_DBGLOG=require("Storage").open("log.txt","a");
-LoopbackB.on('data',function(d) {_DBGLOG.write(d);Terminal.write(d);});
+  if (s.log>=2) boot += `_DBGLOG=require("Storage").open("log.txt","a");
+LoopbackB.on('data',function(d) {_DBGLOG.write(d);${(s.log==3)?"Terminal.write(d);":""}});
 if (!NRF.getSecurityStatus().connected) LoopbackA.setConsole();\n`;
-  else if (s.log) boot += `if (!NRF.getSecurityStatus().connected) Terminal.setConsole();\n`; // if showing debug, put REPL on terminal (until connection)
+  else if (s.log==1) boot += `if (!NRF.getSecurityStatus().connected) Terminal.setConsole();\n`; // if showing debug, put REPL on terminal (until connection)
   else boot += `Bluetooth.setConsole(true);\n`; // else if no debug, force REPL to Bluetooth
 }
 // we just reset, so BLE should be on.
@@ -81,7 +79,7 @@ if (global.save) boot += `global.save = function() { throw new Error("You can't
 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`;
+if (s.whitelist && !s.whitelist_disabled) boot+=`NRF.on('connect', function(addr) { if (!NRF.ignoreWhitelist && !(require('Storage').readJSON('setting.json',1)||{}).whitelist.includes(addr)) NRF.disconnect(); });\n`;
 if (s.rotate) boot+=`g.setRotation(${s.rotate&3},${s.rotate>>2});\n` // screen rotation
 // ================================================== FIXING OLDER FIRMWARES
 if (FWVERSION<215.068) // 2v15.68 and before had compass heading inverted.
@@ -107,7 +105,8 @@ if (!date.toLocalISOString) boot += `Date.prototype.toLocalISOString = function(
 // show timings
 if (DEBUG) boot += `print(".boot0",0|(Date.now()-_tm),"ms");_tm=Date.now();\n`
 // ================================================== BOOT.JS
-// Append *.boot.js files
+// Append *.boot.js files. 
+// Name files with a number - eg 'foo.5.boot.js' to enforce order (lowest first). Numbered files get placed before non-numbered
 // These could change bleServices/bleServiceOptions if needed
 let bootFiles = require('Storage').list(/\.boot\.js$/).sort((a,b)=>{
   let getPriority = /.*\.(\d+)\.boot\.js$/;
diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json
index 455563a16..0a4e7e9d1 100644
--- a/apps/boot/metadata.json
+++ b/apps/boot/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "boot",
   "name": "Bootloader",
-  "version": "0.55",
+  "version": "0.58",
   "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/bootgatthrm/ChangeLog b/apps/bootgatthrm/ChangeLog
new file mode 100644
index 000000000..1e772af29
--- /dev/null
+++ b/apps/bootgatthrm/ChangeLog
@@ -0,0 +1,2 @@
+0.01: Initial release.
+0.02: Added compatibility to OpenTracks and added HRM Location
\ No newline at end of file
diff --git a/apps/bootgatthrm/README.md b/apps/bootgatthrm/README.md
new file mode 100644
index 000000000..15bb2b670
--- /dev/null
+++ b/apps/bootgatthrm/README.md
@@ -0,0 +1,16 @@
+# BLE GATT HRM Service
+
+Adds the GATT HRM Service to advertise the current HRM over Bluetooth.
+
+## Usage
+
+This boot code runs in the background and has no user interface.
+
+## Creator
+
+[Another Stranger](https://github.com/anotherstranger)
+
+## Aknowledgements
+
+Special thanks to [Jonathan Jefferies](https://github.com/jjok) for creating the
+bootgattbat app, which was the inspiration for this App!
diff --git a/apps/bootgatthrm/bluetooth.png b/apps/bootgatthrm/bluetooth.png
new file mode 100644
index 000000000..1a884a62c
Binary files /dev/null and b/apps/bootgatthrm/bluetooth.png differ
diff --git a/apps/bootgatthrm/boot.js b/apps/bootgatthrm/boot.js
new file mode 100644
index 000000000..aad210f6f
--- /dev/null
+++ b/apps/bootgatthrm/boot.js
@@ -0,0 +1,70 @@
+(() => {
+  function setupHRMAdvertising() {
+    /*
+     * This function prepares BLE heart rate Advertisement.
+     */
+
+    NRF.setAdvertising(
+      {
+        0x180d: undefined
+      },
+      {
+        // We need custom Advertisement settings for Apps like OpenTracks
+        connectable: true,
+        discoverable: true,
+        scannable: true,
+        whenConnected: true,
+      }
+    );
+
+    NRF.setServices({
+      0x180D: { // heart_rate
+        0x2A37: { // heart_rate_measurement
+          notify: true,
+          value: [0x06, 0],
+        },
+        0x2A38: { // Sensor Location: Wrist
+          value: 0x02,
+        }
+      }
+    });
+
+  }
+  function updateBLEHeartRate(hrm) {
+    /*
+     * Send updated heart rate measurement via BLE
+     */
+    if (hrm === undefined || hrm.confidence < 50) return;
+    try {
+      NRF.updateServices({
+        0x180D: {
+          0x2A37: {
+            value: [0x06, hrm.bpm],
+            notify: true
+          },
+          0x2A38: {
+            value: 0x02,
+          }
+        }
+      });
+    } catch (error) {
+      if (error.message.includes("BLE restart")) {
+        /*
+         * BLE has to restart after service setup.  
+         */
+        NRF.disconnect();
+      }
+      else if (error.message.includes("UUID 0x2a37")) {
+        /*
+         * Setup service if it wasn't setup correctly for some reason 
+         */
+        setupHRMAdvertising();
+      } else {
+        console.log("[bootgatthrm]: Unexpected error occured while updating HRM over BLE! Error: " + error.message);
+      }
+    }
+  }
+
+  setupHRMAdvertising();
+  Bangle.on("HRM", function (hrm) { updateBLEHeartRate(hrm); });
+})();
diff --git a/apps/bootgatthrm/metadata.json b/apps/bootgatthrm/metadata.json
new file mode 100644
index 000000000..450066622
--- /dev/null
+++ b/apps/bootgatthrm/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "bootgatthrm",
+  "name": "BLE GATT HRM Service",
+  "shortName": "BLE HRM Service",
+  "version": "0.02",
+  "description": "Adds the GATT HRM Service to advertise the measured HRM over Bluetooth.\n",
+  "icon": "bluetooth.png",
+  "type": "bootloader",
+  "tags": "hrm,health,ble,bluetooth,gatt",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"gatthrm.boot.js","url":"boot.js"}
+  ]
+}
diff --git a/apps/boxclk/ChangeLog b/apps/boxclk/ChangeLog
new file mode 100644
index 000000000..cc73fbc08
--- /dev/null
+++ b/apps/boxclk/ChangeLog
@@ -0,0 +1,5 @@
+0.01: New App!
+0.02: New config options such as step, meridian, short/long formats, custom prefix/suffix
+0.03: Allows showing the month in short or long format by setting `"shortMonth"` to true or false
+0.04: Improves touchscreen drag handling for background apps such as Pattern Launcher
+0.05: Fixes step count not resetting after a new day starts
diff --git a/apps/boxclk/README.md b/apps/boxclk/README.md
new file mode 100644
index 000000000..c72d932a4
--- /dev/null
+++ b/apps/boxclk/README.md
@@ -0,0 +1,118 @@
+# Box Clock
+
+Box Clock is a customizable clock app for Bangle.js 2 that features an interactive drag and drop interface and easy JSON configuration.
+
+## Unique Features
+
+__Drag & Drop:__
+
+This intuitive feature allows you to reposition any element (box) on the clock face with ease. Tap on the box(s) you want to move and the border will show, drag into position and tap outside of the boxes to finish placing. **Note:** Roll the tip of your finger slowly on the screen for fine adjustments.
+
+__Double Tap to Save:__
+
+After you've found the perfect position for your boxes, you can save their positions with a quick double tap on the background. This makes it easy to ensure your custom layout is stored for future use. A save icon will appear momentarily to confirm that your configuration has been saved.
+
+__JSON Configuration:__
+
+Each box can be customized extensively via a simple JSON configuration. You can add a custom text string to your configuration with the "string" parameter and you can match system theme colors by using "fg", "bg", "fg2", "bg2", "fgH", or "bgH" for any of the color parameters.
+
+## Config File Structure
+
+Here's an example of what a configuration might contain:
+
+```
+{
+  "customBox": {
+    "string": "Your text here",
+    "font": "CustomFont", // Custom fonts must be removed in setUI
+    "fontSize": 1,
+    "outline": 2,
+    "color": "#FF9900", // Use 6 or 3 digit hex color codes
+    "outlineColor": "bgH", // Or match system theme colors like this
+    "border": 65535, // Or use 16-bit RGB565 like this
+    "xPadding": 1,
+    "yPadding": -4,
+    "xOffset": 0,
+    "yOffset": 3,
+    "boxPos": { "x": 0.5, "y": 0.5 },
+    "prefix": "", // Adds a string to the beginning of the main string
+    "suffix": "", // Adds a string to the end of the main string
+    "disableSuffix": true, // Use to remove DayOfMonth suffix only
+    "short": false, // Use long format of time, meridian, date, or DoW
+    "shortMonth": false // Use long format of month within date
+
+  },
+  "bg": { // Can also be removed for no background
+    "img": "YourImageName.img"
+  }
+}
+```
+
+__Breakdown of Parameters:__
+
+* **Box Name:** The name of your text box. Box Clock includes functional support for "time", "date", "meridian" (AM/PM), "dow" (Day of Week), "batt" (Battery), and "step" (Step count). You can add additional custom boxes with unique titles.
+
+* **string:** The text string to be displayed inside the box. This is only required for custom Box Names.
+
+* **font:** The font name given to g.setFont().
+
+* **fontSize:** The size of the font.
+
+* **outline:** The thickness of the outline around the text.
+
+* **color:** The color of the text.
+
+* **outlineColor:** The color of the text outline.
+
+* **border:** The color of the box border when moving.
+
+* **xPadding, yPadding:** Additional padding around the text inside the box.
+
+* **xOffset, yOffset:** Offsets the text position within the box.
+
+* **boxPos:** Initial position of the box on the screen. Values are fractions of the screen width (x) and height (y), so { "x": 0.5, "y": 0.5 } would be in the middle of the screen.
+
+* **prefix:** Adds a string to the beginning of the main string. For example, you can set "prefix": "Steps: " to display "Steps: 100" for the step count.
+
+* **suffix:** Adds a string to the end of the main string. For example, you can set "suffix": "%" to display "80%" for the battery percentage.
+
+* **disableSuffix:** Applies only to the "date" box. Set to true to disable the DayOfMonth suffix. This is used to remove the "st","nd","rd", or "th" from the DayOfMonth number.
+
+* **short:** Set to false to get the long format value of time, meridian, date, or DayOfWeek. Short formats are used by default if not specified.
+
+* **shortMonth:** Applies only to the "date" box. Set to false to get the long format value of the month. Short format is used by default if not specified.
+
+* **bg:** This specifies a custom background image, with the img property defining the name of the image file on the Bangle.js storage.
+
+## Multiple Configurations
+
+__Settings Menu:__
+
+The app includes a settings menu that allows you to switch between different configurations. The selected configuration is stored as a number in the default `boxclk.json` file using the selectedConfig property.
+
+If the selectedConfig property is not present or is set to 0, the app will use the default configuration. To create additional configurations, create separate JSON files with the naming convention `boxclk-N.json`, where `N` is the configuration number. The settings menu will list all available configurations.
+
+## Example Configs:
+
+To easily try out other configs, download and place the JSON configs and/or background images from below onto your Bangle.js storage. Then go to the Box Clock settings menu to select the new config number. You can also modify them to suit your personal preferences.
+
+__Space Theme:__
+
+- **Config:** [boxclk-1.json](https://github.com/espruino/BangleApps/tree/master/apps/boxclk/boxclk-1.json)
+- **Background:** [boxclk.space.img](https://github.com/espruino/BangleApps/tree/master/apps/boxclk/boxclk.space.img) ([Original Source](https://www.pixilart.com/art/fallin-from-outer-space-sr2e0c1a705749a))
+
+__System Color Theme:__
+
+- **Config:** [boxclk-2.json](https://github.com/espruino/BangleApps/tree/master/apps/boxclk/boxclk-2.json)
+
+## Compatibility
+
+This app was built and tested with Bangle.js 2.
+
+## Feedback
+
+If you have any issues or suggestions, please open an issue on this GitHub repository. Contributions to improve the application are also welcomed.
+
+## Creator
+
+[stweedo](https://github.com/stweedo)
diff --git a/apps/boxclk/app.js b/apps/boxclk/app.js
new file mode 100644
index 000000000..12c69e789
--- /dev/null
+++ b/apps/boxclk/app.js
@@ -0,0 +1,415 @@
+{
+  /**
+  * ---------------------------------------------------------------
+  * 1. Module dependencies and initial configurations
+  * ---------------------------------------------------------------
+  */
+
+  let storage = require("Storage");
+  let locale = require("locale");
+  let widgets = require("widget_utils");
+  let date = new Date();
+  let bgImage;
+  let configNumber = (storage.readJSON("boxclk.json", 1) || {}).selectedConfig || 0;
+  let fileName = 'boxclk' + (configNumber > 0 ? `-${configNumber}` : '') + '.json';
+  // Add a condition to check if the file exists, if it does not, default to 'boxclk.json'
+  if (!storage.read(fileName)) {
+    fileName = 'boxclk.json';
+  }
+  let boxesConfig = storage.readJSON(fileName, 1) || {};
+  let boxes = {};
+  let boxPos = {};
+  let isDragging = {};
+  let wasDragging = {};
+  let doubleTapTimer = null;
+  let g_setColor;
+
+  let saveIcon = require("heatshrink").decompress(atob("mEwwkEogA/AHdP/4AK+gWVDBQWNAAIuVGBAIB+UQdhMfGBAHBCxUAgIXHIwPyCxQwEJAgXB+MAl/zBwQGBn8ggQjBGAQXG+EA/4XI/8gBIQXTGAMPC6n/C6HzkREBC6YACC6QAFC57aHCYIXOOgLsEn4XPABIX/C6vykQAEl6/WgCQBC5imFAAT2BC5gCBI4oUCC5x0IC/4X/C4K8Bl4XJ+TCCC4wKBABkvC4tEEoMQCxcBB4IWEC4XyDBUBFwIXGJAIAOIwowDABoWGGB4uHDBwWJAH4AzA"));
+
+  /**
+  * ---------------------------------------------------------------
+  * 2. Graphical and visual configurations
+  * ---------------------------------------------------------------
+  */
+
+  let w = g.getWidth();
+  let h = g.getHeight();
+  let totalWidth, totalHeight;
+  let drawTimeout;
+
+  /**
+  * ---------------------------------------------------------------
+  * 3. Touchscreen Handlers
+  * ---------------------------------------------------------------
+  */
+
+  let touchHandler;
+  let dragHandler;
+  let movementDistance = 0;
+
+  /**
+  * ---------------------------------------------------------------
+  * 4. Font loading function
+  * ---------------------------------------------------------------
+  */
+
+  let loadCustomFont = function() {
+    Graphics.prototype.setFontBrunoAce = function() {
+      // Actual height 23 (24 - 2)
+      return this.setFontCustom(
+        E.toString(require('heatshrink').decompress(atob('ABMHwADBh4DKg4bKgIPDAYUfAYV/AYX/AQMD/gmC+ADBn/AByE/GIU8AYUwLxcfAYX/8AnB//4JIP/FgMP4F+CQQBBjwJBFYRbBAd43DHoJpBh/g/xPEK4ZfDgEEORKDDAY8////wADLfZrTCgITBnhEBAYJMBAYMPw4DCM4QDjhwDCjwDBn0+AYMf/gDBh/4AYMH+ADBLpc4ToK/NGYZfnAYcfL4U/x5fBW4LvB/7vC+LvBgHAsBfIn76Cn4WBcYQDFEgJ+CQQYDyH4L/BAZbHLNYjjCAZc8ngDunycBZ4KkBa4KwBnEHY4UB+BfMgf/ZgMH/4XBc4cf4F/gE+ZgRjwAYcfj5jBM4U4M4RQBM4UA8BjIngDFEYJ8BAYUDAYQvCM4ZxBC4V+AYQvBnkBQ4M8gabBJQPAI4WAAYM/GYQaBAYJKCnqyCn5OCn4aBAYIaBAYJPCU4IABnBhIuDXCFAMD+Z/BY4IDBQwOPwEfv6TDAYUPAcwrDAYQ7BAYY/BI4cD8bLCK4RfEAA0BRYTeDcwIrFn0Pw43Bg4DugYDBjxBBU4SvDMYMH/5QBgP/LAQAP8EHN4UPwADHB4YAHA'))),
+        46,
+        atob("CBEdChgYGhgaGBsaCQ=="),
+        32|65536
+      );
+    };
+  };
+
+  /**
+  * ---------------------------------------------------------------
+  * 5. Initial settings of boxes and their positions
+  * ---------------------------------------------------------------
+  */
+
+  for (let key in boxesConfig) {
+    if (key === 'bg' && boxesConfig[key].img) {
+      bgImage = storage.read(boxesConfig[key].img);
+    } else if (key !== 'selectedConfig') {
+      boxes[key] = Object.assign({}, boxesConfig[key]);
+    }
+  }
+
+  let boxKeys = Object.keys(boxes);
+
+  boxKeys.forEach((key) => {
+    let boxConfig = boxes[key];
+    boxPos[key] = {
+      x: w * boxConfig.boxPos.x,
+      y: h * boxConfig.boxPos.y
+    };
+    isDragging[key] = false;
+    wasDragging[key] = false;
+  });
+
+  /**
+  * ---------------------------------------------------------------
+  * 6. Text and drawing functions
+  * ---------------------------------------------------------------
+  */
+
+  // Overwrite the setColor function to allow the
+  // use of (x) in g.theme.x as a string
+  // in your JSON config ("fg", "bg", "fg2", "bg2", "fgH", "bgH")
+  let modSetColor = function() {
+    // Save the original setColor function
+    g_setColor = g.setColor;
+    // Overwrite setColor with the new function
+    g.setColor = function(color) {
+      if (typeof color === "string" && color in g.theme) {
+        g_setColor.call(g, g.theme[color]);
+      } else {
+        g_setColor.call(g, color);
+      }
+    };
+  };
+
+  let restoreSetColor = function() {
+    // Restore the original setColor function
+    if (g_setColor) {
+      g.setColor = g_setColor;
+    }
+  };
+
+  // Overwrite the drawString function
+  let g_drawString = g.drawString;
+  g.drawString = function(box, str, x, y) {
+    outlineText(box, str, x, y);
+    g.setColor(box.color);
+    g_drawString.call(g, str, x, y);
+  };
+
+  let outlineText = function(box, str, x, y) {
+    let px = box.outline;
+    let dx = [-px, 0, px, -px, px, -px, 0, px];
+    let dy = [-px, -px, -px, 0, 0, px, px, px];
+    g.setColor(box.outlineColor);
+    for (let i = 0; i < dx.length; i++) {
+      g_drawString.call(g, str, x + dx[i], y + dy[i]);
+    }
+  };
+
+  let calcBoxSize = function(boxItem) {
+    g.reset();
+    g.setFontAlign(0,0);
+    g.setFont(boxItem.font, boxItem.fontSize);
+    let strWidth = g.stringWidth(boxItem.string) + 2 * boxItem.outline;
+    let fontHeight = g.getFontHeight() + 2 * boxItem.outline;
+    totalWidth = strWidth + 2 * boxItem.xPadding;
+    totalHeight = fontHeight + 2 * boxItem.yPadding;
+  };
+
+  let calcBoxPos = function(boxKey) {
+    return {
+      x1: boxPos[boxKey].x - totalWidth / 2,
+      y1: boxPos[boxKey].y - totalHeight / 2,
+      x2: boxPos[boxKey].x + totalWidth / 2,
+      y2: boxPos[boxKey].y + totalHeight / 2
+    };
+  };
+
+  let displaySaveIcon = function() {
+    draw(boxes);
+    g.drawImage(saveIcon, w / 2 - 24, h / 2 - 24);
+    // Display save icon for 2 seconds
+    setTimeout(() => {
+      g.clearRect(w / 2 - 24, h / 2 - 24, w / 2 + 24, h / 2 + 24);
+      draw(boxes);
+    }, 2000);
+  };
+
+  /**
+  * ---------------------------------------------------------------
+  * 7. String forming helper functions
+  * ---------------------------------------------------------------
+  */
+
+  let isBool = function(val, defaultVal) {
+    return typeof val !== 'undefined' ? Boolean(val) : defaultVal;
+  };
+
+  let getDate = function(short, shortMonth, disableSuffix) {
+    const date = new Date();
+    const dayOfMonth = date.getDate();
+    const month = shortMonth ? locale.month(date, 1) : locale.month(date, 0);
+    const year = date.getFullYear();
+    let suffix;
+    if ([1, 21, 31].includes(dayOfMonth)) {
+      suffix = "st";
+    } else if ([2, 22].includes(dayOfMonth)) {
+      suffix = "nd";
+    } else if ([3, 23].includes(dayOfMonth)) {
+      suffix = "rd";
+    } else {
+      suffix = "th";
+    }
+    let dayOfMonthStr = disableSuffix ? dayOfMonth : dayOfMonth + suffix;
+    return month + " " + dayOfMonthStr + (short ? '' : (", " + year)); // not including year for short version
+  };
+
+  let getDayOfWeek = function(date, short) {
+    return locale.dow(date, short ? 1 : 0);
+  };
+
+  locale.meridian = function(date, short) {
+    let hours = date.getHours();
+    let meridian = hours >= 12 ? 'PM' : 'AM';
+    return short ? meridian[0] : meridian;
+  };
+
+  let modString = function(boxItem, data) {
+    let prefix = boxItem.prefix || '';
+    let suffix = boxItem.suffix || '';
+    return prefix + data + suffix;
+  };
+
+  /**
+  * ---------------------------------------------------------------
+  * 8. Main draw function
+  * ---------------------------------------------------------------
+  */
+
+  let draw = (function() {
+    let updatePerMinute = true; // variable to track the state of time display
+
+    return function(boxes) {
+      date = new Date();
+      g.clear();
+      if (bgImage) {
+        g.drawImage(bgImage, 0, 0);
+      }
+      if (boxes.time) {
+        boxes.time.string = modString(boxes.time, locale.time(date, isBool(boxes.time.short, true) ? 1 : 0));
+        updatePerMinute = isBool(boxes.time.short, true);
+      }
+      if (boxes.meridian) {
+        boxes.meridian.string = modString(boxes.meridian, locale.meridian(date, isBool(boxes.meridian.short, true)));
+      }
+      if (boxes.date) {
+        boxes.date.string = (
+          modString(boxes.date,
+          getDate(isBool(boxes.date.short, true),
+          isBool(boxes.date.shortMonth, true),
+          isBool(boxes.date.disableSuffix, false)
+        )));
+      }
+      if (boxes.dow) {
+        boxes.dow.string = modString(boxes.dow, getDayOfWeek(date, isBool(boxes.dow.short, true)));
+      }
+      if (boxes.batt) {
+        boxes.batt.string = modString(boxes.batt, E.getBattery());
+      }
+      if (boxes.step) {
+        boxes.step.string = modString(boxes.step, Bangle.getHealthStatus("day").steps);
+      }
+      boxKeys.forEach((boxKey) => {
+        let boxItem = boxes[boxKey];
+        calcBoxSize(boxItem);
+        const pos = calcBoxPos(boxKey);
+        if (isDragging[boxKey]) {
+          g.setColor(boxItem.border);
+          g.drawRect(pos.x1, pos.y1, pos.x2, pos.y2);
+        }
+        g.drawString(
+          boxItem,
+          boxItem.string,
+          boxPos[boxKey].x +  boxItem.xOffset,
+          boxPos[boxKey].y +  boxItem.yOffset
+        );
+      });
+      if (!Object.values(isDragging).some(Boolean)) {
+        if (drawTimeout) clearTimeout(drawTimeout);
+        let interval = updatePerMinute ? 60000 - (Date.now() % 60000) : 1000;
+        drawTimeout = setTimeout(() => draw(boxes), interval);
+      }
+    };
+  })();
+
+  /**
+  * ---------------------------------------------------------------
+  * 9. Helper function for touch event
+  * ---------------------------------------------------------------
+  */
+
+  let touchInText = function(e, boxItem, boxKey) {
+    calcBoxSize(boxItem);
+    const pos = calcBoxPos(boxKey);
+    return e.x >= pos.x1 &&
+          e.x <= pos.x2 &&
+          e.y >= pos.y1 &&
+          e.y <= pos.y2;
+  };
+
+  let deselectAllBoxes = function() {
+    Object.keys(isDragging).forEach((boxKey) => {
+      isDragging[boxKey] = false;
+    });
+    restoreSetColor();
+    widgets.show();
+    widgets.swipeOn();
+    modSetColor();
+  };
+
+  /**
+  * ---------------------------------------------------------------
+  * 10. Setup function to configure event handlers
+  * ---------------------------------------------------------------
+  */
+
+  let setup = function() {
+    // ------------------------------------
+    // Define the touchHandler function
+    // ------------------------------------
+    touchHandler = function(zone, e) {
+      wasDragging = Object.assign({}, isDragging);
+      let boxTouched = false;
+      boxKeys.forEach((boxKey) => {
+        if (touchInText(e, boxes[boxKey], boxKey)) {
+          isDragging[boxKey] = true;
+          wasDragging[boxKey] = true;
+          boxTouched = true;
+        }
+      });
+      if (!boxTouched) {
+        if (!Object.values(isDragging).some(Boolean)) { // check if no boxes are being dragged
+          deselectAllBoxes();
+          if (doubleTapTimer) {
+            clearTimeout(doubleTapTimer);
+            doubleTapTimer = null;
+            // Save boxesConfig on double tap outside of any box and when no boxes are being dragged
+            Object.keys(boxPos).forEach((boxKey) => {
+              boxesConfig[boxKey].boxPos.x = (boxPos[boxKey].x / w).toFixed(3);
+              boxesConfig[boxKey].boxPos.y = (boxPos[boxKey].y / h).toFixed(3);
+            });
+            storage.write(fileName, JSON.stringify(boxesConfig));
+            displaySaveIcon();
+            return;
+          }
+        } else {
+          // if any box is being dragged, just deselect all without saving
+          deselectAllBoxes();
+        }
+      }
+      if (Object.values(wasDragging).some(Boolean) || !boxTouched) {
+        draw(boxes);
+      }
+      doubleTapTimer = setTimeout(() => {
+        doubleTapTimer = null;
+      }, 500); // Increase or decrease this value based on the desired double tap timing
+      movementDistance = 0;
+    };
+
+    // ------------------------------------
+    // Define the dragHandler function
+    // ------------------------------------
+    dragHandler = function(e) {
+      // Check if any box is being dragged
+      if (!Object.values(isDragging).some(Boolean)) return;
+      // Calculate the movement distance
+      movementDistance += Math.abs(e.dx) + Math.abs(e.dy);
+      // Check if the movement distance exceeds a threshold
+      if (movementDistance > 1) {
+        boxKeys.forEach((boxKey) => {
+          if (isDragging[boxKey]) {
+            widgets.hide();
+            let boxItem = boxes[boxKey];
+            calcBoxSize(boxItem);
+            let newX = boxPos[boxKey].x + e.dx;
+            let newY = boxPos[boxKey].y + e.dy;
+            if (newX - totalWidth / 2 >= 0 &&
+                newX + totalWidth / 2 <= w &&
+                newY - totalHeight / 2 >= 0 &&
+                newY + totalHeight / 2 <= h ) {
+              boxPos[boxKey].x = newX;
+              boxPos[boxKey].y = newY;
+            }
+            const pos = calcBoxPos(boxKey);
+            g.clearRect(pos.x1, pos.y1, pos.x2, pos.y2);
+          }
+        });
+        draw(boxes);
+      }
+    };
+
+    Bangle.on('touch', touchHandler);
+    Bangle.on('drag', dragHandler);
+
+    Bangle.setUI({
+      mode : "clock",
+      remove : function() {
+        // Remove event handlers, stop draw timer, remove custom font if used
+        Bangle.removeListener('touch', touchHandler);
+        Bangle.removeListener('drag', dragHandler);
+        if (drawTimeout) clearTimeout(drawTimeout);
+        drawTimeout = undefined;
+        delete Graphics.prototype.setFontBrunoAce;
+        // Restore original drawString function (no outlines)
+        g.drawString = g_drawString;
+        restoreSetColor();
+        widgets.show();
+      }
+    });
+    loadCustomFont();
+    draw(boxes);
+  };
+
+  /**
+  * ---------------------------------------------------------------
+  * 11. Main execution part
+  * ---------------------------------------------------------------
+  */
+
+  Bangle.loadWidgets();
+  widgets.swipeOn();
+  modSetColor();
+  setup();
+}
\ No newline at end of file
diff --git a/apps/boxclk/app.png b/apps/boxclk/app.png
new file mode 100644
index 000000000..89da3b695
Binary files /dev/null and b/apps/boxclk/app.png differ
diff --git a/apps/boxclk/beachhouse.js b/apps/boxclk/beachhouse.js
new file mode 100644
index 000000000..ef0648658
--- /dev/null
+++ b/apps/boxclk/beachhouse.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("2GwxH+GFkGhgDBhkGAAIJCAYUIgMBiEdAH4AKoOm0AAD02m0+JAAOP2YAE1ut2ePBoQPCAQllizhtWASoBg08g0SjAABiUOgKyBi6k/ABEXr6uF0HE4mm1qiEACVlnSvtVYKuBgFarUMm08oUZjMUV4MBV/4AEndfweCwWgVxGg06uXV6qTBhiVCBYweRrU2gEMAYM2jMah8IhEQVX4ADwapGAA6uZV60Ms1CiU8swZSAAk8YYOo19hjEai0XVH4AEr6tO0yuaAAKvQRgIDCnlCoVmV6UGAAIFChgABmFhtEfjio/AAkXwatNV4SubV6SSCV4M8jEYiQOEisWUQbLKAoUSW4UMiSv/AAk7wSoKAgfE0CucV6IAEhitBiUMhEPh8AhBSBiwOBikbaBitCXIMGVX4ADwatJWAem1umwWCV96NBVwKtBAgMOi0Wi4ABKgUVjkcBoIABg8HZQsbhoNBiwUBAQIA/js7wSuN1utVbqvVhgBBnlCAAMSiqtCV4SxCjkHh0QXAa1DgEcA4LHBVP4ADi+DVpyshV5yPEhivBiU8iUSjEbVwiZEAoYIDh8NDwMVTepKHCJNeVpmnVkivDg8BV5cGAAKyCV4UZMaQABiwQPAEVBndfvgAB0F8r5NIK4VeCAIALwSunV4MRiEQWJMMiSuCWocSiquEMIS1HXiIAki+J1umSo9fiJPDAIM7VhoAB02CWFE6QwMRhCvJVwcMAQU8VAqv+GQKaB0+mV5GgviwBAANeVp6wEV9UXV4MBhMKiEQhK0Jg09VogAGV2wxBr+DVZKwFneDViKuCV9oABiL4DiMBWAwAEh6wORZ6tiQwIABTyasPVoOCryvtAAsIV5cAiAZKTxjBVVx87wasjVwSpnV6MXiECgKtHg8OiyvMUQi6QUh4bBD4wFBVwKtjV1+JryVOiEIVgUBiEQCxy4OV68doNfvtfWgdYVwKvQ02n1unCoIAD04AJV1yvQAAMRVjivJBx4CBneCR4KWCweDwWCVpwTBTOKvnAF6uGUoSiMABmDU36v/V5wEBr6sZAAWCU34AHsqv/WIoDBwSrY0wCC02DVH6v/VxYEDvivYVoQACVH6rDVwavBiMRWH6v/AEOI1ms02l0vJ5HI4WeiNSuywCiMKhUQTlM7ndfAQINJV7asEV/+B4IAD4AAD4MJz2XlsRiMCgIABWE+DwSBEwaxGr+mwQJCV7CyFwau70+eVQgAFlm73V0hUKgUAAAMJV0s7TQiDCwVYmoOCrwKDmkQV6waBFIiu81nCVxXAqyvB3csgQABhMQV0qvGWIijVVhWt1uDwSq81nJ02l4KuL4Ge3W64N0hMKiMRV00Xr6mSXKitBVXYAE5SrNAAedV4WXhMQV9E1vqkLVCgfHUWms6HJ0o5F0zwB1qwRgFIznB3UChUKV81fvihaV5xuBV+STD4PJ02s0vC4QFB02fV6MGv3H4FJgKxBiKxfnc7r+DwSsoAAOCwWDwapr1jeE0qVE4KnDAgIGEABsGV4PG4FygAABgMJWDdfvt8QgICCVsyosVw3J5OmWIWmUSIAMhkGqgEBztQWAUAhSvawSrc0wADBxStxV4XIQ4PB4XCVz3AgyvDy17V4cJiMXAIU1vtZmquQnaub02DN4enWBOnV+nJVT4AEUwMGlVOuV6VwUDiIADvt2vl3vqwQvqubOI+DWQKzFX4gAw03J4XBWQICB4QGBV7cGhgACmCuBgkFhauCrF8AAN2vt3WBs7waECC4KKDDwSuXAA+nV2qyF4elJ4WCz6xZVwkShivBgdMu9xu6tFAwN9iKuKrN9UYYaCVR6uUAHVldgQIEwWlWDEMWAsGhsouFKt1uuqWDuy2CrKuJvoABVgiuU0BgFAH6vGWAQAE03CVy6vBAAkSAAMHksAAAV0VoKbFWBE1vivBCQqvUwak/ACOI5PBVzHAg0GWIsMgyuDgGgTQykBV49ZVwwZDVyOmTn6fD1gAB0vJAAnI5OsxOs5CtZAAMAV48MVwd7V6NY0KwFVaIAD06s/AAOtUoPH4XBAAPH4KPD4+m5KubV4KuHV4dQTYKvNiEQh8PBQKwa02D0+mAYKs5xGs1igBVAavBSA3IBA6vfg0AletVxAABnavDVoMPh0zV4QABq9dwSwUWgiv51ml0vQV4gAD46qdV4sGAASwGg8ygVSV5E1V4cJVwMOh6tCBwM4ildV/WIVqwAB03KV5KuiV4MApFyvC0BV4cShgMBgFRV5cRhEOg8NhF80KwCicaV/Wq52q1YGC02s1oWM1fB5Gs5XJ5HHU0SvJpG62lskkksFaWQMSiUGgywBq6vKiEIhEHAANRV4WCV4OBV/Gr43G4/I5CYBNoIGCAAfH4/BBIOl0oQBWAIVB4KliIAIJH2gAByFIpGQ4FypEGV4SuBg1eVgdYAIM0V4atCAAMIvl3vteiUZrqv6RLK4BV0XNAAJCHyCvBtlItm6WYVIlSvDsKvCrAADmqvHg0HqN9vtdiUTrl8WDGDV7vO4ywaAEXGV5UkpGQV4OQV4IEBpFyvFOgF+wkxryuErERiCvHhsIV4k4vavYAAOCAAKvZ1ZtIAF3HHAgFBAwPM5vH44SEgEAyCrB2gABAgNsWgOWuQAB0VcwKvEiEPiMXh6uDg8Nhstvs5V7wAC0yyBwavV1mq5xuBV2fOG4StBAgPGAYPPBYPICYdIpCnB3W0VgK1BAwOQ4G6BANspFykquCnUQg8QV4KsBgwABWAMIvk4V4M3wKvdAAaxQxGO2Oy2WOAAOx1fP5CyvVwPVUoQAE5/V1ZHB1a7BCgO0VAKpBUYMkWoWQtmW3S+BAQXAp8zh8Ng8AWAMIVoQAChsNq6vCiddV8KwBVxuO2AAC2IABWYIABWQJvBOAPBWtKuBAAfPVYJAC2ONeYON1eq5vHV4KfBtivBAYIHCAga3BXwIABqsHU4YEEV4cOq8UV4U4vivh02mxGIVxWxVogAI1Z8BAAKwo46wCGwmyVYIAExuNw+qyCrCU4WQ2inBWwIDBAAKsBBYPAuSrBVg6wEq8TV4UTrqvhWISwDWgmIMIKvOPQWy63O5CxmV4QxCxqsGWAuqUgKuDVAW0WQSqCAYIIC4FIgClCAYavGrqvDikVrufAASUDAoQKDABqvG1gAFWQKtB2SjFWBfV54ABV5/HABPGCBPGV4IvCVpT+D6itDAAS2BUoKoBAAQFCy3AyEAAAquGhkNnMSV4YABzvB4QAN4IQK4YABWYemAAavBUA+rVpauB53O5/OV5yYCYgQABDQIACWAgQD53NV4g3HAAIED6ivDUIKtBVwW6WAgDCF4IQBlSwLhsHhqvDWIWdNJoAMXQK8D4fEWwXD5XK1anGAwWwAAJ3IVYPGAAI5PV4yyEZYvGCIpECUQQABZIjQFpEkpCuFVggECWwIGC3XAVxQABgCvFiivcAAqwB4fJ5ICB0quGAASuCV5KwJAwS5IWA6QDWAXG4/H5qeGABy5BpAABVwwFEA5GQVY6tCW4KvBVwSvkWAKuB5QAB1avX1Z1C5qPBSAQIEWIS3DWAIAlV4auCUIIABWowIDWwZHBlSsGAAUHhivp4HBWAXPV4IADVgquCWZQVB55/JXIa7CXoqvkkivBWQKzHAAasDAAO64G6yyqEV5CxCV4OcV8XA4SwB5PPSgOqAAKkBAgQFCA4YKEQCHNAASrmV4sAWAMkAQKyDVIKwIWotIWBMMVgKvCWAOjV8fA4IAB4/HQ1avrAAcktizCUgNsWYIBBWYu6WgckV5USV4MUWAOiV8gAF4yzBABQNCYP6vFSgatCtlIAAStDWgIFBVwS0D2iwEgwAChqvBVgIACV9bASWP6vDAAavBAANypC0BWAPAV4KpCVYStCWgO0gytChoACVwKv/WIvGAQKz8V4qoBkgDDAAVIuVytiwFWQQACtivBVYUMVgKuFV/KpBAA3HV3YACklOAAtyAYVPA4dIpGXWAwACtkkgysBAAaqBAYcTvyPYJYfHTyHHAAXNAAgeCAooA+p3HzgACzoEDAoIAB0ejBImc4xzB3WWVwNspCtEVwivc4/O6wAB53BVgqiDLwyh/V6Wi0ei0XGAAPH44CCAAhtCAA/AV4y0FAIKva6qvH4ytJAH6vUABqmEDpHHpEMhixKiSvYWAPIFoQJFIJgA/V7Gk0gMB5vH4xsNV4axLrSvYABPGWAaW/V8GkgEAq3VWAJsDCoWkqtVXwSvDm0MgyxKV8awCAAKy/V76uBkkAlUAV4RoEqq8BgEyqyvGgCwCV9ixHTX6vWLgedT4Or1eHmNVV4YTBv8ArnW1crlWqV4a5CgywBV5Gi0WcznGWMqv/V63GV4ejgFV63W5+Agy8BV4JnBgErBgPVqsA0ivIWIsMAgICBhk2rWK1CjXHYJLCAAhGCV7PP6oABV/SwCp0A1avC1cAV4nNgGAV4QMB0avGUgSwEA4QAB1PU188nmiVy6mJ6gABOK3VLgPXAAJgBV/d5UQWy1eAV4vOgFWJoOxV5KrBV4YAEm2E2GwsANBV6auHAA/O5pWBAAKuTVoQADWOqvCK4dWmXW1mrmMH5p1D5y9B6y9BrivIAAawBWIcSoU8iS7Cg3GV6SwCHYRLDAAIfCKwIAB4G64CwP6itHWIiv452khquBw8GN4KvDWAMAwOrwMqgAHBV5KxFjCtDBIPMVya8OKoYACIYQAL6quLWAXUV+yiCAAMrv6vC4yvD0cAmMrgF5V6CyDAAMw1HGVDSlFAAhsR56uNWASv1LgXH0d40YGCV4vO5uj0bDCV4cGVAKuEhgICVoMSAIMSsGozmcVq5LBVQpDENiPVVxwAB6qvyMQ4ADBowYCAoivBVIKvFAAiwBV4M2nk2CIMqWKxLJH4ZHEABfWV6HWVtpQBV6pzGV4UkVpKvCWAUMsFmWgMSmCwW45MLWB/VVyAAB6qvuvHGMRivcgyxDg02oU8nk2g1UV6vAH4nHAAKv/VyoABV74AB0XMVgqtCAAkMjE8jEMAoOc0V+lUAHoKpJ3QAF4CrBBgSwIWxfPV/hFBKYXOvHMLBivD43MAoPMAYSvFtnM6SXBAA60DhkSAIUAlVasE2BgMwV5KuGWIYCC4yvNWA3WV9qgB44MJBYIACV4RPFWoqiB45oIBAYkBklsyC7BpCvIWQimBg0wwmv1+ErS8C0SwDvFUzivLVwQABLgavj56oVGAStCUIiuKAASvBVQivJAYIpBEgZlEV4VsRYPGzlIpyuJAgdarWEsCvElSwB0V4lUwWASvOWKJUCV6PWVyZ7CTw4ACVpYMBV4KuEV4yuCAYKqEAAvHpHAtlIyyvBAAKwHV4lasFam02V4kA0Wiv0wg0wrWcVxaxDWgZfC4K0JOwXPWCHVT5CrJPAgAWV43GV4itDAAQOCAgYREkmcpAACtiyCV4wAEVgKjBhgDCWAV4v1UmFUql+V56zEAAawCAAawG6qwO6yhED4quJVi6vE41IznN5ivE5gOBBAKvIHIsky1sV4ecCAKvLU4QECg0wrQICAwMGrV+V4PAWCSzDV4ySEWAauN56uJDwaseAAXIvAgBFgiuCcIgMGBIhKCgCuDV4PAV5q2HrVaAwuEV4O62gADV6KwBAAa2FK4fP6yuSAFPOV4LUG0ei4/P6vVHwJBB0aDClUrqujJgSvBkgABWAWc43AV6SpBhkGAwcwrVOyGQV64AFV4hwEWIJlBAAqtxV49OOgUkgGjIYSvD1QMBnM/hwOBV5VsWANIWCcAhkMAwlIVwitQWAi0EV5CwCABR6BSB7AeV4t4WAUqkivH5yvCoEHhukV46wCAYNyzipOgwFFhkSAoUwzmW3SwDABq0LAAKwPO4acOCQgAFW66vM6ivIg8Ug8HV48ApFsWAVIywjCABkqDYIECqmGwFVql+zgAB4/AWKK7OWwYAE4yMVAEavEzivE0SuBV4SwCV4UNV5CqBtivEtnGvOk5ABB5/IAgOe5PPAAXW6wEC6AFBAAfQBAPX6GdyCxbAH7zGV5fUV5ENhwDB0avEuWWVIKuBV4K1B4CrB5+r0ulVoN5vN60gABBIILC0vPAYOk6AAD63XWAPO0fH5HOZ4PI4/H4IAE4AAFM4gAJVGQLKpyvHSIOi5yvHhsUnEGV5KsCAQdsy2d0l6p4ACp0kAYKzBAYNVWwKyCBIOeAwV6AAWAZ4IAFHAQANC4xeBDY4oRQwYACHBwPB5IAM5HCV5pBBV4kGg2BxCvGVoIaBDYSvDtlIlUqBIYABlS2DWAWkYAN6vK1BV4LIEq2lVqqfEUYwOG63XAAnV6inHAB7EHV4vKAAoHC6CvIlUAV5IABw6vHTgINCWQa4BXRCxDlUrAAKwBAAKmBvWl0uAWwIFDwKwEGoPIAAIDBWyYACDYQAB56uF6/WVy62JV4iwHV4+iSgSvMq2HhqvGABCjBV4gJEWwyyCAAayBAANWWAN7WgfP5Ok5/W5+kAA96vOkXYSlGABKvH66vnWBKvEzivEznO6gfBV4uHxADBV4ejV5K5KWYi1CgIHDV4IFEWga1CWAPQQwXPAAKqCqoABqwABvScC56vX56weV4alDWZKvCzgABQQVOgF4UASvGhsNV5skpwABUwiTBAwYICksllYJBAgMlBAIQCV4MqWwNODYNOpFzRYnWAAPQ0ivBVoV7AQOs6+s0ul1fJV5fO6yvG6yveRgKpEVQKtGV4XM5vH42iQgl4DwOpvHHEQOqBQMGgwDBwAKC5Gd0ZkI0meudyuWdztsWAoAJkquCAAiwBud5udzzvP1ek0igBwF6vSuCq8zlssmVdrus2et1iwM6CvHVzyvHWQavGCgSvI53O0fHVwOqqpoBNgV6UgoABz/DAgWYzGXAIOXyFsy1suVIWBwAIpCtBudPp8qBAMBVAIABwQAB0+DrGC02s6Gs1nXxOI0ywL5/WVwvOVbivMWA1O44ABV4150gACT4efAgQAEvV60wMCz6rBAgOZAgOZz2jzudYIOkqyuWkkqVgNV0qcBxACBwWs1um0yvBwICBVoKXCWINYrF8V5awBCwaudWYquO5Uq4+jAAOduaZBAAKpHAoIGCAYYVBwOlvV0VAOYugVG0fH0oQBlksmdWAAssqCgBp8rAAQGCqoPCIQOBQwYAE6GlvZSCFwN7veB0y/Bq8tmd7V4PJ6AABWo3OAAPPAYSQCAIIGDV9FJvKqDVYQANuYFEulJp9zzGeGRHJ53HqEshEIhMImdXq+BwIDBqwCBAYIAJIwSbBVous6Gsvd0qF0AQIvBhIuBltXgUCq6vB54YC6PQVw4AFVoavlWA10R4IAR0qvGz3DFQphC4QCBz2c4HAVwMPmaxBhEyToKqDAwQADmQABAwdQWIOlAAPQVoWlDoN7qKrBkymBVoIABgYBBAANY03RYwfX6HPJAPPAAamCAgYJDVzKvLWQquNz+fAodzpFIV4QkHVQIACAgLEBvdyV4MIhMzh6vCg4ABlcrAYUsVIIHBAAgMCgMBqF6vV0WoNQp8skwACqNKV4KqBABFYwQAD1jLB0vK6DTCAYIAFYASuaV5arBV4arJ4YUDAwOdBYarM4QHB6HR6Gm1stV4UAgUISwMAAAq0CBYIMGBAQACgUsUYMmkssVwUCgSvBAocDgYDCWwYDDlszmktltX6IABVwIACKQJVCAAfP53OV8SrCAAarKAAOludzBYPC5CpEAAKpC5HBzt6q1WliIBq8tgSOBpCvCABilFABKbBAAamCAAILBVwIQHAAy7CWYK0Bvmm0/R0+C04ABvmCvl7AAOBwIDBwGkV9AOHToOey4ABVwKpEVgueudOznApyUDTgyvNVh6vIAA42BDaKzCBIUmk8nagUmlrRCkoADAoKvqTIQABVQPB4Od4SmBVwnCBQNzudISYavBkiYCleAUIqvCBwSwRQQKvTcwYUFBJILDfoagBqFPq2r6Gl0ejzoABAgWcV8oECVAOXVoKrBWQSoCAAeeHgOWSopYCV4kA0mjpyvF3SvMWJCFEWZcDAQNQ0ulEY0Dvel596Fw4EBk3PMYN4zvP6oAB63X63V6aoXV6CxF5SoCAAaqGp6PCSoOWLYhhD4HANAlyV5FIV5jTDUwy+JWAcCk2kNYPHzud0gAD0Z6G0l6p8lgEkvILEVgIAC66wB5yvqWIisG4WeuaKHkivEAAvGV4kk42cWAkky26vFOAIKyOYBywEXwPGAAfMPp4BCBIyxBVoIACV+DzBkgACNAqvGyyvK4wECvGcAAlyZIW6A4isbAA3H5iwEWKAAI5nOVwfWV9KrCAAaqDNZCvF3SvJ4HGuWcPAoADuWWDQOWticRG4oHCgQADBwclR4IyFRDCvE63VVzyvFVQwAETRBvCA4tIV5WcWAIAKuW63StMTwgACgYABWwgPHWQMA46vEVrIAB53WVwPU6fTVrquBVZavNAA6vQ0WcvFyp0kBwavBAwivFTpCvDUYQPJBgVy4ywCTQyuURYKvB6vS6nVSQKuaVofEVpfL5avd4HAzlIDJMk4CvIVwizIWAgAMknHdASwB461BV6vN6quBV4KuB63W6qvZ5+g0OgAQemAAunAAavT3VyvGc0XGvCvEDRgZBV4ypGAoisCVpwOCk3CWAgADWCXM53VVoIABVgIDCV7fKVQSlEABKvTy3AMYJnBzivXVgKuGACq+El18z/I4/I0oAB5HI53ORCHOVAQAFVwIdRE5XJVwKwOV6nG5nNWAN4V6EkV4iuDWTyzBl9Zvt8vmDAAem02s56HP56uJVbICC5/PVppNBV62c0WiVwavCUASvLVxKwUgYACAwcRiM7ndfr6vEAASwBPgQAK5nO6ytG6gYNVxel5PQdQIABUYKoFAAQGEV6ikHkivBDRivBkiuJV6awEgcKiMXi6vBWAoEE02lS5fMAAPN6qxE6itXAAPIvilGAByIFuWc43G4/GV5CfHkm64CgBV5lyV7SrEVoULVwSwDVQKsCAgYFBwWlRZawC53WWAava52fwSvYkmc4CuBAAVOV6auKV4VIgCwSUYKtIhQABiKuEWA4AFV4PORx3O6qvC6vU54XOABPI0qvYp3AV9AOCVp6qHVoarCVw6wDWRGCS4IACVxXN5nOV4QAC56vXEYOlV69IV66gBV5i+B3SuGVZKvKVoSrIAAarGAAWD1ivEUoKyI5nN6qvF6qdHZ4jUIA4PJ0umV68kziwCzmcuSVFV5tIV5VsV4SuEWJqtGhatNi87weJV5GC02m0urAA3PAAKUB5nM6vWVoXW6qfF0l7wSQHFIIAEB5AACwQABV5iiBkiVKV4PABZGW3VODJe02kkV46wJVwsEVwSvMnasHWQwALwXOV4PM6iuCAoXPV4emDxgAbRxQAGtivB0ivJpAZKkm03VzVp6uChQAEhawDWJqyOABWr5yjB6yvC5vU63WXYILB06qjHIivTzkkV6tI3W6kiuPWIcEVgQACV4ayIBIc1V7Gs6CnBVwKwCAoKvBVwPN1iqgfgJUCAYSvTywLIV5+0gCuLgYAGVwqvMLwIADVy+DxPRVoYAE6vNWAPM5ymWV5awDV6aVBV5OQV5kk2m0pCuKWAUKhStCVwywCi6yGiKpEV7NfwXQVo3W6vMV4fS1ilKvtZU4QwOVgKuDjqvV3SvWpCvEUwKyJVoSsHV4YAILYQDBV4KxYwWr63U6fU6yuB6nMAAPNV4PM5yvKVZ6vFKIQADV6fAV5UkDJVsV4MkVQSuCWIisBVxqvKWIiwDV62D56nC6SvCVQQAE5umVIqvUCQZXHV6ikItivMpGQyCvCVgoACVoQABV7CsCV7OJ6yjD6HR6CtGWwOCSoKdHbqKvCnb/CAAavS2ivY2m0pCqCVoisBAAMEV4SwLV6SwW1vPUQPO5/Q6HOVgnO53T51YCwdZvodErM1HYoGGCYhOGi/ISBaVFyFsBZCvNtivCVwSvDVyavNAAsRWCur6XMUQPP5/U6QAB6fUAAXPwaoFAAKcLABpUEiPA42cpyvPUZKvBpAZKkmQ2kkVoKuDWAivQWJoAECIs1mp4LBgVX1CpD6YECAwfU6utZpitWAAmcznA4F4V5tsBZSvMBoKvCVgYEEgatQWCZ7TAAWCVYSuD6fV6nT5vU1iuMV6cXJ4+i43GzlOV5qiKki7KV4e6p6pDAAkDV4SteQR6KKr+C1Wq5+q1PV63X6+Ir01mrVWABU1KAYoBiPOAAOkvN4kiVKtivKABqvCkkBVo6uBVp6uPV4RpDCJZvBTQ4JBiAOBWwOJxNlZJkXAAivSewtli6vC5HH0fHAAOjWY9IV7EktlsAgKwIV8IAMEY5+GRySxLACpGCV4SxDWAdypyvFXA6wSuQbBV4ywBhSwQV7gAGUBYAFBooQDCgyjQABasB5vNVogABzt4zudvN4vFOWwoASpGW4FIVwMDV40EWAIAOWis1ABSsQACOD1s7VhZTEKpStBV4qxC0SzCAAd4V68kuWWgCvBAAMBAAKvDWCBbGAA60LPYSrGABijGBZVerwNBV5KxDAAavNWAS0H0S0DkivWpFyuQEBVgQADV4SuPV54ASYRYAGms1XhICDABCvFBgyvNAAyyF0eizl4pCvVyGWDAKvHgSvzWKgACTYoNLUok1Bgq8DV6a1H42i4wCBvFOki0UV4ywBgawDQIQDCV9MRwder1fACqUKADSvRWQizBAAQGC0ejWqKvGWAIABgizDABCvihWDTQazBAANZAQNYAAIJDYIYGEDYODxOJnadLmoABYwIRLhavUWxKvIUASkEAoIHCWxAPCWoS2CAAQFBVTptDAoZ/BWQaiGAB2DwSzBncXAAinCAAsXYBcL53OV7Ok0krmUHVwsAwGAAYNVUYSqFCgyyDWwwADXIcKAAKnRNxKyDCRM1AASXIB4Q8NHBavKAASyZAAOjAggFC0Wc44AD0YCBGAMxV5oAIW4x1cZxwhCCKCqUAAkKV4iyeAAnMBZV5VwqvCToSlHVYwAEhQAGRKIASYQgqKVjCuChXN0ej5qzHWsYACAoN4pwABkiwEU5KrIAAMJV0EKndfnYABQo4LBiEKhI0BiE0mlYAAdZmg4CV694AASwCWY6ue4yvEAIS0C42idQOjv8rgKzJWA0EVDDHHhUEV4IABweDwQAJ0wAC1gAB6AAD6ODIAKvb0asGWIujAIOiRQPHVyamB4wABVYYCDAAroBp6xBWYa3GVwKtYAAMRiCxIiAADmoADmk0BAKJBB4gABBgIOCIISuXV4iwDRwfOzmiAIQREAASwTWoymCVwwACvMAgCxDWoqxEAASXIggABAoihCiMXi6YCAAkLSIIVCAYTDBbx4PEVzEJp1OT44AP0SpSAgqlD4wAH0auBAASuGWIq0HABsJiCvBAA6wBWIazEBIYAVVqKuBgavBuSeFuS5DuQMEAoujVBapFAAizFzlIpEkAQOcvCtEWA6zEWS8JAAJyDAAcQiK2GA4SHCTgYaHYQq0ODopACIoKlBAAVyqgGEvAGEVoKuCAQOiVxSpGABXGbwQnCzlyV46xJWQ6vPWYy0DhMQV4s7AANfxNfWIQAQYATFOHQavHAByLCXYKuQWiK4EWQMkWB6yFV6h4CgkEgYEBVIQAHiEQV6SyFVhYDBIIivTAAd40SgB5vGAAKvE46rBAgQMBWKoABzmcvC0DVIYGFVywADQAsXAAkRiKrWVwivGVYQAFHgRWBVqtyAQV4uQFEXAKnCSYWiSgIHBW4IAY40rV4gAEVwSwFhSlHOhCfYADCvKKoSvVXht4VQN4p1IAAOcVSzFD5vGgAABWBC4IWgh7MUUcLAAatMegiuCV8YAEVwUkV4vNAAKqKABGjV4QARWIIACNggADVkKoDiIAFVQ6sGVokCgMAkgAQlUqWK1yzgAD0Wj0eizl4AAITEp150mdBQIVC43HCYVyCII+BVZIADMogALXhK9XiAAFVBCqGVwivBADrNRAAS5BAASuFp1yAAOWAYeWznAAAnGAAmjvMqWDDAYABwiKJAiqfYVISNZYVsX4OcpAuGNYoAGWrImMABx9LA="))
diff --git a/apps/boxclk/boxclk-1.json b/apps/boxclk/boxclk-1.json
new file mode 100644
index 000000000..99e225f04
--- /dev/null
+++ b/apps/boxclk/boxclk-1.json
@@ -0,0 +1,88 @@
+{
+  "time": {
+    "font": "6x8",
+    "fontSize": 3,
+    "outline": 2,
+    "color": "#0ff",
+    "outlineColor": "#00f",
+    "border": "#0f0",
+    "xPadding": -1,
+    "yPadding": -2.5,
+    "xOffset": 2,
+    "yOffset": 0,
+    "boxPos": {
+      "x": "0.33",
+      "y": "0.29"
+    }
+  },
+  "meridian": {
+    "font": "6x8",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#FF9900",
+    "outlineColor": "fg",
+    "border": "#0ff",
+    "xPadding": -0.5,
+    "yPadding": -1.5,
+    "xOffset": 2,
+    "yOffset": 1,
+    "boxPos": {
+      "x": "0.34",
+      "y": "0.46"
+    },
+    "short": false
+  },
+  "dow": {
+    "font": "6x8",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#000",
+    "outlineColor": "#fff",
+    "border": "#0f0",
+    "xPadding": -0.5,
+    "yPadding": -0.5,
+    "xOffset": 1,
+    "yOffset": 1,
+    "boxPos": {
+      "x": "0.5",
+      "y": "0.82"
+    }
+  },
+  "step": {
+    "font": "6x8",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#000",
+    "outlineColor": "#fff",
+    "border": "#0f0",
+    "xPadding": -0.5,
+    "yPadding": 0.5,
+    "xOffset": 1,
+    "yOffset": 1,
+    "boxPos": {
+      "x": "0.5",
+      "y": "0.71"
+    },
+    "prefix": "Steps: "
+  },
+  "batt": {
+    "font": "4x6",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#0ff",
+    "outlineColor": "#00f",
+    "border": "#0f0",
+    "xPadding": -0.5,
+    "yPadding": -0.5,
+    "xOffset": 1,
+    "yOffset": 1,
+    "boxPos": {
+      "x": "0.87",
+      "y": "0.87"
+    },
+    "suffix": "%"
+  },
+  "bg": {
+    "img": "boxclk.space.img"
+  }
+}
diff --git a/apps/boxclk/boxclk-2.json b/apps/boxclk/boxclk-2.json
new file mode 100644
index 000000000..64b842f1c
--- /dev/null
+++ b/apps/boxclk/boxclk-2.json
@@ -0,0 +1,87 @@
+{
+  "time": {
+    "font": "6x8",
+    "fontSize": 5,
+    "outline": 3,
+    "color": "bgH",
+    "outlineColor": "fg",
+    "border": "#f0f",
+    "xPadding": -2,
+    "yPadding": -4.5,
+    "xOffset": 3,
+    "yOffset": 0,
+    "boxPos": {
+      "x": "0.5",
+      "y": "0.33"
+    }
+  },
+  "dow": {
+    "font": "6x8",
+    "fontSize": 3,
+    "outline": 1,
+    "color": "#5ccd73",
+    "outlineColor": "fg",
+    "border": "#f0f",
+    "xPadding": -1,
+    "yPadding": 0.5,
+    "xOffset": 2,
+    "yOffset": 0,
+    "boxPos": {
+      "x": "0.5",
+      "y": "0.57"
+    },
+    "short": false
+  },
+  "date": {
+    "font": "6x8",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#5ccd73",
+    "outlineColor": "fg",
+    "border": "#f0f",
+    "xPadding": -0.5,
+    "yPadding": 0.5,
+    "xOffset": 1,
+    "yOffset": 0,
+    "boxPos": {
+      "x": "0.5",
+      "y": "0.75"
+    },
+    "shortMonth": false,
+    "disableSuffix": true
+  },
+  "step": {
+    "font": "4x6",
+    "fontSize": 3,
+    "outline": 2,
+    "color": "bgH",
+    "outlineColor": "fg",
+    "border": "#f0f",
+    "xPadding": -1,
+    "yPadding": 0.5,
+    "xOffset": 2,
+    "yOffset": 1,
+    "boxPos": {
+      "x": "0.5",
+      "y": "0.92"
+    },
+    "prefix": "Steps: "
+  },
+  "batt": {
+    "font": "4x6",
+    "fontSize": 3,
+    "outline": 2,
+    "color": "bgH",
+    "outlineColor": "fg",
+    "border": "#f0f",
+    "xPadding": -1,
+    "yPadding": -1,
+    "xOffset": 2,
+    "yOffset": 2,
+    "boxPos": {
+      "x": "0.85",
+      "y": "0.08"
+    },
+    "suffix": "%"
+  }
+}
diff --git a/apps/boxclk/boxclk.json b/apps/boxclk/boxclk.json
new file mode 100644
index 000000000..51a67ebd6
--- /dev/null
+++ b/apps/boxclk/boxclk.json
@@ -0,0 +1,60 @@
+{
+  "time": {
+    "font": "BrunoAce",
+    "fontSize": 1,
+    "outline": 2,
+    "color": "#000",
+    "outlineColor": "#fff",
+    "border": "#000",
+    "xPadding": 0,
+    "yPadding": -4,
+    "xOffset": 0,
+    "yOffset": 3,
+    "boxPos": { "x": 0.633, "y": 0.16 }
+  },
+  "dow": {
+    "font": "6x8",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#000",
+    "outlineColor": "#fff",
+    "border": "#000",
+    "xPadding": -0.5,
+    "yPadding": 0.5,
+    "xOffset": 1,
+    "yOffset": 1,
+    "boxPos": { "x": 0.633, "y": 0.3 },
+    "short": false
+  },
+  "date": {
+    "font": "6x8",
+    "fontSize": 1,
+    "outline": 1,
+    "color": "#000",
+    "outlineColor": "#fff",
+    "border": "#000",
+    "xPadding": 0,
+    "yPadding": 0.5,
+    "xOffset": 1,
+    "yOffset": 1,
+    "boxPos": { "x": 0.633, "y": 0.39 },
+    "short": false
+  },
+  "batt": {
+    "font": "4x6",
+    "fontSize": 2,
+    "outline": 1,
+    "color": "#0ff",
+    "outlineColor": "#000",
+    "border": "#fff",
+    "xPadding": -0.5,
+    "yPadding": -0.5,
+    "xOffset": 1,
+    "yOffset": 1,
+    "boxPos": { "x": 0.9, "y": 0.95 },
+    "suffix": "%"
+  },
+  "bg": {
+    "img": "boxclk.beachhouse.img"
+  }
+}
diff --git a/apps/boxclk/boxclk.space.img b/apps/boxclk/boxclk.space.img
new file mode 100644
index 000000000..1708b5c24
Binary files /dev/null and b/apps/boxclk/boxclk.space.img differ
diff --git a/apps/boxclk/icon.js b/apps/boxclk/icon.js
new file mode 100644
index 000000000..f6f4412c6
--- /dev/null
+++ b/apps/boxclk/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEogA/AEB5TCwVAC6aOCoED/4AQmAXDh4XR+AX5+URgERl4XR+KGEj4XP+cAgMz/8ziEAn4XOkEBCIfziECC5ouBl/zkMAiU/+QwGC4/wE4MgLwQFCQgoXHiEfO4Mj/8yO4PxgIXMHwMggb+DgRQBC5fygIPBn4xBiYFCiDDEC43xgfyLQJfCGoMvmDCEC5ABCVIJlBCoIXM+EPAIRgBAQIIDC542DC53xT4MfC4cCBAanLBQaWDBIgXo+YXXdgoXQbQcBd5YXHiAYHC5wAC+UQe4IXTDAMABAQXEgYPEiDQEAATdBAYMwC4ZUCK4aLHSoIACC5IuHSogXKCxAXHogXTCwQAFC5YUIC7b/EC6TFFC6IwJC5itBcwQXUbI7vBC5bFGAAgXMDBQXNJIQXUGBEEBog="))
diff --git a/apps/boxclk/metadata.json b/apps/boxclk/metadata.json
new file mode 100644
index 000000000..dd81ac436
--- /dev/null
+++ b/apps/boxclk/metadata.json
@@ -0,0 +1,26 @@
+{
+  "id": "boxclk",
+  "name": "Box Clock",
+  "version": "0.05",
+  "description": "A customizable clock with configurable text boxes that can be positioned to show your favorite background",
+  "icon": "app.png",
+  "screenshots": [
+    {"url":"screenshot.png"},
+    {"url":"screenshot-1.png"},
+    {"url":"screenshot-2.png"}
+  ],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "allow_emulator": true,
+  "storage": [
+    {"name":"boxclk.app.js","url":"app.js"},
+    {"name":"boxclk.settings.js","url":"settings.js"},
+    {"name":"boxclk.img","url":"icon.js","evaluate":true},
+    {"name":"boxclk.beachhouse.img","url":"beachhouse.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"boxclk.json","url":"boxclk.json"}
+  ]
+}
diff --git a/apps/boxclk/screenshot-1.png b/apps/boxclk/screenshot-1.png
new file mode 100644
index 000000000..c6e22d262
Binary files /dev/null and b/apps/boxclk/screenshot-1.png differ
diff --git a/apps/boxclk/screenshot-2.png b/apps/boxclk/screenshot-2.png
new file mode 100644
index 000000000..b7a73d66a
Binary files /dev/null and b/apps/boxclk/screenshot-2.png differ
diff --git a/apps/boxclk/screenshot.png b/apps/boxclk/screenshot.png
new file mode 100644
index 000000000..12ccee5e2
Binary files /dev/null and b/apps/boxclk/screenshot.png differ
diff --git a/apps/boxclk/settings.js b/apps/boxclk/settings.js
new file mode 100644
index 000000000..e35db455d
--- /dev/null
+++ b/apps/boxclk/settings.js
@@ -0,0 +1,94 @@
+(function () {
+  let storage = require("Storage");
+  let fileRegex = /^boxclk-(\d+)\.json$/;
+  let selectedConfig;
+  let configs = {};
+  let hasDefaultConfig = false;
+
+  function getNextConfigNumber() {
+    let maxNumber = 0;
+    storage.list().forEach(file => {
+      let match = file.match(fileRegex);
+      if (match) {
+        let number = parseInt(match[1]);
+        if (number > maxNumber) {
+          maxNumber = number;
+        }
+      }
+    });
+    return maxNumber + 1;
+  }
+
+  function handleSelection(config) {
+    return function () {
+      selectedConfig = config === "Default" ? 0 : config;
+      menu["Cfg:"].value = selectedConfig === 0 ? "Default" : selectedConfig;
+      E.showMenu(menu);
+
+      // Retrieve existing data and update selectedConfig
+      let defaultConfig = storage.readJSON("boxclk.json", 1) || {};
+      defaultConfig.selectedConfig = selectedConfig;
+      storage.writeJSON("boxclk.json", defaultConfig);
+    };
+  }
+
+  let configFiles = [];
+  storage.list().forEach(file => {
+    let match = file.match(fileRegex);
+    if (match) {
+      configFiles.push({ file: file, number: parseInt(match[1]) });
+    } else if (file === "boxclk.json") {
+      hasDefaultConfig = true;
+      let defaultConfig = storage.readJSON(file, 1);
+      if (defaultConfig && defaultConfig.selectedConfig != null) {
+        // Check if corresponding config file exists
+        let configFileName = 'boxclk-' + defaultConfig.selectedConfig + '.json';
+        if (storage.read(configFileName)) {
+          // If it exists, assign selectedConfig
+          selectedConfig = defaultConfig.selectedConfig;
+        } else {
+          // If it does not exist, set selectedConfig to 0 and update boxclk.json
+          defaultConfig.selectedConfig = 0;
+          storage.writeJSON("boxclk.json", defaultConfig);
+          selectedConfig = 0;
+        }
+      }
+    }
+  });
+
+  // Sort the config files by number
+  configFiles.sort((a, b) => a.number - b.number);
+
+  configFiles.forEach(configFile => {
+    configs[configFile.number] = handleSelection(configFile.number);
+  });
+
+  if (!selectedConfig) {
+    if (hasDefaultConfig) {
+      selectedConfig = "Default";
+    } else {
+      let nextConfigNumber = getNextConfigNumber();
+      selectedConfig = nextConfigNumber.toString();
+      configs[selectedConfig] = handleSelection(selectedConfig);
+    }
+  }
+
+  let menu = {
+    '': { 'title': '-- Box Clock --' },
+    '< Back': () => Bangle.showClock(),
+    'Cfg:': {
+              value: selectedConfig === 0 ? "Default" : selectedConfig,
+              format: () => selectedConfig === 0 ? "Default" : selectedConfig
+            }
+  };
+
+  if (hasDefaultConfig) {
+    menu['Default'] = handleSelection('Default');
+  }
+
+  Object.keys(configs).forEach(config => {
+    menu[config] = handleSelection(config);
+  });
+
+  E.showMenu(menu);
+});
diff --git a/apps/btadv/ChangeLog b/apps/btadv/ChangeLog
new file mode 100644
index 000000000..1a3bc1757
--- /dev/null
+++ b/apps/btadv/ChangeLog
@@ -0,0 +1 @@
+0.01: New app!
diff --git a/apps/btadv/README.md b/apps/btadv/README.md
new file mode 100644
index 000000000..7b1afcefe
--- /dev/null
+++ b/apps/btadv/README.md
@@ -0,0 +1,16 @@
+# Bluetooth Advert
+
+This app advertises and exports (over Bluetooth) live data from the bangle's sensors:
+
+- Heart Rate
+- Accelerometer readings
+- Pressure
+- GPS information
+- Magnetic flux
+
+Swipe in any direction to access settings, and tap a setting to toggle it.
+Hit back to return to the details screen, which shows sensor data being exported.
+
+# TypeScript
+
+This app is written in TypeScript, see [typescript/README.md](/typescript/README.md) for more info
diff --git a/apps/btadv/app.js b/apps/btadv/app.js
new file mode 100644
index 000000000..670691fb9
--- /dev/null
+++ b/apps/btadv/app.js
@@ -0,0 +1,413 @@
+{
+    var __assign = Object.assign;
+    var Layout_1 = require("Layout");
+    Bangle.loadWidgets();
+    Bangle.drawWidgets();
+    var HRM_MIN_CONFIDENCE_1 = 75;
+    var services_1 = ["0x180d", "0x181a", "0x1819"];
+    var acc_1;
+    var bar_1;
+    var gps_1;
+    var hrm_1;
+    var hrmAny_1;
+    var mag_1;
+    var btnsShown_1 = false;
+    var prevBtnsShown_1 = undefined;
+    var hrmAnyClear_1;
+    var settings_1 = {
+        bar: false,
+        gps: false,
+        hrm: false,
+        mag: false,
+    };
+    var idToName = {
+        acc: "Acceleration",
+        bar: "Barometer",
+        gps: "GPS",
+        hrm: "HRM",
+        mag: "Magnetometer",
+    };
+    var infoFont_1 = "6x8:2";
+    var colour_1 = {
+        on: "#0f0",
+        off: "#fff",
+    };
+    var makeToggle = function (id) { return function () {
+        settings_1[id] = !settings_1[id];
+        var entry = btnLayout_1[id];
+        var col = settings_1[id] ? colour_1.on : colour_1.off;
+        entry.btnBorder = entry.col = col;
+        btnLayout_1.update();
+        btnLayout_1.render();
+        enableSensors_1();
+    }; };
+    var btnStyle = {
+        font: "Vector:14",
+        fillx: 1,
+        filly: 1,
+        col: g.theme.fg,
+        bgCol: g.theme.bg,
+        btnBorder: "#fff",
+    };
+    var btnLayout_1 = new Layout_1({
+        type: "v",
+        c: [
+            {
+                type: "h",
+                c: [
+                    __assign({ type: "btn", label: idToName.bar, id: "bar", cb: makeToggle('bar') }, btnStyle),
+                    __assign({ type: "btn", label: idToName.gps, id: "gps", cb: makeToggle('gps') }, btnStyle),
+                ]
+            },
+            {
+                type: "h",
+                c: [
+                    __assign({ type: "btn", label: idToName.hrm, id: "hrm", cb: makeToggle('hrm') }, btnStyle),
+                    __assign({ type: "btn", label: idToName.mag, id: "mag", cb: makeToggle('mag') }, btnStyle),
+                ]
+            },
+            {
+                type: "h",
+                c: [
+                    __assign(__assign({ type: "btn", label: idToName.acc, id: "acc", cb: function () { } }, btnStyle), { col: colour_1.on, btnBorder: colour_1.on }),
+                    __assign({ type: "btn", label: "Back", cb: function () {
+                            setBtnsShown_1(false);
+                        } }, btnStyle),
+                ]
+            }
+        ]
+    }, {
+        lazy: true,
+        back: function () {
+            setBtnsShown_1(false);
+        },
+    });
+    var setBtnsShown_1 = function (b) {
+        btnsShown_1 = b;
+        hook_1(!btnsShown_1);
+        setIntervals_1();
+        redraw_1();
+    };
+    var drawInfo_1 = function (force) {
+        var _a = Bangle.appRect, y = _a.y, x = _a.x, w = _a.w;
+        var mid = x + w / 2;
+        var drawn = false;
+        if (!force && !bar_1 && !gps_1 && !hrm_1 && !mag_1)
+            return;
+        g.reset()
+            .clearRect(Bangle.appRect)
+            .setFont(infoFont_1)
+            .setFontAlign(0, -1);
+        if (bar_1) {
+            g.drawString("".concat(bar_1.altitude.toFixed(1), "m"), mid, y);
+            y += g.getFontHeight();
+            g.drawString("".concat(bar_1.pressure.toFixed(1), " hPa"), mid, y);
+            y += g.getFontHeight();
+            g.drawString("".concat(bar_1.temperature.toFixed(1), "C"), mid, y);
+            y += g.getFontHeight();
+            drawn = true;
+        }
+        if (gps_1) {
+            g.drawString("".concat(gps_1.lat.toFixed(4), " lat, ").concat(gps_1.lon.toFixed(4), " lon"), mid, y);
+            y += g.getFontHeight();
+            g.drawString("".concat(gps_1.alt, "m (").concat(gps_1.satellites, " sat)"), mid, y);
+            y += g.getFontHeight();
+            drawn = true;
+        }
+        if (hrm_1) {
+            g.drawString("".concat(hrm_1.bpm, " BPM (").concat(hrm_1.confidence, "%)"), mid, y);
+            y += g.getFontHeight();
+            drawn = true;
+        }
+        else if (hrmAny_1) {
+            g.drawString("~".concat(hrmAny_1.bpm, " BPM (").concat(hrmAny_1.confidence, "%)"), mid, y);
+            y += g.getFontHeight();
+            drawn = true;
+            if (!settings_1.hrm && !hrmAnyClear_1) {
+                hrmAnyClear_1 = setTimeout(function () {
+                    hrmAny_1 = undefined;
+                    hrmAnyClear_1 = undefined;
+                }, 10000);
+            }
+        }
+        if (mag_1) {
+            g.drawString("".concat(mag_1.x, " ").concat(mag_1.y, " ").concat(mag_1.z), mid, y);
+            y += g.getFontHeight();
+            g.drawString("heading: ".concat(mag_1.heading.toFixed(1)), mid, y);
+            y += g.getFontHeight();
+            drawn = true;
+        }
+        if (!drawn) {
+            if (!force || Object.values(settings_1).every(function (x) { return !x; })) {
+                g.drawString("swipe to enable", mid, y);
+            }
+            else {
+                g.drawString("events pending", mid, y);
+            }
+            y += g.getFontHeight();
+        }
+    };
+    var onTap_1 = function () {
+        setBtnsShown_1(true);
+    };
+    var redraw_1 = function () {
+        if (btnsShown_1) {
+            if (!prevBtnsShown_1) {
+                prevBtnsShown_1 = btnsShown_1;
+                Bangle.removeListener("swipe", onTap_1);
+                btnLayout_1.setUI();
+                btnLayout_1.forgetLazyState();
+                g.clearRect(Bangle.appRect);
+            }
+            btnLayout_1.render();
+        }
+        else {
+            if (prevBtnsShown_1) {
+                prevBtnsShown_1 = btnsShown_1;
+                Bangle.setUI();
+                Bangle.on("swipe", onTap_1);
+                drawInfo_1(true);
+            }
+            else {
+                drawInfo_1();
+            }
+        }
+    };
+    var encodeHrm_1 = function (hrm) {
+        return [0, hrm.bpm];
+    };
+    encodeHrm_1.maxLen = 2;
+    var encodePressure_1 = function (data) {
+        return toByteArray_1(Math.round(data.pressure * 10), 4, false);
+    };
+    encodePressure_1.maxLen = 4;
+    var encodeElevation_1 = function (data) {
+        return toByteArray_1(Math.round(data.altitude * 100), 3, true);
+    };
+    encodeElevation_1.maxLen = 3;
+    var encodeTemp_1 = function (data) {
+        return toByteArray_1(Math.round(data.temperature * 10), 2, true);
+    };
+    encodeTemp_1.maxLen = 2;
+    var encodeGps_1 = function (data) {
+        var speed = toByteArray_1(Math.round(1000 * data.speed / 36), 2, false);
+        var lat = toByteArray_1(Math.round(data.lat * 10000000), 4, true);
+        var lon = toByteArray_1(Math.round(data.lon * 10000000), 4, true);
+        var elevation = toByteArray_1(Math.round(data.alt * 100), 3, true);
+        var heading = toByteArray_1(Math.round(data.course * 100), 2, false);
+        return [
+            157,
+            2,
+            speed[0], speed[1],
+            lat[0], lat[1], lat[2], lat[3],
+            lon[0], lon[1], lon[2], lon[3],
+            elevation[0], elevation[1], elevation[2],
+            heading[0], heading[1]
+        ];
+    };
+    encodeGps_1.maxLen = 17;
+    var encodeGpsHeadingOnly_1 = function (data) {
+        var heading = toByteArray_1(Math.round(data.heading * 100), 2, false);
+        return [
+            16,
+            16,
+            heading[0], heading[1]
+        ];
+    };
+    encodeGpsHeadingOnly_1.maxLen = 17;
+    var encodeMag_1 = function (data) {
+        var x = toByteArray_1(data.x, 2, true);
+        var y = toByteArray_1(data.y, 2, true);
+        var z = toByteArray_1(data.z, 2, true);
+        return [x[0], x[1], y[0], y[1], z[0], z[1]];
+    };
+    encodeMag_1.maxLen = 6;
+    var toByteArray_1 = function (value, numberOfBytes, isSigned) {
+        var byteArray = new Array(numberOfBytes);
+        if (isSigned && (value < 0)) {
+            value += 1 << (numberOfBytes * 8);
+        }
+        for (var index = 0; index < numberOfBytes; index++) {
+            byteArray[index] = (value >> (index * 8)) & 0xff;
+        }
+        return byteArray;
+    };
+    var enableSensors_1 = function () {
+        Bangle.setBarometerPower(settings_1.bar, "btadv");
+        if (!settings_1.bar)
+            bar_1 = undefined;
+        Bangle.setGPSPower(settings_1.gps, "btadv");
+        if (!settings_1.gps)
+            gps_1 = undefined;
+        Bangle.setHRMPower(settings_1.hrm, "btadv");
+        if (!settings_1.hrm)
+            hrm_1 = hrmAny_1 = undefined;
+        Bangle.setCompassPower(settings_1.mag, "btadv");
+        if (!settings_1.mag)
+            mag_1 = undefined;
+    };
+    var haveServiceData_1 = function (serv) {
+        switch (serv) {
+            case "0x180d": return !!hrm_1;
+            case "0x181a": return !!(bar_1 || mag_1);
+            case "0x1819": return !!(gps_1 && gps_1.lat && gps_1.lon || mag_1);
+        }
+    };
+    var serviceToAdvert_1 = function (serv, initial) {
+        var _a, _b, _c;
+        if (initial === void 0) { initial = false; }
+        switch (serv) {
+            case "0x180d":
+                if (hrm_1 || initial) {
+                    var o = {
+                        maxLen: encodeHrm_1.maxLen,
+                        readable: true,
+                        notify: true,
+                    };
+                    if (hrm_1) {
+                        o.value = encodeHrm_1(hrm_1);
+                        hrm_1 = undefined;
+                    }
+                    return _a = {}, _a["0x2a37"] = o, _a;
+                }
+                return {};
+            case "0x1819":
+                if (gps_1 || initial) {
+                    var o = {
+                        maxLen: encodeGps_1.maxLen,
+                        readable: true,
+                        notify: true,
+                    };
+                    if (gps_1) {
+                        o.value = encodeGps_1(gps_1);
+                        gps_1 = undefined;
+                    }
+                    return _b = {}, _b["0x2a67"] = o, _b;
+                }
+                else if (mag_1) {
+                    var o = {
+                        maxLen: encodeGpsHeadingOnly_1.maxLen,
+                        readable: true,
+                        notify: true,
+                        value: encodeGpsHeadingOnly_1(mag_1),
+                    };
+                    return _c = {}, _c["0x2a67"] = o, _c;
+                }
+                return {};
+            case "0x181a": {
+                var o = {};
+                if (bar_1 || initial) {
+                    o["0x2a6c"] = {
+                        maxLen: encodeElevation_1.maxLen,
+                        readable: true,
+                        notify: true,
+                    };
+                    o["0x2A1F"] = {
+                        maxLen: encodeTemp_1.maxLen,
+                        readable: true,
+                        notify: true,
+                    };
+                    o["0x2a6d"] = {
+                        maxLen: encodePressure_1.maxLen,
+                        readable: true,
+                        notify: true,
+                    };
+                    if (bar_1) {
+                        o["0x2a6c"].value = encodeElevation_1(bar_1);
+                        o["0x2A1F"].value = encodeTemp_1(bar_1);
+                        o["0x2a6d"].value = encodePressure_1(bar_1);
+                        bar_1 = undefined;
+                    }
+                }
+                if (mag_1 || initial) {
+                    o["0x2aa1"] = {
+                        maxLen: encodeMag_1.maxLen,
+                        readable: true,
+                        notify: true,
+                    };
+                    if (mag_1) {
+                        o["0x2aa1"].value = encodeMag_1(mag_1);
+                    }
+                }
+                return o;
+            }
+        }
+    };
+    var getBleAdvert_1 = function (map, all) {
+        if (all === void 0) { all = false; }
+        var advert = {};
+        for (var _i = 0, services_2 = services_1; _i < services_2.length; _i++) {
+            var serv = services_2[_i];
+            if (all || haveServiceData_1(serv)) {
+                advert[serv] = map(serv);
+            }
+        }
+        mag_1 = undefined;
+        return advert;
+    };
+    var updateServices_1 = function () {
+        var newAdvert = getBleAdvert_1(serviceToAdvert_1);
+        NRF.updateServices(newAdvert);
+    };
+    var onAccel_1 = function (newAcc) { return acc_1 = newAcc; };
+    var onPressure_1 = function (newBar) { return bar_1 = newBar; };
+    var onGPS_1 = function (newGps) { return gps_1 = newGps; };
+    var onHRM_1 = function (newHrm) {
+        if (newHrm.confidence >= HRM_MIN_CONFIDENCE_1)
+            hrm_1 = newHrm;
+        hrmAny_1 = newHrm;
+    };
+    var onMag_1 = function (newMag) { return mag_1 = newMag; };
+    var hook_1 = function (enable) {
+        if (enable) {
+            Bangle.on("accel", onAccel_1);
+            Bangle.on("pressure", onPressure_1);
+            Bangle.on("GPS", onGPS_1);
+            Bangle.on("HRM", onHRM_1);
+            Bangle.on("mag", onMag_1);
+        }
+        else {
+            Bangle.removeListener("accel", onAccel_1);
+            Bangle.removeListener("pressure", onPressure_1);
+            Bangle.removeListener("GPS", onGPS_1);
+            Bangle.removeListener("HRM", onHRM_1);
+            Bangle.removeListener("mag", onMag_1);
+        }
+    };
+    var setIntervals_1 = function (locked, connected) {
+        if (locked === void 0) { locked = Bangle.isLocked(); }
+        if (connected === void 0) { connected = NRF.getSecurityStatus().connected; }
+        changeInterval(redrawInterval_1, locked ? 15000 : 5000);
+        if (connected) {
+            var interval = btnsShown_1 ? 5000 : 1000;
+            if (bleInterval_1) {
+                changeInterval(bleInterval_1, interval);
+            }
+            else {
+                bleInterval_1 = setInterval(updateServices_1, interval);
+            }
+        }
+        else if (bleInterval_1) {
+            clearInterval(bleInterval_1);
+            bleInterval_1 = undefined;
+        }
+    };
+    var redrawInterval_1 = setInterval(redraw_1, 1000);
+    Bangle.on("lock", function (locked) { return setIntervals_1(locked); });
+    var bleInterval_1;
+    NRF.on("connect", function () { return setIntervals_1(undefined, true); });
+    NRF.on("disconnect", function () { return setIntervals_1(undefined, false); });
+    setIntervals_1();
+    setBtnsShown_1(true);
+    enableSensors_1();
+    {
+        var ad = getBleAdvert_1(function (serv) { return serviceToAdvert_1(serv, true); }, true);
+        var adServices = Object
+            .keys(ad)
+            .map(function (k) { return k.replace("0x", ""); });
+        NRF.setServices(ad, {
+            advertise: adServices,
+            uart: false,
+        });
+    }
+}
diff --git a/apps/btadv/app.ts b/apps/btadv/app.ts
new file mode 100644
index 000000000..5e4930865
--- /dev/null
+++ b/apps/btadv/app.ts
@@ -0,0 +1,717 @@
+{
+// @ts-ignore helper
+const __assign = Object.assign;
+
+const Layout = require("Layout");
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+const enum Intervals {
+  // BLE_ADVERT = 60 * 1000,
+  BLE = 1000, // info screen
+  BLE_BACKGROUND = 5000, // button screen
+  UI_INFO = 5 * 1000, // info refresh, wake
+  UI_INFO_SLEEP = 15 * 1000, // info refresh, asleep
+}
+
+type Hrm = { bpm: number, confidence: number };
+
+const HRM_MIN_CONFIDENCE = 75;
+
+// https://github.com/sputnikdev/bluetooth-gatt-parser/blob/master/src/main/resources/gatt/
+const enum BleServ {
+  // org.bluetooth.service.heart_rate
+  // contains: HRM
+  HRM = "0x180d",
+
+  // org.bluetooth.service.environmental_sensing
+  // contains: Elevation, Temp(Celsius), Pressure, Mag
+  EnvSensing = "0x181a",
+
+  // org.bluetooth.service.location_and_navigation
+  // contains: LocationAndSpeed
+  LocationAndNavigation = "0x1819",
+
+  // Acc // none known for this
+}
+
+const services = [BleServ.HRM, BleServ.EnvSensing, BleServ.LocationAndNavigation];
+
+const enum BleChar {
+  // org.bluetooth.characteristic.heart_rate_measurement
+  // <see encode function>
+  HRM = "0x2a37",
+
+  // org.bluetooth.characteristic.elevation
+  // s24, meters 0.01
+  Elevation = "0x2a6c",
+
+  // org.bluetooth.characteristic.temperature
+  // s16 *10^2
+  Temp = "0x2a6e",
+  // org.bluetooth.characteristic.temperature_celsius
+  // s16 *10^2
+  TempCelsius = "0x2A1F",
+
+  // org.bluetooth.characteristic.pressure
+  // u32 *10
+  Pressure = "0x2a6d",
+
+  // org.bluetooth.characteristic.location_and_speed
+  // <see encodeGps>
+  LocationAndSpeed = "0x2a67",
+
+  // org.bluetooth.characteristic.magnetic_flux_density_3d
+  // s16: x, y, z, tesla (10^-7)
+  MagneticFlux3D = "0x2aa1",
+}
+
+type BleCharAdvert = {
+  value?: Array<number>,
+  readable?: true,
+  notify?: true,
+  indicate?: true, // notify + ACK
+  maxLen?: number,
+};
+
+type BleServAdvert = {
+  [key in BleChar]?: BleCharAdvert;
+};
+
+type LenFunc<T> = {
+  (_: T): Array<number>,
+  maxLen: number,
+}
+
+let acc: undefined | AccelData;
+let bar: undefined | PressureData;
+let gps: undefined | GPSFix;
+let hrm: undefined | Hrm;
+let hrmAny: undefined | Hrm;
+let mag: undefined | CompassData;
+let btnsShown = false;
+let prevBtnsShown: boolean | undefined = undefined;
+let hrmAnyClear: undefined | number;
+
+type BtAdvType<IncludeAcc = false> = "bar" | "gps" | "hrm" | "mag" | (IncludeAcc extends true ? "acc" : never);
+type BtAdvMap<T, IncludeAcc = false> = { [key in BtAdvType<IncludeAcc>]: T };
+
+const settings: BtAdvMap<boolean> = {
+  bar: false,
+  gps: false,
+  hrm: false,
+  mag: false,
+};
+
+const idToName: BtAdvMap<string, true> = {
+  acc: "Acceleration",
+  bar: "Barometer",
+  gps: "GPS",
+  hrm: "HRM",
+  mag: "Magnetometer",
+};
+
+// 15 characters per line
+const infoFont: FontNameWithScaleFactor = "6x8:2";
+
+const colour = {
+  on: "#0f0",
+  off: "#fff",
+} as const;
+
+const makeToggle = (id: BtAdvType) => () => {
+  settings[id] = !settings[id];
+
+  const entry = btnLayout[id]!;
+  const col = settings[id] ? colour.on : colour.off;
+
+  entry.btnBorder = entry.col = col;
+
+  btnLayout.update();
+  btnLayout.render();
+
+  //require('Storage').writeJSON(SETTINGS_FILENAME, settings);
+  enableSensors();
+};
+
+const btnStyle: {
+  font: FontNameWithScaleFactor,
+  fillx?: 1,
+  filly?: 1,
+  col: ColorResolvable,
+  bgCol: ColorResolvable,
+  btnBorder: ColorResolvable,
+} = {
+  font: "Vector:14",
+  fillx: 1,
+  filly: 1,
+  col: g.theme.fg,
+  bgCol: g.theme.bg,
+  btnBorder: "#fff",
+};
+
+const btnLayout = new Layout(
+  {
+    type: "v",
+    c: [
+      {
+        type: "h",
+        c: [
+          {
+            type: "btn",
+            label: idToName.bar,
+            id: "bar",
+            cb: makeToggle('bar'),
+            ...btnStyle,
+          },
+          {
+            type: "btn",
+            label: idToName.gps,
+            id: "gps",
+            cb: makeToggle('gps'),
+            ...btnStyle,
+          },
+        ]
+      },
+      {
+        type: "h",
+        c: [
+          // hrm, mag
+          {
+            type: "btn",
+            label: idToName.hrm,
+            id: "hrm",
+            cb: makeToggle('hrm'),
+            ...btnStyle,
+          },
+          {
+            type: "btn",
+            label: idToName.mag,
+            id: "mag",
+            cb: makeToggle('mag'),
+            ...btnStyle,
+          },
+        ]
+      },
+      {
+        type: "h",
+        c: [
+          {
+            type: "btn",
+            label: idToName.acc,
+            id: "acc",
+            cb: () => {},
+            ...btnStyle,
+            col: colour.on,
+            btnBorder: colour.on,
+          },
+          {
+            type: "btn",
+            label: "Back",
+            cb: () => {
+              setBtnsShown(false);
+            },
+            ...btnStyle,
+          },
+        ]
+      }
+    ]
+  },
+  {
+    lazy: true,
+    back: () => {
+      setBtnsShown(false);
+    },
+  },
+);
+
+const setBtnsShown = (b: boolean) => {
+  btnsShown = b;
+
+  hook(!btnsShown);
+  setIntervals();
+
+  redraw();
+};
+
+const drawInfo = (force?: true) => {
+  let { y, x, w } = Bangle.appRect;
+  const mid = x + w / 2
+  let drawn = false;
+
+  if (!force && !bar && !gps && !hrm && !mag)
+    return;
+
+  g.reset()
+    .clearRect(Bangle.appRect)
+    .setFont(infoFont)
+    .setFontAlign(0, -1);
+
+  if (bar) {
+    g.drawString(`${bar.altitude.toFixed(1)}m`, mid, y);
+    y += g.getFontHeight();
+
+    g.drawString(`${bar.pressure.toFixed(1)} hPa`, mid, y);
+    y += g.getFontHeight();
+
+    g.drawString(`${bar.temperature.toFixed(1)}C`, mid, y);
+    y += g.getFontHeight();
+
+    drawn = true;
+  }
+
+  if (gps) {
+    g.drawString(
+      `${gps.lat.toFixed(4)} lat, ${gps.lon.toFixed(4)} lon`,
+      mid,
+      y,
+    );
+    y += g.getFontHeight();
+
+    g.drawString(
+      `${gps.alt}m (${gps.satellites} sat)`,
+      mid,
+      y,
+    );
+    y += g.getFontHeight();
+
+    drawn = true;
+  }
+
+  if (hrm) {
+    g.drawString(`${hrm.bpm} BPM (${hrm.confidence}%)`, mid, y);
+    y += g.getFontHeight();
+
+    drawn = true;
+  } else if (hrmAny) {
+    g.drawString(`~${hrmAny.bpm} BPM (${hrmAny.confidence}%)`, mid, y);
+    y += g.getFontHeight();
+
+    drawn = true;
+
+    if (!settings.hrm && !hrmAnyClear) {
+        // hrm is erased, but hrmAny will remain until cleared (or reset)
+        // if it runs via health check, we reset it here
+        hrmAnyClear = setTimeout(() => {
+            hrmAny = undefined;
+            hrmAnyClear = undefined;
+        }, 10000);
+    }
+  }
+
+  if (mag) {
+    g.drawString(
+      `${mag.x} ${mag.y} ${mag.z}`,
+      mid,
+      y
+    );
+    y += g.getFontHeight();
+
+    g.drawString(
+      `heading: ${mag.heading.toFixed(1)}`,
+      mid,
+      y
+    );
+    y += g.getFontHeight();
+
+    drawn = true;
+  }
+
+  if (!drawn) {
+    if (!force || Object.values(settings).every((x: boolean) => !x)) {
+      g.drawString(`swipe to enable`, mid, y);
+    } else {
+      g.drawString(`events pending`, mid, y);
+    }
+    y += g.getFontHeight();
+  }
+};
+
+const onTap = (/* _: { ... } */) => {
+  setBtnsShown(true);
+};
+
+const redraw = () => {
+  if (btnsShown) {
+    if (!prevBtnsShown) {
+      prevBtnsShown = btnsShown;
+
+      Bangle.removeListener("swipe", onTap);
+
+      btnLayout.setUI();
+      btnLayout.forgetLazyState();
+      g.clearRect(Bangle.appRect); // in case btnLayout isn't full screen
+    }
+
+    btnLayout.render();
+  } else {
+    if (prevBtnsShown) {
+      prevBtnsShown = btnsShown;
+
+      Bangle.setUI(); // remove all existing input handlers
+      Bangle.on("swipe", onTap);
+
+      drawInfo(true);
+    } else {
+      drawInfo();
+    }
+  }
+};
+
+const encodeHrm: LenFunc<Hrm> = (hrm: Hrm) =>
+  // {
+  //   flags: u8,
+  //   bytes: [u8...]
+  // }
+  // flags {
+  //   1 << 0: 16bit bpm
+  //   1 << 1: sensor contact available
+  //   1 << 2: sensor contact boolean
+  //   1 << 3: energy expended, next 16 bits
+  //   1 << 4: "rr" data available, u16s, intervals
+  // }
+  [0, hrm.bpm];
+encodeHrm.maxLen = 2;
+
+const encodePressure: LenFunc<PressureData> = (data: PressureData) =>
+  toByteArray(Math.round(data.pressure * 10), 4, false);
+encodePressure.maxLen = 4;
+
+const encodeElevation: LenFunc<PressureData> = (data: PressureData) =>
+  toByteArray(Math.round(data.altitude * 100), 3, true);
+encodeElevation.maxLen = 3;
+
+const encodeTemp: LenFunc<PressureData> = (data: PressureData) =>
+  toByteArray(Math.round(data.temperature * 10), 2, true);
+encodeTemp.maxLen = 2;
+
+const encodeGps: LenFunc<GPSFix> = (data: GPSFix) => {
+  // flags: 16 bits
+  //   bit 0: Instantaneous Speed Present
+  //   bit 1: Total Distance Present
+  //   bit 2: Location Present
+  //   bit 3: Elevation Present
+  //   bit 4: Heading Present
+  //   bit 5: Rolling Time Present
+  //   bit 6: UTC Time Present
+  //
+  //   bit 7-8: position status
+  //     0 (0b00): no position
+  //     1 (0b01): position ok
+  //     2 (0b10): estimated position
+  //     3 (0b11): last known position
+  //
+  //   bit 9: speed & distance format
+  //     0: 2d
+  //     1: 3d
+  //
+  //   bit 10-11: elevation source
+  //     0: Positioning System
+  //     1: Barometric Air Pressure
+  //     2: Database Service (or similiar)
+  //     3: Other
+  //
+  //   bit 12: Heading Source
+  //     0: Heading based on movement
+  //     1: Heading based on magnetic compass
+  //
+  // speed: u16 (m/s), 1/100
+  // distance: u24, 1/10
+  // lat: s32, 1/10^7
+  // lon: s32, 1/10^7
+  // elevation: s24, 1/100
+  // heading: u16 (deg), 1/100
+  // rolling time: u8 (s)
+  // utc time: org.bluetooth.characteristic.date_time
+
+  const speed = toByteArray(Math.round(1000 * data.speed / 36), 2, false);
+  const lat = toByteArray(Math.round(data.lat * 10000000), 4, true);
+  const lon = toByteArray(Math.round(data.lon * 10000000), 4, true);
+  const elevation = toByteArray(Math.round(data.alt * 100), 3, true);
+  const heading = toByteArray(Math.round(data.course * 100), 2, false);
+
+  return [
+      0b10011101, // speed, location, elevation, heading [...]
+      0b00000010, // position ok, 3d speed/distance
+      speed[0]!, speed[1]!,
+      lat[0]!, lat[1]!, lat[2]!, lat[3]!,
+      lon[0]!, lon[1]!, lon[2]!, lon[3]!,
+      elevation[0]!, elevation[1]!, elevation[2]!,
+      heading[0]!, heading[1]!
+  ];
+};
+encodeGps.maxLen = 17;
+
+const encodeGpsHeadingOnly: LenFunc<CompassData> = (data: CompassData) => {
+  // see encodeGps()
+  const heading = toByteArray(Math.round(data.heading * 100), 2, false);
+
+  return [
+      0b00010000, // heading present
+      0b00010000, // heading source: mag
+      heading[0]!, heading[1]!
+  ];
+};
+encodeGpsHeadingOnly.maxLen = 17;
+
+const encodeMag: LenFunc<CompassData> = (data: CompassData) => {
+  const x = toByteArray(data.x, 2, true);
+  const y = toByteArray(data.y, 2, true);
+  const z = toByteArray(data.z, 2, true);
+
+  return [ x[0]!, x[1]!, y[0]!, y[1]!, z[0]!, z[1]! ];
+};
+encodeMag.maxLen = 6;
+
+const toByteArray = (value: number, numberOfBytes: number, isSigned: boolean) => {
+  const byteArray: Array<number> = new Array(numberOfBytes);
+
+  if(isSigned && (value < 0)) {
+    value += 1 << (numberOfBytes * 8);
+  }
+
+  for(let index = 0; index < numberOfBytes; index++) {
+    byteArray[index] = (value >> (index * 8)) & 0xff;
+  }
+
+  return byteArray;
+};
+
+const enableSensors = () => {
+  Bangle.setBarometerPower(settings.bar, "btadv");
+  if (!settings.bar)
+    bar = undefined;
+
+  Bangle.setGPSPower(settings.gps, "btadv");
+  if (!settings.gps)
+    gps = undefined;
+
+  Bangle.setHRMPower(settings.hrm, "btadv");
+  if (!settings.hrm)
+    hrm = hrmAny = undefined;
+
+  Bangle.setCompassPower(settings.mag, "btadv");
+  if (!settings.mag)
+    mag = undefined;
+};
+
+// ----------------------------
+
+const haveServiceData = (serv: BleServ): boolean => {
+  switch (serv) {
+    case BleServ.HRM: return !!hrm;
+    case BleServ.EnvSensing: return !!(bar || mag);
+    case BleServ.LocationAndNavigation: return !!(gps && gps.lat && gps.lon || mag);
+  }
+};
+
+const serviceToAdvert = (serv: BleServ, initial = false): BleServAdvert => {
+  switch (serv) {
+    case BleServ.HRM:
+      if (hrm || initial) {
+        const o: BleCharAdvert = {
+          maxLen: encodeHrm.maxLen,
+          readable: true,
+          notify: true,
+        };
+        if (hrm) {
+          o.value = encodeHrm(hrm);
+          hrm = undefined;
+        }
+
+        return { [BleChar.HRM]: o };
+      }
+      return {};
+
+    case BleServ.LocationAndNavigation:
+      if (gps || initial) {
+        const o: BleCharAdvert = {
+          maxLen: encodeGps.maxLen,
+          readable: true,
+          notify: true,
+        };
+        if (gps) {
+          o.value = encodeGps(gps);
+          gps = undefined;
+        }
+
+        return { [BleChar.LocationAndSpeed]: o };
+      } else if (mag) {
+        const o: BleCharAdvert = {
+          maxLen: encodeGpsHeadingOnly.maxLen,
+          readable: true,
+          notify: true,
+          value: encodeGpsHeadingOnly(mag),
+        };
+
+        return { [BleChar.LocationAndSpeed]: o };
+      }
+      return {};
+
+    case BleServ.EnvSensing: {
+      const o: BleServAdvert = {};
+
+      if (bar || initial) {
+          o[BleChar.Elevation] = {
+            maxLen: encodeElevation.maxLen,
+            readable: true,
+            notify: true,
+          };
+          o[BleChar.TempCelsius] = {
+            maxLen: encodeTemp.maxLen,
+            readable: true,
+            notify: true,
+          };
+          o[BleChar.Pressure] = {
+            maxLen: encodePressure.maxLen,
+            readable: true,
+            notify: true,
+          };
+
+          if (bar) {
+            o[BleChar.Elevation]!.value = encodeElevation(bar);
+            o[BleChar.TempCelsius]!.value = encodeTemp(bar);
+            o[BleChar.Pressure]!.value = encodePressure(bar);
+            bar = undefined;
+          }
+      }
+
+      if (mag || initial) {
+        o[BleChar.MagneticFlux3D] = {
+          maxLen: encodeMag.maxLen,
+          readable: true,
+          notify: true,
+        };
+
+        if (mag) {
+          o[BleChar.MagneticFlux3D]!.value = encodeMag(mag);
+        }
+      }
+
+      return o;
+    }
+  }
+};
+
+const getBleAdvert = <T>(map: (s: BleServ) => T, all = false) => {
+  const advert: { [key in BleServ]?: T } = {};
+
+  for (const serv of services) {
+    if (all || haveServiceData(serv)) {
+      advert[serv] = map(serv);
+    }
+  }
+
+  // clear mag only after both EnvSensing and LocationAndNavigation have run
+  mag = undefined;
+
+  return advert;
+};
+
+// done via advertise in setServices()
+//const updateBleAdvert = () => {
+//  let bleAdvert: ReturnType<typeof getBleAdvert<undefined>>;
+//
+//  if (!(bleAdvert = (Bangle as any).bleAdvert)) {
+//    bleAdvert = getBleAdvert(_ => undefined);
+//
+//    (Bangle as any).bleAdvert = bleAdvert;
+//  }
+//
+//  try {
+//    NRF.setAdvertising(bleAdvert);
+//  } catch (e) {
+//    console.log("couldn't setAdvertising():", e);
+//  }
+//};
+
+const updateServices = () => {
+  const newAdvert = getBleAdvert(serviceToAdvert);
+
+  NRF.updateServices(newAdvert);
+};
+
+const onAccel = (newAcc: NonNull<typeof acc>) => acc = newAcc;
+const onPressure = (newBar: NonNull<typeof bar>) => bar = newBar;
+const onGPS = (newGps: NonNull<typeof gps>) => gps = newGps;
+const onHRM = (newHrm: NonNull<typeof hrm>) => {
+    if (newHrm.confidence >= HRM_MIN_CONFIDENCE)
+        hrm = newHrm;
+    hrmAny = newHrm;
+};
+const onMag = (newMag: NonNull<typeof mag>) => mag = newMag;
+
+const hook = (enable: boolean) => {
+  // need to disable for perf reasons, when buttons are shown
+  if (enable) {
+    Bangle.on("accel", onAccel);
+    Bangle.on("pressure", onPressure);
+    Bangle.on("GPS", onGPS);
+    Bangle.on("HRM", onHRM);
+    Bangle.on("mag", onMag);
+  } else {
+    Bangle.removeListener("accel", onAccel);
+    Bangle.removeListener("pressure", onPressure);
+    Bangle.removeListener("GPS", onGPS);
+    Bangle.removeListener("HRM", onHRM);
+    Bangle.removeListener("mag", onMag);
+  }
+}
+
+// --- intervals ---
+
+const setIntervals = (
+  locked: boolean = Bangle.isLocked(),
+  connected: boolean = NRF.getSecurityStatus().connected,
+) => {
+  changeInterval(
+    redrawInterval,
+    locked ? Intervals.UI_INFO_SLEEP : Intervals.UI_INFO,
+  );
+
+  if (connected) {
+    const interval = btnsShown ? Intervals.BLE_BACKGROUND : Intervals.BLE;
+
+    if (bleInterval) {
+      changeInterval(bleInterval, interval);
+    } else {
+      bleInterval = setInterval(updateServices, interval);
+    }
+  } else if (bleInterval) {
+    clearInterval(bleInterval);
+    bleInterval = undefined;
+  }
+};
+
+const redrawInterval = setInterval(redraw, /*replaced*/1000);
+Bangle.on("lock", locked => setIntervals(locked));
+
+let bleInterval: undefined | IntervalId;
+NRF.on("connect", () => setIntervals(undefined, true));
+NRF.on("disconnect", () => setIntervals(undefined, false));
+
+setIntervals();
+
+// turn things on
+setBtnsShown(true);
+enableSensors();
+
+// set services/advert once at startup:
+{
+  // must have fixed services from the start:
+  const ad = getBleAdvert(serv => serviceToAdvert(serv, true), /*all*/true);
+
+  const adServices = Object
+        .keys(ad)
+        .map((k: string) => k.replace("0x", ""));
+
+  NRF.setServices(
+    ad,
+    {
+      advertise: adServices,
+      uart: false,
+    },
+  );
+}
+}
diff --git a/apps/btadv/icon.js b/apps/btadv/icon.js
new file mode 100644
index 000000000..03de6f5fd
--- /dev/null
+++ b/apps/btadv/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwZC/gECoARQpARQpIRRkARQkgRRwBrPkmQBpIvDCIMEyQQIgIvDR4WSSRIvDCIUSSRIvDCISSCJRAvCCIoaDCIgvCGooaCiRNEDoRZFBwQRFgDCBPooOCOI0JkihDhApBHARxDgiSCyTFCHYQRGUIQRDHYIRCHYIRBiChDBAJKBHYICBpIRDyQyCSQQgBCJNBCIbCDCIZNDF4R0DEYwRCIIa5BI5ARDyAdCNZIFCCIKYBR5QRBVoJ6BWZY7CTwTXJWYQRFfZYRFRgQRCAoT4DCIgICCIQpCHARlCfYRBDCIhlDCIZuDGor1BCIgCBLgZZEAAiABEYIGCPooALUIYRQVQYRLdIQRPKAQROCBzjELJ4RPAHoA=="))
diff --git a/apps/btadv/icon.png b/apps/btadv/icon.png
new file mode 100644
index 000000000..28867f31e
Binary files /dev/null and b/apps/btadv/icon.png differ
diff --git a/apps/btadv/metadata.json b/apps/btadv/metadata.json
new file mode 100644
index 000000000..7028b2a95
--- /dev/null
+++ b/apps/btadv/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "btadv",
+  "name": "btadv",
+  "shortName": "btadv",
+  "version": "0.01",
+  "description": "Advertise & export live heart rate, accel, pressure, GPS & mag data over bluetooth",
+  "icon": "icon.png",
+  "tags": "health,tool,sensors,bluetooth",
+  "supports": ["BANGLEJS2"],
+  "readme":"README.md",
+  "storage": [
+    {"name":"btadv.app.js","url":"app.js"},
+    {"name":"btadv.img","url":"icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/bthrm/README.md b/apps/bthrm/README.md
index f4eaf43af..6234f3b78 100644
--- a/apps/bthrm/README.md
+++ b/apps/bthrm/README.md
@@ -1,6 +1,6 @@
 # Bluetooth Heart Rate Monitor
 
-When this app is installed it overrides Bangle.js's build in heart rate monitor with an external Bluetooth one.
+When this app is installed it overrides Bangle.js's built in heart rate monitor with an external Bluetooth one.
 
 HRM is requested it searches on Bluetooth for a heart rate monitor, connects, and sends data back using the `Bangle.on('HRM')` event as if it came from the on board monitor.
 
@@ -44,7 +44,7 @@ So far it has been tested on:
 
 ## Recorder plugin
 
-The recorder plugin can record the BT HRM event (blue) and the original unchanged HRM event (green). This is mainly useful for debugging purposes or comparing the BT with the internal HRM, as the resulting "merged" HRM can be recordet using the default HRM recorder.
+The recorder plugin can record the BT HRM event (blue) and the original unchanged HRM event (green). This is mainly useful for debugging purposes or comparing the BT with the internal HRM, as the resulting "merged" HRM can be recorded using the default HRM recorder.
 
 ## Internals
 
diff --git a/apps/bthrm/bthrm.js b/apps/bthrm/bthrm.js
index b07e7bd37..246b539d4 100644
--- a/apps/bthrm/bthrm.js
+++ b/apps/bthrm/bthrm.js
@@ -96,7 +96,7 @@ function draw(){
     if (!isNaN(bt.battery)) layout.btBattery.label = bt.battery + "%";
     if (bt.rr) layout.btRR.label = bt.rr.join(",");
     if (!isNaN(bt.location)) layout.btLocation.label = BODY_LOCS[bt.location];
-    if (bt.contact !== undefined) layout.btContact.label = bt.contact ? "Yes":"No";
+    if (bt.contact !== undefined) layout.btContact.label = bt.contact ? /*LANG*/"Yes":/*LANG*/"No";
     if (!isNaN(bt.energy)) layout.btEnergy.label = bt.energy.toFixed(0) + "kJ";
   } else {
     layout.bt.label = "--";
diff --git a/apps/bthrm/metadata.json b/apps/bthrm/metadata.json
index fea274ff3..6c31759c9 100644
--- a/apps/bthrm/metadata.json
+++ b/apps/bthrm/metadata.json
@@ -18,5 +18,6 @@
     {"name":"bthrm.settings.js","url":"settings.js"},
     {"name":"bthrm","url":"lib.js"},
     {"name":"bthrm.default.json","url":"default.json"}
-  ]
+  ],
+  "data": [{"name":"bthrm.json"}]
 }
diff --git a/apps/bthrmlite/ChangeLog b/apps/bthrmlite/ChangeLog
new file mode 100644
index 000000000..2286a7f70
--- /dev/null
+++ b/apps/bthrmlite/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
\ No newline at end of file
diff --git a/apps/bthrmlite/README.md b/apps/bthrmlite/README.md
new file mode 100644
index 000000000..5bfdc9a83
--- /dev/null
+++ b/apps/bthrmlite/README.md
@@ -0,0 +1,44 @@
+# Bluetooth Heart Rate Monitor - Lite
+
+When this app is installed it overrides Bangle.js's built in heart rate monitor with an external Bluetooth one.
+
+The [`bthrm` app](https://banglejs.com/apps/?id=bthrm) is a much more sophisticated version of this app, however is uses a lot more
+RAM so may not be suitable for Bangle.js 1.
+
+HRM is requested it searches on Bluetooth for a heart rate monitor, connects, and sends data back using the `Bangle.on('HRM'` event as if it came from the on board monitor.
+
+This means it's compatible with many Bangle.js apps including:
+
+* [Heart Rate Widget](https://banglejs.com/apps/#widhrt)
+* [Heart Rate Recorder](https://banglejs.com/apps/#heart)
+
+It it NOT COMPATIBLE with [Heart Rate Monitor](https://banglejs.com/apps/#hrm)
+as that requires live sensor data (rather than just BPM readings).
+
+## Usage
+
+Just install the app, then install an app that uses the heart rate monitor.
+
+Once an app requests Heart Rate `bthrmlite` will automatically try and connect to the first bluetooth
+heart rate monitor it finds.
+
+**To disable this and return to normal HRM, uninstall the app**
+
+## Compatible Heart Rate Monitors
+
+This works with any heart rate monitor providing the standard Bluetooth
+Heart Rate Service (`180D`) and characteristic (`2A37`).
+
+So far it has been tested on:
+
+* CooSpo Bluetooth Heart Rate Monitor
+
+## Internals
+
+This replaces `Bangle.setHRMPower` with its own implementation.
+
+To get debug info, you can call `Bangle.enableBTHRMLog()` in the IDE to enable log messages.
+
+## Creator
+
+Gordon Williams
\ No newline at end of file
diff --git a/apps/bthrmlite/app-icon.js b/apps/bthrmlite/app-icon.js
new file mode 100644
index 000000000..04a5ee610
--- /dev/null
+++ b/apps/bthrmlite/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4UA///g3yy06AoIZNitUAg8AgtVqtQAgoRCAwITBAggABAoIABAgsAgIGDoIEDoApDAAwwBFIV1BYo1E+oLTAgQLGJon9BZNXBatdBYRVFBYN/r9fHoxTBBYYlEL4QLFq/a1WUgE///fr4xBv/+1Wq1EAh/3/tX6/fv/6BYOqwCzBBYf9tWq9QLF79X+oLBDIOgKgILEEIIxBGAMVNAP/BYf/BYUFBYJSB6wLC9QLBeAQLBqwLCGAL9BBYmr9X+GAILBbIIlBBYP6/wwBBYMFBYZGB/4XDGAILD34vEcwYLB15HBBYYkBBYWrFwILDKoRTCVIQLCEgQXIEgVaF44YCoRHHAAMUgQuBNgILFgECO4W/BZCPFBYinGBY6/CAArXFBY7vDAAsq1QuB0ALIOwOABY0KEgJGGGAguHDAYDBA=="))
diff --git a/apps/bthrmlite/app.png b/apps/bthrmlite/app.png
new file mode 100644
index 000000000..40c2ab024
Binary files /dev/null and b/apps/bthrmlite/app.png differ
diff --git a/apps/bthrmlite/boot.js b/apps/bthrmlite/boot.js
new file mode 100644
index 000000000..d10266789
--- /dev/null
+++ b/apps/bthrmlite/boot.js
@@ -0,0 +1,89 @@
+{
+  let log = function() {};//print
+  let gatt;
+
+  Bangle.enableBTHRMLog = function() {
+    log = print;
+  };
+
+  Bangle.setHRMPower = function(isOn, app) {
+    // Do app power handling
+    if (!app) app="?";
+    log("setHRMPower ->", isOn, app);
+    if (Bangle._PWR===undefined) Bangle._PWR={};
+    if (Bangle._PWR.HRM===undefined) Bangle._PWR.HRM=[];
+    if (isOn && !Bangle._PWR.HRM.includes(app)) Bangle._PWR.HRM.push(app);
+    if (!isOn && Bangle._PWR.HRM.includes(app)) Bangle._PWR.HRM = Bangle._PWR.HRM.filter(a=>a!=app);
+    isOn = Bangle._PWR.HRM.length;
+    // so now we know if we're really on
+    if (isOn) {
+      log("setHRMPower on", app);
+      if (!gatt) {
+        log("HRM not already on");
+        NRF.requestDevice({ filters: [{ services: ['180D'] }] }).then(function(device) {
+          log("Found device "+device.id);
+          device.on('gattserverdisconnected', function(reason) {
+            gatt = undefined;
+          });
+          return device.gatt.connect();
+        }).then(function(g) {
+          log("Connected");
+          gatt = g;
+          return gatt.getPrimaryService(0x180D);
+        }).then(function(service) {
+          return service.getCharacteristic(0x2A37);
+        }).then(function(characteristic) {
+          log("Got characteristic");
+          characteristic.on('characteristicvaluechanged', function(event) {
+            var dv = event.target.value;
+            var flags = dv.getUint8(0);
+            // 0 = 8 or 16 bit
+            // 1,2 = sensor contact
+            // 3 = energy expended shown
+            // 4 = RR interval
+            var bpm = (flags&1) ? (dv.getUint16(1)/100/* ? */) : dv.getUint8(1); // 8 or 16 bit
+          /*  var idx = 2 + (flags&1); // index of next field
+            if (flags&8) idx += 2; // energy expended
+            if (flags&16) {
+              var interval = dv.getUint16(idx,1); // in milliseconds
+            }*/
+            Bangle.emit('HRM',{
+              bpm:bpm,
+              confidence:100
+            });
+          });
+          return characteristic.startNotifications();
+        }).then(function() {
+          log("Ready");
+          console.log("Done!");
+        }).catch(function(err) {
+          console.log("BTHRM Error",err);
+          gatt = undefined;
+          // retry connection if we got a connect timeout
+          if (err == "Connection Timeout")
+            setTimeout(Bangle.setHRMPower, 1000, isOn, app);
+        });
+      }
+    } else { // not on
+      log("setHRMPower off", app);
+      if (gatt) {
+        log("HRM connected - disconnecting");
+        try {gatt.disconnect();}catch(e) {
+          log("HRM disconnect error", e);
+        }
+        gatt = undefined;
+      }
+    }
+  };
+// disconnect when swapping apps
+E.on("kill", function() {
+  if (gatt) {
+    log("HRM connected - disconnecting");
+    try {gatt.disconnect();}catch(e) {
+      log("HRM disconnect error", e);
+    }
+    gatt = undefined;
+  }
+});
+
+}
\ No newline at end of file
diff --git a/apps/bthrmlite/metadata.json b/apps/bthrmlite/metadata.json
new file mode 100644
index 000000000..e4b95cca8
--- /dev/null
+++ b/apps/bthrmlite/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "bthrmlite",
+  "name": "Bluetooth Heart Rate Monitor (Lite)",
+  "shortName":"BT HRM",
+  "version":"0.01",
+  "description": "Overrides Bangle.js's build in heart rate monitor with an external Bluetooth one. Cut-down version that uses less RAM.",
+  "icon": "app.png",
+  "tags": "health,bluetooth",
+  "type": "bootloader",
+  "supports" : ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"bthrmlite.boot.js","url":"boot.js"},
+    {"name":"bthrmlite.img","url":"app-icon.js","evaluate":true}
+  ]
+}
\ No newline at end of file
diff --git a/apps/bwclk/ChangeLog b/apps/bwclk/ChangeLog
index 8b82f6843..191bb51e5 100644
--- a/apps/bwclk/ChangeLog
+++ b/apps/bwclk/ChangeLog
@@ -29,4 +29,7 @@
 clkinfo.addInteractive that would cause ReferenceError.
 0.28: Option to show (1) time only and (2) week of year.
 0.29: use setItem of clockInfoMenu to change the active item
-0.30: Use widget_utils.
+0.30: Use widget_utils
+0.31: Use clock_info module as an app
+0.32: Make the border of the clock_info box extend all the way to the right of the screen.
+0.33: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
\ No newline at end of file
diff --git a/apps/bwclk/README.md b/apps/bwclk/README.md
index 5e2a7b55f..882d525f6 100644
--- a/apps/bwclk/README.md
+++ b/apps/bwclk/README.md
@@ -11,6 +11,7 @@ sub-items simply swipe up/down. To run an action (e.g. trigger home assistant),
 
 ![](screenshot_3.png)
 
+Note: Check out the settings to change different themes.
 
 ## Settings
 - Screen: Normal (widgets shown), Dynamic (widgets shown if unlocked) or Full (widgets are hidden).
diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js
index de7c7d510..fdb82df73 100644
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@@ -132,18 +132,16 @@ clockInfoItems[0].items.unshift({ name : "nop",
 
 
 let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
+  app: "bwclk",
   x : 0,
   y: 135,
-  w: W,
+  w: W+1,
   h: H-135,
   draw : (itm, info, options) => {
     var hideClkInfo = info.text == null;
 
-    g.setColor(g.theme.fg);
-    g.fillRect(options.x, options.y, options.x+options.w, options.y+options.h);
-
-    g.setFontAlign(0,0);
-    g.setColor(g.theme.bg);
+    g.reset().setBgColor(g.theme.fg).clearRect(options.x, options.y, options.x+options.w, options.y+options.h);
+    g.setFontAlign(0,0).setColor(g.theme.bg);
 
     if (options.focus){
       var y = hideClkInfo ? options.y+20 : options.y+2;
diff --git a/apps/bwclk/metadata.json b/apps/bwclk/metadata.json
index 39106c827..d4091c2fe 100644
--- a/apps/bwclk/metadata.json
+++ b/apps/bwclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "bwclk",
   "name": "BW Clock",
-  "version": "0.30",
+  "version": "0.33",
   "description": "A very minimalistic clock.",
   "readme": "README.md",
   "icon": "app.png",
@@ -9,10 +9,12 @@
   "type": "clock",
   "tags": "clock,clkinfo",
   "supports": ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
   "allow_emulator": true,
   "storage": [
     {"name":"bwclk.app.js","url":"app.js"},
     {"name":"bwclk.img","url":"app-icon.js","evaluate":true},
     {"name":"bwclk.settings.js","url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"bwclk.setting.json"}]
 }
diff --git a/apps/bwclklite/ChangeLog b/apps/bwclklite/ChangeLog
new file mode 100644
index 000000000..c68c62edc
--- /dev/null
+++ b/apps/bwclklite/ChangeLog
@@ -0,0 +1,38 @@
+0.01: New App.
+0.02: Use build in function for steps and other improvements.
+0.03: Adapt colors based on the theme of the user.
+0.04: Steps can be hidden now such that the time is even larger.
+0.05: Included icons for information.
+0.06: Design and usability improvements.
+0.07: Improved positioning.
+0.08: Select the color of widgets correctly. Additional settings to hide colon.
+0.09: Larger font size if colon is hidden to improve readability further.
+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.
+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.
+0.24: Update clock_info to avoid a redraw
+0.25: Use Bangle.setUI({remove:...}) to allow loading the launcher without a full reset on fw2v16.
+      ClockInfo Fix: Use .get instead of .show as .show is not implemented for weather etc.
+0.26: Use clkinfo.addInteractive instead of a custom implementation
+0.27: Clean out some leftovers in the remove function after switching to
+clkinfo.addInteractive that would cause ReferenceError.
+0.28: Option to show (1) time only and (2) week of year.
+0.29: use setItem of clockInfoMenu to change the active item
+0.30: Use widget_utils
+0.31: Use clock_info module as an app
+0.32: Diverge from BW Clock. Change out the custom font for a standard bitmap one to speed up loading times.
+      Remove invertion of theme as this doesn'twork very well with fastloading.
+      Do an quick inital fillRect on theclock info area.
+0.33: Make the border of the clock_info box extend all the way to the right of the screen.
+0.34: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
\ No newline at end of file
diff --git a/apps/bwclklite/README.md b/apps/bwclklite/README.md
new file mode 100644
index 000000000..1ad320894
--- /dev/null
+++ b/apps/bwclklite/README.md
@@ -0,0 +1,30 @@
+# BW Clock Lite
+This is a fork of a very minimalistic clock.
+
+![](screenshot.png)
+
+## Features
+The BW clock implements features that are exposed by other apps through the `clkinfo` module.
+For example, if you install the Simple Timer app, this menu item will be shown if you first
+touch the bottom of the screen and then swipe left/right to the Simple Timer menu. To select
+sub-items simply swipe up/down. To run an action (e.g. add 5 min), simply select the clkinfo (border) and touch on the item again. See also the screenshot below:
+
+![](screenshot_3.png)
+
+Note: Check out the settings to change different themes.
+
+## Settings
+- 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.
+- Your bangle uses the sys color settings so you can change the color too.
+
+## Thanks to
+- 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)
+
+## Contributors
+thyttan
diff --git a/apps/bwclklite/app-icon.js b/apps/bwclklite/app-icon.js
new file mode 100644
index 000000000..1df0fa6a5
--- /dev/null
+++ b/apps/bwclklite/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgIcah0EgEB/H8iFsAoOY4kMBYMDhmGgXkAoUGiWkAoQQBoAFCjgnCAoM4hgFDuEI+wpC8EKyg1C/0eAoMAsEAiQvBAAeAApQAB/4Ao+P4v/wn0P8Pgn/wnkH4Pjv/j/nn9PH//n/nj/IFF4F88AXBAoM88EcAoPHj//jlDAoOf/+Y+YFHjnnjAjBEIIjD+BHDO9IALA=="))
diff --git a/apps/bwclklite/app.js b/apps/bwclklite/app.js
new file mode 100644
index 000000000..05f61ec58
--- /dev/null
+++ b/apps/bwclklite/app.js
@@ -0,0 +1,328 @@
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+
+/************************************************
+ * Includes
+ */
+const locale = require('locale');
+const storage = require('Storage');
+const clock_info = require("clock_info");
+const widget_utils = require("widget_utils");
+
+/************************************************
+ * Globals
+ */
+const SETTINGS_FILE = "bwclklite.setting.json";
+const W = g.getWidth();
+const H = g.getHeight();
+
+/************************************************
+ * Settings
+ */
+let settings = {
+  screen: "Normal",
+  showLock: true,
+  hideColon: false,
+  menuPosX: 0,
+  menuPosY: 0,
+};
+
+let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
+for (const key in saved_settings) {
+  settings[key] = saved_settings[key];
+}
+
+let isFullscreen = function() {
+  let s = settings.screen.toLowerCase();
+  if(s == "dynamic"){
+    return Bangle.isLocked();
+  } else {
+    return s == "full";
+  }
+};
+
+let getLineY = function(){
+  return H/5*2 + (isFullscreen() ? 0 : 8);
+};
+
+/************************************************
+ * Assets
+ */
+let imgLock = function() {
+  return {
+    width : 16, height : 16, bpp : 1,
+    transparent : 0,
+    buffer : E.toArrayBuffer(atob("A8AH4A5wDDAYGBgYP/w//D/8Pnw+fD58Pnw//D/8P/w="))
+  };
+};
+
+
+/************************************************
+ * Clock Info
+ */
+let clockInfoItems = clock_info.load();
+
+// Add some custom clock-infos
+let weekOfYear = function() {
+  let 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.
+  let 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);
+};
+
+clockInfoItems[0].items.unshift({ name : "weekofyear",
+  get : function() { return { text : "Week " + weekOfYear(),
+                              img : null};},
+  show : function() {},
+  hide : function() {},
+});
+
+// Empty for large time
+clockInfoItems[0].items.unshift({ name : "nop",
+  get : function() { return { text : null,
+                              img : null};},
+  show : function() {},
+  hide : function() {},
+});
+
+
+
+let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
+  app: "bwclklite",
+  x : 0,
+  y: 135,
+  w: W+1,
+  h: H-135,
+  draw : (itm, info, options) => {
+    let hideClkInfo = info.text == null;
+
+    g.reset().setBgColor(g.theme.fg).clearRect(options.x, options.y, options.x+options.w, options.y+options.h);
+    g.setFontAlign(0,0).setColor(g.theme.bg);
+
+    if (options.focus){
+      let y = hideClkInfo ? options.y+20 : options.y+2;
+      let h = hideClkInfo ? options.h-20 : options.h-2;
+      g.drawRect(options.x, y, options.x+options.w-2, y+h-1); // show if focused
+      g.drawRect(options.x+1, y+1, options.x+options.w-3, y+h-2); // show if focused
+    }
+
+    // In case we hide the clkinfo, we show the time again as the time should
+    // be drawn larger.
+    if(hideClkInfo){
+      drawTime();
+      return;
+    }
+
+    // Set text and font
+    let image = info.img;
+    let text = String(info.text);
+    if(text.split('\n').length > 1){
+      g.setFont("6x8"); //g.setMiniFont();
+    } else {
+      g.setFont("6x8:3"); //g.setSmallFont();
+    }
+
+    // Compute sizes
+    let strWidth = g.stringWidth(text);
+    let imgWidth = image == null ? 0 : 24;
+    let midx = options.x+options.w/2;
+
+    // Draw
+    if (image) {
+      let scale = imgWidth / image.width;
+      g.drawImage(image, midx-parseInt(imgWidth*1.3/2)-parseInt(strWidth/2), options.y+6, {scale: scale});
+    }
+    g.drawString(text, midx+parseInt(imgWidth*1.3/2), options.y+20);
+
+    // In case we are in focus and the focus box changes (fullscreen yes/no)
+    // we draw the time again. Otherwise it could happen that a while line is
+    // not cleared correctly.
+    if(options.focus) drawTime();
+  }
+});
+
+
+/************************************************
+ * Draw
+ */
+let draw = function() {
+  // Queue draw again
+  queueDraw();
+
+  // Draw clock
+  drawDate();
+  drawTime();
+  drawLock();
+  drawWidgets();
+};
+
+
+let drawDate = function() {
+    // Draw background
+    let y = getLineY();
+    g.reset().clearRect(0,0,W,y);
+
+    // Draw date
+    y = parseInt(y/2)+4;
+    y += isFullscreen() ? 0 : 8;
+    let date = new Date();
+    let dateStr = date.getDate();
+    dateStr = ("0" + dateStr).substr(-2);
+    g.setFont("6x8:4"); //g.setMediumFont();  // Needed to compute the width correctly
+    let dateW = g.stringWidth(dateStr);
+
+    g.setFont("6x8:3"); //g.setSmallFont();
+    let dayStr = locale.dow(date, true);
+    let monthStr = locale.month(date, 1);
+    let dayW = Math.max(g.stringWidth(dayStr), g.stringWidth(monthStr));
+    let fullDateW = dateW + 10 + dayW;
+
+    g.setFontAlign(-1,0);
+    g.drawString(dayStr, W/2 - fullDateW/2 + 10 + dateW, y-12);
+    g.drawString(monthStr, W/2 - fullDateW/2 + 10 + dateW, y+11);
+
+    g.setFont("6x8:4"); //g.setMediumFont();
+    g.setColor(g.theme.fg);
+    g.drawString(dateStr, W/2 - fullDateW / 2, y+2);
+};
+
+
+let drawTime = function() {
+  let hideClkInfo = clockInfoMenu.menuA == 0 && clockInfoMenu.menuB == 0;
+
+  // Draw background
+  let y1 = getLineY();
+  let y = y1;
+  let date = new Date();
+
+  let hours = String(date.getHours());
+  let minutes = date.getMinutes();
+  minutes = minutes < 10 ? String("0") + minutes : minutes;
+  let colon = settings.hideColon ? "" : ":";
+  let timeStr = hours + colon + minutes;
+
+  // Set y coordinates correctly
+  y += parseInt((H - y)/2) + 5;
+
+  if (hideClkInfo){
+    g.setFont("6x8:5"); //g.setLargeFont();
+  } else {
+    y -= 15;
+    g.setFont("6x8:4"); //g.setMediumFont();
+  }
+
+  // Clear region and draw time
+  g.setColor(g.theme.fg);
+  g.fillRect(0,y1,W,y+20 + (hideClkInfo ? 1 : 0) + (isFullscreen() ? 3 : 0));
+
+  g.setColor(g.theme.bg);
+  g.setFontAlign(0,0);
+  g.drawString(timeStr, W/2, y);
+};
+
+
+let drawLock = function() {
+  if(settings.showLock && Bangle.isLocked()){
+    g.setColor(g.theme.fg);
+    g.drawImage(imgLock(), W-16, 2);
+  }
+};
+
+
+let drawWidgets = function() {
+  if(isFullscreen()){
+    widget_utils.hide();
+  } else {
+    Bangle.drawWidgets();
+  }
+};
+
+
+/************************************************
+ * Listener
+ */
+// timeout used to update every minute
+let drawTimeout;
+
+// schedule a draw for the next minute
+let queueDraw = function() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+};
+
+
+// Stop updates when LCD is off, restart when on
+let lcdListenerBw = function(on) {
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+};
+Bangle.on('lcdPower', lcdListenerBw);
+
+let lockListenerBw = 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!
+    widget_utils.show();
+  }
+
+  draw();
+};
+Bangle.on('lock', lockListenerBw);
+
+let charging = function(charging){
+  // Jump to battery
+  clockInfoMenu.setItem(0, 2);
+  drawTime();
+};
+Bangle.on('charging', charging);
+
+let kill = function(){
+  clockInfoMenu.remove();
+  delete clockInfoMenu;
+};
+E.on("kill", kill);
+
+/************************************************
+ * Startup Clock
+ */
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    Bangle.removeListener('lcdPower', lcdListenerBw);
+    Bangle.removeListener('lock', lockListenerBw);
+    Bangle.removeListener('charging', charging);
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    // save settings
+    kill();
+    E.removeListener("kill", kill);
+    Bangle.removeListener('charging', charging);
+    widget_utils.show();
+  }
+});
+
+// Load widgets and draw clock the first time
+Bangle.loadWidgets();
+
+// Draw first time
+g.setColor(g.theme.fg).fillRect(0,135,W,H); // Otherwise this rect will wait for clock_info before updating
+draw();
+
+} // End of app scope
diff --git a/apps/bwclklite/app.png b/apps/bwclklite/app.png
new file mode 100644
index 000000000..5073f0ed0
Binary files /dev/null and b/apps/bwclklite/app.png differ
diff --git a/apps/bwclklite/metadata.json b/apps/bwclklite/metadata.json
new file mode 100644
index 000000000..f8dffdca9
--- /dev/null
+++ b/apps/bwclklite/metadata.json
@@ -0,0 +1,48 @@
+{
+  "id": "bwclklite",
+  "name": "BW Clock Lite",
+  "version": "0.34",
+  "description": "A very minimalistic clock. This version of BW Clock is quicker at the cost of the custom font.",
+  "readme": "README.md",
+  "icon": "app.png",
+  "screenshots": [
+    {
+      "url": "screenshot.png"
+    },
+    {
+      "url": "screenshot_2.png"
+    },
+    {
+      "url": "screenshot_3.png"
+    }
+  ],
+  "type": "clock",
+  "tags": "clock,clkinfo",
+  "supports": [
+    "BANGLEJS2"
+  ],
+  "dependencies": {
+    "clock_info": "module"
+  },
+  "allow_emulator": true,
+  "storage": [
+    {
+      "name": "bwclklite.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "bwclklite.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    },
+    {
+      "name": "bwclklite.settings.js",
+      "url": "settings.js"
+    }
+  ],
+  "data": [
+    {
+      "name": "bwclklite.setting.json"
+    }
+  ]
+}
diff --git a/apps/bwclklite/screenshot.png b/apps/bwclklite/screenshot.png
new file mode 100644
index 000000000..28983c9c4
Binary files /dev/null and b/apps/bwclklite/screenshot.png differ
diff --git a/apps/bwclklite/screenshot_2.png b/apps/bwclklite/screenshot_2.png
new file mode 100644
index 000000000..8d2f1717f
Binary files /dev/null and b/apps/bwclklite/screenshot_2.png differ
diff --git a/apps/bwclklite/screenshot_3.png b/apps/bwclklite/screenshot_3.png
new file mode 100644
index 000000000..573675d28
Binary files /dev/null and b/apps/bwclklite/screenshot_3.png differ
diff --git a/apps/bwclklite/settings.js b/apps/bwclklite/settings.js
new file mode 100644
index 000000000..2d3916a3d
--- /dev/null
+++ b/apps/bwclklite/settings.js
@@ -0,0 +1,50 @@
+(function(back) {
+    const SETTINGS_FILE = "bwclklite.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/calendar/ChangeLog b/apps/calendar/ChangeLog
index 05eca83c0..c7902e263 100644
--- a/apps/calendar/ChangeLog
+++ b/apps/calendar/ChangeLog
@@ -11,3 +11,6 @@
 0.10: Use default Bangle formatter for booleans
 0.11: Fix off-by-one-error on next year
 0.12: Mark dated events on a day
+0.13: Switch to swipe left/right for month and up/down for year selection
+      Display events for current month on touch
+0.14: Add support for holidays
diff --git a/apps/calendar/README.md b/apps/calendar/README.md
index 4fc6962cf..5f90d0d52 100644
--- a/apps/calendar/README.md
+++ b/apps/calendar/README.md
@@ -4,11 +4,14 @@ Basic calendar
 
 ## Usage
 
-- Use `BTN4` (left screen tap) to go to the previous month
-- Use `BTN5` (right screen tap) to go to the next month
+- Swipe left to go to the previous month
+- Swipe right to go to the next month
+- Swipe up (Bangle.js 2 only) to go to the previous year
+- Swipe down (Bangle.js 2 only) to go to the next year
+- Touch to display events for current month
+- Press the button (button 3 on Bangle.js 1) to exit
+- Holidays have same color as weekends and can be edited with the 'Download'-interface, e.g. by uploading an iCalendar file.
 
 ## Settings
 
-- Starts Sunday: whether the calendar should start on Sunday (default is Monday).
 - B2 Colors: use non-dithering colors (default, recommended for Bangle 2) or the original color scheme.
-
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index b61f2089c..d7c43eb1f 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -16,6 +16,7 @@ const white = "#ffffff";
 const red = "#d41706";
 const blue = "#0000ff";
 const yellow = "#ffff00";
+const cyan = "#00ffff";
 let bgColor = color4;
 let bgColorMonth = color1;
 let bgColorDow = color2;
@@ -23,12 +24,31 @@ let bgColorWeekend = color3;
 let fgOtherMonth = gray1;
 let fgSameMonth = white;
 let bgEvent = blue;
+let bgOtherEvent = "#ff8800";
 const eventsPerDay=6; // how much different events per day we can display
+const date = new Date();
 
 const timeutils = require("time_utils");
 let settings = require('Storage').readJSON("calendar.json", true) || {};
 let startOnSun = ((require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0) === 0;
-const events = (require("Storage").readJSON("sched.json",1) || []).filter(a => a.on && a.date); // all alarms that run on a specific date
+ // all alarms that run on a specific date
+const events = (require("Storage").readJSON("sched.json",1) || []).filter(a => a.on && a.date).map(a => {
+  const date = new Date(a.date);
+  const time = timeutils.decodeTime(a.t);
+  date.setHours(time.h);
+  date.setMinutes(time.m);
+  date.setSeconds(time.s);
+  return {date: date, msg: a.msg, type: "e"};
+});
+// add holidays & other events
+(require("Storage").readJSON("calendar.days.json",1) || []).forEach(d => {
+  const date = new Date(d.date);
+  const o = {date: date, msg: d.name, type: d.type};
+  if (d.repeat) {
+    o.repeat = d.repeat;
+  }
+  events.push(o);
+});
 
 if (settings.ndColors === undefined) {
   settings.ndColors = !g.theme.dark;
@@ -42,68 +62,16 @@ if (settings.ndColors === true) {
   fgOtherMonth = blue;
   fgSameMonth = black;
   bgEvent = color2;
+  bgOtherEvent = cyan;
 }
 
 function getDowLbls(locale) {
-  let dowLbls;
-  //TODO: Find some clever way to generate this programmatically from locale lib
-  switch (locale) {
-    case "de_AT":
-    case "de_CH":
-    case "de_DE":
-      if (startOnSun) {
-        dowLbls = ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"];
-      } else {
-        dowLbls = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
-      }
-      break;
-    case "nl_NL":
-      if (startOnSun) {
-        dowLbls = ["zo", "ma", "di", "wo", "do", "vr", "za"];
-      } else {
-        dowLbls = ["ma", "di", "wo", "do", "vr", "za", "zo"];
-      }
-      break;
-    case "fr_BE":
-    case "fr_CH":
-    case "fr_FR":
-      if (startOnSun) {
-        dowLbls = ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"];
-      } else {
-        dowLbls = ["Lu", "Ma", "Me", "Je", "Ve", "Sa", "Di"];
-      }
-      break;
-    case "sv_SE":
-      if (startOnSun) {
-        dowLbls = ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"];
-      } else {
-        dowLbls = ["Lu", "Ma", "Me", "Je", "Ve", "Sa", "Di"];
-      }
-      break;
-    case "it_CH":
-    case "it_IT":
-      if (startOnSun) {
-        dowLbls = ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa"];
-      } else {
-        dowLbls = ["Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"];
-      }
-      break;
-    case "oc_FR":
-      if (startOnSun) {
-        dowLbls = ["dg", "dl", "dm", "dc", "dj", "dv", "ds"];
-      } else {
-        dowLbls = ["dl", "dm", "dc", "dj", "dv", "ds", "dg"];
-      }
-      break;
-    default:
-      if (startOnSun) {
-        dowLbls = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
-      } else {
-        dowLbls = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
-      }
-      break;
-  }
-  return dowLbls;
+  let days = startOnSun ? [0, 1, 2, 3, 4, 5, 6] : [1, 2, 3, 4, 5, 6, 0];
+  const d = new Date();
+  return days.map(i => {
+    d.setDate(d.getDate() + (i + 7 - d.getDay()) % 7);
+    return require("locale").dow(d, 1);
+  });
 }
 
 function sameDay(d1, d2) {
@@ -192,6 +160,17 @@ function drawCalendar(date) {
     }
   }
 
+  const weekBeforeMonth = new Date(date.getTime());
+  weekBeforeMonth.setDate(weekBeforeMonth.getDate() - 7);
+  const week2AfterMonth = new Date(date.getFullYear(), date.getMonth()+1, 0);
+  week2AfterMonth.setDate(week2AfterMonth.getDate() + 14);
+  events.forEach(ev => {
+    if (ev.repeat === "y") {
+      ev.date.setFullYear(ev.date.getMonth() < 6 ? week2AfterMonth.getFullYear() : weekBeforeMonth.getFullYear());
+    }
+  });
+  const eventsThisMonth = events.filter(ev => ev.date > weekBeforeMonth && ev.date < week2AfterMonth);
+  eventsThisMonth.sort((a,b) => a.date - b.date);
   let i = 0;
   for (y = 0; y < rowN - 1; y++) {
     for (x = 0; x < colN; x++) {
@@ -204,6 +183,33 @@ function drawCalendar(date) {
       const y1 = y * rowH + headerH + rowH;
       const x2 = x * colW + colW;
       const y2 = y * rowH + headerH + rowH + rowH;
+
+      if (eventsThisMonth.length > 0) {
+        // Display events for this day
+        eventsThisMonth.forEach((ev, idx) => {
+          if (sameDay(ev.date, curDay)) {
+            switch(ev.type) {
+              case "e": // alarm/event
+                const hour = ev.date.getHours() + ev.date.getMinutes()/60.0;
+                const slice = hour/24*(eventsPerDay-1); // slice 0 for 0:00 up to eventsPerDay for 23:59
+                const height = (y2-2) - (y1+2); // height of a cell
+                const sliceHeight = height/eventsPerDay;
+                const ystart = (y1+2) + slice*sliceHeight;
+                g.setColor(bgEvent).fillRect(x1+1, ystart, x2-2, ystart+sliceHeight);
+                break;
+              case "h": // holiday
+                g.setColor(bgColorWeekend).fillRect(x1+1, y1+1, x2-1, y2-1);
+                break;
+              case "o": // other
+                g.setColor(bgOtherEvent).fillRect(x1+1, y1+1, x2-1, y2-1);
+                break;
+            }
+
+            eventsThisMonth.splice(idx, 1); // this event is no longer needed
+          }
+        });
+      }
+
       if (isToday) {
         g.setColor(red);
         g.drawRect(x1, y1, x2, y2);
@@ -215,21 +221,6 @@ function drawCalendar(date) {
         );
       }
 
-      // Display events for this day
-      const eventsCurDay = events.filter(ev => ev.date === curDay.toLocalISOString().substr(0, 10));
-      if (eventsCurDay.length > 0) {
-        g.setColor(bgEvent);
-        eventsCurDay.forEach(ev => {
-          const time = timeutils.decodeTime(ev.t);
-          const hour = time.h + time.m/60.0;
-          const slice = hour/24*(eventsPerDay-1); // slice 0 for 0:00 up to eventsPerDay for 23:59
-          const height = (y2-2) - (y1+2); // height of a cell
-          const sliceHeight = height/eventsPerDay;
-          const ystart = (y1+2) + slice*sliceHeight;
-          g.fillRect(x1+1, ystart, x2-2, ystart+sliceHeight);
-        });
-      }
-
       require("Font8x12").add(Graphics);
       g.setFont("8x12", fontSize);
       g.setColor(day < 50 ? fgOtherMonth : fgSameMonth);
@@ -242,23 +233,52 @@ function drawCalendar(date) {
   }
 }
 
-const date = new Date();
-drawCalendar(date);
-clearWatch();
-Bangle.on("touch", area => {
-  const month = date.getMonth();
-  if (area == 1) {
-    let prevMonth = month > 0 ? month - 1 : 11;
-    if (prevMonth === 11) date.setFullYear(date.getFullYear() - 1);
-    date.setMonth(prevMonth);
-  } else {
-    let nextMonth = month < 11 ? month + 1 : 0;
-    if (nextMonth === 0) date.setFullYear(date.getFullYear() + 1);
-    date.setMonth(nextMonth);
-  }
-  drawCalendar(date);
-});
+function setUI() {
+  Bangle.setUI({
+    mode : "custom",
+    swipe: (dirLR, dirUD) => {
+      if (dirLR<0) { // left
+        const month = date.getMonth();
+        let prevMonth = month > 0 ? month - 1 : 11;
+        if (prevMonth === 11) date.setFullYear(date.getFullYear() - 1);
+        date.setMonth(prevMonth);
+        drawCalendar(date);
+      } else if (dirLR>0) { // right
+        const month = date.getMonth();
+        let nextMonth = month < 11 ? month + 1 : 0;
+        if (nextMonth === 0) date.setFullYear(date.getFullYear() + 1);
+        date.setMonth(nextMonth);
+        drawCalendar(date);
+      } else if (dirUD<0) { // up
+        date.setFullYear(date.getFullYear() - 1);
+        drawCalendar(date);
+      } else if (dirUD>0) { // down
+        date.setFullYear(date.getFullYear() + 1);
+        drawCalendar(date);
+      }
+    },
+    btn: (n) => n === (process.env.HWVERSION === 2 ? 1 : 3) && load(),
+    touch: (n,e) => {
+      events.sort((a,b) => a.date - b.date);
+      const menu = events.filter(ev => ev.date.getFullYear() === date.getFullYear() && ev.date.getMonth() === date.getMonth()).map(e => {
+        const dateStr = require("locale").date(e.date, 1);
+        const timeStr = require("locale").time(e.date, 1);
+        return { title: `${dateStr} ${e.type === "e" ? timeStr : ""}` + (e.msg ? " " + e.msg : "") };
+      });
+      if (menu.length === 0) {
+        menu.push({title: /*LANG*/"No events"});
+      }
+      menu[""] = { title: require("locale").month(date) + " " + date.getFullYear() };
+      menu["< Back"] = () => {
+        E.showMenu();
+        drawCalendar(date);
+        setUI();
+      };
+      E.showMenu(menu);
+    }
+  });
+}
 
-// Show launcher when button pressed
-setWatch(() => load(), process.env.HWVERSION === 2 ? BTN : BTN3, { repeat: false, edge: "falling" });
+drawCalendar(date);
+setUI();
 // No space for widgets!
diff --git a/apps/calendar/interface.html b/apps/calendar/interface.html
new file mode 100644
index 000000000..280a96c0b
--- /dev/null
+++ b/apps/calendar/interface.html
@@ -0,0 +1,234 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <script src="../../core/lib/interface.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ical.js/1.5.0/ical.min.js"></script>
+    <script>
+let dataElement = document.getElementById("data");
+let holidays;
+
+function sameDay(d1, d2) {
+  return d1.getFullYear() === d2.getFullYear() &&
+    d1.getMonth() === d2.getMonth() &&
+    d1.getDate() === d2.getDate();
+}
+
+function render() {
+  holidays.sort((a,b) => new Date(a.date) - new Date(b.date));
+  document.getElementById('events').innerHTML = "";
+  holidays.forEach(holiday => {
+    renderHoliday(holiday);
+  });
+}
+
+function readFile(input) {
+  document.getElementById('upload').disabled = true;
+
+  for(let i=0; i<input.files.length; i++) {
+    const reader = new FileReader();
+    reader.addEventListener("load", () => {
+      const jCalData = ICAL.parse(reader.result);
+      const comp = new ICAL.Component(jCalData);
+      // Fetch the VEVENT part
+      comp.getAllSubcomponents('vevent').forEach(vevent => {
+        event = new ICAL.Event(vevent);
+        holidays = holidays.filter(holiday => !sameDay(new Date(holiday.date), event.startDate.toJSDate())); // remove if already exists
+
+        const holiday = eventToHoliday(event);
+
+        holidays.push(holiday);
+      });
+
+      render();
+    }, false);
+
+    reader.readAsText(input.files[i], "UTF-8");
+  }
+}
+
+function eventToHoliday(event) {
+  const date = event.startDate.toJSDate();
+
+  const holiday = {
+    date: formatDate(date),
+    name: event.summary,
+    type: 'h',
+  };
+  return holiday;
+}
+
+function formatDate(d) {
+  return d.getFullYear() + "-" + (d.getMonth() + 1).toString().padStart(2, '0') + "-" + d.getDate().toString().padStart(2, '0');
+}
+
+function upload() {
+  Util.showModal("Saving...");
+  Util.writeStorage("calendar.days.json", JSON.stringify(holidays), () => {
+    location.reload(); // reload so we see current data
+  });
+}
+
+function renderHoliday(holiday) {
+  const localDate = new Date(holiday.date);
+
+  const tr = document.createElement('tr');
+  tr.classList.add('event-row');
+  const tdTime = document.createElement('td');
+  tr.appendChild(tdTime);
+  const inputTime = document.createElement('input');
+  inputTime.type = "date";
+  inputTime.classList.add('event-date');
+  inputTime.classList.add('form-input');
+  inputTime.value = formatDate(localDate)
+  inputTime.onchange = (e => {
+    const date = new Date(inputTime.value);
+    holiday.date = formatDate(date);
+  });
+  tdTime.appendChild(inputTime);
+
+  const tdSummary = document.createElement('td');
+  tr.appendChild(tdSummary);
+  const inputSummary = document.createElement('input');
+  inputSummary.type = "text";
+  inputSummary.classList.add('event-summary');
+  inputSummary.classList.add('form-input');
+  inputSummary.maxLength=40;
+  const summary = (holiday.name?.substring(0, inputSummary.maxLength) || "");
+  inputSummary.value = summary;
+  inputSummary.onchange = (e => {
+    holiday.name = inputSummary.value;
+  });
+  tdSummary.appendChild(inputSummary);
+  inputSummary.onchange();
+
+  const tdType = document.createElement('td');
+  tr.appendChild(tdType);
+  const selectType = document.createElement("select");
+  selectType.classList.add('form-select');
+  tdType.prepend(selectType);
+  const optionHoliday = document.createElement("option");
+  optionHoliday.text = "Holiday";
+  optionHoliday.value = "h";
+  optionHoliday.selected = holiday.type === "h";
+  selectType.add(optionHoliday);
+  const optionOther = document.createElement("option");
+  optionOther.text = "Other";
+  optionOther.value = "o";
+  optionOther.selected = holiday.type === "o";
+  selectType.add(optionOther);
+  selectType.onchange = (e => {
+    holiday.type = e.target.value;
+  });
+
+  const tdRepeat = document.createElement('td');
+  tr.appendChild(tdRepeat);
+  const selectRepeat = document.createElement("select");
+  selectRepeat.classList.add('form-select');
+  tdRepeat.prepend(selectRepeat);
+  const optionNever = document.createElement("option");
+  optionNever.text = "Never";
+  optionNever.selected = !holiday.repeat;
+  selectRepeat.add(optionNever);
+  const optionYearly = document.createElement("option");
+  optionYearly.text = "Yearly";
+  optionYearly.value = "y";
+  optionYearly.selected = holiday.repeat === "y";
+  selectRepeat.add(optionYearly);
+  selectRepeat.onchange = (e => {
+    holiday.repeat = e.target.value;
+  });
+
+  const tdAction = document.createElement('td');
+  tr.appendChild(tdAction);
+
+  const buttonDelete = document.createElement('button');
+  buttonDelete.classList.add('btn');
+  buttonDelete.classList.add('btn-action');
+  tdAction.prepend(buttonDelete);
+  const iconDelete = document.createElement('i');
+  iconDelete.classList.add('icon');
+  iconDelete.classList.add('icon-delete');
+  buttonDelete.appendChild(iconDelete);
+  buttonDelete.onclick = (e => {
+    holidays = holidays.filter(a => a !== holiday);
+    document.getElementById('events').removeChild(tr);
+  });
+
+  document.getElementById('events').appendChild(tr);
+  document.getElementById('upload').disabled = false;
+}
+
+function addHoliday() {
+  const holiday = {date: formatDate(new Date()), type: 'h'};
+  renderHoliday(holiday);
+  holidays.push(holiday);
+  render();
+}
+
+function getData() {
+  Util.showModal("Loading...");
+  Puck.write(`\x10(function() {
+    Bluetooth.print(JSON.stringify(require("Storage").list("calendar.days.json").sort()));
+    })()\n`, contents => {
+      const fileNames = JSON.parse(contents);
+      if (fileNames.length > 0) {
+        Util.readStorage('calendar.days.json',data=>{
+          holidays = JSON.parse(data || "[]") || [];
+
+          Util.hideModal();
+          render();
+        });
+      } else {
+        holidays = [];
+        Util.hideModal();
+      }
+  });
+}
+
+// Called when app starts
+function onInit() {
+  getData();
+}
+    </script>
+  </head>
+  <body>
+    <h4 class="float-left">Holidays</h4>
+
+    <div class="float-right">
+      <button class="btn" onclick="addHoliday();">
+        <i class="icon icon-plus"></i>
+      </button>
+    </div>
+
+    <table class="table table-scroll" style="clear:both;">
+      <thead>
+        <tr>
+          <th>Date</th>
+          <th>Holiday</th>
+          <th>Type</th>
+          <th>Repeat</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody id="events">
+      </tbody>
+    </table>
+
+    <div class="divider"></div>
+    <div class="form-horizontal">
+      <div class="form-group">
+        <div class="col-5 col-xs-12">
+          <label class="form-label" for="fileinput">Add from iCalendar file</label>
+        </div>
+        <div class="col-7 col-xs-12">
+          <input id="fileinput" class="form-input" type="file" onchange="readFile(this)" accept=".ics,.ifb,.ical,.ifbf" multiple/>
+        </div>
+      </div>
+    </div>
+    <div class="divider"></div>
+
+    <button id="upload" class="btn btn-primary" onClick="upload()" disabled>Upload</button>
+    <button id="reload" class="btn" onClick="location.reload()">Reload</button>
+  </body>
+</html>
diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json
index 5bfc422fa..44a68d879 100644
--- a/apps/calendar/metadata.json
+++ b/apps/calendar/metadata.json
@@ -1,18 +1,19 @@
 {
   "id": "calendar",
   "name": "Calendar",
-  "version": "0.12",
+  "version": "0.14",
   "description": "Simple calendar",
   "icon": "calendar.png",
   "screenshots": [{"url":"screenshot_calendar.png"}],
-  "tags": "calendar",
+  "tags": "calendar,tool",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
+  "interface": "interface.html",
   "storage": [
     {"name":"calendar.app.js","url":"calendar.js"},
     {"name":"calendar.settings.js","url":"settings.js"},
     {"name":"calendar.img","url":"calendar-icon.js","evaluate":true}
   ],
-  "data": [{"name":"calendar.json"}]
+  "data": [{"name":"calendar.json"}, {"name":"calendar.days.json"}]
 }
diff --git a/apps/cassioWatch/ChangeLog b/apps/cassioWatch/ChangeLog
index 1180554ff..e0abc576c 100644
--- a/apps/cassioWatch/ChangeLog
+++ b/apps/cassioWatch/ChangeLog
@@ -10,4 +10,5 @@
 0.9: Remove ESLint spaces
 0.10: Show daily steps, heartrate and the temperature if weather information is available.
 0.11: Tell clock widgets to hide.
-0.12: Swipe down to see widgets, step counter now just uses getHealthStatus 
+0.12: Swipe down to see widgets, step counter now just uses getHealthStatus
+0.13: Report latest HRM rather than HRM 10 minutes ago (fix #2395)
\ No newline at end of file
diff --git a/apps/cassioWatch/app.js b/apps/cassioWatch/app.js
index 19dd883d2..68c8a3ceb 100644
--- a/apps/cassioWatch/app.js
+++ b/apps/cassioWatch/app.js
@@ -121,7 +121,7 @@ function draw() {
   g.setFontAlign(0,-1);
   g.setFont("8x12", 2);
   g.drawString(getTemperature(), 155, 132);
-  g.drawString(Math.round(Bangle.getHealthStatus("last").bpm), 109, 98);
+  g.drawString(Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm), 109, 98);
   g.drawString(getSteps(), 158, 98);
 
   g.setFontAlign(-1,-1);
diff --git a/apps/cassioWatch/metadata.json b/apps/cassioWatch/metadata.json
index 5ac4502fd..fb7dfd401 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.12",
+  "version": "0.13",
   "type": "clock",
   "tags": "clock, weather, cassio, retro",
   "supports": ["BANGLEJS2"],
@@ -12,7 +12,10 @@
   "readme": "README.md",
   "storage": [
     { "name": "cassioWatch.app.js", "url": "app.js" },
-    {"name":"cassioWatch.settings.js","url":"settings.js"},
+    { "name": "cassioWatch.settings.js","url": "settings.js" },
     { "name": "cassioWatch.img", "url": "icon.js", "evaluate": true }
+  ],
+  "data": [
+    { "name": "cassioWatch.settings.json" }
   ]
 }
diff --git a/apps/chance/README.md b/apps/chance/README.md
new file mode 100644
index 000000000..3f8e15ed5
--- /dev/null
+++ b/apps/chance/README.md
@@ -0,0 +1,11 @@
+# Chance
+
+![](chance-coin.png)
+
+* Toss a coin just touch the screen  
+* If you click in the dice button change to roll mode
+
+![](chance-dice.png)
+
+* Roll the dice just touch the screen  
+* If you click in the coin button change to toss mode
diff --git a/apps/chance/chance-coin.png b/apps/chance/chance-coin.png
new file mode 100644
index 000000000..dd1a581eb
Binary files /dev/null and b/apps/chance/chance-coin.png differ
diff --git a/apps/chance/chance-dice.png b/apps/chance/chance-dice.png
new file mode 100644
index 000000000..45d12992f
Binary files /dev/null and b/apps/chance/chance-dice.png differ
diff --git a/apps/chance/chance.app.js b/apps/chance/chance.app.js
new file mode 100644
index 000000000..d6a0d1a40
--- /dev/null
+++ b/apps/chance/chance.app.js
@@ -0,0 +1,328 @@
+/*
+Chance
+by Michael Sillas
+*/
+
+
+var volinit = true;
+var aleatorio;
+var chance=false;
+var chanceforma='moneda';
+var ang = 0;
+var puntosale = 1;
+
+function inipinta(){
+g.clear();
+
+
+//color de fondo de default
+g.setBgColor('#2c04ac');
+
+
+//Pinta rec de fondo
+g.setColor('#2c04ac').fillRect(0, 0, g.getHeight(),  g.getWidth());
+}
+
+
+Bangle.on('touch', function(zone,e) { 
+  var cordenadas= Object.values(e);
+if(chanceforma=='moneda'){
+  
+  if(chance==false){
+      
+
+
+      if(cordenadas[0] > 85 && cordenadas[1] > 134)
+        {
+         
+          chanceforma='dado';
+          chanceproc();
+        }
+
+      else
+      {
+      
+        drawvolado();
+        }        
+      }
+   }
+  else if(chanceforma=='dado'){
+   if(chance==false){ 
+    if(cordenadas[0] < 88 && cordenadas[1] > 134)
+        {
+        
+          volinit=true;
+          chanceforma='moneda';
+          chanceproc();
+        }
+    else
+    {
+    drawavdado();
+    }
+          
+          }
+  }
+   });
+
+
+function getImage(x){
+
+if (x==1) {   
+  return require("heatshrink").decompress(atob("qFQwkBiIA/AH4A/AH4A/AGcAAAQllFMQmHFDwmJFDkQE5cBE0ooaExonYJxyhYDpIxGKCocGBZQnVNZgoFJzJCIE7wONE7AOYDBq4KE7CRDax4nUQzgn/E/7VTfxYn/OwgniEwaeIGgInlLLJ2NE7AmEDhANFPaYYLEowpTIBYmKE6AVFOwgmLE54VLBYwzCGIR1UJxLvHiB1YBYgJBfRJ1WJwYiCE6Z1LBgg6EE6DfHLZInVExgNDEIYnROpieHE6QmMTw4nROponYOowPME6YmOE65OFCRQncCBzvSJx4nWJyA5EE6zYRE6omMPA4nNJyI6HE8DaFE45sGOyLbHPgwnaKAoAHYy4oPE7YoLE5DGPFJiyKE6rvHE6I/LE6YAOE84dHDQKEKE6S6JE7zXTE87kFE+omTPBZHDBwROUAH4A/AH4Ar"));
+      }
+  
+  else if(x==2) {
+  return require("heatshrink").decompress(atob("qFQwkBiIA/AD0QNAZlhSQ5MiFETkLJ0oobExrMZExpQZJ5xQ/KFInPKDB4/KD4nYKBwnYKBwnbKhgnYiBCCE8akOE/7yPE0wnaExjvaE/52cgIn/E84mNE7DFOYzAmOdzJQOY0wnXEZhaCYyxLNE7CbOBwROjgKeXdR52mE7AoNEYKeXFBsBYzDINGgR2WE5YiCE8iEEE84mXO5oNBE8QjDE8hQCE7KSBE8qgNE88QE80RAYYnjADLIIgIJCE8gEDKTh7oE5JQdE5RQcE+R4cE/4AOiAn/OzTwaJxgnaExgn/Ox7IZE84mOE65OPE/4mPE/x2QE/wmQgIcKA"));
+  
+  }
+  
+  else if(x==3) {
+ return require("heatshrink").decompress(atob("t1uwkEogA/AH4A/AH4A/AC1AgAAZGSwxaHTJnbABUEGug3PGs6nNNlA3NCQ8BiIAZGyJsEgMimc//4AbmciiDdNBocCGboAFkBuMBgcvGsQABN4ajLgQ1k//xUpQ2DNkpuEGw41CgI1m//wUpIJCh42nUoY2Jj42n/42MbU7cLGwU/G1EgG2swGxY1oGxNAG1nwGxUBG342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G342/G3420gA2pmA2Hog25n42okA21iA2Ll42oFgQ1FGwcPGs/zGxkCG0/xGxNABQQ2nmA2Nj7apgg2KUsyjDGw7cDgEvGsfziCjJGwsBn42iGoY2JUoYABkY0fmQ1EUZBuFOAURADg0ENhRuHAEo2KNww1vN1LZKG9Q1OU8w0QHMRpRAH4A/AH4A/AH4ADA=="));
+  }
+}
+
+
+function rotar(){
+  ang +=  0.157;
+  g.clearRect(0, 0, g.getHeight(),  139);
+  g.drawImage(getImage(3),87,77,  {rotate : ang});
+  
+}
+
+//Volado Letras (Toss)
+function toss(){
+ 
+  if(chance==false)
+  { 
+    g.setColor('#06f77b');
+    }
+  
+  else
+    
+  {
+   g.setColor('#D8D8D8');
+  }
+  
+    g.setFontAlign(0,0); // center font
+    g.setFont("Vector",26); // bitmap font, 8x magnified
+    g.drawString("Toss",44,160);
+}
+
+
+
+//Roll dado Letras (Roll)
+function roll(){
+ 
+ if(chance==false)
+  { 
+    g.setColor('#06f77b');
+    }
+  
+  else
+    
+  {
+   g.setColor('#D8D8D8');
+  }
+  
+    g.setFontAlign(0,0); // center font
+    g.setFont("Vector",26); // bitmap font, 8x magnified
+    g.drawString("Roll",135,160);
+}
+
+
+
+function getRandomIntInclusive(min, max) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
+}
+
+
+function drawvolado()
+{
+ 
+ 
+  if(volinit==true){ //si es inicial el volado
+   aleatorio = 1;
+    g.drawImage(getImage(1),49,30);
+ 
+    }
+  
+  else{
+    chance=true;
+  toss();
+  setInterval(function () {
+    
+      if(aleatorio==1){
+      g.setColor('#D4AF37').fillCircle(g.getWidth()/2,73,50);
+      aleatorio=2;
+      }
+      else if(aleatorio==2){
+      g.setColor('#c0c0c0').fillCircle(g.getWidth()/2,73,50);      
+      aleatorio=1;
+      }
+}, 500, aleatorio);
+    
+    
+    setTimeout(function () {
+       clearInterval();
+ aleatorio = getRandomIntInclusive(1,2); 
+      
+     if(aleatorio==1){
+
+    g.setColor('#c0c0c0');
+    g.fillCircle(g.getWidth()/2,73,50);
+
+        }
+      else if(aleatorio==2){
+
+
+    g.setColor('#D4AF37');
+    g.fillCircle(g.getWidth()/2,73,50);
+      }
+  
+  
+   g.drawImage(getImage(aleatorio),49,30);// Expected output: 1 or 2 
+   chance=false;   
+   toss();    
+}, 2500);
+    
+
+  }
+   volinit = false; 
+}
+
+function drawavdado()
+{
+ chance=true;
+  roll();
+ setInterval(rotar,100);
+    
+    setTimeout(function () {
+       clearInterval();
+      
+      puntosale = getRandomIntInclusive(1,6);
+      
+    
+      g.clearRect(0, 0, g.getHeight(),  139);
+  g.drawImage(getImage(3),30,24);
+      
+        switch (puntosale) {
+        case 1:
+         g.setColor('#000000').fillCircle(86,77,9);  
+        break;    
+        case 2:
+        g.setColor('#000000').fillCircle(68,63,9);
+        g.setColor('#000000').fillCircle(104,98,9);    
+        break;    
+        case 3:
+        g.setColor('#000000').fillCircle(65,55,9);
+        g.setColor('#000000').fillCircle(86,77,9);
+        g.setColor('#000000').fillCircle(108,100,9);
+        break;
+        case 4:
+        g.setColor('#000000').fillCircle(65,55,9);
+        g.setColor('#000000').fillCircle(107,55,9);
+        g.setColor('#000000').fillCircle(65,100,9);
+        g.setColor('#000000').fillCircle(107,100,9);
+        break;
+        case 5:
+        g.setColor('#000000').fillCircle(65,55,9);
+        g.setColor('#000000').fillCircle(107,55,9);
+        g.setColor('#000000').fillCircle(86,77,9);
+        g.setColor('#000000').fillCircle(65,100,9);
+        g.setColor('#000000').fillCircle(107,100,9);
+        break;
+        case 6:
+        g.setColor('#000000').fillCircle(65,55,9);
+        g.setColor('#000000').fillCircle(65,77,9);
+        g.setColor('#000000').fillCircle(65,100,9);
+        g.setColor('#000000').fillCircle(107,55,9);
+        g.setColor('#000000').fillCircle(107,77,9);
+        g.setColor('#000000').fillCircle(107,100,9);
+        break;
+      }
+
+       chance=false;
+      roll();
+}, 2000);
+}
+
+//##################### Inicia Volado
+
+
+
+function chanceproc()
+{
+
+
+    if(chanceforma=='moneda'){
+   
+      
+    inipinta();
+
+    //Pinta rec de boton
+    g.setColor('#06f77b').fillRect(g.getWidth()/2, 143, g.getWidth(),  g.getWidth());
+
+
+    //Circulo concentrico externo moneda
+    g.setColor('#000000').fillCircle(g.getWidth()/2,73,55);
+
+    //Circulo concentrico interno moneda
+    g.setColor('#c0c0c0').fillCircle(g.getWidth()/2,73,50);
+
+
+    toss();
+
+    //####### Inicio dibuja dado boton
+    g.setColor('#000000');
+    g.fillRect(117, 145,147, 173);
+
+    g.setColor('#FFFFFF');
+    g.fillRect(119, 147,145, 171);
+
+    g.setColor('#000000');
+    g.fillCircle(132,159,4);
+    //####### Fin dibuja dado boton
+
+
+    drawvolado();
+
+    }//##### fin volado
+  
+  else if(chanceforma=='dado'){
+    
+     inipinta();      
+           
+     //Pinta rec de boton
+    g.setColor('#06f77b').fillRect(0, 143, g.getWidth()/2,  g.getWidth());
+    
+    
+    roll();
+    
+    //####### Inicio dibuja moneda boton
+    
+    //Circulo icono externo moneda
+    g.setColor('#000000').fillCircle(43,159,15);
+    
+    //Circulo icono interno moneda
+    g.setColor('#c0c0c0').fillCircle(43,159,12);
+    
+    //####### Fin dibuja moneda boton
+    
+    g.setFont("Vector",17); g.setColor('#000000'); g.drawString('2c',45,160);
+    
+      //Uno
+    
+      g.drawImage(getImage(3),30,24);
+    
+    
+      g.setColor('#000000').fillCircle(86,77,9);
+   
+  
+    }
+  
+
+}  
+
+chanceproc();
diff --git a/apps/chance/chance.img.js b/apps/chance/chance.img.js
new file mode 100644
index 000000000..019fac9c2
--- /dev/null
+++ b/apps/chance/chance.img.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEogAfFIgmQoBDHDJoWCgMRAAQYOCwczAAcyiAJBLZkSCwgACDBYuBCxAxDJJBEGAAsxGBAuBiYOBOgRJIGAwuDKwQ1HmQwGFwY8CAAUDDAsgC4wnCXwYwIEgJIEEwQhBCQQ/CMI4XFkZdCPIQdCBIJIJLwIICgQODmAdEJAgXDCYgXMNwJICQo5HKMAgkISgQhIC4YkHR4swBwZRBC4QkHSgJpCmUQZAIZBC5byCe4xwBSAYXHdwgDBkEjmQeDC5CMBNAQPBkZfEC5JACV4QcBO4qCBC450BIoQXBAgIvNIogdCSIIXNIogXOBAQHBIoZHJX4gICIwIuEB4SPFkEEC4SuBOoTEHX4MTX4UQC4VAFQQXId4wXELQUQLwpiEiUieIMAC4YrCHwMikMRAAMSMQZfCOwZgEHoZBFJILkEC4i0BBAIXIPohGCJAinBgJFBkURTQZ8EC4gwBEwwAHIwqRFABSNEJAo/FFxxICaw5dLSQxFJFxBJDDBBFBFxIYDgLnCAAMhFoIWLMQYABYQIECCxoxDAAgVOAH4ABA"))
diff --git a/apps/chance/chance.png b/apps/chance/chance.png
new file mode 100644
index 000000000..2e9edeef2
Binary files /dev/null and b/apps/chance/chance.png differ
diff --git a/apps/chance/metadata.json b/apps/chance/metadata.json
new file mode 100644
index 000000000..fd55e9d05
--- /dev/null
+++ b/apps/chance/metadata.json
@@ -0,0 +1,17 @@
+{ "id": "chance",
+  "name": "Chance",
+  "shortName":"Chance",
+  "version":"0.01",
+  "description": "Toss a coin or Roll the dice, chose your chance with this app.",
+  "icon": "chance.png",
+  "type":"app",
+  "tags": "tool",
+  "supports" : ["BANGLEJS2"],  
+  "allow_emulator": true,
+  "readme": "README.md",
+  "storage": [
+    {"name":"chance.app.js","url":"chance.app.js"},
+    {"name":"chance.img","url":"chance.img.js","evaluate":true}
+  ],
+  "screenshots": [{"url":"chance-coin.png"},{"url":"chance-dice.png"}]
+}
diff --git a/apps/chargent/ChangeLog b/apps/chargent/ChangeLog
index 7f837e50e..d7081ecfb 100644
--- a/apps/chargent/ChangeLog
+++ b/apps/chargent/ChangeLog
@@ -1 +1,5 @@
 0.01: First version
+0.02: Support BangleJS2
+0.03: Added threshold
+0.04: Added notification
+0.05: Fixed boot
diff --git a/apps/chargent/README.md b/apps/chargent/README.md
index 56bc763b4..db93615a6 100644
--- a/apps/chargent/README.md
+++ b/apps/chargent/README.md
@@ -6,6 +6,8 @@ The first stage of charging Li-ion ends at ~80% capacity when the charge voltage
 
 This app has no UI and no configuration. To disable the app, you have to uninstall it.
 
+New in v0.03: before the very first buzz, the average value after the peak is written to chargent.json and used as threshold for future charges. This reduces the time spent in the second charge stage.
+
 Side notes
 - Full capacity is reached after charge current drops to an insignificant level. This is quite some time after charge voltage reached its peak / `E.getBattery()` returns 100.
 - This app starts buzzing some time after `E.getBattery()` returns 100 (~15min on my watch), and at least 5min after the peak to account for noise.
diff --git a/apps/chargent/boot.js b/apps/chargent/boot.js
index 802c3f55a..c8fd4f930 100644
--- a/apps/chargent/boot.js
+++ b/apps/chargent/boot.js
@@ -1,30 +1,44 @@
 (() => {
+  const pin = process.env.HWVERSION === 2 ? D3 : D30;
+
   var id;
-  Bangle.on('charging', (charging) => {
+  function gent(charging) {
     if (charging) {
       if (!id) {
         var max = 0;
-        var count = 0;
+        var cnt = 0;
+        var sum = 0;
+        var lim = (require('Storage').readJSON('chargent.json', true) || {}).limit || 0;
         id = setInterval(() => {
-          var d30 = analogRead(D30);
-          if (max < d30) {
-            max = d30;
-            count = 0;
+          var val = analogRead(pin);
+          if (max < val) {
+            max = val;
+            cnt = 1;
+            sum = val;
           } else {
-            count++;
-            if (10 <= count) {  // 10 * 30s == 5 min  // TODO ? customizable
-              // TODO ? customizable
-              Bangle.buzz(500);
-              setTimeout(() => Bangle.buzz(500), 1000);
-            }
+            cnt++;
+            sum += val;
           }
-        }, 30*1000);
+          if (10 < cnt || (lim && lim <= max)) {  // 10 * 30s == 5 min  // TODO ? customizable
+            if (!lim) {
+              lim = sum / cnt;
+              require('Storage').writeJSON('chargent.json', {limit: lim});
+            }
+            require('notify').show({id: 'chargent', title: 'Fully charged'});
+            // TODO ? customizable
+            Bangle.buzz(500);
+            setTimeout(() => Bangle.buzz(500), 1000);
+          }
+        }, 3e4);
       }
     } else {
       if (id) {
-        clearInterval(id);
-        id = undefined;
+        id = clearInterval(id);
+        require('notify').hide({id: 'chargent'});
       }
     }
-  });
+  }
+
+  Bangle.on('charging', gent);
+  if (Bangle.isCharging()) gent(true);
 })();
diff --git a/apps/chargent/boot.min.js b/apps/chargent/boot.min.js
deleted file mode 100644
index 700198146..000000000
--- a/apps/chargent/boot.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var a;Bangle.on("charging",function(e){if(e){if(!a){var c=0,b=0;a=setInterval(function(){var d=analogRead(D30);c<d?(c=d,b=0):(b++,10<=b&&(Bangle.buzz(500),setTimeout(function(){return Bangle.buzz(500)},1E3)))},3E4)}}else a&&(clearInterval(a),a=void 0)})})()
\ No newline at end of file
diff --git a/apps/chargent/metadata.json b/apps/chargent/metadata.json
index 4ec3e437c..d43493ada 100644
--- a/apps/chargent/metadata.json
+++ b/apps/chargent/metadata.json
@@ -1,13 +1,17 @@
 { "id": "chargent",
   "name": "Charge Gently",
-  "version": "0.01",
+  "version": "0.05",
   "description": "When charging, reminds you to disconnect the watch to prolong battery life.",
   "icon": "icon.png",
   "type": "bootloader",
   "tags": "battery",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "dependencies": {"notify": "type"},
   "readme": "README.md",
   "storage": [
-    {"name": "chargent.boot.js", "url": "boot.min.js"}
+    {"name": "chargent.boot.js", "url": "boot.js"}
+  ],
+  "data": [
+    {"name": "chargent.json"}
   ]
 }
diff --git a/apps/chargerot/ChangeLog b/apps/chargerot/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/chargerot/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/chargerot/README.md b/apps/chargerot/README.md
new file mode 100644
index 000000000..764a5ffda
--- /dev/null
+++ b/apps/chargerot/README.md
@@ -0,0 +1,10 @@
+# Charge LCD rotation
+
+This simple app is for handling all types of charging cradles i.e.:
+- [Official Bangle.js 2 dock](https://shop.espruino.com/banglejs2-dock)
+- [Many more you can 3d print](https://www.thingiverse.com/search?q=banglejs+dock&page=1&type=things&sort=relevant)
+
+## Setup
+In app settings set desired rotation.  
+App will swap screen rotation when charged and return to default one (you can change this in settings app) when undocked.
+
diff --git a/apps/chargerot/boot.js b/apps/chargerot/boot.js
new file mode 100644
index 000000000..0a4361c50
--- /dev/null
+++ b/apps/chargerot/boot.js
@@ -0,0 +1,14 @@
+(() => {
+    const chargingRotation = 0 | require('Storage').readJSON("chargerot.settings.json").rotate;
+    const defaultRotation = 0 | require('Storage').readJSON("setting.json").rotate;
+    if (Bangle.isCharging()) g.setRotation(chargingRotation&3,chargingRotation>>2).clear();
+    Bangle.on('charging', (charging) => {
+        if (charging) {
+            g.setRotation(chargingRotation&3,chargingRotation>>2).clear();
+            Bangle.showClock();
+        } else {
+            g.setRotation(defaultRotation&3,defaultRotation>>2).clear();
+            Bangle.showClock();
+        }
+    });
+})();
diff --git a/apps/chargerot/icon.png b/apps/chargerot/icon.png
new file mode 100644
index 000000000..3347098e5
Binary files /dev/null and b/apps/chargerot/icon.png differ
diff --git a/apps/chargerot/metadata.json b/apps/chargerot/metadata.json
new file mode 100644
index 000000000..1b13403d7
--- /dev/null
+++ b/apps/chargerot/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "chargerot",
+  "name": "Charge LCD rotation",
+  "version": "0.01",
+  "description": "When charging, this app can rotate your screen and revert it when unplugged. Made for all sort of cradles.",
+  "icon": "icon.png",
+  "tags": "battery",
+  "readme": "README.md",
+  "type": "bootloader",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"chargerot.boot.js","url":"boot.js"},
+    {"name":"chargerot.settings.js","url":"settings.js"}
+  ],
+  "data":[{"name":"chargerot.settings.json"}]
+}
diff --git a/apps/chargerot/settings.js b/apps/chargerot/settings.js
new file mode 100644
index 000000000..eaaa488f1
--- /dev/null
+++ b/apps/chargerot/settings.js
@@ -0,0 +1,28 @@
+(function(back) {
+  var rotNames = [/*LANG*/"No",/*LANG*/"Rotate CW",/*LANG*/"Left Handed",/*LANG*/"Rotate CCW",/*LANG*/"Mirror"];
+  var FILE = "chargerot.settings.json";
+  var appSettings = Object.assign({
+    rotate: 0,
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, appSettings);
+  }
+
+
+  E.showMenu({
+    "" : { "title" : "Charging rotation" },
+    "< Back" : () => back(),
+    'Rotate': {
+      value: 0|appSettings.rotate,
+      min: 0, 
+      max: rotNames.length-1,
+      format: v=> rotNames[v],
+      onchange: v => {
+        appSettings.rotate = 0 | v;
+        writeSettings();
+      }
+    },
+  });
+  // If(true) big();
+})
\ No newline at end of file
diff --git a/apps/chess/ChangeLog b/apps/chess/ChangeLog
new file mode 100644
index 000000000..fb08248ff
--- /dev/null
+++ b/apps/chess/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Bugfixes
diff --git a/apps/chess/app-icon.js b/apps/chess/app-icon.js
new file mode 100644
index 000000000..2aa34d5ae
--- /dev/null
+++ b/apps/chess/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AH4A/AEnPAEAv/wAAcF6XWAAYdFBQgLLF/4v/F/4vTFKoLGF/4v/F/4v/F4QpWBQov/F7UslgKBAYIABEgIDDF/4v/F4es1gvTdKoLBFYYAHF/4vTmQvuvQwJFxAvbAAOIxIAFFxIvzFKYLG6CMNF8GsF92BdpwvfqwvtRwgvQAC+IxIAJF5QAYF93OwEyRwqSPACwsJGEov/AH4A/AH4AwA="))
diff --git a/apps/chess/app.js b/apps/chess/app.js
new file mode 100644
index 000000000..3d584b261
--- /dev/null
+++ b/apps/chess/app.js
@@ -0,0 +1,301 @@
+// Using p4wn chess engine: https://p4wn.sourceforge.net/ | https://github.com/douglasbagnall/p4wn
+const engine = require("chessengine");
+
+Bangle.loadWidgets(); // load before first appRect call
+
+const FIELD_WIDTH = Bangle.appRect.w/8;
+const FIELD_HEIGHT = Bangle.appRect.h/8;
+const SETTINGS_FILE = "chess.json";
+const DEFAULT_TIMEOUT = Bangle.getOptions().lockTimeout;
+const ICON_SIZE=45;
+const ICON_BISHOP = require("heatshrink").decompress(atob("lstwMB/4Ac/wFE4IED/kPAofgn4FDGon8j4QEBQgQE4EHBQcACwfAgF/BQYWD8EAHAX+NgI4C+AQEwAQDDYIhDDYMDCAQKBGQQsHHogKDCAJODCAI3CHoQKCHoIQDHoIQCFgoQBFgfgIQYmBEIQECKgIrCBYQKDC4OBg/8iCvEAC+AA="));
+const ICON_PAWN = require("heatshrink").decompress(atob("lstwMB/4At/AFEGon4h4FDwE/AgX8CAngCAkAv4bDgYbECAf4gAhD4AhD/kAg4mDCAkACAYbBEIYQBG4gbDEII9DFhXAgEfBQYWDEwJUC/wKBGQXwCAgEBE4RCBCAYmBCAQmCCAQmBCAbdCCAIbCQ4gAYwA="));
+const ICON_KING = require("heatshrink").decompress(atob("lstwMB/4Ac/wFE+4KEh4FD+F/AofvCwgKE+IKEg4bEj4FDwADC/k8g+HAoJhCC4PwAoQXBNod//AECgYfBAoUP/gQE8AQEBQcfCAaLBCAZmBEIZuBBQgyDJAIWCPgXAEAQWDBQRUCPgQnBHgJqBLwYhDOwRvDGQc/EIaSDCwLedwAA=="));
+const ICON_QUEEN = require("heatshrink").decompress(atob("lstwMB/4Ac/l/AgXn4PzAgP+j0Ph4FB8FwuE///PgeDwPn/k8n0+j0f4Hz+Px8F+g/Px+fgf4vgACn/jAAf/x8Pj0en/8vAsB+P/+PBwcHj//w0MjEwJgMwsHBw5CBwMEhBDBPoR6B/gFCDYPgAoRZBAgUH//4AoQbB4AbDCAYbBCAZ1CAgJ7CwAKDGQQmBCAYmBEIQmC+AQEDYQQBDYQQCFgo3CXQIsFBYIEDACmAA="));
+const ICON_ROOK = require("heatshrink").decompress(atob("lstwMB/4Ax/0HgPAAoPwnEOg4FBwBFBn///gEBI4XgAoMPAoJWCv4QDDYXwBQf/4AKD/wmDCARuDGQImCEIQbCGQMDCAQKBj4EB/AFBBQQsgDYQQCNQQhCOog3CCAQ3BEIRvCAoSRCE4IxCKgQmCKgYAZwA="));
+const ICON_KNIGHT = require("heatshrink").decompress(atob("lstwMB/4Ann1/AgX48IKD4UPAgX+gEHAoXwgALDJQMfDYQFBEQWAgBSCBQQcC4AFBn///hnCBQPgAgMDGIQnDGIIQDAgQQBEwQQCGIIQCEwMECAQxBsAQBEwMPCAQmBAIJDB4EPDoM/CAIoBKgP4BQQQB/AzCKgJlIPgQ+COwJlCHoJlDJwJlDS4aBDDYQsCADOA"));
+
+const settings = Object.assign({
+  state: engine.P4_INITIAL_BOARD,
+  computer_level: 0, // default to "stupid" which is the fastest
+}, require("Storage").readJSON(SETTINGS_FILE,1) || {});
+
+const ovr = Graphics.createArrayBuffer(Bangle.appRect.w,Bangle.appRect.h,2,{msb:true});
+const curfield = [4*FIELD_WIDTH, 6*FIELD_HEIGHT]; // e2
+const startfield = Array(2);
+let piece_sel = 0;
+let showmenu = false;
+let finished = false;
+
+const writeSettings = () => {
+  settings.state = engine.p4_state2fen(state);
+  require('Storage').writeJSON(SETTINGS_FILE, settings);
+};
+
+const generateBgImage = () => {
+  let buf = Graphics.createArrayBuffer(Bangle.appRect.w,Bangle.appRect.h,1,{msb:true});
+  for(let idxrow=0; idxrow<8; idxrow++) {
+    for(let idxcol=0; idxcol<8; idxcol++) {
+      const bgCol = idxrow % 2 != idxcol % 2 ? 0 : 1;
+      const x = idxcol*FIELD_WIDTH;
+      const y = idxrow*FIELD_HEIGHT;
+      buf.setColor(bgCol).fillRect({x:x, y:y, w:FIELD_WIDTH, h:FIELD_HEIGHT});
+    }
+  }
+  return {width:buf.getWidth(), height:buf.getHeight(),
+          buffer:buf.buffer
+        };
+};
+
+const idx2Pos = (idxcol, idxrow) => {
+  "ram"
+  return 2*(1+8+1) + (7-idxrow)*(1+8+1) + idxcol + 1;
+};
+
+const drawPiece = (buf, x, y, piece) => {
+  let icon;
+
+  switch(piece & ~0x1) {
+    case engine.P4_PAWN:
+      icon = ICON_PAWN;
+      break;
+    case engine.P4_BISHOP:
+      icon = ICON_BISHOP;
+      break;
+    case engine.P4_KING:
+      icon = ICON_KING;
+      break;
+    case engine.P4_QUEEN:
+      icon = ICON_QUEEN;
+      break;
+    case engine.P4_ROOK:
+      icon = ICON_ROOK;
+      break;
+    case engine.P4_KNIGHT:
+      icon = ICON_KNIGHT;
+      break;
+  }
+
+  if (icon) {
+    const scale = FIELD_HEIGHT/ICON_SIZE;
+    buf.drawImage(icon, x+(FIELD_WIDTH-(ICON_SIZE*scale))/2, y, {scale: scale});
+  }
+  return buf;
+};
+
+const drawBoard = () => {
+  //console.log("Free: " + process.memory().free);
+
+  g.setBgColor("#555").setColor("#aaa").drawImage(bgImage, Bangle.appRect.x, Bangle.appRect.y);
+  for(let idxrow=0; idxrow<8; idxrow++) {
+    for(let idxcol=0; idxcol<8; idxcol++) {
+      const x = idxcol*FIELD_WIDTH+Bangle.appRect.x;
+      const y = idxrow*FIELD_HEIGHT+Bangle.appRect.y;
+
+      const pos = idx2Pos(idxcol, idxrow);
+      const field = state.board[pos];
+
+      if (field) {
+        const fgCol = field & 0x1 ? "#000" : "#fff";
+        drawPiece(g.setBgColor(fgCol), x, y, field);
+      }
+    }
+  }
+};
+
+const roundX = (x) => {
+  return Math.round(x/FIELD_WIDTH)*FIELD_WIDTH;
+};
+
+const roundY = (y) => {
+  return Math.round(y/FIELD_HEIGHT)*FIELD_HEIGHT;
+};
+
+const drawSelectedField = () => {
+  ovr.clear();
+  if (!showmenu && !finished) {
+    if (startfield[0] !== undefined && startfield[1] !== undefined) {
+      // remove piece from startfield
+      const x = startfield[0];
+      const y = startfield[1];
+      ovr.setColor(2).fillRect({x:x, y:y, w:FIELD_WIDTH, h:FIELD_HEIGHT});
+    }
+
+    const x = roundX(curfield[0]);
+    const y = roundY(curfield[1]);
+    ovr.setColor(piece_sel ? 1 : 2)
+      .drawRect({x:x+1, y:y, w:FIELD_WIDTH-2, h:FIELD_HEIGHT})
+      .drawRect({x:x+2, y:y+1, w:FIELD_WIDTH-4, h:FIELD_HEIGHT-2})
+      .drawRect({x:x+3, y:y+2, w:FIELD_WIDTH-6, h:FIELD_HEIGHT-4});
+    if (piece_sel) {
+      drawPiece(ovr.setBgColor(1), x, y, piece_sel);
+      ovr.setBgColor(0); // back to transparent
+    }
+  }
+  Bangle.setLCDOverlay({width:ovr.getWidth(), height:ovr.getHeight(),
+          bpp:2, transparent:0,
+          palette:new Uint16Array([0, g.toColor("#F00"), g.toColor("#0F0"), 0]),
+          buffer:ovr.buffer
+        },Bangle.appRect.x,Bangle.appRect.y);
+};
+
+const isInside = (rect, e) => {
+  return e.x>=rect.x && e.x<rect.x+rect.w
+    && e.y>=rect.y && e.y<=rect.y+rect.h;
+};
+
+const showAlert = (msg, cb) => {
+  showmenu = true;
+  drawSelectedField();
+  E.showAlert(msg).then(function() {
+    showmenu = false;
+    drawBoard();
+    drawSelectedField();
+    if (cb) {
+      cb();
+    }
+  });
+};
+
+const move = (from,to,cbok) => {
+  const res = state.move(from, to);
+  //console.log(res);
+  if (!res.ok) {
+    showAlert("Illegal move");
+  } else {
+    if (res.flags & engine.P4_MOVE_FLAG_MATE) {
+      finished = true;
+      showAlert("Checkmate or stalemate", cbok);
+    } else if (res.flags & engine.P4_MOVE_FLAG_CHECK) {
+      showAlert("A king is in check", cbok);
+    } else if (res.flags & engine.P4_MOVE_FLAG_DRAW) {
+      showAlert("A draw is available", cbok);
+    } else if (cbok) {
+      cbok();
+    }
+  }
+  return res;
+};
+
+const showMessage = (msg) => {
+  g.setColor("#f00").setFont("4x6:2").setFontAlign(-1,1).drawString(msg, 10, Bangle.appRect.y2-10);
+};
+
+// Run
+
+g.reset();
+const bgImage = generateBgImage();
+let state = engine.p4_fen2state(settings.state);
+drawBoard();
+drawSelectedField();
+Bangle.drawWidgets();
+
+// drag selected field
+Bangle.on('drag', (ev) => {
+  const newx = curfield[0]+ev.dx;
+  const newy = curfield[1]+ev.dy;
+  if (newx >= 0 && newx <= 7*FIELD_WIDTH) {
+    curfield[0] = newx;
+  }
+  if (newy >= 0 && newy <= 7*FIELD_HEIGHT) {
+    curfield[1] = newy;
+  }
+  drawSelectedField();
+});
+
+// touch to start/stop moving a piece
+Bangle.on('touch', (button, xy) => {
+  if (isInside(Bangle.appRect, xy) && !showmenu) {
+    if (piece_sel === 0) {
+      startfield[0] = roundX(curfield[0]);
+      startfield[1] = roundY(curfield[1]);
+      const startpos = idx2Pos(startfield[0]/FIELD_WIDTH, startfield[1]/FIELD_HEIGHT);
+      piece_sel = state.board[startpos];
+      if (piece_sel === 0) {
+        startfield[0] = startfield[1] = undefined;
+        // nothing here, do nothing
+        return;
+      }
+    } else { // piece_sel === 0
+      const colTo = roundX(curfield[0]);
+      const rowTo = roundY(curfield[1]);
+      if (startfield[0] !== colTo || startfield[1] !== rowTo) {
+        showMessage(/*LANG*/"Moving..");
+        const posFrom = idx2Pos(startfield[0]/FIELD_WIDTH, startfield[1]/FIELD_HEIGHT);
+        const posTo = idx2Pos(colTo/FIELD_WIDTH, rowTo/FIELD_HEIGHT);
+        setTimeout(() => {
+          const cb = () => {
+            // human move ok, update
+            drawBoard();
+            drawSelectedField();
+            if (!finished) {
+              // do computer move
+              Bangle.setLCDTimeout(0.1); // this can take some time, turn off to save power
+              showMessage(/*LANG*/"Calculating..");
+              setTimeout(() => {
+                const compMove = state.findmove(settings.computer_level+1);
+                const result = move(compMove[0], compMove[1]);
+                if (result.ok) {
+                  writeSettings();
+                }
+                Bangle.setLCDPower(true);
+                Bangle.setLocked(false);
+                Bangle.setLCDTimeout(DEFAULT_TIMEOUT/1000); // restore
+                if (!showmenu) {
+                  showAlert(result.string);
+                }
+              }, 200); // execute after display update
+            }
+          };
+          move(posFrom, posTo,cb);
+        }, 200); // execute after display update
+      } // piece_sel === 0
+      startfield[0] = startfield[1] = undefined;
+      piece_sel = 0;
+    }
+    drawSelectedField();
+  }
+});
+
+// show menu on button
+setWatch(() => {
+  if (showmenu) {
+    return;
+  }
+  showmenu = true;
+  piece_sel = 0;
+  startfield[0] = startfield[1] = undefined;
+  drawSelectedField();
+
+  const closeMenu = () => {
+      showmenu = false;
+      E.showMenu();
+      drawBoard();
+      drawSelectedField();
+  };
+
+  E.showMenu({
+    "" : { title : /*LANG*/"Chess settings" },
+    "< Back" : () => closeMenu(),
+    /*LANG*/"New Game" : () => {
+      state = engine.p4_fen2state(engine.P4_INITIAL_BOARD);
+      writeSettings();
+      closeMenu();
+    },
+    /*LANG*/"Undo Move" : () => {
+      state.jump_to_moveno(-2);
+      writeSettings();
+      closeMenu();
+    },
+    /*LANG*/'Level': {
+      value: settings.computer_level,
+      min: 0, max: 4,
+      format: v => [/*LANG*/'stupid', /*LANG*/'middling', /*LANG*/'default', /*LANG*/'slow', /*LANG*/'slowest'][v],
+      onchange: v => {
+        settings.computer_level = v;
+        writeSettings();
+      }
+    },
+    /*LANG*/"Exit" : () => load(),
+  });
+}, BTN, { repeat: true, edge: "falling" });
diff --git a/apps/chess/app.png b/apps/chess/app.png
new file mode 100644
index 000000000..9db78e27d
Binary files /dev/null and b/apps/chess/app.png differ
diff --git a/apps/chess/engine.js b/apps/chess/engine.js
new file mode 100644
index 000000000..f67ecc456
--- /dev/null
+++ b/apps/chess/engine.js
@@ -0,0 +1,1615 @@
+/* p4wn, AKA 5k chess - by Douglas Bagnall <douglas@paradise.net.nz>
+ *
+ * This code is in the public domain, or as close to it as various
+ * laws allow. No warranty; no restrictions.
+ *
+ * lives at http://p4wn.sf.net/
+ */
+
+/*Compatibility tricks:
+ * backwards for old MSIEs (to 5.5)
+ * sideways for seed command-line javascript.*/
+var p4_log;
+if (this.imports !== undefined &&
+    this.printerr !== undefined){//seed or gjs
+    p4_log = function(){
+        var args = Array.prototype.slice.call(arguments);
+        printerr(args.join(', '));
+    };
+}
+else if (this.console === undefined){//MSIE
+    p4_log = function(){};
+}
+else {
+    p4_log = function(){console.log.apply(console, arguments);};
+}
+
+/*MSIE Date.now backport */
+if (Date.now === undefined)
+    Date.now = function(){return (new Date).getTime();};
+
+/* The pieces are stored as numbers between 2 and 13, inclusive.
+ * Empty squares are stored as 0, and off-board squares as 16.
+ * There is some bitwise logic to it:
+ *  piece & 1 -> colour (white: 0, black: 1)
+ *  piece & 2 -> single move piece (including pawn)
+ *  if (piece & 2) == 0:
+ *     piece & 4  -> row and column moves
+ *     piece & 8  -> diagonal moves
+ */
+var P4_PAWN = 2, P4_ROOK = 4, P4_KNIGHT = 6, P4_BISHOP = 8, P4_QUEEN = 12, P4_KING = 10;
+var P4_EDGE = 16;
+
+/* in order, even indices: <nothing>, pawn, rook, knight, bishop, king, queen. Only the
+ * even indices are used.*/
+var P4_MOVES = [[], [],
+                [], [],
+                [1,10,-1,-10], [],
+                [21,19,12,8,-21,-19,-12,-8], [],
+                [11,9,-11,-9], [],
+                [1,10,11,9,-1,-10,-11,-9], [],
+                [1,10,11,9,-1,-10,-11,-9], []
+               ];
+
+/*P4_VALUES defines the relative value of various pieces.
+ *
+ * It follows the 1,3,3,5,9 pattern you learn as a kid, multiplied by
+ * 20 to give sub-pawn resolution to other factors, with bishops given
+ * a wee boost over knights.
+ */
+var P4_VALUES=[0, 0,      //Piece values
+               20, 20,    //pawns
+               100, 100,  //rooks
+               60, 60,    //knights
+               61, 61,    //bishops
+               8000, 8000,//kings
+               180, 180,  //queens
+               0];
+
+/* A score greater than P4_WIN indicates a king has been taken. It is
+ * less than the value of a king, in case someone finds a way to, say,
+ * sacrifice two queens in order to checkmate.
+ */
+var P4_KING_VALUE = P4_VALUES[10];
+var P4_WIN = P4_KING_VALUE >> 1;
+
+/* every move, a winning score decreases by this much */
+var P4_WIN_DECAY = 300;
+var P4_WIN_NOW = P4_KING_VALUE - 250;
+
+/* P4_{MAX,MIN}_SCORE should be beyond any possible evaluated score */
+
+var P4_MAX_SCORE = 9999;    // extremes of evaluation range
+var P4_MIN_SCORE = -P4_MAX_SCORE;
+
+/*initialised in p4_initialise_state */
+var P4_CENTRALISING_WEIGHTS;
+var P4_BASE_PAWN_WEIGHTS;
+var P4_KNIGHT_WEIGHTS;
+
+/*P4_DEBUG turns on debugging features */
+var P4_DEBUG = 0;
+var P4_INITIAL_BOARD = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1";
+
+/*use javascript typed arrays rather than plain arrays
+ * (faster in some browsers, unsupported in others, possibly slower elsewhere) */
+var P4_USE_TYPED_ARRAYS = this.Int32Array !== undefined;
+
+var P4_PIECE_LUT = { /*for FEN, PGN interpretation */
+    P: 2,
+    p: 3,
+    R: 4,
+    r: 5,
+    N: 6,
+    n: 7,
+    B: 8,
+    b: 9,
+    K: 10,
+    k: 11,
+    Q: 12,
+    q: 13
+};
+
+var P4_ENCODE_LUT = '  PPRRNNBBKKQQ';
+
+
+function p4_alphabeta_treeclimber(state, count, colour, score, s, e, alpha, beta){
+    var move = p4_make_move(state, s, e, P4_QUEEN);
+    var i;
+    var ncolour = 1 - colour;
+    var movelist = p4_parse(state, colour, move.ep, -score);
+    var movecount = movelist.length;
+    if(count){
+        //branch nodes
+        var t;
+        for(i = 0; i < movecount; i++){
+            var mv = movelist[i];
+            var mscore = mv[0];
+            var ms = mv[1];
+            var me = mv[2];
+            if (mscore > P4_WIN){ //we won! Don't look further.
+                alpha = P4_KING_VALUE;
+                break;
+            }
+            t = -p4_alphabeta_treeclimber(state, count - 1, ncolour, mscore, ms, me,
+                                          -beta, -alpha);
+            if (t > alpha){
+                alpha = t;
+            }
+            if (alpha >= beta){
+                break;
+            }
+        }
+        if (alpha < -P4_WIN_NOW && ! p4_check_check(state, colour)){
+            /* Whatever we do, we lose the king.
+             * But if it is not check then this is stalemate, and the
+             * score doesn't apply.
+             */
+            alpha = state.stalemate_scores[colour];
+        }
+        if (alpha < -P4_WIN){
+            /*make distant checkmate seem less bad */
+            alpha += P4_WIN_DECAY;
+        }
+    }
+    else{
+        //leaf nodes
+        while(beta > alpha && --movecount != -1){
+            if(movelist[movecount][0] > alpha){
+                alpha = movelist[movecount][0];
+            }
+        }
+    }
+    p4_unmake_move(state, move);
+    return alpha;
+}
+
+
+/* p4_prepare() works out weightings for assessing various moves,
+ * favouring centralising moves early, for example.
+ *
+ * It is called before each tree search, not for each parse(), so it
+ * is OK for it to be a little bit slow. But that also means it drifts
+ * out of sync with the real board state, especially on deep searches.
+ */
+
+function p4_prepare(state){
+    var i, j, x, y, a;
+    var pieces = state.pieces = [[], []];
+    /*convert state.moveno half move count to move cycle count */
+    var moveno = state.moveno >> 1;
+    var board = state.board;
+
+    /* high earliness_weight indicates a low move number. The formula
+     * should work above moveno == 50, but this is javascript.
+     */
+    var earliness_weight = (moveno > 50) ? 0 : parseInt(6 * Math.exp(moveno * -0.07));
+    var king_should_hide = moveno < 12;
+    var early = moveno < 5;
+    /* find the pieces, kings, and weigh material*/
+    var kings = [0, 0];
+    var material = [0, 0];
+    var best_pieces = [0, 0];
+    for(i = 20; i  < 100; i++){
+        a = board[i];
+        var piece = a & 14;
+        var colour = a & 1;
+        if(piece){
+            pieces[colour].push([a, i]);
+            if (piece == P4_KING){
+                kings[colour] = i;
+            }
+            else{
+                material[colour] += P4_VALUES[piece];
+                best_pieces[colour] = Math.max(best_pieces[colour], P4_VALUES[piece]);
+            }
+        }
+    }
+
+    /*does a draw seem likely soon?*/
+    var draw_likely = (state.draw_timeout > 90 || state.current_repetitions >= 2);
+    if (draw_likely)
+        p4_log("draw likely", state.current_repetitions, state.draw_timeout);
+    state.values = [[], []];
+    var qvalue = P4_VALUES[P4_QUEEN]; /*used as ballast in various ratios*/
+    var material_sum = material[0] + material[1] + 2 * qvalue;
+    var wmul = 2 * (material[1] + qvalue) / material_sum;
+    var bmul = 2 * (material[0] + qvalue) / material_sum;
+    var multipliers = [wmul, bmul];
+    var emptiness = 4 * P4_QUEEN / material_sum;
+    state.stalemate_scores = [parseInt(0.5 + (wmul - 1) * 2 * qvalue),
+                              parseInt(0.5 + (bmul - 1) * 2 * qvalue)];
+    //p4_log("value multipliers (W, B):", wmul, bmul,
+    //       "stalemate scores", state.stalemate_scores);
+    for (i = 0; i < P4_VALUES.length; i++){
+        var v = P4_VALUES[i];
+        if (v < P4_WIN){//i.e., not king
+            state.values[0][i] = parseInt(v * wmul + 0.5);
+            state.values[1][i] = parseInt(v * bmul + 0.5);
+        }
+        else {
+            state.values[0][i] = v;
+            state.values[1][i] = v;
+        }
+    }
+    /*used for pruning quiescence search */
+    state.best_pieces = [parseInt(best_pieces[0] * wmul + 0.5),
+                         parseInt(best_pieces[1] * bmul + 0.5)];
+
+    var kx = [kings[0] % 10, kings[1] % 10];
+    var ky = [parseInt(kings[0] / 10), parseInt(kings[1] / 10)];
+
+    /* find the frontmost pawns in each file */
+    var pawn_cols = [[], []];
+    for (y = 3; y < 9; y++){
+        for (x = 1; x < 9; x++){
+            i = y * 10 + x;
+            a = board[i];
+            if ((a & 14) != P4_PAWN)
+                continue;
+            if ((a & 1) == 0){
+                pawn_cols[0][x] = y;
+            }
+            else if (pawn_cols[1][x] === undefined){
+                pawn_cols[1][x] = y;
+            }
+        }
+    }
+    var target_king = (moveno >= 20 || material_sum < 5 * qvalue);
+    var weights = state.weights;
+
+    for (y = 2; y < 10; y++){
+        for (x = 1; x < 9; x++){
+            i = y * 10 + x;
+            var early_centre = P4_CENTRALISING_WEIGHTS[i] * earliness_weight;
+            var plateau = P4_KNIGHT_WEIGHTS[i];
+            for (var c = 0; c < 2; c++){
+                var dx = Math.abs(kx[1 - c] - x);
+                var dy = Math.abs(ky[1 - c] - y);
+                var our_dx = Math.abs(kx[c] - x);
+                var our_dy = Math.abs(ky[c] - y);
+
+                var d = Math.max(Math.sqrt(dx * dx + dy * dy), 1) + 1;
+                var mul = multipliers[c]; /*(mul < 1) <==> we're winning*/
+                var mul3 = mul * mul * mul;
+                var at_home = y == 2 + c * 7;
+                var pawn_home = y == 3 + c * 5;
+                var row4 = y == 5 + c;
+                var promotion_row = y == 9 - c * 7;
+                var get_out = (early && at_home) * -5;
+
+                var knight = parseInt(early_centre * 0.3) + 2 * plateau + get_out;
+                var rook = parseInt(early_centre * 0.3);
+                var bishop = parseInt(early_centre * 0.6) + plateau + get_out;
+                if (at_home){
+                    rook += (x == 4 || x == 5) * (earliness_weight + ! target_king);
+                    rook += (x == 1 || x == 8) * (moveno > 10 && moveno < 20) * -3;
+                    rook += (x == 2 || x == 7) * (moveno > 10 && moveno < 20) * -1;
+                }
+
+                /*Queen wants to stay home early, then jump right in*/
+                /*keep kings back on home row for a while*/
+                var queen = parseInt(plateau * 0.5 + early_centre * (0.5 - early));
+                var king = (king_should_hide && at_home) * 2 * earliness_weight;
+
+                /*empty board means pawn advancement is more urgent*/
+                var get_on_with_it = Math.max(emptiness * 2, 1);
+                var pawn = get_on_with_it * P4_BASE_PAWN_WEIGHTS[c ? 119 - i : i];
+                if (early){
+                    /* Early pawn weights are slightly randomised, so each game is different.
+                     */
+                    if (y >= 4 && y <= 7){
+                        var boost = 1 + 3 * (y == 5 || y == 6);
+                        pawn += parseInt((boost + p4_random_int(state, 4)) * 0.1 *
+                                         early_centre);
+                    }
+                    if (x == 4 || x == 5){
+                        //discourage middle pawns from waiting at home
+                        pawn -= 3 * pawn_home;
+                        pawn += 3 * row4;
+                    }
+                }
+                /*pawn promotion row is weighted as a queen minus a pawn.*/
+                if (promotion_row)
+                    pawn += state.values[c][P4_QUEEN] - state.values[c][P4_PAWN];
+
+                /*pawns in front of a castled king should stay there*/
+                pawn += 4 * (y == 3 && ky[c] == 2 && Math.abs(our_dx) < 2 &&
+                             kx[c] != 5 && x != 4 && x != 5);
+                /*passed pawns (having no opposing pawn in front) are encouraged. */
+                var cols = pawn_cols[1 - c];
+                if (cols[x] == undefined ||
+                    (c == 0 && cols[x] < y) ||
+                    (c == 1 && cols[x] > y))
+                    pawn += 2;
+
+                /* After a while, start going for opposite king. Just
+                 * attract pieces into the area so they can mill about in
+                 * the area, waiting for an opportunity.
+                 *
+                 * As prepare is only called at the beginning of each tree
+                 * search, the king could wander out of the targetted area
+                 * in deep searches. But that's OK. Heuristics are
+                 * heuristics.
+                 */
+                if (target_king){
+                    knight += 2 * parseInt(8 * mul / d);
+                    rook += 2 * ((dx < 2) + (dy < 2));
+                    bishop += 3 * (Math.abs((dx - dy))  < 2);
+                    queen += 2 * parseInt(8 / d) + (dx * dy == 0) + (dx - dy == 0);
+                    /* The losing king wants to stay in the middle, while
+                     the winning king goes in for the kill.*/
+                    var king_centre_wt = 8 * emptiness * P4_CENTRALISING_WEIGHTS[i];
+                    king += parseInt(150 * emptiness / (mul3 * d) + king_centre_wt * mul3);
+                }
+                weights[P4_PAWN + c][i] = pawn;
+                weights[P4_KNIGHT + c][i] = knight;
+                weights[P4_ROOK + c][i] = rook;
+                weights[P4_BISHOP + c][i] = bishop;
+                weights[P4_QUEEN + c][i] = queen;
+                weights[P4_KING + c][i] = king;
+
+                if (draw_likely && mul < 1){
+                    /*The winning side wants to avoid draw, so adds jitter to its weights.*/
+                    var range = 3 / mul3;
+                    for (j = 2 + c; j < 14; j += 2){
+                        weights[j][i] += p4_random_int(state, range);
+                    }
+                }
+            }
+        }
+    }
+    state.prepared = true;
+}
+
+function p4_maybe_prepare(state){
+    if (! state.prepared)
+        p4_prepare(state);
+}
+
+
+function p4_parse(state, colour, ep, score) {
+    var board = state.board;
+    var s, e;    //start and end position
+    var E, a;       //E=piece at end place, a= piece moving
+    var i, j;
+    var other_colour = 1 - colour;
+    var dir = (10 - 20 * colour); //dir= 10 for white, -10 for black
+    var movelist = [];
+    var captures = [];
+    var weight;
+    var pieces = state.pieces[colour];
+    var castle_flags = (state.castles >> (colour * 2)) & 3;
+    var values = state.values[other_colour];
+    var all_weights = state.weights;
+    for (j = pieces.length - 1; j >= 0; j--){
+        s = pieces[j][1]; // board position
+        a = board[s]; //piece number
+        var weight_lut = all_weights[a];
+        weight = score - weight_lut[s];
+        a &= 14;
+        if(a > 2){    //non-pawns
+            var moves = P4_MOVES[a];
+            if(a & 2){
+                for(i = 0; i < 8; i++){
+                    e = s + moves[i];
+                    E = board[e];
+                    if(!E){
+                        movelist.push([weight + values[E] + weight_lut[e], s, e]);
+                    }
+                    else if((E&17)==other_colour){
+                        captures.push([weight + values[E] + weight_lut[e] + all_weights[E][e], s, e]);
+                    }
+                }
+                if(a == P4_KING && castle_flags){
+                    if((castle_flags & 1) &&
+                        (board[s - 1] + board[s - 2] + board[s - 3] == 0) &&
+                        p4_check_castling(board, s - 2, other_colour, dir, -1)){//Q side
+                        movelist.push([weight + 12, s, s - 2]);     //no analysis, just encouragement
+                    }
+                    if((castle_flags & 2) && (board[s + 1] + board[s + 2] == 0) &&
+                        p4_check_castling(board, s, other_colour, dir, 1)){//K side
+                        movelist.push([weight + 13, s, s + 2]);
+                    }
+                }
+            }
+            else{//rook, bishop, queen
+                var mlen = moves.length;
+                for(i=0;i<mlen;){     //goeth thru list of moves
+                    var m = moves[i++];
+                    e=s;
+                    do {
+                        e+=m;
+                        E=board[e];
+                        if(!E){
+                            movelist.push([weight + values[E] + weight_lut[e], s, e]);
+                        }
+                        else if((E&17)==other_colour){
+                            captures.push([weight + values[E] + weight_lut[e] + all_weights[E][e], s, e]);
+                        }
+                    }while(!E);
+                }
+            }
+        }
+        else{    //pawns
+            e=s+dir;
+            if(!board[e]){
+                movelist.push([weight + weight_lut[e], s, e]);
+                /* s * (120 - s) < 3200 true for outer two rows on either side.*/
+                var e2 = e + dir;
+                if(s * (120 - s) < 3200 && (!board[e2])){
+                    movelist.push([weight + weight_lut[e2], s, e2]);
+                }
+            }
+            /* +/-1 for pawn capturing */
+            E = board[--e];
+            if(E && (E & 17) == other_colour){
+                captures.push([weight + values[E] + weight_lut[e] + all_weights[E][e], s, e]);
+            }
+            e += 2;
+            E = board[e];
+            if(E && (E & 17) == other_colour){
+                captures.push([weight + values[E] + weight_lut[e] + all_weights[E][e], s, e]);
+            }
+        }
+    }
+    if(ep){
+        var pawn = P4_PAWN | colour;
+        var taken;
+        /* Some repetitive calculation here could be hoisted out, but that would
+            probably slow things: the common case is no pawns waiting to capture
+            enpassant, not 2.
+         */
+        s = ep - dir - 1;
+        if (board[s] == pawn){
+            taken = values[P4_PAWN] + all_weights[P4_PAWN | other_colour][ep - dir];
+            captures.push([score - weight_lut[s] + weight_lut[ep] + taken, s, ep]);
+        }
+        s += 2;
+        if (board[s] == pawn){
+            taken = values[P4_PAWN] + all_weights[P4_PAWN | other_colour][ep - dir];
+            captures.push([score - weight_lut[s] + weight_lut[ep] + taken, s, ep]);
+        }
+    }
+    return captures.concat(movelist);
+}
+
+/*Explaining the bit tricks used in check_castling and check_check:
+ *
+ * in binary:    16 8 4 2 1
+ *   empty
+ *   pawn               1 c
+ *   rook             1   c
+ *   knight           1 1 c
+ *   bishop         1     c
+ *   king           1   1 c
+ *   queen          1 1   c
+ *   wall         1
+ *
+ * so:
+ *
+ * piece & (16 | 4 | 2 | 1) is:
+ *  2 + c  for kings and pawns
+ *  4 + c  for rooks and queens
+ *  6 + c  for knights
+ *  0 + c  for bishops
+ * 16      for walls
+ *
+ * thus:
+ * ((piece & 23) == 4 | colour) separates the rooks and queens out
+ * from the rest.
+ * ((piece & 27) == 8 | colour) does the same for queens and bishops.
+ */
+
+/* check_castling
+ *
+ * s - "start" location (either king home square, or king destination)
+ *     the checks are done left to right.
+ * * dir - direction of travel (White: 10, Black: -10)
+ * side: -1 means Q side; 1, K side
+ */
+
+function p4_check_castling(board, s, colour, dir, side){
+    var e;
+    var E;
+    var m, p;
+    var knight = colour + P4_KNIGHT;
+    var diag_slider = P4_BISHOP | colour;
+    var diag_mask = 27;
+    var grid_slider = P4_ROOK | colour;
+    var king_pawn = 2 | colour;
+    var grid_mask = 23;
+
+    /* go through 3 positions, checking for check in each
+     */
+    for(p = s; p < s + 3; p++){
+        //bishops, rooks, queens
+        e = p;
+        do{
+            e += dir;
+            E=board[e];
+        } while (! E);
+        if((E & grid_mask) == grid_slider)
+            return 0;
+        e = p;
+        var delta = dir - 1;
+        do{
+            e += delta;
+            E=board[e];
+        } while (! E);
+        if((E & diag_mask) == diag_slider)
+            return 0;
+        e = p;
+        delta += 2;
+        do{
+            e += delta;
+            E=board[e];
+        } while (! E);
+        if((E & diag_mask) == diag_slider)
+            return 0;
+        /*knights on row 7. (row 6 is handled below)*/
+        if (board[p + dir - 2] == knight ||
+            board[p + dir + 2] == knight)
+            return 0;
+    }
+
+    /* a pawn or king in any of 5 positions on row 7.
+     * or a knight on row 6. */
+    for(p = s + dir - 1; p < s + dir + 4; p++){
+        E = board[p] & grid_mask;
+        if(E == king_pawn || board[p + dir] == knight)
+            return 0;
+    }
+    /* scan back row for rooks, queens on the other side.
+     * Same side check is impossible, because the castling rook is there
+     */
+    e = (side < 0) ? s + 2 : s;
+    do {
+        e -= side;
+        E=board[e];
+    } while (! E);
+    if((E & grid_mask) == grid_slider)
+        return 0;
+
+    return 1;
+}
+
+function p4_check_check(state, colour){
+    var board = state.board;
+    /*find the king.  The pieces list updates from the end,
+     * so the last-most king is correctly placed.*/
+    var pieces = state.pieces[colour];
+    var p;
+    var i = pieces.length;
+    do {
+        p = pieces[--i];
+    } while (p[0] != (P4_KING | colour));
+    var s = p[1];
+    var other_colour = 1 - colour;
+    var dir = 10 - 20 * colour;
+    if (board[s + dir - 1] == (P4_PAWN | other_colour) ||
+        board[s + dir + 1] == (P4_PAWN | other_colour))
+        return true;
+    var knight_moves = P4_MOVES[P4_KNIGHT];
+    var king_moves = P4_MOVES[P4_KING];
+    var knight = P4_KNIGHT | other_colour;
+    var king = P4_KING | other_colour;
+    for (i = 0; i < 8; i++){
+        if (board[s + knight_moves[i]] == knight ||
+            board[s + king_moves[i]] == king)
+            return true;
+    }
+    var diagonal_moves = P4_MOVES[P4_BISHOP];
+    var grid_moves = P4_MOVES[P4_ROOK];
+
+    /* diag_mask ignores rook moves of queens,
+     * grid_mask ignores the bishop moves*/
+    var diag_slider = P4_BISHOP | other_colour;
+    var diag_mask = 27;
+    var grid_slider = P4_ROOK | other_colour;
+    var grid_mask = 23;
+    for (i = 0; i < 4; i++){
+        var m = diagonal_moves[i];
+        var e = s;
+        var E;
+        do {
+            e += m;
+            E = board[e];
+        } while (!E);
+        if((E & diag_mask) == diag_slider)
+            return true;
+
+        m = grid_moves[i];
+        e = s;
+        do {
+            e += m;
+            E = board[e];
+        } while (!E);
+        if((E & grid_mask) == grid_slider)
+            return true;
+    }
+    return false;
+}
+
+function p4_optimise_piece_list(state){
+    var i, p, s, e;
+    var movelists = [
+        p4_parse(state, 0, 0, 0),
+        p4_parse(state, 1, 0, 0)
+    ];
+    var weights = state.weights;
+    var board = state.board;
+    for (var colour = 0; colour < 2; colour++){
+        var our_values = state.values[colour];
+        var pieces = state.pieces[colour];
+        var movelist = movelists[colour];
+        var threats = movelists[1 - colour];
+        /* sparse array to index by score. */
+        var scores = [];
+        for (i = 0; i < pieces.length; i++){
+            p = pieces[i];
+            scores[p[1]] = {
+                score: 0,
+                piece: p[0],
+                pos: p[1],
+                threatened: 0
+            };
+        }
+        /* Find the best score for each piece by pure static weights,
+         * ignoring captures, which have their own path to the top. */
+        for(i = movelist.length - 1; i >= 0; i--){
+            var mv = movelist[i];
+            var score = mv[0];
+            s = mv[1];
+            e = mv[2];
+            if(! board[e]){
+                var x = scores[s];
+                x.score = Math.max(x.score, score);
+            }
+        }
+        /* moving out of a threat is worth considering, especially
+         * if it is a pawn and you are not.*/
+        for(i = threats.length - 1; i >= 0; i--){
+            var mv = threats[i];
+            var x = scores[mv[2]];
+            if (x !== undefined){
+                var S = board[mv[1]];
+                var r = (1 + x.piece > 3 + S < 4) * 0.01;
+                if (x.threatened < r)
+                    x.threatened = r;
+            }
+        }
+        var pieces2 = [];
+        for (i = 20; i < 100; i++){
+            p = scores[i];
+            if (p !== undefined){
+                p.score += p.threatened * our_values[p.piece];
+                pieces2.push(p);
+            }
+        }
+        pieces2.sort(function(a, b){return a.score - b.score;});
+        for (i = 0; i < pieces2.length; i++){
+            p = pieces2[i];
+            pieces[i] = [p.piece, p.pos];
+        }
+    }
+}
+
+function p4_findmove(state, level, colour, ep){
+    p4_prepare(state);
+    p4_optimise_piece_list(state);
+    var board = state.board;
+
+    // Changed for espruino compatibility
+    if (colour === undefined) {
+        colour = state.to_play;
+    }
+    if (ep === undefined) {
+        ep = state.enpassant;
+    }
+    var movelist = p4_parse(state, colour, ep, 0);
+    var alpha = P4_MIN_SCORE;
+    var mv, t, i;
+    var bs = 0;
+    var be = 0;
+
+    if (level <= 0){
+        for (i = 0; i < movelist.length; i++){
+            mv = movelist[i];
+            if(movelist[i][0] > alpha){
+                alpha = mv[0];
+                bs = mv[1];
+                be = mv[2];
+            }
+        }
+        return [bs, be, alpha];
+    }
+
+    for(i = 0; i < movelist.length; i++){
+        mv = movelist[i];
+        var mscore = mv[0];
+        var ms = mv[1];
+        var me = mv[2];
+        if (mscore > P4_WIN){
+            p4_log("XXX taking king! it should never come to this");
+            alpha = P4_KING_VALUE;
+            bs = ms;
+            be = me;
+            break;
+        }
+        t = -state.treeclimber(state, level - 1, 1 - colour, mscore, ms, me,
+                               P4_MIN_SCORE, -alpha);
+        if (t > alpha){
+            alpha = t;
+            bs = ms;
+            be = me;
+        }
+    }
+    if (alpha < -P4_WIN_NOW && ! p4_check_check(state, colour)){
+        alpha = state.stalemate_scores[colour];
+    }
+    return [bs, be, alpha];
+}
+
+/*p4_make_move changes the state and returns an object containing
+ * everything necesary to undo the change.
+ *
+ * p4_unmake_move uses the p4_make_move return value to restore the
+ * previous state.
+ */
+
+function p4_make_move(state, s, e, promotion){
+    var board = state.board;
+    var S = board[s];
+    var E = board[e];
+    board[e] = S;
+    board[s] = 0;
+    var piece = S & 14;
+    var moved_colour = S & 1;
+    var end_piece = S; /* can differ from S in queening*/
+    //now some stuff to handle queening, castling
+    var rs = 0, re, rook;
+    var ep_taken = 0, ep_position;
+    var ep = 0;
+    if(piece == P4_PAWN){
+        if((60 - e) * (60 - e) > 900){
+            /*got to end; replace the pawn on board and in pieces cache.*/
+            promotion |= moved_colour;
+            board[e] = promotion;
+            end_piece = promotion;
+        }
+        else if (((s ^ e) & 1) && E == 0){
+            /*this is a diagonal move, but the end spot is empty, so we surmise enpassant */
+            ep_position = e - 10 + 20 * moved_colour;
+            ep_taken = board[ep_position];
+            board[ep_position] = 0;
+        }
+        else if ((s - e) * (s - e) == 400){
+            /*delta is 20 --> two row jump at start*/
+            ep = (s + e) >> 1;
+        }
+    }
+    else if (piece == P4_KING && ((s - e) * (s - e) == 4)){  //castling - move rook too
+        rs = s - 4 + (s < e) * 7;
+        re = (s + e) >> 1; //avg of s,e=rook's spot
+        rook = moved_colour + P4_ROOK;
+        board[rs] = 0;
+        board[re] = rook;
+        //piece_locations.push([rook, re]);
+    }
+
+    var old_castle_state = state.castles;
+    if (old_castle_state){
+        var mask = 0;
+        var shift = moved_colour * 2;
+        var side = moved_colour * 70;
+        var s2 = s - side;
+        var e2 = e + side;
+        //wipe both our sides if king moves
+        if (s2 == 25)
+            mask |= 3 << shift;
+        //wipe one side on any move from rook points
+        else if (s2 == 21)
+            mask |= 1 << shift;
+        else if (s2 == 28)
+            mask |= 2 << shift;
+        //or on any move *to* opposition corners
+        if (e2 == 91)
+            mask |= 4 >> shift;
+        else if (e2 == 98)
+            mask |= 8 >> shift;
+        state.castles &= ~mask;
+    }
+
+    var old_pieces = state.pieces.concat();
+    var our_pieces = old_pieces[moved_colour];
+    var dest = state.pieces[moved_colour] = [];
+    for (var i = 0; i < our_pieces.length; i++){
+        var x = our_pieces[i];
+        var pp = x[0];
+        var ps = x[1];
+        if (ps != s && ps != rs){
+            dest.push(x);
+        }
+    }
+    dest.push([end_piece, e]);
+    if (rook)
+        dest.push([rook, re]);
+
+    if (E || ep_taken){
+        var their_pieces = old_pieces[1 - moved_colour];
+        dest = state.pieces[1 - moved_colour] = [];
+        var gone = ep_taken ? ep_position : e;
+        for (i = 0; i < their_pieces.length; i++){
+            var x = their_pieces[i];
+            if (x[1] != gone){
+                dest.push(x);
+            }
+        }
+    }
+
+    return {
+        /*some of these (e.g. rook) could be recalculated during
+         * unmake, possibly more cheaply. */
+        s: s,
+        e: e,
+        S: S,
+        E: E,
+        ep: ep,
+        castles: old_castle_state,
+        rs: rs,
+        re: re,
+        rook: rook,
+        ep_position: ep_position,
+        ep_taken: ep_taken,
+        pieces: old_pieces
+    };
+}
+
+function p4_unmake_move(state, move){
+    var board = state.board;
+    if (move.ep_position){
+        board[move.ep_position] = move.ep_taken;
+    }
+    board[move.s] = move.S;
+    board[move.e] = move.E;
+    //move.piece_locations.length--;
+    if(move.rs){
+        board[move.rs] = move.rook;
+        board[move.re] = 0;
+        //move.piece_locations.length--;
+    }
+    state.pieces = move.pieces;
+    state.castles = move.castles;
+}
+
+
+function p4_insufficient_material(state){
+    var knights = false;
+    var bishops = undefined;
+    var i;
+    var board = state.board;
+    for(i = 20; i  < 100; i++){
+        var piece = board[i] & 14;
+        if(piece == 0 || piece == P4_KING){
+            continue;
+        }
+        if (piece == P4_KNIGHT){
+            /* only allow one knight of either colour, never with a bishop */
+            if (knights || bishops !== undefined){
+                return false;
+            }
+            knights = true;
+        }
+        else if (piece == P4_BISHOP){
+            /*any number of bishops, but on only one colour square */
+            var x = i & 1;
+            var y = parseInt(i / 10) & 1;
+            var parity = x ^ y;
+            if (knights){
+                return false;
+            }
+            else if (bishops === undefined){
+                bishops = parity;
+            }
+            else if (bishops != parity){
+                return false;
+            }
+        }
+        else {
+             return false;
+        }
+    }
+    return true;
+}
+
+/* p4_move(state, s, e, promotion)
+ * s, e are start and end positions
+ *
+ * promotion is the desired pawn promotion if the move gets a pawn to the other
+ * end.
+ *
+ * return value contains bitwise flags
+*/
+
+var P4_MOVE_FLAG_OK = 1;
+var P4_MOVE_FLAG_CHECK = 2;
+var P4_MOVE_FLAG_MATE = 4;
+var P4_MOVE_FLAG_CAPTURE = 8;
+var P4_MOVE_FLAG_CASTLE_KING = 16;
+var P4_MOVE_FLAG_CASTLE_QUEEN = 32;
+var P4_MOVE_FLAG_DRAW = 64;
+
+var P4_MOVE_ILLEGAL = 0;
+var P4_MOVE_MISSED_MATE = P4_MOVE_FLAG_CHECK | P4_MOVE_FLAG_MATE;
+var P4_MOVE_CHECKMATE = P4_MOVE_FLAG_OK | P4_MOVE_FLAG_CHECK | P4_MOVE_FLAG_MATE;
+var P4_MOVE_STALEMATE = P4_MOVE_FLAG_OK | P4_MOVE_FLAG_MATE;
+
+function p4_move(state, s, e, promotion){
+    var board = state.board;
+    var colour = state.to_play;
+    var other_colour = 1 - colour;
+    if (s != parseInt(s)){
+        if (e === undefined){
+            var mv = p4_interpret_movestring(state, s);
+            s = mv[0];
+            e = mv[1];
+            if (s == 0)
+                return {flags: P4_MOVE_ILLEGAL, ok: false};
+            promotion = mv[2];
+        }
+        else {/*assume two point strings: 'e2', 'e4'*/
+            s = p4_destringify_point(s);
+            e = p4_destringify_point(e);
+        }
+    }
+    if (promotion === undefined)
+        promotion = P4_QUEEN;
+    var E=board[e];
+    var S=board[s];
+
+    /*See if this move is even slightly legal, disregarding check.
+     */
+    var i;
+    var legal = false;
+    p4_maybe_prepare(state);
+    var moves = p4_parse(state, colour, state.enpassant, 0);
+    for (i = 0; i < moves.length; i++){
+        if (e == moves[i][2] && s == moves[i][1]){
+            legal = true;
+            break;
+        }
+    }
+    if (! legal) {
+        return {flags: P4_MOVE_ILLEGAL, ok: false};
+    }
+
+    /*Try the move, and see what the response is.*/
+    var changes = p4_make_move(state, s, e, promotion);
+
+    /*is it check? */
+    if (p4_check_check(state, colour)){
+        p4_unmake_move(state, changes);
+        p4_log('in check', changes);
+        return {flags: P4_MOVE_ILLEGAL, ok: false, string: "in check!"};
+    }
+    /*The move is known to be legal. We won't be undoing it.*/
+
+    var flags = P4_MOVE_FLAG_OK;
+
+    state.enpassant = changes.ep;
+    state.history.push([s, e, promotion]);
+
+    /*draw timeout: 50 moves without pawn move or capture is a draw */
+    if (changes.E || changes.ep_position){
+        state.draw_timeout = 0;
+        flags |= P4_MOVE_FLAG_CAPTURE;
+    }
+    else if ((S & 14) == P4_PAWN){
+        state.draw_timeout = 0;
+    }
+    else{
+        state.draw_timeout++;
+    }
+    if (changes.rs){
+        flags |= (s > e) ? P4_MOVE_FLAG_CASTLE_QUEEN : P4_MOVE_FLAG_CASTLE_KING;
+    }
+    var shortfen = p4_state2fen(state, true);
+    var repetitions = (state.position_counts[shortfen] || 0) + 1;
+    state.position_counts[shortfen] = repetitions;
+    state.current_repetitions = repetitions;
+    if (state.draw_timeout > 100 || repetitions >= 3 ||
+        p4_insufficient_material(state)){
+        flags |= P4_MOVE_FLAG_DRAW;
+    }
+    state.moveno++;
+    state.to_play = other_colour;
+
+    if (p4_check_check(state, other_colour)){
+        flags |= P4_MOVE_FLAG_CHECK;
+    }
+    /* check for (stale|check)mate, by seeing if there is a move for
+     * the other side that doesn't result in check. (In other words,
+     * reduce the pseudo-legal-move list down to a legal-move list,
+     * and check it isn't empty).
+     *
+     * We don't need to p4_prepare because other colour pieces can't
+     * have moved (just disappeared) since previous call. Also,
+     * setting the promotion piece is unnecessary, because all
+     * promotions block check equally well.
+    */
+    var is_mate = true;
+    var replies = p4_parse(state, other_colour, changes.ep, 0);
+    for (i = 0; i < replies.length; i++){
+        var m = replies[i];
+        var change2 = p4_make_move(state, m[1], m[2], P4_QUEEN);
+        var check = p4_check_check(state, other_colour);
+        p4_unmake_move(state, change2);
+        if (!check){
+            is_mate = false;
+            break;
+        }
+    }
+    if (is_mate)
+        flags |= P4_MOVE_FLAG_MATE;
+
+    var movestring = p4_move2string(state, s, e, S, promotion, flags, moves);
+    p4_log("successful move", s, e, movestring, flags);
+    state.prepared = false;
+    return {
+        flags: flags,
+        string: movestring,
+        ok: true
+    };
+}
+
+
+function p4_move2string(state, s, e, S, promotion, flags, moves){
+    var piece = S & 14;
+    var src, dest;
+    var mv, i;
+    var capture = flags & P4_MOVE_FLAG_CAPTURE;
+
+    src = p4_stringify_point(s);
+    dest = p4_stringify_point(e);
+    if (piece == P4_PAWN){
+        if (capture){
+            mv = src.charAt(0) + 'x' + dest;
+        }
+        else
+            mv = dest;
+        if (e > 90 || e < 30){  //end row, queening
+            if (promotion === undefined)
+                promotion = P4_QUEEN;
+            mv += '=' + P4_ENCODE_LUT.charAt(promotion);
+        }
+    }
+    else if (piece == P4_KING && (s-e) * (s-e) == 4) {
+        if (e < s)
+            mv = 'O-O-O';
+        else
+            mv = 'O-O';
+    }
+    else {
+        var row_qualifier = '';
+        var col_qualifier = '';
+        var pstr = P4_ENCODE_LUT.charAt(S);
+        var sx = s % 10;
+        var sy = parseInt(s / 10);
+
+        /* find any other pseudo-legal moves that would put the same
+         * piece in the same place, for which we'd need
+         * disambiguation. */
+        var co_landers = [];
+        for (i = 0; i < moves.length; i++){
+            var m = moves[i];
+            if (e == m[2] && s != m[1] && state.board[m[1]] == S){
+                co_landers.push(m[1]);
+            }
+        }
+        if (co_landers.length){
+            for (i = 0; i < co_landers.length; i++){
+                var c = co_landers[i];
+                var cx = c % 10;
+                var cy = parseInt(c / 10);
+                if (cx == sx)/*same column, so qualify by row*/
+                    row_qualifier = src.charAt(1);
+                if (cy == sy)
+                    col_qualifier = src.charAt(0);
+            }
+            if (row_qualifier == '' && col_qualifier == ''){
+                /*no co-landers on the same rank or file, so one or the other will do.
+                 * By convention, use the column (a-h) */
+                col_qualifier = src.charAt(0);
+            }
+        }
+        mv = pstr + col_qualifier + row_qualifier + (capture ? 'x' : '') + dest;
+    }
+    if (flags & P4_MOVE_FLAG_CHECK){
+        if (flags & P4_MOVE_FLAG_MATE)
+            mv += '#';
+        else
+            mv += '+';
+    }
+    else if (flags & P4_MOVE_FLAG_MATE)
+        mv += ' stalemate';
+    return mv;
+}
+
+
+function p4_jump_to_moveno(state, moveno){
+    p4_log('jumping to move', moveno);
+    if (moveno === undefined || moveno > state.moveno)
+        moveno = state.moveno;
+    else if (moveno < 0){
+        moveno = state.moveno + moveno;
+    }
+    var state2 = p4_fen2state(state.beginning);
+    var i = 0;
+    while (state2.moveno < moveno){
+        var m = state.history[i++];
+        p4_move(state2, m[0], m[1], m[2]);
+    }
+    /* copy the replayed state across, not all that deeply, but
+     * enough to cover, eg, held references to board. */
+    var attr, dest;
+    for (attr in state2){
+        var src = state2[attr];
+        if (attr instanceof Array){
+            dest = state[attr];
+            dest.length = 0;
+            for (i = 0; i < src.length; i++){
+                dest[i] = src[i];
+            }
+        }
+        else {
+            state[attr] = src;
+        }
+    }
+    state.prepared = false;
+}
+
+
+/* write a standard FEN notation
+ * http://en.wikipedia.org/wiki/Forsyth%E2%80%93Edwards_Notation
+ * */
+function p4_state2fen(state, reduced){
+    var piece_lut = '  PpRrNnBbKkQq';
+    var board = state.board;
+    var fen = '';
+    //fen does Y axis backwards, X axis forwards */
+    for (var y = 9; y > 1; y--){
+        var count = 0;
+        for (var x = 1; x < 9; x++){
+            var piece = board[y * 10 + x];
+            if (piece == 0)
+                count++;
+            else{
+                if (count)
+                    fen += count.toString();
+                fen += piece_lut.charAt(piece);
+                count = 0;
+            }
+        }
+        if (count)
+            fen += count;
+        if (y > 2)
+            fen += '/';
+    }
+    /*white or black */
+    fen += ' ' + 'wb'.charAt(state.to_play) + ' ';
+    /*castling */
+    if (state.castles){
+        var lut = [2, 'K', 1, 'Q', 8, 'k', 4, 'q'];
+        for (var i = 0; i < 8; i += 2){
+            if (state.castles & lut[i]){
+                fen += lut[i + 1];
+            }
+        }
+    }
+    else
+        fen += '-';
+    /*enpassant */
+    if (state.enpassant !== 0){
+        fen += ' ' + p4_stringify_point(state.enpassant);
+    }
+    else
+        fen += ' -';
+    if (reduced){
+        /*if the 'reduced' flag is set, the move number and draw
+         *timeout are not added. This form is used to detect draws by
+         *3-fold repetition.*/
+        return fen;
+    }
+    fen += ' ' + state.draw_timeout + ' ';
+    fen += (state.moveno >> 1) + 1;
+    return fen;
+}
+
+function p4_stringify_point(p){
+    var letters = " abcdefgh";
+    var x = p % 10;
+    var y = (p - x) / 10 - 1;
+    return letters.charAt(x) + y;
+}
+
+function p4_destringify_point(p){
+    var x = parseInt(p.charAt(0), 19) - 9; //a-h <-> 10-18, base 19
+    var y = parseInt(p.charAt(1)) + 1;
+    if (y >= 2 && y < 10 && x >= 1 && x < 9)
+        return y * 10 + x;
+    return undefined;
+}
+
+/* read a standard FEN notation
+ * http://en.wikipedia.org/wiki/Forsyth%E2%80%93Edwards_Notation
+ * */
+function p4_fen2state(fen, state){
+    if (state === undefined)
+        state = p4_initialise_state();
+    var board = state.board;
+    var fenbits = fen.split(' ');
+    var fen_board = fenbits[0];
+    var fen_toplay = fenbits[1];
+    var fen_castles = fenbits[2];
+    var fen_enpassant = fenbits[3];
+    var fen_timeout = fenbits[4];
+    var fen_moveno = fenbits[5];
+    if (fen_timeout === undefined)
+        fen_timeout = 0;
+    //fen does Y axis backwards, X axis forwards */
+    var y = 90;
+    var x = 1;
+    var i, c;
+    for (var j = 0; j < fen_board.length; j++){
+        c = fen_board.charAt(j);
+        if (c == '/'){
+            x = 1;
+            y -= 10;
+            if (y < 20)
+                break;
+            continue;
+        }
+        var piece = P4_PIECE_LUT[c];
+        if (piece && x < 9){
+            board[y + x] = piece;
+            x++;
+        }
+        else {
+            var end = Math.min(x + parseInt(c), 9);
+            for (; x < end; x++){
+                board[y + x] = 0;
+            }
+        }
+    }
+    state.to_play = (fen_toplay.toLowerCase() == 'b') ? 1 : 0;
+    state.castles = 0;
+    /* Sometimes we meet bad FEN that says it can castle when it can't. */
+    var wk = board[25] == P4_KING;
+    var bk = board[95] == P4_KING + 1;
+    var castle_lut = {
+        k: 8 * (bk && board[98] == P4_ROOK + 1),
+        q: 4 * (bk && board[91] == P4_ROOK + 1),
+        K: 2 * (wk && board[28] == P4_ROOK),
+        Q: 1 * (wk && board[21] == P4_ROOK)
+    };
+    for (i = 0; i < fen_castles.length; i++){
+        c = fen_castles.charAt(i);
+        var castle = castle_lut[c];
+        if (castle !== undefined){
+            state.castles |= castle;
+            if (castle == 0){
+                console.log("FEN claims castle state " + fen_castles +
+                            " but pieces are not in place for " + c);
+            }
+        }
+    }
+
+    state.enpassant = (fen_enpassant != '-') ? p4_destringify_point(fen_enpassant) : 0;
+    state.draw_timeout = parseInt(fen_timeout);
+    if (fen_moveno === undefined){
+        /*have a guess based on entropy and pieces remaining*/
+        var pieces = 0;
+        var mix = 0;
+        var p, q, r;
+        for (y = 20; y < 100; y+=10){
+            for (x = 1; x < 9; x++){
+                p = board[y + x] & 15;
+                pieces += (!!p);
+                if (x < 8){
+                    q = board[y + x + 1];
+                    mix += (!q) != (!p);
+                }
+                if (y < 90){
+                    q = board[y + x + 10];
+                    mix += (!q) != (!p);
+                }
+            }
+        }
+        fen_moveno = Math.max(1, parseInt((32 - pieces) * 1.3 + (4 - fen_castles.length) * 1.5 + ((mix - 16) / 5)));
+        //p4_log("pieces", pieces, "mix", mix, "estimate", fen_moveno);
+    }
+    state.moveno = 2 * (parseInt(fen_moveno) - 1) + state.to_play;
+    state.history = [];
+    state.beginning = fen;
+    state.prepared = false;
+    state.position_counts = {};
+    /* Wrap external functions as methods. */
+    state.move = function(s, e, promotion){
+        return p4_move(this, s, e, promotion);
+    };
+    state.findmove = function(level){
+        return p4_findmove(this, level);
+    };
+    state.jump_to_moveno = function(moveno){
+        return p4_jump_to_moveno(this, moveno);
+    };
+    return state;
+}
+
+/*
+Weights would all fit within an Int8Array *except* for the last row
+for pawns, which is close to the queen value (180, max is 127).
+
+Int8Array seems slightly quicker in Chromium 18, no different in
+Firefox 12.
+
+Int16Array is no faster, perhaps slower than Int32Array.
+
+Int32Array is marginally slower than plain arrays with Firefox 12, but
+significantly quicker with Chromium.
+ */
+
+var P4_ZEROS = [];
+function p4_zero_array(){
+    if (P4_USE_TYPED_ARRAYS)
+        return new Int32Array(120);
+    if (P4_ZEROS.length == 0){
+        for(var i = 0; i < 120; i++){
+            P4_ZEROS[i] = 0;
+        }
+    }
+    return P4_ZEROS.slice();
+}
+
+/* p4_initialise_state() creates the board and initialises weight
+ * arrays etc.  Some of this is really only needs to be done once.
+ */
+
+function p4_initialise_state(){
+    var board = p4_zero_array();
+    P4_CENTRALISING_WEIGHTS = p4_zero_array();
+    P4_BASE_PAWN_WEIGHTS = p4_zero_array();
+    P4_KNIGHT_WEIGHTS = p4_zero_array();
+    for(var i = 0; i < 120; i++){
+        var y = parseInt(i / 10);
+        var x = i % 10;
+        var dx = Math.abs(x - 4.5);
+        var dy = Math.abs(y - 5.5);
+        P4_CENTRALISING_WEIGHTS[i] = parseInt(6 - Math.pow((dx * dx + dy * dy) * 1.5, 0.6));
+         //knights have a flat topped centre (bishops too, but less so).
+        P4_KNIGHT_WEIGHTS[i] = parseInt(((dx < 2) + (dy < 2) * 1.5)
+                                        + (dx < 3) + (dy < 3)) - 2;
+        P4_BASE_PAWN_WEIGHTS[i] = parseInt('000012347000'.charAt(y));
+        if (y > 9 || y < 2 || x < 1 || x > 8)
+            board[i] = 16;
+    }
+    var weights = [];
+    for (i = 0; i < 14; i++){
+        weights[i] = p4_zero_array();
+    }
+    var state = {
+        board: board,
+        weights: weights,
+        history: [],
+        treeclimber: p4_alphabeta_treeclimber
+    };
+    p4_random_seed(state, P4_DEBUG ? 1 : Date.now());
+    return state;
+}
+
+function p4_new_game(){
+    return p4_fen2state(P4_INITIAL_BOARD);
+}
+
+/*convert an arbitrary movestring into a pair of integers offsets into
+ * the board. The string might be in any of these forms:
+ *
+ *  "d2-d4" "d2d4" "d4" -- moving a pawn
+ *
+ *  "b1-c3" "b1c3" "Nc3" "N1c3" "Nbc3" "Nb1c3" -- moving a knight
+ *
+ *  "b1xc3" "b1xc3" "Nxc3" -- moving a knight, also happens to capture.
+ *
+ *  "O-O" "O-O-O" -- special cases for castling ("e1-c1", etc, also work)
+ *
+ *  Note that for the "Nc3" (pgn) format, some knowledge of the board
+ *  is necessary, so the state parameter is required. If it is
+ *  undefined, the other forms will still work.
+ */
+
+function p4_interpret_movestring(state, str){
+    /* Ignore any irrelevant characters, then tokenise.
+     *
+     */
+    var FAIL = [0, 0];
+    var algebraic_re = /^\s*([RNBQK]?[a-h]?[1-8]?)[ :x-]*([a-h][1-8]?)(=[RNBQ])?[!?+#e.p]*\s*$/;
+    var castle_re = /^\s*([O0o]-[O0o](-[O0o])?)\s*$/;
+    var position_re = /^[a-h][1-8]$/;
+
+    var m = algebraic_re.exec(str);
+    if (m == null){
+        /*check for castling notation (O-O, O-O-O) */
+        m = castle_re.exec(str);
+        if (m){
+            s = 25 + state.to_play * 70;
+            if (m[2])/*queenside*/
+                e = s - 2;
+            else
+                e = s + 2;
+        }
+        else
+            return FAIL;
+    }
+    var src = m[1];
+    var dest = m[2];
+    var queen = m[3];
+    var s, e, q;
+    var moves, i;
+    if (src == '' || src == undefined){
+        /* a single coordinate pawn move */
+        e = p4_destringify_point(dest);
+        s = p4_find_source_point(state, e, 'P' + dest.charAt(0));
+    }
+    else if (/^[RNBQK]/.test(src)){
+        /*pgn format*/
+        e = p4_destringify_point(dest);
+        s = p4_find_source_point(state, e, src);
+    }
+    else if (position_re.test(src) && position_re.test(dest)){
+        s = p4_destringify_point(src);
+        e = p4_destringify_point(dest);
+    }
+    else if (/^[a-h]$/.test(src)){
+        e = p4_destringify_point(dest);
+        s = p4_find_source_point(state, e, 'P' + src);
+    }
+    if (s == 0)
+        return FAIL;
+
+    if (queen){
+        /* the chosen queen piece */
+        q = P4_PIECE_LUT[queen.charAt(1)];
+    }
+    return [s, e, q];
+}
+
+
+function p4_find_source_point(state, e, str){
+    var colour = state.to_play;
+    var piece = P4_PIECE_LUT[str.charAt(0)];
+    piece |= colour;
+    var s, i;
+
+    var row, column;
+    /* can be specified as Na, Na3, N3, and who knows, N3a? */
+    for (i = 1; i < str.length; i++){
+        var c = str.charAt(i);
+        if (/[a-h]/.test(c)){
+            column = str.charCodeAt(i) - 96;
+        }
+        else if (/[1-8]/.test(c)){
+            /*row goes 2 - 9 */
+            row = 1 + parseInt(c);
+        }
+    }
+    var possibilities = [];
+    p4_prepare(state);
+    var moves = p4_parse(state, colour,
+                         state.enpassant, 0);
+    for (i = 0; i < moves.length; i++){
+        var mv = moves[i];
+        if (e == mv[2]){
+            s = mv[1];
+            if (state.board[s] == piece &&
+                (column === undefined || column == s % 10) &&
+                (row === undefined || row == parseInt(s / 10))
+               ){
+                   var change = p4_make_move(state, s, e, P4_QUEEN);
+                   if (! p4_check_check(state, colour))
+                       possibilities.push(s);
+                   p4_unmake_move(state, change);
+            }
+        }
+    }
+    p4_log("finding", str, "that goes to", e, "got", possibilities);
+
+    if (possibilities.length == 0){
+        return 0;
+    }
+    else if (possibilities.length > 1){
+        p4_log("p4_find_source_point seems to have failed",
+               state, e, str,
+               possibilities);
+    }
+    return possibilities[0];
+}
+
+
+/*random number generator based on
+ * http://burtleburtle.net/bob/rand/smallprng.html
+ */
+function p4_random_seed(state, seed){
+    seed &= 0xffffffff;
+    state.rng = (P4_USE_TYPED_ARRAYS) ? new Uint32Array(4) : [];
+    state.rng[0] = 0xf1ea5eed;
+    state.rng[1] = seed;
+    state.rng[2] = seed;
+    state.rng[3] = seed;
+    for (var i = 0; i < 20; i++)
+        p4_random31(state);
+}
+
+function p4_random31(state){
+    var rng = state.rng;
+    var b = rng[1];
+    var c = rng[2];
+    /* These shifts amount to rotates.
+     * Note the three-fold right shift '>>>', meaning an unsigned shift.
+     * The 0xffffffff masks are needed to keep javascript to 32bit. (supposing
+     * untyped arrays).
+     */
+    var e = rng[0] - ((b << 27) | (b >>> 5));
+    rng[0] = b ^ ((c << 17) | (c >>> 15));
+    rng[1] = (c + rng[3]) & 0xffffffff;
+    rng[2] = (rng[3] + e) & 0xffffffff;
+    rng[3] = (e + rng[0]) & 0xffffffff;
+    return rng[3] & 0x7fffffff;
+}
+
+function p4_random_int(state, top){
+    /* uniform integer in range [0 <= n < top), supposing top < 2 ** 31
+     *
+     * This method is slightly (probably pointlessly) more accurate
+     * than converting to 0-1 float, multiplying and truncating, and
+     * considerably more accurate than a simple modulus.
+     * Obviously it is a bit slower.
+     */
+    /* mask becomes one less than the next highest power of 2 */
+    var mask = top;
+    mask--;
+    mask |= mask >>> 1;
+    mask |= mask >>> 2;
+    mask |= mask >>> 4;
+    mask |= mask >>> 8;
+    mask |= mask >>> 16;
+    var r;
+    do{
+        r = p4_random31(state) & mask;
+    } while (r >= top);
+    return r;
+}
+
+// Added for espruino
+exports.p4_new_game = p4_new_game;
+exports.p4_fen2state = p4_fen2state;
+exports.p4_state2fen = p4_state2fen;
+exports.p4_random_int = p4_random_int;
+exports.P4_INITIAL_BOARD = P4_INITIAL_BOARD;
+exports.P4_PAWN = P4_PAWN;
+exports.P4_ROOK = P4_ROOK;
+exports.P4_KNIGHT = P4_KNIGHT;
+exports.P4_BISHOP = P4_BISHOP;
+exports.P4_QUEEN = P4_QUEEN;
+exports.P4_KING = P4_KING;
+exports.P4_MOVE_FLAG_OK = P4_MOVE_FLAG_OK;
+exports.P4_MOVE_FLAG_CHECK = P4_MOVE_FLAG_CHECK;
+exports.P4_MOVE_FLAG_MATE = P4_MOVE_FLAG_MATE;
+exports.P4_MOVE_FLAG_CAPTURE = P4_MOVE_FLAG_CAPTURE;
+exports.P4_MOVE_FLAG_CASTLE_KING = P4_MOVE_FLAG_CASTLE_KING;
+exports.P4_MOVE_FLAG_CASTLE_QUEEN = P4_MOVE_FLAG_CASTLE_QUEEN;
+exports.P4_MOVE_FLAG_DRAW = P4_MOVE_FLAG_DRAW;
+exports.P4_MOVE_ILLEGAL = P4_MOVE_ILLEGAL;
+exports.P4_MOVE_MISSED_MATE = P4_MOVE_MISSED_MATE;
+exports.P4_MOVE_CHECKMATE = P4_MOVE_CHECKMATE;
+exports.P4_MOVE_STALEMATE = P4_MOVE_STALEMATE;
diff --git a/apps/chess/metadata.json b/apps/chess/metadata.json
new file mode 100644
index 000000000..3c2ea69ac
--- /dev/null
+++ b/apps/chess/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "chess",
+  "name": "Chess",
+  "shortName": "Chess",
+  "version": "0.02",
+  "description": "Chess game based on the [p4wn engine](https://p4wn.sourceforge.net/). Drag on the touchscreen to move the green cursor onto a piece, select it with a single touch and drag the now red cursor around. Release the piece with another touch to finish the move. The button opens a menu.",
+  "icon": "app.png",
+  "tags": "game",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"chess.app.js","url":"app.js"},
+    {"name":"chessengine","url":"engine.js"},
+    {"name":"chess.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"chess.json"}],
+  "screenshots": [ {"url":"screenshot.png"} ]
+}
diff --git a/apps/chess/screenshot.png b/apps/chess/screenshot.png
new file mode 100644
index 000000000..11d96163b
Binary files /dev/null and b/apps/chess/screenshot.png differ
diff --git a/apps/chimer/ChangeLog b/apps/chimer/ChangeLog
index 01bd00a0a..6c6f5312e 100644
--- a/apps/chimer/ChangeLog
+++ b/apps/chimer/ChangeLog
@@ -1,2 +1,4 @@
 0.01: Initial Creation
-0.02: Fixed some sleep bugs. Added a sleep mode toggle
\ No newline at end of file
+0.02: Fixed some sleep bugs. Added a sleep mode toggle
+0.03: Reduce busy-loop and code
+0.04: Separate buzz-time and sleep-time
diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index d5bc04950..cfa0da00f 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -1,8 +1,8 @@
 {
   "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",
+  "version": "0.04",
+  "description": "A fork of Hour Chime that adds extra features such as: \n - Buzz or beep on every 60, 30 or 15 minutes. \n - Repeat Chime up to 3 times \n - Set hours to disable chime",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 18358df9e..3b7de9d7a 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -16,25 +16,36 @@
 
   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++) {
+    let count = settings.repeat;
+
+    const chime1 = () => {
+      let p;
       if (settings.type === 1) {
-        Bangle.buzz(100);
+        p = Bangle.buzz(100);
       } else if (settings.type === 2) {
-        Bangle.beep();
+        p = Bangle.beep();
       } else {
         return;
       }
-      sleep(150);
-    }
+      if (--count > 0)
+        p.then(() => setTimeout(chime1, 150));
+    };
+
+    chime1();
+  }
+
+  function queueNextCheckMins(mins) {
+    const now = new Date(),
+      m = now.getMinutes(),
+      s = now.getSeconds(),
+      ms = now.getMilliseconds();
+
+    const mLeft = mins - (m + mins * 2) % mins,
+      sLeft = mLeft * 60 - s,
+      msLeft = sLeft * 1000 - ms;
+
+    setTimeout(check, msLeft);
   }
 
   let lastHour = new Date().getHours();
@@ -45,88 +56,41 @@
       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)
+    if (settings.sleep && (
+        h > settings.end ||
+        (h >= settings.end && m !== 0) ||
+        h < settings.start)
     ) {
-      var mLeft = 60 - m,
-        sLeft = mLeft * 60 - s,
-        msLeft = sLeft * 1000 - ms;
-      setTimeout(check, msLeft);
+      queueNextCheckMins(60);
       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);
+    switch (settings.freq) {
+      case 1:
+        if (m !== lastMinute && m % 30 === 0)
+          chime();
+        lastHour = h;
+        lastMinute = m;
+        queueNextCheckMins(30);
+        break;
+      case 2:
+        if (m !== lastMinute && m % 15 === 0)
+          chime();
+        lastHour = h;
+        lastMinute = m;
+        queueNextCheckMins(15);
+        break;
+      case 3:
+        // unreachable - not available in settings
+        if (m !== lastMinute) chime();
+        lastHour = h;
+        lastMinute = m;
+        queueNextCheckMins(1);
+        break;
+      default:
+        if (h !== lastHour && m === 0) chime();
+        lastHour = h;
+        queueNextCheckMins(60);
+        break;
     }
   }
 
diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog
index 01a51e094..9838ae409 100644
--- a/apps/circlesclock/ChangeLog
+++ b/apps/circlesclock/ChangeLog
@@ -41,3 +41,4 @@
 0.22: Fixed crash if item has no image and cutting long overflowing text
 0.23: Setting circles colours per clkinfo and not position
 0.24: Using suggested color from clock_info if set as default and available
+0.25: Use clock_info module as an app
diff --git a/apps/circlesclock/README.md b/apps/circlesclock/README.md
index 7f6a2585c..1dc5be61b 100644
--- a/apps/circlesclock/README.md
+++ b/apps/circlesclock/README.md
@@ -23,7 +23,7 @@ To change what is shown:
 
 * Unlock the watch
 * Tap on the circle to change (a border is drawn around it)
-* Swipe up/down to change the guage within the given group
+* Swipe up/down to change the gauge within the given group
 * Swipe left/right to change the group (eg. between standard Bangle.js and Alarms/etc)
 
 Data is provided by ['Clock Info'](http://www.espruino.com/Bangle.js+Clock+Info)
diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js
index 583763af1..6f76ff013 100644
--- a/apps/circlesclock/app.js
+++ b/apps/circlesclock/app.js
@@ -356,6 +356,7 @@ for(var i=0;i<circleCount; i++) {
   let w = circlePosX[i];
   let y = h3-radiusBorder;
   clockInfoMenu[i] = require("clock_info").addInteractive(clockInfoItems, {
+    app:"circlesclock",
     x:w-radiusBorder, y:y, w:radiusBorder*2, h:g.getHeight()-(y+1),
     draw : clockInfoDraw, circlePosition : i+1
   });
diff --git a/apps/circlesclock/metadata.json b/apps/circlesclock/metadata.json
index 7fc18af1b..f96a7872c 100644
--- a/apps/circlesclock/metadata.json
+++ b/apps/circlesclock/metadata.json
@@ -1,14 +1,14 @@
 { "id": "circlesclock",
   "name": "Circles clock",
   "shortName":"Circles clock",
-  "version":"0.24",
+  "version":"0.25",
   "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"}],
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "supports" : ["BANGLEJS2"],
-  "allow_emulator":true,
+  "dependencies" : { "clock_info":"module" },
   "readme": "README.md",
   "storage": [
     {"name":"circlesclock.app.js","url":"app.js"},
diff --git a/apps/clkinfocal/metadata.json b/apps/clkinfocal/metadata.json
index 6d6dd63fc..1d14c3b59 100644
--- a/apps/clkinfocal/metadata.json
+++ b/apps/clkinfocal/metadata.json
@@ -3,6 +3,7 @@
   "version":"0.01",
   "description": "For clocks that display 'clockinfo' (messages that can be cycled through using the clock_info module) this displays the day of the month in the icon, and the weekday",
   "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
   "type": "clkinfo",
   "tags": "clkinfo,calendar",
   "supports" : ["BANGLEJS2"],
diff --git a/apps/clkinfocal/screenshot.png b/apps/clkinfocal/screenshot.png
new file mode 100644
index 000000000..bb054e3a4
Binary files /dev/null and b/apps/clkinfocal/screenshot.png differ
diff --git a/apps/clkinfogps/ChangeLog b/apps/clkinfogps/ChangeLog
new file mode 100644
index 000000000..11bb8526f
--- /dev/null
+++ b/apps/clkinfogps/ChangeLog
@@ -0,0 +1,2 @@
+0.01: First version
+0.02: turned off debugging
diff --git a/apps/clkinfogps/README.md b/apps/clkinfogps/README.md
new file mode 100644
index 000000000..18e470436
--- /dev/null
+++ b/apps/clkinfogps/README.md
@@ -0,0 +1,64 @@
+# GPS Clock Info
+
+![](app.png)
+
+A clock info that displays the Ordanance Survey (OS) grid reference
+
+- At the start of the walk update the GPS with using one of the AGPS apps. This will
+  significantly reduce the time to the first fix.
+- I suggest installing the GPS power widget so that you can be assured
+  when the GPS is draining power.
+- The primary use is for walking where a GPS fix that is 2 minutes old is
+  perfectly fine for providing an OS map grid reference.
+- Saves power by only turning the GPS on for the time it takes to get a fix.
+- In a static test from 100% charge the battery fell to 20% over 48 hours.
+- It then switches the GPS off for 90 seconds before trying to get the next fix
+- Displays the GPS time and number of satelites while waiting for a fix.
+- The fix is invalidated after 4 minutes and will display 00:00:00 0
+  or the gps time while the gps is powered on and searching for a fix.
+- If the display is shows solid 00:00:00 0 then tap the clkinfo to restart it
+  as it will have timed out after 4 minutes
+- It is unlikley that this style of gps clock info will work well with the Recorder
+  app as that would hold the GPS power permantly on all the time during the
+  recording.
+- The design is intended to be minimal so if you want to complicate matters
+  please fork the app.
+
+
+## Screenshots
+
+
+![](screenshot0.png)
+
+- Above: The GPS is powered on and waiting for a fix.
+- The GPS widget shows yellow indicating powered on
+- The time from the GPS chip is displayed with the satellite count
+- The time from the GPS chip is incrementing approximately every second
+- Note the time on the GPS is in UTC and not the current timezone
+
+
+![](screenshot1.png)
+
+- Above: The GPS has a fix
+- The OS grid reference has been calculated
+- The GPS has been turned off for 90 seconds
+- The GPS widget is grey showing the GPS is off
+- You will not see the GPS widget turn green as the GPS is turned off after a fix
+
+
+![](screenshot2.png)
+
+- Above: The GPS has been powered on after 90 seconds and is waiting for a fix
+
+
+![](screenshot3.png)
+
+- Above: The GPS has not had a fix for 4 minutes and the cycle has stopped
+- The time from the GPS is 00:00:00 0, indicating that the GPS not on
+- The GPS widget is grey showing the GPS is off
+- Tap the clock_info to restart the GPS clock info
+
+
+
+
+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/clkinfogps/app.png b/apps/clkinfogps/app.png
new file mode 100644
index 000000000..ab4aa46e5
Binary files /dev/null and b/apps/clkinfogps/app.png differ
diff --git a/apps/clkinfogps/clkinfo.js b/apps/clkinfogps/clkinfo.js
new file mode 100644
index 000000000..ed2fc721a
--- /dev/null
+++ b/apps/clkinfogps/clkinfo.js
@@ -0,0 +1,127 @@
+(function () {
+  var timeout;
+  var last_fix;
+  var fixTs;
+  var geo = require("geotools");
+
+  var debug = function(o) {
+    //console.log(o);
+  };
+
+  var resetLastFix = function() {
+    last_fix = {
+      fix: 0,
+      alt: 0,
+      lat: 0,
+      lon: 0,
+      speed: 0,
+      time: 0,
+      course: 0,
+      satellites: 0
+    };
+  };
+
+  var formatTime = function(now) {
+    try {
+      var fd = now.toUTCString().split(" ");
+      return fd[4];
+    } catch (e) {
+      return "00:00:00";
+    }
+  };
+
+  var clearTimer = function() {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = undefined;
+      debug("timer cleared");
+    }
+  };
+
+  var queueGPSon = function() {
+    clearTimer();
+    // power on the GPS again in 90 seconds
+    timeout = setTimeout(function() {
+      timeout = undefined;
+      Bangle.setGPSPower(1,"clkinfo");
+    }, 90000);
+    debug("gps on queued");
+  };
+
+  var onGPS = function(fix) {
+    debug(fix);
+    last_fix.time = fix.time;
+
+    // we got a fix
+    if (fix.fix) {
+      last_fix = fix;
+      fixTs = Math.round(getTime());
+      // cancel the timeout, if not already timed out
+      clearTimer();
+      // power off the GPS
+      Bangle.setGPSPower(0,"clkinfo");
+      queueGPSon();
+    }
+
+    // if our last fix was more than 4 minutes ago, reset the fix to show gps time + satelites
+    if (Math.round(getTime()) - fixTs > 240) {
+      resetLastFix();
+      fixTs = Math.round(getTime());
+      // cancel the timeout and power off the gps, tap required to restart
+      clearTimer();
+      Bangle.setGPSPower(0,"clkinfo");
+    }
+
+    info.items[0].emit("redraw");
+  };
+
+  var img = function() {
+    return atob("GBgBAAAAAAAAABgAAb2ABzzgB37gD37wHn54AAAADEwIPn58Pn58Pv58Pn58FmA4AAAAHn54D37wD37gBzzAAb2AABgAAAAAAAAA");
+  };
+
+  var gpsText = function() {
+    if (last_fix === undefined)
+      return '';
+
+    // show gps time and satelite count
+    if (!last_fix.fix)
+      return formatTime(last_fix.time) + ' ' + last_fix.satellites;
+
+    return geo.gpsToOSMapRef(last_fix);
+  };
+
+  var info = {
+    name: "Gps",
+    items: [
+      {
+        name: "gridref",
+        get: function () { return ({
+          img: img(),
+          text: gpsText()
+        }); },
+        run : function() {
+          debug("run");
+          // if the timer is already runnuing reset it, we can get multiple run calls by tapping
+          clearTimer();
+          Bangle.setGPSPower(1,"clkinfo");
+        },
+        show: function () {
+          debug("show");
+          resetLastFix();
+          fixTs = Math.round(getTime());
+          Bangle.on("GPS",onGPS);
+          this.run();
+        },
+        hide: function() {
+          debug("hide");
+          clearTimer();
+          Bangle.setGPSPower(0,"clkinfo");
+          Bangle.removeListener("GPS", onGPS);
+          resetLastFix();
+        }
+      }
+    ]
+  };
+
+  return info;
+});
diff --git a/apps/clkinfogps/geotools.js b/apps/clkinfogps/geotools.js
new file mode 100644
index 000000000..d251c1f95
--- /dev/null
+++ b/apps/clkinfogps/geotools.js
@@ -0,0 +1,128 @@
+/**
+ * 
+ * A module of Geo functions for use with gps fixes
+ *
+ * let geo = require("geotools");
+ * let os = geo.gpsToOSGrid(fix);
+ * let ref = geo.gpsToOSMapRef(fix);
+ *
+ */
+
+Number.prototype.toRad = function() { return this*Math.PI/180; };
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+/*  Ordnance Survey Grid Reference functions  (c) Chris Veness 2005-2014                          */
+/*   - www.movable-type.co.uk/scripts/gridref.js                                                  */
+/*   - www.movable-type.co.uk/scripts/latlon-gridref.html                                         */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+function OsGridRef(easting, northing) {
+  this.easting = 0|easting;
+  this.northing = 0|northing;
+}
+OsGridRef.latLongToOsGrid = function(point) {
+  var lat = point.lat.toRad();
+  var lon = point.lon.toRad();
+
+  var a = 6377563.396, b = 6356256.909;          // Airy 1830 major & minor semi-axes
+  var F0 = 0.9996012717;                         // NatGrid scale factor on central meridian
+  var lat0 = (49).toRad(), lon0 = (-2).toRad();  // NatGrid true origin is 49Ã¯Â¿Â½N,2Ã¯Â¿Â½W
+  var N0 = -100000, E0 = 400000;                 // northing & easting of true origin, metres
+  var e2 = 1 - (b*b)/(a*a);                      // eccentricity squared
+  var n = (a-b)/(a+b), n2 = n*n, n3 = n*n*n;
+
+  var cosLat = Math.cos(lat), sinLat = Math.sin(lat);
+  var nu = a*F0/Math.sqrt(1-e2*sinLat*sinLat);              // transverse radius of curvature
+  var rho = a*F0*(1-e2)/Math.pow(1-e2*sinLat*sinLat, 1.5);  // meridional radius of curvature
+  var eta2 = nu/rho-1;
+
+  var Ma = (1 + n + (5/4)*n2 + (5/4)*n3) * (lat-lat0);
+  var Mb = (3*n + 3*n*n + (21/8)*n3) * Math.sin(lat-lat0) * Math.cos(lat+lat0);
+  var Mc = ((15/8)*n2 + (15/8)*n3) * Math.sin(2*(lat-lat0)) * Math.cos(2*(lat+lat0));
+  var Md = (35/24)*n3 * Math.sin(3*(lat-lat0)) * Math.cos(3*(lat+lat0));
+  var M = b * F0 * (Ma - Mb + Mc - Md);              // meridional arc
+
+  var cos3lat = cosLat*cosLat*cosLat;
+  var cos5lat = cos3lat*cosLat*cosLat;
+  var tan2lat = Math.tan(lat)*Math.tan(lat);
+  var tan4lat = tan2lat*tan2lat;
+
+  var I = M + N0;
+  var II = (nu/2)*sinLat*cosLat;
+  var III = (nu/24)*sinLat*cos3lat*(5-tan2lat+9*eta2);
+  var IIIA = (nu/720)*sinLat*cos5lat*(61-58*tan2lat+tan4lat);
+  var IV = nu*cosLat;
+  var V = (nu/6)*cos3lat*(nu/rho-tan2lat);
+  var VI = (nu/120) * cos5lat * (5 - 18*tan2lat + tan4lat + 14*eta2 - 58*tan2lat*eta2);
+
+  var dLon = lon-lon0;
+  var dLon2 = dLon*dLon, dLon3 = dLon2*dLon, dLon4 = dLon3*dLon, dLon5 = dLon4*dLon, dLon6 = dLon5*dLon;
+
+  var N = I + II*dLon2 + III*dLon4 + IIIA*dLon6;
+  var E = E0 + IV*dLon + V*dLon3 + VI*dLon5;
+
+  return new OsGridRef(E, N);
+};
+
+/*
+ * converts northing, easting to standard OS grid reference.
+ *
+ * [digits=10] - precision (10 digits = metres)
+ *   to_map_ref(8, 651409, 313177); => 'TG 5140 1317'
+ *   to_map_ref(0, 651409, 313177); => '651409,313177'
+ *
+ */
+function to_map_ref(digits, easting, northing) {
+  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`); // eslint-disable-line comma-spacing
+
+  let e = easting;
+  let n = northing;
+
+  // use digits = 0 to return numeric format (in metres) - note northing may be >= 1e7
+  if (digits == 0) {
+    const format = { useGrouping: false,  minimumIntegerDigits: 6, maximumFractionDigits: 3 };
+    const ePad = e.toLocaleString('en', format);
+    const nPad = n.toLocaleString('en', format);
+    return `${ePad},${nPad}`;
+  }
+
+  // get the 100km-grid indices
+  const e100km = Math.floor(e / 100000), n100km = Math.floor(n / 100000);
+
+  // translate those into numeric equivalents of the grid letters
+  let l1 = (19 - n100km) - (19 - n100km) % 5 + Math.floor((e100km + 10) / 5);
+  let l2 = (19 - n100km) * 5 % 25 + e100km % 5;
+
+  // compensate for skipped 'I' and build grid letter-pairs
+  if (l1 > 7) l1++;
+  if (l2 > 7) l2++;
+  const letterPair = String.fromCharCode(l1 + 'A'.charCodeAt(0), l2 + 'A'.charCodeAt(0));
+
+  // strip 100km-grid indices from easting & northing, and reduce precision
+  e = Math.floor((e % 100000) / Math.pow(10, 5 - digits / 2));
+  n = Math.floor((n % 100000) / Math.pow(10, 5 - digits / 2));
+
+  // pad eastings & northings with leading zeros
+  e = e.toString().padStart(digits/2, '0');
+  n = n.toString().padStart(digits/2, '0');
+
+  return `${letterPair} ${e} ${n}`;
+}
+
+/**
+ * 
+ * Module exports section, example code below
+ *
+ * let geo = require("geotools");
+ * let os = geo.gpsToOSGrid(fix);
+ * let ref = geo.gpsToOSMapRef(fix);
+ */
+
+// get easting and northings
+exports.gpsToOSGrid = function(gps_fix) {
+  return OsGridRef.latLongToOsGrid(gps_fix);
+}
+
+// string with an OS Map grid reference
+exports.gpsToOSMapRef = function(gps_fix) {
+  let os = OsGridRef.latLongToOsGrid(gps_fix);
+  return to_map_ref(6, os.easting, os.northing);
+}
diff --git a/apps/clkinfogps/metadata.json b/apps/clkinfogps/metadata.json
new file mode 100644
index 000000000..72651495f
--- /dev/null
+++ b/apps/clkinfogps/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "clkinfogps",
+  "name": "GPS Grid Ref Clockinfo",
+  "version":"0.02",
+  "description": "Clockinfo that displays the GPS OS Grid Reference",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot1.png"}],
+  "type": "clkinfo",
+  "tags": "clkinfo,gps",
+  "supports" : ["BANGLEJS2"],
+  "readme":"README.md",
+  "storage": [
+    {"name":"geotools","url":"geotools.js"},
+    {"name":"gps.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/clkinfogps/screenshot0.png b/apps/clkinfogps/screenshot0.png
new file mode 100644
index 000000000..9429c369d
Binary files /dev/null and b/apps/clkinfogps/screenshot0.png differ
diff --git a/apps/clkinfogps/screenshot1.png b/apps/clkinfogps/screenshot1.png
new file mode 100644
index 000000000..9e1d019ba
Binary files /dev/null and b/apps/clkinfogps/screenshot1.png differ
diff --git a/apps/clkinfogps/screenshot2.png b/apps/clkinfogps/screenshot2.png
new file mode 100644
index 000000000..7bb5bee36
Binary files /dev/null and b/apps/clkinfogps/screenshot2.png differ
diff --git a/apps/clkinfogps/screenshot3.png b/apps/clkinfogps/screenshot3.png
new file mode 100644
index 000000000..6f0bfffc4
Binary files /dev/null and b/apps/clkinfogps/screenshot3.png differ
diff --git a/apps/clkinfom/ChangeLog b/apps/clkinfom/ChangeLog
new file mode 100644
index 000000000..7f837e50e
--- /dev/null
+++ b/apps/clkinfom/ChangeLog
@@ -0,0 +1 @@
+0.01: First version
diff --git a/apps/clkinfom/README.md b/apps/clkinfom/README.md
new file mode 100644
index 000000000..baa241fc7
--- /dev/null
+++ b/apps/clkinfom/README.md
@@ -0,0 +1,11 @@
+# RAM Clock Info
+
+![](app.png)
+
+A clock info that displays the % memory used
+
+## Screenshots
+
+![](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/clkinfom/app.png b/apps/clkinfom/app.png
new file mode 100644
index 000000000..aea4bcbcd
Binary files /dev/null and b/apps/clkinfom/app.png differ
diff --git a/apps/clkinfom/clkinfo.js b/apps/clkinfom/clkinfo.js
new file mode 100644
index 000000000..a3dae43e1
--- /dev/null
+++ b/apps/clkinfom/clkinfo.js
@@ -0,0 +1,61 @@
+(function () {
+  var timeout;
+
+  var debug = function(o) {
+    //console.log(o);
+  };
+
+  var clearTimer = function() {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = undefined;
+      debug("timer cleared");
+    }
+  };
+
+  var queueRedraw = function() {
+    clearTimer();
+    timeout = setTimeout(function() {
+      timeout = undefined;
+      queueRedraw();
+    }, 60000);
+    info.items[0].emit("redraw");
+    debug("queued");
+  };
+
+  var img = function() {
+    return atob("GBgBAAAAAAAAAAAAB//gD//wH//4HgB4HAA4HAA4HAA4HDw4HDw4HDw4HDw4HAA4HAA4HAA4HgB4H//4D//wB//gAAAAAAAAAAAA");
+  };
+
+  var text = function() {
+    var val = process.memory(false);
+    return '' + Math.round(val.usage*100 / val.total) + '%';
+  };
+
+  var info = {
+    name: "Bangle",
+    items: [
+      {
+        name: "ram",
+        get: function () { return ({
+          img: img(),
+          text: text()
+        }); },
+        run : function() {
+          debug("run");
+          queueRedraw();
+        },
+        show: function () {
+          debug("show");
+          this.run();
+        },
+        hide: function() {
+          debug("hide");
+          clearTimer();
+        }
+      }
+    ]
+  };
+
+  return info;
+});
diff --git a/apps/clkinfom/metadata.json b/apps/clkinfom/metadata.json
new file mode 100644
index 000000000..36ab221cd
--- /dev/null
+++ b/apps/clkinfom/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "clkinfom",
+  "name": "RAM Clock Info",
+  "version":"0.01",
+  "description": "Clockinfo that displays % used memory",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clkinfo",
+  "tags": "clkinfo",
+  "supports" : ["BANGLEJS2"],
+  "readme":"README.md",
+  "storage": [
+    {"name":"ram.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/clkinfom/screenshot.png b/apps/clkinfom/screenshot.png
new file mode 100644
index 000000000..4ae613edd
Binary files /dev/null and b/apps/clkinfom/screenshot.png differ
diff --git a/apps/clkinfomag/ChangeLog b/apps/clkinfomag/ChangeLog
new file mode 100644
index 000000000..4d19c5998
--- /dev/null
+++ b/apps/clkinfomag/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New Widget!
+0.02: Ensure that the generated image is transparent (2v18+)
\ No newline at end of file
diff --git a/apps/clkinfomag/clkinfo.js b/apps/clkinfomag/clkinfo.js
new file mode 100644
index 000000000..620227472
--- /dev/null
+++ b/apps/clkinfomag/clkinfo.js
@@ -0,0 +1,49 @@
+(function() {
+  var heading, cnt;
+  function magHandler(m) {
+    var h = m.heading;
+    if (isNaN(heading) || isNaN(h))
+      heading = h;
+    else {
+      // Average
+      if (Math.abs(heading-h)>180) {
+        if (h<180 && heading>180) h+=360;
+        if (h>180 && heading<180) h-=360;
+      }
+      heading = heading*0.8 + h*0.2;
+      if (heading<0) heading+=360;
+      if (heading>=360) heading-=360;
+    }
+    // only draw 1 in 2 to try and save some power!
+    if (!(1&cnt++)) ci.items[0].emit('redraw');
+  }
+  var ci = {
+    name: "Bangle",
+    items: [
+      { name : "Compass",
+        get : function() {
+          var g = Graphics.createArrayBuffer(24,24,1,{msb:true});
+          if (isNaN(heading))
+            g.drawLine(8,12,16,12);
+          else
+            g.fillPoly(g.transformVertices([0,-10,4,10,-4,10],{x:12,y:12,rotate:-heading/57}));
+          g.transparent=0; // only works on 2v18+, ignored otherwise (makes image background transparent)
+          return { text : isNaN(heading)?"--":Math.round(heading),
+                      v : 0|heading, min : 0, max : 360,
+                      img : g.asImage("string") }},
+        show : function() {
+          Bangle.setCompassPower(1,"clkinfomag");
+          Bangle.on('mag',magHandler);
+          cnt=0;
+          heading = undefined;
+        },
+        hide : function() {
+          Bangle.removeListener('mag', magHandler);
+          Bangle.setCompassPower(0,"clkinfomag");
+        },
+        run : function() { Bangle.resetCompass(); }
+      }
+    ]
+  };
+  return ci;
+}) // must not have a semi-colon!
\ No newline at end of file
diff --git a/apps/clkinfomag/icon.png b/apps/clkinfomag/icon.png
new file mode 100644
index 000000000..aaa9c7027
Binary files /dev/null and b/apps/clkinfomag/icon.png differ
diff --git a/apps/clkinfomag/metadata.json b/apps/clkinfomag/metadata.json
new file mode 100644
index 000000000..464bba778
--- /dev/null
+++ b/apps/clkinfomag/metadata.json
@@ -0,0 +1,12 @@
+{ "id": "clkinfomag",
+  "name": "Compass Clockinfo",
+  "version":"0.02",
+  "description": "Extra information to add to clock screens. When selected, displays the compass heading and an arrow pointing North",
+  "icon": "icon.png",
+  "type": "clkinfo",
+  "tags": "clkinfo,compass,mag,magnetometer",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"clkinfomag.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/clkinfostopw/ChangeLog b/apps/clkinfostopw/ChangeLog
new file mode 100644
index 000000000..20742562f
--- /dev/null
+++ b/apps/clkinfostopw/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New clkinfo!
+0.02: Added format option, reduced battery usage
+0.03: Hardcode colon-format, show milliseconds for the first minute
diff --git a/apps/clkinfostopw/README.md b/apps/clkinfostopw/README.md
new file mode 100644
index 000000000..e92eee3ef
--- /dev/null
+++ b/apps/clkinfostopw/README.md
@@ -0,0 +1,15 @@
+# StopW
+
+A simple stopwatch widget
+
+## Usage
+
+Tap to start, tap again to pause. Tap again to restart
+
+## Requests
+
+[Contact Rob](https://www.github.com/bobrippling) for features/bugs
+
+# TypeScript
+
+This app is written in TypeScript, see [typescript/README.md](/typescript/README.md) for more info
diff --git a/apps/clkinfostopw/app.png b/apps/clkinfostopw/app.png
new file mode 100644
index 000000000..fb1d74b5c
Binary files /dev/null and b/apps/clkinfostopw/app.png differ
diff --git a/apps/clkinfostopw/clkinfo.js b/apps/clkinfostopw/clkinfo.js
new file mode 100644
index 000000000..fbbe80a55
--- /dev/null
+++ b/apps/clkinfostopw/clkinfo.js
@@ -0,0 +1,77 @@
+(function () {
+    var durationOnPause = "---";
+    var redrawInterval;
+    var startTime;
+    var showMillis = true;
+    var milliTime = 60;
+    var unqueueRedraw = function () {
+        if (redrawInterval)
+            clearInterval(redrawInterval);
+        redrawInterval = undefined;
+    };
+    var queueRedraw = function () {
+        var _this = this;
+        unqueueRedraw();
+        redrawInterval = setInterval(function () {
+            if (startTime) {
+                if (showMillis && Date.now() - startTime > milliTime * 1000) {
+                    showMillis = false;
+                    changeInterval(redrawInterval, 1000);
+                }
+            }
+            else {
+                unqueueRedraw();
+            }
+            _this.emit('redraw');
+        }, 100);
+    };
+    var pad2 = function (s) { return ('0' + s.toFixed(0)).slice(-2); };
+    var duration = function (start) {
+        var seconds = (Date.now() - start) / 1000;
+        if (seconds < milliTime)
+            return seconds.toFixed(1);
+        var mins = seconds / 60;
+        seconds %= 60;
+        if (mins < 60)
+            return "".concat(mins.toFixed(0), ":").concat(pad2(seconds));
+        var hours = mins / 60;
+        mins %= 60;
+        return "".concat(hours.toFixed(0), ":").concat(pad2(mins), ":").concat(pad2(seconds));
+    };
+    var img = function () { return atob("GBiBAAAAAAB+AAB+AAAAAAB+AAH/sAOB8AcA4A4YcAwYMBgYGBgYGBg8GBg8GBgYGBgAGAwAMA4AcAcA4AOBwAH/gAB+AAAAAAAAAA=="); };
+    return {
+        name: "timer",
+        img: img(),
+        items: [
+            {
+                name: "stopw",
+                get: function () { return ({
+                    text: startTime
+                        ? duration(startTime)
+                        : durationOnPause,
+                    img: img(),
+                }); },
+                show: function () {
+                    if (startTime) {
+                        queueRedraw.call(this);
+                    }
+                    else {
+                        this.emit('redraw');
+                    }
+                },
+                hide: unqueueRedraw,
+                run: function () {
+                    if (startTime) {
+                        durationOnPause = duration(startTime);
+                        startTime = undefined;
+                    }
+                    else {
+                        queueRedraw.call(this);
+                        showMillis = true;
+                        startTime = Date.now();
+                    }
+                }
+            }
+        ]
+    };
+});
diff --git a/apps/clkinfostopw/clkinfo.ts b/apps/clkinfostopw/clkinfo.ts
new file mode 100644
index 000000000..f0c2a6ccb
--- /dev/null
+++ b/apps/clkinfostopw/clkinfo.ts
@@ -0,0 +1,83 @@
+(() => {
+  let durationOnPause = "---";
+  let redrawInterval: IntervalId | undefined;
+  let startTime: number | undefined;
+  let showMillis = true;
+  const milliTime = 60;
+
+  const unqueueRedraw = () => {
+    if (redrawInterval) clearInterval(redrawInterval);
+    redrawInterval = undefined;
+  };
+
+  const queueRedraw = function(this: ClockInfo.MenuItem) {
+    unqueueRedraw();
+    redrawInterval = setInterval(() => {
+        if (startTime) {
+            if (showMillis && Date.now() - startTime > milliTime * 1000) {
+                showMillis = false;
+                changeInterval(redrawInterval!, 1000);
+            }
+        } else {
+            unqueueRedraw();
+        }
+        this.emit('redraw')
+    }, 100);
+  };
+
+  const pad2 = (s: number) => ('0' + s.toFixed(0)).slice(-2);
+
+  const duration = (start: number) => {
+    let seconds = (Date.now() - start) / 1000;
+
+    if (seconds < milliTime)
+      return seconds.toFixed(1);
+
+    let mins = seconds / 60;
+    seconds %= 60;
+
+    if (mins < 60)
+      return `${mins.toFixed(0)}:${pad2(seconds)}`;
+
+    let hours = mins / 60;
+    mins %= 60;
+
+    return `${hours.toFixed(0)}:${pad2(mins)}:${pad2(seconds)}`;
+  };
+
+  const img = () => atob("GBiBAAAAAAB+AAB+AAAAAAB+AAH/sAOB8AcA4A4YcAwYMBgYGBgYGBg8GBg8GBgYGBgAGAwAMA4AcAcA4AOBwAH/gAB+AAAAAAAAAA==");
+
+  return {
+    name: "timer",
+    img: img(),
+    items: [
+      {
+        name: "stopw",
+        get: () => ({
+          text: startTime
+            ? duration(startTime)
+            : durationOnPause,
+          img: img(),
+        }),
+        show: function(this: ClockInfo.MenuItem) {
+          if(startTime){ // only queue if active
+            queueRedraw.call(this);
+          }else{
+            this.emit('redraw')
+          }
+        },
+        hide: unqueueRedraw,
+        run: function() { // tapped
+          if (startTime) {
+            durationOnPause = duration(startTime);
+            startTime = undefined; // this also unqueues the redraw
+          } else {
+            queueRedraw.call(this);
+            showMillis = true;
+            startTime = Date.now();
+          }
+        }
+      }
+    ]
+  };
+}) satisfies ClockInfoFunc
diff --git a/apps/clkinfostopw/metadata.json b/apps/clkinfostopw/metadata.json
new file mode 100644
index 000000000..f33f61dbb
--- /dev/null
+++ b/apps/clkinfostopw/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "clkinfostopw",
+  "name": "Stop Watch Clockinfo",
+  "version":"0.03",
+  "description": "A simple stopwatch, shown via clockinfo",
+  "icon": "app.png",
+  "type": "clkinfo",
+  "tags": "clkinfo,timer",
+  "supports" : ["BANGLEJS2"],
+  "readme":"README.md",
+  "allow_emulator": true,
+  "storage": [
+    {"name":"stopw.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/clkinfosunrise/metadata.json b/apps/clkinfosunrise/metadata.json
index d130c6453..7bcbb289b 100644
--- a/apps/clkinfosunrise/metadata.json
+++ b/apps/clkinfosunrise/metadata.json
@@ -5,6 +5,7 @@
   "icon": "app.png",
   "type": "clkinfo",
   "tags": "clkinfo,sunrise",
+  "dependencies": {"mylocation":"app"},
   "supports" : ["BANGLEJS2"],
   "storage": [
     {"name":"sunrise.clkinfo.js","url":"clkinfo.js"}
diff --git a/apps/clock_info/ChangeLog b/apps/clock_info/ChangeLog
new file mode 100644
index 000000000..e12b30692
--- /dev/null
+++ b/apps/clock_info/ChangeLog
@@ -0,0 +1,7 @@
+0.01: Moved from modules/clock_info.js
+0.02: Fix settings page
+0.03: Reported image for battery now reflects charge level
+0.04: On 2v18+ firmware, we can now stop swipe events from being handled by other apps
+      eg. when a clockinfo is selected, swipes won't affect swipe-down widgets
+0.05: Reported image for battery is now transparent (2v18+)
+0.06: When >1 clockinfo, swiping one back tries to ensure they don't display the same thing
\ No newline at end of file
diff --git a/apps/clock_info/README.md b/apps/clock_info/README.md
new file mode 100644
index 000000000..7e1a3d637
--- /dev/null
+++ b/apps/clock_info/README.md
@@ -0,0 +1,99 @@
+# Clock Info module
+
+Module that allows for loading of clock 'info' displays
+that can be scrolled through on the clock face.
+
+## Usage
+
+In most clocks that use Clock Info, you can interact with it the following way:
+
+* Tap on an info menu to 'focus' it (this will highlight it in some way)
+* Swipe up/down to change which info is displayed within the category
+* Tap to activate (if supported), eg for a Stopwatch, Home Assistant, etc
+* Swipe left/right to change between categories (Bangle.js/Agenda/etc)
+* Tap outside the area of the Clock Info to 'defocus' it
+
+## Extensions
+
+By default Clock Info provides:
+
+* Battery
+* Steps
+* Heart Rate (HRM)
+* Altitude
+
+But by installing other apps that are tagged with the type `clkinfo` you can
+add extra features. For example [Sunrise Clockinfo](http://banglejs.com/apps/?id=clkinfosunrise)
+
+A full list is available at https://banglejs.com/apps/?c=clkinfo
+
+## Settings
+
+Available from `Settings -> Apps -> Clock Info`
+
+* `Defocus on Lock` - (default=on) when the watch screen auto-locks, defocus
+and previously focussed Clock Infos
+* `HRM` - (default=always) when does the HRM stay on?
+  * `Always` - When a HRM ClockInfo is shown, keep the HRM on
+  * `Tap` - When a HRM ClockInfo is shown, turn HRM on for 1 minute. Turn on again when tapped.
+* `Max Altitude` - on clocks like [Circles Clock](https://banglejs.com/apps/?id=circlesclock) a
+  progress/percent indicator may be shown. The percentage for altitude will be how far towards
+  the Max Altitude you are. If you go higher than `Max Altitude` the correct altitude will still
+  be shown - the percent indicator will just read 100%
+
+## API (Software development)
+
+See http://www.espruino.com/Bangle.js+Clock+Info for details on using
+this module inside your apps (or generating your own Clock Info
+extensions).
+
+`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
+* `dynamic` : if `true`, items are not constant but are sorted (e.g. calendar events sorted by date)
+* `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.hasRange` : if `true`, `.get` returns `v/min/max` values (for progress bar/guage)
+* `item.get` : function that returns an object:
+
+```JS
+{
+  'text'  // the text to display for this item
+  'short' // optional: a shorter text to display for this item (at most 6 characters)
+  'img'   // optional: a 24x24px image to display for this item
+  'color' // optional: a color string (like "#f00") to color the icon in compatible clocks
+  'v'     // (if hasRange==true) a numerical value
+  'min','max' // (if hasRange==true) a minimum and maximum numerical value (if this were to be displayed as a guage)
+}
+```
+
+* `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 `lib.js` for example usage...
+
+example.clkinfo.js :
+
+```JS
+(function() {
+  return {
+    name: "Bangle",
+    img: atob("GBiBAAD+AAH+AAH+AAH+AAH/AAOHAAYBgAwAwBgwYBgwYBgwIBAwOBAwOBgYIBgMYBgAYAwAwAYBgAOHAAH/AAH+AAH+AAH+AAD+AA==") }),
+    items: [
+      { name : "Item1",
+        get : () => ({ text : "TextOfItem1", v : 10, min : 0, max : 100,
+                      img : atob("GBiBAAD+AAH+AAH+AAH+AAH/AAOHAAYBgAwAwBgwYBgwYBgwIBAwOBAwOBgYIBgMYBgAYAwAwAYBgAOHAAH/AAH+AAH+AAH+AAD+AA==")
+                    }),
+        show : () => {},
+        hide : () => {}
+        // run : () => {} optional (called when tapped)
+      }
+    ]
+  };
+}) // must not have a semi-colon!
+```
diff --git a/apps/clock_info/app-icon.js b/apps/clock_info/app-icon.js
new file mode 100644
index 000000000..49232b838
--- /dev/null
+++ b/apps/clock_info/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="))
diff --git a/apps/clock_info/app.png b/apps/clock_info/app.png
new file mode 100644
index 000000000..4013f353f
Binary files /dev/null and b/apps/clock_info/app.png differ
diff --git a/modules/clock_info.js b/apps/clock_info/lib.js
similarity index 71%
rename from modules/clock_info.js
rename to apps/clock_info/lib.js
index 0e4e2a8b6..9dd975f1e 100644
--- a/modules/clock_info.js
+++ b/apps/clock_info/lib.js
@@ -1,54 +1,4 @@
-/* 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
-* `dynamic` : if `true`, items are not constant but are sorted (e.g. calendar events sorted by date)
-* `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.hasRange` : if `true`, `.get` returns `v/min/max` values (for progress bar/guage)
-* `item.get` : function that returns an object:
-
-{
-  'text'  // the text to display for this item
-  'short' // optional: a shorter text to display for this item (at most 6 characters)
-  'img'   // optional: a 24x24px image to display for this item
-  'color' // optional: a color string (like "#ffffff") to color the icon in compatible clocks
-  'v'     // (if hasRange==true) a numerical value
-  'min','max' // (if hasRange==true) a minimum and maximum numerical value (if this were to be displayed as a guage)
-}
-
-* `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", v : 10, min : 0, max : 100,
-                      img : atob("GBiBAAD+AAH+AAH+AAH+AAH/AAOHAAYBgAwAwBgwYBgwYBgwIBAwOBAwOBgYIBgMYBgAYAwAwAYBgAOHAAH/AAH+AAH+AAH+AAD+AA==")
-                    }),
-        show : () => {},
-        hide : () => {}
-        // run : () => {} optional (called when tapped)
-      }
-    ]
-  };
-}) // must not have a semi-colon!
-
-*/
+/* See the README for more info... */
 
 let storage = require("Storage");
 let stepGoal = undefined;
@@ -60,7 +10,27 @@ if (stepGoal == undefined) {
   stepGoal = d != undefined && d.settings != undefined ? d.settings.goal : 10000;
 }
 
+/// How many times has addInteractive been called?
+exports.loadCount = 0;
+/// A list of all the instances returned by addInteractive
+exports.clockInfos = [];
+
+/// Load the settings, with defaults
+exports.loadSettings = function() {
+  return Object.assign({
+      hrmOn : 0, // 0(Always), 1(Tap)
+      defocusOnLock : true,
+      maxAltitude : 3000,
+      apps : {}
+    },
+    require("Storage").readJSON("clock_info.json",1)||{}
+  );
+};
+
+/// Load a list of ClockInfos - this does not cache and reloads each time
 exports.load = function() {
+  var settings = exports.loadSettings();
+  delete settings.apps; // keep just the basic settings in memory
   // info used for drawing...
   var hrm = 0;
   var alt = "--";
@@ -89,10 +59,18 @@ exports.load = function() {
     items: [
     { name : "Battery",
       hasRange : true,
-      get : () => { let v = E.getBattery(); return {
-        text : v + "%", v : v, min:0, max:100,
-        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==")
-      }},
+      get : () => { let v = E.getBattery();
+        var img;
+        if (!Bangle.isCharging()) {
+          var s=24, g=Graphics.createArrayBuffer(24,24,1,{msb:true});
+          g.fillRect(0,6,s-3,18).clearRect(2,8,s-5,16).fillRect(s-2,10,s,15).fillRect(3,9,3+v*(s-9)/100,15);
+          g.transparent=0; // only works on 2v18+, ignored otherwise (makes image background transparent)
+          img = g.asImage("string");
+        } else img=atob("GBiBAAABgAADwAAHwAAPgACfAAHOAAPkBgHwDwP4Hwf8Pg/+fB//OD//kD//wD//4D//8D//4B//QB/+AD/8AH/4APnwAHAAACAAAA==");
+        return {
+          text : v + "%", v : v, min:0, max:100, img : img
+        };
+      },
       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); },
     },
@@ -101,7 +79,7 @@ exports.load = function() {
       get : () => { let v = Bangle.getHealthStatus("day").steps; return {
           text : v, v : v, min : 0, max : stepGoal,
         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); },
     },
@@ -110,9 +88,32 @@ exports.load = function() {
       get : () => { return {
         text : (hrm||"--") + " bpm", v : hrm, min : 40, max : 200,
         img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAADAAADAAAHAAAHjAAHjgAPngH9n/n82/gA+AAA8AAA8AAAcAAAYAAAYAAAAAAAAAAAAAAAAAAAAAA==")
-      }},
-      show : function() { Bangle.setHRMPower(1,"clkinfo"); Bangle.on("HRM", hrmUpdateHandler); hrm = Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm); hrmUpdateHandler(); },
-      hide : function() { Bangle.setHRMPower(0,"clkinfo"); Bangle.removeListener("HRM", hrmUpdateHandler); hrm = 0; },
+      };},
+      run : function() {
+        Bangle.setHRMPower(1,"clkinfo");
+        if (settings.hrmOn==1/*Tap*/) {
+          /* turn off after 1 minute. If Health HRM monitoring is
+          enabled we will still get HRM events every so often */
+          this.timeout = setTimeout(function() {
+            this.timeout = undefined;
+            Bangle.setHRMPower(0,"clkinfo");
+          }, 60000);
+        }
+      },
+      show : function() {
+        Bangle.on("HRM", hrmUpdateHandler);
+        hrm = Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm); hrmUpdateHandler();
+        this.run(); // start HRM
+      },
+      hide : function() {
+        Bangle.setHRMPower(0,"clkinfo");
+        Bangle.removeListener("HRM", hrmUpdateHandler);
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+          this.timeout = undefined;
+        }
+        hrm = 0;
+      },
     }
   ],
   }];
@@ -123,7 +124,7 @@ exports.load = function() {
       hasRange : true,
       get : () => ({
         text : alt, v : parseInt(alt),
-        min : 0, max : 3000,
+        min : 0, max : settings.maxAltitude,
         img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAAACAAAGAAAPAAEZgAOwwAPwQAZgYAwAMBgAGBAACDAADGAABv///////wAAAAAAAAAAAAAAAAAAAA==")
       }),
       show : function() { this.interval = setInterval(altUpdateHandler, 60000); alt = "--"; altUpdateHandler(); },
@@ -136,11 +137,11 @@ exports.load = function() {
   require("Storage").list(/clkinfo.js$/).forEach(fn => {
     try{
       var a = eval(require("Storage").read(fn))();
-      var b = menu.find(x => x.name === a.name)
+      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 "+E.toJS(fn))
+      console.log("Could not load clock info "+E.toJS(fn));
     }
   });
 
@@ -148,9 +149,18 @@ exports.load = function() {
   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.
 
+options = {
+  app : "str",                // optional: app ID used when saving clock_info positions
+                              // if defined, your app will remember its own positions,
+                              // otherwise all apps share the same ones
+  x : 20, y: 20, w: 80, h:80, // dimensions of area used for clock_info
+  draw : (itm, info, options) // draw function
+}
+
 For example:
 
 let clockInfoItems = require("clock_info").load();
@@ -181,7 +191,7 @@ clockInfoMenu is the 'options' parameter, with the following added:
 * `redraw` : function - force a redraw
 * `focus` : function - bool to show if menu is focused or not
 
-You can have more than one clock_info at once as well, sfor instance:
+You can have more than one clock_info at once as well, for instance:
 
 let clockInfoDraw = (itm, info, options) => {
   g.reset().setBgColor(options.bg).setColor(options.fg).clearRect(options.x, options.y, options.x+options.w-2, options.y+options.h-1);
@@ -200,20 +210,21 @@ exports.addInteractive = function(menu, options) {
   if ("function" == typeof options) options = {draw:options}; // backwards compatibility
   options.index = 0|exports.loadCount;
   exports.loadCount = options.index+1;
+  exports.clockInfos[options.index] = options;
   options.focus = options.index==0 && options.x===undefined; // focus if we're the first one loaded and no position has been defined
-  const appName = "default:"+options.index;
+  const appName = (options.app||"default")+":"+options.index;
 
-  { // load the currently showing clock_infos
-    let settings = require("Storage").readJSON("clock_info.json",1)||{};
-    if (settings[appName]) {
-      let a = settings[appName].a|0;
-      let b = settings[appName].b|0;
-      if (menu[a] && menu[a].items[b]) { // all ok
-        options.menuA = a;
-        options.menuB = b;
-      }
+  // load the currently showing clock_infos
+  let settings = exports.loadSettings();
+  if (settings.apps[appName]) {
+    let a = settings.apps[appName].a|0;
+    let b = settings.apps[appName].b|0;
+    if (menu[a] && menu[a].items[b]) { // all ok
+      options.menuA = a;
+      options.menuB = b;
     }
   }
+
   if (options.menuA===undefined) options.menuA = 0;
   if (options.menuB===undefined) options.menuB = Math.min(exports.loadCount, menu[options.menuA].items.length)-1;
   function drawItem(itm) {
@@ -255,6 +266,10 @@ exports.addInteractive = function(menu, options) {
         //can happen for dynamic ones (alarms, events)
         //in the worst case we come back to 0
       } while(menu[options.menuA].items.length==0);
+      // When we change, ensure we don't display the same thing as another clockinfo if we can avoid it
+      while ((options.menuB < menu[options.menuA].items.length) &&
+             exports.clockInfos.some(m => (m!=options) && m.menuA==options.menuA && m.menuB==options.menuB))
+          options.menuB++;
     }
     if (oldMenuItem) {
       menuHideItem(oldMenuItem);
@@ -262,21 +277,15 @@ exports.addInteractive = function(menu, options) {
       menuShowItem(menu[options.menuA].items[options.menuB]);
     }
     // save the currently showing clock_info
-    let settings = require("Storage").readJSON("clock_info.json",1)||{};
-    settings[appName] = {a:options.menuA,b:options.menuB};
+    let settings = exports.loadSettings();
+    settings.apps[appName] = {a:options.menuA,b:options.menuB};
     require("Storage").writeJSON("clock_info.json",settings);
+    // On 2v18+ firmware we can stop other event handlers from being executed since we handled this
+    E.stopEventPropagation&&E.stopEventPropagation();
   }
   Bangle.on("swipe",swipeHandler);
-  var touchHandler;
-  var lockHandler;
+  let touchHandler, lockHandler;
   if (options.x!==undefined && options.y!==undefined && options.w && options.h) {
-    lockHandler = function() {
-      if(options.focus) {
-        options.focus=false;
-        delete Bangle.CLKINFO_FOCUS;
-        options.redraw();
-      }
-    };
     touchHandler = function(_,e) {
       if (e.x<options.x || e.y<options.y ||
           e.x>(options.x+options.w) || e.y>(options.y+options.h)) {
@@ -300,7 +309,16 @@ exports.addInteractive = function(menu, options) {
       }
     };
     Bangle.on("touch",touchHandler);
-    Bangle.on("lock", lockHandler);
+    if (settings.defocusOnLock) {
+      lockHandler = function() {
+        if(options.focus) {
+          options.focus=false;
+          delete Bangle.CLKINFO_FOCUS;
+          options.redraw();
+        }
+      };
+      Bangle.on("lock", lockHandler);
+    }
   }
   // draw the first item
   menuShowItem(menu[options.menuA].items[options.menuB]);
@@ -312,6 +330,7 @@ exports.addInteractive = function(menu, options) {
     delete Bangle.CLKINFO_FOCUS;
     menuHideItem(menu[options.menuA].items[options.menuB]);
     exports.loadCount--;
+    delete exports.clockInfos[options.index];
   };
   options.redraw = function() {
     drawItem(menu[options.menuA].items[options.menuB]);
@@ -332,7 +351,8 @@ exports.addInteractive = function(menu, options) {
     menuShowItem(menu[options.menuA].items[options.menuB]);
 
     return true;
-  }
+  };
+  delete settings; // don't keep settings in RAM - save space
   return options;
 };
 
diff --git a/apps/clock_info/metadata.json b/apps/clock_info/metadata.json
new file mode 100644
index 000000000..ef9a3effa
--- /dev/null
+++ b/apps/clock_info/metadata.json
@@ -0,0 +1,18 @@
+{ "id": "clock_info",
+  "name": "Clock Info Module",
+  "shortName": "Clock Info",
+  "version":"0.06",
+  "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
+  "icon": "app.png",
+  "type": "module",
+  "tags": "clkinfo",
+  "supports" : ["BANGLEJS2"],
+  "provides_modules" : ["clock_info"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"clock_info","url":"lib.js"},
+    {"name":"clock_info.settings.js","url":"settings.js"}
+  ], "data": [
+    {"name":"clock_info.json","url":"lib.js"}
+  ]
+}
diff --git a/apps/clock_info/settings.js b/apps/clock_info/settings.js
new file mode 100644
index 000000000..a86fae473
--- /dev/null
+++ b/apps/clock_info/settings.js
@@ -0,0 +1,30 @@
+(function(back) {
+  let settings = require("clock_info").loadSettings();
+
+  function save(key, value) {
+    settings[key] = value;
+    require('Storage').write("clock_info.json", settings);
+  }
+
+  let menu ={
+    '': { 'title': 'Clock Info' },
+    /*LANG*/'< Back': back,
+    /*LANG*/'Defocus on Lock': {
+      value:  !!settings.defocusOnLock,
+      onchange: x => save('defocusOnLock', x),
+    },
+    /*LANG*/'HRM': {
+      value: settings.hrmOn,
+      min: 0, max: 1, step: 1,
+      format: v => ["Always","Tap"][v],
+      onchange: x => save('hrmOn', x),
+    },
+    /*LANG*/'Max Altitude': {
+      value: settings.maxAltitude,
+      min: 500, max: 10000, step: 500,
+      format: v => v+"m",
+      onchange: x => save('maxAltitude', x),
+    }
+  };
+  E.showMenu(menu);
+})
diff --git a/apps/clockcal/ChangeLog b/apps/clockcal/ChangeLog
index 27d4fc7f4..5657bf26d 100644
--- a/apps/clockcal/ChangeLog
+++ b/apps/clockcal/ChangeLog
@@ -4,3 +4,5 @@
 0.04: Use default Bangle formatter for booleans
 0.05: Improved colors (connected vs disconnected)
 0.06: Tell clock widgets to hide.
+0.07: Convert Yes/No On/Off in settings to checkboxes
+0.08: Fixed typo in settings.js for DRAGDOWN to make option work
\ No newline at end of file
diff --git a/apps/clockcal/metadata.json b/apps/clockcal/metadata.json
index 872211495..998115827 100644
--- a/apps/clockcal/metadata.json
+++ b/apps/clockcal/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "clockcal",
   "name": "Clock & Calendar",
-  "version": "0.06",
+  "version": "0.08",
   "description": "Clock with Calendar",
   "readme":"README.md",
   "icon": "app.png",
diff --git a/apps/clockcal/settings.js b/apps/clockcal/settings.js
index d4cc4df68..a406f3cf7 100644
--- a/apps/clockcal/settings.js
+++ b/apps/clockcal/settings.js
@@ -16,7 +16,7 @@
 
     actions = ["[ignore]","[calend.]","[AI:music]","[AI:messg]"];
     require("Storage").list(RegExp(".app.js")).forEach(element => actions.push(element.replace(".app.js","")));
-  
+
     function writeSettings() {
         require('Storage').writeJSON(FILE, settings);
     }
@@ -93,7 +93,7 @@
             value: actions.indexOf(settings.DRAGDOWN),
             format: v => actions[v],
             onchange: v => {
-                settings.DRGDOWN = actions[v];
+                settings.DRAGDOWN = actions[v];
                 writeSettings();
             }
         },
@@ -106,18 +106,11 @@
                 writeSettings();
             }
         },
-        'Load deafauls?': {
-            value: 0,
-            min: 0, max: 1,
-            format: v => ["No", "Yes"][v],
-            onchange: v => {
-                if (v == 1) {
-                    settings = defaults;
-                    writeSettings();
-                    load();
-                }
-            }
-        },
+        'Load defaults': () => {
+            settings = defaults;
+            writeSettings();
+            load();
+        }
     };
     // Show the menu
     E.showMenu(menu);
diff --git a/apps/cogclock/ChangeLog b/apps/cogclock/ChangeLog
index 403cd2258..23885e519 100644
--- a/apps/cogclock/ChangeLog
+++ b/apps/cogclock/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Use ClockFace library, add settings
 0.03: Use ClockFace_menu.addSettingsFile
 0.04: Hide widgets instead of not loading them at all
+0.05: Support Bangle.js 2
diff --git a/apps/cogclock/app.js b/apps/cogclock/app.js
index d24031684..30df613ae 100644
--- a/apps/cogclock/app.js
+++ b/apps/cogclock/app.js
@@ -44,7 +44,7 @@ const clock = new ClockFace({
   precision: 1,
   settingsFile: "cogclock.settings.json",
   init: function() {
-    this.r1 = 84; // inner radius
+    this.r1 = (process.env.HWVERSION>1) ? 68 : 84; // inner radius
     this.r3 = Math.min(Bangle.appRect.w/2, Bangle.appRect.h/2); // outer radius
     this.r2 = (this.r1*3+this.r3*2)/5;
     this.teeth = 12;
diff --git a/apps/cogclock/metadata.json b/apps/cogclock/metadata.json
index d404275ee..fee8982df 100644
--- a/apps/cogclock/metadata.json
+++ b/apps/cogclock/metadata.json
@@ -1,13 +1,13 @@
 {
   "id": "cogclock",
   "name": "Cog Clock",
-  "version": "0.04",
+  "version": "0.05",
   "description": "A cross-shaped clock inside a cog",
   "icon": "icon.png",
-  "screenshots": [{"url":"screenshot.png"}],
+  "screenshots": [{"url":"screenshot_b1.png"},{"url":"screenshot_b2.png"}],
   "type": "clock",
   "tags": "clock",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "allow_emulator": true,
   "storage": [
     {"name":"cogclock.app.js","url":"app.js"},
diff --git a/apps/cogclock/screenshot.png b/apps/cogclock/screenshot_b1.png
similarity index 100%
rename from apps/cogclock/screenshot.png
rename to apps/cogclock/screenshot_b1.png
diff --git a/apps/cogclock/screenshot_b2.png b/apps/cogclock/screenshot_b2.png
new file mode 100644
index 000000000..3eddda615
Binary files /dev/null and b/apps/cogclock/screenshot_b2.png differ
diff --git a/apps/compass/ChangeLog b/apps/compass/ChangeLog
index cb1c6d463..1e7360018 100644
--- a/apps/compass/ChangeLog
+++ b/apps/compass/ChangeLog
@@ -6,3 +6,4 @@
 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
+0.09: use falling edge of button to reset compass (allows exit without compass reset)
\ No newline at end of file
diff --git a/apps/compass/compass.js b/apps/compass/compass.js
index 9a7aec2fc..b7c8ebb71 100644
--- a/apps/compass/compass.js
+++ b/apps/compass/compass.js
@@ -68,7 +68,7 @@ g.clear(1);
 g.setFont("6x8").setFontAlign(0,0,3).drawString(/*LANG*/"RESET", g.getWidth()-5, g.getHeight()/2);
 setWatch(function() {
   Bangle.resetCompass();
-}, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat:true});
+}, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat:true, edge:"falling"});
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
diff --git a/apps/compass/metadata.json b/apps/compass/metadata.json
index 1a614e1f8..9cc03d6c8 100644
--- a/apps/compass/metadata.json
+++ b/apps/compass/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "compass",
   "name": "Compass",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Simple compass that points North",
   "icon": "compass.png",
   "screenshots": [{"url":"screenshot_compass.png"}],
diff --git a/apps/contourclock/metadata.json b/apps/contourclock/metadata.json
index d59999c04..ca5ee114f 100644
--- a/apps/contourclock/metadata.json
+++ b/apps/contourclock/metadata.json
@@ -15,5 +15,6 @@
     {"name":"contourclock.settings.js","url":"contourclock.settings.js"},
     {"name":"contourclock","url":"lib.js"},
     {"name":"contourclock.img","url":"app-icon.js","evaluate":true}
-    ]
+  ],
+  "data": [{"name":"contourclock.json"}]
 }
diff --git a/apps/cprassist/metadata.json b/apps/cprassist/metadata.json
index d832e98c5..94ba71d1b 100644
--- a/apps/cprassist/metadata.json
+++ b/apps/cprassist/metadata.json
@@ -13,5 +13,6 @@
     {"name":"cprassist.app.js","url":"cprassist.js"},
     {"name":"cprassist.img","url":"cprassist-icon.js","evaluate":true},
     {"name":"cprassist.settings.js","url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"cprassist.settings.json"}]
 }
diff --git a/apps/cscsensor/ChangeLog b/apps/cscsensor/ChangeLog
index a98be5c0f..5264e8d42 100644
--- a/apps/cscsensor/ChangeLog
+++ b/apps/cscsensor/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Now read wheel rev as well as cadence sensor
       Improve connection code
 0.07: Make Bangle.js 2 compatible
+0.08: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/cscsensor/metadata.json b/apps/cscsensor/metadata.json
index 4006789ef..d7c3add53 100644
--- a/apps/cscsensor/metadata.json
+++ b/apps/cscsensor/metadata.json
@@ -2,15 +2,18 @@
   "id": "cscsensor",
   "name": "Cycling speed sensor",
   "shortName": "CSCSensor",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Read BLE enabled cycling speed and cadence sensor and display readings on watch",
   "icon": "icons8-cycling-48.png",
-  "tags": "outdoors,exercise,ble,bluetooth",
+  "tags": "outdoors,exercise,ble,bluetooth,bike,cycle,bicycle",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"cscsensor.app.js","url":"cscsensor.app.js"},
     {"name":"cscsensor.settings.js","url":"settings.js"},
     {"name":"cscsensor.img","url":"cscsensor-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"cscsensor.json"}
   ]
 }
diff --git a/apps/cscsensor/settings.js b/apps/cscsensor/settings.js
index d7a7d565d..4fac5d0c1 100644
--- a/apps/cscsensor/settings.js
+++ b/apps/cscsensor/settings.js
@@ -23,17 +23,17 @@
     }
   }
   const menu = {
-    '': { 'title': 'Cycle speed sensor' },
+    '': { 'title': /*LANG*/'Cycle speed sensor' },
     '< Back': back,
-    'Wheel circ.(mm)': {
+    /*LANG*/'Wheel circ.(mm)': {
       value: s.wheelcirc,
       min: 800,
       max: 2400,
       step: 5,
       onchange: save('wheelcirc'),
     },
-    'Reset total distance': function() {
-      E.showPrompt("Zero total distance?", {buttons: {"No":false, "Yes":true}}).then(function(v) {
+    /*LANG*/'Reset total distance': function() {
+      E.showPrompt(/*LANG*/"Zero total distance?", {buttons: {/*LANG*/"No":false, /*LANG*/"Yes":true}}).then(function(v) {
         if (v) {
           s['totaldist'] = 0;
           storage.write(SETTINGS_FILE, s);
diff --git a/apps/cycling/metadata.json b/apps/cycling/metadata.json
index cb4260bb2..caf93eda3 100644
--- a/apps/cycling/metadata.json
+++ b/apps/cycling/metadata.json
@@ -13,5 +13,8 @@
     {"name":"cycling.settings.js","url":"settings.js"},
     {"name":"blecsc","url":"blecsc.js"},
     {"name":"cycling.img","url":"cycling.icon.js","evaluate": true}
+  ],
+  "data": [
+    {"name":"cycling.json"}
   ]
 }
diff --git a/apps/distortclk/app-icon.js b/apps/distortclk/app-icon.js
index c375de96e..56a3c6b6f 100644
--- a/apps/distortclk/app-icon.js
+++ b/apps/distortclk/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("j0ewkBiIAxHIQMJiBJEIxAaCAIQfHDgIUFDwwNCHYgVFiAVBHYgIDEghKCCIQGCFYoaDAYgORGIJ2DBwYIBHgQOPgAOIPIYOGAgQOFFgh7DHZQeDBwhoFQgh3JEAgOFFoqkHYRzgOfx4bCJ4gNGSIaJEABA7EAGA"))
+require("heatshrink").decompress(atob("mEwwMB/4AFgYCB4H//kAAoMAn/w+IFBx8P8fjAoPH4/n4/gg/j8/Px4rB+Pz58ch/wnHzz0wv/+hl5zlhDoOGnOY44FB8cZyOP/1/+OJwcfAoP44OGn4FB/lh5giBAIMz7n/AoP/nf4Aocf/IFDz5YBAoWP+YFD54FFMgIFD84FD84FM/0AApKfDApiaCAAJBCApKyCWgRlBAAWfOIIACj/8Aoc//g/BJ4KTBn4FBBIUfAoIbCx4CBFoUHAQPgDIMhAoOEV4NwVgMOn/4/jdBn8fDILpBUIfwh5TBIAYABA="))
diff --git a/apps/dragboard/metadata.json b/apps/dragboard/metadata.json
index 964ace3a7..58de5153c 100644
--- a/apps/dragboard/metadata.json
+++ b/apps/dragboard/metadata.json
@@ -6,10 +6,13 @@
   "type":"textinput",
   "tags": "keyboard",
   "supports" : ["BANGLEJS2"],
-  "screenshots": [{"url":"screenshot.png"}],  
+  "screenshots": [{"url":"screenshot.png"}],
   "readme": "README.md",
   "storage": [
     {"name":"textinput","url":"lib.js"},
     {"name":"dragboard.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"dragboard.json"}
   ]
 }
diff --git a/apps/draguboard/ChangeLog b/apps/draguboard/ChangeLog
new file mode 100644
index 000000000..a228aab54
--- /dev/null
+++ b/apps/draguboard/ChangeLog
@@ -0,0 +1 @@
+0.01: New App based on dragboard, but with a U shaped drag area
diff --git a/apps/draguboard/README.md b/apps/draguboard/README.md
new file mode 100644
index 000000000..2386c7658
--- /dev/null
+++ b/apps/draguboard/README.md
@@ -0,0 +1,8 @@
+Swipe along the drag bars and release to select a letter, number or punctuation.
+
+Tap on left for backspace or right for space.
+
+Settings: 
+- ABC Color: color of the characters row
+- Num Color: color of the digits and symbols row
+- Highlight Color: color of the currently shown character
diff --git a/apps/draguboard/app.png b/apps/draguboard/app.png
new file mode 100644
index 000000000..ae7262b47
Binary files /dev/null and b/apps/draguboard/app.png differ
diff --git a/apps/draguboard/lib.js b/apps/draguboard/lib.js
new file mode 100644
index 000000000..258f8b02d
--- /dev/null
+++ b/apps/draguboard/lib.js
@@ -0,0 +1,156 @@
+exports.input = function(options) {
+  options = options||{};
+  var text = options.text;
+  if ("string"!=typeof text) text="";
+  let settings = require('Storage').readJSON('draguboard.json',1)||{};
+
+  var R;
+  const paramToColor = (param) => g.toColor(`#${settings[param].toString(16).padStart(3,0)}`);
+  var BGCOLOR = g.theme.bg;
+  var HLCOLOR = settings.Highlight ? paramToColor("Highlight") : g.theme.fg;
+  var ABCCOLOR = settings.ABC ? paramToColor("ABC") : g.toColor(1,0,0);//'#FF0000';
+  var NUMCOLOR = settings.Num ? paramToColor("Num") : g.toColor(0,1,0);//'#00FF00';
+  var BIGFONT = '6x8:3';
+  var SMALLFONT = '6x8:1';
+
+  var LEFT = "IJKLMNOPQ";
+  var MIDDLE = "ABCDEFGH";
+  var RIGHT = "RSTUVWXYZ";
+
+  var NUM = ' 1234567890!?,.-@';
+  var rectHeight = 40;
+  var vLength = LEFT.length;
+  var MIDPADDING;
+  var NUMPADDING;
+  var showCharY;
+  var middleWidth;
+  var middleStart;
+  var topStart;
+
+  function drawAbcRow() {
+    g.clear();
+    try { // Draw widgets if they are present in the current app.
+      if (WIDGETS) Bangle.drawWidgets();
+    } catch (_) {}
+    g.setColor(ABCCOLOR);
+    g.setFont('6x8:2x1');
+    g.setFontAlign(-1, -1, 0);
+    g.drawString(RIGHT.split("").join("\n\n"), R.x2-28, topStart);
+    g.drawString(LEFT.split("").join("\n\n"), R.x+22, topStart);
+    g.setFont('6x8:1x2');
+    var spaced = MIDDLE.split("").join(" ");
+    middleWidth = g.stringWidth(spaced);
+    middleStart = (R.x2-middleWidth)/2;
+    g.drawString(spaced, (R.x2-middleWidth)/2, (R.y2)/2);
+    g.fillRect(MIDPADDING, (R.y2)-26, (R.x2-MIDPADDING), (R.y2));
+    // Draw left and right drag rectangles
+    g.fillRect(R.x, R.y, 12, R.y2);
+    g.fillRect(R.x2, R.y, R.x2-12, R.y2);
+  }
+
+  function drawNumRow() {
+    g.setFont('6x8:1x2');
+    g.setColor(NUMCOLOR);
+    NUMPADDING = (R.x2-g.stringWidth(NUM))/2;
+    g.setFontAlign(-1, -1, 0);
+    g.drawString(NUM, NUMPADDING, (R.y2)/4);
+    g.drawString("<-", NUMPADDING+10, showCharY+5);
+    g.drawString("->", R.x2-(NUMPADDING+20), showCharY+5);
+
+    g.fillRect(NUMPADDING, (R.y2)-rectHeight*4/3, (R.x2)-NUMPADDING, (R.y2)-rectHeight*2/3);
+  }
+
+  function updateTopString() {
+    g.setFont(SMALLFONT);
+    g.setColor(BGCOLOR);
+    g.fillRect(R.x,R.y,R.x2,R.y+9);
+    var rectLen = text.length<27? text.length*6:27*6;
+    g.setColor(0.7,0,0);
+    //draw cursor at end of text
+    g.fillRect(R.x+rectLen+5,R.y,R.x+rectLen+10,R.y+9);
+    g.setColor(HLCOLOR);
+    g.setFontAlign(-1, -1, 0);
+    g.drawString(text.length<=27? text : '<- '+text.substr(-24,24), R.x+5, R.y+1);
+  }
+
+  function showChars(chars) {
+    "ram";
+
+    // clear large character
+    g.setColor(BGCOLOR);
+    g.fillRect(R.x+65,showCharY,R.x2-65,showCharY+28);
+
+    // show new large character
+    g.setColor(HLCOLOR);
+    g.setFont(BIGFONT);
+    g.setFontAlign(-1, -1, 0);
+    g.drawString(chars, (R.x2 - g.stringWidth(chars))/2, showCharY+4);
+  }
+
+  var charPos;
+  var char;
+  var prevChar;
+
+  function moveCharPos(list, select, posPixels) {
+    charPos = Math.min(list.length-1, Math.max(0, Math.floor(posPixels)));
+    char = list.charAt(charPos);
+
+    if (char != prevChar) showChars(char);
+    prevChar = char;
+
+    if (select) {
+      text += char;
+      updateTopString();
+    }
+  }
+
+  return new Promise((resolve,reject) => {
+    // Interpret touch input
+    Bangle.setUI({
+      mode: 'custom',
+      back: ()=>{
+        Bangle.setUI();
+        g.clearRect(Bangle.appRect);
+        resolve(text);
+      },
+      drag: function(event) {
+        "ram";
+
+        // drag on middle bottom rectangle
+        if (event.x > MIDPADDING - 2 && event.x < (R.x2-MIDPADDING + 2) && event.y >= ( (R.y2) - 12 )) {
+          moveCharPos(MIDDLE, event.b == 0, (event.x-middleStart)/(middleWidth/MIDDLE.length));
+        }
+        // drag on left or right rectangle
+        else if (event.y > R.y && (event.x < MIDPADDING-2 || event.x > (R.x2-MIDPADDING + 2))) {
+          moveCharPos(event.x<MIDPADDING-2 ? LEFT : RIGHT, event.b == 0, (event.y-topStart)/((R.y2 - topStart)/vLength));
+        }
+        // drag on top rectangle for number or punctuation
+        else if ((event.y < ( (R.y2) - 12 )) && (event.y > ( (R.y2) - 52 ))) {
+          moveCharPos(NUM, event.b == 0, (event.x-NUMPADDING)/6);
+        }
+        // Make a space or backspace by tapping right or left on screen above green rectangle
+        else if (event.y > R.y && event.b == 0) {
+          if (event.x < (R.x2)/2) {
+            showChars('<-');
+            text = text.slice(0, -1);
+          } else {
+            //show space sign
+            showChars('->');
+            text += ' ';
+          }
+          prevChar = null;
+          updateTopString();
+        }
+      }
+    });
+
+    R = Bangle.appRect;
+    MIDPADDING = R.x + 35;
+    showCharY = (R.y2)/3;
+    topStart = R.y+12;
+
+    drawAbcRow();
+    drawNumRow();
+    updateTopString();
+  });
+};
diff --git a/apps/draguboard/metadata.json b/apps/draguboard/metadata.json
new file mode 100644
index 000000000..dc9b06254
--- /dev/null
+++ b/apps/draguboard/metadata.json
@@ -0,0 +1,18 @@
+{ "id": "draguboard",
+  "name": "DragUboard",
+  "version":"0.01",
+  "description": "A library for text input via swiping U-shaped keyboard.",
+  "icon": "app.png",
+  "type":"textinput",
+  "tags": "keyboard",
+  "supports" : ["BANGLEJS2"],
+  "screenshots": [{"url":"screenshot.png"}],
+  "readme": "README.md",
+  "storage": [
+    {"name":"textinput","url":"lib.js"},
+    {"name":"draguboard.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"draguboard.json"}
+  ]
+}
diff --git a/apps/draguboard/screenshot.png b/apps/draguboard/screenshot.png
new file mode 100644
index 000000000..f2cb91717
Binary files /dev/null and b/apps/draguboard/screenshot.png differ
diff --git a/apps/draguboard/settings.js b/apps/draguboard/settings.js
new file mode 100644
index 000000000..c94ebee70
--- /dev/null
+++ b/apps/draguboard/settings.js
@@ -0,0 +1,44 @@
+(function(back) {
+  let settings = require('Storage').readJSON('draguboard.json',1)||{};
+  const colors = {
+      4095: /*LANG*/"White",
+      4080: /*LANG*/"Yellow",
+      3840: /*LANG*/"Red",
+      3855: /*LANG*/"Magenta",
+      255: /*LANG*/"Cyan",
+      240: /*LANG*/"Green",
+      15: /*LANG*/"Blue",
+      0: /*LANG*/"Black",
+      '-1': /*LANG*/"Default"
+  };
+
+  const save = () => require('Storage').write('draguboard.json', settings);
+  function colorMenu(key) {
+    let menu = {'': {title: key}, '< Back': () => E.showMenu(appMenu)};
+    Object.keys(colors).forEach(color => {
+      var label = colors[color];
+      menu[label] = {
+        value: settings[key] == color,
+        onchange: () => {
+          if (color >= 0) {
+            settings[key] = color;
+          } else {
+            delete settings[key];
+          }
+          save();
+          setTimeout(E.showMenu, 10, appMenu);
+        }
+      };
+    });
+    return menu;
+  }
+
+  const appMenu = {
+      '': {title: 'draguboard'}, '< Back': back,
+      /*LANG*/'ABC Color': () => E.showMenu(colorMenu("ABC")),
+      /*LANG*/'Num Color': () => E.showMenu(colorMenu("Num")),
+      /*LANG*/'Highlight Color': () => E.showMenu(colorMenu("Highlight"))
+  };
+
+  E.showMenu(appMenu);
+});
\ No newline at end of file
diff --git a/apps/drained/ChangeLog b/apps/drained/ChangeLog
new file mode 100644
index 000000000..c7fd27981
--- /dev/null
+++ b/apps/drained/ChangeLog
@@ -0,0 +1,4 @@
+0.01: New app!
+0.02: Allow boot exceptions, e.g. to load DST
+0.03: Permit exceptions to load in low-power mode, e.g. daylight saving time.
+      Also avoid polluting global scope.
diff --git a/apps/drained/README.md b/apps/drained/README.md
new file mode 100644
index 000000000..7bef74d81
--- /dev/null
+++ b/apps/drained/README.md
@@ -0,0 +1,33 @@
+# Drained
+
+With this app installed, your Bangle will automatically switch into low power mode when the battery reaches 5% battery (or a preconfigured percentage), displaying a simple clock. When the battery is then charged above 20% (also configurable), normal operation is restored.
+
+Low power mode can also be exited manually, by tapping the primary watch button (an initial tap may be required to unlock the watch).
+
+# Features
+
+## Persistence
+- [x] Restore normal operation with sufficient charge
+- [x] Reactivate on watch startup
+
+## Time
+- [x] Show simple date/time
+- [ ] Disable alarms - with a setting?
+- [ ] Smarter/backoff interval for checking battery percentage
+
+## No backlight (#2502)
+- [x] LCD brightness
+- [ ] LCD timeout?
+
+## Peripherals
+- [x] Disable auto heart rate measurement in health app (#2502)
+- [x] Overwrite setGPSPower() function (#2502)
+- [x] Turn off already-running GPS / HRM
+
+## Features
+- [x] Wake on twist -> off (#2502)
+- [x] Emit `"drained"` event
+
+# Creator
+
+- [bobrippling](https://github.com/bobrippling/)
diff --git a/apps/drained/app-icon.js b/apps/drained/app-icon.js
new file mode 100644
index 000000000..36c3683a2
--- /dev/null
+++ b/apps/drained/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4AwqwAHF84HOF/6OQA5pe/F/4v2X1AvHL1crF9srwMrMwWJAAIvlFwIABAwQvCGEJXCFwYvBSQIvDGEAuHqySBF4gwfK4IuDF4IDClowjFwovEMMYuHF4gwhFw16q16BAoweFwwvJGAwueGAQJIGAgufABYvYFypfYFy3+F6wuXF6wuYF6ouZL9QuEX9IuFF64wQFwwvYGBwuHF7IwMFxAvaGBQuJF7YwIFxQvcGAwuLF7owEFxgveGAQuNF74wBB5wvfAB4v/FDgANM1YA/AH4A/AHI"))
diff --git a/apps/drained/app.js b/apps/drained/app.js
new file mode 100644
index 000000000..e27fcb1d1
--- /dev/null
+++ b/apps/drained/app.js
@@ -0,0 +1,116 @@
+var app = "drained";
+if (typeof drainedInterval !== "undefined")
+    drainedInterval = clearInterval(drainedInterval);
+Bangle.setLCDBrightness(0);
+var powerNoop = function () { return false; };
+var forceOff = function (name) {
+    var _a;
+    if ((_a = Bangle._PWR) === null || _a === void 0 ? void 0 : _a[name])
+        Bangle._PWR[name] = [];
+    Bangle["set".concat(name, "Power")](0, app);
+    Bangle["set".concat(name, "Power")] = powerNoop;
+};
+forceOff("GPS");
+forceOff("HRM");
+try {
+    NRF.disconnect();
+    NRF.sleep();
+}
+catch (e) {
+    console.log("couldn't disable ble: ".concat(e));
+}
+Bangle.removeAllListeners();
+clearWatch();
+Bangle.setOptions({
+    wakeOnFaceUp: 0,
+    wakeOnTouch: 0,
+    wakeOnTwist: 0,
+});
+var nextDraw;
+var draw = function () {
+    var x = g.getWidth() / 2;
+    var y = g.getHeight() / 2 - 48;
+    var date = new Date();
+    var timeStr = require("locale").time(date, 1);
+    var dateStr = require("locale").date(date, 0).toUpperCase() +
+        "\n" +
+        require("locale").dow(date, 0).toUpperCase();
+    var x2 = x + 6;
+    var y2 = y + 66;
+    g.reset()
+        .clearRect(Bangle.appRect)
+        .setFont("Vector", 55)
+        .setFontAlign(0, 0)
+        .drawString(timeStr, x, y)
+        .setFont("Vector", 24)
+        .drawString(dateStr, x2, y2)
+        .drawString("".concat(E.getBattery(), "%"), x2, y2 + 48);
+    if (nextDraw)
+        clearTimeout(nextDraw);
+    nextDraw = setTimeout(function () {
+        nextDraw = undefined;
+        draw();
+    }, 60000 - (date.getTime() % 60000));
+};
+var reload = function () {
+    Bangle.setUI({
+        mode: "custom",
+        remove: function () {
+            if (nextDraw)
+                clearTimeout(nextDraw);
+            nextDraw = undefined;
+        },
+        btn: function () {
+            E.showPrompt("Restore watch to full power?").then(function (v) {
+                if (v) {
+                    drainedRestore();
+                }
+                else {
+                    reload();
+                }
+            });
+        }
+    });
+    Bangle.CLOCK = 1;
+    g.clear();
+    draw();
+};
+reload();
+Bangle.emit("drained", E.getBattery());
+var _a = require("Storage").readJSON("".concat(app, ".setting.json"), true) || {}, _b = _a.keepStartup, keepStartup = _b === void 0 ? true : _b, _c = _a.restore, restore = _c === void 0 ? 20 : _c, _d = _a.exceptions, exceptions = _d === void 0 ? ["widdst.0"] : _d;
+function drainedRestore() {
+    if (!keepStartup) {
+        try {
+            eval(require('Storage').read('bootupdate.js'));
+        }
+        catch (e) {
+            console.log("error restoring bootupdate:" + e);
+        }
+    }
+    load();
+}
+var checkCharge = function () {
+    if (E.getBattery() < restore)
+        return;
+    drainedRestore();
+};
+if (Bangle.isCharging())
+    checkCharge();
+Bangle.on("charging", function (charging) {
+    if (charging)
+        checkCharge();
+});
+if (!keepStartup) {
+    var storage = require("Storage");
+    for (var _i = 0, exceptions_1 = exceptions; _i < exceptions_1.length; _i++) {
+        var boot = exceptions_1[_i];
+        try {
+            var js = storage.read("".concat(boot, ".boot.js"));
+            if (js)
+                eval(js);
+        }
+        catch (e) {
+            console.log("error loading boot exception \"".concat(boot, "\": ").concat(e));
+        }
+    }
+}
diff --git a/apps/drained/app.ts b/apps/drained/app.ts
new file mode 100644
index 000000000..f4d33bc44
--- /dev/null
+++ b/apps/drained/app.ts
@@ -0,0 +1,139 @@
+const app = "drained";
+
+// from boot.js
+declare var drainedInterval: IntervalId | undefined;
+if(typeof drainedInterval !== "undefined")
+  drainedInterval = clearInterval(drainedInterval) as undefined;
+
+// backlight
+Bangle.setLCDBrightness(0);
+
+// peripherals
+const powerNoop = () => false;
+
+const forceOff = (name: "GPS" | "HRM" | "Compass" /*| "Barom"*/) => {
+  if ((Bangle as any)._PWR?.[name])
+    (Bangle as any)._PWR[name] = [];
+
+  // if(name === "Barom"){ setBarometerPower(...) }
+  //                               ^^^^
+  Bangle[`set${name}Power`](0, app);
+  Bangle[`set${name}Power`] = powerNoop;
+};
+forceOff("GPS");
+forceOff("HRM");
+try{
+  NRF.disconnect();
+  NRF.sleep();
+}catch(e){
+  console.log(`couldn't disable ble: ${e}`);
+}
+
+// events
+Bangle.removeAllListeners();
+clearWatch();
+
+// UI
+Bangle.setOptions({
+  wakeOnFaceUp: 0,
+  wakeOnTouch: 0,
+  wakeOnTwist: 0,
+});
+
+// clock
+let nextDraw: TimeoutId | undefined;
+const draw = () => {
+  const x = g.getWidth() / 2;
+  const y = g.getHeight() / 2 - 48;
+
+  const date = new Date();
+
+  const timeStr = require("locale").time(date, 1);
+  const dateStr = require("locale").date(date, 0).toUpperCase() +
+    "\n" +
+    require("locale").dow(date, 0).toUpperCase();
+  const x2 = x + 6;
+  const y2 = y + 66;
+
+  g.reset()
+    .clearRect(Bangle.appRect)
+    .setFont("Vector", 55)
+    .setFontAlign(0, 0)
+    .drawString(timeStr, x, y)
+    .setFont("Vector", 24)
+    .drawString(dateStr, x2, y2)
+    .drawString(`${E.getBattery()}%`, x2, y2 + 48);
+
+  if(nextDraw) clearTimeout(nextDraw);
+  nextDraw = setTimeout(() => {
+    nextDraw = undefined;
+    draw();
+  }, 60000 - (date.getTime() % 60000));
+};
+
+const reload = () => {
+  Bangle.setUI({
+    mode: "custom",
+    remove: () => {
+      if (nextDraw) clearTimeout(nextDraw);
+      nextDraw = undefined;
+    },
+    btn: () => {
+      E.showPrompt("Restore watch to full power?").then(v => {
+        if(v){
+          drainedRestore();
+        }else{
+          reload();
+        }
+      })
+    }
+  });
+  Bangle.CLOCK=1;
+
+  g.clear();
+  draw();
+};
+reload();
+
+// permit other apps to put themselves into low-power mode
+Bangle.emit("drained", E.getBattery());
+
+// restore normal boot on charge
+const { keepStartup = true, restore = 20, exceptions = ["widdst.0"] }: DrainedSettings
+  = require("Storage").readJSON(`${app}.setting.json`, true) || {};
+
+// re-enable normal boot code when we're above a threshold:
+function drainedRestore() { // "public", to allow users to call
+  if(!keepStartup){
+    try{
+      eval(require('Storage').read('bootupdate.js'));
+    }catch(e){
+      console.log("error restoring bootupdate:" + e);
+    }
+  }
+  load(); // necessary after updating boot.0
+}
+
+const checkCharge = () => {
+  if(E.getBattery() < restore) return;
+  drainedRestore();
+};
+
+if (Bangle.isCharging())
+  checkCharge();
+
+Bangle.on("charging", charging => {
+  if(charging) checkCharge();
+});
+
+if(!keepStartup){
+  const storage = require("Storage");
+  for(const boot of exceptions){
+    try{
+      const js = storage.read(`${boot}.boot.js`);
+      if(js) eval(js);
+    }catch(e){
+      console.log(`error loading boot exception "${boot}": ${e}`);
+    }
+  }
+}
diff --git a/apps/drained/boot.js b/apps/drained/boot.js
new file mode 100644
index 000000000..48c1572bd
--- /dev/null
+++ b/apps/drained/boot.js
@@ -0,0 +1,13 @@
+(function () {
+    var _a = require("Storage").readJSON("drained.setting.json", true) || {}, _b = _a.battery, threshold = _b === void 0 ? 5 : _b, _c = _a.interval, interval = _c === void 0 ? 10 : _c, _d = _a.keepStartup, keepStartup = _d === void 0 ? true : _d;
+    drainedInterval = setInterval(function () {
+        if (Bangle.isCharging())
+            return;
+        if (E.getBattery() > threshold)
+            return;
+        var app = "drained.app.js";
+        if (!keepStartup)
+            require("Storage").write(".boot0", "if(typeof __FILE__ === \"undefined\" || __FILE__ !== \"".concat(app, "\") setTimeout(load, 100, \"").concat(app, "\");"));
+        load(app);
+    }, interval * 60 * 1000);
+})();
diff --git a/apps/drained/boot.ts b/apps/drained/boot.ts
new file mode 100644
index 000000000..1fcb0591b
--- /dev/null
+++ b/apps/drained/boot.ts
@@ -0,0 +1,21 @@
+(() => {
+const { battery: threshold = 5, interval = 10, keepStartup = true }: DrainedSettings
+  = require("Storage").readJSON(`drained.setting.json`, true) || {};
+
+drainedInterval = setInterval(() => {
+  if(Bangle.isCharging())
+    return;
+  if(E.getBattery() > threshold)
+    return;
+
+  const app = "drained.app.js";
+
+  if(!keepStartup)
+    require("Storage").write(
+      ".boot0",
+      `if(typeof __FILE__ === "undefined" || __FILE__ !== "${app}") setTimeout(load, 100, "${app}");`
+    );
+
+  load(app);
+}, interval * 60 * 1000);
+})()
diff --git a/apps/drained/icon.png b/apps/drained/icon.png
new file mode 100644
index 000000000..33311cf2c
Binary files /dev/null and b/apps/drained/icon.png differ
diff --git a/apps/drained/metadata.json b/apps/drained/metadata.json
new file mode 100644
index 000000000..6dfdac78d
--- /dev/null
+++ b/apps/drained/metadata.json
@@ -0,0 +1,21 @@
+{
+  "id": "drained",
+  "name": "Drained",
+  "version": "0.03",
+  "description": "Switches to displaying a simple clock when the battery percentage is low, and disables some peripherals",
+  "readme": "README.md",
+  "icon": "icon.png",
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"drained.boot.js","url":"boot.js"},
+    {"name":"drained.app.js","url":"app.js"},
+    {"name":"drained.settings.js","url":"settings.js"},
+    {"name":"drained.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"drained.setting.json"}
+  ]
+}
diff --git a/apps/drained/settings.js b/apps/drained/settings.js
new file mode 100644
index 000000000..ce72f215f
--- /dev/null
+++ b/apps/drained/settings.js
@@ -0,0 +1,90 @@
+(function (back) {
+    var _a, _b, _c, _d, _e;
+    var SETTINGS_FILE = "drained.setting.json";
+    var storage = require("Storage");
+    var settings = storage.readJSON(SETTINGS_FILE, true) || {};
+    (_a = settings.battery) !== null && _a !== void 0 ? _a : (settings.battery = 5);
+    (_b = settings.restore) !== null && _b !== void 0 ? _b : (settings.restore = 20);
+    (_c = settings.interval) !== null && _c !== void 0 ? _c : (settings.interval = 10);
+    (_d = settings.keepStartup) !== null && _d !== void 0 ? _d : (settings.keepStartup = true);
+    (_e = settings.exceptions) !== null && _e !== void 0 ? _e : (settings.exceptions = ["widdst.0"]);
+    var save = function () {
+        storage.writeJSON(SETTINGS_FILE, settings);
+    };
+    var menu = {
+        "": { "title": "Drained" },
+        "< Back": back,
+        "Trigger at batt%": {
+            value: settings.battery,
+            min: 0,
+            max: 95,
+            step: 5,
+            format: function (v) { return "".concat(v, "%"); },
+            onchange: function (v) {
+                settings.battery = v;
+                save();
+            },
+        },
+        "Poll interval": {
+            value: settings.interval,
+            min: 1,
+            max: 60 * 2,
+            step: 5,
+            format: function (v) { return "".concat(v, " mins"); },
+            onchange: function (v) {
+                settings.interval = v;
+                save();
+            },
+        },
+        "Restore watch at %": {
+            value: settings.restore,
+            min: 0,
+            max: 95,
+            step: 5,
+            format: function (v) { return "".concat(v, "%"); },
+            onchange: function (v) {
+                settings.restore = v;
+                save();
+            },
+        },
+        "Keep startup code": {
+            value: settings.keepStartup,
+            onchange: function (b) {
+                settings.keepStartup = b;
+                save();
+                updateAndRedraw();
+            },
+        },
+    };
+    var updateAndRedraw = function () {
+        setTimeout(function () { E.showMenu(menu); }, 10);
+        if (settings.keepStartup) {
+            delete menu["Startup exceptions"];
+            return;
+        }
+        menu["Startup exceptions"] = function () { return E.showMenu(bootExceptions); };
+        var bootExceptions = {
+            "": { "title": "Startup exceptions" },
+            "< Back": function () { return E.showMenu(menu); },
+        };
+        storage.list(/\.boot\.js/)
+            .map(function (name) { return name.replace(".boot.js", ""); })
+            .forEach(function (name) {
+            bootExceptions[name] = {
+                value: settings.exceptions.indexOf(name) >= 0,
+                onchange: function (b) {
+                    if (b) {
+                        settings.exceptions.push(name);
+                    }
+                    else {
+                        var i = settings.exceptions.indexOf(name);
+                        if (i >= 0)
+                            settings.exceptions.splice(i, 1);
+                    }
+                    save();
+                },
+            };
+        });
+    };
+    updateAndRedraw();
+});
diff --git a/apps/drained/settings.ts b/apps/drained/settings.ts
new file mode 100644
index 000000000..f972f51a7
--- /dev/null
+++ b/apps/drained/settings.ts
@@ -0,0 +1,104 @@
+type DrainedSettings = {
+  battery?: number,
+  restore?: number,
+  interval?: number,
+  keepStartup?: ShortBoolean,
+  exceptions?: string[],
+};
+
+(back => {
+  const SETTINGS_FILE = "drained.setting.json";
+
+  const storage = require("Storage")
+  const settings: DrainedSettings = storage.readJSON(SETTINGS_FILE, true) || {};
+  settings.battery ??= 5;
+  settings.restore ??= 20;
+  settings.interval ??= 10;
+  settings.keepStartup ??= true;
+  settings.exceptions ??= ["widdst.0"]; // daylight savings
+
+  const save = () => {
+    storage.writeJSON(SETTINGS_FILE, settings)
+  };
+
+  const menu: Menu = {
+    "": { "title": "Drained" },
+    "< Back": back,
+    "Trigger at batt%": {
+      value: settings.battery,
+      min: 0,
+      max: 95,
+      step: 5,
+      format: (v: number) => `${v}%`,
+      onchange: (v: number) => {
+        settings.battery = v;
+        save();
+      },
+    },
+    "Poll interval": {
+      value: settings.interval,
+      min: 1,
+      max: 60 * 2,
+      step: 5,
+      format: (v: number) => `${v} mins`,
+      onchange: (v: number) => {
+        settings.interval = v;
+        save();
+      },
+    },
+    "Restore watch at %": {
+      value: settings.restore,
+      min: 0,
+      max: 95,
+      step: 5,
+      format: (v: number) => `${v}%`,
+      onchange: (v: number) => {
+        settings.restore = v;
+        save();
+      },
+    },
+    "Keep startup code": {
+      value: settings.keepStartup as boolean,
+      onchange: (b: boolean) => {
+        settings.keepStartup = b;
+        save();
+        updateAndRedraw();
+      },
+    },
+  };
+
+  const updateAndRedraw = () => {
+    // will change the menu, queue redraw:
+    setTimeout(() => { E.showMenu(menu) }, 10);
+
+    if (settings.keepStartup) {
+      delete menu["Startup exceptions"];
+      return;
+    }
+    menu["Startup exceptions"] = () => E.showMenu(bootExceptions);
+
+    const bootExceptions: Menu = {
+      "": { "title" : "Startup exceptions" },
+      "< Back": () => E.showMenu(menu),
+    };
+
+    storage.list(/\.boot\.js/)
+      .map(name => name.replace(".boot.js", ""))
+      .forEach((name: string) => {
+        bootExceptions[name] = {
+          value: settings.exceptions!.indexOf(name) >= 0,
+          onchange: (b: boolean) => {
+            if (b) {
+              settings.exceptions!.push(name);
+            } else {
+              const i = settings.exceptions!.indexOf(name);
+              if (i >= 0) settings.exceptions!.splice(i, 1);
+            }
+            save();
+          },
+        };
+      });
+  };
+
+  updateAndRedraw();
+}) satisfies SettingsFunc
diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog
index e0bd76eb0..6c096f45b 100644
--- a/apps/dtlaunch/ChangeLog
+++ b/apps/dtlaunch/ChangeLog
@@ -27,4 +27,5 @@ widgets would still be loaded when they weren't supposed to.
 immediately follows the correct theme.
 0.22: Bangle 2: Change to not automatically marking the first app on a page
 when moving pages. Add caching for faster startups.
-
+0.23: Bangle 1: Fix issue with missing icons, added touch screen interactions
+0.24: Add buzz-on-interaction setting
diff --git a/apps/dtlaunch/README.md b/apps/dtlaunch/README.md
index 1835bc842..ff562d9db 100644
--- a/apps/dtlaunch/README.md
+++ b/apps/dtlaunch/README.md
@@ -6,6 +6,10 @@ Bangle 1:
 
 In the picture above, the Settings app is selected.
 
+
+![](sshot_e1.png)
+
+
 Bangle 2:
 
 ![shot1](https://user-images.githubusercontent.com/89286474/146471756-ec6d16de-6916-4fde-b991-ba88c2c8fa1a.png)
@@ -25,6 +29,12 @@ Bangle 2:
 
 **Swipe Right** - move to previous page of app icons
 
+**Touch Left(1) area** -  "Back" to Clock
+
+**Touch Right(2) area** - move forward through app icons
+
+**Touch Middle(1+2) area** - run the selected app
+
 ## Controls- Bangle 2
 
 **Touch** - icon to select, second touch launches app
diff --git a/apps/dtlaunch/app-b1.js b/apps/dtlaunch/app-b1.js
index ed9cc778e..c7e78d671 100644
--- a/apps/dtlaunch/app-b1.js
+++ b/apps/dtlaunch/app-b1.js
@@ -13,13 +13,13 @@ function wdog(handle,timeout){
  wdog.timeout = timeout;
  }
  if(wdog.timer){
-   clearTimeout(wdog.timer)
+   clearTimeout(wdog.timer);
  }
- wdog.timer = setTimeout(wdog.handle,wdog.timeout)
+ wdog.timer = setTimeout(wdog.handle,wdog.timeout);
 }
 
 // reset after two minutes of inactivity
-wdog(load,120000)
+wdog(load,120000);
 
 var s = require("Storage");
 var apps = s.list(/\.info$/).map(app=>{
@@ -49,7 +49,13 @@ function draw_icon(p,n,selected) {
     var y = n>2?130:40;
     (selected?g.setColor(0.3,0.3,0.3):g.setColor(0,0,0)).fillRect(x,y,x+79,y+89);
     g.setColor(g.theme.fg);
-    g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25});
+    //bad g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25});
+    if  ((apps[p*6+n].icon)){
+      if (s.read(apps[p*6+n].icon))  //ensure that graph exist    
+       g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25});    
+      else console.log("icon file NOT exist :"+apps[p*6+n].icon);   
+     } 
+     else console.log("icon property NOT exist");    
     g.setColor(-1).setFontAlign(0,-1,0).setFont("6x8",1);
     var txt =  apps[p*6+n].name.split(" ");
     for (var i = 0; i < txt.length; i++) {
@@ -65,10 +71,31 @@ function drawPage(p){
         if (!apps[p*6+i]) return i;
         draw_icon(p,i,selected==i);
     }
-}
+  }
+
+    // case was not working 
+Bangle.on("touch", function(tzone){
+  //(tzone)=>{
+    //console.log("tzone"+tzone);
+    switch(tzone){  
+    case 1: //left managed by
+        console.log("1, left or back to clock?");		  
+        load();//clock
+        //nextapp(-1);             
+        break;	
+      case 2: // right                 
+        nextapp(1);
+        break;
+      case 3: //center 1+2 no for emul
+         doselect();
+        break;
+      default:
+         console.log("no match");		 
+    }
+  });
 
 Bangle.on("swipe",(dir)=>{
-    wdog()
+    wdog();
     selected = 0;
     oldselected=-1;
     if (dir<0){
diff --git a/apps/dtlaunch/app-b2.js b/apps/dtlaunch/app-b2.js
index 2070f1147..a3ddd2538 100644
--- a/apps/dtlaunch/app-b2.js
+++ b/apps/dtlaunch/app-b2.js
@@ -9,7 +9,8 @@
     showLaunchers: true,
     direct: false,
     swipeExit: false,
-    timeOut: "Off"
+    timeOut: "Off",
+    interactionBuzz: false,
   }, require('Storage').readJSON("dtlaunch.json", true) || {});
 
   let s = require("Storage");
@@ -89,6 +90,13 @@
     g.flip();
   };
 
+  let buzzShort = function() {
+    if (settings.interactionBuzz) Bangle.buzz(20);
+  };
+  let buzzLong = function() {
+    if (settings.interactionBuzz) Bangle.buzz(100);
+  };
+
   Bangle.drawWidgets(); // To immediately update widget field to follow current theme - remove leftovers if previous app set custom theme.
   Bangle.loadWidgets();
   drawPage(0);
@@ -100,9 +108,11 @@
     if(settings.swipeExit && dirLeftRight==1) Bangle.showClock();
     if (dirUpDown==-1||dirLeftRight==-1){
       ++page; if (page>maxPage) page=0;
+      buzzShort();
       drawPage(page);
     } else if (dirUpDown==1||(dirLeftRight==1 && !settings.swipeExit)){
       --page; if (page<0) page=maxPage;
+      buzzShort();
       drawPage(page);
     }
   };
@@ -123,8 +133,10 @@
           drawIcon(page,i,true && !settings.direct);
           if (selected>=0 || settings.direct) {
             if (selected!=i && !settings.direct){
+              buzzShort();
               drawIcon(page,selected,false);
             } else {
+              buzzLong();
               load(apps[page*4+i].src);
             }
           }
@@ -134,6 +146,7 @@
       }
     }
     if ((i==4 || (page*4+i)>Napps) && selected>=0) {
+      buzzShort();
       drawIcon(page,selected,false);
       selected=-1;
     }
diff --git a/apps/dtlaunch/metadata.json b/apps/dtlaunch/metadata.json
index b19d59e49..5e25b61fb 100644
--- a/apps/dtlaunch/metadata.json
+++ b/apps/dtlaunch/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "dtlaunch",
   "name": "Desktop Launcher",
-  "version": "0.22",
+  "version": "0.24",
   "description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.",
   "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}],
   "icon": "icon.png",
diff --git a/apps/dtlaunch/settings-b2.js b/apps/dtlaunch/settings-b2.js
index 24959df8c..6a50f90d4 100644
--- a/apps/dtlaunch/settings-b2.js
+++ b/apps/dtlaunch/settings-b2.js
@@ -6,7 +6,8 @@
     showLaunchers: true,
     direct: false,
     swipeExit: false,
-    timeOut: "Off"
+    timeOut: "Off",
+    interactionBuzz: false,
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {
@@ -55,6 +56,13 @@
         settings.timeOut = timeOutChoices[v];
         writeSettings();
       }
-    }
+    },
+    /*LANG*/'Interaction buzz': {
+      value: settings.interactionBuzz,
+      onchange: v => {
+        settings.interactionBuzz = v;
+        writeSettings();
+      }
+    },
   });
 });
diff --git a/apps/dtlaunch/sshot_e1.png b/apps/dtlaunch/sshot_e1.png
new file mode 100644
index 000000000..69f708c33
Binary files /dev/null and b/apps/dtlaunch/sshot_e1.png differ
diff --git a/apps/encourageclk/ChangeLog b/apps/encourageclk/ChangeLog
new file mode 100644
index 000000000..83c07f784
--- /dev/null
+++ b/apps/encourageclk/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New face :)
+0.02: code improvements
+0.03: code improvments to queuedraw and draw
diff --git a/apps/encourageclk/README.md b/apps/encourageclk/README.md
new file mode 100644
index 000000000..420eddbcc
--- /dev/null
+++ b/apps/encourageclk/README.md
@@ -0,0 +1,18 @@
+# Encouragement & Positivity Clock
+
+Tap on the watch for a note of encouragement
+
+## Features
+
+Pretty backgrounds
+
+<img width="181" alt="Screenshot 2023-03-28-2" src="https://user-images.githubusercontent.com/44651387/228306964-be0b1d46-aee7-4562-9953-4e461954d41b.png">
+<img width="181" alt="Screenshot 2023-03-28-1" src="https://user-images.githubusercontent.com/44651387/228306967-768e0315-8652-4043-9c98-ebf0c72fd2a4.png">
+
+## Requests
+
+If you have any issues or would like to suggest an encouraging note, please tweet me!
+
+## Creator
+
+[Eleanor Tayam](http://twitter.com/elykittytee)
diff --git a/apps/encourageclk/app-icon.js b/apps/encourageclk/app-icon.js
new file mode 100644
index 000000000..56a3c6b6f
--- /dev/null
+++ b/apps/encourageclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwMB/4AFgYCB4H//kAAoMAn/w+IFBx8P8fjAoPH4/n4/gg/j8/Px4rB+Pz58ch/wnHzz0wv/+hl5zlhDoOGnOY44FB8cZyOP/1/+OJwcfAoP44OGn4FB/lh5giBAIMz7n/AoP/nf4Aocf/IFDz5YBAoWP+YFD54FFMgIFD84FD84FM/0AApKfDApiaCAAJBCApKyCWgRlBAAWfOIIACj/8Aoc//g/BJ4KTBn4FBBIUfAoIbCx4CBFoUHAQPgDIMhAoOEV4NwVgMOn/4/jdBn8fDILpBUIfwh5TBIAYABA="))
diff --git a/apps/encourageclk/app.js b/apps/encourageclk/app.js
new file mode 100644
index 000000000..a78a788ba
--- /dev/null
+++ b/apps/encourageclk/app.js
@@ -0,0 +1,73 @@
+//230404
+
+require("FontHaxorNarrow7x17").add(Graphics);
+require("FontDylex7x13").add(Graphics);
+
+const storage = require('Storage');
+const locale = require("locale");
+const dateutil = require("date_utils");
+const currentFont=g.getFont();
+
+const width = 175; 
+const height = 175;
+const offset = 25;
+
+var d = new Date();
+var nowDate = d.getDate(); //today's date
+var drawTimeout;
+var encourage = ["you\'re doing\ngreat!","pas de deux it!","you\'re amazing~","you got dis","keep going","you\'re one\nin a melon!","we\'re rooting\nfor you!","believe in\nyourself","dance like\nno one\'s\nwatching"];
+
+var bgimg = {
+  width : 175, height : 175, bpp : 4,
+  transparent : -1,
+  palette : new Uint16Array([46452,38393,32024,42585,52984,46739,59130,21489,46543,21493,25358,52696,48564,61210,29944,46322]),
+  buffer : require("heatshrink").decompress(atob("1UiAAUZ1QGEAAUhzWvBI0izIAY7tm7vWswAGtvTCo+Q7e23e263dDgNtDgVq0RCD9Wq1xMGl2qCAgJDKzGbHAI/BKw9mlIWHle7AAIXDAQJ1CU42quKvH1UhK8GS7u3lqXCWYnWDBcG3e9te77vb3oZBVwoABy6lIvRhHl3uABXpHpXiSgOy83bTYRaC6YYB2ZqEpe7A4OQKgIAE6Wd7quGkN68RNGiWqiQJGABceKxXhtZQBi9NHwVtK4QOBzvZCgc9BQIHBVwIAE216tvaUw/q17+HvXhK6UiVAspAYSABjbmBo3d3dm3tpBoPp9s5Ngud63Ws1iAwO2swAB7d3AAKuGJoWqySZG04IGABkuz3u93pKIPp9IcC8Wz2dtIoOxkWyJ4dCAQMhA4crXYXpzOSgMRiMQk5WBvSuHkPq1SvGkOqiSvTMZfuyZECUwoACyz/BAAXtCIPSCA3n06uJl2a1VxBI16yJXeEQMTiMTjy/BAAniYoJJBylEzIWCNJGXVxClBl+qcoIAEiRrIWDQABBZBHCz3d7xODzwWC9JXEIRUhMYL/FMAJXgABChIAAndAAPWBAmaVxB3C1WnWAsq1xWol2eKpWe3pXCtORiMSkPpTJchK4KvEW4OnV9MeK5VtswAB62RLYXbzWulyiFPYni1UhBAnq0JXpl3uAAUuVonW6xWBttr3e72xYBJAwAGjOpMguqyRXpAAkpKwc9KwSuBK4dm7Whmcx9weJkOq+USAwfq8JWt9xXD7pVCV4XdK4IAB1UTiIABaZV604HEzWiKtnjom72OR2ytDAAPdWAdq0MxiMzmQhJj2q1y2F8SusUYPdt1tKwoAB6yuHmIhK9WqiQGEuMuXoZdk91tJQIBEAApjBlOZzSuCiMTJIhXHu5LEu9yCgcRK0fhnr5BfofdKIQJCAwPR9OZVyEijOpKAUukd6iZeBl0TmKvil1NVAtt6xWCK4Nt7e7syuFiTxEA4JDB9xkCiOquITCmMq0YLDiIaDAAhgEAgZpQ9ZWEKIO27tr3e7AgmwgCuEDokhmamCAgIABm+qAoUxmeqiIFBiMTmSuhkW9KwZbBte2sxRB3a0BAgVmtSuDAB0x1WjCgUTlUjBgnuAAPiL4IICUwMu8QsDmSvO8KhBfYICBUoQAD7q3CAASuEABsTj2q1xICmN3uZdDCxEuf4INEAYJWNl0bUwO2VgRUDWoKtBtpWD7SuSV4YFCmZyFmYACKwsuiYIEicyVxxPDVYu9KAJZBAAiuSdIeq+ZuClSvDACMzKxoAB2xUFKoJTGAAVqVyY5BjWqkIXBV4IECCZK1FAAUSKxyvDAAe27vWK5CuVic61V2KQMT9UjDacukXiAQIAL9xYE7pVKVyw7C1QYCmMq0YdSmXukKxM9xlBjarCtpXBJ4QEBLoIDDVypXBmGqVQUz1QaTiUhmczjyvMVwdtKYICCAAa1D7SuVAAU60czIQMquwcVmPiVpNN6avB2xYCWIKvB7pgDAYauWVQWayQ9BmOn8J2UiauJ8M27s+AgJXFtvWtYGCAYdqVzCqB16vBi16OyquJl297quBkXi6yvFKQYAEVzA6BjWq8avBlWjO6auKkQNBAgUhiQDBjZXBKxG6VzERmfq1RbBmYDCOaZWJ9wABAovuKY6udSYM/1UjAgMqAYIdViT8BkUuKgoGCBgvhte2j3u9a0BtfqVzKTCu9zmcxAYIhWK4XincznceVYUbmexLAZZBkIVBBAIbCjyuaSIMzDoQDDDqpQBl0t7vd7ZPC8YGB3xVCWIjDFlWjVzI6ClRUClSvXDwMu7u73vWiUj61tswCBpxRCAAXr3a/CAAOqc4IpLmczHBkx1WpWYUhK6I1DFYUWte7s3Umdt7tmsy2BkMSWAk72K/CkSuBK5gqBK5qvCCIPqkZWQinTAYXdsVN3YAC7pVBAQJWBBAKvEly1FGwREJKoS9NV4MivVymJ7BV6CuFGARNBVgPd6xeDAAL/EAAquJEYJWEAoJjMAQOq0UT1UhK6AjFAQRWBswABtZWE2b/DAAyuJKggADKxKUE1WqscauxWUE4ipFAAViz3uVxhQJLBJVFMQky093kWn8J8HACEbKguzXQIiBiSvJVwJWRUgJWHfoczsWq+2qkavYAA0u93k7e2jyuLADYyEiGq3+v/5pBMYYAYmPujtr3cykZYBl0hBwceVwJWgie61cK1WiVrsTiXh7e7mMiAIIABdQcxVzo0GmfP1QAC0IOHLCoNNVzFGsgLJnn6kUhid6uVxNJIAfjSuXmndsYMJ5+joczpywBgbfCK8yuWinWtvW6cTmMTVw4ECmMzmWq16wnVy00tvds3dskzoilBVwwGEj8H0UQgCu7mhVBAANt6M96yuKAAU2lWq1WhV8kaEwMzs1jKx8xKAJXC61GLoKvFVwwXBkIxBkUhBARNWiYlEVwk0maUHVx9m7vWtvUFIiuHC4ICBn+q+cxH4RNQCgIDBKwoGCVwOm7sxToXdH4oAHVogADttBGAVNmKuHAAdC1QAB19DIoKkPIwLuKVwNt6zpBdwPdslEChFEo0ztpWGswcCBwPWpiuHAAcXkH/vWqkY/HdKAAFnWm63WTodt7tjCQ9NXYM2Vw9m7szm3dEIMPVxUzoc82mq05uBAAiqGACKuBTQQDBV4JJBsJeBEoa/BCIPdKQYUBBIIICAQNtsH6igGBJIwADhWjlWvJ6wAFifa1fdHwaYD7s07tkRYKtBXYQQEAYRSCN4SuC0NNs3UGpMw/9Bv8hiJXbpuq2zxCtvb3e7KwIAC6kd6JTCA4INBK4QUB3vW3YNBDISuCBgI1Kh9zmcx1WjKzXdtWrIoXdtZWBBwk0AQMbB4INCKAIWCtZyB3YGBOQSuB1YEB3e2ZQKuH+4DBmMR/WhCBAAOHwSuEHwKMJ3amCAANmV4SuCJYKuCAgKuBCQRdBVxYABn+qkcTKys7RoPa0lkogALtpUDAAVtNQQAJ37yNVwZYEuywOmKaGHwOqoxWMo1mpe72lEAYKvBKxe7/Q+NVwgABiWii8jA4c0HASmEnZmDnezGAVqVxwAFK4QAE2ZHG56uUmc2hWqKwhCCskTUwe9oJWCHIiuOABjjFRIU8/Q1DVxqjDom61VNFY1mohOE2iRG3SuUAAxDEmhdCVyaPDs36/gqGo3UKApdFVzpdIVwNGoawDUQjyCg/0Rg1K/v6U4IATpSubABG/EptAv4JH1/a1YxVV0TiBpiuBCBiuBSo/91ULS6iul56uYsnK/qu4oiuZ+3U1/UV2PWswACtohBVwPdVy1NpUGVytNHQYABBIIGEMgYEDoxQEm8iAAdw7quBkV0SoYqFs3Ug/9RgtGtX9/WgVyQiBtWkVrVgu4ADvV0VwOnu8EC5Wwu6uI7Wqho3RozmB1Q6EAAMN6gGEund7vTu99AgPSCwwAFvf6AYN2CgPQBw1+3+nhvdo3dWQPQvX91SuGBwIFD3YAGte6RAIAFgEnAwkggAICAYMAKxl3I4IgCChJmCgUGmUjs1Au+vm6uHqEWAgVLKou02UGVw4AcVwZmO0/e1Ut6env4IBVwlmo1Y062FAAlku/a0FVAENQ34lNgH3AYNUqsFC4NV19VhWq4B2Bg93xGI+4RBABWqBpgAWrf6EpsHutFA4lFrX1qv60H61X/u94K4N3EJda0pWiqu/EptQIQ1UxWnw93VIOq1WshnQ1AJBVxhWjVwIPNg5mHK4KmBx96v+q4HEh9F+91V36uHAAN6fwdw5WsgHw5vYVxtUZ4iusrkPfQJOCAgYFBvWmt/MVwMAgG8Bod1oodBAQSuC1FYB4eIV1nAKg+Ix/3VgNG5///hWBh/4x4TBw+FJQ+qBgIACvV1V1kcxGHKogGBHQOr7cL1W7KwMA1QLCvADCu+oV4da04cBvCrdVwgrDbAN3cwVFxGFwCmBvWqTIWHv8P1Wq1+q/WqVwMLt64BK4RKDqiuEvAdBwpWfVwMFAwadCA4RFBU4X3J4IEBLgOvBgIAD1/Ah9N572DJRCuDXYYAERgQAOqgbFn+nAYL1Dv6xBWQOq06UBVwWq5nLKgWm7nMoGv3nAgH07AeCw6jBJQ57Dw4yDAAV3bIQAOrF4LAIFBxn3TYX/xH/+5NB14DCu/61HyBAJUBAIPw/W2hnP+/8gAAB4gsCx5PCLA2KVwQAIW5AAJQAJ0DQ4QvBMISkCXAL3D//85nPAwW97vA+HA1W8KwUIKw4AGPYI7DACwaBJQIcCxRMDAQJVDAAWs5gABf4QAB/vdhgKC3+g4BVBhkK/AvFfQ2PvQuCTphZPv57DPgICCAAJWEVQIACA4ev7fPBIXw1XwVoS7BdwoDBIIuHFwYAKCgpfGPQoABUwoAE/gKJABGsVwX604mBwrEBRxGKVyQEDZ4QNBVQf3f4JWD14DDTgL+D1+wgH3WQYAF/QVB4BXBs3//AqBDgOoKw6uNYQzQFB4uHKgL9D17nBAAPMAAKeD3vd6nL3e73nL5m7CAWw1+8KwUG7//JYauIx96VwZOFNRAEDVQZpDdZH7IQKrD03W6nwBIJIBAA8LhWsAoUM1XP1CJBKoP3JJCuMAApvEK4iqBAIIADdIIFDKwP3+H/s1m3hUJKAX/v6tCgHP1n6/4tB/GIvGPAYIAE/SuDABpyFAwZUB06rF5nLVQb/Dh//+BWLgHK1hWDK4PPFQN3rA2DKwv3VyBvGagKtDVAPKVYRTC19r3e7h7/CIgiuL1UMAwZtBVoLfCAA2HKgN6Vx4dHVwP3u6hC14BB5//A4UN7vd7cMh5UOVwegNIfLK4ItBSAwACKgSuMUwhZCEYN4xRyCfIev5jgBKoXWfhquO/fbVwPP094RYLlDxGFHYN/xSuK/5wDKQJWC1WnOQIDBKweqKof7he72BWVVw291X//n6JgP3AIOq1GPu/3VwN4VxRuBAAYbBOYJJBvADCAAfM5gEC03d36tWVw0L7WvVwKHBIYSNBWYIABVxisDAAJtBA4NaKYoAB//LKomwSQauah6uB5n//4pB095AYRWDUIKuJVoptCx/4Kw+s/TbB0H/s1sVi6uHhlg/RWBV4JTBVoJPDAYOIVyAJDKo385nKAgOv7vQKrKuGV4PW1W/LAivBy4+DVwb5DVgZWEBQSrH1/8Kodr3e7KrSuGgENtSEB//8bYKwCIASqCvWnJwWHA4N/VYitDZIRWF5//AgP65vW/5WbVw0As3616uBF4SlBAIQCBAARPGAAeHxBTHKoXM34FC3vb+BVcVw8A5sK1W8Q4YAEVwV3fggAF+93+5WJ54ECgELs3PKzquH/nbFwX856zBLA6tLMgKuD1/aVogEC1vd56teVxNs/SKC/nMAoIAEu9/VpZYCCQOsDQR2BKwWmsnMRQiujgEE6CME/4ADLAf4VpV4V4hxD5nPAYOg7vQVj6uJh+9oGvRwf854CB5RAC1BPBx93KQSuEKoYADOIP7VoXfKkCuKgEN77hC1WrSAI8BLYIIBv6kBx5SBJ4IDBUwZWHDAX73ZWjVwPMBI27tj/F/hXCAoOnUYKpCw4IBrADCAAwZBDAWg7nwV0oIGh/N2HM349DV4ShCKwN4KwOP1Wo+93WQKtIaAWtsBVjAAPP1/ABI0E7tP//HH4ev5nM/5OBu/4//4xWqx4HBVpLOC/9rVskAhkK/ivH21r3e8/SpCK4I9B5n4KAKnBWAOIVwl5zRWE/YEB03QK0quKLAO963w5hXDIYXIKIIFB1AEBVoJWC1WnAYSsB54EB0m8KsquB/SuHBYW821m7brDAARRBxQEDw5WE1QECVoP/OQOv7itmVxavB/nd7ts3dPJAapCxF/KoRWD36uBAoPP//LBIOt6BVmVwX0B5n7LIO/+HKegSqC/GIKwgAE1//54EBuFLK08A4H/+CvJAAXE3YAB236//3vCuFKw5XB5gDB1nQ+BXogn6/gPM///3vd7fM5aoBAAWqKxAVBKwWm3gjG5gAi3+g3nMLBkMCYNNs3XKwd605ZBAAv8//PWIXbVoziBAEPwRQTcP/fWsytE1WnVw3M//7AgOt7iJG5f6NowAfhhXOAAI5CVoIbEWQpJJKc45CVx4ACJ45eIAGX7KyMHJgpTBLo4ALFyIATEyhWFKg76D/4JE1//AAP85gAj5Ws4BWRhREE1KuBAoXL5nNAoWt7m7AAYxDVsnA1W8YaauFKwd3u/PAoX2EqYAbh/6/iuXK4JWEv/6AoOr6HwK92/1/AVy4ADKwN3AoX9p5VugEMVzRVCK40APaQAd56ubKYRXFPaSu01hWGK4d6BIWsV+HK0AyR1Wv/RWD05TCAYJWD1XwK9/M1UMVyOsKwOaVwZSCKwqvBV36uEKwN5JogAH+H/V18M1XMVyKlIAAZjB1Wv3hWvgHP14TRu+q05WC1/M+4IBAAO9KN4AF4GqRSEHKgJQC1//04FC08LpkM5iswAAMMhWsVyWXVwXM/WnVoUN56u/VxN3Von/KoWq/fb+BW0VwOrK6D+BVoRWB/RWCvlGDqCum1/wHJ8K05WB1/MK4PPVoXUVuoABhf6/gSP1V3KAOv1///gFC5tvK20A5+vVyZSC//KAgP86hW3hiuSAAn//QDBgncK26uC2CuPKwvPAYOstpW4VwP/VyWs////iuD6BX53Wg4CuO15UBAARVBA4Ku5K4OqhiuP/n8KwXKK4MLglgK/PKVyv7VwW936u75gROKwn/KwX77fwK/PP//8CBsPCIIAB/hWC2HN2BW5gGw1XACBv8K4e/K4P8/iu7hn6Vx5VCAAKuC5m2V3fP16uOKIKvBh4EB1nA6yt6VwX7VyX6K4MMhtgK3UA4H/0CvN56tBAAJWBCoNmK3cAgn6/iuQ/nKVwUGV3kA4+g2APMKwX//SuD6xW8hn6//AVx6tC1UAhqu9hnK1iuP/hVB18A228K3kA5mqIBiuGhf06HwV3sK0CuP/auC5+94Cu9gHP1+wVxxWB1X8/fcK30MJIMMVxn8/Su/K4u60BCLA=="))
+};
+//TAP ALL THE THINGS
+Bangle.on('touch', (n, e) => {
+  // <88, top
+  if (e.x < width && e.y > offset) { 
+    g.setColor(0,0,0);
+    g.setFont("Dylex7x13",2).setFontAlign(0,0).drawString(getEncour(), width/2, height/2);
+    setInterval(draw,3000);
+  }
+});
+
+//getters
+function getRandomInt(max) {
+  return Math.floor(Math.random() * max);
+}
+function getEncour(){ //return string
+  let rando = getRandomInt(encourage.length);
+  return encourage[rando];
+}
+//everymine
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+function draw() {
+  var time = locale.time(d, 1);
+  var date = locale.date(d);
+  var mo = dateutil.month(d.getMonth() + 1, 1);
+
+  g.drawImage(bgimg,0,offset); //bg
+  g.setFont("HaxorNarrow7x17").setColor(0,0,0);
+  g.setFontAlign(0, 0).setFont(currentFont, 7).drawString(time, width/2, 100);
+  g.setFontAlign(0,0).setFont(currentFont, 3).drawString(mo + " " + nowDate, width/2, 130);
+
+  queueDraw();
+}
+
+//ready set go!
+g.clear();
+
+Bangle.setUI("clock"); //button
+Bangle.drawWidgets(); //widgets
+Bangle.loadWidgets();
+
+draw(); //draw all the things
diff --git a/apps/encourageclk/app.png b/apps/encourageclk/app.png
new file mode 100644
index 000000000..6dc6b9270
Binary files /dev/null and b/apps/encourageclk/app.png differ
diff --git a/apps/encourageclk/metadata.json b/apps/encourageclk/metadata.json
new file mode 100644
index 000000000..4e5d630cf
--- /dev/null
+++ b/apps/encourageclk/metadata.json
@@ -0,0 +1,17 @@
+{
+    "id": "encourageclk",
+    "name": "Encouragement & Positivity Clock",
+    "shortName":"Encouragement Clock",
+    "version": "0.03",
+    "description": "Tap on the watch for a note of encouragement",
+    "icon": "app.png",
+    "type": "clock",
+    "tags": "clock",
+    "supports": ["BANGLEJS2"],
+    "allow_emulator": true,
+    "readme":"README.md",
+    "storage": [
+      {"name":"encourageclk.app.js","url":"app.js"},
+      {"name":"encourageclk.img","url":"app-icon.js","evaluate":true}
+    ]
+}
diff --git a/apps/encourageclk/screenshot.png b/apps/encourageclk/screenshot.png
new file mode 100644
index 000000000..2569b6291
Binary files /dev/null and b/apps/encourageclk/screenshot.png differ
diff --git a/apps/f9lander/ChangeLog b/apps/f9lander/ChangeLog
index a13f2a313..b5a33bd2e 100644
--- a/apps/f9lander/ChangeLog
+++ b/apps/f9lander/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Add lightning
+0.03: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/f9lander/metadata.json b/apps/f9lander/metadata.json
index 1db777099..5a3887c9e 100644
--- a/apps/f9lander/metadata.json
+++ b/apps/f9lander/metadata.json
@@ -1,7 +1,7 @@
 { "id": "f9lander",
   "name": "Falcon9 Lander",
   "shortName":"F9lander",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Land a rocket booster",
   "icon": "f9lander.png",
   "screenshots" : [ { "url":"f9lander_screenshot1.png" }, { "url":"f9lander_screenshot2.png" }, { "url":"f9lander_screenshot3.png" }],
@@ -12,5 +12,6 @@
     {"name":"f9lander.app.js","url":"app.js"},
     {"name":"f9lander.img","url":"app-icon.js","evaluate":true},
     {"name":"f9lander.settings.js", "url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"f9settings.json"}]
 }
diff --git a/apps/f9lander/settings.js b/apps/f9lander/settings.js
index 0f9fba302..9d85da394 100644
--- a/apps/f9lander/settings.js
+++ b/apps/f9lander/settings.js
@@ -2,7 +2,6 @@
 /**
  * @param {function} back Use back() to return to settings menu
  */
-const boolFormat = v => v ? /*LANG*/"On" : /*LANG*/"Off";
 (function(back) {
   const SETTINGS_FILE = 'f9settings.json'
   // initialize with default settings...
@@ -27,8 +26,7 @@ const boolFormat = v => v ? /*LANG*/"On" : /*LANG*/"Off";
     '': { 'title': 'OpenWind' },
     '< Back': back,
     'Lightning': {
-      value: settings.lightning,
-      format: boolFormat,
+      value: !!settings.lightning,
       onchange: save('lightning'),
     }
   }
diff --git a/apps/fastload/ChangeLog b/apps/fastload/ChangeLog
index 53e3c2591..4e68ab2c7 100644
--- a/apps/fastload/ChangeLog
+++ b/apps/fastload/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Allow redirection of loads to the launcher
 0.03: Allow hiding the fastloading info screen
+0.04: (WIP) Allow use of app history when going back (`load()` or `Bangle.load()` calls without specified app).
diff --git a/apps/fastload/README.md b/apps/fastload/README.md
index a1feedcf8..be4175f55 100644
--- a/apps/fastload/README.md
+++ b/apps/fastload/README.md
@@ -8,9 +8,16 @@ This allows fast loading of all apps with two conditions:
 
 ## Settings
 
+* Activate app history and navigate back through recent apps instead of immediately loading the clock face
+* If Quick Launch is installed it can be excluded from app history
 * Allows to redirect all loads usually loading the clock to the launcher instead
 * The "Fastloading..." screen can be switched off
 
+## App history
+
+* Long press of hardware button clears the app history and loads the clock face
+* Installing the 'Fast Reset' app allows doing fastloads directly to the clock face by pressing the hardware button for one second. Useful if there are many apps in the history and the user want to access the clock quickly.
+
 ## Technical infos
 
 This is still experimental but it uses the same mechanism as `.bootcde` does.
@@ -19,3 +26,6 @@ It checks the app to be loaded for widget use and stores the result of that and
 # Creator
 
 [halemmerich](https://github.com/halemmerich)
+
+# Contributors
+[thyttan](https://github.com/thyttan)
diff --git a/apps/fastload/boot.js b/apps/fastload/boot.js
index c9271abbf..c7fc2fd86 100644
--- a/apps/fastload/boot.js
+++ b/apps/fastload/boot.js
@@ -1,5 +1,6 @@
 {
-const SETTINGS = require("Storage").readJSON("fastload.json") || {};
+const s = require("Storage");
+const SETTINGS = s.readJSON("fastload.json") || {};
 
 let loadingScreen = function(){
   g.reset();
@@ -16,26 +17,26 @@ let loadingScreen = function(){
   g.flip(true);
 };
 
-let cache = require("Storage").readJSON("fastload.cache") || {};
+let cache = s.readJSON("fastload.cache") || {};
 
 let checkApp = function(n){
   // no widgets, no problem
   if (!global.WIDGETS) return true;
-  let app = require("Storage").read(n);
+  let app = s.read(n);
   if (cache[n] && E.CRC32(app) == cache[n].crc)
-    return cache[n].fast
+    return cache[n].fast;
   cache[n] = {};
   cache[n].fast = app.includes("Bangle.loadWidgets");
   cache[n].crc = E.CRC32(app);
-  require("Storage").writeJSON("fastload.cache", cache);
+  s.writeJSON("fastload.cache", cache);
   return cache[n].fast;
-}
+};
 
 global._load = load;
 
 let slowload = function(n){
   global._load(n);
-}
+};
 
 let fastload = function(n){
   if (!n || checkApp(n)){
@@ -50,17 +51,40 @@ let fastload = function(n){
 };
 global.load = fastload;
 
+let appHistory, resetHistory, recordHistory;
+if (SETTINGS.useAppHistory){
+  appHistory  = s.readJSON("fastload.history.json",true)||[];
+  resetHistory = ()=>{appHistory=[];s.writeJSON("fastload.history.json",appHistory);};
+  recordHistory = ()=>{s.writeJSON("fastload.history.json",appHistory);};
+}
+
 Bangle.load = (o => (name) => {
   if (Bangle.uiRemove && !SETTINGS.hideLoading) loadingScreen();
+  if (SETTINGS.useAppHistory){
+    if (name && name!=".bootcde" && !(name=="quicklaunch.app.js" && SETTINGS.disregardQuicklaunch)) {
+      // store the name of the app to launch
+      appHistory.push(name);
+    } else if (name==".bootcde") { // when Bangle.showClock is called
+      resetHistory();
+    } else if (name=="quicklaunch.app.js" && SETTINGS.disregardQuicklaunch) {
+      // do nothing with history
+    } else {
+      // go back in history
+      appHistory.pop();
+      name = appHistory[appHistory.length-1];
+    }
+  }
   if (SETTINGS.autoloadLauncher && !name){
     let orig = Bangle.load;
     Bangle.load = (n)=>{
       Bangle.load = orig;
       fastload(n);
-    }
+    };
     Bangle.showLauncher();
     Bangle.load = orig;
-  } else 
+  } else
     o(name);
 })(Bangle.load);
+
+if (SETTINGS.useAppHistory) E.on('kill', ()=>{if (!BTN.read()) recordHistory(); else resetHistory();}); // Usually record history, but reset it if long press of HW button was used.
 }
diff --git a/apps/fastload/metadata.json b/apps/fastload/metadata.json
index 15adcb7e3..954a7d8b4 100644
--- a/apps/fastload/metadata.json
+++ b/apps/fastload/metadata.json
@@ -1,7 +1,7 @@
 { "id": "fastload",
   "name": "Fastload Utils",
   "shortName" : "Fastload Utils",
-  "version": "0.03",
+  "version": "0.04",
   "icon": "icon.png",
   "description": "Enable experimental fastloading for more apps",
   "type":"bootloader",
diff --git a/apps/fastload/settings.js b/apps/fastload/settings.js
index 4904e057e..66c990df1 100644
--- a/apps/fastload/settings.js
+++ b/apps/fastload/settings.js
@@ -1,7 +1,8 @@
 (function(back) {
   var FILE="fastload.json";
   var settings;
-  
+  var isQuicklaunchPresent = !!require('Storage').read("quicklaunch.app.js", 0, 1);
+
   function writeSettings(key, value) {
     var s = require('Storage').readJSON(FILE, true) || {};
     s[key] = value;
@@ -12,25 +13,52 @@
   function readSettings(){
     settings = require('Storage').readJSON(FILE, true) || {};
   }
-  
+
   readSettings();
 
   function buildMainMenu(){
-    var mainmenu = {
-      '': { 'title': 'Fastload', back: back },
-      'Force load to launcher': {
+    var mainmenu = {};
+
+    mainmenu[''] = { 'title': 'Fastload', back: back };
+
+    mainmenu['Activate app history'] = {
+        value: !!settings.useAppHistory,
+        onchange: v => {
+          writeSettings("useAppHistory",v);
+          if (v && settings.autoloadLauncher) {
+            writeSettings("autoloadLauncher",!v);  // Don't use app history and load to launcher together.
+            setTimeout(()=>E.showMenu(buildMainMenu()), 0); // Update the menu so it can be seen if a value was automatically set to false (app history vs load launcher).
+          }
+        }
+      };
+
+    if (isQuicklaunchPresent) {
+      mainmenu['Exclude Quick Launch from history'] = {
+        value: !!settings.disregardQuicklaunch,
+        onchange: v => {
+          writeSettings("disregardQuicklaunch",v);
+        }
+      };
+    }
+
+    mainmenu['Force load to launcher'] = {
         value: !!settings.autoloadLauncher,
         onchange: v => {
           writeSettings("autoloadLauncher",v);
+          if (v && settings.useAppHistory) {
+            writeSettings("useAppHistory",!v);
+            setTimeout(()=>E.showMenu(buildMainMenu()), 0); // Update the menu so it can be seen if a value was automatically set to false (app history vs load launcher).
+          } // Don't use app history and load to launcher together.
         }
-      },
-      'Hide "Fastloading..."': {
+      };
+
+    mainmenu['Hide "Fastloading..."'] = {
         value: !!settings.hideLoading,
         onchange: v => {
           writeSettings("hideLoading",v);
         }
-      }
-    };
+      };
+
     return mainmenu;
   }
 
diff --git a/apps/fastreset/ChangeLog b/apps/fastreset/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/fastreset/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/fastreset/README.md b/apps/fastreset/README.md
new file mode 100644
index 000000000..381d80cf5
--- /dev/null
+++ b/apps/fastreset/README.md
@@ -0,0 +1,32 @@
+# Fast Reset
+
+Reset the watch by holding the hardware button for half a second. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.
+
+Fast Reset was developed with the app history feature of 'Fastload Utils' in mind. If many apps are in the history stack, the user may want a fast way to exit directly to the clock face without using the firmwares reset function.
+
+## Usage
+
+Just install and it will run as boot code.
+
+## Features
+
+If 'Fastload Utils' is installed fastloading will be used when possible. Otherwise a standard `load(.bootcde)` is used.
+
+If the hardware button is held for longer the standard reset functionality of the firmware is executed as well (total 1.5 seconds). And eventually the watchdog will be kicked.
+
+## Controls
+
+Hold the hardware button for half a second to feel the buzz, loading the clock face.
+
+## Requests
+
+Mention @[thyttan](https://github.com/thyttan) in an issue to the official [BangleApps repository](https://github.com/espruino/BangleApps/issues) for feature requests and bug reports.
+
+## Acknowledgements
+
+<a target="_blank" href="https://icons8.com/icon/15165/rewind">Rewind</a> icon by <a target="_blank" href="https://icons8.com">Icons8</a>
+
+## Creator
+
+[thyttan](https://github.com/thyttan)
+
diff --git a/apps/fastreset/app.png b/apps/fastreset/app.png
new file mode 100644
index 000000000..79e0f310e
Binary files /dev/null and b/apps/fastreset/app.png differ
diff --git a/apps/fastreset/boot.js b/apps/fastreset/boot.js
new file mode 100644
index 000000000..681a5ddb7
--- /dev/null
+++ b/apps/fastreset/boot.js
@@ -0,0 +1,5 @@
+{let buzzTimeout;
+setWatch((e)=>{  
+  if (e.state) buzzTimeout = setTimeout(()=>{Bangle.buzz(80,0.40);Bangle.showClock();}, 500);
+  if (!e.state && buzzTimeout) clearTimeout(buzzTimeout);},
+BTN,{repeat:true, edge:'both' });}
diff --git a/apps/fastreset/metadata.json b/apps/fastreset/metadata.json
new file mode 100644
index 000000000..098e0eeb1
--- /dev/null
+++ b/apps/fastreset/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "fastreset",
+  "name": "Fast Reset",
+  "shortName":"Fast Reset",
+  "version":"0.01",
+  "description": "Reset the watch by holding the hardware button for half a second. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "system",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"fastreset.boot.js","url":"boot.js"}
+  ]
+}
diff --git a/apps/fileman/fileman.app.js b/apps/fileman/fileman.app.js
index 6a3c5598d..5baae298b 100644
--- a/apps/fileman/fileman.app.js
+++ b/apps/fileman/fileman.app.js
@@ -7,7 +7,7 @@ var m;
 var files;
 
 function delete_file(fn) {
-  E.showPrompt("Delete\n"+fn+"?", {buttons: {"No":false, "Yes":true}}).then(function(v) {
+  E.showPrompt(/*LANG*/"Delete\n"+fn+"?", {buttons: {/*LANG*/"No":false, /*LANG*/"Yes":true}}).then(function(v) {
     if (v) {
       if (fn.charCodeAt(fn.length-1)==1) {
         var fh = STOR.open(fn.substr(0, fn.length-1), "r");
diff --git a/apps/findphone/ChangeLog b/apps/findphone/ChangeLog
index 29100f3c1..27c7460ab 100644
--- a/apps/findphone/ChangeLog
+++ b/apps/findphone/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First Version
 0.02: Remove HID requirement, update screen
 0.03: Fix for Bangle 2, toggle find with top half of screen, exit touch bottom half of screen
+0.04: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/findphone/app.js b/apps/findphone/app.js
index e5e32739a..6a2681031 100644
--- a/apps/findphone/app.js
+++ b/apps/findphone/app.js
@@ -5,11 +5,11 @@ var finding = false;
 
 function draw() {
   // show message
-  g.clear(g.theme.bg); 
+  g.clear(g.theme.bg);
   g.setColor(g.theme.fg);
   g.setFont("Vector", fontSize);
   g.setFontAlign(0,0);
-  
+
   if (finding) {
     g.drawString("Finding...", g.getWidth()/2, (g.getHeight()/2)-20);
     g.drawString("Click to stop", g.getWidth()/2, (g.getHeight()/2)+20);
@@ -20,6 +20,7 @@ function draw() {
 }
 
 function findPhone(v) {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({t:"findPhone", n:v}));
 }
 
@@ -43,7 +44,7 @@ if (process.env.HWVERSION == 1) {
 
 if (process.env.HWVERSION == 2) {
   Bangle.on('touch', function(button, xy) {
-   
+
     // click top part of the screen to stop start
     if (xy.y < g.getHeight() / 2) {
       find();
diff --git a/apps/findphone/metadata.json b/apps/findphone/metadata.json
index d67c6ec93..4ce72982e 100644
--- a/apps/findphone/metadata.json
+++ b/apps/findphone/metadata.json
@@ -2,7 +2,7 @@
   "id": "findphone",
   "name": "Find Phone",
   "shortName": "Find Phone",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Find your phone via Gadgetbridge. Click any button to let your phone ring. 📳  Note: The functionality is available even without this app, just go to Settings, App Settings, Gadgetbridge, Find Phone.",
   "icon": "app.png",
   "tags": "tool,android",
diff --git a/apps/flashcards/ChangeLog b/apps/flashcards/ChangeLog
new file mode 100644
index 000000000..6f9ed7196
--- /dev/null
+++ b/apps/flashcards/ChangeLog
@@ -0,0 +1,5 @@
+1.00: Local cards data
+1.10: Download cards data from Trello public board
+1.20: Configuration instructions added and card layout optimized
+1.30: Font size can be changed in Settings
+1.31: Fix for fast-loading support
\ No newline at end of file
diff --git a/apps/flashcards/README.md b/apps/flashcards/README.md
new file mode 100644
index 000000000..484d1102f
--- /dev/null
+++ b/apps/flashcards/README.md
@@ -0,0 +1,19 @@
+A simple flash cards application based on Trello public board. 
+
+Configuration:
+
+1. Create public Trello board
+2. Create new Trello list
+3. Add Trello cards:
+- card name will be flash card front text
+- card description will be flash card back text
+4. Add ".json" to the end of the Trello board URL and refresh page
+5. Find your list ID
+6. Save list ID to the "flashcards.settings.json" file on your watch, e.g.: 
+{"listId":"65942f7b27z68000996ddc00","fontSize":1,"cardWidth":9,"swipeGesture":1}
+7. Connect phone with Gadgetbridge to the watch
+8. Enable "Allow Internet Access" in Gadgetbridge
+9. On the watch go to Settings -> Apps -> Flash Cards -> Get from Trello
+10. Start Flash Cards as watch app or set it as watch clock face
+11. Swipe left/right to change card
+12. Tap to switch card front/back text
\ No newline at end of file
diff --git a/apps/flashcards/app-icon.js b/apps/flashcards/app-icon.js
new file mode 100644
index 000000000..72371cac4
--- /dev/null
+++ b/apps/flashcards/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AH0iABQWKgQXLkAXhCxZIKFxgwKC68zABwWGgYXPmAX/C/4X/C/4X/C9ndACQX/C6dEAAQXS6gXDpovpR/4X/C8ENCyPQC4YA/AGo"))
diff --git a/apps/flashcards/app.js b/apps/flashcards/app.js
new file mode 100644
index 000000000..d2118f8cb
--- /dev/null
+++ b/apps/flashcards/app.js
@@ -0,0 +1,186 @@
+/**
+ * Copyright 2023 Crisp Advice
+ * We believe in Finnish
+ */
+{
+  // Modules
+  let Layout = require("Layout");
+  let locale = require("locale");
+  let storage = require("Storage");
+
+  // Global variables
+  const SWAP_SIDE_BUZZ_MILLISECONDS = 50;
+  const CARD_DATA_FILE = "flashcards.data.json";
+  const CARD_SETTINGS_FILE = "flashcards.settings.json";
+  const CARD_EMPTY = "no cards found";
+ 
+  let cards = [];
+  let cardIndex = 0;
+  let backSide = false;
+  let drawTimeout;
+  let fontSizes = ["15%","20%","25%"];
+  let lastDragX = 0;
+  let lastDragY = 0;
+
+  let settings = Object.assign({
+    listId: "",
+    fontSize: 1,
+    cardWidth: 9,
+    swipeGesture: 1
+  }, storage.readJSON(CARD_SETTINGS_FILE, true) || {});
+
+  // Cards data
+  let wordWrap = function (textStr, maxLength) {
+    if (maxLength == undefined) {
+      maxLength = settings.cardWidth;
+    }
+    let res = '';
+    let str = textStr.trim();
+    while (str.length > maxLength) {
+      let found = false;
+      // Inserts new line at first whitespace of the line
+      for (i = maxLength - 1; i > 0; i--) {
+        if (str.charAt(i)==' ') {
+          res = res + [str.slice(0, i), "\n"].join('');
+          str = str.slice(i + 1);
+          found = true;
+          break;
+        }
+      }
+      // Inserts new line at MAX_LENGTH position, the word is too long to wrap
+      if (!found) {
+        res += [str.slice(0, maxLength), "\n"].join('');
+        str = str.slice(maxLength);
+      }
+    }
+    return res + str;
+  }
+
+  let loadLocalCards = function() {
+    var cardsJSON = "";
+    if (storage.read(CARD_DATA_FILE))
+    {
+      cardsJSON = storage.readJSON(CARD_DATA_FILE, 1)  || {};
+    }
+    refreshCards(cardsJSON,false);
+  }
+
+  let refreshCards = function(cardsJSON,showMsg)
+  {
+    cardIndex = 0;
+    backSide = false;
+    cards = [];
+
+    if (cardsJSON && cardsJSON.length) {
+      cardsJSON.forEach(card => {
+        cards.push([ wordWrap(card.name), wordWrap(card.desc) ]);
+      });
+    }
+
+    if (!cards.length) {
+      cards.push([ wordWrap(CARD_EMPTY), wordWrap(CARD_EMPTY) ]);
+      drawMessage("e: cards not found");
+    } else if (showMsg) {
+      drawMessage("i: cards refreshed");
+    }
+  }
+
+  // Drawing a card
+  let queueDraw = function() {
+    let timeout = 60000;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(function() {
+      drawTimeout = undefined;
+      draw();
+    }, timeout - (Date.now() % timeout));
+  };
+
+  let cardLayout = new Layout( {
+    type:"v", c: [
+      {type:"txt", font:"6x8:3", label:"", id:"widgets", fillx:1 },
+      {type:"txt", font:fontSizes[settings.fontSize], label:"ABCDEFGHIJ KLMNOPQRST UVWXYZÅÖÄ", filly:1, fillx:1, id:"card" },
+      {type:"txt", font:"6x8:2", label:"00:00", id:"clock", fillx:1, bgCol:g.theme.fg, col:g.theme.bg }
+    ]
+  }, {lazy:true});
+
+  let drawCard = function() {
+    cardLayout.card.label = cards[cardIndex][backSide ? 1 : 0];
+    cardLayout.clock.label = locale.time(new Date(),1);
+    cardLayout.render();
+  }
+
+  let drawMessage = function(msg) {
+    cardLayout.card.label = wordWrap(msg);
+    cardLayout.render();
+    console.log(msg);
+  }
+
+  let draw = function() {
+    drawCard();
+    Bangle.drawWidgets();
+    queueDraw();
+  }
+
+  let swipeCard = function(forward)
+  {
+    if(forward) {
+      cardIndex = (cardIndex + 1) % cards.length;
+    }
+    else if(--cardIndex < 0) {
+      cardIndex = cards.length - 1;
+    }
+    drawCard();
+  }
+
+  // Handle a touch: swap card side
+  let handleTouch = function(zone, event) {
+    backSide = !backSide;
+    drawCard();
+    Bangle.buzz(SWAP_SIDE_BUZZ_MILLISECONDS);
+  }
+
+  // Handle a stroke event: cycle cards
+  let handleStroke = function(event) {
+    let first_x = event.xy[0];
+    let last_x = event.xy[event.xy.length - 2];
+    swipeCard((last_x - first_x) > 0);
+  }
+
+  // Handle a drag event: cycle cards
+  let handleDrag = function(event) {
+    let isFingerReleased = (event.b === 0);
+    if(isFingerReleased) {
+      let isHorizontalDrag = (Math.abs(lastDragX) >= Math.abs(lastDragY)) &&
+                            (lastDragX !== 0);
+      if(isHorizontalDrag) {
+        swipeCard(lastDragX > 0);
+      }
+    }
+    else {
+      lastDragX = event.dx;
+      lastDragY = event.dy;
+    }
+  }
+
+  // Ensure pressing the button goes to the launcher (by making this seem like a clock?)
+  Bangle.setUI({mode:"clock", remove:function() {
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    Bangle.removeListener("touch", handleTouch);
+    if (settings.swipeGesture) { Bangle.removeListener("drag", handleDrag);} else { Bangle.removeListener("stroke", handleStroke); }  
+  }});
+
+  // initialize
+  cardLayout.update();
+  Bangle.loadWidgets();
+  loadLocalCards();
+
+  Bangle.on("touch", handleTouch);
+  if (settings.swipeGesture) { Bangle.on("drag", handleDrag); } else { Bangle.on("stroke", handleStroke); }
+
+  // On start: display the first card
+  g.clear();
+  draw();
+}
+
+
diff --git a/apps/flashcards/app.png b/apps/flashcards/app.png
new file mode 100644
index 000000000..e16b8a263
Binary files /dev/null and b/apps/flashcards/app.png differ
diff --git a/apps/flashcards/flashcards.data.json b/apps/flashcards/flashcards.data.json
new file mode 100644
index 000000000..2bda9fd54
--- /dev/null
+++ b/apps/flashcards/flashcards.data.json
@@ -0,0 +1 @@
+[{"id":"634fb1548fcbf401dcb49cf4","name":"monikeitin","desc":"multicooker"},{"id":"634fb18855a957017a5d03f7","name":"lihamylly","desc":"meat grinder"},{"id":"634fb2b50f1f1101890aa7f7","name":"uuni","desc":"oven"},{"id":"633988016d09b300c3770b6d","name":"riittää","desc":"is enough"},{"id":"634fb26ea0aef000ec78e481","name":"kahvinkeitin","desc":"coffee maker"},{"id":"634fb1f8e1378600b51bb317","name":"mehulinko","desc":"juicer"},{"id":"634fb307df637101f7f36b2d","name":"palovaroitin","desc":"smoke \nsensor"},{"id":"634fb29699f51701d79a2cbb","name":"tiskikone","desc":"dishwashing \nmachine"},{"id":"634fb2bbe01e1c0446179a40","name":"liesi","desc":"kitchen\nstove"},{"id":"63419634ce475100b444d577","name":"kohtalainen","desc":"moderate"}]
diff --git a/apps/flashcards/flashcards.settings.json b/apps/flashcards/flashcards.settings.json
new file mode 100644
index 000000000..7c8ef545b
--- /dev/null
+++ b/apps/flashcards/flashcards.settings.json
@@ -0,0 +1 @@
+{"listId":"","fontSize":1,"cardWidth":9,"swipeGesture":1}
diff --git a/apps/flashcards/metadata.json b/apps/flashcards/metadata.json
new file mode 100644
index 000000000..096e7e918
--- /dev/null
+++ b/apps/flashcards/metadata.json
@@ -0,0 +1,22 @@
+{
+  "id": "flashcards",
+  "name": "Flash Cards",
+  "shortName": "Flash Cards",
+  "version": "1.31",
+  "description": "Flash cards based on public Trello board",
+  "readme":"README.md",
+  "screenshots" : [ { "url":"screenshot.png" }],  
+  "icon": "app.png",
+  "tags": "flash cards",
+  "type": "clock",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"flashcards.app.js","url":"app.js"},
+    {"name":"flashcards.settings.js","url":"settings.js"}, 
+    {"name":"flashcards.img","url":"app-icon.js","evaluate":true}
+  ],  
+  "data": [
+    {"name":"flashcards.data.json"},
+    {"name":"flashcards.settings.json"}  
+  ]
+}
diff --git a/apps/flashcards/screenshot.png b/apps/flashcards/screenshot.png
new file mode 100644
index 000000000..f9c5bcb63
Binary files /dev/null and b/apps/flashcards/screenshot.png differ
diff --git a/apps/flashcards/settings.js b/apps/flashcards/settings.js
new file mode 100644
index 000000000..cc03349b4
--- /dev/null
+++ b/apps/flashcards/settings.js
@@ -0,0 +1,79 @@
+(function(back) {
+  var storage = require("Storage");
+
+  var settingsFile = "flashcards.settings.json";
+  var dataFile = "flashcards.data.json";
+  var trelloTimeout = 3000;
+  var trelloURL = "https://api.trello.com/1/lists/$cardsListId/cards/?fields=name%2Cdesc%2Clist";
+
+  var settings = Object.assign({
+    listId: "",
+    fontSize: 1,
+    cardWidth: 9,
+    swipeGesture: 1
+  }, storage.readJSON(settingsFile, true) || {});
+
+  function writeSettings() {
+    storage.writeJSON(settingsFile, settings);
+  }
+
+  const fontSizes = [/*LANG*/"Small",/*LANG*/"Medium",/*LANG*/"Large"];
+  const swipeGestures = [/*LANG*/"Stroke",/*LANG*/"Drag"];  
+  var settingsMenu = {
+    "" : { "title" : "Flash Cards" },
+    "< Back" : () => back(),     
+    /*LANG*/"Get from Trello": () => {
+      if (!storage.read(settingsFile)) { writeSettings();}
+      E.showPrompt(/*LANG*/"Download cards?").then((v) => {
+        let delay = 500;
+        if (v) {
+          if (Bangle.http)
+          {
+            if (settings.listId)
+            {
+              delay = delay + trelloTimeout;
+              E.showMessage(/*LANG*/"Downloading");
+              Bangle.http(trelloURL.replace("$cardsListId", settings.listId),
+              {
+                timeout : trelloTimeout,
+                method: "GET",
+                headers: { "Content-Type": "application/json" }
+              }).then(data=>{
+                var cardsJSON = JSON.parse(data.resp);
+                storage.write(dataFile, JSON.stringify(cardsJSON));
+                E.showMessage(/*LANG*/"Downloaded");
+              })
+              .catch((e) => {
+                  E.showMessage(/*LANG*/"Error:" + e);
+              });
+            } else {
+              E.showMessage(/*LANG*/"List Id not found");
+            }
+          } else {
+            E.showMessage(/*LANG*/"Gadgetbridge not found");
+          }
+        }
+        setTimeout(() => E.showMenu(settingsMenu), delay);
+      });
+    },
+    /*LANG*/"Font size": {
+      value: settings.fontSize,
+      min: 0, max: 2, wrap: true,
+      format: v => fontSizes[v],
+      onchange: v => { settings.fontSize = v; writeSettings(); }
+    },
+    /*LANG*/"Card width": {
+      value: settings.cardWidth,
+      min: 6, max: 12,
+      onchange: v => { settings.cardWidth = v; writeSettings(); }
+    },    
+    /*LANG*/"Swipe gesture": {
+      value: settings.swipeGesture,
+      min: 0, max: 1, wrap: true,
+      format: v => swipeGestures[v],
+      onchange: v => { settings.swipeGesture = v; writeSettings(); }
+    }
+  }
+  // Show the menu
+  E.showMenu(settingsMenu);
+})//(load)
\ No newline at end of file
diff --git a/apps/folderlaunch/ChangeLog b/apps/folderlaunch/ChangeLog
new file mode 100644
index 000000000..2670571d7
--- /dev/null
+++ b/apps/folderlaunch/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New app!
+0.02: Handle files potentially not existing
+0.03: Add setting to disable vibration
\ No newline at end of file
diff --git a/apps/folderlaunch/README.md b/apps/folderlaunch/README.md
new file mode 100644
index 000000000..2caac29c3
--- /dev/null
+++ b/apps/folderlaunch/README.md
@@ -0,0 +1,36 @@
+# Folder launcher
+
+Launcher that allows you to put your apps into folders
+
+![](screenshot1.png)
+![](screenshot2.png)
+
+## Launcher UI
+
+The apps and folders will be presented in a grid layout, configurable in size. Tapping on a folder will open the folder. Folders can contain both apps and more folders. Tapping on an app will launch the app. If there is more than one page, there will be a scroll bar on the right side to indicate how far through the list you have scrolled. Folders will be displayed before apps, in the order that they were added. Apps will honor their sort order, if it exists.
+
+Swiping up and down will scroll. Swiping from the left, using the back button, or pressing BTN1 will take you up a level to the folder containing the current one, or exit the launcher if you are at the top level.
+
+## Settings menu
+
+* Show clocks / Show launcher: Whether clock and launcher apps are displayed in the UI to be launched. The default is no.
+
+* Disable vibration: Whether vibration is disabled in the launcher. The default is no.
+
+* Hidden apps: Displays the list of installed apps, enabling them to be manually hidden. (Or unhidden, if hidden from here.) This may be convenient for apps that you have some other shortcut to access, or apps that are only shortcuts to an infrequently used settings menu. By default, no apps are hidden.
+
+* Display:
+    * Rows: The side length of the square grid. Lowest value is 1, no upper limit. The default is 2, but 3 is also convenient.
+    * Show icons?: Whether app and folder icons are displayed. The default is yes.
+    * Font size: How much height of each grid cell to allocate for the app or folder name. If size zero is selected, there will be no title for apps and folders will use a size of 12. (This is important because it is not possible to distinguish folders solely by icon.) The default is 12.
+
+    To prevent the launcher from becoming unusable, if neither icons nor text are enabled in the settings menu, text will still be drawn.
+
+* Timeout: If the launcher is left idle for too long, return to the clock. This is convenient if you often accidentally open the launcher without noticing. At zero seconds, the timeout is disabled. The default is 30 seconds.
+
+* Folder management: Open the folder management menu for the root folder. (The folder first displayed when opening the launcher.) The folder management menu contains the following:
+    * New subfolder: Open the keyboard to enter the name for a new subfolder to be created. If left blank or given the name of an existing subfolder, no folder is created. If a subfolder is created, open the folder management menu for the new folder.
+    * Move app here: Display a list of apps. Selecting one moves it into the folder.
+    * One menu entry for each subfolder, which opens the folder management menu for that subfolder.
+    * View apps: Only present if this folder contains apps, Display a menu of all apps in the folder. This is for information only, tapping the apps does nothing.
+    * Delete folder: Only present if not viewing the root folder. Delete the current folder and move all apps into the parent folder.
\ No newline at end of file
diff --git a/apps/folderlaunch/app.js b/apps/folderlaunch/app.js
new file mode 100644
index 000000000..438b9e06d
--- /dev/null
+++ b/apps/folderlaunch/app.js
@@ -0,0 +1,206 @@
+{
+    var loader = require('folderlaunch-configLoad.js');
+    var storage_1 = require('Storage');
+    var FOLDER_ICON_1 = require("heatshrink").decompress(atob("mEwwMA///wAJCAoPAAongAonwAon4Aon8Aon+Aon/AooA/AH4A/AFgA="));
+    var config_1 = loader.getConfig();
+    var timeout_1;
+    var resetTimeout_1 = function () {
+        if (timeout_1) {
+            clearTimeout(timeout_1);
+        }
+        if (config_1.timeout != 0) {
+            timeout_1 = setTimeout(function () {
+                Bangle.showClock();
+            }, config_1.timeout);
+        }
+    };
+    var folderPath_1 = [];
+    var getFolder_1 = function (folderPath) {
+        var result = config_1.rootFolder;
+        for (var _i = 0, folderPath_2 = folderPath; _i < folderPath_2.length; _i++) {
+            var folderName = folderPath_2[_i];
+            result = result.folders[folderName];
+        }
+        nPages_1 = Math.ceil((result.apps.length + Object.keys(result.folders).length) / (config_1.display.rows * config_1.display.rows));
+        return result;
+    };
+    var folder_1 = getFolder_1(folderPath_1);
+    var getFontSize_1 = function (length, maxWidth, minSize, maxSize) {
+        var size = Math.floor(maxWidth / length);
+        size *= (20 / 12);
+        if (size < minSize)
+            return minSize;
+        else if (size > maxSize)
+            return maxSize;
+        else
+            return Math.floor(size);
+    };
+    var grid_1 = [];
+    for (var x = 0; x < config_1.display.rows; x++) {
+        grid_1.push([]);
+        for (var y = 0; y < config_1.display.rows; y++) {
+            grid_1[x].push({
+                type: 'empty',
+                id: ''
+            });
+        }
+    }
+    var render_1 = function () {
+        var gridSize = config_1.display.rows * config_1.display.rows;
+        var startIndex = page_1 * gridSize;
+        for (var i = 0; i < gridSize; i++) {
+            var y = Math.floor(i / config_1.display.rows);
+            var x = i % config_1.display.rows;
+            var folderIndex = startIndex + i;
+            var appIndex = folderIndex - Object.keys(folder_1.folders).length;
+            if (folderIndex < Object.keys(folder_1.folders).length) {
+                grid_1[x][y].type = 'folder';
+                grid_1[x][y].id = Object.keys(folder_1.folders)[folderIndex];
+            }
+            else if (appIndex < folder_1.apps.length) {
+                grid_1[x][y].type = 'app';
+                grid_1[x][y].id = folder_1.apps[appIndex];
+            }
+            else
+                grid_1[x][y].type = 'empty';
+        }
+        var squareSize = (g.getHeight() - 24) / config_1.display.rows;
+        if (!config_1.display.icon && !config_1.display.font)
+            config_1.display.font = 12;
+        g.clearRect(0, 24, g.getWidth(), g.getHeight())
+            .reset()
+            .setFontAlign(0, -1);
+        var empty = true;
+        for (var x = 0; x < config_1.display.rows; x++) {
+            for (var y = 0; y < config_1.display.rows; y++) {
+                var entry = grid_1[x][y];
+                var icon = void 0;
+                var text = void 0;
+                var fontSize = void 0;
+                switch (entry.type) {
+                    case 'app':
+                        var app_1 = storage_1.readJSON(entry.id + '.info', false);
+                        icon = storage_1.read(app_1.icon);
+                        text = app_1.name;
+                        empty = false;
+                        fontSize = config_1.display.font;
+                        break;
+                    case 'folder':
+                        icon = FOLDER_ICON_1;
+                        text = entry.id;
+                        empty = false;
+                        fontSize = config_1.display.font ? config_1.display.font : 12;
+                        break;
+                    default:
+                        continue;
+                }
+                var iconSize = config_1.display.icon ? Math.max(0, squareSize - fontSize) : 0;
+                var iconScale = iconSize / 48;
+                var posX = 12 + (x * squareSize);
+                var posY = 24 + (y * squareSize);
+                if (config_1.display.icon && iconSize != 0)
+                    try {
+                        g.drawImage(icon, posX + (squareSize - iconSize) / 2, posY, { scale: iconScale });
+                    }
+                    catch (error) {
+                        console.log("Failed to draw icon for ".concat(text, ": ").concat(error));
+                        console.log(icon);
+                    }
+                if (fontSize)
+                    g.setFont('Vector', getFontSize_1(text.length, squareSize, 6, squareSize - iconSize))
+                        .drawString(text, posX + (squareSize / 2), posY + iconSize);
+            }
+        }
+        if (empty)
+            E.showMessage('Folder is empty. Swipe from left, back button, or BTN1 to go back.');
+        if (nPages_1 > 1) {
+            var barSize = (g.getHeight() - 24) / nPages_1;
+            var barTop = 24 + (page_1 * barSize);
+            g.fillRect(g.getWidth() - 8, barTop, g.getWidth() - 4, barTop + barSize);
+        }
+    };
+    var onTouch = function (_button, xy) {
+        var x = Math.floor((xy.x - 12) / ((g.getWidth() - 24) / config_1.display.rows));
+        if (x < 0)
+            x = 0;
+        else if (x >= config_1.display.rows)
+            x = config_1.display.rows - 1;
+        var y = Math.floor((xy.y - 24) / ((g.getHeight() - 24) / config_1.display.rows));
+        if (y < 0)
+            y = 0;
+        else if (y >= config_1.display.rows)
+            y = config_1.display.rows - 1;
+        var entry = grid_1[x][y];
+        switch (entry.type) {
+            case "app":
+                buzz_1();
+                var infoFile = storage_1.readJSON(entry.id + '.info', false);
+                load(infoFile.src);
+                break;
+            case "folder":
+                buzz_1();
+                resetTimeout_1();
+                page_1 = 0;
+                folderPath_1.push(entry.id);
+                folder_1 = getFolder_1(folderPath_1);
+                render_1();
+                break;
+            default:
+                resetTimeout_1();
+                break;
+        }
+    };
+    var page_1 = 0;
+    var nPages_1;
+    var onSwipe = function (lr, ud) {
+        if (lr == 1 && ud == 0) {
+            onBackButton_1();
+            return;
+        }
+        else if (ud == 1) {
+            resetTimeout_1();
+            if (page_1 == 0) {
+                buzz_1(200);
+                return;
+            }
+            else
+                page_1--;
+        }
+        else if (ud == -1) {
+            resetTimeout_1();
+            if (page_1 == nPages_1 - 1) {
+                buzz_1(200);
+                return;
+            }
+            else
+                page_1++;
+        }
+        render_1();
+    };
+    var onBackButton_1 = function () {
+        buzz_1();
+        if (folderPath_1.length == 0)
+            Bangle.showClock();
+        else {
+            folderPath_1.pop();
+            folder_1 = getFolder_1(folderPath_1);
+            resetTimeout_1();
+            page_1 = 0;
+            render_1();
+        }
+    };
+    var buzz_1 = config_1.disableVibration ? function () { } : Bangle.buzz;
+    Bangle.loadWidgets();
+    Bangle.drawWidgets();
+    Bangle.setUI({
+        mode: 'custom',
+        back: onBackButton_1,
+        btn: onBackButton_1,
+        swipe: onSwipe,
+        touch: onTouch,
+        remove: function () { if (timeout_1)
+            clearTimeout(timeout_1); }
+    });
+    resetTimeout_1();
+    render_1();
+}
diff --git a/apps/folderlaunch/app.ts b/apps/folderlaunch/app.ts
new file mode 100644
index 000000000..993570e59
--- /dev/null
+++ b/apps/folderlaunch/app.ts
@@ -0,0 +1,275 @@
+{
+  const loader = require('folderlaunch-configLoad.js')
+  const storage = require('Storage')
+
+  const FOLDER_ICON = require("heatshrink").decompress(atob("mEwwMA///wAJCAoPAAongAonwAon4Aon8Aon+Aon/AooA/AH4A/AFgA="))
+
+  let config: Config = loader.getConfig();
+
+  let timeout: any;
+  /**
+   * If a timeout to return to the clock is set, reset it.
+   */
+  let resetTimeout = function () {
+    if (timeout) {
+      clearTimeout(timeout);
+    }
+
+    if (config.timeout != 0) {
+      timeout = setTimeout(() => {
+        Bangle.showClock();
+      }, config.timeout);
+    }
+  }
+
+  let folderPath: Array<string> = [];
+  /**
+   * Get the folder at the provided path
+   *
+   * @param folderPath a path for the desired folder
+   * @return the folder that was found
+   */
+  let getFolder = function (folderPath: Array<string>): Folder {
+    let result: Folder = config.rootFolder;
+    for (let folderName of folderPath)
+      result = result.folders[folderName]!;
+    nPages = Math.ceil((result.apps.length + Object.keys(result.folders).length) / (config.display.rows * config.display.rows));
+    return result;
+  }
+  let folder: Folder = getFolder(folderPath);
+
+  /**
+   * Determine the font size needed to fit a string of the given length widthin maxWidth number of pixels, clamped between minSize and maxSize
+   *
+   * @param length the number of characters of the string
+   * @param maxWidth the maximum allowable width
+   * @param minSize the minimum acceptable font size
+   * @param maxSize the maximum acceptable font size
+   * @return the calculated font size
+  */
+  let getFontSize = function (length: number, maxWidth: number, minSize: number, maxSize: number): number {
+    let size = Math.floor(maxWidth / length);  //Number of pixels of width available to character
+    size *= (20 / 12);  //Convert to height, assuming 20 pixels of height for every 12 of width
+
+    // Clamp to within range
+    if (size < minSize) return minSize;
+    else if (size > maxSize) return maxSize;
+    else return Math.floor(size);
+  }
+
+  // grid[x][y] = id of app at column x row y, or undefined if no app displayed there
+  let grid: Array<Array<GridEntry>> = [];
+  for (let x = 0; x < config.display.rows; x++) {
+    grid.push([]);
+    for (let y = 0; y < config.display.rows; y++) {
+      grid[x]!.push({
+        type: 'empty',
+        id: ''
+      });
+    }
+  }
+  let render = function () {
+    let gridSize: number = config.display.rows * config.display.rows;
+    let startIndex: number = page * gridSize; // Start at this position in the folders
+
+    // Populate the grid
+    for (let i = 0; i < gridSize; i++) {
+      // Calculate coordinates
+      let y = Math.floor(i / config.display.rows);
+      let x = i % config.display.rows;
+
+      // Try to place a folder
+      let folderIndex = startIndex + i;
+      let appIndex = folderIndex - Object.keys(folder.folders).length;
+      if (folderIndex < Object.keys(folder.folders).length) {
+        grid[x]![y]!.type = 'folder';
+        grid[x]![y]!.id = Object.keys(folder.folders)[folderIndex];
+      }
+
+      // If that fails, try to place an app
+      else if (appIndex < folder.apps.length) {
+        grid[x]![y]!.type = 'app';
+        grid[x]![y]!.id = folder.apps[appIndex]!;
+      }
+
+      // If that also fails, make the space empty
+      else grid[x]![y]!.type = 'empty';
+    }
+
+    // Prepare to draw the grid
+    let squareSize: number = (g.getHeight() - 24) / config.display.rows;
+    if (!config.display.icon && !config.display.font) config.display.font = 12; // Fallback in case user disabled both icon and text
+    g.clearRect(0, 24, g.getWidth(), g.getHeight())
+      .reset()
+      .setFontAlign(0, -1);
+
+    // Actually draw the grid
+    let empty = true; // Set to empty upon drawing something, so we can know whether to draw a nice message rather than leaving the screen completely blank
+    for (let x = 0; x < config.display.rows; x++) {
+      for (let y = 0; y < config.display.rows; y++) {
+        let entry: GridEntry = grid[x]![y]!;
+        let icon: string | ArrayBuffer;
+        let text: string;
+        let fontSize: number;
+
+        // Get the icon and text, skip if the space is empty. Always draw text for folders even if disabled
+        switch (entry.type) {
+          case 'app':
+            let app = storage.readJSON(entry.id + '.info', false) as AppInfo;
+            icon = storage.read(app.icon!)!;
+            text = app.name;
+            empty = false;
+            fontSize = config.display.font;
+            break;
+          case 'folder':
+            icon = FOLDER_ICON;
+            text = entry.id;
+            empty = false;
+            fontSize = config.display.font ? config.display.font : 12;
+            break;
+          default:
+            continue;
+        }
+
+        // Calculate position and icon size
+        let iconSize = config.display.icon ? Math.max(0, squareSize - fontSize) : 0; // If icon is disabled, stay at zero. Otherwise, subtract font size from square
+        let iconScale: number = iconSize / 48;
+        let posX = 12 + (x * squareSize);
+        let posY = 24 + (y * squareSize);
+
+        // Draw the icon
+        if (config.display.icon && iconSize != 0)
+          try {
+            g.drawImage(icon, posX + (squareSize - iconSize) / 2, posY, { scale: iconScale });
+          } catch (error) {
+            console.log(`Failed to draw icon for ${text}: ${error}`);
+            console.log(icon);
+          }
+
+        // Draw the text
+        if (fontSize)
+          g.setFont('Vector', getFontSize(text.length, squareSize, 6, squareSize - iconSize))
+            .drawString(text, posX + (squareSize / 2), posY + iconSize);
+      }
+    }
+
+    // Draw a nice message if there is nothing to see, so the user doesn't think the app is broken
+    if (empty) E.showMessage(/*LANG*/'Folder is empty. Swipe from left, back button, or BTN1 to go back.');
+
+    // Draw a scroll bar if necessary
+    if (nPages > 1) { // Avoid divide-by-zero and pointless scroll bars
+      let barSize = (g.getHeight() - 24) / nPages;
+      let barTop = 24 + (page * barSize);
+      g.fillRect(
+        g.getWidth() - 8, barTop,
+        g.getWidth() - 4, barTop + barSize);
+    }
+  }
+
+  /**
+   * Handle a touch
+   *
+   * @param _button 1 for left half, 2 for right half
+   * @param xy postion on screen
+   */
+  let onTouch = function (_button: number, xy: { x: number, y: number } | undefined) {
+    // Determine which grid cell was tapped
+    let x: number = Math.floor((xy!.x - 12) / ((g.getWidth() - 24) / config.display.rows));
+    if (x < 0) x = 0;
+    else if (x >= config.display.rows) x = config.display.rows - 1;
+    let y: number = Math.floor((xy!.y - 24) / ((g.getHeight() - 24) / config.display.rows));
+    if (y < 0) y = 0;
+    else if (y >= config.display.rows) y = config.display.rows - 1;
+
+    // Handle the grid cell
+    let entry: GridEntry = grid[x]![y]!;
+    switch (entry.type) {
+      case "app":
+        buzz();
+        let infoFile = storage.readJSON(entry.id + '.info', false) as AppInfo;
+        load(infoFile.src);
+        break;
+      case "folder":
+        buzz();
+        resetTimeout();
+        page = 0;
+        folderPath.push(entry.id);
+        folder = getFolder(folderPath);
+        render();
+        break;
+      default:
+        resetTimeout();
+        break;
+    }
+  }
+
+  let page: number = 0;
+  let nPages: number; // Set when setting folder
+
+  /**
+   * Handle a swipe
+   *
+   * A swipe from left is treated as the back button. Up and down swipes change pages
+   *
+   * @param lr -1 if left, 0 if pure up/down, 1 if right
+   * @param ud -1 if up, 0 if pure left/right, 1 if down
+   */
+  let onSwipe = function (lr: -1 | 0 | 1 | undefined, ud: -1 | 0 | 1 | undefined) {
+    if (lr == 1 && ud == 0) {
+      onBackButton();
+      return;
+    } else if (ud == 1) {
+      resetTimeout();
+      if (page == 0) {
+        buzz(200);
+        return;
+      } else page--;
+    } else if (ud == -1) {
+      resetTimeout();
+      if (page == nPages - 1) {
+        buzz(200);
+        return;
+      } else page++;
+    }
+
+    // If we reached this point, the page number has been changed and is valid.
+    render();
+  }
+
+  /**
+   * Go back up a level. If already at the root folder, exit the launcher
+   */
+  let onBackButton = () => {
+    buzz();
+    if (folderPath.length == 0)
+      Bangle.showClock();
+    else {
+      folderPath.pop();
+      folder = getFolder(folderPath);
+      resetTimeout();
+      page = 0;
+      render();
+    }
+  }
+
+  /**
+   * Vibrate the watch if vibration is enabled
+   */
+  let buzz = config.disableVibration ? () => {} : Bangle.buzz;
+
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+
+  Bangle.setUI({
+    mode: 'custom',
+    back: onBackButton,
+    btn: onBackButton,
+    swipe: onSwipe,
+    touch: onTouch,
+    remove: () => { if (timeout) clearTimeout(timeout); }
+  });
+
+  resetTimeout();
+  render();
+
+}
diff --git a/apps/folderlaunch/configLoad.js b/apps/folderlaunch/configLoad.js
new file mode 100644
index 000000000..86c2d9dd3
--- /dev/null
+++ b/apps/folderlaunch/configLoad.js
@@ -0,0 +1,106 @@
+var storage = require("Storage");
+var SETTINGS_FILE = "folderlaunch.json";
+var DEFAULT_CONFIG = {
+    showClocks: false,
+    showLaunchers: false,
+    disableVibration: false,
+    hidden: [],
+    display: {
+        rows: 2,
+        icon: true,
+        font: 12
+    },
+    timeout: 30000,
+    rootFolder: {
+        folders: {},
+        apps: []
+    },
+    apps: {},
+    hash: 0
+};
+function clearFolder(folder) {
+    for (var childName in folder.folders)
+        folder.folders[childName] = clearFolder(folder.folders[childName]);
+    folder.apps = [];
+    return folder;
+}
+function cleanAndSave(config) {
+    var infoFiles = storage.list(/\.info$/);
+    var installedAppIds = [];
+    for (var _i = 0, infoFiles_1 = infoFiles; _i < infoFiles_1.length; _i++) {
+        var infoFile = infoFiles_1[_i];
+        installedAppIds.push((storage.readJSON(infoFile, true) || {}).id);
+    }
+    var toRemove = [];
+    for (var appId in config.apps)
+        if (!installedAppIds.includes(appId))
+            toRemove.push(appId);
+    for (var _a = 0, toRemove_1 = toRemove; _a < toRemove_1.length; _a++) {
+        var appId = toRemove_1[_a];
+        delete config.apps[appId];
+    }
+    storage.writeJSON(SETTINGS_FILE, config);
+    return config;
+}
+var infoFileSorter = function (a, b) {
+    var aJson = storage.readJSON(a, false);
+    var bJson = storage.readJSON(b, false);
+    var n = (0 | aJson.sortorder) - (0 | bJson.sortorder);
+    if (n)
+        return n;
+    if (aJson.name < bJson.name)
+        return -1;
+    if (aJson.name > bJson.name)
+        return 1;
+    return 0;
+};
+module.exports = {
+    cleanAndSave: cleanAndSave,
+    infoFileSorter: infoFileSorter,
+    getConfig: function () {
+        var config = storage.readJSON(SETTINGS_FILE, true) || DEFAULT_CONFIG;
+        if (config.hash == storage.hash(/\.info$/)) {
+            return config;
+        }
+        E.showMessage('Rebuilding cache...');
+        config.rootFolder = clearFolder(config.rootFolder);
+        var infoFiles = storage.list(/\.info$/);
+        infoFiles.sort(infoFileSorter);
+        for (var _i = 0, infoFiles_2 = infoFiles; _i < infoFiles_2.length; _i++) {
+            var infoFile = infoFiles_2[_i];
+            var app_1 = storage.readJSON(infoFile, false) || {};
+            if ((!config.showClocks && app_1.type == 'clock') ||
+                (!config.showLaunchers && app_1.type == 'launch') ||
+                (app_1.type == 'widget') ||
+                (!app_1.src)) {
+                if (Object.keys(config.hidden).includes(app_1.id))
+                    delete config.apps[app_1.id];
+                continue;
+            }
+            if (!config.apps.hasOwnProperty(app_1.id)) {
+                config.apps[app_1.id] = {
+                    folder: [],
+                    nagged: false
+                };
+            }
+            if (config.hidden.includes(app_1.id))
+                continue;
+            var curFolder = config.rootFolder;
+            var depth = 0;
+            for (var _a = 0, _b = config.apps[app_1.id].folder; _a < _b.length; _a++) {
+                var folderName = _b[_a];
+                if (curFolder.folders.hasOwnProperty(folderName)) {
+                    curFolder = curFolder.folders[folderName];
+                    depth++;
+                }
+                else {
+                    config.apps[app_1.id].folder = config.apps[app_1.id].folder.slice(0, depth);
+                    break;
+                }
+            }
+            curFolder.apps.push(app_1.id);
+        }
+        config.hash = storage.hash(/\.info$/);
+        return cleanAndSave(config);
+    }
+};
diff --git a/apps/folderlaunch/configLoad.ts b/apps/folderlaunch/configLoad.ts
new file mode 100644
index 000000000..37841cd36
--- /dev/null
+++ b/apps/folderlaunch/configLoad.ts
@@ -0,0 +1,157 @@
+const storage = require("Storage");
+
+const SETTINGS_FILE: string = "folderlaunch.json";
+
+const DEFAULT_CONFIG: Config = {
+    showClocks: false,
+    showLaunchers: false,
+    disableVibration: false,
+    hidden: [],
+    display: {
+        rows: 2,
+        icon: true,
+        font: 12
+    },
+    timeout: 30000,
+    rootFolder: {
+        folders: {},
+        apps: []
+    },
+    apps: {},
+    hash: 0
+}
+
+/**
+ * Recursively remove all apps from a folder
+ *
+ * @param folder the folder to clean
+ * @return the folder with all apps removed
+ */
+function clearFolder(folder: Folder): Folder {
+    for (let childName in folder.folders)
+        folder.folders[childName] = clearFolder(folder.folders[childName]!);
+    folder.apps = [];
+    return folder;
+}
+
+/**
+ * Clean and save the configuration.
+ *
+ * Assume that:
+ *  - All installed apps have an appInfo entry
+ *  - References to nonexistent folders have been removed from appInfo
+ * And therefore we do not need to do this ourselves.
+ * Note: It is not a real problem if the assumptions are not true. If this was called by getConfig, the assumptions are already taken care of. If this was called somewhere else, they will be taken care of the next time getConfig is called.
+ *
+ * Perform the following cleanup:
+ *  - Remove appInfo entries for nonexistent apps, to prevent irrelevant data invisible to the user from accumulating
+ *
+ * @param config the configuration to be cleaned
+ * @return the cleaned configuration
+ */
+function cleanAndSave(config: Config): Config {
+    // Get the list of installed apps
+    let infoFiles: Array<string> = storage.list(/\.info$/);
+    let installedAppIds: Array<string> = [];
+    for (let infoFile of infoFiles)
+        installedAppIds.push(((storage.readJSON(infoFile, true) || {}) as AppInfo).id);
+
+    // Remove nonexistent apps from appInfo
+    let toRemove: Array<string> = [];
+    for (let appId in config.apps)
+        if (!installedAppIds.includes(appId))
+            toRemove.push(appId);
+    for (let appId of toRemove)
+        delete config.apps[appId];
+
+    // Save and return
+    storage.writeJSON(SETTINGS_FILE, config);
+    return config;
+}
+
+/**
+ * Comparator function to sort a list of app info files.
+ * Copied and slightly modified (mainly to port to Typescript) from dtlaunch.
+ *
+ * @param a the first
+ * @param b the second
+ * @return negative if a should go first, positive if b should go first, zero if equivalent.
+ */
+let infoFileSorter = (a: string, b: string): number => {
+    let aJson = storage.readJSON(a, false) as AppInfo;
+    let bJson = storage.readJSON(b, false) as AppInfo;
+    var n = (0 | aJson.sortorder!) - (0 | bJson.sortorder!);
+    if (n) return n; // do sortorder first
+    if (aJson.name < bJson.name) return -1;
+    if (aJson.name > bJson.name) return 1;
+    return 0;
+}
+
+export = {
+    cleanAndSave: cleanAndSave,
+    infoFileSorter: infoFileSorter,
+
+    /**
+     * Get the configuration for the launcher. Perform a cleanup if any new apps were installed or any apps refer to nonexistent folders.
+     *
+     * @param keepHidden if true, don't exclude apps that would otherwise be hidden
+     * @return the loaded configuration
+     */
+    getConfig: (): Config => {
+        let config = (storage.readJSON(SETTINGS_FILE, true) as Config | undefined) || DEFAULT_CONFIG;
+
+        // We only need to load data from the filesystem if there is a change
+        if (config.hash == storage.hash(/\.info$/)) {
+            return config;
+        }
+
+        E.showMessage(/*LANG*/'Rebuilding cache...')
+        config.rootFolder = clearFolder(config.rootFolder);
+        let infoFiles: Array<string> = storage.list(/\.info$/);
+        infoFiles.sort(infoFileSorter);
+
+        for (let infoFile of infoFiles) {
+            let app = storage.readJSON(infoFile, false) as AppInfo | undefined || ({} as AppInfo);
+
+            // If the app is to be hidden by policy, exclude it completely
+            if (
+                (!config.showClocks && app.type == 'clock') ||
+                (!config.showLaunchers && app.type == 'launch') ||
+                (app.type == 'widget') ||
+                (!app.src)
+            ) {
+                if (Object.keys(config.hidden).includes(app.id)) delete config.apps[app.id];
+                continue;
+            }
+
+            // Creates the apps entry if it doesn't exist yet.
+            if (!config.apps.hasOwnProperty(app.id)) {
+                config.apps[app.id] = {
+                    folder: [],
+                    nagged: false
+                };
+            }
+
+            // If the app is manually hidden, don't put it in a folder but still keep information about it
+            if (config.hidden.includes(app.id)) continue;
+
+            // Place apps in folders, deleting references to folders that no longer exist
+            // Note: Relies on curFolder secretly being a reference rather than a copy
+            let curFolder: Folder = config.rootFolder;
+            let depth = 0;
+            for (let folderName of config.apps[app.id]!.folder) {
+                if (curFolder.folders.hasOwnProperty(folderName)) {
+                    curFolder = curFolder.folders[folderName]!;
+                    depth++;
+                } else {
+                    config.apps[app.id]!.folder = config.apps[app.id]!.folder.slice(0, depth);
+                    break;
+                }
+            }
+            curFolder.apps.push(app.id);
+        }
+        config.hash = storage.hash(/\.info$/);
+
+        return cleanAndSave(config);
+    }
+}
\ No newline at end of file
diff --git a/apps/folderlaunch/icon.js b/apps/folderlaunch/icon.js
new file mode 100644
index 000000000..426ffc1d2
--- /dev/null
+++ b/apps/folderlaunch/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwMA///wAJCAoPAAongAonwAon4Aon8Aon+Aon/AooA/AH4A/AFgA="))
\ No newline at end of file
diff --git a/apps/folderlaunch/icon.png b/apps/folderlaunch/icon.png
new file mode 100644
index 000000000..1ebab139f
Binary files /dev/null and b/apps/folderlaunch/icon.png differ
diff --git a/apps/folderlaunch/metadata.json b/apps/folderlaunch/metadata.json
new file mode 100644
index 000000000..0cf83abb4
--- /dev/null
+++ b/apps/folderlaunch/metadata.json
@@ -0,0 +1,48 @@
+{
+    "id": "folderlaunch",
+    "name": "Folder launcher",
+    "version": "0.03",
+    "description": "Launcher that allows you to put your apps into folders",
+    "icon": "icon.png",
+    "type": "launch",
+    "tags": "tool,system,launcher",
+    "supports": [
+        "BANGLEJS2"
+    ],
+    "readme": "README.md",
+    "storage": [
+        {
+            "name": "folderlaunch.app.js",
+            "url": "app.js"
+        },
+        {
+            "name": "folderlaunch.settings.js",
+            "url": "settings.js"
+        },
+        {
+            "name": "folderlaunch-configLoad.js",
+            "url": "configLoad.js"
+        },
+        {
+            "name": "folderlaunch.img",
+            "url": "icon.js",
+            "evaluate": true
+        }
+    ],
+    "data": [
+        {
+            "name": "folderlaunch.json"
+        }
+    ],
+    "dependencies": {
+        "textinput": "type"
+    },
+    "screenshots": [
+        {
+            "url": "screenshot1.png"
+        },
+        {
+            "url": "screenshot2.png"
+        }
+    ]
+}
diff --git a/apps/folderlaunch/screenshot1.png b/apps/folderlaunch/screenshot1.png
new file mode 100644
index 000000000..88642a728
Binary files /dev/null and b/apps/folderlaunch/screenshot1.png differ
diff --git a/apps/folderlaunch/screenshot2.png b/apps/folderlaunch/screenshot2.png
new file mode 100644
index 000000000..f72840594
Binary files /dev/null and b/apps/folderlaunch/screenshot2.png differ
diff --git a/apps/folderlaunch/settings.js b/apps/folderlaunch/settings.js
new file mode 100644
index 000000000..b589bb3f7
--- /dev/null
+++ b/apps/folderlaunch/settings.js
@@ -0,0 +1,251 @@
+(function (back) {
+    var loader = require('folderlaunch-configLoad.js');
+    var storage = require('Storage');
+    var textinput = require('textinput');
+    var config = loader.getConfig();
+    var changed = false;
+    var hiddenAppsMenu = function () {
+        var menu = {
+            '': {
+                'title': 'Hide?',
+                'back': showMainMenu
+            }
+        };
+        var onchange = function (value, appId) {
+            if (value && !config.hidden.includes(appId))
+                config.hidden.push(appId);
+            else if (!value && config.hidden.includes(appId))
+                config.hidden = config.hidden.filter(function (item) { return item != appId; });
+            changed = true;
+        };
+        onchange;
+        for (var app_1 in config.apps) {
+            var appInfo = storage.readJSON(app_1 + '.info', false);
+            menu[appInfo.name] = {
+                value: config.hidden.includes(app_1),
+                onchange: eval("(value) => { onchange(value, \"".concat(app_1, "\"); }"))
+            };
+        }
+        E.showMenu(menu);
+    };
+    var getAppInfo = function (id) {
+        return storage.readJSON(id + '.info', false);
+    };
+    var showFolderMenu = function (path) {
+        var folder = config.rootFolder;
+        for (var _i = 0, path_1 = path; _i < path_1.length; _i++) {
+            var folderName = path_1[_i];
+            try {
+                folder = folder.folders[folderName];
+            }
+            catch (_a) {
+                E.showAlert('BUG: Nonexistent folder ' + path);
+            }
+        }
+        var back = function () {
+            if (path.length) {
+                path.pop();
+                showFolderMenu(path);
+            }
+            else
+                showMainMenu();
+        };
+        var menu = {
+            '': {
+                'title': path.length ? path[path.length - 1] : 'Root folder',
+                'back': back
+            },
+            'New subfolder': function () {
+                textinput.input({ text: '' }).then(function (result) {
+                    if (result && !Object.keys(folder.folders).includes(result)) {
+                        folder.folders[result] = {
+                            folders: {},
+                            apps: []
+                        };
+                        changed = true;
+                        path.push(result);
+                        showFolderMenu(path);
+                    }
+                    else {
+                        E.showAlert('No folder created').then(function () {
+                            showFolderMenu(path);
+                        });
+                    }
+                });
+            },
+            'Move app here': function () {
+                var menu = {
+                    '': {
+                        'title': 'Select app',
+                        'back': function () {
+                            showFolderMenu(path);
+                        }
+                    }
+                };
+                var mover = function (appId) {
+                    var folder = config.rootFolder;
+                    for (var _i = 0, _a = config.apps[appId].folder; _i < _a.length; _i++) {
+                        var folderName = _a[_i];
+                        folder = folder.folders[folderName];
+                    }
+                    folder.apps = folder.apps.filter(function (item) { return item != appId; });
+                    config.apps[appId].folder = path.slice();
+                    folder = config.rootFolder;
+                    for (var _b = 0, path_2 = path; _b < path_2.length; _b++) {
+                        var folderName = path_2[_b];
+                        folder = folder.folders[folderName];
+                    }
+                    folder.apps.push(appId);
+                    changed = true;
+                    showFolderMenu(path);
+                };
+                mover;
+                E.showMessage('Loading apps...');
+                for (var _i = 0, _a = Object.keys(config.apps)
+                    .filter(function (item) { return !folder.apps.includes(item); })
+                    .map(function (item) { return item + '.info'; })
+                    .sort(loader.infoFileSorter)
+                    .map(function (item) { return item.split('.info')[0]; }); _i < _a.length; _i++) {
+                    var appId = _a[_i];
+                    menu[getAppInfo(appId).name] = eval("() => { mover(\"".concat(appId, "\"); }"));
+                }
+                E.showMenu(menu);
+            }
+        };
+        var switchToFolder = function (subfolder) {
+            path.push(subfolder);
+            showFolderMenu(path);
+        };
+        switchToFolder;
+        for (var _b = 0, _c = Object.keys(folder.folders); _b < _c.length; _b++) {
+            var subfolder = _c[_b];
+            menu[subfolder] = eval("() => { switchToFolder(\"".concat(subfolder, "\") }"));
+        }
+        if (folder.apps.length)
+            menu['View apps'] = function () {
+                var menu = {
+                    '': {
+                        'title': path[path.length - 1],
+                        'back': function () { showFolderMenu(path); }
+                    }
+                };
+                for (var _i = 0, _a = folder.apps; _i < _a.length; _i++) {
+                    var appId = _a[_i];
+                    menu[storage.readJSON(appId + '.info', false).name] = function () { };
+                }
+                E.showMenu(menu);
+            };
+        if (path.length)
+            menu['Delete folder'] = function () {
+                var apps = folder.apps;
+                var subfolders = folder.folders;
+                var toDelete = path.pop();
+                folder = config.rootFolder;
+                for (var _i = 0, path_3 = path; _i < path_3.length; _i++) {
+                    var folderName = path_3[_i];
+                    folder = folder.folders[folderName];
+                }
+                for (var _a = 0, apps_1 = apps; _a < apps_1.length; _a++) {
+                    var appId = apps_1[_a];
+                    config.apps[appId].folder.pop();
+                    folder.apps.push(appId);
+                }
+                for (var _b = 0, _c = Object.keys(subfolders); _b < _c.length; _b++) {
+                    var subfolder = _c[_b];
+                    folder.folders[subfolder] = subfolders[subfolder];
+                }
+                delete folder.folders[toDelete];
+                changed = true;
+                showFolderMenu(path);
+            };
+        E.showMenu(menu);
+    };
+    var save = function () {
+        if (changed) {
+            E.showMessage('Saving...');
+            config.hash = 0;
+            loader.cleanAndSave(config);
+            changed = false;
+        }
+    };
+    E.on('kill', save);
+    var showMainMenu = function () {
+        E.showMenu({
+            '': {
+                'title': 'Folder launcher',
+                'back': function () {
+                    save();
+                    back();
+                }
+            },
+            'Show clocks': {
+                value: !!config.showClocks,
+                onchange: function (value) {
+                    config.showClocks = value;
+                    changed = true;
+                }
+            },
+            'Show launchers': {
+                value: !!config.showLaunchers,
+                onchange: function (value) {
+                    config.showLaunchers = value;
+                    changed = true;
+                }
+            },
+            'Disable vibration': {
+                value: !!config.disableVibration,
+                onchange: function (value) {
+                    config.disableVibration = value;
+                    changed = true;
+                }
+            },
+            'Hidden apps': hiddenAppsMenu,
+            'Display': function () {
+                E.showMenu({
+                    '': {
+                        'title': 'Display',
+                        'back': showMainMenu
+                    },
+                    'Rows': {
+                        value: config.display.rows,
+                        min: 1,
+                        onchange: function (value) {
+                            config.display.rows = value;
+                            changed = true;
+                        }
+                    },
+                    'Show icons?': {
+                        value: config.display.icon,
+                        onchange: function (value) {
+                            config.display.icon = value;
+                            changed = true;
+                        }
+                    },
+                    'Font size': {
+                        value: config.display.font,
+                        min: 0,
+                        format: function (value) { return (value ? value : 'Icon only'); },
+                        onchange: function (value) {
+                            config.display.font = value;
+                            changed = true;
+                        }
+                    }
+                });
+            },
+            'Timeout': {
+                value: config.timeout,
+                format: function (value) { return value ? "".concat(value / 1000, " sec") : 'None'; },
+                min: 0,
+                step: 1000,
+                onchange: function (value) {
+                    config.timeout = value;
+                    changed = true;
+                }
+            },
+            'Folder management': function () {
+                showFolderMenu([]);
+            }
+        });
+    };
+    showMainMenu();
+});
diff --git a/apps/folderlaunch/settings.ts b/apps/folderlaunch/settings.ts
new file mode 100644
index 000000000..665267b93
--- /dev/null
+++ b/apps/folderlaunch/settings.ts
@@ -0,0 +1,267 @@
+(function (back) {
+    const loader = require('folderlaunch-configLoad.js');
+    const storage = require('Storage');
+    const textinput = require('textinput');
+
+    let config: Config = loader.getConfig();
+    let changed: boolean = false;
+
+    let hiddenAppsMenu = () => {
+        let menu: Menu = {
+            '': {
+                'title': 'Hide?',
+                'back': showMainMenu
+            }
+        }
+
+        let onchange = (value: boolean, appId: string) => {
+            if (value && !config.hidden.includes(appId)) // Hiding, not already hidden
+                config.hidden.push(appId);
+            else if (!value && config.hidden.includes(appId)) // Unhiding, already hidden
+                config.hidden = config.hidden.filter(item => item != appId)
+            changed = true;
+        }
+        onchange    // Do nothing, but stop typescript from yelling at me for this function being unused. It gets used by eval. I know eval is evil, but the menus are a bit limited.
+
+        for (let app in config.apps) {
+            let appInfo = storage.readJSON(app + '.info', false) as AppInfo;
+            menu[appInfo.name] = {
+                value: config.hidden.includes(app),
+                onchange: eval(`(value) => { onchange(value, "${app}"); }`)
+            }
+        }
+
+        E.showMenu(menu);
+    };
+
+    let getAppInfo = (id: string): AppInfo => {
+        return storage.readJSON(id + '.info', false) as AppInfo;
+    }
+
+    let showFolderMenu = (path: Array<string>) => {
+        let folder: Folder = config.rootFolder;
+        for (let folderName of path)
+            try {
+                folder = folder.folders[folderName]!;
+            } catch {
+                E.showAlert(/*LANG*/'BUG: Nonexistent folder ' + path);
+            }
+
+        let back = () => {
+            if (path.length) {
+                path.pop();
+                showFolderMenu(path);
+            } else showMainMenu();
+        };
+
+        let menu: Menu = {
+            '': {
+                'title': path.length ? path[path.length - 1]! : /*LANG*/ 'Root folder',
+                'back': back
+            },
+            /*LANG*/'New subfolder': () => {
+                textinput.input({ text: '' }).then((result: string) => {
+                    if (result && !Object.keys(folder.folders).includes(result)) {
+                        folder.folders[result] = {
+                            folders: {},
+                            apps: []
+                        };
+                        changed = true;
+                        path.push(result);
+                        showFolderMenu(path);
+                    } else {
+                        E.showAlert(/*LANG*/'No folder created').then(() => {
+                            showFolderMenu(path);
+                        })
+                    }
+                });
+            },
+            /*LANG*/'Move app here': () => {
+                let menu: Menu = {
+                    '': {
+                        'title': /*LANG*/'Select app',
+                        'back': () => {
+                            showFolderMenu(path);
+                        }
+                    }
+                };
+
+                let mover = (appId: string) => {
+                    // Delete app from old folder
+                    let folder: Folder = config.rootFolder;
+                    for (let folderName of config.apps[appId]!.folder)
+                        folder = folder.folders[folderName]!;
+                    folder.apps = folder.apps.filter((item: string) => item != appId);
+
+                    // Change folder in app info, .slice is to force a copy rather than a reference
+                    config.apps[appId]!.folder = path.slice();
+
+                    // Place app in new folder (here)
+                    folder = config.rootFolder;
+                    for (let folderName of path)
+                        folder = folder.folders[folderName]!;
+                    folder.apps.push(appId);
+
+                    // Mark changed and refresh menu
+                    changed = true;
+                    showFolderMenu(path);
+                };
+                mover;
+
+                E.showMessage(/*LANG*/'Loading apps...');
+                for (
+                    let appId of Object.keys(config.apps)               // All known apps
+                        .filter(item => !folder.apps.includes(item))    // Filter out ones already in this folder
+                        .map(item => item + '.info')                    // Convert to .info files
+                        .sort(loader.infoFileSorter)                    // Sort the info files using infoFileSorter
+                        .map(item => item.split('.info')[0])            // Back to app ids
+                ) {
+                    menu[getAppInfo(appId).name] = eval(`() => { mover("${appId}"); }`);
+                }
+
+                E.showMenu(menu);
+            }
+        };
+
+        let switchToFolder = (subfolder: string) => {
+            path.push(subfolder);
+            showFolderMenu(path);
+        };
+        switchToFolder;
+
+        for (let subfolder of Object.keys(folder.folders)) {
+            menu[subfolder] = eval(`() => { switchToFolder("${subfolder}") }`);
+        }
+
+        if (folder.apps.length) menu[/*LANG*/'View apps'] = () => {
+            let menu: Menu = {
+                '': {
+                    'title': path[path.length - 1]!,
+                    'back': () => { showFolderMenu(path); }
+                }
+            }
+            for (let appId of folder.apps) {
+                menu[(storage.readJSON(appId + '.info', false) as AppInfo).name] = () => { };
+            }
+            E.showMenu(menu);
+        }
+
+        if (path.length) menu[/*LANG*/'Delete folder'] = () => {
+            // Cache apps for changing the folder reference
+            let apps: Array<string> = folder.apps;
+            let subfolders = folder.folders;
+
+            // Move up to the parent folder
+            let toDelete: string = path.pop()!;
+            folder = config.rootFolder;
+            for (let folderName of path)
+                folder = folder.folders[folderName]!;
+
+            // Move all apps and folders to the parent folder, then delete this one
+            for (let appId of apps) {
+                config.apps[appId]!.folder.pop();
+                folder.apps.push(appId);
+            }
+            for (let subfolder of Object.keys(subfolders))
+                folder.folders[subfolder] = subfolders[subfolder]!;
+            delete folder.folders[toDelete];
+
+            // Mark as modified and go back
+            changed = true;
+            showFolderMenu(path);
+        }
+
+        E.showMenu(menu);
+    };
+
+    let save = () => {
+        if (changed) {
+            E.showMessage(/*LANG*/'Saving...');
+            config.hash = 0;    // Invalidate the cache so changes to hidden apps or folders actually get reflected
+            loader.cleanAndSave(config);
+            changed = false; // So we don't do it again on exit
+        }
+    };
+
+    E.on('kill', save);
+
+    let showMainMenu = () => {
+        E.showMenu({
+            '': {
+                'title': 'Folder launcher',
+                'back': () => {
+                    save();
+                    back();
+                }
+            },
+            'Show clocks': {
+                value: !!config.showClocks,
+                onchange: (value: boolean) => {
+                    config.showClocks = value;
+                    changed = true;
+                }
+            },
+            'Show launchers': {
+                value: !!config.showLaunchers,
+                onchange: (value: boolean) => {
+                    config.showLaunchers = value;
+                    changed = true;
+                }
+            },
+            'Disable vibration': {
+                value: !!config.disableVibration,
+                onchange: (value: boolean) => {
+                    config.disableVibration = value;
+                    changed = true;
+                }
+            },
+            'Hidden apps': hiddenAppsMenu,
+            'Display': () => {
+                E.showMenu({
+                    '': {
+                        'title': 'Display',
+                        'back': showMainMenu
+                    },
+                    'Rows': {
+                        value: config.display.rows,
+                        min: 1,
+                        onchange: value => {
+                            config.display.rows = value;
+                            changed = true;
+                        }
+                    },
+                    'Show icons?': {
+                        value: config.display.icon,
+                        onchange: value => {
+                            config.display.icon = value;
+                            changed = true;
+                        }
+                    },
+                    'Font size': {
+                        value: config.display.font as any,
+                        min: 0,
+                        format: (value: any) => (value ? value : 'Icon only'),
+                        onchange: (value: any) => {
+                            config.display.font = value;
+                            changed = true;
+                        }
+                    }
+                });
+            },
+            'Timeout': {
+                value: config.timeout,
+                format: value => value ? `${value / 1000} sec` : 'None',
+                min: 0,
+                step: 1000,
+                onchange: value => {
+                    config.timeout = value;
+                    changed = true;
+                }
+            },
+            'Folder management': () => {
+                showFolderMenu([]);
+            }
+        });
+    };
+    showMainMenu();
+} satisfies SettingsFunc);
\ No newline at end of file
diff --git a/apps/folderlaunch/types.d.ts b/apps/folderlaunch/types.d.ts
new file mode 100644
index 000000000..86c0465e5
--- /dev/null
+++ b/apps/folderlaunch/types.d.ts
@@ -0,0 +1,34 @@
+type Folder = {
+    folders: {                      // name: folder pairs of all nested folders
+        [key: string]: Folder
+    },
+    apps: Array<string>             // List of ids of all apps in this folder
+};
+
+type FolderList = Array<string>;
+
+type Config = {
+    showClocks: boolean,            // Whether clocks are shown
+    showLaunchers: boolean,         // Whether launchers are shown
+    disableVibration: boolean,      // Whether vibration is disabled
+    hidden: Array<String>,          // IDs of apps to explicitly hide
+    display: {
+        rows: number,               // Display an X by X grid of apps
+        icon: boolean,              // Whether to show icons
+        font: number                // Which font to use for the name, or false to not show the name
+    },
+    timeout: number,                // How many ms before returning to the clock, or zero to never return
+    rootFolder: Folder,             // The top level folder, first displayed when opened
+    apps: {                         // Saved info for each app
+        [key: string]: {
+            folder: FolderList,     // Folder path
+            nagged: boolean         // Whether the app's fast launch setting was configured
+        }
+    },
+    hash: number                    // Hash of .info files
+};
+
+type GridEntry = {                  // An entry in the grid displayed on-screen
+    type: 'app' | 'folder' | 'empty',   // Which type of item is in this space
+    id: string                      // The id of that item
+}
\ No newline at end of file
diff --git a/apps/fuzzyw/ChangeLog b/apps/fuzzyw/ChangeLog
index 206efb10f..dd73475f9 100644
--- a/apps/fuzzyw/ChangeLog
+++ b/apps/fuzzyw/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First release
 0.02: Move translations to locale module (removed watch settings, now pick language in Bangle App Loader, More..., Settings)
-0.03: Change for fast loading, use widget_utils to hide widgets 
\ No newline at end of file
+0.03: Change for fast loading, use widget_utils to hide widgets 
+0.04: Add animation when display changes
\ No newline at end of file
diff --git a/apps/fuzzyw/README.md b/apps/fuzzyw/README.md
index 49d0fe0d5..062c9ac25 100644
--- a/apps/fuzzyw/README.md
+++ b/apps/fuzzyw/README.md
@@ -16,7 +16,6 @@ Most translations are taken from the original Fuzzy Text International code.
 
 ## TODO
 * Bold hour word (as the pebble version has)
-* Animation when changing time?
 
 ## References
 Based on Pebble app Fuzzy Text International: https://github.com/hallettj/Fuzzy-Text-International
diff --git a/apps/fuzzyw/fuzzyw.app.js b/apps/fuzzyw/fuzzyw.app.js
index e185e2ccf..8bc51710f 100644
--- a/apps/fuzzyw/fuzzyw.app.js
+++ b/apps/fuzzyw/fuzzyw.app.js
@@ -33,13 +33,17 @@
   ]
 };
 
-let text_scale = 3.5;
+let text_scale = 4;
 let timeout = 2.5*60;
 let drawTimeout;
+let animInterval;
+let time_string = "";
+let time_string_old = "";
+let time_string_old_wrapped = "";
 
 let loadSettings = function() {
   settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false};
-}
+};
 
 let queueDraw = function(seconds) {
   let millisecs = seconds * 1000;
@@ -48,10 +52,7 @@ let queueDraw = function(seconds) {
     drawTimeout = undefined;
     draw();
   }, millisecs - (Date.now() % millisecs));
-}
-
-const h = g.getHeight();
-const w = g.getWidth();
+};
 
 let getTimeString = function(date) {
   let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300);
@@ -63,18 +64,47 @@ let getTimeString = function(date) {
     f_string = f_string.replace('$2', fuzzy_string.hours[(hour + 1) % 12]);
   }
     return f_string;
-}
+};
 
 let draw = function() {
-  let time_string = getTimeString(new Date()).replace('*', '');
-  // print(time_string);
-  g.setFont('Vector', (h-24*2)/text_scale);
-  g.setFontAlign(0, 0);
-  g.clearRect(0, 24, w, h-24);
-  g.setColor(g.theme.fg);
-  g.drawString(g.wrapString(time_string, w).join("\n"), w/2, h/2);
+  time_string = getTimeString(new Date()).replace('*', '');
+  //print(time_string);
+  if (time_string != time_string_old) {
+    g.setFont('Vector', R.h/text_scale).setFontAlign(0, 0);
+    animate(3);
+  }
   queueDraw(timeout);
-}
+};
+
+let animate = function(step) {
+  if (animInterval) clearInterval(animInterval);
+  let time_string_new_wrapped = g.wrapString(time_string, R.w).join("\n");
+  slideX = 0;
+  animInterval = setInterval(function() {
+    let time_start = getTime()
+    //blank old time
+    g.setColor(g.theme.bg);
+    g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, R.y + R.h/2);
+    g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, R.y + R.h/2);
+    g.setColor(g.theme.fg);
+    slideX += step;
+    let stop = false;
+    if (slideX>=R.w) {
+      slideX=R.w;
+      stop = true;
+    }
+    //draw shifted new time
+    g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, R.y + R.h/2);
+    g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, R.y + R.h/2);
+    if (stop) {
+      time_string_old = time_string;
+      clearInterval(animInterval);
+      animInterval=undefined;
+      time_string_old_wrapped = time_string_new_wrapped;
+    }
+    print(Math.round((getTime() - time_start)*1000))
+  }, 30);
+};
 
 g.clear();
 loadSettings();
@@ -95,6 +125,8 @@ Bangle.setUI({
     // Called to unload all of the clock app
     if (drawTimeout) clearTimeout(drawTimeout);
     drawTimeout = undefined;
+    if (animInterval) clearInterval(animInterval);
+    animInterval = undefined;
     require('widget_utils').show(); // re-show widgets
   }
 });
@@ -106,5 +138,6 @@ if (settings.showWidgets) {
   require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
 }
 
+R = Bangle.appRect;
 draw();
 }
\ No newline at end of file
diff --git a/apps/fuzzyw/metadata.json b/apps/fuzzyw/metadata.json
index d1040fda3..97f060866 100644
--- a/apps/fuzzyw/metadata.json
+++ b/apps/fuzzyw/metadata.json
@@ -2,7 +2,7 @@
   "id":"fuzzyw",
   "name":"Fuzzy Text Clock",
   "shortName": "Fuzzy Text",
-  "version": "0.03",
+  "version": "0.04",
   "description": "An imprecise clock for when you're not in a rush",
   "readme": "README.md",
   "icon":"fuzzyw.png",
diff --git a/apps/fwupdate/ChangeLog b/apps/fwupdate/ChangeLog
index ea0b48eb9..a9673f6de 100644
--- a/apps/fwupdate/ChangeLog
+++ b/apps/fwupdate/ChangeLog
@@ -6,3 +6,4 @@
       Add CRC checks for common bootloaders that we know don't work
 0.04: Include a precompiled bootloader for easy bootloader updates
 0.05: Rename Bootloader->DFU and add explanation to avoid confusion with Bootloader app
+0.06: Lower chunk size to 1024 (from 2048) to make firmware updates more reliable
diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index 31eb4a256..6dcaad035 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -15,7 +15,7 @@
     <p>Your current firmware version is <span id="fw-version" style="font-weight:bold">unknown</span> and DFU is <span id="boot-version" style="font-weight:bold">unknown</span></p>
   </ul>
     <div id="fw-ok" style="display:none">
-      <p>If you have an early (KickStarter or developer) Bangle.js device and still have the old 2v10.x DFU, the Firmware Update
+      <p  id="fw-old-bootloader-msg">If you have an early (KickStarter or developer) Bangle.js device and still have the old 2v10.x DFU, the Firmware Update
         will fail with a message about the DFU version. If so, please <a href="bootloader_espruino_2v12_banglejs2.hex" class="fw-link">click here to update to DFU 2v12</a> and then click the 'Upload' button that appears.</p>
       <div id="latest-firmware" style="display:none">
         <p>The currently available Espruino firmware releases are:</p>
@@ -98,10 +98,16 @@ function onInit(device) {
     if (crc==4056371285) version = "2v13";
     if (crc==1038322422) version = "2v14";
     if (crc==2560806221) version = "2v15";
+    if (crc==2886730689) version = "2v16";
+    if (crc==156320890) version = "2v17";
+    if (crc==4012421318) version = "2v18"; 
     if (!ok) {
       version += 	`(&#9888; update required)`;
     }
     document.getElementById("boot-version").innerHTML = version;
+    var versionNumber = parseFloat(version.replace(".","").replace("v","."));
+    if (versionNumber>=2.15)
+      document.getElementById("fw-old-bootloader-msg").style.display = "none";
   });
 }
 
@@ -154,7 +160,8 @@ function checkForFileOnServer() {
       for (var i=0;i<fwlinks.length;i++)
         fwlinks[i].addEventListener("click", e => {
           e.preventDefault();
-          downloadURL(e.target.href).then(info=>{
+          var href = e.target.href;
+          if (href) downloadURL(href).then(info=>{
             document.getElementById("upload").style = ""; // show upload
           });
         });
@@ -317,7 +324,7 @@ function createJS_app(binary, startAddress, endAddress) {
   hexJS += `\x10if (E.CRC32(E.memoryArea(0xF7000,0x7000))==1207580954) { print("DFU 2v10.236 needs update"); load();}\n`;
   hexJS += '\x10var s = require("Storage");\n';
   hexJS += '\x10s.erase(".firmware");\n';
-  var CHUNKSIZE = 2048;
+  var CHUNKSIZE = 1024;
   for (var i=0;i<binary.length;i+=CHUNKSIZE) {
     var l = binary.length-i;
     if (l>CHUNKSIZE) l=CHUNKSIZE;
diff --git a/apps/fwupdate/metadata.json b/apps/fwupdate/metadata.json
index 372f6850c..e3294f316 100644
--- a/apps/fwupdate/metadata.json
+++ b/apps/fwupdate/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "fwupdate",
   "name": "Firmware Update",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Uploads new Espruino firmwares to Bangle.js 2",
   "icon": "app.png",
   "type": "RAM",
diff --git a/apps/game1024/metadata.json b/apps/game1024/metadata.json
index f3b72aad3..45d6e3f61 100644
--- a/apps/game1024/metadata.json
+++ b/apps/game1024/metadata.json
@@ -14,5 +14,6 @@
       {"name":"game1024.app.js","url":"app.js"},
       {"name":"game1024.settings.js","url":"settings.js"},
       {"name":"game1024.img","url":"app-icon.js","evaluate":true}
-    ]
+    ],
+    "data":[{"name":"game1024.settings.json"}]
   }
diff --git a/apps/gassist/ChangeLog b/apps/gassist/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/gassist/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/gassist/app.js b/apps/gassist/app.js
new file mode 100644
index 000000000..69e8001e3
--- /dev/null
+++ b/apps/gassist/app.js
@@ -0,0 +1,11 @@
+Bluetooth.println("");
+Bluetooth.println(JSON.stringify({
+  t:"intent", 
+  target:"activity", 
+  action:"android.intent.action.VOICE_COMMAND", 
+  flags:["FLAG_ACTIVITY_NEW_TASK"]
+}));
+
+setTimeout(function() {
+  Bangle.showClock();
+}, 0);
diff --git a/apps/gassist/app.png b/apps/gassist/app.png
new file mode 100644
index 000000000..8c190d344
Binary files /dev/null and b/apps/gassist/app.png differ
diff --git a/apps/gassist/boot.js b/apps/gassist/boot.js
new file mode 100644
index 000000000..eb2155796
--- /dev/null
+++ b/apps/gassist/boot.js
@@ -0,0 +1,21 @@
+// load settings
+var settings = Object.assign({
+  enableTap: true
+}, require("Storage").readJSON("gassist.json", true) || {});
+
+if (settings.enableTap) {
+  Bangle.on("tap", function(e) {
+    if (e.dir=="front" && e.double) {
+      Bluetooth.println("");
+      Bluetooth.println(JSON.stringify({
+        t:"intent", 
+        target:"activity", 
+        action:"android.intent.action.VOICE_COMMAND", 
+        flags:["FLAG_ACTIVITY_NEW_TASK"]
+      }));
+    }
+  });
+}
+
+// clear variable
+settings = undefined;
\ No newline at end of file
diff --git a/apps/gassist/icon.js b/apps/gassist/icon.js
new file mode 100644
index 000000000..9e84990e3
--- /dev/null
+++ b/apps/gassist/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AH4ALiAAFFtoxmFpQxjFxwwfFyAwdFyQwcF9wuUGDQvuFywwYF/4vUnAABF9YuCGBAv/F/6/PGC4bE3QACG5YvdFoYxSLzAvuFw4wjLxbCidhAvVGB4UFF7QxMCZAuaGJIRKF7oATFtoA/AEPMAAQttGNQuHGE4vuFxIwlF/4v/d/4vwGBAumGIwtpAH4A/AEIA=="))
\ No newline at end of file
diff --git a/apps/gassist/metadata.json b/apps/gassist/metadata.json
new file mode 100644
index 000000000..995c44adb
--- /dev/null
+++ b/apps/gassist/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "gassist",
+  "name": "Google Assist",
+  "version": "0.01",
+  "description": "A simple way to initiate Google Assistant on Android. Intents must be enabled in  Gadgetbridge.",
+  "icon": "app.png",
+  "type": "app",
+  "tags": "tool, voice, tasker",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": false,
+  "storage": [
+    {"name":"gassist.boot.js","url":"boot.js"},
+    {"name":"gassist.app.js","url":"app.js"},
+    {"name":"gassist.settings.js","url":"settings.js"},
+    {"name":"gassist.img","url":"icon.js","evaluate":true}
+  ],
+  "data": [{"name":"gassist.json"}]
+}
\ No newline at end of file
diff --git a/apps/gassist/settings.js b/apps/gassist/settings.js
new file mode 100644
index 000000000..987c3fdfc
--- /dev/null
+++ b/apps/gassist/settings.js
@@ -0,0 +1,33 @@
+(function (back) {
+  let storage = require('Storage');
+  let file = "gassist.json";
+
+  // Load and set default settings
+  let appSettings = Object.assign({
+    enableTap : true
+  }, storage.readJSON(file, true) || {});
+
+  // Save settings to storage
+  function writeSettings() {
+    storage.writeJSON(file, appSettings);
+  }
+
+  function showMenu() {
+    E.showMenu({
+      "": {
+        "title": "Google Assist"
+      },
+      "< Back": () => back(),
+      'Front Tap:': {
+        value: (appSettings.enableTap === true),
+        format: v => v ? "On" : "Off",
+        onchange: v => {
+          appSettings.enableTap = v;
+          writeSettings();
+        }
+      },
+    });
+  }
+  // Initially show the menu
+  showMenu();
+});
diff --git a/apps/gbmusic/ChangeLog b/apps/gbmusic/ChangeLog
index d8379b317..90e5ed857 100644
--- a/apps/gbmusic/ChangeLog
+++ b/apps/gbmusic/ChangeLog
@@ -10,3 +10,4 @@
 0.10: Simplify touch events
       Remove date+time
 0.11: Use default Bangle formatter for booleans
+0.12: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/gbmusic/app.js b/apps/gbmusic/app.js
index 49f54dac9..ffd247f61 100644
--- a/apps/gbmusic/app.js
+++ b/apps/gbmusic/app.js
@@ -415,6 +415,7 @@ let tCommand = {};
  * @param {string} command - "play"/"pause"/"next"/"previous"/"volumeup"/"volumedown"
  */
 function sendCommand(command) {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({t: "music", n: command}));
   // for control color
   if (command in tCommand) {
diff --git a/apps/gbmusic/metadata.json b/apps/gbmusic/metadata.json
index bbe2a158d..0c73548cb 100644
--- a/apps/gbmusic/metadata.json
+++ b/apps/gbmusic/metadata.json
@@ -2,7 +2,7 @@
   "id": "gbmusic",
   "name": "Gadgetbridge Music Controls",
   "shortName": "Music Controls",
-  "version": "0.11",
+  "version": "0.12",
   "description": "Control the music on your Gadgetbridge-connected phone",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot_v1_d.png"},{"url":"screenshot_v1_l.png"},
diff --git a/apps/gbridge/settings.js b/apps/gbridge/settings.js
index cf6c84c73..ae63bb0f9 100644
--- a/apps/gbridge/settings.js
+++ b/apps/gbridge/settings.js
@@ -24,22 +24,22 @@
   var mainmenu = {
     "" : { "title" : "Gadgetbridge" },
     "< Back" : back,
-    "Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
-    "Show Icon" : {
+    /*LANG*/"Connected" : { value : NRF.getSecurityStatus().connected?/*LANG*/"Yes":/*LANG*/"No" },
+    /*LANG*/"Show Icon" : {
       value: settings().showIcon,
       onchange: setIcon
     },
-    "Find Phone" : function() { E.showMenu(findPhone); },
-    "Record HRM" : {
+    /*LANG*/"Find Phone" : function() { E.showMenu(findPhone); },
+    /*LANG*/"Record HRM" : {
       value: !!settings().hrm,
       onchange: v => updateSetting('hrm', v)
-    }    
+    }
   };
 
   var findPhone = {
     "" : { "title" : "-- Find Phone --" },
-    "On" : _=>gb({t:"findPhone",n:true}),
-    "Off" : _=>gb({t:"findPhone",n:false}),
+    /*LANG*/"On" : _=>gb({t:"findPhone",n:true}),
+    /*LANG*/"Off" : _=>gb({t:"findPhone",n:false}),
     "< Back" : function() { E.showMenu(mainmenu); },
   };
 
diff --git a/apps/gbtwist/ChangeLog b/apps/gbtwist/ChangeLog
index ec66c5568..830486ae2 100644
--- a/apps/gbtwist/ChangeLog
+++ b/apps/gbtwist/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial version
+0.02: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/gbtwist/app.js b/apps/gbtwist/app.js
index 4bd495277..03646064d 100644
--- a/apps/gbtwist/app.js
+++ b/apps/gbtwist/app.js
@@ -22,14 +22,17 @@ var counter = 0; //stores your counted your twists
 var tstate = false; //are you ready to count the twists?
 
 function playx() {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({t:"music", n:"play"}));
 }
 
 function volup() {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({t:"music", n:"volumeup"}));
 }
 
 function voldn() {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({t:"music", n:"volumedown"}));
 }
 
diff --git a/apps/gbtwist/metadata.json b/apps/gbtwist/metadata.json
index 24f39a9d4..cb3e07584 100644
--- a/apps/gbtwist/metadata.json
+++ b/apps/gbtwist/metadata.json
@@ -2,7 +2,7 @@
   "id": "gbtwist",
   "name": "Gadgetbridge Twist Control",
   "shortName": "Twist Control",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Shake your wrist to control your music app via Gadgetbridge",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/geissclk/ChangeLog b/apps/geissclk/ChangeLog
index cd46173f7..680d820ae 100644
--- a/apps/geissclk/ChangeLog
+++ b/apps/geissclk/ChangeLog
@@ -2,3 +2,4 @@
 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.
+0.05: Making geissclock work on Bangle.js 2 (but only animate when unlocked!)
\ No newline at end of file
diff --git a/apps/geissclk/clock.js b/apps/geissclk/clock.js
index 5401fb142..2f1428d24 100644
--- a/apps/geissclk/clock.js
+++ b/apps/geissclk/clock.js
@@ -1,4 +1,7 @@
 var W = 79, H = 64;
+// if screen is always on, only animate when unlocked
+var isScreenAlwaysOn = process.env.BOARD=="BANGLEJS2";
+
 /*var compiled = E.compiledC(`
 // void transl(int, int, int )
 int transl(unsigned char *map, unsigned char *imgfrom, unsigned char *imgto) {
@@ -46,6 +49,7 @@ var map = new Uint8Array(W*H);
 var pal = new Uint16Array(256);
 var PALETTES = 3;
 var MAPS = 6;
+var animInterval;
 
 // If we're missing any maps, compute them!
 (function() {
@@ -65,6 +69,8 @@ function randomPalette() {
   var n = (0|Math.random()*200000) % PALETTES;
   var p = new Uint8Array(pal.buffer);
   p.set(require("Storage").readArrayBuffer("geissclk."+n+".pal"));
+  if (!g.theme.dark) // if not dark, invert colors
+    E.mapInPlace(pal,pal,x=>x^0xFFFF);
 }
 
 function randomMap() {
@@ -93,7 +99,7 @@ var im = {
 };
 var lastSeconds = -1;
 
-function iterate() { "ram"
+function iterate(clearBuf) { "ram"
   var d = new Date();
   var time = require("locale").time(d,1);
   var seconds = d.getSeconds().toString().padStart(2,0);
@@ -108,27 +114,59 @@ function iterate() { "ram"
     gfx.buffer = dataa.buffer;
   }
   var x,y,n,t = getTime()/10;
-  var amt = 100*Bangle.getAccel().diff;
-  for (var i=0;i<amt;i++) {
-    //x = Math.round((W/2) + 20*Math.sin(t));
-    //y = Math.round((H/2) + 20*Math.cos(t));
-    //t += 0.628;
-    x = 1+(Math.random()*(W-2))|0;
-    y = 1+(Math.random()*(H-2))|0;
-    dataa[x + y*W] = 240;
+  if (clearBuf) {
+    gfx.clear();
+  } else { // do geiss animation
+    var amt = 100*Bangle.getAccel().diff;
+    for (var i=0;i<amt;i++) {
+      //x = Math.round((W/2) + 20*Math.sin(t));
+      //y = Math.round((H/2) + 20*Math.cos(t));
+      //t += 0.628;
+      x = 1+(Math.random()*(W-2))|0;
+      y = 1+(Math.random()*(H-2))|0;
+      dataa[x + y*W] = 240;
+    }
+    compiled.transl(addrmap, addra, addrb);
   }
-  compiled.transl(addrmap, addra, addrb);
 
 
   x = 8;
+
   gfx.setFont("5x9Numeric7Seg",2);
   gfx.drawString(time, x, 20);
-  gfx.setFont("5x9Numeric7Seg");
-  gfx.drawString(seconds, x+55, 30);
+  if (!clearBuf) { // don't draw seconds if not animating
+    gfx.setFont("5x9Numeric7Seg");
+    gfx.drawString(seconds, x+55, 30);
+  }
   // firmwares pre-2v09 wouldn't accelerate a 3x blit if it went right to the RHS - hence we're 79px not 80
-  g.drawImage(im,1,24,{scale:3});
+  if (g.getWidth()==176)  // Bangle.js 2
+    g.drawImage(im,8,24,{scale:2});
+  else
+    g.drawImage(im,3,24,{scale:3});
 }
 
+if (isScreenAlwaysOn) {
+  Bangle.on('lock',function(on) {
+    if (animInterval) {
+      clearInterval(animInterval);
+      animInterval = undefined;
+    }
+    if (!on) { // not locked - animate!
+      randomMap();
+      randomPalette();
+      iterate();
+      animInterval = setInterval(iterate, 50);
+    } else {
+      iterate(true); // just clear
+      animInterval = setTimeout(function() {
+        iterate(true);
+        animInterval = setInterval(function() {
+          iterate(true);
+        }, 60000);
+      }, 60000 - (Date.now() % 60000));
+    }
+  });
+}
 
 Bangle.on('lcdPower',function(on) {
   if (animInterval) {
@@ -144,11 +182,15 @@ Bangle.on('lcdPower',function(on) {
 });
 
 // Show launcher when button pressed
-Bangle.setUI("clock");g.clear();
+Bangle.setUI("clock");
+g.clear(1);
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-iterate();
-animInterval = setInterval(iterate, 50);
+iterate(true);
+if (Bangle.isLCDOn() && (!isScreenAlwaysOn || !Bangle.isLocked())) {
+  console.log("Starting");
+  animInterval = setInterval(iterate, 50);
+}
 
 
diff --git a/apps/geissclk/metadata.json b/apps/geissclk/metadata.json
index 68bd2a970..b90efb831 100644
--- a/apps/geissclk/metadata.json
+++ b/apps/geissclk/metadata.json
@@ -1,12 +1,12 @@
 {
   "id": "geissclk",
   "name": "Geiss Clock",
-  "version": "0.04",
+  "version": "0.05",
   "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",
   "tags": "clock",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "storage": [
     {"name":"geissclk.app.js","url":"clock.js"},
     {"name":"geissclk.precompute.js","url":"precompute.js"},
diff --git a/apps/geissclk/precompute.js b/apps/geissclk/precompute.js
index 0518b6cd8..ea2dcf07a 100644
--- a/apps/geissclk/precompute.js
+++ b/apps/geissclk/precompute.js
@@ -1,6 +1,6 @@
 // PALETTES ---------------------------
 E.showMessage("Precomputing\npalettes\n\nPlease wait...\n0 / 3");
-(function() { // fire
+(function() { "jit" // fire
   for (var i=0;i<256;i++) {
     var r = Math.min(i*6,240);
     var g = Math.min(i*3,240);
@@ -10,7 +10,7 @@ E.showMessage("Precomputing\npalettes\n\nPlease wait...\n0 / 3");
 })()
 require("Storage").write("geissclk.0.pal",pal.buffer);
 E.showMessage("Precomputing\npalettes\n\nPlease wait...\n1 / 3");
-(function() { // gunge
+(function() { "jit" // gunge
   for (var i=0;i<256;i++) {
     var r = 0;
     var g = Math.min(i*3,255);
@@ -20,7 +20,7 @@ E.showMessage("Precomputing\npalettes\n\nPlease wait...\n1 / 3");
 })()
 require("Storage").write("geissclk.1.pal",pal.buffer);
 E.showMessage("Precomputing\npalettes\n\nPlease wait...\n2 / 3");
-(function() { // rainbow
+(function() { "jit" // rainbow
   for (var i=0;i<256;i++) {
     var cl = E.HSBtoRGB((48+i)/128,1,Math.min(i/16,0.9),true);
     var r = cl[0];
@@ -35,7 +35,7 @@ require("Storage").write("geissclk.2.pal",pal.buffer);
 // MAPS ----------------------------------------------
 E.showMessage("Precomputing\nmaps\n\nPlease wait...\n0 / 5");
 // straight out
-(function() { "ram"; var n = 0; for (var y=0;y<H;y++) {
+(function() { "jit"; var n = 0; for (var y=0;y<H;y++) {
   for (var x=0;x<W;x++) {
     var dx = x-(W/2);
     var dy = y-(H/2);
@@ -49,7 +49,7 @@ E.showMessage("Precomputing\nmaps\n\nPlease wait...\n0 / 5");
 require("Storage").write("geissclk.0.map",map);
 E.showMessage("Precomputing\nmaps\n\nPlease wait...\n1 / 5");
 // ripple out
-(function() { "ram";  var n = 0; for (var y=0;y<H;y++) {
+(function() { "jit";  var n = 0; for (var y=0;y<H;y++) {
   for (var x=0;x<W;x++) {
     var dx = x-(W/2);
     var dy = y-(H/2);
@@ -63,7 +63,7 @@ E.showMessage("Precomputing\nmaps\n\nPlease wait...\n1 / 5");
 require("Storage").write("geissclk.1.map",map);
 E.showMessage("Precomputing\nmaps\n\nPlease wait...\n2 / 5");
 // twisty outwards
-(function() { "ram";  var n = 0; for (var y=0;y<H;y++) {
+(function() { "jit";  var n = 0; for (var y=0;y<H;y++) {
   for (var x=0;x<W;x++) {
     var dx = x-(W/2);
     var dy = y-(H/2);
@@ -76,7 +76,7 @@ E.showMessage("Precomputing\nmaps\n\nPlease wait...\n2 / 5");
 require("Storage").write("geissclk.2.map",map);
 E.showMessage("Precomputing\nmaps\n\nPlease wait...\n3 / 5");
 // spiral
-(function() { "ram";  var n = 0; for (var y=0;y<H;y++) {
+(function() { "jit";  var n = 0; for (var y=0;y<H;y++) {
   for (var x=0;x<W;x++) {
     var dx = x-(W/2);
     var dy = y-(H/2);
@@ -89,7 +89,7 @@ E.showMessage("Precomputing\nmaps\n\nPlease wait...\n3 / 5");
 require("Storage").write("geissclk.3.map",map);
 E.showMessage("Precomputing\nmaps\n\nPlease wait...\n4 / 5");
 // blur down
-(function() { "ram";  var n=0; for (var y=0;y<H;y++) {
+(function() { "jit";  var n=0; for (var y=0;y<H;y++) {
   for (var x=0;x<W;x++) {
     map[n++] = 136 - 6*16 + (y&1)*8-4;
   }
@@ -97,7 +97,7 @@ E.showMessage("Precomputing\nmaps\n\nPlease wait...\n4 / 5");
 require("Storage").write("geissclk.4.map",map);
 E.showMessage("Precomputing\nmaps\n\nPlease wait...\n5 / 5");
 // twisty
-(function() { "ram";  var n=0; for (var y=0;y<H;y++) {
+(function() { "jit";  var n=0; for (var y=0;y<H;y++) {
   for (var x=0;x<W;x++) {
     dx = Math.sin(y*0.2);
     dy = Math.cos(x*0.2);
diff --git a/apps/getup/metadata.json b/apps/getup/metadata.json
index 0c5a7cc5b..00bab40be 100644
--- a/apps/getup/metadata.json
+++ b/apps/getup/metadata.json
@@ -14,5 +14,6 @@
     {"name":"getup.app.js","url":"app.js"},
     {"name":"getup.settings.js","url":"settings.js"},
     {"name":"getup.img","url":"app-icon.js","evaluate":true}
-  ]
+  ],
+  "data":[{"name":"getup.settings.json"}]
 }
diff --git a/apps/gipy/ChangeLog b/apps/gipy/ChangeLog
index f913c9e58..8646ba11a 100644
--- a/apps/gipy/ChangeLog
+++ b/apps/gipy/ChangeLog
@@ -73,3 +73,17 @@
 	* Display current and next segment in red so that you know where to go.
 	* Avoid angles flickering at low speed at the cost of less refresh.
 	* Splash screen while waiting for gps signal.
+
+0.17:
+	* Convert Yes/No On/Off in settings to checkboxes
+
+0.18:
+	* Major rewrite of display : now tile based
+	* We have a map. Never get lost again.
+
+0.19:
+	* Several fixes for osm requests and map computations
+	* Display path in leaflet
+	* Reduce framerate if locked
+	* Stroke to move around in the map
+	* Fix for missing paths in display
diff --git a/apps/gipy/README.md b/apps/gipy/README.md
index 4ca98dea8..44a8b9bcd 100644
--- a/apps/gipy/README.md
+++ b/apps/gipy/README.md
@@ -16,6 +16,7 @@ This software is not perfect but surprisingly useful.
 It provides the following features :
 
 - display the path with current position from gps
+- display a local map around you, downloaded from openstreetmap
 - detects and buzzes if you leave the path
 - buzzes before sharp turns
 - buzzes before waypoints 
@@ -28,17 +29,14 @@ It provides the following features :
     - artwork
     - bakeries
 
-optionally it can also:
-
-- try to turn off gps between crossroads to save battery
-
 ## Usage
 
 ### Preparing the file
 
 You first need to have a trace file in *gpx* format.
 Usually I download from [komoot](https://www.komoot.com/) or I export
-from google maps using [mapstogpx](https://mapstogpx.com/).
+from google maps using [mapstogpx](https://mapstogpx.com/). [Brouter](https://brouter.damsy.net) is
+also a nice open source option.
 
 Note that *mapstogpx* has a super nice feature in its advanced settings.
 You can turn on 'next turn info' and be warned by the watch when you need to turn.
@@ -58,16 +56,16 @@ Once you have a signal you will reach the main screen:
 
 ![Screenshot](legend.png)
 
+The screen is oriented so that the top of the image is in front of you.
+It will rotate as you turn.
 On your screen you can see:
 
 - yourself (the big black dot)
-- the path (the top of the screen is in front of you)
-- on the path, current and next segments are red and other ones are black
+- the path (thick red line)
+- a green arrow telling you which way is forward
 - if needed a projection of yourself on the path (small black dot)
-- points as white dots
-- waypoints as doubled white dots
+- waypoints as large white dots
 - some text on the left (from top to bottom):
-    * time to reach start point at current average speed
     * current time
     * time to reach end point at current average speed
     * left distance till end of current segment
@@ -90,17 +88,18 @@ display the direction to follow as a black segment.
 Note that while lost, the app will slow down a lot since it will start scanning all possible points to figure out where you
 are. On path it just needed to scan a few points ahead and behind.
 
-![Lost](lost.png)
-
 The distance to next point displayed corresponds to the length of the black segment.
 
+### Menu
+
+If you click the button you'll reach a menu where you can currently zoom out to see more of the map
+(with a slower refresh rate) and reverse the path direction.
+
 ### Settings
 
 Few settings for now (feel free to suggest me more) :
 
-- keep gps alive : if turned off, will try to save battery by turning the gps off on long segments
-- max speed : used to compute how long to turn the gps off
-- display points : display/hide points (not waypoints)
+- lost distance : at which distance from path are you considered to be lost ?
 
 ### Caveats
 
@@ -109,8 +108,8 @@ It is good to use but you should know :
 - the gps might take a long time to start initially (see the assisted gps update app).
 - gps signal is noisy : there is therefore a small delay for instant speed. sometimes you may jump somewhere else.
 - your gpx trace has been decimated and approximated : the **REAL PATH** might be **A FEW METERS AWAY**
-- sometimes the watch will tell you that you are lost but you are in fact on the path.
-- battery saving by turning off gps is not very well tested (disabled by default).
+- sometimes the watch will tell you that you are lost but you are in fact on the path. It usually figures again
+the real gps position after a few minutes. It usually happens when the signal is acquired very fast.
 - buzzing does not always work: when there is a high load on the watch, the buzzes might just never happen :-(.
 - buzzes are not strong enough to be always easily noticed.
 - be careful when **GOING DOWNHILL AT VERY HIGH SPEED**. I already missed a few turning points and by the time I realized it,
diff --git a/apps/gipy/app.js b/apps/gipy/app.js
index c9d018cac..60e4bb5af 100644
--- a/apps/gipy/app.js
+++ b/apps/gipy/app.js
@@ -1,14 +1,26 @@
 let simulated = false;
-let file_version = 3;
-let code_key = 47490;
+let displaying = false;
+let in_menu = false;
+let go_backwards = false;
+let zoomed = true;
+let status;
+
+let interests_colors = [
+  0xffff, // Waypoints, white
+  0xf800, // Bakery, red
+  0x001f, // DrinkingWater, blue
+  0x07ff, // Toilets, cyan
+  0x07e0, // Artwork, green
+];
+
+let Y_OFFSET = 20;
+let s = require("Storage");
 
 var settings = Object.assign(
   {
-    keep_gps_alive: true,
-    max_speed: 35,
-    display_points: true,
+    lost_distance: 50,
   },
-  require("Storage").readJSON("gipy.json", true) || {}
+  s.readJSON("gipy.json", true) || {}
 );
 
 let profile_start_times = [];
@@ -29,23 +41,27 @@ function end_profiling(label) {
   console.log("profile:", label, "took", elapsed);
 }
 
-let interests_colors = [
-  0xf800, // Bakery, red
-  0x001f, // DrinkingWater, blue
-  0x07ff, // Toilets, cyan
-  0x07e0, // Artwork, green
-];
-
+// return the index of the largest element of the array which is <= x
 function binary_search(array, x) {
   let start = 0,
-    end = array.length - 1;
+    end = array.length;
 
-  while (start <= end) {
+  while (end - start >= 0) {
     let mid = Math.floor((start + end) / 2);
-    if (array[mid] < x) start = mid + 1;
-    else end = mid - 1;
+    if (array[mid] == x) {
+      return mid;
+    } else if (array[mid] < x) {
+      if (array[mid + 1] > x) {
+        return mid;
+      }
+      start = mid + 1;
+    } else end = mid - 1;
+  }
+  if (array[start] > x) {
+    return null;
+  } else {
+    return start;
   }
-  return start;
 }
 
 // return a string containing estimated time of arrival.
@@ -57,9 +73,9 @@ function compute_eta(hour, minutes, approximate_speed, remaining_distance) {
     return "";
   }
   let time_needed = (remaining_distance * 60) / approximate_speed; // in minutes
-  let eta_in_minutes = hour * 60 + minutes + time_needed;
-  let eta_minutes = Math.round(eta_in_minutes % 60);
-  let eta_hour = Math.round((eta_in_minutes - eta_minutes) / 60) % 24;
+  let eta_in_minutes = Math.round(hour * 60 + minutes + time_needed);
+  let eta_minutes = eta_in_minutes % 60;
+  let eta_hour = ((eta_in_minutes - eta_minutes) / 60) % 24;
   if (eta_minutes < 10) {
     return eta_hour.toString() + ":0" + eta_minutes;
   } else {
@@ -67,37 +83,573 @@ function compute_eta(hour, minutes, approximate_speed, remaining_distance) {
   }
 }
 
+class TilesOffsets {
+  constructor(buffer, offset) {
+    let type_size = Uint8Array(buffer, offset, 1)[0];
+    offset += 1;
+    this.entry_size = Uint8Array(buffer, offset, 1)[0];
+    offset += 1;
+    let non_empty_tiles_number = Uint16Array(buffer, offset, 1)[0];
+    offset += 2;
+    this.non_empty_tiles = Uint16Array(buffer, offset, non_empty_tiles_number);
+    offset += 2 * non_empty_tiles_number;
+    if (type_size == 24) {
+      this.non_empty_tiles_ends = Uint24Array(
+        buffer,
+        offset,
+        non_empty_tiles_number
+      );
+      offset += 3 * non_empty_tiles_number;
+    } else if (type_size == 16) {
+      this.non_empty_tiles_ends = Uint16Array(
+        buffer,
+        offset,
+        non_empty_tiles_number
+      );
+      offset += 2 * non_empty_tiles_number;
+    } else {
+      throw "unknown size";
+    }
+    return [this, offset];
+  }
+  tile_start_offset(tile_index) {
+    if (tile_index <= this.non_empty_tiles[0]) {
+      return 0;
+    } else {
+      return this.tile_end_offset(tile_index - 1);
+    }
+  }
+  tile_end_offset(tile_index) {
+    let me_or_before = binary_search(this.non_empty_tiles, tile_index);
+    if (me_or_before === null) {
+      return 0;
+    }
+    if (me_or_before >= this.non_empty_tiles_ends.length) {
+      return (
+        this.non_empty_tiles_ends[this.non_empty_tiles.length - 1] *
+        this.entry_size
+      );
+    } else {
+      return this.non_empty_tiles_ends[me_or_before] * this.entry_size;
+    }
+  }
+  end_offset() {
+    return (
+      this.non_empty_tiles_ends[this.non_empty_tiles_ends.length - 1] *
+      this.entry_size
+    );
+  }
+}
+
+class Map {
+  constructor(buffer, offset, filename) {
+    this.points_cache = []; // don't refetch points all the time
+    // header
+    let color_array = Uint8Array(buffer, offset, 3);
+    this.color = [
+      color_array[0] / 255,
+      color_array[1] / 255,
+      color_array[2] / 255,
+    ];
+    offset += 3;
+    this.first_tile = Uint32Array(buffer, offset, 2); // absolute tile id of first tile
+    offset += 2 * 4;
+    this.grid_size = Uint32Array(buffer, offset, 2); // tiles width and height
+    offset += 2 * 4;
+    this.start_coordinates = Float64Array(buffer, offset, 2); // min x and y coordinates
+    offset += 2 * 8;
+    let side_array = Float64Array(buffer, offset, 1); // side of a tile
+    this.side = side_array[0];
+    offset += 8;
+
+    // tiles offsets
+    let res = new TilesOffsets(buffer, offset);
+    this.tiles_offsets = res[0];
+    offset = res[1];
+
+    // now, do binary ways
+    // since the file is so big we'll go line by line
+    let binary_lines = [];
+    for (let y = 0; y < this.grid_size[1]; y++) {
+      let first_tile_start = this.tiles_offsets.tile_start_offset(
+        y * this.grid_size[0]
+      );
+      let last_tile_end = this.tiles_offsets.tile_start_offset(
+        (y + 1) * this.grid_size[0]
+      );
+      let size = last_tile_end - first_tile_start;
+      let string = s.read(filename, offset + first_tile_start, size);
+      let array = Uint8Array(E.toArrayBuffer(string));
+      binary_lines.push(array);
+    }
+    this.binary_lines = binary_lines;
+    offset += this.tiles_offsets.end_offset();
+
+    return [this, offset];
+
+    // now do streets data header
+    // let streets_header = E.toArrayBuffer(s.read(filename, offset, 8));
+    // let streets_header_offset = 0;
+    // let full_streets_size = Uint32Array(
+    //   streets_header,
+    //   streets_header_offset,
+    //   1
+    // )[0];
+    // streets_header_offset += 4;
+    // let blocks_number = Uint16Array(
+    //   streets_header,
+    //   streets_header_offset,
+    //   1
+    // )[0];
+    // streets_header_offset += 2;
+    // let labels_string_size = Uint16Array(
+    //   streets_header,
+    //   streets_header_offset,
+    //   1
+    // )[0];
+    // streets_header_offset += 2;
+    // offset += streets_header_offset;
+
+    // // continue with main streets labels
+    // main_streets_labels = s.read(filename, offset, labels_string_size);
+    // // this.main_streets_labels = main_streets_labels.split(/\r?\n/);
+    // this.main_streets_labels = main_streets_labels.split(/\n/);
+    // offset += labels_string_size;
+
+    // // continue with blocks start offsets
+    // this.blocks_offsets = Uint32Array(
+    //   E.toArrayBuffer(s.read(filename, offset, blocks_number * 4))
+    // );
+    // offset += blocks_number * 4;
+
+    // // continue with compressed street blocks
+    // let encoded_blocks_size =
+    //   full_streets_size - 4 - 2 - 2 - labels_string_size - blocks_number * 4;
+    // this.compressed_streets = Uint8Array(
+    //   E.toArrayBuffer(s.read(filename, offset, encoded_blocks_size))
+    // );
+    // offset += encoded_blocks_size;
+  }
+
+  display(
+    displayed_x,
+    displayed_y,
+    scale_factor,
+    cos_direction,
+    sin_direction
+  ) {
+    g.setColor(this.color[0], this.color[1], this.color[2]);
+    let local_x = displayed_x - this.start_coordinates[0];
+    let local_y = displayed_y - this.start_coordinates[1];
+    let tile_x = Math.floor(local_x / this.side);
+    let tile_y = Math.floor(local_y / this.side);
+
+    let limit = 1;
+    if (!zoomed) {
+      limit = 2;
+    }
+    for (let y = tile_y - limit; y <= tile_y + limit; y++) {
+      if (y < 0 || y >= this.grid_size[1]) {
+        continue;
+      }
+      for (let x = tile_x - limit; x <= tile_x + limit; x++) {
+        if (x < 0 || x >= this.grid_size[0]) {
+          continue;
+        }
+        if (
+          this.tile_is_on_screen(
+            x,
+            y,
+            local_x,
+            local_y,
+            scale_factor,
+            cos_direction,
+            sin_direction
+          )
+        ) {
+//           let colors = [
+//             [0, 0, 0],
+//             [0, 0, 1],
+//             [0, 1, 0],
+//             [0, 1, 1],
+//             [1, 0, 0],
+//             [1, 0, 1],
+//             [1, 1, 0],
+//             [1, 1, 0.5],
+//             [0.5, 0, 0.5],
+//             [0, 0.5, 0.5],
+//           ];
+          if (this.color[0] == 1 && this.color[1] == 0 && this.color[2] == 0) {
+            this.display_thick_tile(
+              x,
+              y,
+              local_x,
+              local_y,
+              scale_factor,
+              cos_direction,
+              sin_direction
+            );
+          } else {
+            this.display_tile(
+              x,
+              y,
+              local_x,
+              local_y,
+              scale_factor,
+              cos_direction,
+              sin_direction
+            );
+          }
+        }
+      }
+    }
+  }
+
+  tile_is_on_screen(
+    tile_x,
+    tile_y,
+    current_x,
+    current_y,
+    scale_factor,
+    cos_direction,
+    sin_direction
+  ) {
+    let width = g.getWidth();
+    let height = g.getHeight();
+    let center_x = width / 2;
+    let center_y = height / 2 + Y_OFFSET;
+    let side = this.side;
+    let tile_center_x = (tile_x + 0.5) * side;
+    let tile_center_y = (tile_y + 0.5) * side;
+    let scaled_center_x = (tile_center_x - current_x) * scale_factor;
+    let scaled_center_y = (tile_center_y - current_y) * scale_factor;
+    let rotated_center_x = scaled_center_x * cos_direction - scaled_center_y * sin_direction;
+    let rotated_center_y = scaled_center_x * sin_direction + scaled_center_y * cos_direction;
+    let on_screen_center_x = center_x - rotated_center_x;
+    let on_screen_center_y = center_y + rotated_center_y;
+
+    let scaled_side = side * scale_factor * Math.sqrt(1/2);
+
+    if (on_screen_center_x + scaled_side <= 0) {
+      return false;
+    }
+    if (on_screen_center_x - scaled_side >= width) {
+      return false;
+    }
+    if (on_screen_center_y + scaled_side <= 0) {
+      return false;
+    }
+    if (on_screen_center_y - scaled_side >= height) {
+      return false;
+    }
+    return true;
+  }
+
+  tile_points(tile_num, tile_x, tile_y, scaled_side) {
+    let line_start_offset = this.tiles_offsets.tile_start_offset(
+      tile_y * this.grid_size[0]
+    );
+    let offset =
+      this.tiles_offsets.tile_start_offset(tile_num) - line_start_offset;
+    let upper_limit =
+      this.tiles_offsets.tile_end_offset(tile_num) - line_start_offset;
+
+    let line = this.binary_lines[tile_y];
+    // we need to copy both for correct results and for performances
+    // let's precompute also.
+    let cached_tile = new Float64Array(upper_limit - offset);
+    for (let i = offset; i < upper_limit; i += 2) {
+      let x = (tile_x + line.buffer[i] / 255) * scaled_side;
+      let y = (tile_y + line.buffer[i + 1] / 255) * scaled_side;
+      cached_tile[i - offset] = x;
+      cached_tile[i + 1 - offset] = y;
+    }
+    return cached_tile;
+  }
+
+  invalidate_caches() {
+    this.points_cache = [];
+  }
+
+  fetch_points(tile_x, tile_y, scaled_side) {
+    let tile_num = tile_x + tile_y * this.grid_size[0];
+    for (let i = 0; i < this.points_cache.length; i++) {
+      if (this.points_cache[i][0] == tile_num) {
+        return this.points_cache[i][1];
+      }
+    }
+    if (this.points_cache.length > 40) {
+      this.points_cache.shift();
+    }
+    let points = this.tile_points(tile_num, tile_x, tile_y, scaled_side);
+    this.points_cache.push([tile_num, points]);
+    return points;
+  }
+
+  display_tile(
+    tile_x,
+    tile_y,
+    current_x,
+    current_y,
+    scale_factor,
+    cos_direction,
+    sin_direction
+  ) {
+      "jit";
+    let center_x = g.getWidth() / 2;
+    let center_y = g.getHeight() / 2 + Y_OFFSET;
+
+    let points = this.fetch_points(tile_x, tile_y, this.side * scale_factor);
+    let scaled_current_x = current_x * scale_factor;
+    let scaled_current_y = current_y * scale_factor;
+
+    for (let i = 0; i < points.length; i += 4) {
+      let scaled_x = points[i] - scaled_current_x;
+      let scaled_y = points[i + 1] - scaled_current_y;
+      let rotated_x = scaled_x * cos_direction - scaled_y * sin_direction;
+      let rotated_y = scaled_x * sin_direction + scaled_y * cos_direction;
+      let final_x = center_x - rotated_x;
+      let final_y = center_y + rotated_y;
+      scaled_x = points[i + 2] - scaled_current_x;
+      scaled_y = points[i + 3] - scaled_current_y;
+      rotated_x = scaled_x * cos_direction - scaled_y * sin_direction;
+      rotated_y = scaled_x * sin_direction + scaled_y * cos_direction;
+      let new_final_x = center_x - rotated_x;
+      let new_final_y = center_y + rotated_y;
+      g.drawLine(final_x, final_y, new_final_x, new_final_y);
+    }
+  }
+
+  display_thick_tile(
+    tile_x,
+    tile_y,
+    current_x,
+    current_y,
+    scale_factor,
+    cos_direction,
+    sin_direction
+  ) {
+    let center_x = g.getWidth() / 2;
+    let center_y = g.getHeight() / 2 + Y_OFFSET;
+
+    let points = this.fetch_points(tile_x, tile_y, this.side * scale_factor);
+    let scaled_current_x = current_x * scale_factor;
+    let scaled_current_y = current_y * scale_factor;
+
+    for (let i = 0; i < points.length; i += 4) {
+      let scaled_x = points[i] - scaled_current_x;
+      let scaled_y = points[i + 1] - scaled_current_y;
+      let rotated_x = scaled_x * cos_direction - scaled_y * sin_direction;
+      let rotated_y = scaled_x * sin_direction + scaled_y * cos_direction;
+      let final_x = center_x - rotated_x;
+      let final_y = center_y + rotated_y;
+      scaled_x = points[i + 2] - scaled_current_x;
+      scaled_y = points[i + 3] - scaled_current_y;
+      rotated_x = scaled_x * cos_direction - scaled_y * sin_direction;
+      rotated_y = scaled_x * sin_direction + scaled_y * cos_direction;
+      let new_final_x = center_x - rotated_x;
+      let new_final_y = center_y + rotated_y;
+
+      let xdiff = new_final_x - final_x;
+      let ydiff = new_final_y - final_y;
+      let d = Math.sqrt(xdiff * xdiff + ydiff * ydiff);
+      let ox = (-ydiff / d) * 3;
+      let oy = (xdiff / d) * 3;
+      g.fillPoly([
+        final_x + ox,
+        final_y + oy,
+        new_final_x + ox,
+        new_final_y + oy,
+        new_final_x - ox,
+        new_final_y - oy,
+        final_x - ox,
+        final_y - oy,
+      ]);
+    }
+  }
+}
+
+class Interests {
+  constructor(buffer, offset) {
+    this.first_tile = Uint32Array(buffer, offset, 2); // absolute tile id of first tile
+    offset += 2 * 4;
+    this.grid_size = Uint32Array(buffer, offset, 2); // tiles width and height
+    offset += 2 * 4;
+    this.start_coordinates = Float64Array(buffer, offset, 2); // min x and y coordinates
+    offset += 2 * 8;
+    let side_array = Float64Array(buffer, offset, 1); // side of a tile
+    this.side = side_array[0];
+    offset += 8;
+
+    let res = new TilesOffsets(buffer, offset);
+    offset = res[1];
+    this.offsets = res[0];
+    let end = this.offsets.end_offset();
+    this.binary_interests = new Uint8Array(end);
+    let binary_interests = Uint8Array(buffer, offset, end);
+    for (let i = 0; i < end; i++) {
+      this.binary_interests[i] = binary_interests[i];
+    }
+    offset += end;
+    this.points_cache = [];
+    return [this, offset];
+  }
+
+  display(
+    displayed_x,
+    displayed_y,
+    scale_factor,
+    cos_direction,
+    sin_direction
+  ) {
+    let local_x = displayed_x - this.start_coordinates[0];
+    let local_y = displayed_y - this.start_coordinates[1];
+    let tile_x = Math.floor(local_x / this.side);
+    let tile_y = Math.floor(local_y / this.side);
+    for (let y = tile_y - 1; y <= tile_y + 1; y++) {
+      if (y < 0 || y >= this.grid_size[1]) {
+        continue;
+      }
+      for (let x = tile_x - 1; x <= tile_x + 1; x++) {
+        if (x < 0 || x >= this.grid_size[0]) {
+          continue;
+        }
+        this.display_tile(
+          x,
+          y,
+          local_x,
+          local_y,
+          scale_factor,
+          cos_direction,
+          sin_direction
+        );
+      }
+    }
+  }
+
+  tile_points(tile_num, tile_x, tile_y, scaled_side) {
+    let offset = this.offsets.tile_start_offset(tile_num);
+    let upper_limit = this.offsets.tile_end_offset(tile_num);
+
+    let tile_interests = [];
+    for (let i = offset; i < upper_limit; i += 3) {
+      let interest = this.binary_interests[i];
+      let x = (tile_x + this.binary_interests[i + 1] / 255) * scaled_side;
+      let y = (tile_y + this.binary_interests[i + 2] / 255) * scaled_side;
+      if (interest >= interests_colors.length) {
+        throw "bad interest" + interest + "at" + tile_num + "offset" + i;
+      }
+      tile_interests.push(interest);
+      tile_interests.push(x);
+      tile_interests.push(y);
+    }
+    return tile_interests;
+  }
+  fetch_points(tile_x, tile_y, scaled_side) {
+    //TODO: factorize with map ?
+    let tile_num = tile_x + tile_y * this.grid_size[0];
+    for (let i = 0; i < this.points_cache.length; i++) {
+      if (this.points_cache[i][0] == tile_num) {
+        return this.points_cache[i][1];
+      }
+    }
+    if (this.points_cache.length > 40) {
+      this.points_cache.shift();
+    }
+    let points = this.tile_points(tile_num, tile_x, tile_y, scaled_side);
+    this.points_cache.push([tile_num, points]);
+    return points;
+  }
+  invalidate_caches() {
+    this.points_cache = [];
+  }
+  display_tile(
+    tile_x,
+    tile_y,
+    displayed_x,
+    displayed_y,
+    scale_factor,
+    cos_direction,
+    sin_direction
+  ) {
+    let width = g.getWidth();
+    let half_width = width / 2;
+    let half_height = g.getHeight() / 2 + Y_OFFSET;
+    let interests = this.fetch_points(tile_x, tile_y, this.side * scale_factor);
+
+    let scaled_current_x = displayed_x * scale_factor;
+    let scaled_current_y = displayed_y * scale_factor;
+
+    for (let i = 0; i < interests.length; i += 3) {
+      let type = interests[i];
+      let x = interests[i + 1];
+      let y = interests[i + 2];
+
+      let scaled_x = x - scaled_current_x;
+      let scaled_y = y - scaled_current_y;
+      let rotated_x = scaled_x * cos_direction - scaled_y * sin_direction;
+      let rotated_y = scaled_x * sin_direction + scaled_y * cos_direction;
+      let final_x = half_width - rotated_x;
+      let final_y = half_height + rotated_y;
+
+      let color = interests_colors[type];
+      if (type == 0) {
+        g.setColor(0, 0, 0).fillCircle(final_x, final_y, 6);
+      }
+      g.setColor(color).fillCircle(final_x, final_y, 5);
+    }
+  }
+}
+
 class Status {
-  constructor(path) {
+  constructor(path, maps, interests) {
     this.path = path;
-    this.scale_factor = 40000.0; // multiply geo coordinates by this to get pixels coordinates
-    this.on_path = false; // are we on the path or lost ?
+    this.maps = maps;
+    this.interests = interests;
+    let half_screen_width = g.getWidth() / 2;
+    let half_screen_height = g.getHeight() / 2;
+    let half_screen_diagonal = Math.sqrt(
+      half_screen_width * half_screen_width +
+        half_screen_height * half_screen_height
+    );
+    this.scale_factor = half_screen_diagonal / maps[0].side; // multiply geo coordinates by this to get pixels coordinates
+    this.on_path = true; // are we on the path or lost ?
     this.position = null; // where we are
-    this.adjusted_cos_direction = null; // cos of where we look at
-    this.adjusted_sin_direction = null; // sin of where we look at
+    this.adjusted_cos_direction = 1; // cos of where we look at
+    this.adjusted_sin_direction = 0; // sin of where we look at
     this.current_segment = null; // which segment is closest
     this.reaching = null; // which waypoint are we reaching ?
     this.distance_to_next_point = null; // how far are we from next point ?
     this.projected_point = null;
 
-    let r = [0];
-    // let's do a reversed prefix computations on all distances:
-    // loop on all segments in reversed order
-    let previous_point = null;
-    for (let i = this.path.len - 1; i >= 0; i--) {
-      let point = this.path.point(i);
-      if (previous_point !== null) {
-        r.unshift(r[0] + point.distance(previous_point));
+    if (this.path !== null) {
+      let r = [0];
+      // let's do a reversed prefix computations on all distances:
+      // loop on all segments in reversed order
+      let previous_point = null;
+      for (let i = this.path.len - 1; i >= 0; i--) {
+        let point = this.path.point(i);
+        if (previous_point !== null) {
+          r.unshift(r[0] + point.distance(previous_point));
+        }
+        previous_point = point;
       }
-      previous_point = point;
+      this.remaining_distances = r; // how much distance remains at start of each segment
     }
-    this.remaining_distances = r; // how much distance remains at start of each segment
     this.starting_time = null; // time we start
     this.advanced_distance = 0.0;
     this.gps_coordinates_counter = 0; // how many coordinates did we receive
     this.old_points = []; // record previous points but only when enough distance between them
     this.old_times = []; // the corresponding times
   }
+  invalidate_caches() {
+    for (let i = 0; i < this.maps.length; i++) {
+      this.maps[i].invalidate_caches();
+    }
+    if (this.interests !== null) {
+      this.interests.invalidate_caches();
+    }
+  }
   new_position_reached(position) {
     // we try to figure out direction by looking at previous points
     // instead of the gps course which is not very nice.
@@ -112,8 +664,8 @@ class Status {
     } else {
       let previous_point = this.old_points[this.old_points.length - 1];
       let distance_to_previous = previous_point.distance(position);
-      // gps signal is noisy but rarely above 4 meters
-      if (distance_to_previous < 4) {
+      // gps signal is noisy but rarely above 5 meters
+      if (distance_to_previous < 5) {
         return null;
       }
     }
@@ -147,7 +699,7 @@ class Status {
     let angle = Math.atan2(diff.lat, diff.lon);
     return angle;
   }
-  update_position(new_position, maybe_direction) {
+  update_position(new_position, maybe_direction, timestamp) {
     let direction = this.new_position_reached(new_position);
     if (direction === null) {
       if (maybe_direction === null) {
@@ -156,173 +708,287 @@ class Status {
         direction = maybe_direction;
       }
     }
+    if (in_menu) {
+      return;
+    }
 
     this.adjusted_cos_direction = Math.cos(-direction - Math.PI / 2.0);
     this.adjusted_sin_direction = Math.sin(-direction - Math.PI / 2.0);
-    cos_direction = Math.cos(direction);
-    sin_direction = Math.sin(direction);
+    this.angle = direction;
+    let cos_direction = Math.cos(direction);
+    let sin_direction = Math.sin(direction);
     this.position = new_position;
 
-    // detect segment we are on now
-    let res = this.path.nearest_segment(
-      this.position,
-      Math.max(0, this.current_segment - 1),
-      Math.min(this.current_segment + 2, this.path.len - 1),
-      cos_direction,
-      sin_direction
+    // we will display position of where we'll be at in a few seconds
+    // and not where we currently are.
+    // this is because the display has more than 1sec duration.
+    this.displayed_position = new Point(
+      new_position.lon + cos_direction * this.instant_speed * 0.00001,
+      new_position.lat + sin_direction * this.instant_speed * 0.00001
     );
-    let orientation = res[0];
-    let next_segment = res[1];
 
-    if (this.is_lost(next_segment)) {
-      // start_profiling();
-      // it did not work, try anywhere
-      res = this.path.nearest_segment(
-        this.position,
-        0,
-        this.path.len - 1,
+    // abort if we are late
+    // if (timestamp !== null) {
+    //   let elapsed = Date.now() - timestamp;
+    //   if (elapsed > 1000) {
+    //     console.log("we are late");
+    //     return;
+    //   }
+    //     console.log("we are not late");
+    // }
+
+    if (this.path !== null) {
+      // detect segment we are on now
+      let res = this.path.nearest_segment(
+        this.displayed_position,
+        Math.max(0, this.current_segment - 1),
+        Math.min(this.current_segment + 2, this.path.len - 1),
         cos_direction,
         sin_direction
       );
-      orientation = res[0];
-      next_segment = res[1];
-      // end_profiling("repositioning");
-    }
-    // now check if we strayed away from path or back to it
-    let lost = this.is_lost(next_segment);
-    if (this.on_path == lost) {
-      // if status changes
-      if (lost) {
-        Bangle.buzz(); // we lost path
-        setTimeout(() => Bangle.buzz(), 500);
-        setTimeout(() => Bangle.buzz(), 1000);
-        setTimeout(() => Bangle.buzz(), 1500);
+      let orientation = res[0];
+      let next_segment = res[1];
+
+      if (this.is_lost(next_segment)) {
+        // start_profiling();
+        // it did not work, try anywhere
+        res = this.path.nearest_segment(
+          this.displayed_position,
+          0,
+          this.path.len - 1,
+          cos_direction,
+          sin_direction
+        );
+        orientation = res[0];
+        next_segment = res[1];
+        // end_profiling("repositioning");
       }
-      this.on_path = !lost;
-    }
-
-    this.current_segment = next_segment;
-
-    // check if we are nearing the next point on our path and alert the user
-    let next_point = this.current_segment + (1 - orientation);
-    this.distance_to_next_point = Math.ceil(
-      this.position.distance(this.path.point(next_point))
-    );
-
-    // disable gps when far from next point and locked
-    if (Bangle.isLocked() && !settings.keep_gps_alive) {
-      let time_to_next_point =
-        (this.distance_to_next_point * 3.6) / settings.max_speed;
-      if (time_to_next_point > 60) {
-        Bangle.setGPSPower(false, "gipy");
-        setTimeout(function () {
-          Bangle.setGPSPower(true, "gipy");
-        }, time_to_next_point);
+      // now check if we strayed away from path or back to it
+      let lost = this.is_lost(next_segment);
+      if (this.on_path == lost) {
+        // if status changes
+        if (lost) {
+          Bangle.buzz(); // we lost path
+          setTimeout(() => Bangle.buzz(), 500);
+          setTimeout(() => Bangle.buzz(), 1000);
+          setTimeout(() => Bangle.buzz(), 1500);
+        }
+        this.on_path = !lost;
       }
-    }
-    if (this.reaching != next_point && this.distance_to_next_point <= 100) {
-      this.reaching = next_point;
-      let reaching_waypoint = this.path.is_waypoint(next_point);
-      if (reaching_waypoint) {
-        Bangle.buzz();
-        setTimeout(() => Bangle.buzz(), 500);
-        setTimeout(() => Bangle.buzz(), 1000);
-        setTimeout(() => Bangle.buzz(), 1500);
-        if (Bangle.isLocked()) {
-          Bangle.setLocked(false);
+
+      this.current_segment = next_segment;
+
+      // check if we are nearing the next point on our path and alert the user
+      let next_point = this.current_segment + (1 - orientation);
+      this.distance_to_next_point = Math.ceil(
+        this.position.distance(this.path.point(next_point))
+      );
+
+      // disable gps when far from next point and locked
+      // if (Bangle.isLocked() && !settings.keep_gps_alive) {
+      //   let time_to_next_point =
+      //     (this.distance_to_next_point * 3.6) / settings.max_speed;
+      //   if (time_to_next_point > 60) {
+      //     Bangle.setGPSPower(false, "gipy");
+      //     setTimeout(function () {
+      //       Bangle.setGPSPower(true, "gipy");
+      //     }, time_to_next_point);
+      //   }
+      // }
+      if (this.reaching != next_point && this.distance_to_next_point <= 100) {
+        this.reaching = next_point;
+        let reaching_waypoint = this.path.is_waypoint(next_point);
+        if (reaching_waypoint) {
+          Bangle.buzz();
+          setTimeout(() => Bangle.buzz(), 500);
+          setTimeout(() => Bangle.buzz(), 1000);
+          setTimeout(() => Bangle.buzz(), 1500);
+          if (Bangle.isLocked()) {
+            Bangle.setLocked(false);
+          }
         }
       }
     }
+
+    // abort most frames if locked
+    if (Bangle.isLocked() && this.gps_coordinates_counter % 5 != 0) {
+      return;
+    }
+
     // re-display
-    this.display(orientation);
+    this.display();
   }
-  remaining_distance(orientation) {
+  display_direction() {
+    //TODO: go towards point on path at 20 meter
+    if (this.current_segment === null) {
+      return;
+    }
+    let next_point = this.path.point(this.current_segment + (1 - go_backwards));
+
+    let distance_to_next_point = Math.ceil(
+      this.projected_point.distance(next_point)
+    );
+    let towards;
+    if (distance_to_next_point < 20) {
+      towards = this.path.point(this.current_segment + 2 * (1 - go_backwards));
+    } else {
+      towards = next_point;
+    }
+    let diff = towards.minus(this.projected_point);
+    direction = Math.atan2(diff.lat, diff.lon);
+
+    let full_angle = direction - this.angle;
+    // let c = towards.coordinates(p, this.adjusted_cos_direction, this.adjusted_sin_direction, this.scale_factor);
+    // g.setColor(1,0,1).fillCircle(c[0], c[1], 5);
+
+    let scale;
+    if (zoomed) {
+      scale = this.scale_factor;
+    } else {
+      scale = this.scale_factor / 2;
+    }
+
+    c = this.projected_point.coordinates(
+      this.displayed_position,
+      this.adjusted_cos_direction,
+      this.adjusted_sin_direction,
+      scale
+    );
+
+    let cos1 = Math.cos(full_angle + 0.6 + Math.PI / 2);
+    let cos2 = Math.cos(full_angle + Math.PI / 2);
+    let cos3 = Math.cos(full_angle - 0.6 + Math.PI / 2);
+    let sin1 = Math.sin(-full_angle - 0.6 - Math.PI / 2);
+    let sin2 = Math.sin(-full_angle - Math.PI / 2);
+    let sin3 = Math.sin(-full_angle + 0.6 - Math.PI / 2);
+    g.setColor(0, 1, 0).fillPoly([
+      c[0] + cos1 * 15,
+      c[1] + sin1 * 15,
+      c[0] + cos2 * 20,
+      c[1] + sin2 * 20,
+      c[0] + cos3 * 15,
+      c[1] + sin3 * 15,
+      c[0] + cos3 * 10,
+      c[1] + sin3 * 10,
+      c[0] + cos2 * 15,
+      c[1] + sin2 * 15,
+      c[0] + cos1 * 10,
+      c[1] + sin1 * 10,
+    ]);
+  }
+  remaining_distance() {
     let remaining_in_correct_orientation =
       this.remaining_distances[this.current_segment + 1] +
       this.position.distance(this.path.point(this.current_segment + 1));
 
-    if (orientation == 0) {
-      return remaining_in_correct_orientation;
-    } else {
+    if (go_backwards) {
       return this.remaining_distances[0] - remaining_in_correct_orientation;
+    } else {
+      return remaining_in_correct_orientation;
     }
   }
   // check if we are lost (too far from segment we think we are on)
   // if we are adjust scale so that path will still be displayed.
   // we do the scale adjustment here to avoid recomputations later on.
   is_lost(segment) {
-    let projection = this.position.closest_segment_point(
+    let projection = this.displayed_position.closest_segment_point(
       this.path.point(segment),
       this.path.point(segment + 1)
     );
     this.projected_point = projection; // save this info for display
-    let distance_to_projection = this.position.distance(projection);
-    if (distance_to_projection > 50) {
-      this.scale_factor =
-        Math.min(88.0 / distance_to_projection, 1.0) * 40000.0;
+    let distance_to_projection = this.displayed_position.distance(projection);
+    if (distance_to_projection > settings.lost_distance) {
       return true;
     } else {
-      this.scale_factor = 40000.0;
       return false;
     }
   }
-  display(orientation) {
-    g.clear();
-    // start_profiling();
-    this.display_map();
-    // end_profiling("display_map");
-
-    this.display_interest_points();
-    this.display_stats(orientation);
-    Bangle.drawWidgets();
-  }
-  display_interest_points() {
-    // this is the algorithm in case we have a lot of interest points
-    // let's draw all points for 5 segments centered on current one
-    let starting_group = Math.floor(Math.max(this.current_segment - 2, 0) / 3);
-    let ending_group = Math.floor(
-      Math.min(this.current_segment + 2, this.path.len - 2) / 3
-    );
-    let starting_bucket = binary_search(
-      this.path.interests_starts,
-      starting_group
-    );
-    let ending_bucket = binary_search(
-      this.path.interests_starts,
-      ending_group + 0.5
-    );
-    // we have 5 points per bucket
-    let end_index = Math.min(
-      this.path.interests_types.length - 1,
-      ending_bucket * 5
-    );
-    for (let i = starting_bucket * 5; i <= end_index; i++) {
-      let index = this.path.interests_on_path[i];
-      let interest_point = this.path.interest_point(index);
-      let color = this.path.interest_color(i);
-      let c = interest_point.coordinates(
-        this.position,
-        this.adjusted_cos_direction,
-        this.adjusted_sin_direction,
-        this.scale_factor
-      );
-      g.setColor(color).fillCircle(c[0], c[1], 5);
+  display() {
+    if (displaying || in_menu) {
+      return; // don't draw on drawings
     }
+    displaying = true;
+    g.clear();
+    let scale_factor = this.scale_factor;
+    if (!zoomed) {
+      scale_factor /= 2;
+    }
+
+    // start_profiling();
+    for (let i = 0; i < this.maps.length; i++) {
+      this.maps[i].display(
+        this.displayed_position.lon,
+        this.displayed_position.lat,
+        scale_factor,
+        this.adjusted_cos_direction,
+        this.adjusted_sin_direction
+      );
+    }
+    // end_profiling("map");
+    if (this.interests !== null) {
+      this.interests.display(
+        this.displayed_position.lon,
+        this.displayed_position.lat,
+        scale_factor,
+        this.adjusted_cos_direction,
+        this.adjusted_sin_direction
+      );
+    }
+    if (this.position !== null) {
+      this.display_path();
+    }
+
+    this.display_direction();
+    this.display_stats();
+    Bangle.drawWidgets();
+    displaying = false;
   }
-  display_stats(orientation) {
-    let remaining_forward_distance = this.remaining_distance(0);
-    let remaining_backward_distance = this.remaining_distance(1);
-    let rounded_forward_distance =
-      Math.round(remaining_forward_distance / 100) / 10;
-    let total = Math.round(this.remaining_distances[0] / 100) / 10;
+  display_stats() {
     let now = new Date();
     let minutes = now.getMinutes().toString();
     if (minutes.length < 2) {
       minutes = "0" + minutes;
     }
     let hours = now.getHours().toString();
+
+    // display the clock
+    g.setFont("6x8:2")
+      .setFontAlign(-1, -1, 0)
+      .setColor(g.theme.fg)
+      .drawString(hours + ":" + minutes, 0, 24);
+
+    let approximate_speed;
+    // display speed (avg and instant)
+    if (this.old_times.length > 0) {
+      let point_time = this.old_times[this.old_times.length - 1];
+      let done_in = point_time - this.starting_time;
+      approximate_speed = Math.round(
+        (this.advanced_distance * 3.6) / done_in
+      );
+      let approximate_instant_speed = Math.round(this.instant_speed * 3.6);
+      g.setFont("6x8:2")
+        .setFontAlign(-1, -1, 0)
+        .drawString(
+          "" +
+            approximate_speed +
+            "km/h (in." +
+            approximate_instant_speed +
+            ")",
+          0,
+          g.getHeight() - 15
+        );
+    }
+
+    if (this.path === null || this.position === null) {
+      return;
+    }
+
+    let remaining_distance = this.remaining_distance();
+    let rounded_distance = Math.round(remaining_distance / 100) / 10;
+    let total = Math.round(this.remaining_distances[0] / 100) / 10;
     // now, distance to next point in meters
     g.setFont("6x8:2")
+      .setFontAlign(-1, -1, 0)
       .setColor(g.theme.fg)
       .drawString(
         "" + this.distance_to_next_point + "m",
@@ -330,55 +996,22 @@ class Status {
         g.getHeight() - 49
       );
 
-    let point_time = this.old_times[this.old_times.length - 1];
-    let done_in = point_time - this.starting_time;
-    let approximate_speed = Math.round(
-      (this.advanced_distance * 3.6) / done_in
-    );
-
     let forward_eta = compute_eta(
       now.getHours(),
       now.getMinutes(),
       approximate_speed,
-      remaining_forward_distance / 1000
+      remaining_distance / 1000
     );
 
-    let backward_eta = compute_eta(
-      now.getHours(),
-      now.getMinutes(),
-      approximate_speed,
-      remaining_backward_distance / 1000
-    );
-
-    // display backward ETA
-    g.setFont("6x8:2")
-      .setFontAlign(-1, -1, 0)
-      .setColor(g.theme.fg)
-      .drawString(backward_eta, 0, 30);
-    // display the clock
-    g.setFont("6x8:2")
-      .setFontAlign(-1, -1, 0)
-      .setColor(g.theme.fg)
-      .drawString(hours + ":" + minutes, 0, 48);
     // now display ETA
     g.setFont("6x8:2")
       .setFontAlign(-1, -1, 0)
       .setColor(g.theme.fg)
-      .drawString(forward_eta, 0, 66);
-
-    // display speed (avg and instant)
-    let approximate_instant_speed = Math.round(this.instant_speed * 3.6);
-    g.setFont("6x8:2")
-      .setFontAlign(-1, -1, 0)
-      .drawString(
-        "" + approximate_speed + "km/h (in." + approximate_instant_speed + ")",
-        0,
-        g.getHeight() - 15
-      );
+      .drawString(forward_eta, 0, 42);
 
     // display distance on path
     g.setFont("6x8:2").drawString(
-      "" + rounded_forward_distance + "/" + total,
+      "" + rounded_distance + "/" + total,
       0,
       g.getHeight() - 32
     );
@@ -397,183 +1030,139 @@ class Status {
         .drawString("lost", g.getWidth() - 55, 35);
     }
   }
-  display_map() {
+  display_path() {
     // don't display all segments, only those neighbouring current segment
     // this is most likely to be the correct display
     // while lowering the cost a lot
     //
-    // note that all code is inlined here to speed things up from 400ms to 200ms
-    let start = Math.max(this.current_segment - 4, 0);
-    let end = Math.min(this.current_segment + 6, this.path.len);
-    let pos = this.position;
+    // note that all code is inlined here to speed things up
     let cos = this.adjusted_cos_direction;
     let sin = this.adjusted_sin_direction;
-    let points = this.path.points;
-    let cx = pos.lon;
-    let cy = pos.lat;
-    let half_width = g.getWidth() / 2;
-    let half_height = g.getHeight() / 2;
-    let previous_x = null;
-    let previous_y = null;
+    let displayed_x = this.displayed_position.lon;
+    let displayed_y = this.displayed_position.lat;
+    let width = g.getWidth();
+    let height = g.getHeight();
+    let half_width = width / 2;
+    let half_height = height / 2 + Y_OFFSET;
     let scale_factor = this.scale_factor;
+    if (!zoomed) {
+      scale_factor /= 2;
+    }
 
-    // display direction to next point if lost
-    if (!this.on_path) {
-      let next_point = this.path.point(this.current_segment + 1);
-      let previous_point = this.path.point(this.current_segment);
-      let nearest_point;
-      if (
-        previous_point.fake_distance(this.position) <
-        next_point.fake_distance(this.position)
-      ) {
-        nearest_point = previous_point;
-      } else {
-        nearest_point = next_point;
-      }
-      let tx = (nearest_point.lon - cx) * scale_factor;
-      let ty = (nearest_point.lat - cy) * scale_factor;
+    if (this.path !== null) {
+      // compute coordinate for projection on path
+      let tx = (this.projected_point.lon - displayed_x) * scale_factor;
+      let ty = (this.projected_point.lat - displayed_y) * scale_factor;
       let rotated_x = tx * cos - ty * sin;
       let rotated_y = tx * sin + ty * cos;
-      let x = half_width - Math.round(rotated_x); // x is inverted
-      let y = half_height + Math.round(rotated_y);
-      g.setColor(g.theme.fgH).drawLine(half_width, half_height, x, y);
-    }
+      let projected_x = half_width - Math.round(rotated_x); // x is inverted
+      let projected_y = half_height + Math.round(rotated_y);
 
-    // now display path
-    for (let i = start; i < end; i++) {
-      let tx = (points[2 * i] - cx) * scale_factor;
-      let ty = (points[2 * i + 1] - cy) * scale_factor;
-      let rotated_x = tx * cos - ty * sin;
-      let rotated_y = tx * sin + ty * cos;
-      let x = half_width - Math.round(rotated_x); // x is inverted
-      let y = half_height + Math.round(rotated_y);
-      if (previous_x !== null) {
-        let segment_color = g.theme.fg;
-        if (i == this.current_segment + 1 || i == this.current_segment + 2) {
-          segment_color = 0xf800;
-        }
-        g.setColor(segment_color);
-        g.drawLine(previous_x, previous_y, x, y);
-
-        if (this.path.is_waypoint(i - 1)) {
-          g.setColor(g.theme.fg);
-          g.fillCircle(previous_x, previous_y, 6);
-          g.setColor(g.theme.bg);
-          g.fillCircle(previous_x, previous_y, 5);
-        }
-        if (settings.display_points) {
-          g.setColor(g.theme.fg);
-          g.fillCircle(previous_x, previous_y, 4);
-          g.setColor(g.theme.bg);
-          g.fillCircle(previous_x, previous_y, 3);
+      // display direction to next point if lost
+      if (!this.on_path) {
+        let next_point = this.path.point(this.current_segment + 1);
+        let previous_point = this.path.point(this.current_segment);
+        let nearest_point;
+        if (
+          previous_point.fake_distance(this.position) <
+          next_point.fake_distance(this.position)
+        ) {
+          nearest_point = previous_point;
+        } else {
+          nearest_point = next_point;
         }
+        let tx = (nearest_point.lon - displayed_x) * scale_factor;
+        let ty = (nearest_point.lat - displayed_y) * scale_factor;
+        let rotated_x = tx * cos - ty * sin;
+        let rotated_y = tx * sin + ty * cos;
+        let x = half_width - Math.round(rotated_x); // x is inverted
+        let y = half_height + Math.round(rotated_y);
+        g.setColor(g.theme.fgH).drawLine(half_width, half_height, x, y);
       }
 
-      previous_x = x;
-      previous_y = y;
+      // display current-segment's projection
+      g.setColor(0, 0, 0);
+      g.fillCircle(projected_x, projected_y, 4);
     }
 
-    if (this.path.is_waypoint(end - 1)) {
-      g.setColor(g.theme.fg);
-      g.fillCircle(previous_x, previous_y, 6);
-      g.setColor(g.theme.bg);
-      g.fillCircle(previous_x, previous_y, 5);
-    }
-    g.setColor(g.theme.fg);
-    g.fillCircle(previous_x, previous_y, 4);
-    g.setColor(g.theme.bg);
-    g.fillCircle(previous_x, previous_y, 3);
-
     // now display ourselves
-    g.setColor(g.theme.fgH);
+    g.setColor(0, 0, 0);
     g.fillCircle(half_width, half_height, 5);
-
-    // display current-segment's projection
-    let tx = (this.projected_point.lon - cx) * scale_factor;
-    let ty = (this.projected_point.lat - cy) * scale_factor;
-    let rotated_x = tx * cos - ty * sin;
-    let rotated_y = tx * sin + ty * cos;
-    let x = half_width - Math.round(rotated_x); // x is inverted
-    let y = half_height + Math.round(rotated_y);
-    g.setColor(g.theme.fgH);
-    g.fillCircle(x, y, 4);
   }
 }
 
-function load_gpc(filename) {
-  let buffer = require("Storage").readArrayBuffer(filename);
+function load_gps(filename) {
+  // let's display splash screen while loading file
+  g.clear();
+  g.drawImage(splashscreen, 0, 0);
+  g.setFont("6x8:2")
+    .setFontAlign(-1, -1, 0)
+    .setColor(0xf800)
+    .drawString(filename, 0, g.getHeight() - 30);
+  g.flip();
+
+  let buffer = s.readArrayBuffer(filename);
   let file_size = buffer.length;
   let offset = 0;
 
-  // header
-  let header = Uint16Array(buffer, offset, 5);
-  offset += 5 * 2;
-  let key = header[0];
-  let version = header[1];
-  let points_number = header[2];
-  if (key != code_key || version > file_version) {
-    E.showMessage("Invalid gpc file");
-    load();
+  let path = null;
+  let maps = [];
+  let interests = null;
+  while (offset < file_size) {
+    let block_type = Uint8Array(buffer, offset, 1)[0];
+    offset += 1;
+    if (block_type == 0) {
+      // it's a map
+      console.log("loading map");
+      let res = new Map(buffer, offset, filename);
+      let map = res[0];
+      offset = res[1];
+      maps.push(map);
+    } else if (block_type == 2) {
+      console.log("loading path");
+      let res = new Path(buffer, offset);
+      path = res[0];
+      offset = res[1];
+    } else if (block_type == 3) {
+      console.log("loading interests");
+      let res = new Interests(buffer, offset);
+      interests = res[0];
+      offset = res[1];
+    } else {
+      console.log("todo : block type", block_type);
+    }
   }
 
-  // path points
-  let points = Float64Array(buffer, offset, points_number * 2);
-  offset += 8 * points_number * 2;
-
-  // path waypoints
-  let waypoints_len = Math.ceil(points_number / 8.0);
-  let waypoints = Uint8Array(buffer, offset, waypoints_len);
-  offset += waypoints_len;
-
-  // interest points
-  let interests_number = header[3];
-  let interests_coordinates = Float64Array(
-    buffer,
-    offset,
-    interests_number * 2
-  );
-  offset += 8 * interests_number * 2;
-  let interests_types = Uint8Array(buffer, offset, interests_number);
-  offset += interests_number;
-
-  // interests on path
-  let interests_on_path_number = header[4];
-  let interests_on_path = Uint16Array(buffer, offset, interests_on_path_number);
-  offset += 2 * interests_on_path_number;
-  let starts_length = Math.ceil(interests_on_path_number / 5.0);
-  let interests_starts = Uint16Array(buffer, offset, starts_length);
-  offset += 2 * starts_length;
-
-  let path_data = [
-    points,
-    waypoints,
-    interests_coordinates,
-    interests_types,
-    interests_on_path,
-    interests_starts,
-  ];
-
   // checksum file size
   if (offset != file_size) {
     console.log("invalid file size", file_size, "expected", offset);
     let msg = "invalid file\nsize " + file_size + "\ninstead of" + offset;
     E.showAlert(msg).then(function () {
       E.showAlert();
-      start_gipy(filename, path_data);
+      start_gipy(path, maps, interests);
     });
   } else {
-    start_gipy(filename, path_data);
+    start_gipy(path, maps, interests);
   }
 }
 
 class Path {
-  constructor(arrays) {
-    this.points = arrays[0];
-    this.waypoints = arrays[1];
-    this.interests_coordinates = arrays[2];
-    this.interests_types = arrays[3];
-    this.interests_on_path = arrays[4];
-    this.interests_starts = arrays[5];
+  constructor(buffer, offset) {
+    // let p = Uint16Array(buffer, offset, 1);
+    // console.log(p);
+    let points_number = Uint16Array(buffer, offset, 1)[0];
+    offset += 2;
+
+    // path points
+    this.points = Float64Array(buffer, offset, points_number * 2);
+    offset += 8 * points_number * 2;
+
+    // path waypoints
+    let waypoints_len = Math.ceil(points_number / 8.0);
+    this.waypoints = Uint8Array(buffer, offset, waypoints_len);
+    offset += waypoints_len;
+
+    return [this, offset];
   }
 
   is_waypoint(point_index) {
@@ -590,16 +1179,6 @@ class Path {
     return new Point(lon, lat);
   }
 
-  interest_point(index) {
-    let lon = this.interests_coordinates[2 * index];
-    let lat = this.interests_coordinates[2 * index + 1];
-    return new Point(lon, lat);
-  }
-
-  interest_color(index) {
-    return interests_colors[this.interests_types[index]];
-  }
-
   // return index of segment which is nearest from point.
   // we need a direction because we need there is an ambiguity
   // for overlapping segments which are taken once to go and once to come back.
@@ -653,7 +1232,7 @@ class Point {
       translated.lon * sin_direction + translated.lat * cos_direction;
     return [
       g.getWidth() / 2 - Math.round(rotated_x), // x is inverted
-      g.getHeight() / 2 + Math.round(rotated_y),
+      g.getHeight() / 2 + Math.round(rotated_y) + Y_OFFSET,
     ];
   }
   minus(other_point) {
@@ -731,37 +1310,50 @@ class Point {
   }
 }
 
-let fake_gps_point = 0.0;
+let fake_gps_point = 0;
 function simulate_gps(status) {
-  // let's keep the screen on in simulations
-  Bangle.setLCDTimeout(0);
-  Bangle.setLCDPower(1);
-  if (fake_gps_point > status.path.len - 1) {
-    return;
-  }
-  let point_index = Math.floor(fake_gps_point);
-  if (point_index >= status.path.len / 2 - 1) {
-    return;
-  }
-  let p1 = status.path.point(2 * point_index); // use these to approximately follow path
-  let p2 = status.path.point(2 * (point_index + 1));
-  //let p1 = status.path.point(point_index); // use these to strictly follow path
-  //let p2 = status.path.point(point_index + 1);
+  if (status.path === null) {
+    let map = status.maps[0];
+    let p1 = new Point(map.start_coordinates[0], map.start_coordinates[1]);
+    let p2 = new Point(
+      map.start_coordinates[0] + map.side * map.grid_size[0],
+      map.start_coordinates[1] + map.side * map.grid_size[1]
+    );
+    let pos = p1.times(1 - fake_gps_point).plus(p2.times(fake_gps_point));
+    if (fake_gps_point < 1) {
+      fake_gps_point += 0.01;
+    }
+    status.update_position(pos, null, null);
+  } else {
+    if (fake_gps_point > status.path.len - 1 || fake_gps_point < 0) {
+      return;
+    }
+    let point_index = Math.floor(fake_gps_point);
+    if (point_index >= status.path.len / 2 - 1) {
+      return;
+    }
+    let p1 = status.path.point(2 * point_index); // use these to approximately follow path
+    let p2 = status.path.point(2 * (point_index + 1));
+    //let p1 = status.path.point(point_index); // use these to strictly follow path
+    //let p2 = status.path.point(point_index + 1);
 
-  let alpha = fake_gps_point - point_index;
-  let pos = p1.times(1 - alpha).plus(p2.times(alpha));
-  let old_pos = status.position;
+    let alpha = fake_gps_point - point_index;
+    let pos = p1.times(1 - alpha).plus(p2.times(alpha));
 
-  fake_gps_point += 0.05; // advance simulation
-  // status.update_position(new Point(1, 1), null); // uncomment to be always lost
-  status.update_position(pos, null);
+    if (go_backwards) {
+      fake_gps_point -= 0.05; // advance simulation
+    } else {
+      fake_gps_point += 0.05; // advance simulation
+    }
+    status.update_position(pos, null, null);
+  }
 }
 
 function drawMenu() {
   const menu = {
     "": { title: "choose trace" },
   };
-  var files = require("Storage").list(".gpc");
+  var files = s.list(".gps");
   for (var i = 0; i < files.length; ++i) {
     menu[files[i]] = start.bind(null, files[i]);
   }
@@ -775,27 +1367,54 @@ function start(fn) {
   E.showMenu();
   console.log("loading", fn);
 
-  load_gpc(fn);
+  load_gps(fn);
 }
 
-function start_gipy(filename, path_data) {
+function start_gipy(path, maps, interests) {
   console.log("starting");
-  let path = new Path(path_data);
-  let status = new Status(path);
+  status = new Status(path, maps, interests);
+
+  if (status.path !== null) {
+    let start = status.path.point(0);
+    status.displayed_position = start;
+  } else {
+    let first_map = maps[0];
+    status.displayed_position = new Point(
+      first_map.start_coordinates[0] +
+      (first_map.side * first_map.grid_size[0]) / 2,
+      first_map.start_coordinates[1] +
+      (first_map.side * first_map.grid_size[1]) / 2);
+  }
+  status.display();
+
+  Bangle.on("stroke", (o) => {
+    if (in_menu) {
+      return;
+    }
+    // we move display according to stroke
+    let first_x = o.xy[0];
+    let first_y = o.xy[1];
+    let last_x = o.xy[o.xy.length - 2];
+    let last_y = o.xy[o.xy.length - 1];
+    let xdiff = last_x - first_x;
+    let ydiff = last_y - first_y;
+
+    let c = status.adjusted_cos_direction;
+    let s = status.adjusted_sin_direction;
+    let rotated_x = xdiff * c - ydiff * s;
+    let rotated_y = xdiff * s + ydiff * c;
+    status.displayed_position.lon += 1.3 * rotated_x / status.scale_factor;
+    status.displayed_position.lat -= 1.3 * rotated_y / status.scale_factor;
+    status.display();
+  });
 
   if (simulated) {
     status.starting_time = getTime();
-    status.position = new Point(status.path.point(0));
+    // let's keep the screen on in simulations
+    Bangle.setLCDTimeout(0);
+    Bangle.setLCDPower(1);
     setInterval(simulate_gps, 500, status);
   } else {
-    // let's display splash screen while waiting for gps signal
-    g.clear();
-    g.drawImage(splashscreen, 0, 0);
-    g.setFont("6x8:2")
-      .setFontAlign(-1, -1, 0)
-      .setColor(0xf800)
-      .drawString(filename, 0, g.getHeight() - 30);
-
     Bangle.setLocked(false);
 
     let frame = 0;
@@ -811,7 +1430,7 @@ function start_gipy(filename, path_data) {
           status.starting_time = getTime();
           Bangle.loadWidgets(); // i don't know why i cannot load them at start : they would display on splash screen
         }
-        status.update_position(new Point(data.lon, data.lat), null);
+        status.update_position(new Point(data.lon, data.lat), null, data.time);
       }
       let gps_status_color;
       if (frame % 2 == 0 || valid_coordinates) {
@@ -819,9 +1438,11 @@ function start_gipy(filename, path_data) {
       } else {
         gps_status_color = g.theme.fg;
       }
-      g.setColor(gps_status_color)
-        .setFont("6x8:2")
-        .drawString("gps", g.getWidth() - 40, 30);
+      if (!in_menu) {
+        g.setColor(gps_status_color)
+          .setFont("6x8:2")
+          .drawString("gps", g.getWidth() - 40, 30);
+      }
     };
 
     Bangle.setGPSPower(true, "gipy");
@@ -834,7 +1455,46 @@ function start_gipy(filename, path_data) {
   }
 }
 
-let files = require("Storage").list(".gpc");
+setWatch(
+  function () {
+    if (in_menu) {
+      return;
+    }
+    in_menu = true;
+    const menu = {
+      "": { title: "choose action" },
+      "Go Backward": {
+        value: go_backwards,
+        format: (v) => (v ? "On" : "Off"),
+        onchange: (v) => {
+          go_backwards = v;
+        },
+      },
+      Zoom: {
+        value: zoomed,
+        format: (v) => (v ? "In" : "Out"),
+        onchange: (v) => {
+          status.invalidate_caches();
+          zoomed = v;
+        },
+      },
+      "back to map": function () {
+        in_menu = false;
+        E.showMenu();
+        g.clear();
+        g.flip();
+        if (status !== null) {
+            status.display();
+        }
+      },
+    };
+    E.showMenu(menu);
+  },
+  BTN1,
+  { repeat: true }
+);
+
+let files = s.list(".gps");
 if (files.length <= 1) {
   if (files.length == 0) {
     load();
diff --git a/apps/gipy/interface.html b/apps/gipy/interface.html
index 552e7be17..892349df9 100644
--- a/apps/gipy/interface.html
+++ b/apps/gipy/interface.html
@@ -1,21 +1,27 @@
 <html>
   <head>
     <link rel="stylesheet" href="../../css/spectre.min.css">
+ <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css"
+     integrity="sha256-kLaT2GOSpHechhsozzB+flnD+zUyjE2LlfWPgU04xyI="
+     crossorigin=""/>
+
   <style>
-svg { width:95% }
+#svgmap { width: 95%; }
+#map { height: 180px; }
   </style>
   </head>
   <body>
+        <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"
+     integrity="sha256-WBkoXOwTeyKclOHuWtc+i2uENFpDZ9YPdf5Hf+D7ewM="
+     crossorigin=""></script>
+ <div id="map"></div>
 
-      <p>Please select a gpx file to be converted to gpc and loaded.</p>
-
+      <p>Please select a gpx file OR an area on the map using shift + drag the mouse.</p>
 
     gpx file : <input type="file" is="gpx_file" id="fileInput" accept=".gpx">
     <br>
-    gpc filename : <input type="text" id="gpc_file" name="gpc_file" maxlength="24">.gpc (max 24 characters)
+    gps filename : <input type="text" id="gps_file" name="gps_file" maxlength="24">.gps (max 24 characters)
     <br>
-    <input type="checkbox" id="osm" name="osm" checked>
-      <label for="osm">fetch interests from openstreetmap</label>
     <table>
         <tr>
             <th><bold>OpenstreetMap <a href="https://wiki.openstreetmap.org/wiki/Tags">NODE Tags</a></bold></th>
@@ -46,7 +52,7 @@ svg { width:95% }
 
     <input type="button" id="upload" name="upload" value="Upload" disabled>
     <div id="status"></div>
-    <div id="map"></div>
+    <div id="svgmap"></div>
 
     <script src="../../core/lib/interface.js"></script>
     <script>
@@ -65,40 +71,96 @@ function vec_to_string(vec) {
   return final_string;
 }
 
-import init, { convert_gpx_strings, convert_gpx_strings_no_osm, get_gpc, get_svg } from "./pkg/gpconv.js";
+function display_polygon(map) {
+	  document.getElementById('upload').disabled = true;
+    if (displayed_polygon !== null) {
+      displayed_polygon.remove();
+    }
+    if (displayed_path !== null) {
+      displayed_path.remove();
+    }
+      let polygon = get_polygon(gps_data);
+      let min_lat = polygon[0];
+      let max_lat = polygon[0];
+      let min_lng = polygon[1];
+      let max_lng = polygon[1];
+      let map_polygon = [];
+      for (let i = 0 ; i < polygon.length ; i+=2) {
+        map_polygon.push([polygon[i], polygon[i+1]]);
+        if (min_lat > polygon[i]) {
+          min_lat = polygon[i];
+        } else if (max_lat < polygon[i]) {
+          max_lat = polygon[i];
+        }
+
+        if (min_lng > polygon[i+1]) {
+          min_lng = polygon[i+1];
+        } else if (max_lng < polygon[i+1]) {
+          max_lng = polygon[i+1];
+        }
+      }
+      displayed_polygon = L.polygon(map_polygon).addTo(map);
+
+      let polyline = get_polyline(gps_data);
+      if (polyline.length > 0) {
+        let map_polyline = [];
+        for (let i = 0 ; i < polyline.length ; i+= 2) {
+          map_polyline.push([polyline[i], polyline[i+1]]);
+        }
+        displayed_path = L.polyline(map_polyline, {color: 'red'}).addTo(map);
+      }
+
+      map.fitBounds(L.latLngBounds(L.latLng(min_lat, min_lng), L.latLng(max_lat, max_lng)));
+	  document.getElementById('convert').disabled = false;
+}
+
+import init, { load_gps_from_string, get_polygon, get_polyline, request_map, get_gps_content, get_gps_map_svg, gps_from_area } from "./pkg/gps.js";
 console.log("imported wasm");
 
-let osm_checkbox = document.querySelector("input[name=osm]");
-let with_osm = true;
+// start map
+ L.Map.BoxPrinter = L.Map.BoxZoom.extend({
+         _onMouseUp: function (e) {
 
-osm_checkbox.addEventListener('change', function() {
-  if (this.checked) {
-    with_osm = true;
-	document.getElementById('key1').disabled = false;
-	document.getElementById('key2').disabled = false;
-	document.getElementById('key3').disabled = false;
-	document.getElementById('key4').disabled = false;
-	document.getElementById('value1').disabled = false;
-	document.getElementById('value2').disabled = false;
-	document.getElementById('value3').disabled = false;
-	document.getElementById('value4').disabled = false;
-  } else {
-    with_osm = false;
-	document.getElementById('key1').disabled = true;
-	document.getElementById('key2').disabled = true;
-	document.getElementById('key3').disabled = true;
-	document.getElementById('key4').disabled = true;
-	document.getElementById('value1').disabled = true;
-	document.getElementById('value2').disabled = true;
-	document.getElementById('value3').disabled = true;
-	document.getElementById('value4').disabled = true;
-  }
-});
+if ((e.which !== 1) && (e.button !== 1)) { return; }
 
+		this._finish();
+
+		if (!this._moved) { return; }
+		// Postpone to next JS tick so internal click event handling
+		// still see it as "moved".
+		setTimeout(L.bind(this._resetState, this), 0);
+
+		var bounds = new L.LatLngBounds(
+		        this._map.containerPointToLatLng(this._startPoint),
+		        this._map.containerPointToLatLng(this._point));
+    let south_west = bounds.getSouthWest();
+    let north_east = bounds.getNorthEast();
+    gps_data = gps_from_area(south_west.lng, south_west.lat, north_east.lng, north_east.lat);
+		document.getElementById('gps_file').value = "";
+    display_polygon(this._map);
+
+    this._map.fire('boxzoomend', {boxZoomBounds: bounds});
+    }
+ });
+ L.Map.mergeOptions({boxPrinter: true});
+ L.Map.addInitHook('addHandler', 'boxPrinter', L.Map.BoxPrinter);
+
+// now the interactions
 let status = document.getElementById("status");
-let gpx_content = null;
-let gpc_filename = null;
-let gpc_content = null;
+let gps_data = null;
+let gps_filename = null;
+let gps_content = null;
+let displayed_polygon = null;
+let displayed_path = null;
+
+init().then(() => {
+
+ var map = L.map('map').setView([45.1825, 5.6731], 1);
+ L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+}).addTo(map);
+
 
 document
   .getElementById("fileInput")
@@ -112,10 +174,10 @@ document
     status.innerHTML = "reading file";
 
     let gpx_filename = this.files[0].name;
-	if (gpc_filename === null || gpc_filename == "") {
+	if (gps_filename === null || gps_filename == "") {
     	if (gpx_filename.length <= 28) {
-    		gpc_filename = gpx_filename.slice(0, gpx_filename.length - 4);
-			document.getElementById('gpc_file').value = gpc_filename;
+    		gps_filename = gpx_filename.slice(0, gpx_filename.length - 4);
+			document.getElementById('gps_file').value = gps_filename;
     	}
 	}
 
@@ -123,8 +185,10 @@ document
     reader.onload = function fileReadCompleted() {
       console.log("reading file completed");
       status.innerHTML = "file reading completed";
-	  gpx_content = reader.result;
-	  document.getElementById('convert').disabled = false;
+	  let gpx_content = reader.result;
+
+      gps_data = load_gps_from_string(gpx_content);
+      display_polygon(map);
 	};
     reader.readAsText(this.files[0]);
 });
@@ -136,9 +200,6 @@ document
 	document.getElementById('convert').disabled = true;
     document.getElementById('upload').disabled = true;
     status.innerHTML = "please wait, converting file";
-    init().then(() => {
-      let gpc_svg;
-      if (with_osm) {
         let key1 = document.getElementById('key1').value;
         let key2 = document.getElementById('key2').value;
         let key3 = document.getElementById('key3').value;
@@ -147,32 +208,29 @@ document
         let value2 = document.getElementById('value2').value;
         let value3 = document.getElementById('value3').value;
         let value4 = document.getElementById('value4').value;
-        gpc_svg = convert_gpx_strings(gpx_content, key1, value1, key2, value2, key3, value3, key4, value4);
-      } else {
-        gpc_svg = convert_gpx_strings_no_osm(gpx_content);
-      }
-      gpc_svg.then(gs => {
+        request_map(gps_data, key1, value1, key2, value2, key3, value3, key4, value4).then(
+            () => {
+
         status.innerHTML = "file converted";
-        let svg = get_svg(gs);
-        let svg_string = vec_to_string(svg);
-        let img = document.getElementById("map");
+        gps_content = get_gps_content(gps_data);
+        let svg_string = get_gps_map_svg(gps_data);
+        let img = document.getElementById("svgmap");
         img.innerHTML = svg_string;
-        gpc_content = get_gpc(gs);
-        if (gpc_filename !== null) {
+        if (gps_filename !== null) {
           document.getElementById('upload').disabled = false;
         }
-      });
-    });
+            }
+        );
 });
 
 document
-  .getElementById("gpc_file")
+  .getElementById("gps_file")
   .addEventListener('change', function() {
-  gpc_filename = document.getElementById("gpc_file").value;
-  if (gpc_filename == "") {
+  gps_filename = document.getElementById("gps_file").value;
+  if (gps_filename == "") {
     document.getElementById("upload").disabled = true;
   } else {
-    if (gpc_content !== null) {
+    if (gps_content !== null) {
       document.getElementById("upload").disabled = false;
     }
   }
@@ -185,12 +243,12 @@ document
     document.getElementById('upload').disabled = true;
     status.innerHTML = "uploading file";
     console.log("uploading");
-    let gpc_string = vec_to_string(gpc_content);
-    Util.writeStorage(gpc_filename + ".gpc", gpc_string, () => {
+    let gps_string = vec_to_string(gps_content);
+    Util.writeStorage(gps_filename + ".gps", gps_string, () => {
       status.innerHTML = "Checking upload";
-      Util.readStorage(gpc_filename + ".gpc", uploaded_content => {
-        if (uploaded_content == gpc_string) {
-            status.innerHTML = `${gpc_filename}.gpc uploaded`;
+      Util.readStorage(gps_filename + ".gps", uploaded_content => {
+        if (uploaded_content == gps_string) {
+            status.innerHTML = `${gps_filename}.gps uploaded`;
             console.log("DONE");
         } else {
             status.innerHTML = "Upload FAILED";
@@ -198,6 +256,7 @@ document
         }
       });
     });
+});
 });
 
     </script>
diff --git a/apps/gipy/legend.png b/apps/gipy/legend.png
index 9040f6df8..b3df7bee7 100644
Binary files a/apps/gipy/legend.png and b/apps/gipy/legend.png differ
diff --git a/apps/gipy/metadata.json b/apps/gipy/metadata.json
index 97d18f5fe..8b8c88780 100644
--- a/apps/gipy/metadata.json
+++ b/apps/gipy/metadata.json
@@ -2,7 +2,7 @@
   "id": "gipy",
   "name": "Gipy",
   "shortName": "Gipy",
-  "version": "0.16",
+  "version": "0.19",
   "description": "Follow gpx files using the gps. Don't get lost in your bike trips and hikes.",
   "allow_emulator":false,
   "icon": "gipy.png",
diff --git a/apps/gipy/pkg/gpconv.d.ts b/apps/gipy/pkg/gpconv.d.ts
deleted file mode 100644
index 2bb57f651..000000000
--- a/apps/gipy/pkg/gpconv.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
-* @param {GpcSvg} gpcsvg
-* @returns {Uint8Array}
-*/
-export function get_gpc(gpcsvg: GpcSvg): Uint8Array;
-/**
-* @param {GpcSvg} gpcsvg
-* @returns {Uint8Array}
-*/
-export function get_svg(gpcsvg: GpcSvg): Uint8Array;
-/**
-* @param {string} input_str
-* @returns {Promise<GpcSvg>}
-*/
-export function convert_gpx_strings_no_osm(input_str: string): Promise<GpcSvg>;
-/**
-* @param {string} input_str
-* @param {string} key1
-* @param {string} value1
-* @param {string} key2
-* @param {string} value2
-* @param {string} key3
-* @param {string} value3
-* @param {string} key4
-* @param {string} value4
-* @returns {Promise<GpcSvg>}
-*/
-export function convert_gpx_strings(input_str: string, key1: string, value1: string, key2: string, value2: string, key3: string, value3: string, key4: string, value4: string): Promise<GpcSvg>;
-/**
-*/
-export class GpcSvg {
-  free(): void;
-}
-
-export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
-
-export interface InitOutput {
-  readonly memory: WebAssembly.Memory;
-  readonly __wbg_gpcsvg_free: (a: number) => void;
-  readonly get_gpc: (a: number, b: number) => void;
-  readonly get_svg: (a: number, b: number) => void;
-  readonly convert_gpx_strings_no_osm: (a: number, b: number) => number;
-  readonly convert_gpx_strings: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number) => number;
-  readonly __wbindgen_malloc: (a: number) => number;
-  readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
-  readonly __wbindgen_export_2: WebAssembly.Table;
-  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h317df853f2d4653e: (a: number, b: number, c: number) => void;
-  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
-  readonly __wbindgen_free: (a: number, b: number) => void;
-  readonly __wbindgen_exn_store: (a: number) => void;
-  readonly wasm_bindgen__convert__closures__invoke2_mut__h573cb80e0bf72240: (a: number, b: number, c: number, d: number) => void;
-}
-
-export type SyncInitInput = BufferSource | WebAssembly.Module;
-/**
-* Instantiates the given `module`, which can either be bytes or
-* a precompiled `WebAssembly.Module`.
-*
-* @param {SyncInitInput} module
-*
-* @returns {InitOutput}
-*/
-export function initSync(module: SyncInitInput): InitOutput;
-
-/**
-* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
-* for everything else, calls `WebAssembly.instantiate` directly.
-*
-* @param {InitInput | Promise<InitInput>} module_or_path
-*
-* @returns {Promise<InitOutput>}
-*/
-export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
diff --git a/apps/gipy/pkg/gpconv_bg.wasm b/apps/gipy/pkg/gpconv_bg.wasm
deleted file mode 100644
index 245afc20c..000000000
Binary files a/apps/gipy/pkg/gpconv_bg.wasm and /dev/null differ
diff --git a/apps/gipy/pkg/gpconv_bg.wasm.d.ts b/apps/gipy/pkg/gpconv_bg.wasm.d.ts
deleted file mode 100644
index cb912f3de..000000000
--- a/apps/gipy/pkg/gpconv_bg.wasm.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function __wbg_gpcsvg_free(a: number): void;
-export function get_gpc(a: number, b: number): void;
-export function get_svg(a: number, b: number): void;
-export function convert_gpx_strings_no_osm(a: number, b: number): number;
-export function convert_gpx_strings(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number): number;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_realloc(a: number, b: number, c: number): number;
-export const __wbindgen_export_2: WebAssembly.Table;
-export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h317df853f2d4653e(a: number, b: number, c: number): void;
-export function __wbindgen_add_to_stack_pointer(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;
-export function __wbindgen_exn_store(a: number): void;
-export function wasm_bindgen__convert__closures__invoke2_mut__h573cb80e0bf72240(a: number, b: number, c: number, d: number): void;
diff --git a/apps/gipy/pkg/gps.d.ts b/apps/gipy/pkg/gps.d.ts
new file mode 100644
index 000000000..15a90b1e8
--- /dev/null
+++ b/apps/gipy/pkg/gps.d.ts
@@ -0,0 +1,96 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+* @param {Gps} gps
+* @returns {string}
+*/
+export function get_gps_map_svg(gps: Gps): string;
+/**
+* @param {Gps} gps
+* @returns {Float64Array}
+*/
+export function get_polygon(gps: Gps): Float64Array;
+/**
+* @param {Gps} gps
+* @returns {Float64Array}
+*/
+export function get_polyline(gps: Gps): Float64Array;
+/**
+* @param {Gps} gps
+* @returns {Uint8Array}
+*/
+export function get_gps_content(gps: Gps): Uint8Array;
+/**
+* @param {Gps} gps
+* @param {string} key1
+* @param {string} value1
+* @param {string} key2
+* @param {string} value2
+* @param {string} key3
+* @param {string} value3
+* @param {string} key4
+* @param {string} value4
+* @returns {Promise<void>}
+*/
+export function request_map(gps: Gps, key1: string, value1: string, key2: string, value2: string, key3: string, value3: string, key4: string, value4: string): Promise<void>;
+/**
+* @param {string} input
+* @returns {Gps}
+*/
+export function load_gps_from_string(input: string): Gps;
+/**
+* @param {number} xmin
+* @param {number} ymin
+* @param {number} xmax
+* @param {number} ymax
+* @returns {Gps}
+*/
+export function gps_from_area(xmin: number, ymin: number, xmax: number, ymax: number): Gps;
+/**
+*/
+export class Gps {
+  free(): void;
+}
+
+export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
+
+export interface InitOutput {
+  readonly memory: WebAssembly.Memory;
+  readonly __wbg_gps_free: (a: number) => void;
+  readonly get_gps_map_svg: (a: number, b: number) => void;
+  readonly get_polygon: (a: number, b: number) => void;
+  readonly get_polyline: (a: number, b: number) => void;
+  readonly get_gps_content: (a: number, b: number) => void;
+  readonly request_map: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number) => number;
+  readonly load_gps_from_string: (a: number, b: number) => number;
+  readonly gps_from_area: (a: number, b: number, c: number, d: number) => number;
+  readonly __wbindgen_malloc: (a: number) => number;
+  readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
+  readonly __wbindgen_export_2: WebAssembly.Table;
+  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab13c10d53cd1c5a: (a: number, b: number, c: number) => void;
+  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
+  readonly __wbindgen_free: (a: number, b: number) => void;
+  readonly __wbindgen_exn_store: (a: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke2_mut__h26ce002f44a5439b: (a: number, b: number, c: number, d: number) => void;
+}
+
+export type SyncInitInput = BufferSource | WebAssembly.Module;
+/**
+* Instantiates the given `module`, which can either be bytes or
+* a precompiled `WebAssembly.Module`.
+*
+* @param {SyncInitInput} module
+*
+* @returns {InitOutput}
+*/
+export function initSync(module: SyncInitInput): InitOutput;
+
+/**
+* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
+* for everything else, calls `WebAssembly.instantiate` directly.
+*
+* @param {InitInput | Promise<InitInput>} module_or_path
+*
+* @returns {Promise<InitOutput>}
+*/
+export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
diff --git a/apps/gipy/pkg/gpconv.js b/apps/gipy/pkg/gps.js
similarity index 78%
rename from apps/gipy/pkg/gpconv.js
rename to apps/gipy/pkg/gps.js
index b9271ad4b..ce9ebe5f8 100644
--- a/apps/gipy/pkg/gpconv.js
+++ b/apps/gipy/pkg/gps.js
@@ -7,20 +7,6 @@ heap.push(undefined, null, true, false);
 
 function getObject(idx) { return heap[idx]; }
 
-let heap_next = heap.length;
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 let cachedUint8Memory0 = new Uint8Array();
@@ -98,13 +84,18 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
+let heap_next = heap.length;
 
-    heap[idx] = obj;
-    return idx;
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
 }
 
 const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
@@ -115,6 +106,15 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
 function debugString(val) {
     // primitive types
     const type = typeof val;
@@ -205,7 +205,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_24(arg0, arg1, arg2) {
-    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h317df853f2d4653e(arg0, arg1, addHeapObject(arg2));
+    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab13c10d53cd1c5a(arg0, arg1, addHeapObject(arg2));
 }
 
 function _assertClass(instance, klass) {
@@ -214,19 +214,86 @@ function _assertClass(instance, klass) {
     }
     return instance.ptr;
 }
+/**
+* @param {Gps} gps
+* @returns {string}
+*/
+export function get_gps_map_svg(gps) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        _assertClass(gps, Gps);
+        wasm.get_gps_map_svg(retptr, gps.ptr);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        return getStringFromWasm0(r0, r1);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+        wasm.__wbindgen_free(r0, r1);
+    }
+}
+
+let cachedFloat64Memory0 = new Float64Array();
+
+function getFloat64Memory0() {
+    if (cachedFloat64Memory0.byteLength === 0) {
+        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachedFloat64Memory0;
+}
+
+function getArrayF64FromWasm0(ptr, len) {
+    return getFloat64Memory0().subarray(ptr / 8, ptr / 8 + len);
+}
+/**
+* @param {Gps} gps
+* @returns {Float64Array}
+*/
+export function get_polygon(gps) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        _assertClass(gps, Gps);
+        wasm.get_polygon(retptr, gps.ptr);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        var v0 = getArrayF64FromWasm0(r0, r1).slice();
+        wasm.__wbindgen_free(r0, r1 * 8);
+        return v0;
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
+/**
+* @param {Gps} gps
+* @returns {Float64Array}
+*/
+export function get_polyline(gps) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        _assertClass(gps, Gps);
+        wasm.get_polyline(retptr, gps.ptr);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        var v0 = getArrayF64FromWasm0(r0, r1).slice();
+        wasm.__wbindgen_free(r0, r1 * 8);
+        return v0;
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
 
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
 }
 /**
-* @param {GpcSvg} gpcsvg
+* @param {Gps} gps
 * @returns {Uint8Array}
 */
-export function get_gpc(gpcsvg) {
+export function get_gps_content(gps) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        _assertClass(gpcsvg, GpcSvg);
-        wasm.get_gpc(retptr, gpcsvg.ptr);
+        _assertClass(gps, Gps);
+        wasm.get_gps_content(retptr, gps.ptr);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var v0 = getArrayU8FromWasm0(r0, r1).slice();
@@ -238,37 +305,7 @@ export function get_gpc(gpcsvg) {
 }
 
 /**
-* @param {GpcSvg} gpcsvg
-* @returns {Uint8Array}
-*/
-export function get_svg(gpcsvg) {
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        _assertClass(gpcsvg, GpcSvg);
-        wasm.get_svg(retptr, gpcsvg.ptr);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
-        var v0 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_free(r0, r1 * 1);
-        return v0;
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-    }
-}
-
-/**
-* @param {string} input_str
-* @returns {Promise<GpcSvg>}
-*/
-export function convert_gpx_strings_no_osm(input_str) {
-    const ptr0 = passStringToWasm0(input_str, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.convert_gpx_strings_no_osm(ptr0, len0);
-    return takeObject(ret);
-}
-
-/**
-* @param {string} input_str
+* @param {Gps} gps
 * @param {string} key1
 * @param {string} value1
 * @param {string} key2
@@ -277,31 +314,53 @@ export function convert_gpx_strings_no_osm(input_str) {
 * @param {string} value3
 * @param {string} key4
 * @param {string} value4
-* @returns {Promise<GpcSvg>}
+* @returns {Promise<void>}
 */
-export function convert_gpx_strings(input_str, key1, value1, key2, value2, key3, value3, key4, value4) {
-    const ptr0 = passStringToWasm0(input_str, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+export function request_map(gps, key1, value1, key2, value2, key3, value3, key4, value4) {
+    _assertClass(gps, Gps);
+    const ptr0 = passStringToWasm0(key1, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(key1, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr1 = passStringToWasm0(value1, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
-    const ptr2 = passStringToWasm0(value1, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr2 = passStringToWasm0(key2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len2 = WASM_VECTOR_LEN;
-    const ptr3 = passStringToWasm0(key2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr3 = passStringToWasm0(value2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len3 = WASM_VECTOR_LEN;
-    const ptr4 = passStringToWasm0(value2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr4 = passStringToWasm0(key3, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len4 = WASM_VECTOR_LEN;
-    const ptr5 = passStringToWasm0(key3, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr5 = passStringToWasm0(value3, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len5 = WASM_VECTOR_LEN;
-    const ptr6 = passStringToWasm0(value3, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr6 = passStringToWasm0(key4, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len6 = WASM_VECTOR_LEN;
-    const ptr7 = passStringToWasm0(key4, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr7 = passStringToWasm0(value4, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len7 = WASM_VECTOR_LEN;
-    const ptr8 = passStringToWasm0(value4, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len8 = WASM_VECTOR_LEN;
-    const ret = wasm.convert_gpx_strings(ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8);
+    const ret = wasm.request_map(gps.ptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7);
     return takeObject(ret);
 }
 
+/**
+* @param {string} input
+* @returns {Gps}
+*/
+export function load_gps_from_string(input) {
+    const ptr0 = passStringToWasm0(input, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.load_gps_from_string(ptr0, len0);
+    return Gps.__wrap(ret);
+}
+
+/**
+* @param {number} xmin
+* @param {number} ymin
+* @param {number} xmax
+* @param {number} ymax
+* @returns {Gps}
+*/
+export function gps_from_area(xmin, ymin, xmax, ymax) {
+    const ret = wasm.gps_from_area(xmin, ymin, xmax, ymax);
+    return Gps.__wrap(ret);
+}
+
 function handleError(f, args) {
     try {
         return f.apply(this, args);
@@ -309,16 +368,16 @@ function handleError(f, args) {
         wasm.__wbindgen_exn_store(addHeapObject(e));
     }
 }
-function __wbg_adapter_69(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen__convert__closures__invoke2_mut__h573cb80e0bf72240(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wbg_adapter_84(arg0, arg1, arg2, arg3) {
+    wasm.wasm_bindgen__convert__closures__invoke2_mut__h26ce002f44a5439b(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 /**
 */
-export class GpcSvg {
+export class Gps {
 
     static __wrap(ptr) {
-        const obj = Object.create(GpcSvg.prototype);
+        const obj = Object.create(Gps.prototype);
         obj.ptr = ptr;
 
         return obj;
@@ -333,7 +392,7 @@ export class GpcSvg {
 
     free() {
         const ptr = this.__destroy_into_raw();
-        wasm.__wbg_gpcsvg_free(ptr);
+        wasm.__wbg_gps_free(ptr);
     }
 }
 
@@ -371,12 +430,8 @@ async function load(module, imports) {
 function getImports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbg_gpcsvg_new = function(arg0) {
-        const ret = GpcSvg.__wrap(arg0);
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
+    imports.wbg.__wbg_log_d04343b58be82b0f = function(arg0, arg1) {
+        console.log(getStringFromWasm0(arg0, arg1));
     };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
         const obj = getObject(arg1);
@@ -386,31 +441,32 @@ function getImports() {
         getInt32Memory0()[arg0 / 4 + 1] = len0;
         getInt32Memory0()[arg0 / 4 + 0] = ptr0;
     };
-    imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
-        const ret = getObject(arg0);
-        return addHeapObject(ret);
+    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+        takeObject(arg0);
     };
     imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
         const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_fetch_3894579f6e2af3be = function(arg0) {
+    imports.wbg.__wbg_fetch_57429b87be3dcc33 = function(arg0) {
         const ret = fetch(getObject(arg0));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cb_drop = function(arg0) {
-        const obj = takeObject(arg0).original;
-        if (obj.cnt-- == 1) {
-            obj.a = 0;
-            return true;
-        }
-        const ret = false;
-        return ret;
+    imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
+        const ret = getObject(arg0);
+        return addHeapObject(ret);
     };
     imports.wbg.__wbg_fetch_749a56934f95c96c = function(arg0, arg1) {
         const ret = getObject(arg0).fetch(getObject(arg1));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_new_2d0053ee81e4dd2a = function() { return handleError(function () {
+        const ret = new Headers();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_append_de37df908812970d = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+        getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
+    }, arguments) };
     imports.wbg.__wbg_instanceof_Response_eaa426220848a39e = function(arg0) {
         let result;
         try {
@@ -440,17 +496,48 @@ function getImports() {
         const ret = getObject(arg0).text();
         return addHeapObject(ret);
     }, arguments) };
+    imports.wbg.__wbg_signal_31753ac644b25fbb = function(arg0) {
+        const ret = getObject(arg0).signal;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_new_6396e586b56e1dff = function() { return handleError(function () {
+        const ret = new AbortController();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_abort_064ae59cda5cd244 = function(arg0) {
+        getObject(arg0).abort();
+    };
     imports.wbg.__wbg_newwithstrandinit_05d7180788420c40 = function() { return handleError(function (arg0, arg1, arg2) {
         const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_new_2d0053ee81e4dd2a = function() { return handleError(function () {
-        const ret = new Headers();
+    imports.wbg.__wbg_new_abda76e883ba8a5f = function() {
+        const ret = new Error();
         return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_append_de37df908812970d = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
-        getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
-    }, arguments) };
+    };
+    imports.wbg.__wbg_stack_658279fe44541cf6 = function(arg0, arg1) {
+        const ret = getObject(arg1).stack;
+        const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        getInt32Memory0()[arg0 / 4 + 1] = len0;
+        getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    };
+    imports.wbg.__wbg_error_f851667af71bcfc6 = function(arg0, arg1) {
+        try {
+            console.error(getStringFromWasm0(arg0, arg1));
+        } finally {
+            wasm.__wbindgen_free(arg0, arg1);
+        }
+    };
+    imports.wbg.__wbindgen_cb_drop = function(arg0) {
+        const obj = takeObject(arg0).original;
+        if (obj.cnt-- == 1) {
+            obj.a = 0;
+            return true;
+        }
+        const ret = false;
+        return ret;
+    };
     imports.wbg.__wbindgen_is_object = function(arg0) {
         const val = getObject(arg0);
         const ret = typeof(val) === 'object' && val !== null;
@@ -523,7 +610,7 @@ function getImports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_69(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_84(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -588,8 +675,8 @@ function getImports() {
         const ret = wasm.memory;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper929 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 143, __wbg_adapter_24);
+    imports.wbg.__wbindgen_closure_wrapper2298 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 260, __wbg_adapter_24);
         return addHeapObject(ret);
     };
 
@@ -603,6 +690,7 @@ function initMemory(imports, maybe_memory) {
 function finalizeInit(instance, module) {
     wasm = instance.exports;
     init.__wbindgen_wasm_module = module;
+    cachedFloat64Memory0 = new Float64Array();
     cachedInt32Memory0 = new Int32Array();
     cachedUint8Memory0 = new Uint8Array();
 
@@ -626,7 +714,7 @@ function initSync(module) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = new URL('gpconv_bg.wasm', import.meta.url);
+        input = new URL('gps_bg.wasm', import.meta.url);
     }
     const imports = getImports();
 
diff --git a/apps/gipy/pkg/gps_bg.wasm b/apps/gipy/pkg/gps_bg.wasm
new file mode 100644
index 000000000..6999cb946
Binary files /dev/null and b/apps/gipy/pkg/gps_bg.wasm differ
diff --git a/apps/gipy/pkg/gps_bg.wasm.d.ts b/apps/gipy/pkg/gps_bg.wasm.d.ts
new file mode 100644
index 000000000..df9a024fa
--- /dev/null
+++ b/apps/gipy/pkg/gps_bg.wasm.d.ts
@@ -0,0 +1,19 @@
+/* tslint:disable */
+/* eslint-disable */
+export const memory: WebAssembly.Memory;
+export function __wbg_gps_free(a: number): void;
+export function get_gps_map_svg(a: number, b: number): void;
+export function get_polygon(a: number, b: number): void;
+export function get_polyline(a: number, b: number): void;
+export function get_gps_content(a: number, b: number): void;
+export function request_map(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number): number;
+export function load_gps_from_string(a: number, b: number): number;
+export function gps_from_area(a: number, b: number, c: number, d: number): number;
+export function __wbindgen_malloc(a: number): number;
+export function __wbindgen_realloc(a: number, b: number, c: number): number;
+export const __wbindgen_export_2: WebAssembly.Table;
+export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab13c10d53cd1c5a(a: number, b: number, c: number): void;
+export function __wbindgen_add_to_stack_pointer(a: number): number;
+export function __wbindgen_free(a: number, b: number): void;
+export function __wbindgen_exn_store(a: number): void;
+export function wasm_bindgen__convert__closures__invoke2_mut__h26ce002f44a5439b(a: number, b: number, c: number, d: number): void;
diff --git a/apps/gipy/pkg/package.json b/apps/gipy/pkg/package.json
index dee41f5cc..0f6ae6a75 100644
--- a/apps/gipy/pkg/package.json
+++ b/apps/gipy/pkg/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "gpconv",
+  "name": "gps",
   "version": "0.1.0",
   "files": [
-    "gpconv_bg.wasm",
-    "gpconv.js",
-    "gpconv.d.ts"
+    "gps_bg.wasm",
+    "gps.js",
+    "gps.d.ts"
   ],
-  "module": "gpconv.js",
-  "types": "gpconv.d.ts",
+  "module": "gps.js",
+  "types": "gps.d.ts",
   "sideEffects": false
 }
\ No newline at end of file
diff --git a/apps/gipy/settings.js b/apps/gipy/settings.js
index af9cbef22..1f6ae0853 100644
--- a/apps/gipy/settings.js
+++ b/apps/gipy/settings.js
@@ -3,8 +3,7 @@
   // Load settings
   var settings = Object.assign(
     {
-      keep_gps_alive: false,
-      max_speed: 35,
+      lost_distance: 50,
     },
     require("Storage").readJSON(FILE, true) || {}
   );
@@ -17,18 +16,10 @@
   E.showMenu({
     "": { title: "Gipy" },
     "< Back": () => back(),
-    "keep gps alive": {
-      value: !!settings.keep_gps_alive, // !! converts undefined to false
-      format: (v) => (v ? "Yes" : "No"),
-      onchange: (v) => {
-        settings.keep_gps_alive = v;
-        writeSettings();
-      },
-    },
-    "max speed": {
-      value: 35 | settings.max_speed, // 0| converts undefined to 0
-      min: 0,
-      max: 130,
+    "lost distance": {
+      value: 50 | settings.lost_distance, // 0| converts undefined to 0
+      min: 10,
+      max: 500,
       onchange: (v) => {
         settings.max_speed = v;
         writeSettings();
diff --git a/apps/glbasic/ChangeLog b/apps/glbasic/ChangeLog
index d97fd44d5..1f3a1b643 100644
--- a/apps/glbasic/ChangeLog
+++ b/apps/glbasic/ChangeLog
@@ -1,3 +1,3 @@
 0.20: New App!
 0.21: Tell clock widgets to hide.
-
+0.22: Changed font so 5 and 6 are not similar
diff --git a/apps/glbasic/glbasic.app.js b/apps/glbasic/glbasic.app.js
index c1f82f74c..4f6c9ffb3 100644
--- a/apps/glbasic/glbasic.app.js
+++ b/apps/glbasic/glbasic.app.js
@@ -1,13 +1,36 @@
-Graphics.prototype.setFontLECO1976Regular42 = function (scale) {
+
+Graphics.prototype.setFontLECO1976Regular5fix42 = function(scale) {
     // Actual height 42 (41 - 0)
-    g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAA/AAAAAAAAH/AAAAAAAA//AAAAAAAP//AAAAAAB///AAAAAAP///AAAAAB////AAAAAf////AAAAD////4AAAAf////AAAAH////4AAAA////+AAAAA////wAAAAA///+AAAAAA///gAAAAAA//8AAAAAAA//gAAAAAAA/4AAAAAAAA/AAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////gD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4B/gH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/wB////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/wB////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAH+AAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), 46, atob("ERkmHyYmJiYmJCYmEQ=="), 60 + (scale << 8) + (1 << 16));
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADMD/gHFv/AAwkHB3QAtngGFj47Fh5KFh//BwkH/4OEgf/BwgGCBwcBAwIOEAwQODAwX/wB7CCos/Awo/BAAPgDgvwJwgGEBwX4LoplFAw0P/yCF/4GFh6YGKgQAhNAZGDAwZ4CB3ibCg4ODZoYO/BwyV/BxIA7YX7C/YRRZCAAZZDB2AAgNAMHO4v4O42PB3P4AIL+EwABBQwQO/BwgABBwgGBB34A0h/wAYMDSogDBSogGBUgoOOd/4O2AAbgEAAIO+AGY7C/AHDIIWAB3wQCBwjiDB34OGf1gOdAGbgDgZKFwF/JQn4g4O3/ABBBwmAB34OLcAgOBd4oO6AGY5CJQoADd4gO5f2wOdf1IOdAEgqBA4v//AOGwAO5AwqGCB34OJAAbRCAwbgDB3QAzO/4OL/ABBg4ODwABBv4O/BwyV/BxIAzHYX4gZKFSogOCSowOxf2gOdf1YOdAGkH/EAgY7DSgMASoSWCCIIO3ADg='))),
+    46,
+    atob("ERkmICYmJiYmJCYmEQ=="),
+    60+(scale<<8)+(1<<16)
+  );
+  return this;
 };
 
-Graphics.prototype.setFontLECO1976Regular22 = function (scale) {
+Graphics.prototype.setFontLECO1976Regular5fix22 = function(scale) {
     // Actual height 22 (21 - 0)
-    g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gAD+AAPwAAAAAD+AAP4AA/gAAAAAAAAAAAAAcOAP//A//8D//wP//AHDgAcOAP//A//8D//wP//AHDgAAAAAAAAH/jgf+OB/44H/jj8OP/w4//Dj/8OPxw/4HD/gcP+Bw/4AAAAAAAP+AA/8AD/wQOHHA4c8D//wP/8A//gAD4AAfAAH/8A//wP//A84cDjhwIP/AA/8AB/wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8ABwAAAAAAAAD8AAP4AA/gAD8AAAAAAAAAAAEAAD+AB//A///v/D//gB/wABwAAAAAADgAA/wAf/4P8///wf/4AP8AAOAAAAAAAAAyAAHcAAPwAD/gAP/AA/8AA/AAH8AAMwAAAAAAAAAAAAADgAAOAAA4AAf8AD/wAP/AA/8AAOAAA4AADgAAAAAAAAAAD8AAfwAB/AAD8AAAAAAAADgAAOAAA4AADgAAOAAA4AADgAAAAAAAAAADgAAOAAA4AADgAAAAAAAAABwAB/AA/8A//gP/gA/wADwAAIAAAAAAD//wP//A//8D//wOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA4AcDgBwOAHA//8D//wP//A//8AABwAAHAAAcAAAAAAAA+f8D5/wPn/A+f8DhxwOHHA4ccDhxwP/HA/8cD/xwP/HAAAAAAAAOAHA4AcDhxwOHHA4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/wAP/AA/8AD/wAAHAAAcAABwAAHAA//8D//wP//A//8AAAAAAAA/98D/3wP/fA/98DhxwOHHA4ccDhxwOH/A4f8Dh/wOH/AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccDh/wOH/A4f8Dh/wAAAAAAAD4AAPgAA+AADgAAOAAA4AADgAAP//A//8D//wP//AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA//8D//wP//A//8AAAAAAAAOA4A4DgDgOAOA4AAAAAAAAOA/A4H8DgfwOA/AAAAAAAAB4AAPwAA/AAD8AAf4ABzgAPPAA8cAHh4AAAAAAAAAAAAHHAAccABxwAHHAAccABxwAHHAAccABxwAHHAAAAAAAAAOHAA4cADzwAPPAAf4AB/gAD8AAPwAAeAAB4AAAAAAAAA+AAD4AAPgAA+ecDh9wOH3A4fcDhwAP/AA/8AD/wAP/AAAAAAAAAP//4///j//+P//44ADjn/OOf845/zjnHOP8c4//zj//OP/84AAAAAAAP//A//8D//wP//A4cADhwAOHAA4cAD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA//8D//wP9/A/j8AAAAAAAA//8D//wP//A//8DgBwOAHA4AcDgBwOAHA4AcDgBwOAHAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA8A8D//wH/+AP/wAf+AAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4ccDhxwOAHA4AcAAAAAAAA//8D//wP//A//8DhwAOHAA4cADhwAOHAA4cADgAAOAAAAAAD//wP//A//8D//wOAHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA//8D//wP//A//8ABwAAHAAAcAABwAP//A//8D//wP//AAAAAAAAP//A//8D//wP//AAAAAAAAOAHA4AcDgBwOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA//8D//wP//A//8AHwAA/AAP8AB/wAPn/A8f8DB/wIH/AAAAAAAAP//A//8D//wP//AAAcAABwAAHAAAcAABwAAHAAAAAAAAP//A//8D//wP//Af8AAP+AAH/AAD8AAHwAD/AB/wAf8AP+AA//8D//wP//AAAAAAAAP//A//8D//wP//AfwAAfwAAfwAAfwAAfwP//A//8D//wAAAAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHAA4cADhwAOHAA/8AD/wAP/AA/8AAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//+P//4///j//+AAA4AADgAAAP//A//8D//wP//A4eADh+AOH8A4f4D/3wP/HA/8MD/wQAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA4AADgAAOAAA//8D//wP//A//8DgAAOAAA4AADgAAAAAA//8D//wP//A//8AABwAAHAAAcAABwP//A//8D//wP//AAAADAAAPgAA/wAD/4AB/8AA/8AAfwAB/AA/8Af+AP/AA/wAD4AAMAAA4AAD+AAP/gA//8AH/wAB/AAf8Af/wP/4A/4AD/gAP/4AH/8AB/wAB/AB/8D//wP/gA/gADgAAIABA4AcDwDwPw/Afn4Af+AA/wAD/AA//AH5+A/D8DwDwOAHAgAEAAAAP/AA/8AD/wAP/AAAf8AB/wAH/AAf8D/wAP/AA/8AD/wAAAAAAAADh/wOH/A4f8Dh/wOHHA4ccDhxwOHHA/8cD/xwP/HA/8cAAAAAAAAf//9///3///f//9wAA3AADcAAMAAAOAAA/gAD/wAH/8AB/8AA/wAAPAAAEAAAAHAADcAANwAB3///f//9///wAA"), 32, atob("BwYLDg4UDwYJCQwMBgkGCQ4MDg4ODg4NDg4GBgwMDA4PDg4ODg4NDg4GDQ4MEg8ODQ8ODgwODhQODg4ICQg="), 22 + (scale << 8) + (1 << 16));
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('AAs8AYV8AaQjOgP8AYMPAYV/AYMH/4DBn///EA///4ADB/wSB//gAYQlCCIIABCIIAFDYIjBAaYjBLYIDTF64AH+CDCGdLLV/i7C/wfCAZ/4/BPCAaTiBAaaHBABaPIIaxPMcbxbBAapgCAahPhVYLDTUbA7CAZ/wv5PKN6xPzAof+AaTuXdcCbuJ8H4ngDCE4QDOJ+8PgBPBh+AE4IDPAA4'))),
+    46,
+    atob("CQ0UERQUFBQUExQUCQ=="),
+    32+(scale<<8)+(1<<16)
+  );
+  return this;
 };
 
+Graphics.prototype.setFontLECO1976Regular5fix11 = function(scale) {
+  // Actual height 11 (10 - 0)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('AAMBwEDgEGgECgF8g/4v/w/+B+ARBg//h/+j/8mEYsEw//h//D/+AgEMg0Yhk/DofggHAFwMAh9+j38nv4scw41h/nD/OH+YdC5kxzAODxgsBw47CIIM/wF/gAGBhkAjBKFCAN/mH+FgUZw0zhl+jH8mP4CAJZEBwVmBwdj+HwgPggfAQoIxBFgJoDSwUDJQhZDO4QsB4CVB+cP80fNAiVGgaWDmAA=='))),
+    46,
+    atob("BAYJCAkJCQkJCQkJBA=="),
+    15+(scale<<8)+(1<<16)
+  );
+  return this;
+};
 
 require("Font7x11Numeric7Seg").add(Graphics);
 
@@ -60,7 +83,7 @@ function drawCal() {
     const CAL_Y = g.getHeight() - 44; // Bangle.appRect.y+this.DATE_FONT_SIZE()+10+this.TIME_FONT_SIZE()+3;
     const CAL_AREA_H = 44; // g.getHeight()-CAL_Y+24; //+24: top widgtes only
     const CELL_W = g.getWidth() / 7; //cell width
-    const CELL_H = (CAL_AREA_H - DAY_NAME_FONT_SIZE) / 3; //cell heigth
+    const CELL_H = 1+parseInt((CAL_AREA_H - DAY_NAME_FONT_SIZE) / 3); //cell heigth
     const DAY_NUM_FONT_SIZE = Math.min(CELL_H + 3, 15); //size down, max 15
 
     const wdStrt = 1;
@@ -73,11 +96,14 @@ function drawCal() {
     const tdyNumClr = 0; // today fg
 
     g.setFont("Vector", DAY_NAME_FONT_SIZE + 3);
+    
+    
+    
     g.setColor(nrgb[1]);
     g.setFontAlign(-1, -1);
     // g.clearRect(Bangle.appRect.x, CAL_Y, Bangle.appRect.x2, CAL_Y+CAL_AREA_H);
 
-    //draw grid & Headline
+    // == draw grid & Headline ==
     const dNames = ABR_DAY.map((a) => a.length <= 2 ? a : a.substr(0, 2)); //force shrt 2
     for (var dNo = 0; dNo < dNames.length; dNo++) {
         const dIdx = wdStrt >= 0 ? ((wdStrt + dNo) % 7) : ((dNo + d.getDay() + 4) % 7);
@@ -103,9 +129,10 @@ function drawCal() {
     // horizontal lines
     // for(i=0; i<3; i++){ const y=nextY+i*CELL_H; g.drawLine(Bangle.appRect.x, y, Bangle.appRect.x2, y); }
 
-    g.setFont("Vector", DAY_NUM_FONT_SIZE);
+    // g.setFont("Vector", DAY_NUM_FONT_SIZE);
 
-    g.setFont("7x11Numeric7Seg", 1);
+    // g.setFont("7x11Numeric7Seg", 1);
+    g.setFontLECO1976Regular5fix11();
 
     //write days
     const tdyDate = d.getDate();
@@ -113,16 +140,38 @@ function drawCal() {
     var rD = new Date(d.getTime());
     rD.setDate(rD.getDate() - days);
     var rDate = rD.getDate();
+    
+    // == today background rectangle ==
     for (var y = 0; y < 3; y++) {
         for (var x = 0; x < dNames.length; x++) {
             if (rDate === tdyDate) { //today
                 g.setColor(nrgb[tdyMrkClr]); //today marker color or fg color
 
                 // rectangle
-                g.fillRect(x * CELL_W, nextY + CELL_H - 1, x * CELL_W + CELL_W, nextY + CELL_H + CELL_H - 1);
-                g.setColor(nrgb[tdyNumClr]); //today color or fg color
+                var frm=3; // fame pixels
+                g.drawRect(x * CELL_W-frm, nextY + CELL_H - 1-frm, x * CELL_W + CELL_W+frm, nextY + CELL_H + CELL_H - 1+frm);
+            }
+            rD.setDate(rDate + 1);
+            rDate = rD.getDate();
+        }
+    }
+    
+    // == individual days ==
+    rD = new Date(d.getTime());
+    rD.setDate(rD.getDate() - days);
+    rDate = rD.getDate();
+    for (var y = 0; y < 3; y++) {
+        for (var x = 0; x < dNames.length; x++) {
+            if (rDate === tdyDate) { //today
+                g.setColor(nrgb[tdyMrkClr]); //today marker color or fg color
+
+                // rectangle
+                // g.fillRect(x * CELL_W, nextY + CELL_H - 1, x * CELL_W + CELL_W, nextY + CELL_H + CELL_H - 1);
+                // g.setColor(nrgb[tdyNumClr]); //today color or fg color
+                // g.drawRect(x * CELL_W, nextY + CELL_H - 1, x * CELL_W + CELL_W, nextY + CELL_H + CELL_H - 1);
 
                 // simulate "bold"
+                // g.setColor(nrgb[tdyNumClr]); //today color or fg color
                 g.drawString(rDate, 1 + x * CELL_W + ((CELL_W - g.stringWidth(rDate)) / 2) + 2, nextY + ((CELL_H - DAY_NUM_FONT_SIZE + 2) / 2) + (CELL_H * y));
 
             } else if (IS_SUNDAY[rD.getDay()]) { //sundays
@@ -153,7 +202,7 @@ function draw() {
 
     // g.setFont('Vector', 30);
     // g.setFont("7x11Numeric7Seg", 5);
-    g.setFontLECO1976Regular42();
+    g.setFontLECO1976Regular5fix42();
     g.setFontAlign(0, -1);
     g.drawString(timeString(h, m), g.getWidth() / 2, 28);
     g.drawString(dayString(d), g.getWidth() * 3 / 4, 88);
@@ -162,7 +211,7 @@ function draw() {
     g.reset();
 
     // Steps
-    g.setFontLECO1976Regular22();
+    g.setFontLECO1976Regular5fix22();
     g.setFontAlign(-1, -1);
     g.drawString(getSteps(), 8, 88);
 
@@ -200,4 +249,4 @@ Bangle.on('lcdPower', on => {
 });
 
 
-Bangle.drawWidgets();
+Bangle.drawWidgets();
\ No newline at end of file
diff --git a/apps/glbasic/metadata.json b/apps/glbasic/metadata.json
index 6d4c562a3..2636deefa 100644
--- a/apps/glbasic/metadata.json
+++ b/apps/glbasic/metadata.json
@@ -2,7 +2,7 @@
   "id": "glbasic",
   "name": "GLBasic Clock",
   "shortName": "GLBasic",
-  "version": "0.21",
+  "version": "0.22",
   "description": "A clock with large numbers",
   "dependencies": {"widpedom":"app"},
   "icon": "icon48.png",
diff --git a/apps/gpsmagcourse/README.md b/apps/gpsmagcourse/README.md
new file mode 100644
index 000000000..82670e7a2
--- /dev/null
+++ b/apps/gpsmagcourse/README.md
@@ -0,0 +1,38 @@
+# GPS Compass course switcher
+The GPS course and speed is calculated by the difference of positions.
+However GPS position is noisy and prone to jump around.
+This results in randomly jumping GPS course values when speed is slow or standing still.
+So in these cases a user might want to get the moving direction from a compass instead.
+This is why this service replaces the GPS course with the compass heading when the speed is slower then 6 km/h (threshold is configurable, see settings).
+You can switch between the built-in compass and "Navigation Compass" (magnav) as the source of the compass heading. When using magnav on Bangle.js 2 at least firmware 2v16.191 is recommended to get a three-dimensional reading.
+
+## Important Notes
+* **Watch orientation**
+  When the GPS is calculating the course the orientation of the watch does not matter.
+  When the Compass is used as the source of the current heading its top must obviously point at the moving direction (Usually away from you).
+* **Compass reset and calibration**
+  When using "Navigation Compass" as compass source (see settings) please remember to calibrate it regularly. The author recommends to calibrate before every use and at least each time after attaching the charge cable.
+  With this service installed the built-in compass calibration is automatically reset when the compass is turned on (deactivatable in settings). It can also be reset with a tap on the Widget (Bangle.js 2 only). Please note that directly after a reset the built-in compass must be turned 360 degrees to provide a useable value.
+* **True north vs magnetic north**
+  Please note that the compass does not point to the "real north" but depending on your location there is an offset, see [Magnetic declination](https://en.wikipedia.org/wiki/Magnetic_declination)
+  However the error from local magnetic interference and from calibration will probably be higher..
+
+## Widget
+The widget indicates if the current GPS course is provided from GPS or compass.
+It can be turned off in the settings.
+On Bangle.js 2 a click on the widget does reset the built-in compass, it has only an affect if the built-in compass is used.
+
+## Settings
+* **Speed threshold**
+  - (default = 6 km/h) When GPS speed is lower then this threshold use the compass direction. The speed must be for at least 10 seconds this fast to switch back to GPS course. The optimum threshold varies with the quality of the GPS reception.
+* **Compass source**
+  - off: Disables this service.
+  - built-in (default if "Navigation Compass" is not installed): Uses the built-in compass. Its calibration can be restarted by pressing the Widget. The watch must be orientated horizontally for the compass heading to be used.
+  - magnav (default if "Navigation Compass" is installed and calibrated): Compass heading is provided by "Navigation Compass" (magnav).
+* **Reset compass when powered on**
+  - Off: Do nothing when compass is turned on.
+  - On (default): The calibration of the built-in compass is reset when it is turned on.
+* **Show Widget**
+  - Never: Widget is hidden.
+  - Active (default): Widget is only visible when replacing GPS course with compass heading.
+  - GPS on: Widget is shown as soon as GPS is enabled, crossed out when GPS provides the course and displayed normally when the compass heading is used.
diff --git a/apps/gpsmagcourse/app.png b/apps/gpsmagcourse/app.png
new file mode 100644
index 000000000..c7e990268
Binary files /dev/null and b/apps/gpsmagcourse/app.png differ
diff --git a/apps/gpsmagcourse/boot.js b/apps/gpsmagcourse/boot.js
new file mode 100644
index 000000000..723e27598
--- /dev/null
+++ b/apps/gpsmagcourse/boot.js
@@ -0,0 +1,79 @@
+{
+  const settings = Object.assign({
+    speed: 6, // when lower then this use direction from compass
+    compassSrc: 2, // [off, built-in, magnav]
+    resetCompassOnPwr: true, // reset compass on power on
+  }, require("Storage").readJSON("gpsmagcourse.json", true) || {});
+  const CALIBDATA = (settings.compassSrc === 2) ? require("Storage").readJSON("magnav.json",1) : undefined;
+  let cntAboveSpeed = 0;
+  let lastGPS;
+
+  // Check if magnav is installed
+  try {
+    require("magnav");
+  } catch(err) {
+    // not installed, adjust settings to work without magnav
+    if (settings.compassSrc === 2) {
+      settings.compassSrc = 1;
+    }
+  }
+  if (settings.compassSrc === 2 && !CALIBDATA) {
+    // No calibration for magnav, fallback to built-in compass
+    settings.compassSrc = 1;
+  }
+
+  // execute Bangle.resetCompass() after Bangle.setCompassPower();
+  if (settings.resetCompassOnPwr) {
+    const origSetCompassPower = Bangle.setCompassPower;
+      Bangle.setCompassPower = function(on, id) {
+        const isOn = origSetCompassPower(on, id);
+        if (on) {
+          Bangle.resetCompass();
+        }
+        return isOn;
+    };
+  } // if (settings.resetCompassOnPwr)
+
+  if (settings.compassSrc > 0) {
+    const isFaceUp = (acc) => {
+      return (acc.z<-6700/8192) && (acc.z>-9000/8192) && Math.abs(acc.x)<2048/8192 && Math.abs(acc.y)<2048/8192;
+    };
+
+    const changeGpsCourse = (gps) => {
+      cntAboveSpeed = gps.speed < settings.speed ? 0 : cntAboveSpeed+1;
+      if (cntAboveSpeed < 10) { // need to stay x events above or equal threshold
+        if (settings.compassSrc === 1 && isFaceUp(Bangle.getAccel())) { // Use built-in compass heading only if face is up
+          const heading = Bangle.getCompass().heading;
+          if (!isNaN(heading)) {
+            gps.courseOrig = gps.course;
+            gps.course = Bangle.getCompass().heading;
+          }
+        } else if (settings.compassSrc === 2) { // magnav
+          gps.courseOrig = gps.course;
+          gps.course = require("magnav").tiltfixread(CALIBDATA.offset,CALIBDATA.scale);
+        }
+      }
+      return gps;
+    };
+
+    // Modify GPS event
+    Bangle.on('GPS', gps => {
+      lastGPS = gps;
+      if (!isNaN(gps.course)) {
+        changeGpsCourse(gps);
+      }
+    });
+    const origGetGPSFix = Bangle.getGPSFix;
+    Bangle.getGPSFix = function() {
+      return lastGPS === undefined ? origGetGPSFix() : lastGPS;
+    };
+
+    // Enable Compass with GPS
+    const origSetGPSPower = Bangle.setGPSPower;
+    Bangle.setGPSPower = function(on, id) {
+      const isGPSon = origSetGPSPower(on, id);
+      Bangle.setCompassPower(isGPSon, "gpsmagcourse" + (id || ''));
+      return isGPSon;
+    };
+  } // if (settings.compassSrc > 0)
+}
diff --git a/apps/gpsmagcourse/metadata.json b/apps/gpsmagcourse/metadata.json
new file mode 100644
index 000000000..057b01383
--- /dev/null
+++ b/apps/gpsmagcourse/metadata.json
@@ -0,0 +1,19 @@
+{
+  "id": "gpsmagcourse",
+  "name": "GPS Compass course switcher",
+  "shortName":"GPS/Compass course",
+  "icon": "app.png",
+  "version":"0.01",
+  "description": "Replaces the GPS course with the compass heading when speed is slow or standing still to avoid the value from jumping randomly. For best experience also install \"Navigation Compass\", although not a requirement (see README).",
+  "type": "bootloader",
+  "tags": "outdoors,widget",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"gpsmagcourse.boot.js","url":"boot.js"},
+    {"name":"gpsmagcourse.wid.js","url":"widget.js"},
+    {"name":"gpsmagcourse.settings.js","url":"settings.js"}
+  ],
+  "data": [{"name":"gpsmagcourse.json"}]
+}
+
diff --git a/apps/gpsmagcourse/settings.js b/apps/gpsmagcourse/settings.js
new file mode 100644
index 000000000..e574292d6
--- /dev/null
+++ b/apps/gpsmagcourse/settings.js
@@ -0,0 +1,75 @@
+(function(back) {
+  var FILE = "gpsmagcourse.json";
+  // Load settings
+  const settings = Object.assign({
+    speed: 6, // when lower then this use direction from compass
+    compassSrc: 2, // [off, built-in, magnav]
+    resetCompassOnPwr: true, // reset compass on power on
+    showWidget: 2, // 0 = never, 1 = when replacing GPS course with compass course, 2 = when GPS is on
+  }, require("Storage").readJSON(FILE, true) || {});
+
+  let magnavInstalled = true;
+  // Check if magnav is installed
+  try {
+    require("magnav");
+  } catch(err) {
+    // not installed
+    magnavInstalled = false;
+  }
+
+  if (!magnavInstalled) {
+    // adjust settings to work without magnav
+    if (settings.compassSrc === 2) {
+      settings.compassSrc = 1;
+    }
+  }
+  const compassSrcOpts = [/*LANG*/"off", /*LANG*/"built-in"];
+  if (magnavInstalled) {
+    compassSrcOpts.push(/*LANG*/"magnav");
+  }
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  const menu = {
+    "" : { "title" : /*LANG*/"GPS/Com.course" },
+    "< Back" : () => back(),
+    /*LANG*/'Speed threshold': {
+      value: settings.speed,
+      min: 1, max: 20, step: 0.5,
+      onchange: v => {
+        settings.speed = v;
+        writeSettings();
+      }
+    },
+    /*LANG*/'Compass source': {
+      value: settings.compassSrc,
+      min: 0, max: compassSrcOpts.length-1,
+      format: v => compassSrcOpts[v],
+      onchange: v => {
+        settings.compassSrc = v;
+        writeSettings();
+      }
+    },
+    /*LANG*/'Reset compass when powered on': {
+      value: !!settings.resetCompassOnPwr,
+      onchange: v => {
+        settings.resetCompassOnPwr = v;
+        writeSettings();
+      }
+    },
+    /*LANG*/'Show Widget': {
+      value: settings.showWidget,
+      min: 0, max: 2,
+      format: v => [/*LANG*/"Never", /*LANG*/"Active", /*LANG*/"GPS on"][v],
+      onchange: v => {
+        settings.showWidget = v;
+        writeSettings();
+      }
+    },
+  };
+
+  // Show the menu
+  E.showMenu(menu);
+})
diff --git a/apps/gpsmagcourse/widget.js b/apps/gpsmagcourse/widget.js
new file mode 100644
index 000000000..6317cedcd
--- /dev/null
+++ b/apps/gpsmagcourse/widget.js
@@ -0,0 +1,80 @@
+(() => {
+  const settings = Object.assign({
+    compassSrc: 1, // 0 = off
+    showWidget: 2, // 0 = never, 1 = when replacing GPS course with compass course, 2 = when GPS is on
+  }, require("Storage").readJSON("gpsmagcourse.json", true) || {});
+
+  function isInside(rect, e) {
+    return e.x>=rect.x && e.x<rect.x+rect.w
+          && e.y>=rect.y && e.y<=rect.y+rect.h;
+  }
+
+  function draw() {
+    if (this.width) {
+      g.clearRect(this.x, this.y, this.x+this.width-1, this.y+23);
+
+      if (this.show) {
+        this.width = 24;
+        g.reset();
+        g.drawImage(require("heatshrink").decompress(atob("jEYwgrohEN6EwBQ+DBYM4wALFxGA7vdB4IWFxEABYMAnAlECwMNBYPQCIQLDgALDDAI5EBYIFBBYIeBBYRBGA4QnBCAZBDA4ILLEZYLMKYR9FAgaKFNYpgCD4RBFAwQLBCwpOELAwACgeIwbLHK5ILPAAwA=")), this.x, this.y);
+        if (this.show === 2) {
+          // draw stroke
+          g.setColor(1,0,0).fillPoly([this.x+2, 0,
+                                      this.x+this.width-1,this.y+21,
+                                      this.x+this.width-3, this.y+23,
+                                      this.x, 2
+                                     ]);
+        }
+      }
+    }
+
+    const newWidth = this.show ? 24 : 0;
+    if (newWidth !== this.width) {
+      this.width = newWidth;
+      Bangle.drawWidgets();
+    }
+  }
+
+  if (settings.compassSrc > 0 && settings.showWidget > 0) {
+    // add your widget
+    WIDGETS.gpsmagcourse={
+      area:"tr", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
+      width: 0, // hide by default
+      draw:draw,
+      show:0 // 0 = hide, 1 = show, 2 = with stroke
+    };
+
+    // show only when GPS course is replaced
+    Bangle.on('GPS', function(gps) {
+      if (gps.courseOrig && WIDGETS.gpsmagcourse.show !== 1 && Bangle.isGPSOn()) {
+        WIDGETS.gpsmagcourse.show = 1;
+        WIDGETS.gpsmagcourse.draw();
+      } else if (!gps.courseOrig && WIDGETS.gpsmagcourse.show === 1) {
+        WIDGETS.gpsmagcourse.show = settings.showWidget === 1 ? 0 : 2;
+        WIDGETS.gpsmagcourse.draw();
+      }
+    });
+
+    // hide widget if GPS is turned off
+    const origSetGPSPower = Bangle.setGPSPower;
+    Bangle.setGPSPower = function(on, id) {
+      const isGPSon = origSetGPSPower(on, id);
+      if (!isGPSon && WIDGETS.gpsmagcourse.show) {
+        WIDGETS.gpsmagcourse.show = 0;
+        WIDGETS.gpsmagcourse.draw();
+      } else if (isGPSon && !WIDGETS.gpsmagcourse.show) {
+        WIDGETS.gpsmagcourse.show = 2;
+        WIDGETS.gpsmagcourse.draw();
+      }
+      return isGPSon;
+    };
+
+    // reset compass on click on widget
+    Bangle.on('touch', function(button, touch) {
+      if (touch && WIDGETS.gpsmagcourse && WIDGETS.gpsmagcourse.x && WIDGETS.gpsmagcourse.width && isInside({x: WIDGETS.gpsmagcourse.x, y: WIDGETS.gpsmagcourse.y, w: WIDGETS.gpsmagcourse.width, h: 24}, touch)) {
+        Bangle.buzz(50);
+        Bangle.resetCompass();
+      }
+    });
+  } // if (settings.compassSrc > 0 && settings.showWidget)
+})();
diff --git a/apps/gpstrek/ChangeLog b/apps/gpstrek/ChangeLog
index 849088c64..0d7c06ab4 100644
--- a/apps/gpstrek/ChangeLog
+++ b/apps/gpstrek/ChangeLog
@@ -14,3 +14,5 @@
       Averaging for smoothing compass headings
       Save state if route or waypoint has been chosen
 0.09: Workaround a minifier issue allowing to install gpstrek with minification enabled
+0.10: Adds map view of loaded route
+      Automatically search for new waypoint if moving away from current target
\ No newline at end of file
diff --git a/apps/gpstrek/README.md b/apps/gpstrek/README.md
index c55f5a8bf..6901c90f1 100644
--- a/apps/gpstrek/README.md
+++ b/apps/gpstrek/README.md
@@ -6,11 +6,18 @@ This app is inspired by and uses code from "GPS Navigation" and "Navigation comp
 
 ## Usage
 
-Tapping or button to switch to the next information display, swipe right for the menu.
+Swipe left and right to change between map, info and menu. Swipe up and down in map and info display to change the displayed information.
 
-Choose either a route or a waypoint as basis for the display.
+### Menu
+Choose either a route or a waypoint as basis for the display and configure settings to your liking.
 
-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.
+### Map
+The map shows the loaded route. Current waypoint is a green dot with a circle around it that denotes how close you need to be to autoselect the next waypoint as target.
+The map is centered on the currently selected waypoint and the position will be shown relative to the waypoint. If the position is farther away than can be shown on the display the icon turns red and shows the approximate direction on the border of the map.
+Secondary map mode is an overview map. Tap the overview to enter scrolling mode and move it around. Tap again to get back to normal function navigation.
+
+### Info
+After selecting a target 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.
@@ -18,13 +25,9 @@ If they are on display, the source is the magnetometer and you should keep the b
 
 ### 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.
+If the GPS position is close enough to the next waypoint, the route is automatically advanced to the next waypoint.
 
 ### Waypoints
 
diff --git a/apps/gpstrek/app.js b/apps/gpstrek/app.js
index 1f46ae2b4..95db86aaf 100644
--- a/apps/gpstrek/app.js
+++ b/apps/gpstrek/app.js
@@ -1,7 +1,31 @@
 
 { //run in own scope for fast switch
+
+const MODE_MENU = 0;
+const MODE_MAP = 1;
+const MODE_SLICES = 2;
+
 const STORAGE = require("Storage");
 const BAT_FULL = require("Storage").readJSON("setting.json").batFullVoltage || 0.3144;
+const SETTINGS = {
+  mapCompass: true,
+  mapScale:0.2, //initial value
+  mapRefresh:1000, //minimum time in ms between refreshs of the map
+  mapChunkSize: 5, //render this many waypoints at a time
+  overviewScroll: 30, //scroll this amount on swipe in pixels
+  overviewScale: 0.02, //initial value
+  refresh:500, //general refresh interval in ms
+  refreshLocked:3000, //general refresh interval when Bangle is locked
+  cacheMinFreeMem:2000,
+  cacheMaxEntries:0,
+  minCourseChange: 5, //course change needed in degrees before redrawing the map
+  minPosChange: 5, //position change needed in pixels before redrawing the map
+  waypointChangeDist: 50, //distance in m to next waypoint before advancing automatically
+  queueWaitingTime: 5, // waiting time during processing of task queue items when running with timeouts
+  autosearch: true,
+  maxDistForAutosearch: 300,
+  autosearchLimit: 3
+};
 
 let init = function(){
   global.screen = 1;
@@ -9,22 +33,13 @@ let init = function(){
   global.lastDrawnScreen = 0;
   global.firstDraw = true;
   global.slices = [];
-  global.maxScreens = 1;
+  global.maxSlicePages = 1;
   global.scheduleDraw = false;
 
   Bangle.loadWidgets();
   WIDGETS.gpstrek.start(false);
-  if (!WIDGETS.gpstrek.getState().numberOfSlices) WIDGETS.gpstrek.getState().numberOfSlices = 3;
-};
-
-let cleanup = function(){
-  if (global.drawTimeout) clearTimeout(global.drawTimeout);
-  delete global.screen;
-  delete global.drawTimeout;
-  delete global.lastDrawnScreen;
-  delete global.firstDraw;
-  delete global.slices;
-  delete global.maxScreens;
+  if (!WIDGETS.gpstrek.getState().numberOfSlices) WIDGETS.gpstrek.getState().numberOfSlices = 2;
+  if (!WIDGETS.gpstrek.getState().mode) WIDGETS.gpstrek.getState().mode = MODE_MENU;
 };
 
 init();
@@ -63,7 +78,45 @@ let parseWaypointWithElevationAndName = function(filename, offset, result){
   return parseName(filename, offset, result);
 };
 
-let getEntry = function(filename, offset, result){
+let cache = {};
+let cachedOffsets = [];
+
+let getFromCache = function(filename, offset, result){
+  if(filename == cache.filename && cache[offset]) {
+    Object.assign(result, cache[offset]);
+    result.access = Date.now();
+    return offset + cache[offset].fileLength;
+  }
+  return offset;
+};
+
+let cacheCleanup = function (){
+  if (SETTINGS.cacheMinFreeMem){
+    while (cachedOffsets.length > 0 && process.memory(false).free < SETTINGS.cacheMinFreeMem){
+      cache[cachedOffsets.shift()] = undefined;
+    }
+  }
+  if (SETTINGS.cacheMaxEntries){
+    while (cachedOffsets.length > SETTINGS.cacheMaxEntries){
+      cache[cachedOffsets.shift()] = undefined;
+    }
+  }
+};
+
+let cacheAdd = function (filename, result) {
+  cacheCleanup();
+  if(cache.filename != filename) {
+    cache = {};
+    cache.filename = filename;
+  }
+  cache[result.fileOffset] = result;
+  cachedOffsets.push(result.fileOffset);
+};
+
+let getEntry = function(filename, offset, result, noCaching){
+  if (offset < 0) return offset;
+  let cacheOffset = getFromCache(filename, offset, result);
+  if (cacheOffset != offset) return cacheOffset;
   result.fileOffset = offset;
   let type = STORAGE.read(filename, offset++, 1);
   if (type == "") return -1;
@@ -87,7 +140,9 @@ let getEntry = function(filename, offset, result){
   offset++;
 
   result.fileLength = offset - result.fileOffset;
-  //print(result);
+  if (!noCaching && (SETTINGS.cacheMaxEntries || SETTINGS.cacheMinFreeMem)){
+    cacheAdd(filename, result);
+  }
   return offset;
 };
 
@@ -104,18 +159,8 @@ let matchFontSize = function(graphics, text, height, width){
   }
 };
 
-let getDoubleLineSlice = function(title1,title2,provider1,provider2,refreshTime){
-  let lastDrawn = Date.now() - Math.random()*refreshTime;
-  let lastValue1 = 0;
-  let lastValue2 = 0;
+let getDoubleLineSlice = function(title1,title2,provider1,provider2){
   return {
-    refresh: function (){
-      let bigChange1 = (Math.abs(lastValue1 - provider1()) > 1);
-      let bigChange2 = (Math.abs(lastValue2 - provider2()) > 1);
-      let refresh = (Bangle.isLocked()?(refreshTime?refreshTime*5:10000):(refreshTime?refreshTime*2:1000));
-      let old = (Date.now() - lastDrawn) > refresh;
-      return (bigChange1 || bigChange2) && old;
-    },
     draw: function (graphics, x, y, height, width){
       lastDrawn = Date.now();
       if (typeof title1 == "function") title1 = title1();
@@ -139,15 +184,385 @@ let getDoubleLineSlice = function(title1,title2,provider1,provider2,refreshTime)
   };
 };
 
+const dot = Graphics.createImage(`
+XX
+XX
+`);
+
+const arrow = Graphics.createImage(`
+     X
+    XXX
+   XXXXX
+  XXX XXX
+ XXX   XXX
+XXX     XXX
+`);
+
+const cross = Graphics.createImage(`
+XX       XX
+ XX     XX
+  XX   XX
+   XX XX
+    XXX
+   XX XX
+  XX   XX
+ XX     XX
+XX       XX
+`);
+
+const move = Graphics.createImage(`
+      X
+     XXX
+    X X X
+      X
+      X
+  X   X   X
+ X    X    X
+XXXXXXXXXXXXX
+ X    X    X
+  X   X   X
+      X
+      X
+    X X X
+     XXX
+      X
+`);
+
+const point = Graphics.createImage(`
+   XX
+  XXXX
+ XX  XX
+XX    XX
+XX    XX
+ XX  XX
+  XXXX
+   XX
+`);
+
+let isGpsCourse = function(){
+  return WIDGETS.gpstrek.getState().currentPos && isFinite(WIDGETS.gpstrek.getState().currentPos.course);
+};
+
+let isMapOverview = false;
+let forceMapRedraw = false;
+
+let activeTimeouts = [];
+let taskQueue = [];
+let queueProcessing = false;
+
+let addToTaskQueue = function (func, data){
+  if (queueProcessing) print("Adding during processing, this should not happen");
+  taskQueue.push({f:func,d:data});
+};
+
+let prependTaskQueue = function (func, data, force){
+  if (queueProcessing && !force) print("Prepending during processing, this should not happen");
+  taskQueue.unshift({f:func,d:data});
+};
+
+let runQueue = function(inTimeouts){
+  if (taskQueue.length > 0){
+    let current = taskQueue.shift();
+    if (inTimeouts){
+      let id = setTimeout(()=>{
+        current.f(current.d);
+        activeTimeouts = activeTimeouts.filter((c)=>c!=id);
+        runQueue(inTimeouts);
+      },SETTINGS.queueWaitingTime);
+      activeTimeouts.push(id);
+    } else {
+      current.f(current.d);
+      runQueue(inTimeouts);
+    }
+  }
+};
+
+let processTaskQueue = function(inTimeouts){
+  if (queueProcessing) return;
+  addToTaskQueue(()=>{queueProcessing=false;});
+  queueProcessing = true;
+  runQueue(inTimeouts);
+};
+
+let clearTaskQueue = function(){
+  taskQueue = [];
+  for (let c of activeTimeouts){
+    clearTimeout(c);
+  }
+  queueProcessing = false;
+};
+
+let getMapSlice = function(){
+  let lastDrawn = 0;
+  let lastCourse = 0;
+  let lastStart;
+  let lastCurrent;
+  return {
+    draw: function (graphics, x, y, height, width){
+      let s = WIDGETS.gpstrek.getState();
+
+      let course = 0;
+      if (isGpsCourse())
+        course = s.currentPos.course;
+      else
+        course = getAveragedCompass();
+
+      let route = s.route;
+      if (!route) return;
+      let waypoint = get(route);
+      let currentRouteIndex = getWaypointIndex(route);
+      let startingPoint = Bangle.project(waypoint);
+      let current = startingPoint;
+      let currentPosFromGPS = false;
+      if (s.currentPos.lat) {
+        current = Bangle.project(s.currentPos);
+        currentPosFromGPS = true;
+      } else {
+        // in case of no actual position assume previous waypoint as current
+        let prevPoint = getPrev(route, currentRouteIndex);
+        if (prevPoint && prevPoint.lat) current = Bangle.project(prevPoint);
+      }
+
+      const interfaceHeight = g.getHeight()*0.1;
+      const errorMarkerSize=3;
+      let compassHeight = height*0.4;
+      if (!SETTINGS.mapCompass) compassHeight=0;
+      if (compassHeight > g.getHeight()*0.1) compassHeight = g.getHeight()*0.1;
+      let compassCenterX = x + errorMarkerSize + 8 + compassHeight;
+      let compassCenterY = y + errorMarkerSize + 8 + compassHeight;
+      let mapCenterX = isMapOverview?mapOverviewX:x+(width-10)/2+compassHeight+5;
+      let mapCenterY = isMapOverview?mapOverviewY:y+height*0.4;
+      let mapScale = isMapOverview?mapOverviewScale : mapLiveScale;
+      let mapRot = require("graphics_utils").degreesToRadians(180-(isMapOverview?0:course));
+      let mapTrans = {
+        scale: mapScale,
+        rotate: mapRot,
+        x: mapCenterX,
+        y: mapCenterY
+      };
+
+      let drawInterface = function(){
+
+        graphics.setClipRect(x,y,x+width,y+height);
+        graphics.setFont("Vector",25).setFontAlign(0,0);
+        graphics.setColor(graphics.theme.fg);
+        graphics.clearRect(x,y+height-interfaceHeight,x+width,y+height-1);
+
+        graphics.drawRect(x,y+height-interfaceHeight,x+width/4,y+height-1);
+        graphics.drawString("-", x+width*0.125,y+height-interfaceHeight*0.5);
+
+        graphics.drawRect(x+width*0.75,y+height-interfaceHeight,x+width-1,y+height-1);
+        graphics.drawString("+", x+width*0.875,y+height-interfaceHeight*0.5);
+
+        let refs = [10,20,50,100,200,300,400,500,800,1000,2000,5000,10000,50000];
+        let l = width*0.4;
+        let scale = refs[0];
+        for (let c of refs){
+          if (c*mapScale > l)
+            break;
+          else
+            scale = c;
+        }
+        let scaleString = loc.distance(scale, 2);
+
+        let scaleHeight = interfaceHeight * 0.2;
+        graphics.setFontAlign(-1,-1).setFont("Vector",12);
+        graphics.drawString(scaleString,x+width*0.31,y+height-interfaceHeight, true);
+        if (isFinite(scale)){
+          graphics.drawLine(x+width*0.3,y+height-scaleHeight,x+width*0.3+scale*mapScale,y+height-scaleHeight);
+          graphics.drawLine(x+width*0.3,y+height-scaleHeight,x+width*0.3,y+height-interfaceHeight);
+          graphics.drawLine(x+width*0.3+scale*mapScale,y+height-scaleHeight,x+width*0.3+scale*mapScale,y+height-interfaceHeight);
+        }
+      };
+
+      let drawMapCompass = function(){
+        graphics.setClipRect(x,y,x+width,y+height-interfaceHeight-1);
+        graphics.setFont6x15();
+        let compass = [ 0,0, 0, compassHeight, 0, -compassHeight, compassHeight,0,-compassHeight,0 ];
+        compass = graphics.transformVertices(compass, {
+          rotate:require("graphics_utils").degreesToRadians(180-course),
+          x: compassCenterX,
+          y: compassCenterY
+        });
+        graphics.setFontAlign(0,0);
+        graphics.setColor(graphics.theme.bg);
+        graphics.fillCircle(compassCenterX, compassCenterY,compassHeight+7);
+        graphics.setColor(graphics.theme.fg);
+        graphics.drawCircle(compassCenterX, compassCenterY,compassHeight);
+        graphics.drawString("N", compass[2], compass[3], true);
+        graphics.drawString("S", compass[4], compass[5], true);
+        graphics.drawString("W", compass[6], compass[7], true);
+        graphics.drawString("E", compass[8], compass[9], true);
+
+        if(!isGpsCourse() && !isMapOverview) {
+          let xh = E.clip(s.acc.x*compassHeight, -compassHeight, compassHeight);
+          let yh = E.clip(s.acc.y*compassHeight, -compassHeight, compassHeight);
+          graphics.fillCircle(compassCenterX + xh, compassCenterY + yh,3);
+        } else if (isMapOverview){
+          graphics.setColor(0,0,1);
+          graphics.fillCircle(compassCenterX, compassCenterY,3);
+        }
+      };
+
+      let drawCurrentPos = function(){
+        graphics.setClipRect(x,y,x+width,y+height-interfaceHeight-1);
+        graphics.setColor(graphics.theme.fg);
+
+        if (currentPosFromGPS) {
+          let pos = graphics.transformVertices([ startingPoint.x - current.x, (startingPoint.y - current.y)*-1 ], mapTrans);
+
+          if (!isMapOverview){
+            if (pos[0] < x) { pos[0] = x + errorMarkerSize + 5; graphics.setColor(1,0,0).fillRect(x,y,x+errorMarkerSize,y+height);}
+            if (pos[0] > x + width) {pos[0] = x + width - errorMarkerSize - 5; graphics.setColor(1,0,0).fillRect(x + width - errorMarkerSize,y,x + width ,y+height);}
+            if (pos[1] < y) {pos[1] = y + errorMarkerSize + 1; graphics.setColor(1,0,0).fillRect(x,y,x + width,y+errorMarkerSize);}
+            if (pos[1] > y + height - interfaceHeight -1) { pos[1] = y + height - errorMarkerSize - 5-interfaceHeight-1; graphics.setColor(1,0,0).fillRect(x,y + height - errorMarkerSize-interfaceHeight-1,x + width ,y+height-interfaceHeight-1);}
+          }
+
+          if (isMapOverview) {
+            graphics.drawImage(arrow, pos[0],pos[1], {rotate: require("graphics_utils").degreesToRadians(course)});
+          } else {
+            graphics.drawImage(arrow, pos[0]-arrow.width/2,pos[1]);
+          }
+          graphics.setColor(0,1,0);
+          graphics.fillRect(mapCenterX-1,mapCenterY-1, mapCenterX+1,mapCenterY+1);
+          graphics.drawCircle(mapCenterX,mapCenterY, mapScale*SETTINGS.waypointChangeDist);
+          graphics.setColor(graphics.theme.fg);
+        } else {
+          graphics.setColor(0,1,0);
+          graphics.fillCircle(mapCenterX,mapCenterY, 5);
+          graphics.setColor(graphics.theme.fg);
+        }
+      };
+
+      let courseChanged = Math.abs(lastCourse - course) > SETTINGS.minCourseChange;
+      let oldEnough = Date.now() - lastDrawn > SETTINGS.mapRefresh;
+      let startChanged = (!lastStart || lastStart.x != startingPoint.x || lastStart.y != startingPoint.y);
+      let neededChange = (SETTINGS.minPosChange/(isMapOverview?mapOverviewScale:mapLiveScale));
+      let currentChanged = (!lastCurrent || (Math.abs(lastCurrent.x - current.x)) > neededChange|| (Math.abs(lastCurrent.y - current.y)) > neededChange);
+      let liveChanged = !isMapOverview && (startChanged || currentChanged || courseChanged);
+      let refreshMap = forceMapRedraw || (oldEnough && (liveChanged));
+
+      let renderInTimeouts = isMapOverview || !Bangle.isLocked();
+      if (refreshMap) {
+        clearTaskQueue();
+
+        //clear map view
+        graphics.clearRect(x,y,x+width,y+height-interfaceHeight-1);
+
+        if (isMapOverview && scrolling){
+          addToTaskQueue(()=>{
+            graphics.setColor(graphics.theme.fg);
+            graphics.drawImage(move, compassCenterX-compassHeight, compassCenterY-compassHeight);
+          });
+        }
+
+        if (!isMapOverview){
+          drawCurrentPos();
+        }
+        if (!isMapOverview && renderInTimeouts){
+          drawMapCompass();
+        }
+        if (renderInTimeouts) drawInterface();
+
+        forceMapRedraw = false;
+        lastDrawn = Date.now();
+
+        let drawPath = function(reverse, startingIndex, maxWaypoints){
+          let data = {
+            i:startingIndex,
+            poly:[],
+            maxWaypoints: maxWaypoints,
+            breakLoop: false
+          };
+
+          let drawChunk = function(data){
+            if (data.breakLoop) return;
+            graphics.setColor(graphics.theme.fg);
+            graphics.setClipRect(x,y,x+width,y+height-interfaceHeight-1);
+            let finish;
+            let last;
+            let toDraw;
+            let named = [];
+            for (let j = 0; j < SETTINGS.mapChunkSize; j++){
+              data.i = data.i + (reverse?-1:1);
+              let p = get(route, data.i);
+              if (!p || !p.lat) {
+                data.i = data.i + (reverse?1:-1);
+                data.breakLoop = true;
+                break;
+              }
+              if (data.maxWaypoints && Math.abs(startingIndex - data.i) > data.maxWaypoints) {
+                data.breakLoop = true;
+                last = true;
+                break;
+              }
+              toDraw = Bangle.project(p);
+              if (p.name) named.push({i:data.poly.length,n:p.name});
+              data.poly.push(startingPoint.x-toDraw.x);
+              data.poly.push((startingPoint.y-toDraw.y)*-1);
+            }
+            finish = isLast(route, getWaypointIndex(route, data.i));
+
+            data.poly = graphics.transformVertices(data.poly, mapTrans);
+            graphics.drawPoly(data.poly, false);
+
+            if (!isMapOverview && (data.poly[data.poly.length-2] < (x - 10)
+              || data.poly[data.poly.length-2] > (x + width + 10)
+              || data.poly[data.poly.length-1] < (y - 10)
+              || data.poly[data.poly.length-1] > (y + height + 10))) data.breakLoop = true;
+
+            graphics.setFont6x15().setFontAlign(-1,0);
+            for (let c of named){
+              if (data.i != 0 || currentPosFromGPS){
+                graphics.drawImage(point, Math.round(data.poly[c.i]-point.width/2), Math.round(data.poly[c.i+1]-point.height/2));
+              }
+              graphics.drawString(c.n, data.poly[c.i] + 10, data.poly[c.i+1]);
+            }
+            
+            if (finish)
+              graphics.drawImage(finishIcon, data.poly[data.poly.length - 2] -5, data.poly[data.poly.length - 1] - 4);
+            else if (last) {
+              graphics.drawImage(cross, data.poly[data.poly.length - 2] - cross.width/2, data.poly[data.poly.length - 1] - cross.height/2);
+            }
+
+            //Add last drawn point to get closed path
+            if (toDraw) {
+              data.poly = [ startingPoint.x-toDraw.x, (startingPoint.y-toDraw.y)*-1];
+              toDraw = null;
+            }
+
+            if (!data.breakLoop){
+              prependTaskQueue(drawChunk, data, true);
+            }
+          };
+          addToTaskQueue(drawChunk, data);
+        };
+
+        drawPath(true, currentRouteIndex+1);
+        drawPath(false, currentRouteIndex-1);
+
+        addToTaskQueue(drawInterface);
+
+        addToTaskQueue(drawCurrentPos);
+
+        addToTaskQueue(()=>{
+          lastCourse = course;
+          lastStart = startingPoint;
+          lastCurrent = current;
+        })
+        processTaskQueue(renderInTimeouts);
+      }
+      if (SETTINGS.mapCompass && !isMapOverview){
+        drawMapCompass();
+      }
+    }
+  };
+};
+
 let getTargetSlice = function(targetDataSource){
   let nameIndex = 0;
-  let lastDrawn = Date.now() - Math.random()*3000;
   return {
-    refresh: function (){
-      return Date.now() - lastDrawn > (Bangle.isLocked()?3000:10000);
-    },
     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);
@@ -155,14 +570,17 @@ let getTargetSlice = function(targetDataSource){
         width -= 16;
       }
 
-      if (!targetDataSource.getTarget() || !targetDataSource.getStart()) return;
+      let start = targetDataSource.getStart();
+      let target = targetDataSource.getTarget();
 
-      let dist = distance(targetDataSource.getStart(),targetDataSource.getTarget());
+      if (!target || !start) return;
+
+      let dist = distance(start,target);
       if (isNaN(dist)) dist = Infinity;
-      let bearingString = bearing(targetDataSource.getStart(),targetDataSource.getTarget()) + "°";
-      if (targetDataSource.getTarget().name) {
+      let bearingString = bearing(start,target) + "°";
+      if (target.name) {
         graphics.setFont("Vector",Math.floor(height*0.5));
-        let scrolledName = (targetDataSource.getTarget().name || "").substring(nameIndex);
+        let scrolledName = (target.name || "").substring(nameIndex);
         if (graphics.stringMetrics(scrolledName).width > width){
           nameIndex++;
         } else {
@@ -177,18 +595,15 @@ let getTargetSlice = function(targetDataSource){
         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 bearingString = bearing(start,target) + "°";
         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);
+
+        matchFontSize(graphics, bearingString + distNum, height*0.8, width);
+        graphics.setFontAlign(-1,-1);
+        graphics.drawString(bearingString, x+2, y);
         graphics.setFontAlign(1,-1);
-        graphics.drawString(distNum, x + width, y + (height - distNumMetrics.height)/2);
+        graphics.drawString(distNum, x + width, y);
         graphics.setFont("Vector",Math.floor(height*0.25));
 
         graphics.setFontAlign(-1,1);
@@ -196,7 +611,7 @@ let getTargetSlice = function(targetDataSource){
           graphics.drawString(targetDataSource.getProgress(), x + 2, y + height);
         }
         graphics.setFontAlign(1,1);
-        if (!isNaN(distNum) && distNum != Infinity)
+        if (isFinite(distNum) && distNum != Infinity)
           graphics.drawString(formattedDist.match(/[a-zA-Z]+/), x + width, y + height);
       }
     }
@@ -213,11 +628,11 @@ let drawCompass = function(graphics, x, y, height, width, increment, start){
   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));
+      graphics.drawString(labels[Math.floor(res/45)%8],xpos,y+height*0.1);
+      graphics.fillRect(xpos-1,Math.floor(y+height*0.8),xpos+1,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));
+      graphics.drawString(labels[Math.floor(res/45)%8],xpos,y+height*0.1);
+      graphics.fillRect(xpos-1,Math.floor(y+height*0.7),xpos+1,Math.floor(y+height));
     } else if (res%15==0) {
       graphics.fillRect(xpos,Math.floor(y+height*0.9),xpos+1,Math.floor(y+height));
     }
@@ -226,32 +641,55 @@ let drawCompass = function(graphics, x, y, height, width, increment, start){
   }
 };
 
-let getCompassSlice = function(compassDataSource){
-  let lastDrawn = Date.now() - Math.random()*2000;
+let getCompassSlice = function(){
+  let compassDataSource = {
+    getCourse: function (){
+      if(isGpsCourse()) return WIDGETS.gpstrek.getState().currentPos.course;
+      return getAveragedCompass();
+    },
+    getPoints: function (){
+      let points = [];
+      let s = WIDGETS.gpstrek.getState();
+      if (s.currentPos && s.currentPos.lon && s.route){
+        points.push({bearing:bearing(s.currentPos, getLast(s.route)), icon: finishIcon});
+      }
+      if (s.currentPos && s.currentPos.lon && s.waypoint){
+        points.push({bearing:bearing(s.currentPos, s.waypoint), icon: finishIcon});
+      }
+      if (s.currentPos && s.currentPos.lon && s.route){
+        points.push({bearing:bearing(s.currentPos, get(s.route)), color:"#0f0"});
+      }
+      return points;
+    },
+    getMarkers: function (){
+      return [{xpos:0.5, width:10, height:10, linecolor:g.theme.fg, fillcolor:"#f00"}];
+    }
+  };
   let lastDrawnValue = 0;
   const buffers = 4;
   let buf = [];
   return {
-    refresh : function (){
-      let bigChange = (Math.abs(lastDrawnValue - compassDataSource.getCourse()) > 2);
-      let old = (Bangle.isLocked()?(Date.now() - lastDrawn > 2000):true);
-      return bigChange && old;
+    refresh: function(){
+      return Math.abs(lastDrawnValue - compassDataSource.getCourse()) > SETTINGS.minCourseChange;
     },
     draw: function (graphics, x,y,height,width){
-      lastDrawn = Date.now();
       const max = 180;
       const increment=width/max;
 
+      let s = WIDGETS.gpstrek.getState();
+
+      let course = isGpsCourse() ? s.currentPos.course : getAveragedCompass();
+
+      lastDrawnValue = course;
+
       graphics.clearRect(x,y,x+width,y+height);
 
-      lastDrawnValue = compassDataSource.getCourse();
-
-      var start = lastDrawnValue - 90;
-      if (isNaN(lastDrawnValue)) start = -90;
+      var start = course - 90;
+      if (isNaN(course)) start = -90;
       if (start<0) start+=360;
       start = start % 360;
 
-      if (WIDGETS.gpstrek.getState().acc && compassDataSource.getCourseType() == "MAG"){
+      if (s.acc && !isGpsCourse()){
         drawCompass(graphics,0,y+width*0.05,height-width*0.05,width,increment,start);
       } else {
         drawCompass(graphics,0,y,height,width,increment,start);
@@ -262,7 +700,7 @@ let getCompassSlice = function(compassDataSource){
         let points = compassDataSource.getPoints(); //storing this in a variable works around a minifier bug causing a problem in the next line: for(let a of a.getPoints())
         for (let p of points){
           g.reset();
-          var bpos = p.bearing - lastDrawnValue;
+          var bpos = p.bearing - course;
           if (bpos>180) bpos -=360;
           if (bpos<-180) bpos +=360;
           bpos+=120;
@@ -301,9 +739,9 @@ let getCompassSlice = function(compassDataSource){
       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 (WIDGETS.gpstrek.getState().acc && compassDataSource.getCourseType() == "MAG") {
-        let xh = E.clip(width*0.5-height/2+(((WIDGETS.gpstrek.getState().acc.x+1)/2)*height),width*0.5 - height/2, width*0.5 + height/2);
-        let yh = E.clip(y+(((WIDGETS.gpstrek.getState().acc.y+1)/2)*height),y,y+height);
+      if (s.acc && !isGpsCourse()) {
+        let xh = E.clip(width*0.5-height/2+(((s.acc.x+1)/2)*height),width*0.5 - height/2, width*0.5 + height/2);
+        let yh = E.clip(y+(((s.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));
 
@@ -366,139 +804,279 @@ let triangle = function(x, y, width, height){
   ];
 };
 
-let onSwipe = function(dir){
-  if (dir < 0) {
-    nextScreen();
-  } else if (dir > 0) {
-    switchMenu();
-  } else {
-    nextScreen();
+mapOverviewX = g.getWidth()/2;
+mapOverviewY = g.getHeight()/2;
+mapOverviewScale = SETTINGS.overviewScale;
+mapLiveScale = SETTINGS.mapScale;
+
+let onAction = function(_,xy){
+  clearTaskQueue();
+  forceMapRedraw = true;
+  if (WIDGETS.gpstrek.getState().mode == MODE_MAP){
+    stopDrawing();
+    if (xy && xy.y > Bangle.appRect.y+Bangle.appRect.h-g.getHeight()*0.2 && xy.y <= Bangle.appRect.y2){
+      if (xy.x < Bangle.appRect.x + Bangle.appRect.w/2)
+        if (isMapOverview) {
+          mapOverviewScale /= 1.33;
+        } else {
+          mapLiveScale /= 1.33;
+        }
+      else
+        if (isMapOverview) {
+          mapOverviewScale *= 1.33;
+        } else {
+          mapLiveScale *= 1.33;
+        }
+    } else if (isMapOverview && xy && xy.y > Bangle.appRect.y){
+      scrolling = !scrolling;
+    }
+    startDrawing();
   }
 };
 
+let scrolling = false;
+
+let onSwipe = function(dirLR,dirUD){
+  let s = WIDGETS.gpstrek.getState();
+  clearTaskQueue();
+  forceMapRedraw = true;
+
+  if (s.mode == MODE_MAP){
+    if (!scrolling){
+      if (dirLR > 0) {
+        switchMode(MODE_MENU);
+      } else if (dirLR < 0) {
+        switchMode(MODE_SLICES);
+      }
+      if (dirUD){
+        isMapOverview = !isMapOverview;
+        if (!isMapOverview){
+          mapOverviewX = g.getWidth()/2;
+          mapOverviewY = g.getHeight()/2;
+          scrolling = false;
+        }
+        startDrawing();
+      }
+    } else {
+      mapOverviewX += dirLR * SETTINGS.overviewScroll;
+      mapOverviewY += dirUD * SETTINGS.overviewScroll;
+    }
+  } else if (s.mode == MODE_SLICES){
+    if (dirLR > 0) {
+      if (s.route){
+        switchMode(MODE_MAP);
+      } else {
+        switchMode(MODE_MENU);
+      }
+    } else if (dirLR < 0) {
+      switchMode(MODE_MENU);
+    }
+    if (dirUD){
+      setSlicesPage(dirUD);
+    }
+  } else {
+    if (dirLR > 0) {
+      switchMode(MODE_SLICES);
+    } else if (dirLR < 0) {
+      if (s.route){
+        switchMode(MODE_MAP);
+      } else {
+        switchMode(MODE_SLICES);
+      }
+    }
+  }
+};
+
+
 let setButtons = function(){
+  Bangle.removeListener("swipe", onSwipe);
   let options = {
     mode: "custom",
     swipe: onSwipe,
-    btn: nextScreen,
-    touch: nextScreen
+    btn: onAction,
+    touch: onAction,
   };
   Bangle.setUI(options);
 };
 
-let getApproxFileSize = function(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;
+let getFileSize = function(filename){
+  return STORAGE.readArrayBuffer(filename).byteLength;
 };
 
-let parseRouteData = function(filename, progressMonitor){
+let writeUint24 = function(filename, number, offset, size){
+  let b = new ArrayBuffer(3);
+  let n = new Uint24Array(b,0,1);
+  n[0] = number;
+  STORAGE.write(filename,b,offset,size);
+};
+
+let writeUint32 = function(filename, number, offset, size){
+  let b = new ArrayBuffer(4);
+  let n = new Uint32Array(b,0,1);
+  n[0] = number;
+  STORAGE.write(filename,b,offset,size);
+};
+
+let getRouteIndex = function(route){
+  if (!route.indexToOffset) loadIndex(route);
+  return route.indexToOffset;
+}
+
+let getIndexFileName = function(filename){
+  return filename.substring(0,filename.length-1) + "i";
+}
+
+let loadIndex = function(routeInfo){
+  routeInfo.indexToOffset = new Uint24Array(STORAGE.readArrayBuffer(getIndexFileName(routeInfo.filename)),4,routeInfo.count);
+}
+
+let loadRouteData = function(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 = {};
+  let count = 0;
 
   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);
+  let trfHash = E.CRC32(STORAGE.read(filename));
+  let size = getFileSize(filename);
+  let indexFileName = filename.substring(0,filename.length-1) + "i";
+  //shortest possible entry is 24 characters + linebreak, 3 bytes per entry, 4 bytes hash in front
+  let indexFileSize = Math.ceil(size/25*3 + 4);
+  let createIndexFile = !STORAGE.read(indexFileName);
+  if (!createIndexFile){
+    let currentHash = new Uint32Array(STORAGE.readArrayBuffer(indexFileName),0,1)[0];
+    if (currentHash != trfHash){
+      createIndexFile = true;
+    }
+  }
+
+  // write hash into index file, will be recreated by this
+  if (createIndexFile)
+    writeUint32(indexFileName, trfHash, 0, indexFileSize);
+
+  while ((scanOffset = getEntry(filename, scanOffset, waypoint, true)) > 0) {
+    if (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);
+    if (createIndexFile) writeUint24(indexFileName, waypoint.fileOffset, 4 + count * 3, indexFileSize);
+    count++;
     lastSeenWaypoint = waypoint;
-    if (!isNaN(waypoint.alt)) lastSeenAlt = waypoint.alt;
+    if (isFinite(waypoint.alt)) lastSeenAlt = waypoint.alt;
     waypoint = {};
   }
+  routeInfo.count = count;
+  loadIndex(routeInfo);
 
   set(routeInfo, 0);
   return routeInfo;
 };
 
-let hasPrev = function(route){
-  if (route.mirror) return route.index < (route.count - 1);
-  return route.index > 0;
+let hasPrev = function(route, index){
+  if (isNaN(index)) index = getWaypointIndex(route);
+  return index > 0;
 };
 
-let hasNext = function(route){
-  if (route.mirror) return route.index > 0;
-  return route.index < (route.count - 1);
+let hasNext = function(route, index, count){
+  if (!count) count = 1;
+  if (isNaN(index)) index = route.index;
+  return getWaypointIndex(route, index) + count < (getRouteIndex(route).length);
+};
+
+let getNext = function(route, index, count){
+  if (!count) count = 1;
+  if (isNaN(index)) index = getWaypointIndex(route);
+  index += count;
+  if (index >= getRouteIndex(route).length || index < 0) return;
+  let result = {};
+  getEntry(route.filename, getRouteIndex(route)[getWaypointIndex(route, index)], result);
+  return result;
+};
+
+let get = function(route, index){
+  if (isNaN(index)) index = getWaypointIndex(route);
+  if (index >= getRouteIndex(route).length || index < 0) return;
+  let result = {};
+  getEntry(route.filename, getRouteIndex(route)[getWaypointIndex(route, index)], result);
+  return result;
+};
+
+let getWaypointIndex = function(route, index){
+  if (isNaN(index)) index = route.index;
+  return route.mirror?getRouteIndex(route).length-1-index:index;
+};
+
+let setWaypointIndex = function(route, waypointIndex){
+  if (route.mirror)
+    route.index = getRouteIndex(route).length - 1 - waypointIndex;
+  else
+    route.index = waypointIndex;
+};
+
+let getPrev = function(route, index){
+  return getNext(route, index, -1);
 };
 
 let next = function(route){
   if (!hasNext(route)) return;
-  if (route.mirror) set(route, --route.index);
-  if (!route.mirror) set(route, ++route.index);
+  set(route, getWaypointIndex(route)+1);
 };
 
 let set = function(route, index){
-  route.currentWaypoint = {};
-  route.index = index;
-  getEntry(route.filename, route.refs[index], route.currentWaypoint);
+  if (!route) return;
+  route.index = getWaypointIndex(route, index);
 };
 
 let prev = function(route){
   if (!hasPrev(route)) return;
-  if (route.mirror) set(route, ++route.index);
-  if (!route.mirror) set(route, --route.index);
+  set(route, getWaypointIndex(route)-1);
 };
 
-let lastMirror;
-let cachedLast;
-
 let getLast = function(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;
+  return get(route, getRouteIndex(route).length - 1);
+};
+
+let isLast = function(route, index){
+  if (isNaN(index)) index = route.index;
+  index = getWaypointIndex(route, index);
+  return getRouteIndex(route).length - 1 == index;
 };
 
 let removeMenu = function(){
+  let s = WIDGETS.gpstrek.getState();
   E.showMenu();
-  switchNav();
+  switch(searchNeeded){
+    case 1:
+      setClosestWaypoint(s.route, getWaypointIndex(s.route), showProgress);
+      break;
+    case 2:
+      setClosestWaypoint(s.route, 0, showProgress)
+      break;
+  }
+  searchNeeded = 0;
+  onSwipe(-1,0);
 };
 
 let showProgress = function(progress, title, max){
-  //print("Progress",progress,max)
   let message = title? title: "Loading";
   if (max){
     message += " " + E.clip((progress/max*100),0,100).toFixed(0) +"%";
@@ -512,10 +1090,10 @@ let showProgress = function(progress, title, max){
 
 let handleLoading = function(c){
   E.showMenu();
-  WIDGETS.gpstrek.getState().route = parseRouteData(c, showProgress);
-  WIDGETS.gpstrek.getState().waypoint = null;
-  WIDGETS.gpstrek.getState().route.mirror = false;
-  removeMenu();
+  let s = WIDGETS.gpstrek.getState();
+  s.route = loadRouteData(c, showProgress);
+  if(SETTINGS.autosearch && searchNeeded < 2) searchNeeded = 2;
+  s.waypoint = null;
 };
 
 let showRouteSelector  = function(){
@@ -525,13 +1103,16 @@ let showRouteSelector  = function(){
     }
   };
 
-  STORAGE.list(/\.trf$/).forEach((file)=>{
-     menu[file] = ()=>{handleLoading(file);};
+  STORAGE.list(/\.trf$/).sort().forEach((file)=>{
+      menu[file] = ()=>{handleLoading(file); showRouteMenu()};
   });
 
   E.showMenu(menu);
 };
 
+// 1 for complete search, 2 for starting at current waypoint
+let searchNeeded = 0;
+
 let showRouteMenu = function(){
   var menu = {
     "" : {
@@ -541,44 +1122,55 @@ let showRouteMenu = function(){
     "Select file" : showRouteSelector
   };
 
-  if (WIDGETS.gpstrek.getState().route){
+  let s = WIDGETS.gpstrek.getState();
+
+  if (s.route){
     menu.Mirror = {
-      value: WIDGETS.gpstrek.getState() && WIDGETS.gpstrek.getState().route && !!WIDGETS.gpstrek.getState().route.mirror || false,
+      value: s && s.route && !!s.route.mirror || false,
       onchange: v=>{
-        WIDGETS.gpstrek.getState().route.mirror = v;
+        if (s.route.mirror != v){
+          s.route.mirror = v;
+          if(SETTINGS.autosearch)
+            if (searchNeeded < 2) searchNeeded = 2;
+          else
+            setWaypointIndex(s.route, 0);
+        }
       }
     };
     menu['Select closest waypoint'] = function () {
-      if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lat){
-        setClosestWaypoint(WIDGETS.gpstrek.getState().route, null, showProgress); removeMenu();
+      if (s.currentPos && s.currentPos.lat){
+        if (searchNeeded < 2) searchNeeded = 2;
+        removeMenu();
       } else {
         E.showAlert("No position").then(()=>{E.showMenu(menu);});
       }
     };
     menu['Select closest waypoint (not visited)'] = function () {
-      if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lat){
-        setClosestWaypoint(WIDGETS.gpstrek.getState().route, WIDGETS.gpstrek.getState().route.index, showProgress); removeMenu();
+      if (s.currentPos && s.currentPos.lat){
+        if (searchNeeded < 1) searchNeeded = 1;
+        removeMenu();
       } else {
         E.showAlert("No position").then(()=>{E.showMenu(menu);});
       }
     };
     menu['Select waypoint'] = {
-      value : WIDGETS.gpstrek.getState().route.index,
-      min:1,max:WIDGETS.gpstrek.getState().route.count,step:1,
-      onchange : v => { set(WIDGETS.gpstrek.getState().route, v-1); }
+      value : getWaypointIndex(s.route),
+      min:0,max:getRouteIndex(s.route).length-1,step:1,
+      onchange : v => { setWaypointIndex(s.route, v); }
     };
     menu['Select waypoint as current position'] = function (){
-      WIDGETS.gpstrek.getState().currentPos.lat = WIDGETS.gpstrek.getState().route.currentWaypoint.lat;
-      WIDGETS.gpstrek.getState().currentPos.lon = WIDGETS.gpstrek.getState().route.currentWaypoint.lon;
-      WIDGETS.gpstrek.getState().currentPos.alt = WIDGETS.gpstrek.getState().route.currentWaypoint.alt;
+      let c = get(s.route);
+      s.currentPos.lat = c.lat;
+      s.currentPos.lon = c.lon;
+      s.currentPos.alt = c.alt;
       removeMenu();
     };
   }
 
-  if (WIDGETS.gpstrek.getState().route && hasPrev(WIDGETS.gpstrek.getState().route))
-    menu['Previous waypoint'] = function() { prev(WIDGETS.gpstrek.getState().route); removeMenu(); };
-  if (WIDGETS.gpstrek.getState().route && hasNext(WIDGETS.gpstrek.getState().route))
-    menu['Next waypoint'] = function() { next(WIDGETS.gpstrek.getState().route); removeMenu(); };
+  if (s.route && hasPrev(s.route))
+    menu['Previous waypoint'] = function() { prev(s.route); removeMenu(); };
+  if (s.route && hasNext(s.route))
+    menu['Next waypoint'] = function() { next(s.route); removeMenu(); };
   E.showMenu(menu);
 };
 
@@ -592,9 +1184,10 @@ let showWaypointSelector = function(){
 
   waypoints.forEach((wp,c)=>{
     menu[waypoints[c].name] = function (){
-      WIDGETS.gpstrek.getState().waypoint = waypoints[c];
-      WIDGETS.gpstrek.getState().waypointIndex = c;
-      WIDGETS.gpstrek.getState().route = null;
+      let s = WIDGETS.gpstrek.getState();
+      s.waypoint = waypoints[c];
+      s.waypointIndex = c;
+      s.route = null;
       removeMenu();
     };
   });
@@ -609,15 +1202,16 @@ let showCalibrationMenu = function(){
       back : showMenu,
     },
     "Barometer (GPS)" : ()=>{
-      if (!WIDGETS.gpstrek.getState().currentPos || isNaN(WIDGETS.gpstrek.getState().currentPos.alt)){
+      let s = WIDGETS.gpstrek.getState();
+      if (!s.currentPos || isNaN(s.currentPos.alt)){
         E.showAlert("No GPS altitude").then(()=>{E.showMenu(menu);});
       } else {
-        WIDGETS.gpstrek.getState().calibAltDiff = WIDGETS.gpstrek.getState().altitude - WIDGETS.gpstrek.getState().currentPos.alt;
-        E.showAlert("Calibrated Altitude Difference: " + WIDGETS.gpstrek.getState().calibAltDiff.toFixed(0)).then(()=>{removeMenu();});
+        s.calibAltDiff = s.altitude - s.currentPos.alt;
+        E.showAlert("Calibrated Altitude Difference: " + s.calibAltDiff.toFixed(0)).then(()=>{removeMenu();});
       }
     },
     "Barometer (Manual)" : {
-      value : Math.round(WIDGETS.gpstrek.getState().currentPos && (WIDGETS.gpstrek.getState().currentPos.alt != undefined && !isNaN(WIDGETS.gpstrek.getState().currentPos.alt)) ? WIDGETS.gpstrek.getState().currentPos.alt: WIDGETS.gpstrek.getState().altitude),
+      value : Math.round(WIDGETS.gpstrek.getState().currentPos && (WIDGETS.gpstrek.getState().currentPos.alt != undefined && isFinite(WIDGETS.gpstrek.getState().currentPos.alt)) ? WIDGETS.gpstrek.getState().currentPos.alt: WIDGETS.gpstrek.getState().altitude),
       min:-2000,max: 10000,step:1,
       onchange : v => { WIDGETS.gpstrek.getState().calibAltDiff = WIDGETS.gpstrek.getState().altitude - v; }
     },
@@ -643,8 +1237,8 @@ let showBackgroundMenu = function(){
       "title" : "Background",
       back : showMenu,
     },
-    "Start" : ()=>{ E.showPrompt("Start?").then((v)=>{ if (v) {WIDGETS.gpstrek.start(true); removeMenu();} else {showMenu();}}).catch(()=>{showMenu();});},
-    "Stop" : ()=>{ E.showPrompt("Stop?").then((v)=>{ if (v) {WIDGETS.gpstrek.stop(true); removeMenu();} else {showMenu();}}).catch(()=>{showMenu();});},
+    "Start" : ()=>{ E.showPrompt("Start?").then((v)=>{ if (v) {WIDGETS.gpstrek.start(true); showMenu();} else {showMenu();}}).catch(()=>{showMenu();});},
+    "Stop" : ()=>{ E.showPrompt("Stop?").then((v)=>{ if (v) {WIDGETS.gpstrek.stop(true); showMenu();} else {showMenu();}}).catch(()=>{showMenu();});},
   };
   E.showMenu(menu);
 };
@@ -668,105 +1262,99 @@ let showMenu = function(){
   };
 
   E.showMenu(mainmenu);
+  Bangle.removeListener("swipe", onSwipe);
+  Bangle.on("swipe",onSwipe);
 };
 
-
 let switchMenu = function(){
   stopDrawing();
   showMenu();
 };
 
 let stopDrawing = function(){
-  if (drawTimeout) clearTimeout(drawTimeout);
+  if (global.drawTimeout) clearTimeout(global.drawTimeout);
+  global.drawTimeout = undefined;
   scheduleDraw = false;
 };
 
+let startDrawing = function(){
+  firstDraw = true;
+  scheduleDraw = true;
+  draw();
+  drawInTimeout();
+};
+
 let drawInTimeout = function(){
-  if (global.drawTimeout) clearTimeout(drawTimeout);
+  if (global.drawTimeout) return;
   drawTimeout = setTimeout(()=>{
     drawTimeout = undefined;
     draw();
-  },50);
+  },Bangle.isLocked()?SETTINGS.refreshLocked:SETTINGS.refresh);
 };
 
 let switchNav = function(){
-  if (!screen) screen = 1;
   setButtons();
-  scheduleDraw = true;
-  firstDraw = true;
-  drawInTimeout();
+  startDrawing();
 };
 
-let nextScreen = function(){
-  screen++;
-  if (screen > maxScreens){
-    screen = 1;
+let setSlicesPage = function(change){
+  page_slices -= change;
+  if (page_slices >= maxSlicePages){
+    page_slices = 0;
+  }
+  if (page_slices < 0){
+    page_slices = maxSlicePages - 1;
   }
   drawInTimeout();
 };
 
-let setClosestWaypoint = function(route, startindex, progress){
-  if (startindex >= WIDGETS.gpstrek.getState().route.count) startindex = WIDGETS.gpstrek.getState().route.count - 1;
-  if (!WIDGETS.gpstrek.getState().currentPos.lat){
+let setClosestWaypoint = function(route, startindex, progress, maxDist){
+  let s = WIDGETS.gpstrek.getState();
+
+  let stopSearchAfterFirstMatch = !isFinite(startindex);
+  if (!startindex) startindex = 0;
+  if (startindex >= getRouteIndex(s.route).length) startindex = getRouteIndex(s.route).length - 1;
+  if (startindex < 0) startindex = 0;
+
+  if (!s.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(WIDGETS.gpstrek.getState().currentPos, wp);
+  if (!maxDist) maxDist = Number.MAX_VALUE;
+  let minDist = maxDist;
+  let mincount = 0;
+
+  let currentPos = s.currentPos;
+  let count = 0;
+  let wp;
+  do {
+    if (progress && (count % 5 == 0)) progress(count+startindex, "Searching", getRouteIndex(route).length);
+    wp = getNext(route, startindex, count);
+    if (!wp) break;
+    let curDist = distance(currentPos, wp);
+    if (curDist > maxDist) {
+      break;
+    }
     if (curDist < minDist){
       minDist = curDist;
-      minIndex = i;
+      mincount = count;
     } else {
-      if (startindex) break;
+      if (stopSearchAfterFirstMatch) break;
     }
-  }
-  set(route, minIndex);
+    count++;
+  } while (wp);
+  set(route, startindex + mincount);
 };
 
 const finishIcon = atob("CggB//meZmeZ+Z5n/w==");
 
-const compassSliceData = {
-  getCourseType: function(){
-    return (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.course) ? "GPS" : "MAG";
-  },
-  getCourse: function (){
-    if(compassSliceData.getCourseType() == "GPS") return WIDGETS.gpstrek.getState().currentPos.course;
-    return getAveragedCompass();
-  },
-  getPoints: function (){
-    let points = [];
-    if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lon && WIDGETS.gpstrek.getState().route && WIDGETS.gpstrek.getState().route.currentWaypoint){
-      points.push({bearing:bearing(WIDGETS.gpstrek.getState().currentPos, WIDGETS.gpstrek.getState().route.currentWaypoint), color:"#0f0"});
-    }
-    if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lon && WIDGETS.gpstrek.getState().route){
-      points.push({bearing:bearing(WIDGETS.gpstrek.getState().currentPos, getLast(WIDGETS.gpstrek.getState().route)), icon: finishIcon});
-    }
-    if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lon && WIDGETS.gpstrek.getState().waypoint){
-      points.push({bearing:bearing(WIDGETS.gpstrek.getState().currentPos, WIDGETS.gpstrek.getState().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 (WIDGETS.gpstrek.getState().route.index + 1) + "/" + WIDGETS.gpstrek.getState().route.count;
+    return (getWaypointIndex(WIDGETS.gpstrek.getState().route) + 1) + "/" + getRouteIndex(WIDGETS.gpstrek.getState().route).length;
   },
   getTarget: function (){
-    if (distance(WIDGETS.gpstrek.getState().currentPos,WIDGETS.gpstrek.getState().route.currentWaypoint) < 30 && hasNext(WIDGETS.gpstrek.getState().route)){
-      next(WIDGETS.gpstrek.getState().route);
-      Bangle.buzz(1000);
-    }
-    return WIDGETS.gpstrek.getState().route.currentWaypoint;
+    return get(WIDGETS.gpstrek.getState().route);
   },
   getStart: function (){
     return WIDGETS.gpstrek.getState().currentPos;
@@ -776,8 +1364,9 @@ const waypointData = {
 const finishData = {
   icon: atob("EBABAAA/4DmgJmAmYDmgOaAmYD/gMAAwADAAMAAwAAAAAAA="),
   getTarget: function (){
-    if (WIDGETS.gpstrek.getState().route) return getLast(WIDGETS.gpstrek.getState().route);
-    if (WIDGETS.gpstrek.getState().waypoint) return WIDGETS.gpstrek.getState().waypoint;
+    let s = WIDGETS.gpstrek.getState();
+    if (s.route) return getLast(s.route);
+    if (s.waypoint) return s.waypoint;
   },
   getStart: function (){
     return WIDGETS.gpstrek.getState().currentPos;
@@ -788,25 +1377,30 @@ let getSliceHeight = function(number){
   return Math.floor(Bangle.appRect.h/WIDGETS.gpstrek.getState().numberOfSlices);
 };
 
-let compassSlice = getCompassSlice(compassSliceData);
+let compassSlice = getCompassSlice();
+let mapSlice = getMapSlice();
 let waypointSlice = getTargetSlice(waypointData);
 let finishSlice = getTargetSlice(finishData);
 let eleSlice = getDoubleLineSlice("Up","Down",()=>{
-  return loc.distance(WIDGETS.gpstrek.getState().up,3) + "/" + (WIDGETS.gpstrek.getState().route ? loc.distance(WIDGETS.gpstrek.getState().route.up,3):"---");
+  let s = WIDGETS.gpstrek.getState();
+  return loc.distance(s.up,3) + "/" + (s.route ? loc.distance(s.route.up,3):"---");
 },()=>{
-  return loc.distance(WIDGETS.gpstrek.getState().down,3) + "/" + (WIDGETS.gpstrek.getState().route ? loc.distance(WIDGETS.gpstrek.getState().route.down,3): "---");
+  let s = WIDGETS.gpstrek.getState();
+  return loc.distance(s.down,3) + "/" + (s.route ? loc.distance(s.route.down,3): "---");
 });
 
 let statusSlice = getDoubleLineSlice("Speed","Alt",()=>{
   let speed = 0;
-  if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.speed) speed = WIDGETS.gpstrek.getState().currentPos.speed;
+  let s = WIDGETS.gpstrek.getState();
+  if (s.currentPos && s.currentPos.speed) speed = s.currentPos.speed;
   return loc.speed(speed,2);
 },()=>{
   let alt = Infinity;
-  if (!isNaN(WIDGETS.gpstrek.getState().altitude)){
-    alt = isNaN(WIDGETS.gpstrek.getState().calibAltDiff) ? WIDGETS.gpstrek.getState().altitude : (WIDGETS.gpstrek.getState().altitude - WIDGETS.gpstrek.getState().calibAltDiff);
+  let s = WIDGETS.gpstrek.getState();
+  if (isFinite(s.altitude)){
+    alt = isNaN(s.calibAltDiff) ? s.altitude : (s.altitude - s.calibAltDiff);
   }
-  if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.alt) alt = WIDGETS.gpstrek.getState().currentPos.alt;
+  if (s.currentPos && s.currentPos.alt) alt = s.currentPos.alt;
   if (isNaN(alt)) return "---";
   return loc.distance(alt,3);
 });
@@ -815,85 +1409,157 @@ let status2Slice = getDoubleLineSlice("Compass","GPS",()=>{
   return getAveragedCompass() + "°";
 },()=>{
   let course = "---°";
-  if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.course) course = WIDGETS.gpstrek.getState().currentPos.course + "°";
+  let s = WIDGETS.gpstrek.getState();
+  if (s.currentPos && s.currentPos.course) course = s.currentPos.course.toFixed(0) + "°";
   return course;
-},200);
+});
 
 let healthSlice = getDoubleLineSlice("Heart","Steps",()=>{
   return WIDGETS.gpstrek.getState().bpm || "---";
 },()=>{
-  return !isNaN(WIDGETS.gpstrek.getState().steps)? WIDGETS.gpstrek.getState().steps: "---";
+  return isFinite(WIDGETS.gpstrek.getState().steps)? WIDGETS.gpstrek.getState().steps: "---";
 });
 
-let system2Slice = getDoubleLineSlice("Bat","",()=>{
+let system2Slice = getDoubleLineSlice("Bat","Storage",()=>{
   return (Bangle.isCharging()?"+":"") + E.getBattery().toFixed(0)+"% " + (analogRead(D3)*4.2/BAT_FULL).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";
 });
 
-let updateSlices = function(){
-  slices = [];
-  slices.push(compassSlice);
-
-  if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lat && WIDGETS.gpstrek.getState().route && WIDGETS.gpstrek.getState().route.currentWaypoint && WIDGETS.gpstrek.getState().route.index < WIDGETS.gpstrek.getState().route.count - 1) {
-    slices.push(waypointSlice);
-  }
-  if (WIDGETS.gpstrek.getState().currentPos && WIDGETS.gpstrek.getState().currentPos.lat && (WIDGETS.gpstrek.getState().route || WIDGETS.gpstrek.getState().waypoint)) {
-    slices.push(finishSlice);
-  }
-  if ((WIDGETS.gpstrek.getState().route && WIDGETS.gpstrek.getState().route.down !== undefined) || WIDGETS.gpstrek.getState().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/WIDGETS.gpstrek.getState().numberOfSlices);
-};
+let systemSlice = getDoubleLineSlice("RAM","WP Cache",()=>{
+  let ram = process.memory(false);
+  return ((ram.blocksize * ram.free)/1024).toFixed(0)+"kB";
+},()=>{
+  return cachedOffsets.length?cachedOffsets.length:0;
+});
 
 let clear = function() {
   g.clearRect(Bangle.appRect);
 };
 
-let draw = function(){
-  if (!global.screen) return;
-  let ypos = Bangle.appRect.y;
+let minimumDistance = Number.MAX_VALUE;
+let lastSearch = 0;
+let autosearchCounter = 0;
 
-  let firstSlice = (screen-1)*WIDGETS.gpstrek.getState().numberOfSlices;
+let updateRouting = function() {
+  let s = WIDGETS.gpstrek.getState();
+  if (s.mode != MODE_MENU && s.route && s.currentPos.lat) {
+    let currentDistanceToTarget = distance(s.currentPos,get(s.route));
+    if (currentDistanceToTarget < minimumDistance){
+      minimumDistance = currentDistanceToTarget;
+    }
+    if (SETTINGS.autosearch && autosearchCounter < SETTINGS.autosearchLimit && !isMapOverview && lastSearch + 15000 < Date.now() && minimumDistance < currentDistanceToTarget - SETTINGS.waypointChangeDist){
+      Bangle.buzz(1000);
+      setClosestWaypoint(s.route, getWaypointIndex(s.route), null, SETTINGS.maxDistForAutosearch);
+      minimumDistance = Number.MAX_VALUE;
+      lastSearch = Date.now();
+      autosearchCounter++;
+    }
+    let counter = 0;
+    while (hasNext(s.route) && distance(s.currentPos,get(s.route)) < SETTINGS.waypointChangeDist) {
+      next(s.route);
+      minimumDistance = Number.MAX_VALUE;
+      autosearchCounter = 0;
+    }
+  }
+};
 
+let updateSlices = function(){
+  let s = WIDGETS.gpstrek.getState();
+  slices = [ compassSlice ];
+  if (s.currentPos && s.currentPos.lat && s.route && !isLast(s.route)) {
+    slices.push(waypointSlice);
+  }
+  if (s.currentPos && s.currentPos.lat && (s.route || s.waypoint)) {
+    slices.push(finishSlice);
+  }
+  slices.push(eleSlice);
+  slices.push(statusSlice);
+  slices.push(status2Slice);
+  slices.push(healthSlice);
+  slices.push(systemSlice);
+  slices.push(system2Slice);
+  maxSlicePages = Math.ceil(slices.length/s.numberOfSlices);
+};
+
+let page_slices = 0;
+
+let switchMode = function(targetMode){
+  switch (targetMode){
+    case MODE_MENU:
+      WIDGETS.gpstrek.getState().mode = MODE_MENU;
+      switchMenu();
+      break;
+    case MODE_MAP:
+    case MODE_SLICES:
+      WIDGETS.gpstrek.getState().mode = targetMode;
+      E.showMenu();
+      switchNav();
+      break;
+  }
+}
+
+let lastDrawnMode;
+let lastDrawnPage;
+
+let drawMap = function(){
+  g.reset();
+  mapSlice.draw(g,Bangle.appRect.x,Bangle.appRect.y, Bangle.appRect.h,Bangle.appRect.w);
+}
+
+let drawSlices = function(){
+  let s = WIDGETS.gpstrek.getState();
   updateSlices();
-
-  let force = lastDrawnScreen != screen || firstDraw;
+  let ypos = Bangle.appRect.y;
+  let force = lastDrawnPage != page_slices || firstDraw;
   if (force){
     clear();
   }
-  if (firstDraw) Bangle.drawWidgets();
-  lastDrawnScreen = screen;
-
+  let firstSlice = page_slices*s.numberOfSlices;
   let sliceHeight = getSliceHeight();
-  for (let slice of slices.slice(firstSlice,firstSlice + WIDGETS.gpstrek.getState().numberOfSlices)) {
+  let slicesToDraw = slices.slice(firstSlice,firstSlice + s.numberOfSlices);
+  for (let slice of slicesToDraw) {
     g.reset();
-    if (!slice.refresh || slice.refresh() || force) slice.draw(g,0,ypos,sliceHeight,g.getWidth());
+    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);
   }
-  
+  lastDrawnPage = page_slices;
+}
+
+let draw = function(){
+  let s = WIDGETS.gpstrek.getState();
+  if (s.mode == MODE_MENU) return;
+
+  if (lastDrawnMode != s.mode)
+    firstDraw = true;
+
+  if (firstDraw) {
+    g.clear();
+    Bangle.drawWidgets();
+  }
+
+  switch (s.mode) {
+    case MODE_MAP:
+      drawMap();
+      break;
+    case MODE_SLICES:
+      drawSlices();
+      break;
+  }
+
+  firstDraw = false;
+  lastDrawnMode = s.mode;
+
   if (scheduleDraw){
     drawInTimeout();
   }
-  firstDraw = false;
 };
 
-
-switchNav();
-
 clear();
+
+switchMode(MODE_SLICES);
+
+setInterval(updateRouting, 500);
 }
diff --git a/apps/gpstrek/convert.xsl b/apps/gpstrek/convert.xsl
new file mode 100644
index 000000000..72b19b565
--- /dev/null
+++ b/apps/gpstrek/convert.xsl
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:_="http://www.topografix.com/GPX/1/1" xmlns:DEFAULT="http://www.topografix.com/GPX/1/1" version="1.0" extension-element-prefixes="exslt">
+  <xsl:output omit-xml-declaration="no" indent="yes"/>
+
+  <xsl:template match="/">
+    <xsl:for-each select="//_:trkpt">
+        <xsl:choose>
+          <xsl:when test="_:name and _:ele">
+            <xsl:text>D</xsl:text>
+          </xsl:when>
+          <xsl:when test="_:ele and not(_:name)">
+            <xsl:text>C</xsl:text>
+          </xsl:when>
+          <xsl:when test="not(_:ele) and _:name">
+            <xsl:text>B</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>A</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:call-template name="value-of-template">
+          <xsl:with-param name="select" select="format-number(@lat,&quot;+00.0000000;-00.0000000&quot;)"/>
+        </xsl:call-template>
+        <xsl:call-template name="value-of-template">
+          <xsl:with-param name="select" select="format-number(@lon,&quot;+000.0000000;-000.0000000&quot;)"/>
+        </xsl:call-template>
+        <xsl:choose>
+          <xsl:when test="_:ele">
+            <xsl:call-template name="value-of-template">
+              <xsl:with-param name="select" select="format-number(_:ele,&quot;+00000;-00000&quot;)"/>
+            </xsl:call-template>
+          </xsl:when>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="_:name">
+            <xsl:call-template name="value-of-template">
+              <xsl:with-param name="select" select="format-number(string-length(_:name),&quot;00&quot;)"/>
+            </xsl:call-template>
+            <xsl:call-template name="value-of-template">
+              <xsl:with-param name="select" select="_:name"/>
+            </xsl:call-template>
+          </xsl:when>
+        </xsl:choose>
+        <xsl:value-of select="'&#10;'"/>
+    </xsl:for-each>
+  </xsl:template>
+  <xsl:template name="value-of-template">
+    <xsl:param name="select"/>
+    <xsl:value-of select="$select"/>
+    <xsl:for-each select="exslt:node-set($select)[position()&gt;1]">
+      <xsl:value-of select="'&#10;'"/>
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/apps/gpstrek/createRoute.sh b/apps/gpstrek/createRoute.sh
deleted file mode 100755
index 729e6af00..000000000
--- a/apps/gpstrek/createRoute.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/interface.html b/apps/gpstrek/interface.html
new file mode 100644
index 000000000..b645abb53
--- /dev/null
+++ b/apps/gpstrek/interface.html
@@ -0,0 +1,96 @@
+<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>
+    <script src="../../core/lib/interface.js"></script>
+
+    <script>
+      var converted;
+      var filename;
+
+      function handleOnload(readerEvent){
+        var content = readerEvent.target.result;
+
+        // Replace the gpx version 1.0 with 1.1 to allow parsing older gpx files. The nodes referenced by the xsl exist in both versions.
+        content = content.replaceAll("http://www.topografix.com/GPX/1/0", "http://www.topografix.com/GPX/1/1");
+
+        var xsltProcessor = new XSLTProcessor();
+
+        var myXMLHTTPRequest = new XMLHttpRequest();
+        myXMLHTTPRequest.open("GET", "convert.xsl", false);
+        myXMLHTTPRequest.send(null);
+
+        var xslRef = myXMLHTTPRequest.responseXML;
+
+        xsltProcessor.importStylesheet(xslRef);
+
+        var parser = new DOMParser();
+        var doc = parser.parseFromString(content, "text/xml");
+
+        var fragment = xsltProcessor.transformToFragment(doc, document);
+
+        var serializer = new XMLSerializer();
+        converted = serializer.serializeToString(fragment);
+
+        document.getElementById('upload').disabled = false;
+      }
+
+      function handleFileChange(event){
+        document.getElementById('error').innerHTML = "";
+        var file = event.target.files[0];
+        if (!file) {
+          document.getElementById('error').innerHTML = "No valid file selected";
+          return;
+        }
+
+        filename = file.name.replace(/\.gpx/,".trf");
+        document.getElementById('fileName').value = filename;
+
+        var reader = new FileReader();
+
+        reader.onload = handleOnload;
+
+        reader.readAsText(file,'UTF-8');
+      }
+
+      function handleClick(event){
+        if (converted){
+          Util.showModal("Saving...");
+          var name = document.getElementById('fileName').value;
+          if (!name || name.length == 0)
+            name = document.getElementById('fileName').placeholder;
+          if (name){
+            Util.writeStorage(name, converted, function() {
+                Util.hideModal();
+            });
+          }
+        } else {
+          document.getElementById('status').innerHTML += "error" + "</br>";
+          document.getElementById('error').innerHTML = "File could not be converted correctly.";
+        }
+      }
+      function onInit() {}
+    </script>
+  </head>
+  <body>
+    <h1>Upload tracks to your watch</h1>
+    <p>Allows uploading a GPX format track file to your watch. Converts tracks containing "trkpt"-nodes into the GPS Trekking format.</p>
+    <form>
+      <input class="form-input" type="file" id="fileSelector"><br/>
+      <label class="form-label" for="fileName">Filename on watch (must end with .trf an be shorter than 28 characters total)</label>
+      <input class="form-input" placeholder="route.trf" id="fileName" pattern="^.{0,24}\.trf$"><br/>
+      <button class="btn btn-primary" type="button" id="upload">Upload</button><br/>
+    </form>
+    <div id="error"></div>
+    <div id="status"></div>
+    <script>
+      document.getElementById('upload').disabled = true;
+      document.getElementById('fileSelector').addEventListener('change', handleFileChange);
+      document.getElementById('upload').addEventListener('click', handleClick);
+    </script>
+  </body>
+</html>
diff --git a/apps/gpstrek/metadata.json b/apps/gpstrek/metadata.json
index 2e2e481af..0ec3a8bfe 100644
--- a/apps/gpstrek/metadata.json
+++ b/apps/gpstrek/metadata.json
@@ -1,14 +1,15 @@
 {
   "id": "gpstrek",
   "name": "GPS Trekking",
-  "version": "0.09",
+  "version": "0.10",
   "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"}],
+  "screenshots": [{"url":"screenInit.png"},{"url":"screenMenu.png"},{"url":"screenMap.png"},{"url":"screenLost.png"},{"url":"screenOverview.png"},{"url":"screenOverviewScroll.png"},{"url":"screenSlices.png"},{"url":"screenSlices2.png"},{"url":"screenSlices3.png"}],
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "dependencies" : { "waypoints":"type" },
+  "interface" : "interface.html",
   "storage": [
     {"name":"gpstrek.app.js","url":"app.js"},
     {"name":"gpstrek.wid.js","url":"widget.js"},
diff --git a/apps/gpstrek/screen1.png b/apps/gpstrek/screen1.png
deleted file mode 100644
index 3cfd7d31b..000000000
Binary files a/apps/gpstrek/screen1.png and /dev/null differ
diff --git a/apps/gpstrek/screen2.png b/apps/gpstrek/screen2.png
deleted file mode 100644
index 9a6e14e06..000000000
Binary files a/apps/gpstrek/screen2.png and /dev/null differ
diff --git a/apps/gpstrek/screen3.png b/apps/gpstrek/screen3.png
deleted file mode 100644
index a0c7fd8c3..000000000
Binary files a/apps/gpstrek/screen3.png and /dev/null differ
diff --git a/apps/gpstrek/screen4.png b/apps/gpstrek/screen4.png
deleted file mode 100644
index 7b6812077..000000000
Binary files a/apps/gpstrek/screen4.png and /dev/null differ
diff --git a/apps/gpstrek/screenInit.png b/apps/gpstrek/screenInit.png
new file mode 100644
index 000000000..297055dc4
Binary files /dev/null and b/apps/gpstrek/screenInit.png differ
diff --git a/apps/gpstrek/screenLost.png b/apps/gpstrek/screenLost.png
new file mode 100644
index 000000000..1ff4ec1be
Binary files /dev/null and b/apps/gpstrek/screenLost.png differ
diff --git a/apps/gpstrek/screenMap.png b/apps/gpstrek/screenMap.png
new file mode 100644
index 000000000..60b8ca44f
Binary files /dev/null and b/apps/gpstrek/screenMap.png differ
diff --git a/apps/gpstrek/screenMenu.png b/apps/gpstrek/screenMenu.png
new file mode 100644
index 000000000..34c47c767
Binary files /dev/null and b/apps/gpstrek/screenMenu.png differ
diff --git a/apps/gpstrek/screenOverview.png b/apps/gpstrek/screenOverview.png
new file mode 100644
index 000000000..f18b5196f
Binary files /dev/null and b/apps/gpstrek/screenOverview.png differ
diff --git a/apps/gpstrek/screenOverviewScroll.png b/apps/gpstrek/screenOverviewScroll.png
new file mode 100644
index 000000000..29f796381
Binary files /dev/null and b/apps/gpstrek/screenOverviewScroll.png differ
diff --git a/apps/gpstrek/screenSlices.png b/apps/gpstrek/screenSlices.png
new file mode 100644
index 000000000..3e417a315
Binary files /dev/null and b/apps/gpstrek/screenSlices.png differ
diff --git a/apps/gpstrek/screenSlices2.png b/apps/gpstrek/screenSlices2.png
new file mode 100644
index 000000000..3574078df
Binary files /dev/null and b/apps/gpstrek/screenSlices2.png differ
diff --git a/apps/gpstrek/screenSlices3.png b/apps/gpstrek/screenSlices3.png
new file mode 100644
index 000000000..06b5074d1
Binary files /dev/null and b/apps/gpstrek/screenSlices3.png differ
diff --git a/apps/gpstrek/widget.js b/apps/gpstrek/widget.js
index 363ade8ee..6887486bc 100644
--- a/apps/gpstrek/widget.js
+++ b/apps/gpstrek/widget.js
@@ -23,10 +23,12 @@ if (!state) {
   state = {};
   initState();
 }
+state.started = false;
 let bgChanged = false;
 
 function saveState(){
   state.saved = Date.now();
+  if (state.route) delete state.route.indexToOffset;
   STORAGE.writeJSON("gpstrek.state.json", state);
 }
 
@@ -144,6 +146,9 @@ function start(bg){
   Bangle.setHRMPower(1, "gpstrek");
   Bangle.setCompassPower(1, "gpstrek");
   Bangle.setBarometerPower(1, "gpstrek");
+
+  state.started = true;
+
   if (bg){
     if (!state.active) bgChanged = true;
     state.active = true;
@@ -153,6 +158,7 @@ function start(bg){
 }
 
 function stop(bg){
+  state.started = true;
   if (bg){
     if (state.active) bgChanged = true;
     state.active = false;
@@ -177,12 +183,12 @@ if (state.active){
   start(false);
 }
 
-WIDGETS["gpstrek"]={
+WIDGETS.gpstrek={
   area:"tl",
   width:state.active?24:0,
   resetState: initState,
   getState: function() {
-    if (state.saved && Date.now() - state.saved > 60000 || !state){
+    if (!state.started && state.saved && Date.now() - state.saved > 60000 || !state){
       initState();
     }
     return state;
diff --git a/apps/grocery/ChangeLog b/apps/grocery/ChangeLog
index 294dab597..cb066ef3d 100644
--- a/apps/grocery/ChangeLog
+++ b/apps/grocery/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Refactor code to store grocery list in separate file
 0.03: Sort selected items to bottom and enable Widgets
+0.04: Add settings to edit list on device
diff --git a/apps/grocery/interface.html b/apps/grocery/interface.html
index 65528c8e6..58ab2a484 100644
--- a/apps/grocery/interface.html
+++ b/apps/grocery/interface.html
@@ -46,7 +46,6 @@
 
       var $name = document.getElementById('add_product_name')
       var $form = document.getElementById('add_product_form')
-      var $button = document.getElementById('add_product_button')
       var $quantity = document.getElementById('add_product_quantity')
       var $list = document.getElementById('products')
       var $reset = document.getElementById('reset')
@@ -68,7 +67,8 @@
           ok: false
         })
 
-        renderProducts()
+        renderProducts();
+        window.scrollTo(0, document.body.scrollHeight);
         $name.value = ''
         $quantity.value = 1
       })
diff --git a/apps/grocery/metadata.json b/apps/grocery/metadata.json
index ef073a1b2..8cf304cc1 100644
--- a/apps/grocery/metadata.json
+++ b/apps/grocery/metadata.json
@@ -1,17 +1,20 @@
 {
   "id": "grocery",
   "name": "Grocery",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Simple grocery (shopping) list - Display a list of product and track if you already put them in your cart.",
   "icon": "grocery.png",
   "type": "app",
-  "tags": "tool,outdoors,shopping,list",
+  "tags": "tool,shopping,list",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "custom": "grocery.html",
   "interface": "interface.html",
   "allow_emulator": true,
+  "dependencies": {"textinput":"type"},
   "storage": [
     {"name":"grocery.app.js","url":"app.js"},
+    {"name":"grocery.settings.js","url":"settings.js"},
     {"name":"grocery.img","url":"grocery-icon.js","evaluate":true}
-  ]
+  ],
+  "data": [{"name":"grocery_list.json"}]
 }
diff --git a/apps/grocery/settings.js b/apps/grocery/settings.js
new file mode 100644
index 000000000..5f84fd782
--- /dev/null
+++ b/apps/grocery/settings.js
@@ -0,0 +1,138 @@
+(function(back) {
+  const FILE = "grocery_list.json";
+  const settings = require("Storage").readJSON(FILE,1)|| { products: [] };
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  const changeQuantity = (i) => {
+    const menu = {
+      "" : { title : /*LANG*/"Quantity" },
+      "< Back" : () => edititem(i),
+      "x 0.1" : {
+        value : settings.products[i].quantity,
+        min:0,
+        max:9999,
+        step:0.1,
+        onchange : v => {
+          settings.products[i].quantity=v;
+          menu["x 1"].value = v;
+          menu["x 10"].value  = v;
+          menu["x 100"].value  = v;
+        },
+      },
+      "x 1" : {
+        value : settings.products[i].quantity,
+        min:0,
+        max:9999,
+        step:1,
+        onchange : v => {
+          settings.products[i].quantity=v;
+          menu["x 0.1"].value  = v;
+          menu["x 10"].value  = v;
+          menu["x 100"].value  = v;
+        },
+      },
+      "x 10" : {
+        value : settings.products[i].quantity,
+        min:0,
+        max:9999,
+        step:10,
+        onchange : v => {
+          settings.products[i].quantity=v;
+          menu["x 0.1"].value  = v;
+          menu["x 1"].value  = v;
+          menu["x 100"].value  = v;
+        },
+      },
+      "x 100" : {
+        value : settings.products[i].quantity,
+        min:0,
+        max:9999,
+        step:100,
+        onchange : v => {
+          settings.products[i].quantity=v;
+          menu["x 0.1"].value  = v;
+          menu["x 1"].value  = v;
+          menu["x 10"].value  = v;
+        },
+      },
+    };
+    E.showMenu(menu);
+  };
+
+  const edititem = (i) => {
+    const menu = {};
+    const textName = /*LANG*/"Name";
+    const textQuantity = /*LANG*/"Quantity";
+    const textChecked = /*LANG*/"Checked";
+    const textDelete = /*LANG*/"Delete";
+    menu[""] = { "title" : ''+settings.products[i].quantity+' '+settings.products[i].name };
+    menu["< Back"] = () => {
+      writeSettings();
+      editlist();
+    };
+    menu[textName] = () => {
+      require("textinput").input({text:settings.products[i].name}).then(result => {
+        settings.products[i].name = result;
+        edititem(i);
+      });
+    };
+    menu[textQuantity] = () => changeQuantity(i);
+    menu[textChecked] = {
+      value : settings.products[i].ok,
+      onchange : v => {
+        settings.products[i].ok = v;
+      }
+    };
+    menu[textDelete] = () => E.showPrompt(/*LANG*/"Delete" + " " + menu[""].title + "?").then(function(v) {
+        if (v) {
+          settings.products.splice(i, 1);
+          writeSettings();
+          editlist();
+        } else {
+          edititem(i);
+        }
+      });
+
+    E.showMenu(menu);
+  };
+
+  const editlist = () => {
+    const menu = settings.products.map((p,i) => ({
+      title: ''+p.quantity+' '+p.name,
+      format: () => p.ok?'[x]':'[ ]',
+      onchange: v => setTimeout(() => edititem(i), 10),
+    }));
+
+    menu[''] = { 'title': 'Grocery list' };
+    menu['< Back'] = ()=>settingsmenu();
+    E.showMenu(menu);
+  };
+
+  const settingsmenu = () => {
+    E.showMenu({
+      "" : { "title" : "Grocery" },
+      "< Back" : () => back(),
+      /*LANG*/"Edit List": () => editlist(),
+      /*LANG*/"Add item": () => {
+        settings.products.push({
+          "name":/*LANG*/"New item",
+          "quantity":1,
+          "ok":false
+        });
+        edititem(settings.products.length-1);
+      },
+      /*LANG*/"Clear checked": () => E.showPrompt(/*LANG*/"Clear checked" + "?").then(function(v) {
+        if (v) {
+          settings.products = settings.products.filter(p => !p.ok);
+          writeSettings();
+        }
+        settingsmenu();
+      }),
+    });
+  };
+
+  settingsmenu();
+})
diff --git a/apps/guitar/ChangeLog b/apps/guitar/ChangeLog
new file mode 100644
index 000000000..22c67383d
--- /dev/null
+++ b/apps/guitar/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: More Chords, formatting, fret offset support.
\ No newline at end of file
diff --git a/apps/guitar/README.md b/apps/guitar/README.md
new file mode 100644
index 000000000..ad4ecca4a
--- /dev/null
+++ b/apps/guitar/README.md
@@ -0,0 +1,12 @@
+# Guitar Chords
+
+An app that simply describes finger placements on a Guitar to form common chords.
+
+## Usage
+
+Select a chord to view.
+Use the button to return to the chord selection menu.
+
+## Creator
+
+NovaDawn999
diff --git a/apps/guitar/app-icon.js b/apps/guitar/app-icon.js
new file mode 100644
index 000000000..490541b44
--- /dev/null
+++ b/apps/guitar/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkCkQA/AGMkoQXVptEFytEogwUCoIYBLqlUGIIXTopHVknUoXULylNpouUIoKmUUi0hoMUailEiMSCR/d7pdECx8tC4IYBolULqAWC7qLSFwfdiKMRC4dEoK6RFwYWBppdW7vSLiPd6gXPConVgIWCYYYtM9vdosUqgXOFwndilBqoGDLh/eqtEioXR9xHCoIXDO5SKEpvU6kVppeQ73kqgwB7wuNOwosEXqSlB9xFNR49RpwXV6pICIxhIF73ePAIXTAAgXOJApePGBQXPGA4XPGAxeOGBAWQDAouRDAgWUAH4AZ"))
diff --git a/apps/guitar/app.js b/apps/guitar/app.js
new file mode 100644
index 000000000..6c172f920
--- /dev/null
+++ b/apps/guitar/app.js
@@ -0,0 +1,340 @@
+const stringInterval = 24;
+const stringLength = 138;
+const fretHeight = 35;
+const fingerOffset = 17;
+const xOffset = 26;
+const yOffset = 34;
+
+const cc = [
+  "C",
+  "0X",
+  "33",
+  "22",
+  "x",
+  "11",
+  "x",
+  "0"
+];
+
+const dd = [
+  "D",
+  "0X",
+  "0X",
+  "x",
+  "21",
+  "33",
+  "22",
+  "0"
+];
+
+const gg = [
+  "G",
+  "32",
+  "21",
+  "x",
+  "x",
+  "x",
+  "33",
+  "0"
+];
+
+const am = [
+  "Am",
+  "0x",
+  "x",
+  "23",
+  "22",
+  "11",
+  "x",
+  "0"
+];
+
+const em = [
+  "Em",
+  "x",
+  "22",
+  "23",
+  "x",
+  "x",
+  "x",
+  "0"
+];
+
+const aa = [
+  "A",
+  "0X",
+  "x",
+  "21",
+  "22",
+  "23",
+  "x",
+  "0"
+];
+
+var ee = [
+  "E",
+  "x",
+  "22",
+  "23",
+  "11",
+  "x",
+  "x",
+  "0"
+];
+
+var dm = [
+  "Dm",
+  "0x",
+  "0x",
+  "x",
+  "22",
+  "33",
+  "11",
+  "0"
+];
+
+var ff = [
+  "F",
+  "0x",
+  "0x",
+  "33",
+  "22",
+  "11",
+  "11",
+  "0"
+];
+
+var b7 = [
+  "B7",
+  "0x",
+  "22",
+  "11",
+  "23",
+  "x",
+  "24",
+  "0"
+];
+
+var cadd9 = [
+  "Cadd9",
+  "0x",
+  "32",
+  "21",
+  "x",
+  "33",
+  "34",
+  "0"
+];
+
+var dadd11 = [
+  "Dadd11",
+  "0x",
+  "33",
+  "22",
+  "x",
+  "11",
+  "x",
+  "3"
+];
+
+var csus2 = [
+  "Csus2",
+  "0x",
+  "33",
+  "x",
+  "x",
+  "11",
+  "0x",
+  "0"
+];
+
+var gadd9 = [
+  "Gadd9",
+  "32",
+  "0x",
+  "x",
+  "21",
+  "x",
+  "33",
+  "0"
+];
+
+var aadd9 = [
+  "Aadd9",
+  "11",
+  "33",
+  "34",
+  "22",
+  "x",
+  "x",
+  "5"
+];
+
+var fsharp7add11 = [
+  "F#7add11",
+  "21",
+  "43",
+  "44",
+  "32",
+  "x",
+  "x",
+  "0"
+];
+
+var d9 = [
+  "D9",
+  "0x",
+  "22",
+  "11",
+  "23",
+  "23",
+  "0x",
+  "4"
+];
+
+var g7 = [
+  "G7",
+  "33",
+  "22",
+  "x",
+  "x",
+  "34",
+  "11",
+  "0"
+];
+
+var bflatd = [
+  "Bb/D",
+  "0x",
+  "33",
+  "11",
+  "11",
+  "11",
+  "0x",
+  "3"
+];
+
+var e7sharp9 = [
+  "E7#9",
+  "0x",
+  "22",
+  "11",
+  "23",
+  "34",
+  "0x",
+  "6"
+];
+
+var a11 = [
+  "A11 3rd fret",
+  "33",
+  "0x",
+  "34",
+  "22",
+  "11",
+  "0x",
+  "0"
+];
+
+var a9 = [
+  "A9",
+  "32",
+  "0x",
+  "33",
+  "21",
+  "34",
+  "0x",
+  "3"
+];
+
+
+
+var index = 0;
+var chords = [];
+var menu = {
+    "" : {
+        "title" : "Guitar Chords"
+    },
+    "C" : function() { draw(cc); },
+    "D" : function() { draw(dd); },
+    "E" : function() { draw(ee); },
+    "Em" : function() { draw(em); },
+    "A" : function() { draw(aa); },
+    "Am" : function() { draw(am); },
+    "F" : function() { draw(ff); },
+    "G" : function() { draw(gg); },
+    "Dm" : function() { draw(dm); },
+    "B7" : function () { draw(b7); },
+    "Cadd9" : function () { draw(cadd9); },
+    "Dadd11" : function () { draw(dadd11); },
+    "Csus2" : function () { draw(csus2); },
+    "Gadd9" : function () { draw(gadd9); },
+    "Aadd9" : function () { draw(aadd9); },
+    "F#7add11" : function () { draw(fsharp7add11); },
+    "D9" : function () { draw(d9); },
+    "G7" : function () { draw(g7); },
+    "Bb/D" : function () { draw(bflatd); },
+    "E7#9" : function () { draw(e7sharp9); },
+    "A11" : function () { draw(a11); },
+    "A9" : function () { draw(a9); },
+    "About" : function() {
+        E.showMessage(
+            "Created By:\nNovaDawn999", {
+              title:"About"
+            }
+        );
+    }
+};
+
+
+
+function drawBase() {
+  for (let i = 0; i < 6; i++) {
+    g.drawLine(xOffset + i * stringInterval, yOffset, xOffset + i * stringInterval, yOffset + stringLength);
+    g.fillRect(xOffset- 1, yOffset + i * fretHeight - 1, xOffset + stringInterval * 5 + 1, yOffset + i * fretHeight + 1);
+  }
+}
+
+function drawChord(chord) {
+    g.drawString(chord[0], g.getWidth() * 0.5 - (chord[0].length * 5), 16);
+    for (let i = 0; i < chord.length - 1; i++) {
+        if (i === 0 || chord[i][0] === "x") {
+            continue;
+        }
+        if (chord[i][0] === "0") {
+            g.drawString(chord[i][1], xOffset + (i - 1) * stringInterval - 5, yOffset + fretHeight * chord[i][0] + 2, true);
+            g.drawCircle(xOffset + (i - 1) * stringInterval -1, yOffset + fretHeight * chord[i][0], 10);
+        }
+        else {
+            g.drawString(chord[i][1], xOffset + (i - 1) * stringInterval -5, yOffset -fingerOffset + fretHeight * chord[i][0] + 2, true);
+            g.drawCircle(xOffset + (i - 1) * stringInterval -1, yOffset -fingerOffset + fretHeight * chord[i][0], 10);
+        }
+    }
+    if (chord[7] !== "0") {
+      g.drawString(chord[7], 9, 50);
+    }
+}
+
+function buttonPress() {
+  setWatch(() => {
+    buttonPress();
+    }, BTN);
+  E.showMenu(menu);
+}
+
+function draw(chord) {
+  g.clear();
+  drawBase();
+  drawChord(chord);
+}
+
+
+
+function main() {
+  E.showMenu(menu);
+  setWatch(() => {
+    buttonPress();
+    }, BTN);
+}
+
+main();
\ No newline at end of file
diff --git a/apps/guitar/app.png b/apps/guitar/app.png
new file mode 100644
index 000000000..6ff5d79ca
Binary files /dev/null and b/apps/guitar/app.png differ
diff --git a/apps/guitar/metadata.json b/apps/guitar/metadata.json
new file mode 100644
index 000000000..6ab3ffc51
--- /dev/null
+++ b/apps/guitar/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "guitar",
+  "name": "Guitar Chords",
+  "shortName":"Guitar",
+  "version":"0.02",
+  "description": "Wrist mounted guitar chords",
+  "icon": "app.png",
+  "tags": "guitar, chords",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"guitar.app.js","url":"app.js"},
+    {"name":"guitar.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/guitarsongs/ChangeLog b/apps/guitarsongs/ChangeLog
new file mode 100644
index 000000000..dda3f0fd1
--- /dev/null
+++ b/apps/guitarsongs/ChangeLog
@@ -0,0 +1,2 @@
+0.01: First Release
+0.02: WIP
diff --git a/apps/guitarsongs/README.md b/apps/guitarsongs/README.md
new file mode 100644
index 000000000..12af8a9f4
--- /dev/null
+++ b/apps/guitarsongs/README.md
@@ -0,0 +1,22 @@
+# Guitar Songs
+
+Upload lyrics and chords to your BangleJS2. Play songs at the camp fire.
+
+![screenshot](screenshot.png)
+
+## Usage
+
+Install the app. Use the App Loader to add songs to the watch.
+
+You can scroll through the chords by dragging your finger left and right.
+
+You can scroll the lyrics by dragging it up and down.
+
+## Attribution
+
+[Fire icon created by Freepik - Flaticon](https://www.flaticon.com/free-icons/fire)
+
+## Credits
+
+Created by: devsnd
+Inspired by: NovaDawn999
diff --git a/apps/guitarsongs/app-icon.js b/apps/guitarsongs/app-icon.js
new file mode 100644
index 000000000..554372bb0
--- /dev/null
+++ b/apps/guitarsongs/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwg967oABCaHQAYUNDCISBC4wfDC5gQCC4YYPC5BJOC65MFJCQXIGCIXGGAY0MC5K2EC54TCMhoWGC5YHEC5RBIIxREKC4gWHC5QLDFwXu9oXSCAXuDAoXILIYDD7wYBeJhxHC4QwEC6QwEaB4WCGAgXYDIxGKVQwXJLAQXESJYXGCYPjmYXPFYPtFwQXTAAczmc+C6fj+YXNa4QXEn//C43QC5kz/4XBMAPtVIQXM8YWBC4bBDC4xgCC4RFBC5AWGC4guDC55IBC4IuDC4xGHC5peJPAfdCQIAEVAdACglEABVDDAM97vUqgGBkUAggXLGAQXBotUCwM0oAWLC4cz6tUokyGANCIxwABooGBmkzmQuMoQXDDwQXBmgXMI4gGCmRFBoR3PFIYECVYJgOAwtEbQ4AoA"))
diff --git a/apps/guitarsongs/app.js b/apps/guitarsongs/app.js
new file mode 100644
index 000000000..a12fa842b
--- /dev/null
+++ b/apps/guitarsongs/app.js
@@ -0,0 +1,241 @@
+const chords = [
+  // name: [name, placement, fingers, fret],
+  // sourced from https://github.com/spilth/chord_diagrams/blob/main/lib/chord_diagrams/fingerings.csv
+  ['A', 'x02220', '', 0],
+  ['B', 'x24442', '', 0],
+  ['Bb', 'x13331', '', 0],
+  ['C', 'x32010', '', 0],
+  ['C#', 'x46664', '', 0],
+  ['D', 'xx0232', '', 0],
+  ['D#', 'x68886', '', 0],
+  ['E', '022100', '', 0],
+  ['Eb', 'x68886', '', 0],
+  ['F', '133211', '', 0],
+  ['F#', '244322', '', 0],
+  ['G', '320003', '', 0],
+  ['G#', '466544', '', 0],
+  ['C5', 'x355xx', '', 0],
+  ['D5', 'x577xx', '', 0],
+  ['D#5', 'x688xx', '', 0],
+  ['C6', 'x32210', '', 0],
+  ['D6', 'xx0202', '', 0],
+  ['E6', '022120', '', 0],
+  ['G6', '320000', '', 0],
+  ['A7', '002020', '', 0],
+  ['B7', 'x21202', '', 0],
+  ['C7', 'x32310', '', 0],
+  ['C#7', 'x46464', '', 0],
+  ['D7', 'x00212', '', 0],
+  ['E7', '020100', '', 0],
+  ['E7sus4', '020200', '', 0],
+  ['F7', '131211', '', 0],
+  ['F#7', '242322', '', 0],
+  ['G7', '320001', '', 0],
+  ['G#7', '464544', '', 0],
+  ['AM7', 'x02120', '', 0],
+  ['CM7', 'x32000', '', 0],
+  ['DM7', 'xx0222', '', 0],
+  ['EM7', 'xx2444', '', 0],
+  ['FM7', '132211', '', 0],
+  ['Cadd9', 'x32033', '', 0],
+  ['Fadd9', 'xx3213', '', 0],
+  ['Dsus2', 'xx0230', '', 0],
+  ['Asus2', 'x02200', '', 0],
+  ['Asus4', 'x02230', '', 0],
+  ['Dsus4', 'xx0233', '', 0],
+  ['Esus4', '022200', '', 0],
+  ['A7sus4', '002030', '', 0],
+  ['G7sus4', '353533', '', 0],
+  ['G+', 'x21003', '', 0],
+  ['Am', '002210', '', 0],
+  ['Bm', 'x24432', '', 0],
+  ['Cm', 'x35543', '', 0],
+  ['C#m', 'x46654', '', 0],
+  ['Dm', 'x00231', '', 0],
+  ['Em', '022000', '', 0],
+  ['Fm', '133111', '', 0],
+  ['F#m', '244222', '', 0],
+  ['Gm', '355333', '', 0],
+  ['G#m', '466444', '', 0],
+  ['Am7', '002010', '', 0],
+  ['A#m7', 'x13121', '', 0],
+  ['Bm7', 'x24232', '', 0],
+  ['Cm7', 'x35343', '', 0],
+  ['C#m7', 'x46454', '', 0],
+  ['Dm7', 'x00211', '', 0],
+  ['Em7', '020030', '', 0],
+  ['Fm7', '131111', '', 0],
+  ['F#m7', '242222', '', 0],
+  ['Gm7', '353333', '', 0],
+  ['Am9', 'x05557', '', 0],
+  ['Bm11', 'x20220', '', 0],
+  ['F#m11', '202200', '', 0],
+  ['A/C#', '042220', '', 0],
+  ['A/E', '00222x', '', 0],
+  ['A/F#', '202220', '', 0],
+  ['Bb/A', 'x00331', '', 0],
+  ['C/B', 'x22010', '', 0],
+  ['C/E', '032010', '', 0],
+  ['D/A', 'x04232', '', 0],
+  ['D/F#', '200232', '', 0],
+  ['F/A', 'x03211', '', 0],
+  ['G/B', 'x20003', '', 0],
+  ['C7/G', '3323xx', '', 0],
+  ['D7/F#', '200212', '', 0],
+  ['G7/F', '123003', '', 0],
+  ['D9/F#', '2x0210', '', 0],
+  ['Am/D', 'xx0210', '', 0],
+  ['Am/G', '302210', '', 0],
+  ['A#m/D#', 'xx1321', '', 0],
+  ['Dm/F', '10323x', '', 0],
+  ['Gm/Bb', 'x10333', '', 0],
+  ['A7/G', '302020', '', 0],
+  ['G#dim', '4564xx', '', 0],
+  ['Adim', 'x01212', '', 0],
+  ['D#dim7', 'xx1212', '', 0],
+  ['G#dim7', '456464', '', 0],
+  ['Daug', 'xx0332', '', 0],
+  ['Aaug', 'x03221', '', 0],
+  ['Dadd11', 'xx0032', '', 0],
+]
+
+const chordHeight = 85;
+const chordWidth = 80;
+
+const chordOptions = {
+  stringWidths: 12,
+  fretHeight: 14,
+  circleSize: 4,
+  drawFinger: false,
+  drawCircleRim: false,
+}
+
+const chordCache = {};
+function drawChordCached(chord, x, y, options) {
+  let image;
+  if (chordCache[chord[0]]) {
+    image = chordCache[chord[0]]
+  } else {
+    arrbuff = Graphics.createArrayBuffer(chordWidth,chordHeight,1,{msb:true});
+    drawChord(arrbuff, chord, 0, 0, options);
+    image = {width: arrbuff.getWidth(), height: arrbuff.getHeight(), bpp:arrbuff.getBPP(), buffer: arrbuff.buffer, transparent:0}
+    chordCache[chord[0]] = image;
+  }
+  g.drawImage(image, x, y);
+}
+
+
+function drawChord(buffer, chord, x, y, options) {
+  const stringWidths = options.stringWidths;
+  const fretHeight = options.fretHeight;
+  const circleSize = options.circleSize;
+  const drawFinger = options.drawFinger;
+  const drawCircleRim = options.drawCircleRim;
+
+  const name = chord[0];
+  chord = chord.slice(1);
+  x += 3;
+  buffer.setFont('6x8').setColor(0x1).setFontAlign(-1, -1).drawString(name, x, y);
+  y += 15;
+  for (let i = 0; i < 6; i++) {
+    buffer.drawLine(x + i * stringWidths, y, x + i * stringWidths, y + fretHeight*4);
+  }
+  for (let i = 0; i < 5; i++) {
+    buffer.fillRect(x - 1, y + i * fretHeight - 1, x + stringWidths * 5 + 1, y + i * fretHeight + 1);
+  }
+
+  for (let i = 0; i < 6; i++) {
+      const placement = chord[0];
+      const fingers = chord[1];
+      const xPos = x + i * stringWidths;
+      let yPos = y + fretHeight * parseInt(placement[i]) - fretHeight/2
+
+      if (placement[i] === "0") {
+        buffer.setColor(0x1).drawCircle(xPos, y - 5, 2);
+        continue;
+      } else if (placement[i] === "x") {
+        buffer.setFontAlign(0, 0);
+        buffer.setColor(0x1).drawString('x', xPos, y - 5);
+        continue;
+      }
+      buffer.setFontAlign(0, 0);
+      if (drawFinger && chord[i].length>1) {
+        buffer.setColor(0x0).fillCircle(xPos, yPos, circleSize);
+        if (drawCircleRim) {
+          buffer.setColor(0x1).drawCircle(xPos, yPos, circleSize);
+        }
+        if (parseInt(fingers[i])) {
+          buffer.setColor(0x1).drawString(fingers[i], xPos, yPos);
+        }
+      } else {
+        buffer.setColor(0x1).fillCircle(xPos, yPos, circleSize);
+        buffer.setFontAlign(0, -1)
+        if (parseInt(fingers[i])) {
+          buffer.setColor(0x1).drawString(fingers[i], xPos, y + fretHeight*4 + 2);
+        }
+      }
+  }
+  if (chord[2] !== 0) {
+    buffer.setFontAlign(-1, -1);
+    buffer.drawString(chord[2] + 'fr', x + 5 * stringWidths + 2, y);
+  }
+}
+
+
+
+function drawApp(lyricsLines, chordsDraw, scrollY, chordScrollX) {
+  const R = Bangle.appRect;
+
+  g.setFont('6x8');
+  if (scrollY < chordHeight) {
+    for (let i=0; i<chordsDraw.length; i++) {
+      drawChordCached(chordsDraw[i], 3 + i*chordWidth + chordScrollX, R.y + scrollY, chordOptions);
+    }
+  }
+  const lineHeight = g.stringMetrics(' ').height;
+  for (let i=0; i<lyricsLines.length; i++){
+    const y = R.y + lineHeight * i + chordHeight + scrollY;
+    if (y < -lineHeight) continue;
+    if (y > R.y2) break;
+    g.setFontAlign(-1, -1).drawString(lyricsLines[i], R.x, y);
+  }
+}
+
+let currentScrollY = 0;
+let chordScrollX = 0;
+let currentChordScroll = 0;
+let lyricsHeight = 0;
+
+function main(song) {
+  const lyrics = song.lyrics;
+  const foundChords = song.chords;
+  const lyricsLines = lyrics.split('\n');
+  const chordsDraw = chords.filter(c=>foundChords.includes(c[0]));
+  const R = Bangle.appRect;
+  g.clear();
+  drawApp(lyricsLines, chordsDraw, currentScrollY, chordScrollX);
+  lyricsHeight = g.stringMetrics(lyrics).height;
+  Bangle.on('drag', (event) => {
+    currentScrollY = Math.min(0, currentScrollY + event.dy);
+    chordScrollX = Math.max(Math.min(0, chordScrollX + event.dx), -(song.chords.length*chordWidth - R.x2));
+    g.clear();
+    drawApp(lyricsLines, chordsDraw, currentScrollY, chordScrollX);
+  })
+}
+
+function mainMenu () {
+  const songs = (
+      require("Storage").readJSON("guitar_songs.json", true) ||
+      [{'name': 'No songs', 'lyrics': 'Em\nPlease upload a song\nAm        A7\nusing the Bangle App Loader', 'chords': ['Am', 'Em', 'A7']}]
+  );
+  const menu = {
+    "": {"title": "Guitar Songs"},
+  };
+  for (let i=0; i<songs.length; i++) {
+    const song = songs[i];
+    menu[song.name] = function() { main(song) };
+  }
+  E.showMenu(menu);
+}
+
+mainMenu();
diff --git a/apps/guitarsongs/app.png b/apps/guitarsongs/app.png
new file mode 100644
index 000000000..d48a06268
Binary files /dev/null and b/apps/guitarsongs/app.png differ
diff --git a/apps/guitarsongs/manage_songs.html b/apps/guitarsongs/manage_songs.html
new file mode 100644
index 000000000..9280d8d96
--- /dev/null
+++ b/apps/guitarsongs/manage_songs.html
@@ -0,0 +1,229 @@
+<html>
+<head>
+  <link rel="stylesheet" href="../../css/spectre.min.css">
+</head>
+<body>
+<script src="../../core/lib/interface.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+
+<div id="app">
+  <h4>List of Songs</h4>
+  <div v-if="songsState === 'loading'">
+    <button v-on:click="loadSongs">Load Songs</button>
+  </div>
+  <div v-else>
+    <table class="table">
+      <thead>
+      <tr>
+        <th>Name</th>
+        <th>Lyrics</th>
+        <th>chords</th>
+        <th>size</th>
+        <th></th>
+        <th></th>
+      </tr>
+      </thead>
+      <tbody id="songs">
+      <tr v-for="(song, index) in localSongs">
+        <td>{{song.name}}</td>
+        <td>{{song.lyrics.slice(0, 30)}}</td>
+        <td>{{song.chords.join(' ')}}</td>
+        <td>{{song.lyrics.length + song.name.length}}</td>
+        <td><button class="btn" v-on:click="setEditSong(song)">edit</button></td>
+        <td><button class="btn" v-on:click="deleteSong(index)">delete</button></td>
+      </tr>
+      <tr><th colspan="3">
+        <button v-on:click="addNewSong" class="btn">Add new song</button>
+      </th></tr>
+      </tbody>
+    </table>
+    <div v-if="editSong">
+      <div class="modal active" id="modal-id">
+        <a href="#close" class="modal-overlay" aria-label="Close"></a>
+        <div class="modal-container" style="max-height: 95vh;">
+          <div class="modal-header">
+            <div class="modal-title h5">Edit Song</div>
+          </div>
+          <div class="modal-body">
+            <div class="content">
+              <edit-song :song="editSong"></edit-song>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button class="btn btn-primary" v-on:click="setEditSong(null)">Done editing</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <br>
+    <br>
+
+    <div class="card">
+      <div class="card-body">
+        Size on Bangle Flash: {{watchSongsSize}} Bytes
+        <div v-if="watchSongsSize != localSongsSize">
+          New size: {{localSongsSize}} Bytes
+        </div>
+      </div>
+      <div class="card-footer">
+        <button class="btn" v-on:click="uploadSongs">Upload</button>
+      </div>
+    </div>
+  </div>
+
+</div>
+
+<script>
+  Vue.component('edit-song', {
+    props: ['song'],
+    data: function () {
+      return {
+        newChord: '',
+        builtInChords: [
+          'A', 'B', 'Bb', 'C', 'C#', 'D', 'D#', 'E', 'Eb', 'F', 'F#', 'G', 'G#', 'C5', 'D5', 'D#5',
+          'C6', 'D6', 'E6', 'G6', 'A7', 'B7', 'C7', 'C#7', 'D7', 'E7', 'E7sus4', 'F7', 'F#7', 'G7',
+          'G#7', 'AM7', 'CM7', 'DM7', 'EM7', 'FM7', 'Cadd9', 'Fadd9', 'Dsus2', 'Asus2', 'Asus4',
+          'Dsus4', 'Esus4', 'A7sus4', 'G7sus4', 'G+', 'Am', 'Bm', 'Cm', 'C#m', 'Dm', 'Em', 'Fm',
+          'F#m', 'Gm', 'G#m', 'Am7', 'A#m7', 'Bm7', 'Cm7', 'C#m7', 'Dm7', 'Em7', 'Fm7', 'F#m7',
+          'Gm7', 'Am9', 'Bm11', 'F#m11', 'A/C#', 'A/E', 'A/F#', 'Bb/A', 'C/B', 'C/E', 'D/A', 'D/F#',
+          'F/A', 'G/B', 'C7/G', 'D7/F#', 'G7/F', 'D9/F#', 'Am/D', 'Am/G', 'A#m/D#', 'Dm/F', 'Gm/Bb',
+          'A7/G', 'G#dim', 'Adim', 'D#dim7', 'G#dim7', 'Daug', 'Aaug', 'Dadd11',
+        ]
+      }
+    },
+    computed: {
+      availableChords: function () {
+        const chords  = [...this.builtInChords];
+        for (const chord of this.song.chords) {
+          chords.splice(chords.indexOf(chord), 1)
+        }
+        return chords
+      }
+    },
+    methods: {
+      removeEmptyLines: function () {
+        this.song.lyrics = this.song.lyrics.replace(/\n\s*\n/g, '\n');
+      },
+      autoDetectChords: function () {
+        const regex = '((' + Object.values(this.builtInChords).join('|') + ')(\\n|\\s))';
+        console.log(regex)
+        const matches = this.song.lyrics.match(new RegExp(regex, 'g'));
+        const dedup = matches.reduce((accu, val) => { accu[val.slice(0, -1)]=true; return accu}, {});
+        console.log(dedup);
+        this.song.chords = Object.keys(dedup);
+      },
+      addChord: function (chord) {
+        this.song.chords.push(chord);
+      },
+      removeChord: function (idx) {
+        this.song.chords.splice(idx, 1);
+      }
+    },
+    template: `
+      <div id="add_song_form">
+      <div class="columns">
+        <div class="column col-4 col-xs-12">
+          <input v-model="song.name" class="form-input input-sm" type="text" placeholder="Name">
+        </div>
+        <div>
+          <h3>Chords in this Song</h3>
+          <span v-if="song.chords.length === 0" style="font-size: 80%">
+              Please add chords by clicking the bubbles below, or use the Auto-Detect Button after
+              having inserted the lyrics.
+            </span>
+          <span class="chip" v-for="(chord, idx) in song.chords">
+              {{chord}}
+            <span v-on:click="removeChord(idx)" class="badge" data-badge="x"></span>
+            </span>
+          <h3>Available Chords</h3>
+          <span class="chip" v-for="(chord, idx) in availableChords" v-on:click="addChord(chord)">
+              {{chord}}
+            </span>
+        </div>
+        <div class="column col-12 col-xs-12">
+            <span style="font-size: 80%">
+              Please paste the lyrics and chords in the box below. The width of the text area below is twice the width of the BangleJS2 screen. Everything in the gray area cannot be seen on the screen
+            </span>
+          <div style="width: 60ch;">
+            <textarea
+                    v-model="song.lyrics"
+                    class="form-input input-sm"
+                    aria-label="Song Text"
+                    ref="songText"
+                    style="
+                width: 60ch;
+                font-family: monospace;
+                min-height: 200px;
+                resize:none;
+                overflow-y: scroll;
+                background: rgb(255,255,255);
+                background: linear-gradient(90deg, rgba(255,255,255,1) 50%, rgba(0,0,0,0.20) 50%);
+              "></textarea>
+          </div>
+        </div>
+        <div class="column col-12 col-xs-12">
+          <span class="btn btn-sm" id="remove-empty-lines" v-on:click="removeEmptyLines">Remove empty lines</span>
+          <span class="btn btn-sm" id="remove-empty-lines" v-on:click="autoDetectChords">Auto Detect Chords</span>
+        </div>
+      </div>
+      <br><br>
+      </div>
+    `
+  });
+  var app = new Vue({
+    el: '#app',
+    data: {
+      songsState: 'loading',
+      localSongs: [],
+      watchSongs: [],
+      editSong: null,
+    },
+    computed: {
+      localSongsSize: function() {
+        return JSON.stringify(this.localSongs).length;
+      },
+      watchSongsSize: function() {
+        return JSON.stringify(this.watchSongs).length;
+      },
+    },
+    mounted: function () {
+      this.loadSongs();
+    },
+    methods: {
+      addNewSong: function () {
+        this.songsState = 'modified';
+        const newSong = {
+          name: '', lyrics: '', chords: [],
+        }
+        this.localSongs.push(newSong);
+        this.editSong = newSong;
+      },
+      uploadSongs: function () {
+        Util.writeStorage('guitar_songs.json', JSON.stringify(this.localSongs), () => {
+          this.watchSongs = JSON.parse(JSON.stringify(this.localSongs));
+          alert('Songs written!');
+        })
+      },
+      deleteSong: function (index) {
+        this.localSongs.splice(index, 1);
+      },
+      setEditSong: function (song) {
+        this.editSong = song;
+      },
+      loadSongs: function () {
+        Util.readStorage('guitar_songs.json', (contents) => {
+          this.songsState = 'loaded';
+          this.localSongs = JSON.parse(contents) || [];
+          this.watchSongs = JSON.parse(JSON.stringify(this.localSongs));
+        });
+        window.setTimeout(() => {
+          if (!this.localSongs.length) {
+            this.songsState = 'loaded';
+          }
+        }, 2000);
+      }
+    }
+  })
+</script>
+</body>
+</html>
diff --git a/apps/guitarsongs/metadata.json b/apps/guitarsongs/metadata.json
new file mode 100644
index 000000000..cec4be2fd
--- /dev/null
+++ b/apps/guitarsongs/metadata.json
@@ -0,0 +1,17 @@
+{ "id": "guitarsongs",
+  "name": "Guitar Songs",
+  "shortName":"Guitar Songs",
+  "version":"0.02",
+  "description": "Songs lyrics and guitar chords",
+  "icon": "app.png",
+  "screenshots": [{"url": "screenshot.png"}],
+  "tags": "guitar, song, lyrics, chords",
+  "supports" : ["BANGLEJS2"],
+  "interface": "manage_songs.html",
+  "readme": "README.md",
+  "storage": [
+    {"name":"guitarsongs.app.js","url":"app.js"},
+    {"name":"guitarsongs.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":  "guitar_songs.json"}]
+}
diff --git a/apps/guitarsongs/screenshot.png b/apps/guitarsongs/screenshot.png
new file mode 100644
index 000000000..c2d7fe2ea
Binary files /dev/null and b/apps/guitarsongs/screenshot.png differ
diff --git a/apps/ha/ChangeLog b/apps/ha/ChangeLog
index 2a911c207..587a074f2 100644
--- a/apps/ha/ChangeLog
+++ b/apps/ha/ChangeLog
@@ -7,3 +7,4 @@
 0.07: Update clock_info to avoid a redraw
 0.08: Allow swiping to switch triggers
 0.09: Improve web interface, arrows in UI
+0.10: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/ha/ha.lib.js b/apps/ha/ha.lib.js
index b09cbeab2..93ba2416e 100644
--- a/apps/ha/ha.lib.js
+++ b/apps/ha/ha.lib.js
@@ -64,6 +64,7 @@ exports.sendTrigger = function(triggerName){
     while(retries > 0){
         try{
             // Now lets send the trigger that we sould send.
+            Bluetooth.println("");
             Bluetooth.println(JSON.stringify({
             t:"intent",
             action:"com.espruino.gadgetbridge.banglejs.HA",
diff --git a/apps/ha/metadata.json b/apps/ha/metadata.json
index d44b4b6f8..a34621b04 100644
--- a/apps/ha/metadata.json
+++ b/apps/ha/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ha",
   "name": "Home Assistant",
-  "version": "0.09",
+  "version": "0.10",
   "description": "Integrates your Bangle.js into Home Assistant.",
   "icon": "ha.png",
   "type": "app",
diff --git a/apps/happyclk/ChangeLog b/apps/happyclk/ChangeLog
new file mode 100644
index 000000000..e87114779
--- /dev/null
+++ b/apps/happyclk/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New app!
+0.02: Added settings to show/hide widgets and settings for different styles.
\ No newline at end of file
diff --git a/apps/happyclk/README.md b/apps/happyclk/README.md
new file mode 100644
index 000000000..d5b8752fb
--- /dev/null
+++ b/apps/happyclk/README.md
@@ -0,0 +1,25 @@
+# Happy Clock
+
+A happy clock.
+
+![](screenshot_1.png)
+
+## How to read this happy clock?
+- The left eye shows the hour, the right hour the minutes.
+- The happiness decreases as the battery level decreases.
+- The left mouthline shows whether your bangle is locked or not
+- The right mouthline whether you reached 10k steps or not.
+
+Here you can see an example of a locked bangle with a low battery:
+
+![](screenshot_3.png)
+
+## Settings
+- Screen: Normal (widgets shown), Dynamic (widgets shown if unlocked) or Full (widgets are hidden).
+- Theme: Select your custom theme, independent of system settings.
+
+## Creator
+- [David Peer](https://github.com/peerdavid).
+
+Thanks for this great idea:
+http://apps.rebble.io/de_DE/application/55014a037ed24ae745000004?section=watchfaces
diff --git a/apps/happyclk/happyclk.app.js b/apps/happyclk/happyclk.app.js
new file mode 100644
index 000000000..8e22b6e1e
--- /dev/null
+++ b/apps/happyclk/happyclk.app.js
@@ -0,0 +1,284 @@
+/************************************************
+ * Happy Clock
+ */
+
+
+const storage = require('Storage');
+const widget_utils = require("widget_utils");
+
+
+/************************************************
+ * Settings
+ */
+const SETTINGS_FILE = "happyclk.setting.json";
+
+let settings = {
+    color: "Dark",
+    screen: "Dynamic"
+};
+
+let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
+for (const key in saved_settings) {
+    settings[key] = saved_settings[key];
+}
+
+var color_map = {
+    "Dark":{
+        fg: "#fff",
+        bg: "#000",
+        eye: "#fff",
+        eyePupils: "#000"
+    },
+    "Black":{
+        fg: "#fff",
+        bg: "#000",
+        eye: "#000",
+        eyePupils: "#fff"
+    },
+    "White":{
+        fg: "#000",
+        bg: "#fff",
+        eye: "#fff",
+        eyePupils: "#000"
+    },
+    "Blue":{
+        fg: "#fff",
+        bg: "#00f",
+        eye: "#fff",
+        eyePupils: "#000"
+    },
+    "Green":{
+        fg: "#000",
+        bg: "#0f0",
+        eye: "#fff",
+        eyePupils: "#000"
+    },
+    "Red":{
+        fg: "#fff",
+        bg: "#f00",
+        eye: "#fff",
+        eyePupils: "#000"
+    },
+    "Purple":{
+        fg: "#fff",
+        bg: "#f0f",
+        eye: "#fff",
+        eyePupils: "#000"
+    },
+    "Yellow":{
+        fg: "#000",
+        bg: "#ff0",
+        eye: "#fff",
+        eyePupils: "#000"
+    }
+};
+var colors = color_map[settings.color];
+
+/************************************************
+ * Globals
+ */
+var W = g.getWidth(),R=W/2;
+var H = g.getHeight();
+var drawTimeout;
+
+
+/*
+ * HELPER
+ */
+
+let isFullscreen = function() {
+    var s = settings.screen.toLowerCase();
+    if(s == "dynamic"){
+      return Bangle.isLocked();
+    } else {
+      return s == "full";
+    }
+  };
+
+
+// Based on the great multi clock from https://github.com/jeffmer/BangleApps/
+Graphics.prototype.drawPupils = function(cx, cy, r1, dx, dy, angle) {
+    angle = angle % 360;
+    var theta=angle*Math.PI/180;
+    var x = parseInt(cx+r1*Math.sin(theta)*1.2);
+    var y = parseInt(cy-r1*Math.cos(theta)*1.2);
+
+    g.setColor(g.theme.fg);
+    g.fillCircle(cx, cy, 32);
+
+    g.setColor(colors.eye);
+    g.fillCircle(cx, cy, 27);
+    g.fillCircle(cx+dx, cy+dy, 28);
+
+    g.setColor(colors.eyePupils);
+    g.fillCircle(x, y, 8);
+    g.fillCircle(x+1, y, 8);
+};
+
+let quadraticCurve = function(t, p0x, p0y, p1x, p1y, p2x, p2y){
+    var t2 = t * t;
+    var oneMinT = 1 - t;
+    var oneMinT2 = oneMinT * oneMinT;
+    return {
+      x: p0x * oneMinT2 + 2 * p1x * t * oneMinT + p2x *t2,
+      y: p0y * oneMinT2 + 2 * p1y * t * oneMinT + p2y *t2
+    };
+}
+
+// Thanks to user stephaneAG from the Espruino forum!
+// https://forum.espruino.com/conversations/330154/#comment14593349
+let drawCurve = function(x1, y1, x2, y2, x3, y3){
+    var p0 = { x: x1, y: y1};
+    var p1 = { x: x2, y: y2};
+    var p2 = { x: x3, y: y3};
+    var time = 0;
+    var stepping = 0.1; // Stepping defines the speed.
+
+    for(var y = 0; y < 8; y++){
+        var pathPts = [];
+        for(time = 0; time <= 1; time+= stepping){
+        var pos = quadraticCurve(time, p0.x, p0.y, p1.x, p1.y, p2.x, p2.y);
+        pathPts.push(pos.x, pos.y+y);
+        }
+        g.drawPoly(pathPts, false);
+    }
+    g.flip();
+}
+
+
+/*
+ * Draw the clock
+ */
+let drawEyes = function(){
+    // And now the analog time
+    var drawHour = g.drawPupils.bind(g,55,70,12,1,0);
+    var drawMinute = g.drawPupils.bind(g,125,70,12,0,1);
+
+    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 fg
+    g.setColor(g.theme.fg);
+    drawHour(h);
+    drawMinute(m);
+}
+
+
+let drawSmile = function(isLocked){
+    g.setColor(colors.fg);
+    var y = 120;
+    var o = parseInt(E.getBattery()*0.8);
+
+    // Draw smile
+    drawCurve(30, y, W/2+12, y+o, W-40, y);
+
+    // And the two "mouth lines"
+    var reachedSteps = Bangle.getHealthStatus("day").steps >= 10000;
+    for(var i=0; i < 6; i++){
+        if(isLocked) g.drawLine(25, y+6+i, 35, y-5+i);
+        if(reachedSteps) g.drawLine(W-35, y+5+i, W-45, y-5+i);
+    }
+}
+
+let drawEyeBrow = function(){
+    if(!isFullscreen()) return;
+
+    g.setColor(colors.fg);
+    var w = 6;
+    for(var i = 0; i < w; i++){
+        g.drawLine(25, 25+i, 70, 15+i%3);
+        g.drawLine(W-25, 28+i%3, W-68, 19+i);
+    }
+}
+
+
+let drawWidgets = function(){
+    if (isFullscreen()) {
+        widget_utils.hide();
+    } else {
+        Bangle.drawWidgets();
+    }
+}
+
+
+
+let draw = function(){
+    // Queue draw in one minute
+    queueDraw();
+
+    var isLocked = Bangle.isLocked();
+    drawHelper(isLocked);
+}
+
+let drawHelper = function(isLocked){
+    g.setColor(g.theme.bg);
+
+    g.fillRect(0, isFullscreen() ? 0 : 24, W, H);
+    g.setColor(g.theme.fg);
+
+    drawEyes();
+    drawEyeBrow();
+    drawSmile(isLocked);
+
+    drawWidgets();
+}
+
+
+/*
+ * Listeners
+ */
+Bangle.on('lcdPower',on=>{
+    if (on) {
+        draw();
+    } else { // stop draw timer
+        if (drawTimeout) clearTimeout(drawTimeout);
+        drawTimeout = undefined;
+    }
+});
+
+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!
+        widget_utils.show();
+    }
+
+    draw(isLocked);
+});
+
+
+/*
+ * Some helpers
+ */
+let queueDraw = function() {
+    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();
+
+// Clear the screen once, at startup and draw clock
+g.setTheme({bg:colors.bg,fg:colors.fg,dark:false});
+draw();
+
+// After drawing the watch face, we can draw the widgets
+// Bangle.drawWidgets();
diff --git a/apps/happyclk/happyclk.icon.js b/apps/happyclk/happyclk.icon.js
new file mode 100644
index 000000000..d59fc0668
--- /dev/null
+++ b/apps/happyclk/happyclk.icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgP/ADEP/AEC+E//kH//+gYIB8F//1/B4U/ERgdB/wdB//AFIJGCx/n+P8EIM/+fnE4IBB/PAv4aBv/84E/z/8//8wAFDwwFB74FBgQFD/wFGyF/AoUAz//z/+AoPfAoV/gPP/+/IIP585lCj/z8ZvCw+H/HwPQUf/iACACIrBAAaRCGAP+AoXzAonxAoJRB//lAQJLBC4X/44IE8KeCVoQCBj4CB/iYBEwX+h6sCAAOB8BCD4C+CDwTKCACI="))
\ No newline at end of file
diff --git a/apps/happyclk/happyclk.png b/apps/happyclk/happyclk.png
new file mode 100644
index 000000000..53fbe152e
Binary files /dev/null and b/apps/happyclk/happyclk.png differ
diff --git a/apps/happyclk/happyclk.settings.js b/apps/happyclk/happyclk.settings.js
new file mode 100644
index 000000000..dd9f2f675
--- /dev/null
+++ b/apps/happyclk/happyclk.settings.js
@@ -0,0 +1,43 @@
+(function(back) {
+  const SETTINGS_FILE = "happyclk.setting.json";
+
+  // initialize with default settings...
+  const storage = require('Storage')
+  let settings = {
+    color: "Dark",
+    screen: "Dynamic"
+  };
+  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 colorOptions = ["Dark", "Black", "White", "Blue", "Green", "Red", "Purple", "Yellow"];
+  var screenOptions = ["Normal", "Dynamic", "Full"];
+  E.showMenu({
+    '': { 'title': 'Happy Clock' },
+    '< Back': back,
+    'Screen': {
+      value: 0 | screenOptions.indexOf(settings.screen),
+      min: 0, max: screenOptions.length-1,
+      format: v => screenOptions[v],
+      onchange: v => {
+        settings.screen = screenOptions[v];
+        save();
+      },
+    },
+    'Theme': {
+      value: 0 | colorOptions.indexOf(settings.color),
+      min: 0, max: colorOptions.length-1,
+      format: v => colorOptions[v],
+      onchange: v => {
+        settings.color = colorOptions[v];
+        save();
+      },
+    },
+  });
+})
diff --git a/apps/happyclk/metadata.json b/apps/happyclk/metadata.json
new file mode 100644
index 000000000..da7bdcd16
--- /dev/null
+++ b/apps/happyclk/metadata.json
@@ -0,0 +1,25 @@
+{
+  "id": "happyclk",
+  "name": "Happy Clock",
+  "shortName":"Happy Clock",
+  "icon": "happyclk.png",
+  "version":"0.02",
+  "readme": "README.md",
+  "supports": ["BANGLEJS2"],
+  "description": "A happy clock :)",
+  "type": "clock",
+  "tags": "clock",
+  "screenshots": [
+    {"url":"screenshot_1.png"},
+    {"url":"screenshot_2.png"},
+    {"url":"screenshot_3.png"},
+    {"url":"screenshot_4.png"},
+    {"url":"screenshot_5.png"}
+  ],
+  "storage": [
+    {"name":"happyclk.app.js","url":"happyclk.app.js"},
+    {"name":"happyclk.img","url":"happyclk.icon.js","evaluate":true},
+    {"name":"happyclk.settings.js","url":"happyclk.settings.js"}
+  ],
+  "data":[{"name":"happyclk.setting.json"}]
+}
diff --git a/apps/happyclk/screenshot_1.png b/apps/happyclk/screenshot_1.png
new file mode 100644
index 000000000..20bf2d294
Binary files /dev/null and b/apps/happyclk/screenshot_1.png differ
diff --git a/apps/happyclk/screenshot_2.png b/apps/happyclk/screenshot_2.png
new file mode 100644
index 000000000..49c09ee31
Binary files /dev/null and b/apps/happyclk/screenshot_2.png differ
diff --git a/apps/happyclk/screenshot_3.png b/apps/happyclk/screenshot_3.png
new file mode 100644
index 000000000..404bd7918
Binary files /dev/null and b/apps/happyclk/screenshot_3.png differ
diff --git a/apps/happyclk/screenshot_4.png b/apps/happyclk/screenshot_4.png
new file mode 100644
index 000000000..b84e41ab1
Binary files /dev/null and b/apps/happyclk/screenshot_4.png differ
diff --git a/apps/happyclk/screenshot_5.png b/apps/happyclk/screenshot_5.png
new file mode 100644
index 000000000..401bb0c51
Binary files /dev/null and b/apps/happyclk/screenshot_5.png differ
diff --git a/apps/hasensors/ChangeLog b/apps/hasensors/ChangeLog
new file mode 100644
index 000000000..7b3a63039
--- /dev/null
+++ b/apps/hasensors/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New app!
+0.02: Add sensor icons
+      Customize code directly, remove config file
diff --git a/apps/hasensors/README.md b/apps/hasensors/README.md
new file mode 100644
index 000000000..e7f6ca98d
--- /dev/null
+++ b/apps/hasensors/README.md
@@ -0,0 +1,24 @@
+# Home Assistant Sensors
+
+Sends sensor values to [Home Assistant](https://www.home-assistant.io/) using 
+the [Android Integration](/?id=android).   
+It doesn't use the Home Assistant app on your phone, but posts directly to 
+Home Assistant, so it only works if Home Assistant can be reached from your phone.
+
+## Setup
+
+You need to fill out these fields:
+
+* *Sensor ID*: This is prefixed to sensor IDs in Home Assistant.   
+  If you set this to `banglejs`, the battery sensor will be named `sensor.banglejs_battery_level`.
+* *Sensor Name*: This is prefixed to human-friendly sensor names.
+  If you set this to `Bangle.js`, the battery sensor will show as `Bangle.js Battery Level`.
+* *Home Assistant URL*: The URL of your Home Assistant Installation.
+* *Authentication Token*: You need to generate a Long-Lived Access Token in
+  Home Assistant, at the bottom of [your profile page](https://my.home-assistant.io/redirect/profile/).
+
+## Features
+
+Currently creates these sensors:
+* `<sensor id>_battery_level`: Your watch battery level as percentage
+* `<sensor id>_battery_state`: `charging` or `discharging`
\ No newline at end of file
diff --git a/apps/hasensors/boot.js b/apps/hasensors/boot.js
new file mode 100644
index 000000000..efafbc8a3
--- /dev/null
+++ b/apps/hasensors/boot.js
@@ -0,0 +1,6 @@
+(function () {
+    const sb = () => require("hasensors").sendBattery();
+    Bangle.on("charging", sb);
+    NRF.on("connect", () => setTimeout(sb, 2000));
+    setInterval(sb, 10 * 60 * 1000);
+})();
\ No newline at end of file
diff --git a/apps/hasensors/custom.html b/apps/hasensors/custom.html
new file mode 100644
index 000000000..265f80f46
--- /dev/null
+++ b/apps/hasensors/custom.html
@@ -0,0 +1,105 @@
+<html lang="en">
+<head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <title>Home Assistant Sensors configuration</title>
+    <style>
+        label {
+            display: block;
+            margin-bottom: 1em;
+        }
+        label span:first-child {
+            display: inline-block;
+            min-width: 20ex;
+        }
+        label span.explanation {
+            display: block;
+            margin-left: 21ex;
+        }
+
+        input:invalid {
+            outline: 1px solid red;
+            background: lightcoral;
+        }
+    </style>
+</head>
+<body>
+<form id="sensorform">
+    <label><span>Sensor ID:</span>
+        <input name="id" size="10" value="banglejs" required pattern="[_a-z0-9]+">
+        <span class="explanation">Lowercase letters, numbers or underscores.</span></label>
+    <label><span>Sensor Name:</span>
+        <input name="name" size="10" value="Bangle.js" required>
+        <span class="explanation">Human-friendly sensor name.</span></label>
+    <label><span>Home Assistant URL:</span>
+        <input name="url" type="url" placeholder="http://home_assistant_url:8123" required>
+        <span class="explanation">Needs to be reachable by your phone.</span></label>
+    <label><span>Authentication Token:</span>
+        <input name="token" required pattern="[\-_\.0-9a-zA-Z]+">
+        <span class="explanation">Create a long-lived access token in Home Assistant at the bottom of
+        <a href="https://my.home-assistant.io/redirect/profile/" target="_blank">your user profile</a>.</span></label>
+</form>
+<p>
+    <button id="upload" class="btn btn-primary" disabled>Upload</button>
+</p>
+<script src="../../core/lib/customize.js"></script>
+<script>
+    const STORAGE_KEY = "hasensors-config";
+    const fields = ["id", "name", "url", "token"];
+    const form = document.getElementById("sensorform");
+    const LIBRARY_URL = "./lib.js";
+
+    // fetch library code template, enable upload button once we"ve got it
+    let libTpl;
+    fetch(LIBRARY_URL).then(response=>{
+        if (! response.ok) return;
+console.log(response);
+        response.text().then(code=>{
+            libTpl = code;
+            document.getElementById("upload").disabled = false;
+        });
+    });
+
+    // try to pre-fill form with values previously saved in localStorage
+    let stored = localStorage.getItem(STORAGE_KEY);
+    if (stored) {
+        try {
+            stored = JSON.parse(stored);
+        } catch (_) {
+            stored = undefined;
+        }
+    }
+    if (stored) {
+        for (const field of fields) {
+            form[field].value = stored[field];
+        }
+    }
+
+    document.getElementById("upload").addEventListener("click", function () {
+        // validate form fields or bail out
+        for (const field of fields) {
+            if (!form[field].validity.valid) {
+                form[field].focus();
+                alert("Please enter a valid " + field);
+                return;
+            }
+        }
+        let config = {};
+        for (const field of fields) {
+            config[field] = form[field].value;
+        }
+        // save config to localStorage for re-use next time
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(config));
+        // replace {placeholders} in library code template
+        const lib = libTpl.replace(/\{(\w+)\}/g, (_,f) => config[f]);
+        console.log("config:", config, JSON.stringify(config));
+        sendCustomizedApp({
+            id: "hasensors",
+            storage: [
+                {name: "hasensors.boot.js", url: "boot.js"},
+                {name: "hasensors", content: lib},
+            ],
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/apps/hasensors/ha.png b/apps/hasensors/ha.png
new file mode 100644
index 000000000..8fce958e4
Binary files /dev/null and b/apps/hasensors/ha.png differ
diff --git a/apps/hasensors/lib.js b/apps/hasensors/lib.js
new file mode 100644
index 000000000..83072262c
--- /dev/null
+++ b/apps/hasensors/lib.js
@@ -0,0 +1,43 @@
+// split out into a separate file to keep bootcode short.
+// placeholders are replaced by custom.html before upload
+function post(sensor, data) {
+    const url = "{url}/api/states/sensor.{id}_" + sensor;
+    Bangle.http(url, {
+        method: "POST",
+        body: JSON.stringify(data),
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer {token}",
+        }
+    });
+}
+
+exports.sendBattery = function () {
+    if (!NRF.getSecurityStatus().connected) return;
+    const b = E.getBattery(), 
+        c = Bangle.isCharging();
+    let i = "mdi:battery";
+    if (c) i += "-charging";
+
+    post("battery_state", {
+        state: c ? "charging" : "discharging",
+        attributes: {
+            friendly_name: "{name} Battery State",
+            icon: i + (c ? "" : "-minus"),
+        }
+    });
+
+    if (b<10) i += "-outline"; // there is no battery-0
+    else if (b<100 || c) i += "-" + Math.floor(b/10)*10; // no battery-100 either
+
+    post("battery_level", {
+        state: b,
+        attributes: {
+            friendly_name: "{name} Battery Level",
+            unit_of_measurement: "%",
+            device_class: "battery",
+            state_class: "measurement",
+            icon: i,
+        }
+    });
+}
\ No newline at end of file
diff --git a/apps/hasensors/metadata.json b/apps/hasensors/metadata.json
new file mode 100644
index 000000000..106f11407
--- /dev/null
+++ b/apps/hasensors/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "hasensors",
+  "name": "Home Assistant Sensors",
+  "shortName": "HA sensors",
+  "version": "0.02",
+  "description": "Send sensor values to Home Assistant using the Android Integration.",
+  "icon": "ha.png",
+  "type": "bootloader",
+  "tags": "tool,sensors",
+  "dependencies": {"android":"app"},
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "custom": "custom.html",
+  "storage": [
+    {"name":"hasensors","url":"lib.js"},
+    {"name":"hasensors.boot.js","url":"boot.js"}
+  ]
+}
diff --git a/apps/health/ChangeLog b/apps/health/ChangeLog
index 921b2b682..12740959a 100644
--- a/apps/health/ChangeLog
+++ b/apps/health/ChangeLog
@@ -20,4 +20,5 @@
 0.19: Can show notification when daily step goal is reached
 0.20: Fix the settings page, it would not update settings correctly.
 0.21: Update boot.min.js.
-0.22: Fix timeout for heartrate sensor on 3 minute setting (#2435)
\ No newline at end of file
+0.22: Fix timeout for heartrate sensor on 3 minute setting (#2435)
+0.23: Fix HRM logic
diff --git a/apps/health/README.md b/apps/health/README.md
index 960e5565b..b5f6191cc 100644
--- a/apps/health/README.md
+++ b/apps/health/README.md
@@ -2,8 +2,6 @@
 
 Logs health data to a file in a defined interval, and provides an app to view it
 
-**BETA - requires firmware 2v11 or later**
-
 ## Usage
 
 Once installed, health data is logged automatically.
diff --git a/apps/health/boot.js b/apps/health/boot.js
index ae9a7cdc9..62e8b87ab 100644
--- a/apps/health/boot.js
+++ b/apps/health/boot.js
@@ -1,28 +1,28 @@
-(function(){
-  var settings = require("Storage").readJSON("health.json",1)||{};
+(function() {
+  var settings = require("Storage").readJSON("health.json", 1) || {};
   var hrm = 0|settings.hrm;
   if (hrm == 1 || hrm == 2) {
-   function onHealth() {
-     Bangle.setHRMPower(1, "health");
-     setTimeout(()=>Bangle.setHRMPower(0, "health"),hrm*60000); // give it 1 minute detection time for 3 min setting and 2 minutes for 10 min setting
-     if (hrm == 1){
-       for (var i = 1; i <= 2; i++){
-         setTimeout(()=>{
-           Bangle.setHRMPower(1, "health");
-           setTimeout(()=>{
-             Bangle.setHRMPower(0, "health");
-           }, 60000);
-         }, (i * 200000));
-       }
-     }
-   }
-   Bangle.on("health", onHealth);
-   Bangle.on('HRM', h => {
-     if (h.confidence>80) Bangle.setHRMPower(0, "health");
-   });
-   if (Bangle.getHealthStatus().bpmConfidence) return;
-   onHealth();
-  } else Bangle.setHRMPower(hrm!=0, "health");
+    function onHealth() {
+      Bangle.setHRMPower(1, "health");
+      setTimeout(() => Bangle.setHRMPower(0, "health"), hrm * 60000); // give it 1 minute detection time for 3 min setting and 2 minutes for 10 min setting
+      if (hrm == 1) {
+        function startMeasurement() {
+          Bangle.setHRMPower(1, "health");
+          setTimeout(() => {
+            Bangle.setHRMPower(0, "health");
+          }, 60000);
+        }
+        setTimeout(startMeasurement, 200000);
+        setTimeout(startMeasurement, 400000);
+      }
+    }
+    Bangle.on("health", onHealth);
+    Bangle.on("HRM", (h) => {
+      if (h.confidence > 90 && Math.abs(Bangle.getHealthStatus().bpm - h.bpm) < 1) Bangle.setHRMPower(0, "health");
+    });
+    if (Bangle.getHealthStatus().bpmConfidence > 90) return;
+    onHealth();
+  } else Bangle.setHRMPower(!!hrm, "health");
 })();
 
 Bangle.on("health", health => {
diff --git a/apps/health/boot.min.js b/apps/health/boot.min.js
index e3e45c400..651231195 100644
--- a/apps/health/boot.min.js
+++ b/apps/health/boot.min.js
@@ -1,5 +1,5 @@
 function l(){var a=require("Storage").readJSON("health.json",1)||{},d=Bangle.getHealthStatus("day").steps;a.stepGoalNotification&&0<a.stepGoal&&d>=a.stepGoal&&(d=(new Date(Date.now())).toISOString().split("T")[0],!a.stepGoalNotificationDate||a.stepGoalNotificationDate<d)&&(Bangle.buzz(200,.5),require("notify").show({title:a.stepGoal+" steps",body:"You reached your step goal!",icon:atob("DAyBABmD6BaBMAsA8BCBCBCBCA8AAA==")}),a.stepGoalNotificationDate=d,require("Storage").writeJSON("health.json",
-a))}(function(){var a=0|(require("Storage").readJSON("health.json",1)||{}).hrm;if(1==a||2==a){function d(){Bangle.setHRMPower(1,"health");setTimeout(()=>Bangle.setHRMPower(0,"health"),6E4*a);if(1==a)for(var b=1;2>=b;b++)setTimeout(()=>{Bangle.setHRMPower(1,"health");setTimeout(()=>{Bangle.setHRMPower(0,"health")},6E4)},2E5*b)}Bangle.on("health",d);Bangle.on("HRM",b=>{80<b.confidence&&Bangle.setHRMPower(0,"health")});Bangle.getHealthStatus().bpmConfidence||d()}else Bangle.setHRMPower(0!=a,"health")})();
-Bangle.on("health",a=>{function d(c){return String.fromCharCode(c.steps>>8,c.steps&255,c.bpm,Math.min(c.movement/8,255))}var b=new Date(Date.now()-59E4);a&&0<a.steps&&l();var f=function(c){return 145*(c.getDate()-1)+6*c.getHours()+(0|6*c.getMinutes()/60)}(b);b=function(c){return"health-"+c.getFullYear()+"-"+(c.getMonth()+1)+".raw"}(b);var g=require("Storage").read(b);if(g){var e=g.substr(8+4*f,4);if("\u00ff\u00ff\u00ff\u00ff"!=e){print("HEALTH ERR: Already written!");return}}else require("Storage").write(b,
-"HEALTH1\x00",0,17988);var h=8+4*f;require("Storage").write(b,d(a),h,17988);if(143==f%145)if(f=h+4,"\u00ff\u00ff\u00ff\u00ff"!=g.substr(f,4))print("HEALTH ERR: Daily summary already written!");else{a={steps:0,bpm:0,movement:0,movCnt:0,bpmCnt:0};for(var k=0;144>k;k++)e=g.substr(h,4),"\u00ff\u00ff\u00ff\u00ff"!=e&&(a.steps+=(e.charCodeAt(0)<<8)+e.charCodeAt(1),a.movement+=e.charCodeAt(2),a.movCnt++,e=e.charCodeAt(2),a.bpm+=e,e&&a.bpmCnt++),h-=4;a.bpmCnt&&(a.bpm/=a.bpmCnt);a.movCnt&&(a.movement/=a.movCnt);
-require("Storage").write(b,d(a),f,17988)}})
\ No newline at end of file
+a))}(function(){var a=0|(require("Storage").readJSON("health.json",1)||{}).hrm;if(1==a||2==a){var d=function(){Bangle.setHRMPower(1,"health");setTimeout(function(){return Bangle.setHRMPower(0,"health")},6E4*a);if(1==a){var b=function(){Bangle.setHRMPower(1,"health");setTimeout(function(){Bangle.setHRMPower(0,"health")},6E4)};setTimeout(b,2E5);setTimeout(b,4E5)}};Bangle.on("health",d);Bangle.on("HRM",function(b){90<b.confidence&&1>Math.abs(Bangle.getHealthStatus().bpm-b.bpm)&&Bangle.setHRMPower(0,
+"health")});90<Bangle.getHealthStatus().bpmConfidence||d()}else Bangle.setHRMPower(!!a,"health")})();Bangle.on("health",function(a){function d(c){return String.fromCharCode(c.steps>>8,c.steps&255,c.bpm,Math.min(c.movement/8,255))}var b=new Date(Date.now()-59E4);a&&0<a.steps&&l();var f=function(c){return 145*(c.getDate()-1)+6*c.getHours()+(0|6*c.getMinutes()/60)}(b);b=function(c){return"health-"+c.getFullYear()+"-"+(c.getMonth()+1)+".raw"}(b);var g=require("Storage").read(b);if(g){var e=g.substr(8+
+4*f,4);if("\u00ff\u00ff\u00ff\u00ff"!=e){print("HEALTH ERR: Already written!");return}}else require("Storage").write(b,"HEALTH1\x00",0,17988);var h=8+4*f;require("Storage").write(b,d(a),h,17988);if(143==f%145)if(f=h+4,"\u00ff\u00ff\u00ff\u00ff"!=g.substr(f,4))print("HEALTH ERR: Daily summary already written!");else{a={steps:0,bpm:0,movement:0,movCnt:0,bpmCnt:0};for(var k=0;144>k;k++)e=g.substr(h,4),"\u00ff\u00ff\u00ff\u00ff"!=e&&(a.steps+=(e.charCodeAt(0)<<8)+e.charCodeAt(1),a.movement+=e.charCodeAt(2),
+a.movCnt++,e=e.charCodeAt(2),a.bpm+=e,e&&a.bpmCnt++),h-=4;a.bpmCnt&&(a.bpm/=a.bpmCnt);a.movCnt&&(a.movement/=a.movCnt);require("Storage").write(b,d(a),f,17988)}})
diff --git a/apps/health/metadata.json b/apps/health/metadata.json
index d80585200..30e4b4276 100644
--- a/apps/health/metadata.json
+++ b/apps/health/metadata.json
@@ -2,7 +2,7 @@
   "id": "health",
   "name": "Health Tracking",
   "shortName": "Health",
-  "version": "0.22",
+  "version": "0.23",
   "description": "Logs health data and provides an app to view it",
   "icon": "app.png",
   "tags": "tool,system,health",
diff --git a/apps/helloworld/ChangeLog b/apps/helloworld/ChangeLog
index 777e555f1..6ffdb7f46 100644
--- a/apps/helloworld/ChangeLog
+++ b/apps/helloworld/ChangeLog
@@ -1,2 +1,3 @@
 0.01: 1st version !
 0.02: Supports bottom widgets and UI based in UI4swatch!
+0.03: Added compatibility with BJS2, improvements
diff --git a/apps/helloworld/README.md b/apps/helloworld/README.md
index 370ec349b..0617a9450 100644
--- a/apps/helloworld/README.md
+++ b/apps/helloworld/README.md
@@ -3,7 +3,6 @@
 A cross cultural hello world!/hola mundo! app
 The most common testing sentence in several languages ;)
 
-
 ## Pictures:
 
 Launcher icon
@@ -14,6 +13,10 @@ Screen - Spanish
 
 ![](helloworld_es.png)
 
+Screenshot BJS2 emul
+
+![](ss_emul_BJS2.png)
+
 Screen - English
 
 ![](helloworld_en.png)
@@ -22,6 +25,10 @@ Screen - Japanese
 
 ![](helloworld_jp.png)
 
+Screenshot BJS1 emul
+
+![](ss_emul_BJS1.png)
+
 
 
 ## Usage
@@ -31,17 +38,32 @@ interact to change language, color or quit.
 
 ## Features
 
-Colours, all inputs , graph, widgets loaded 
-Counter for Times Display
+ - Compatible Bangle.js1 Bangle.js2
+ - Bottom Widget compatible
+ - Change FG/BG colors, 
+ - Usage of many input events
 
 
-## Controls
+## Pending/future Features
+- replace UI hardcoded colors for dynamic based on theme
+- BJS2 change BTN1 from quit to Change FG Color (conflict wit setUI?)
 
-finger swipe 
-button 1,2 and 3
-touch screen left, center or right
+
+## Controls/UI
+ - Left area: Back/Exit/launcher 
+ - BTN3 (long press)(BJS1): default Exit/kill app 
+
+ - BTN1 (BJS2): Back/Exit/launcher 
+ - BTN1 (BJS1): Change Language
+ - BTN2 (BJS1): Change FG Color 
+ - BTN3 (BJS1): Quit
+
+ - Right area: Change BG Color 
+ - Swipe left: Change Language
+ - Swipe right: Change Language 
 
 
 ## Creator
 
-Daniel Perez
\ No newline at end of file
+This app is so basic that probably the easiest is to just edit the code 
+Otherwise you can contact me [here](https://github.com/dapgo/my_espruino_smartwatch_things)
\ No newline at end of file
diff --git a/apps/helloworld/app.js b/apps/helloworld/helloworld.app.js
similarity index 56%
rename from apps/helloworld/app.js
rename to apps/helloworld/helloworld.app.js
index 4803fc423..1b6684f3f 100644
--- a/apps/helloworld/app.js
+++ b/apps/helloworld/helloworld.app.js
@@ -1,40 +1,62 @@
-//HolaMundo v202103
+//HolaMundo v202212
 // place your const, vars, functions or classes here
 {
     var contador=1; 
-    var v_color_statictxt='#e56e06';
-    var v_color_b_area='#111111';   //orange RGB format rrggbb     //white,Orange,DarkGreen,Yellow,Maroon,Blue,green,Purple,cyan,olive,DarkCyan,pink
+    var v_mode_debug=0;
+    var v_model=process.env.BOARD;
+
+    var v_color_statictxt='#b30000';
+    //var v_color_b_area='#111111';   
+    //orange RGB format rrggbb     //white,Orange,DarkGreen,Yellow,Maroon,Blue,green,Purple,cyan,olive,DarkCyan,pink
     var a_colors= Array(0xFFFF,0xFD20,0x03E0,0xFFE0,0x7800,0x001F,0x07E0,0x780F,0x07FF,0x7BE0,0x03EF,0xF81F);
+    
+    var x_max_screen=g.getWidth();
+    var y_max_screen=g.getHeight(); 
+    var y_wg_bottom=g.getHeight()-25;
+    var y_wg_top=25; 
+    
+    //EMSCRIPTEN,EMSCRIPTEN2
+if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') {
     var v_color_lines=0xFFFF; //White hex format
- //new
-  var v_color_text=0x07E0;
+    var v_color_text=0x07E0;
     var v_font1size=10; //out of quotes
     var v_font2size=12;
     var v_font_banner_size=30;    
     var v_font3size=12;
+    var x_btn_area=215;
+    var x_max_usable_area=x_btn_area;//Pend! only for bangle.js
+    var y_btn2=124; //harcoded for bangle.js  cuz it is not the half of display height
+    var graph_y=120;
+    var box_x2=195;
+    var box_y2=150;
+  }else{   //BJS2
+      //176x176
+    var v_color_lines="#000"; //White hex format
+    var v_color_text="#000";
+    var v_font1size=9; //out of quotes
+    var v_font2size=9;
+    var v_font_banner_size=16;    
+    var v_font3size=8;
+    //g.setColor("#000"); //black or dark
+    x_max_usable_area=176;	
+    var graph_y=60;
+    var box_x2=128;
+    var box_y2=104;
+  }
+  if (v_mode_debug>0) console.log("device="+v_model);
     var v_arraypos=0;
-    var v_acolorpos=0;
+    var v_acolorpos=0; //for fg
+    var v_aBGcolorPos=5; //for bg
     var a_string1 = Array('hola', 'hello', 'saluton', 'ola','ciao', 'salut','czesc','konnichiwa');
     var a_string2 = Array('mundo!', 'world!', 'mondo!','mundo!','mondo!','monde!','swiat!','sekai!');
-    var mem=process.memory();
-    var v_model=process.env.BOARD;
-    console.log("device="+v_model);
-  
-    var x_max_screen=g.getWidth();//240;
-    var y_max_screen=g.getHeight(); //240; 
-    var y_wg_bottom=g.getHeight()-25;
-    var y_wg_top=25; 
-     if (v_model=='BANGLEJS') {
-        var x_btn_area=215;
-        var x_max_usable_area=x_btn_area;//Pend! only for bangle.js
-        var y_btn2=124; //harcoded for bangle.js  cuz it is not the half of display height
-     } else x_max_usable_area=240;
+
+   
 }
-            
- console.log("*** UI dimensions***"); 
- console.log("x="+x_max_screen);
- console.log("y_wg_bottom="+y_wg_bottom);
- 
+ if (v_mode_debug>0) {
+     console.log("*** UI dimensions***"); 
+     console.log("x="+x_max_screen);
+     console.log("y_wg_bottom="+y_wg_bottom);
+ }
 
     // special function to handle display switch on
     Bangle.on('lcdPower', (on) => {
@@ -47,17 +69,15 @@
     });
     
     //Clear/fill dynamic area except widget area, right and bottom status line
-    function ClearActiveArea(){        
-        g.setColor(v_color_b_area); 
-        //harcoded values to avoid clearing areas
-        g.fillRect(0,y_wg_top,195,150);
+    function ClearActiveArea(){                 
+        g.setColor(a_colors[v_aBGcolorPos]); //dynamic color
+        g.fillRect(0,y_wg_top,box_x2,box_y2);
         g.flip();
       }
       
       function DrawBangleButtons(){    
         g.setFontVector(v_font1size);
-        g.setColor(v_color_lines);//White
-        
+        g.setColor(v_color_lines);//White        
         
         g.drawString("Lang", x_max_screen-g.stringWidth("Lang"),y_wg_top+v_font1size+1); 
         //above Btn2 
@@ -93,7 +113,7 @@ function DrawBottomInfoBanner(){
     function PrintHelloWorld(){     
         ClearActiveArea(); //except widgets and bottom
         
-        console.log("drawing a "+a_string1[v_arraypos]+" "+a_string2[v_arraypos]);
+        if (v_mode_debug>0) console.log("drawing a "+a_string1[v_arraypos]+" "+a_string2[v_arraypos]);
         
         g.setColor(a_colors[v_acolorpos]); //dynamic color
         g.setFont("Vector",v_font_banner_size); 
@@ -106,55 +126,62 @@ function DrawBottomInfoBanner(){
         g.drawString(a_string2[v_arraypos],5,85);   
         g.flip();
     
-        g.setFont("Vector",v_font3size);
-        g.setColor(0,0,1);  //blue
-        g.drawString("Display count: "+contador ,10,115); 
-        mem=process.memory();
-        //console.log("Mem free/total: "+mem.free+"/"+mem.total);    
-        g.drawString("Free mem: "+mem.free+"/"+mem.total,10,135); 
+        g.setFont("Vector",v_font3size);   
+        g.setColor(v_color_statictxt);  
+        g.drawString("Display on/off: "+contador ,10,box_y2+7); 
+        //var mem=process.memory();        
+        //if (v_mode_debug>0) console.log("Mem free/total: "+mem.free+"/"+mem.total);            
         g.flip();    
     }
     
     function PrintMainStaticArea(){ 
         g.setColor(v_color_statictxt);  
         g.setFont("Vector",v_font3size);    
-        g.drawString("#by DPG #bangle.js",10,170); 
-        g.drawString("#javascript #espruino",10,185); 
+        g.drawString("#by DPG #bangle.js",10,box_y2+5+(v_font3size*2)); 
+        g.drawString("#javascript #espruino",10,box_y2+5+(v_font3size*3)); 
         
         var img_obj_RedHi = {
             width : 40, height : 40, bpp : 4,
             transparent : 0,
             buffer : require("heatshrink").decompress(atob("AFkM7vd4EAhoTNhvQhvcgHdAQIAL5oWCFIPdExo+CEoIZCABI0DhvADIZhJL4IXDHRkMEAQmOCYgmOAAIOBHwImNRQgmPHgYmCUIIXMJobfB3jgCWZJNDEga1JYQQQCMYZoJJAJNDBwgTICQPdCY7lDRQx4DVIwTIHYZzEHZATFBwblDCZRKEO5ITFWAbIJCYrHBAAImICYwEB5raKCYwAMCYXc5gADE5hLDAAgTIBJLkBBJAyKHw5hKBRJJKKJSuII5Q0IhqPKCbjRKCc4AgA=="))
           }
-          g.drawImage(img_obj_RedHi,155,160);
+          g.drawImage(img_obj_RedHi,box_x2+2,graph_y);		  
           g.flip();
     }
     
     
     //inc var postion for text array
-    function ChangeLang(){
-        if (v_arraypos<a_string1.length-1) v_arraypos++;
-         else v_arraypos=0;
-        //console.log("ChangeLang, Langpos: "+v_arraypos);        
+    function ChangeLang(dir){        
+        if (v_mode_debug>0) console.log("ChangeLang, dir, Prev pos: "+dir+" , "+v_arraypos);        
+       
+        if ((dir==1) && (v_arraypos<a_string1.length-1)) v_arraypos++;
+        else if ((dir== 1) && (v_arraypos==a_string1.length-1)) v_arraypos=0;
+         else if ((dir== -1) && (v_arraypos>0)) v_arraypos--;  
+          else if ((dir== -1) && (v_arraypos==0)) v_arraypos=a_string1.length-1;  
         PrintHelloWorld();
     }
     
     //inc var postion for color array
     function ChangeColor(){
-        //console.log("ChangeColor, colpos: "+v_acolorpos);
+        //if (v_mode_debug>0) console.log("ChangeColor, colpos: "+v_acolorpos);
         if (v_acolorpos<a_colors.length-2) v_acolorpos++;
          else v_acolorpos=0;    
         PrintHelloWorld();
     }
-    
+    function ChangeBGColor(){        
+        if (v_aBGcolorPos<a_colors.length-2) v_aBGcolorPos++;
+         else v_aBGcolorPos=0; 
+        ClearActiveArea(); //except widgets and bottom    
+        PrintHelloWorld();
+    }
     function UserInput(){   
         Bangle.on('touch', function(button){ 
             switch(button){
                 case 1:       
-                    ChangeLang();//left
+                    ChangeLang();//left area
                          break;
                 case 2:
-                    ChangeColor();//right
+                    ChangeBGColor();//right
                          break;
                 case 3: 
                     ChangeColor();
@@ -162,23 +189,29 @@ function DrawBottomInfoBanner(){
                         break;
             }  
         });
-            
-        setWatch(ChangeLang, BTN1, { repeat: true });//func  to quit
+    
+   if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') {
+       setWatch(ChangeLang, BTN1, { repeat: true });//func  to quit
         setWatch(ChangeColor, BTN2, { repeat: true });
         setWatch(Bangle.showLauncher, BTN3, { repeat: true });  
-        //touchscreen to quit
-        Bangle.on('swipe', dir => {  
-          if(dir == 1) ChangeLang(); //func load() to quit
-          else ChangeLang();
-        });
+     } //touchscreen to quit
+     else setWatch(ChangeColor, BTN1, { repeat: true });//func  to quit
+    Bangle.on('swipe', dir => {  
+        if(dir == 1) ChangeLang(1); //right
+        else ChangeLang(-1); //left
+    });
     }
     
-    console.log("**************************");
-    console.log("Log: *** hola mundo app");
+    if (v_mode_debug>0) console.log("**************************");
+    if (v_mode_debug>0) console.log("Log: *** hola mundo app");
     g.clear();
       Bangle.loadWidgets();
       Bangle.drawWidgets();   
-      if (v_model=='BANGLEJS') DrawBangleButtons();
+      Bangle.setUI({
+      mode : "custom",
+      back : function() {load();}
+    });
+    if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') DrawBangleButtons();
       DrawBottomInfoBanner();
       UserInput();
       PrintMainStaticArea();
diff --git a/apps/helloworld/metadata.json b/apps/helloworld/metadata.json
index b8fe1b1e3..b9dec6b52 100644
--- a/apps/helloworld/metadata.json
+++ b/apps/helloworld/metadata.json
@@ -2,14 +2,15 @@
   "id": "helloworld",
   "name": "hello, world!",
   "shortName": "hello world",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A cross cultural hello world!/hola mundo! app with colors and languages",
   "icon": "app.png",
   "tags": "input,interface,buttons,touch",
-  "supports": ["BANGLEJS"],
+  "screenshots": [{"url":"screenshot.png"}],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name":"helloworld.app.js","url":"app.js"},
+    {"name":"helloworld.app.js","url":"helloworld.app.js"},
     {"name":"helloworld.img","url":"app-icon.js","evaluate":true}
   ]
 }
diff --git a/apps/helloworld/screenshot.png b/apps/helloworld/screenshot.png
new file mode 100644
index 000000000..32cbd4ff3
Binary files /dev/null and b/apps/helloworld/screenshot.png differ
diff --git a/apps/helloworld/ss_emul_BJS1.png b/apps/helloworld/ss_emul_BJS1.png
new file mode 100644
index 000000000..32cbd4ff3
Binary files /dev/null and b/apps/helloworld/ss_emul_BJS1.png differ
diff --git a/apps/helloworld/ss_emul_BJS2.png b/apps/helloworld/ss_emul_BJS2.png
new file mode 100644
index 000000000..349703519
Binary files /dev/null and b/apps/helloworld/ss_emul_BJS2.png differ
diff --git a/apps/homework/app.js b/apps/homework/app.js
index 3d9be31c9..a6ad331f0 100644
--- a/apps/homework/app.js
+++ b/apps/homework/app.js
@@ -46,8 +46,8 @@ var mainMenu = {
   "Reset Homework": function() {
     E.showPrompt("Are you sure you want to delete homework.txt?", {
       buttons: {
-        "No": false,
-        "Yes": true
+        /*LANG*/"No": false,
+        /*LANG*/"Yes": true
       }
     }).then(function(v) {
       if (v) {
diff --git a/apps/hralarm/metadata.json b/apps/hralarm/metadata.json
index 4c661b3fc..c99cb857f 100644
--- a/apps/hralarm/metadata.json
+++ b/apps/hralarm/metadata.json
@@ -4,7 +4,7 @@
   "shortName":"HR Alarm",
   "version":"0.02",
   "description": "This invisible widget vibrates whenever the heart rate gets close to the upper limit or goes over or under the configured limits",
-  "icon": "widget.png",  
+  "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
   "supports" : ["BANGLEJS2"],
@@ -12,5 +12,8 @@
   "storage": [
     {"name":"hralarm.wid.js","url":"widget.js"},
     {"name":"hralarm.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"hralarm.json"}
   ]
 }
diff --git a/apps/hrmmar/ChangeLog b/apps/hrmmar/ChangeLog
new file mode 100644
index 000000000..8c418c8fd
--- /dev/null
+++ b/apps/hrmmar/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App
+0.02: Disable when bthrm is active
+      Enable fft elim as default
diff --git a/apps/hrmmar/README.md b/apps/hrmmar/README.md
index ff90d9156..2d9612117 100644
--- a/apps/hrmmar/README.md
+++ b/apps/hrmmar/README.md
@@ -7,5 +7,5 @@ Measurements from the build in PPG-Sensor (Photoplethysmograph) is sensitive to
 * **MA removal**
 
 Select the algorithm to Remove Motion artifacts:
-  - None: (default) No Motion Artifact removal.
-  - fft elim: (*experimental*) Remove Motion Artifacts by cutting out the frequencies from the HRM frequency spectrum that are noisy in acceleration spectrum. Under motion this can report a heart rate that is closer to the real one but will fail if motion frequency and heart rate overlap.
+  - None: No Motion Artifact removal.
+  - fft elim: (default, *experimental*) Remove Motion Artifacts by cutting out the frequencies from the HRM frequency spectrum that are noisy in acceleration spectrum. Under motion this can report a heart rate that is closer to the real one but will fail if motion frequency and heart rate overlap.
diff --git a/apps/hrmmar/boot.js b/apps/hrmmar/boot.js
index 52d88c313..4c589bc03 100644
--- a/apps/hrmmar/boot.js
+++ b/apps/hrmmar/boot.js
@@ -5,8 +5,12 @@
     bpm_corrected = bpm;
   };
 
+  const isInternal = (hrm) => {
+    return !hrm.src || hrm.src === "int";
+  };
+
   Bangle.on('HRM', (hrm) => {
-    if (bpm_corrected > 0) {
+    if (isInternal(hrm) && bpm_corrected > 0) {
       // replace bpm data in event
       hrm.bpm_orig = hrm.bpm;
       hrm.confidence_orig = hrm.confidence;
@@ -17,16 +21,16 @@
 
   let run = () => {
     const settings = Object.assign({
-        mAremoval: 0
+        mAremoval: 1
     }, require("Storage").readJSON("hrmmar.json", true) || {});
 
     // select motion artifact removal algorithm
     switch(settings.mAremoval) {
       case 1:
-        require("hrmfftelim").run(settings, updateHrm);
+        require("hrmfftelim").run(settings, updateHrm, isInternal);
       break;
     }
-  }
+  };
 
   // override setHRMPower so we can run our code on HRM enable
   const oldSetHRMPower = Bangle.setHRMPower;
diff --git a/apps/hrmmar/fftelim.js b/apps/hrmmar/fftelim.js
index 98b7f33ad..f57489dda 100644
--- a/apps/hrmmar/fftelim.js
+++ b/apps/hrmmar/fftelim.js
@@ -1,4 +1,4 @@
-exports.run = (settings, updateHrm) => {
+exports.run = (settings, updateHrm, isInternal) => {
   const SAMPLE_RATE = 12.5;
   const NUM_POINTS = 256; // fft size
   const ACC_PEAKS = 2; // remove this number of ACC peaks
@@ -147,7 +147,7 @@ exports.run = (settings, updateHrm) => {
   });
 
   Bangle.on('accel', (acc) => {
-    if (hrmdata !== undefined) {
+    if (hrmdata !== undefined && isInternal(hrmdata)) {
       hrmvalues[idx] = hrmdata.filt;
       accvalues[idx] = acc.x*1000 + acc.y*1000 + acc.z*1000;
       idx++;
diff --git a/apps/hrmmar/metadata.json b/apps/hrmmar/metadata.json
index 232ff64a7..fcb2fac5c 100644
--- a/apps/hrmmar/metadata.json
+++ b/apps/hrmmar/metadata.json
@@ -3,7 +3,7 @@
   "name": "HRM Motion Artifacts removal",
   "shortName":"HRM MA removal",
   "icon": "app.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Removes Motion Artifacts in Bangle.js's heart rate sensor data.",
   "type": "bootloader",
   "tags": "health",
diff --git a/apps/hrmmar/settings.js b/apps/hrmmar/settings.js
index 3c6e62c91..c391f6862 100644
--- a/apps/hrmmar/settings.js
+++ b/apps/hrmmar/settings.js
@@ -2,7 +2,7 @@
   var FILE = "hrmmar.json";
   // Load settings
   var settings = Object.assign({
-   mAremoval: 0,
+   mAremoval: 1,
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {
diff --git a/apps/hwid_a_battery_widget/ChangeLog b/apps/hwid_a_battery_widget/ChangeLog
index cbdccfecf..6c57f97a8 100644
--- a/apps/hwid_a_battery_widget/ChangeLog
+++ b/apps/hwid_a_battery_widget/ChangeLog
@@ -5,4 +5,5 @@
 0.05: Deleting Background - making Font larger
 0.06: Fixing refresh issues
 0.07: Fixed position after unlocking
-0.08: Handling exceptions
\ No newline at end of file
+0.08: Handling exceptions
+0.09: Add option for showing battery high mark
diff --git a/apps/hwid_a_battery_widget/README.md b/apps/hwid_a_battery_widget/README.md
index db105635a..fd7bbec67 100644
--- a/apps/hwid_a_battery_widget/README.md
+++ b/apps/hwid_a_battery_widget/README.md
@@ -8,6 +8,8 @@ Show the current battery level and charging status in the top right of the clock
   *  Blue when charging
 *  40 pixels wide
 
+The high-level marker (a little bar at the 100% point) can be toggled in settings.
+
 ![](a_battery_widget-pic.jpg)
 
 ## Creator
diff --git a/apps/hwid_a_battery_widget/metadata.json b/apps/hwid_a_battery_widget/metadata.json
index 29b0540c2..73dfc7c92 100644
--- a/apps/hwid_a_battery_widget/metadata.json
+++ b/apps/hwid_a_battery_widget/metadata.json
@@ -3,12 +3,13 @@
   "name": "A Battery Widget (with percentage) - Hanks Mod",
   "shortName":"H Battery Widget",
   "icon": "widget.png",
-  "version":"0.08",
+  "version":"0.09",
   "type": "widget",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "description": "Simple and slim battery widget with charge status and percentage",
   "tags": "widget,battery",
+  "provides_widgets" : ["battery"],
   "storage": [
     {"name":"hwid_a_battery_widget.wid.js","url":"widget.js"}
   ]
diff --git a/apps/hwid_a_battery_widget/widget.js b/apps/hwid_a_battery_widget/widget.js
index e42c15355..027535051 100644
--- a/apps/hwid_a_battery_widget/widget.js
+++ b/apps/hwid_a_battery_widget/widget.js
@@ -1,7 +1,6 @@
 (function(){
 	const intervalLow  = 60000; // update time when not charging
 	const intervalHigh = 2000; // update time when charging
-	var old_l;
 
 	var old_x = this.x;
 	var old_y = this.y;
@@ -22,49 +21,36 @@
 	};
 
 	function draw() {
-	if (typeof old_x === 'undefined') old_x = this.x;	
-	if (typeof old_y === 'undefined') old_y = this.y;	
-	var s = 29;
+	var s = width - 1;
 	var x = this.x;
 	var	y = this.y;
 	if ((typeof x === 'undefined') || (typeof y === 'undefined')) {
 	} else {
+		g.clearRect(old_x, old_y, old_x + width, old_y + height);
+
 		const l = E.getBattery(); // debug: Math.floor(Math.random() * 101);
 		let xl = x+4+l*(s-12)/100;
-		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);
-			g.fillRect(x,y,xl+4,y+16+3); //Clear
-			g.setFontAlign(0,0);
-			g.setFont('Vector',16);
-			//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;
-		//console.log(old_x);
 
 		g.setColor(levelColor(l));
 		g.fillRect(x+4,y+14+3,xl,y+16+3); // charging bar
-		g.fillRect((x+4+100*(s-12)/100)-1,y+14+3,x+4+100*(s-12)/100,y+16+3); // charging bar "full mark"
 		// Show percentage
 		g.setColor(COLORS.black);
 		g.setFontAlign(0,0);
 		g.setFont('Vector',16);
 		g.drawString(l, x + 14, y + 10);
-		
+
 	}
 		old_x = this.x;
-		old_y = this.y;	
-	
+		old_y = this.y;
+
 	if (Bangle.isCharging()) changeInterval(id, intervalHigh);
 		else					 changeInterval(id, intervalLow);
 	}
 
 	Bangle.on('charging',function(charging) { draw(); });
 	var id = setInterval(()=>WIDGETS["hwid_a_battery_widget"].draw(), intervalLow);
+	var width = 30;
+	var height = 19;
 
-	WIDGETS["hwid_a_battery_widget"]={area:"tr",width:30,draw:draw};
+	WIDGETS["hwid_a_battery_widget"]={area:"tr",width,draw:draw};
 })();
diff --git a/apps/iconlaunch/ChangeLog b/apps/iconlaunch/ChangeLog
index 0c33a4871..8bad496bf 100644
--- a/apps/iconlaunch/ChangeLog
+++ b/apps/iconlaunch/ChangeLog
@@ -20,3 +20,5 @@
       still be loaded when they weren't supposed to.
 0.15: Ensure that we hide widgets if in fullscreen mode
       (So that widgets are still hidden if launcher is fast-loaded)
+0.16: Use firmware provided E.showScroller method
+0.17: fix fullscreen with oneClickExit 
diff --git a/apps/iconlaunch/README.md b/apps/iconlaunch/README.md
index 0d36fdeb4..49d01d3fd 100644
--- a/apps/iconlaunch/README.md
+++ b/apps/iconlaunch/README.md
@@ -6,7 +6,3 @@ This launcher shows 9 apps per screen, making it much faster to navigate versus
 
 ![A screenshot](screenshot1.png)
 ![Another screenshot](screenshot2.png)
-
-## Technical note
-
-The app uses `E.showScroller`'s code in the app but not the function itself because `E.showScroller` doesn't report the position of a press to the select function.
diff --git a/apps/iconlaunch/app.js b/apps/iconlaunch/app.js
index acf695ddb..9f8cedb0f 100644
--- a/apps/iconlaunch/app.js
+++ b/apps/iconlaunch/app.js
@@ -9,6 +9,7 @@
     timeOut:"Off"
   }, s.readJSON("iconlaunch.json", true) || {});
 
+  
   if (!settings.fullscreen) {
     Bangle.loadWidgets();
     Bangle.drawWidgets();
@@ -32,13 +33,14 @@
       }) };
     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;
@@ -61,36 +63,26 @@
       }
       x += iconSize;
     }
-    drawText(itemI);
+    drawText(itemI, r.y);
   };
-  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) {
+
+  let drawText = function(i, appY) {
     const selectedApp = launchCache.apps[selectedItem];
     const idy = (selectedItem - (selectedItem % 3)) / 3;
     if (!selectedApp || i != idy) return;
-    const appY = idxToY(idy) + iconSize / 2;
+    appY = appY + itemSize/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
+      R.w / 2 - rect.width / 2 - 2,
+      appY - rect.height / 2 - 2,
+      R.w / 2 + rect.width / 2 + 1,
+      appY + rect.height / 2 + 1
     );
     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;
@@ -108,95 +100,46 @@
       }
     }
     selectedItem = appId;
-    drawItems();
+    if (scroller) scroller.draw();
   };
-  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(launchCache.apps.length / appsN);
-  let onDrag = function(e) {
-    updateTimeout();
-    g.setColor(g.theme.fg);
-    g.setBgColor(g.theme.bg);
-    let dy = e.dy;
-    if (scroll + R.h - dy > itemsN * itemSize) {
-      dy = scroll + R.h - itemsN * itemSize;
-    }
-    if (scroll - dy < 0) {
-      dy = scroll;
-    }
-    scroll -= dy;
-    scroll = E.clip(scroll, 0, itemSize * (itemsN - 1));
-    g.setClipRect(R.x, R.y, R.x2, R.y2);
-    g.scroll(0, dy);
-    if (dy < 0) {
-      g.setClipRect(R.x, R.y2 - (1 - dy), R.x2, R.y2);
-      let i = YtoIdx(R.y2 - (1 - dy));
-      let y = idxToY(i);
-      while (y < R.y2) {
-        drawItem(i, {
-          x: R.x,
-          y: y,
-          w: R.w,
-          h: itemSize,
-        });
-        i++;
-        y += itemSize;
-      }
-    } else {
-      g.setClipRect(R.x, R.y, R.x2, R.y + dy);
-      let i = YtoIdx(R.y + dy);
-      let y = idxToY(i);
-      while (y > R.y - itemSize) {
-        drawItem(i, {
-          x: R.x,
-          y: y,
-          w: R.w,
-          h: itemSize,
-        });
-        y -= itemSize;
-        i--;
-      }
-    }
-    g.setClipRect(0, 0, g.getWidth() - 1, g.getHeight() - 1);
-  };
-  let mode = {
-    mode: "custom",
-    drag: onDrag,
-    touch: (_, e) => {
-      if (e.y < R.y - 4) return;
-      updateTimeout();
-      let i = YtoIdx(e.y);
-      selectItem(i, e);
-    },
-    swipe: (h,_) => { if(settings.swipeExit && h==1) { Bangle.showClock(); } },
-    btn: _=> { if (settings.oneClickExit) Bangle.showClock(); },
+
+  let idWatch = null;
+  let options = {
+    h: itemSize,
+    c: itemsN,
+    draw: drawItem,
+    select: selectItem,
     remove: function() {
       if (timeout) clearTimeout(timeout);
+      Bangle.removeListener("drag", updateTimeout);
+      Bangle.removeListener("touch", updateTimeout);
+      Bangle.removeListener("swipe", swipeHandler);
       if (settings.fullscreen) { // for fast-load, if we hid widgets then we should show them again
         require("widget_utils").show();
       }
-    }
+      if(idWatch) clearWatch(idWatch);
+    },
+    btn:Bangle.showClock
   };
+  
+  //work both the fullscreen and the oneClickExit
+  if( settings.fullscreen && settings.oneClickExit)
+  {
+      idWatch=setWatch(function(e) { 
+        Bangle.showClock();
+      }, BTN, {repeat:false, edge:'rising' });
+    
+  }
+  else if( settings.oneClickExit ) 
+  {
+      options.back=Bangle.showClock;
+  }
+
+  
+
+
+  let scroller = E.showScroller(options);
 
   let timeout;
   const updateTimeout = function(){
@@ -207,7 +150,11 @@
     }
   };
 
-  updateTimeout();
+  let swipeHandler = (h,_) => { if(settings.swipeExit && h==1) { Bangle.showClock(); } };
+  
+  Bangle.on("swipe", swipeHandler)
+  Bangle.on("drag", updateTimeout);
+  Bangle.on("touch", updateTimeout);
 
-  Bangle.setUI(mode);
-}
+  updateTimeout();
+}
\ No newline at end of file
diff --git a/apps/iconlaunch/metadata.json b/apps/iconlaunch/metadata.json
index 27f6386d3..35a7907bd 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.15",
+	"version": "0.17",
 	"icon": "app.png",
 	"description": "A launcher inspired by smartphones, with an icon-only scrollable menu.",
 	"tags": "tool,system,launcher",
diff --git a/apps/imageclock/metadata.json b/apps/imageclock/metadata.json
index b291ab01e..f8a0aa61e 100644
--- a/apps/imageclock/metadata.json
+++ b/apps/imageclock/metadata.json
@@ -15,5 +15,8 @@
     {"name":"imageclock.app.js","url":"app.js"},
     {"name":"imageclock.settings.js","url":"settings.js"},
     {"name":"imageclock.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"imageclock.json"}
   ]
 }
diff --git a/apps/info/info.app.js b/apps/info/info.app.js
index ade3f3ebb..d97f780da 100644
--- a/apps/info/info.app.js
+++ b/apps/info/info.app.js
@@ -21,11 +21,11 @@ var screens = [
     name: "Hardware",
     items: [
       {name: "Battery", fun: () => E.getBattery() + "%"},
-      {name: "Charge?", fun: () => Bangle.isCharging() ? "Yes" : "No"},
+      {name: "Charge?", fun: () => Bangle.isCharging() ? /*LANG*/"Yes" : /*LANG*/"No"},
       {name: "TempInt.", fun: () => locale.temp(parseInt(E.getTemperature()))},
-      {name: "Bluetooth", fun:  () => NRF.getSecurityStatus().connected ? "Conn" : "NoConn"},
-      {name: "GPS", fun:  () => Bangle.isGPSOn() ? "On" : "Off"},
-      {name: "Compass", fun:  () => Bangle.isCompassOn() ? "On" : "Off"},
+      {name: "Bluetooth", fun:  () => NRF.getSecurityStatus().connected ? /*LANG*/"Conn" : /*LANG*/"NoConn"},
+      {name: "GPS", fun:  () => Bangle.isGPSOn() ? /*LANG*/"On" : /*LANG*/"Off"},
+      {name: "Compass", fun:  () => Bangle.isCompassOn() ? /*LANG*/"On" : /*LANG*/"Off"},
     ]
   },
   {
@@ -160,4 +160,4 @@ Bangle.on('lock', function(isLocked) {
 });
 
 Bangle.loadWidgets();
-Bangle.drawWidgets();
\ No newline at end of file
+Bangle.drawWidgets();
diff --git a/apps/infoclk/ChangeLog b/apps/infoclk/ChangeLog
index 4744f872a..c5453e529 100644
--- a/apps/infoclk/ChangeLog
+++ b/apps/infoclk/ChangeLog
@@ -1,3 +1,13 @@
 0.01: New app!
 0.02-0.07: Bug fixes
-0.08: Submitted to the app loader
\ No newline at end of file
+0.08: Submitted to the app loader
+0.09: Added weather dependency
+      Up and down swipes can now be configured separately
+      The settings menu can now handle having shortcuts configured to apps that were removed
+      Default notification app is now messageui rather than messages
+      Support for dual stage unlock
+      Support for a calendar bar
+      The clock face is redrawn less often, hoping to save some battery
+      Option to show the seconds when unlocked, even when otherwise hidden by other settings
+      Broke out config loading into separate file to avoid duplicating a whole bunch of code
+      Added support for fast loading
\ No newline at end of file
diff --git a/apps/infoclk/README.md b/apps/infoclk/README.md
index 1dd563bec..984953e01 100644
--- a/apps/infoclk/README.md
+++ b/apps/infoclk/README.md
@@ -16,6 +16,8 @@ There are generally a few apps that the user uses far more frequently than the o
 
 ## Configurability
 
+Dual stage unlock allows for unlocking to be split into two stages: lighting the screen upon the actual unlock, and displaying the extra information and shortcuts after a user-configurable number of taps. This may be useful if you want to quickly glance at the clock with a wrist flick in the dark, or if you want to show the time to other people. Swipe shortcuts are active even after the first stage.
+
 Displaying the seconds allows for more precise timing, but waking up the CPU to refresh the display more often consumes battery. The user can enable or disable them completely, but can also configure them to be enabled or disabled automatically based on some hueristics:
 
 * They can be hidden while the display is locked, if the user expects to unlock their watch when they need the seconds.
diff --git a/apps/infoclk/app.js b/apps/infoclk/app.js
index 3d51191df..3f31398e0 100644
--- a/apps/infoclk/app.js
+++ b/apps/infoclk/app.js
@@ -1,280 +1,302 @@
-const SETTINGS_FILE = "infoclk.json";
-const FONT = require('infoclk-font.js');
+{
+  const FONT = require('infoclk-font.js');
 
-const storage = require("Storage");
-const locale = require("locale");
-const weather = require('weather');
+  const storage = require("Storage");
+  const locale = require("locale");
+  const weather = require('weather');
 
-let config = Object.assign({
-  seconds: {
-    // Displaying the seconds can reduce battery life because the CPU must wake up more often to update the display.
-    // The seconds will be shown unless one of these conditions is enabled here, and currently true.
-    hideLocked: false,  // Hide the seconds when the display is locked.
-    hideBattery: 20,    // Hide the seconds when the battery is at or below a defined percentage.
-    hideTime: true,     // Hide the seconds when between a certain period of time. Useful for when you are sleeping and don't need the seconds
-    hideStart: 2200,    //    The time when the seconds are hidden: first 2 digits are hours on a 24 hour clock, last 2 are minutes
-    hideEnd: 700,      //    The time when the seconds are shown again
-    hideAlways: false,  // Always hide (never show) the seconds
-  },
+  let config = require('infoclk-config.js').getConfig();
 
-  date: {
-    // Settings related to the display of the date
-    mmdd: true,           // If true, display the month first. If false, display the date first.
-    separator: '-',       // The character that goes between the month and date
-    monthName: false,     // If false, display the month as a number. If true, display the name.
-    monthFullName: false, //    If displaying the name: If false, display an abbreviation. If true, display a full name.
-    dayFullName: false,   // If false, display the day of the week's abbreviation. If true, display the full name.
-  },
+  // Return whether the given time (as a date object) is between start and end (as a number where the first 2 digits are hours on a 24 hour clock and the last 2 are minutes), with end time wrapping to next day if necessary
+  let timeInRange = function (start, time, end) {
 
-  bottomLocked: {
-    display: 'weather'    // What to display in the bottom row when locked:
-    //    'weather': The current temperature and weather description
-    //    'steps': Step count
-    //    'health': Step count and bpm
-    //    'progress': Day progress bar
-    //    false: Nothing
-  },
+    // Convert the given date object to a time number
+    let timeNumber = time.getHours() * 100 + time.getMinutes();
 
-  shortcuts: [
-    //8 shortcuts, displayed in the bottom half of the screen (2 rows of 4 shortcuts) when unlocked
-    //    false = no shortcut
-    //    '#LAUNCHER' = open the launcher
-    //    any other string = name of app to open
-    'stlap', 'keytimer', 'pomoplus', 'alarm',
-    'rpnsci', 'calendar', 'torch', 'weather'
-  ],
-
-  swipe: {
-    // 3 shortcuts to launch upon swiping:
-    //    false = no shortcut
-    //    '#LAUNCHER' = open the launcher
-    //    any other string = name of app to open
-    up: 'messages',       // Swipe up or swipe down, due to limitation of event handler
-    left: '#LAUNCHER',
-    right: '#LAUNCHER',
-  },
-
-  dayProgress: {
-    // A progress bar representing how far through the day you are
-    enabledLocked: true,    // Whether this bar is enabled when the watch is locked
-    enabledUnlocked: false, // Whether the bar is enabled when the watch is unlocked
-    color: [0, 0, 1],      // The color of the bar
-    start: 700,            // The time of day that the bar starts filling
-    end: 2200,              // The time of day that the bar becomes full
-    reset: 300             // The time of day when the progress bar resets from full to empty
-  },
-
-  lowBattColor: {
-    // The text can change color to indicate that the battery is low
-    level: 20,        // The percentage where this happens
-    color: [1, 0, 0]  // The color that the text changes to
-  }
-}, storage.readJSON(SETTINGS_FILE));
-
-// Return whether the given time (as a date object) is between start and end (as a number where the first 2 digits are hours on a 24 hour clock and the last 2 are minutes), with end time wrapping to next day if necessary
-function timeInRange(start, time, end) {
-
-  // Convert the given date object to a time number
-  let timeNumber = time.getHours() * 100 + time.getMinutes();
-
-  // Normalize to prevent the numbers from wrapping around at midnight
-  if (end <= start) {
-    end += 2400;
-    if (timeNumber < start) timeNumber += 2400;
-  }
-
-  return start <= timeNumber && timeNumber <= end;
-}
-
-// Return whether settings should be displayed based on the user's configuration
-function shouldDisplaySeconds(now) {
-  return !(
-    (config.seconds.hideAlways) ||
-    (config.seconds.hideLocked && Bangle.isLocked()) ||
-    (E.getBattery() <= config.seconds.hideBattery) ||
-    (config.seconds.hideTime && timeInRange(config.seconds.hideStart, now, config.seconds.hideEnd))
-  );
-}
-
-// Determine the font size needed to fit a string of the given length widthin maxWidth number of pixels, clamped between minSize and maxSize
-function getFontSize(length, maxWidth, minSize, maxSize) {
-  let size = Math.floor(maxWidth / length);  //Number of pixels of width available to character
-  size *= (20 / 12);  //Convert to height, assuming 20 pixels of height for every 12 of width
-
-  // Clamp to within range
-  if (size < minSize) return minSize;
-  else if (size > maxSize) return maxSize;
-  else return Math.floor(size);
-}
-
-// Get the current day of the week according to user settings
-function getDayString(now) {
-  if (config.date.dayFullName) return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][now.getDay()];
-  else return ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][now.getDay()];
-}
-
-// Pad a number with zeros to be the given number of digits
-function pad(number, digits) {
-  let result = '' + number;
-  while (result.length < digits) result = '0' + result;
-  return result;
-}
-
-// Get the current date formatted according to the user settings
-function getDateString(now) {
-  let month;
-  if (!config.date.monthName) month = pad(now.getMonth() + 1, 2);
-  else if (config.date.monthFullName) month = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][now.getMonth()];
-  else month = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][now.getMonth()];
-
-  if (config.date.mmdd) return `${month}${config.date.separator}${pad(now.getDate(), 2)}`;
-  else return `${pad(now.getDate(), 2)}${config.date.separator}${month}`;
-}
-
-// Get a floating point number from 0 to 1 representing how far between the user-defined start and end points we are
-function getDayProgress(now) {
-  let start = config.dayProgress.start;
-  let current = now.getHours() * 100 + now.getMinutes();
-  let end = config.dayProgress.end;
-  let reset = config.dayProgress.reset;
-
-  // Normalize
-  if (end <= start) end += 2400;
-  if (current < start) current += 2400;
-  if (reset < start) reset += 2400;
-
-  // Convert an hhmm number into a floating-point hours
-  function toDecimalHours(time) {
-    let hours = Math.floor(time / 100);
-    let minutes = time % 100;
-
-    return hours + (minutes / 60);
-  }
-
-  start = toDecimalHours(start);
-  current = toDecimalHours(current);
-  end = toDecimalHours(end);
-  reset = toDecimalHours(reset);
-
-  let progress = (current - start) / (end - start);
-
-  if (progress < 0 || progress > 1) {
-    if (current < reset) return 1;
-    else return 0;
-  } else {
-    return progress;
-  }
-}
-
-// Get a Gadgetbridge weather string
-function getWeatherString() {
-  let current = weather.get();
-  if (current) return locale.temp(current.temp - 273.15) + ', ' + current.txt;
-  else return 'Weather unknown!';
-}
-
-// Get a second weather row showing humidity, wind speed, and wind direction
-function getWeatherRow2() {
-  let current = weather.get();
-  if (current) return `${current.hum}%, ${locale.speed(current.wind)} ${current.wrose}`;
-  else return 'Check Gadgetbridge';
-}
-
-// Get a step string
-function getStepsString() {
-  return '' + Bangle.getHealthStatus('day').steps + ' steps';
-}
-
-// Get a health string including daily steps and recent bpm
-function getHealthString() {
-  return `${Bangle.getHealthStatus('day').steps} steps ${Bangle.getHealthStatus('last').bpm} bpm`;
-}
-
-// Set the next timeout to draw the screen
-let drawTimeout;
-function setNextDrawTimeout() {
-  if (drawTimeout) {
-    clearTimeout(drawTimeout);
-    drawTimeout = undefined;
-  }
-
-  let time;
-  let now = new Date();
-  if (shouldDisplaySeconds(now)) time = 1000 - (now.getTime() % 1000);
-  else time = 60000 - (now.getTime() % 60000);
-
-  drawTimeout = setTimeout(draw, time);
-}
-
-
-const DIGIT_WIDTH = 40; // How much width is allocated for each digit, 37 pixels + 3 pixels of space (which will go off of the screen on the right edge)
-const COLON_WIDTH = 19; // How much width is allocated for the colon, 16 pixels + 3 pixels of space
-const HHMM_TOP = 27;    // 24 pixels for widgets + 3 pixels of space
-const DIGIT_HEIGHT = 64; // How tall the digits are
-
-const SECONDS_TOP = HHMM_TOP + DIGIT_HEIGHT + 3;    // The top edge of the seconds, top of hours and minutes + digit height + space
-const SECONDS_LEFT = 2 * DIGIT_WIDTH + COLON_WIDTH; // The left edge of the seconds: displayed after 2 digits and the colon
-const DATE_LETTER_HEIGHT = DIGIT_HEIGHT / 2;        // Each letter of the day of week and date will be half the height of the time digits
-
-const DATE_CENTER_X = SECONDS_LEFT / 2;                       // Day of week and date will be centered between left edge of screen and where seconds start
-const DOW_CENTER_Y = SECONDS_TOP + (DATE_LETTER_HEIGHT / 2);  // Day of week will be the top row
-const DATE_CENTER_Y = DOW_CENTER_Y + DATE_LETTER_HEIGHT;      // Date will be the bottom row
-const DOW_DATE_CENTER_Y = SECONDS_TOP + (DIGIT_HEIGHT / 2);   // When displaying both on one row, center it
-const BOTTOM_CENTER_Y = ((SECONDS_TOP + DIGIT_HEIGHT + 3) + g.getHeight()) / 2;
-
-// Draw the clock
-function draw() {
-  //Prepare to draw
-  g.reset()
-    .setFontAlign(0, 0);
-
-  if (E.getBattery() <= config.lowBattColor.level) {
-    let color = config.lowBattColor.color;
-    g.setColor(color[0], color[1], color[2]);
-  }
-  now = new Date();
-
-  if (Bangle.isLocked()) {  //When the watch is locked
-    g.clearRect(0, 24, g.getWidth(), g.getHeight());
-
-    //Draw the hours and minutes
-    let x = 0;
-
-    for (let digit of locale.time(now, 1)) {  //apparently this is how you get an hh:mm time string adjusting for the user's 12/24 hour preference
-      if (digit != ' ') g.drawImage(FONT[digit], x, HHMM_TOP);
-      if (digit == ':') x += COLON_WIDTH;
-      else x += DIGIT_WIDTH;
-    }
-    if (storage.readJSON('setting.json')['12hour']) g.drawImage(FONT[(now.getHours() < 12) ? 'am' : 'pm'], 0, HHMM_TOP);
-
-    //Draw the seconds if necessary
-    if (shouldDisplaySeconds(now)) {
-      let tens = Math.floor(now.getSeconds() / 10);
-      let ones = now.getSeconds() % 10;
-      g.drawImage(FONT[tens], SECONDS_LEFT, SECONDS_TOP)
-        .drawImage(FONT[ones], SECONDS_LEFT + DIGIT_WIDTH, SECONDS_TOP);
-
-      // Draw the day of week and date assuming the seconds are displayed
-
-      g.setFont('Vector', getFontSize(getDayString(now).length, SECONDS_LEFT, 6, DATE_LETTER_HEIGHT))
-        .drawString(getDayString(now), DATE_CENTER_X, DOW_CENTER_Y)
-        .setFont('Vector', getFontSize(getDateString(now).length, SECONDS_LEFT, 6, DATE_LETTER_HEIGHT))
-        .drawString(getDateString(now), DATE_CENTER_X, DATE_CENTER_Y);
-
-    } else {
-      //Draw the day of week and date without the seconds
-
-      let string = getDayString(now) + ' ' + getDateString(now);
-      g.setFont('Vector', getFontSize(string.length, g.getWidth(), 6, DATE_LETTER_HEIGHT))
-        .drawString(string, g.getWidth() / 2, DOW_DATE_CENTER_Y);
+    // Normalize to prevent the numbers from wrapping around at midnight
+    if (end <= start) {
+      end += 2400;
+      if (timeNumber < start) timeNumber += 2400;
     }
 
-    // Draw the bottom area
-    if (config.bottomLocked.display == 'progress') {
-      let color = config.dayProgress.color;
+    return start <= timeNumber && timeNumber <= end;
+  }
+
+  // Return whether settings should be displayed based on the user's configuration
+  let shouldDisplaySeconds = function (now) {
+    return (config.seconds.forceWhenUnlocked > 0 && getUnlockStage() >= config.seconds.forceWhenUnlocked) || !(
+      (config.seconds.hideAlways) ||
+      (config.seconds.hideLocked && getUnlockStage() < 2) ||
+      (E.getBattery() <= config.seconds.hideBattery) ||
+      (config.seconds.hideTime && timeInRange(config.seconds.hideStart, now, config.seconds.hideEnd))
+    );
+  }
+
+  // Determine the font size needed to fit a string of the given length widthin maxWidth number of pixels, clamped between minSize and maxSize
+  let getFontSize = function (length, maxWidth, minSize, maxSize) {
+    let size = Math.floor(maxWidth / length);  //Number of pixels of width available to character
+    size *= (20 / 12);  //Convert to height, assuming 20 pixels of height for every 12 of width
+
+    // Clamp to within range
+    if (size < minSize) return minSize;
+    else if (size > maxSize) return maxSize;
+    else return Math.floor(size);
+  }
+
+  // Get the current day of the week according to user settings
+  let getDayString = function (now) {
+    if (config.date.dayFullName) return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][now.getDay()];
+    else return ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][now.getDay()];
+  }
+
+  // Pad a number with zeros to be the given number of digits
+  let pad = function (number, digits) {
+    let result = '' + number;
+    while (result.length < digits) result = '0' + result;
+    return result;
+  }
+
+  // Get the current date formatted according to the user settings
+  let getDateString = function (now) {
+    let month;
+    if (!config.date.monthName) month = pad(now.getMonth() + 1, 2);
+    else if (config.date.monthFullName) month = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][now.getMonth()];
+    else month = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][now.getMonth()];
+
+    if (config.date.mmdd) return `${month}${config.date.separator}${pad(now.getDate(), 2)}`;
+    else return `${pad(now.getDate(), 2)}${config.date.separator}${month}`;
+  }
+
+  // Get a Gadgetbridge weather string
+  let getWeatherString = function () {
+    let current = weather.get();
+    if (current) return locale.temp(current.temp - 273.15) + ', ' + current.txt;
+    else return 'Weather unknown!';
+  }
+
+  // Get a second weather row showing humidity, wind speed, and wind direction
+  let getWeatherRow2 = function () {
+    let current = weather.get();
+    if (current) return `${current.hum}%, ${locale.speed(current.wind)} ${current.wrose}`;
+    else return 'Check Gadgetbridge';
+  }
+
+  // Get a step string
+  let getStepsString = function () {
+    return '' + Bangle.getHealthStatus('day').steps + ' steps';
+  }
+
+  // Get a health string including daily steps and recent bpm
+  let getHealthString = function () {
+    return `${Bangle.getHealthStatus('day').steps} steps ${Bangle.getHealthStatus('last').bpm} bpm`;
+  }
+
+  // Set the next timeout to draw the screen
+  let drawTimeout;
+  let setNextDrawTimeout = function () {
+    if (drawTimeout !== undefined) {
+      clearTimeout(drawTimeout);
+      drawTimeout = undefined;
+    }
+
+    let time;
+    let now = new Date();
+    if (shouldDisplaySeconds(now)) time = 1000 - (now.getTime() % 1000);
+    else time = 60000 - (now.getTime() % 60000);
+
+    drawTimeout = setTimeout(drawLockedSeconds, time);
+  }
+
+  /** Return one of the following values:
+   *  0: Watch is locked
+   *  1: Watch is unlocked, but should still be displaying the large clock (first stage unlock)
+   *  2: Watch is unlocked and should be displaying the extra info and icons (second stage unlock)
+   */
+  let getUnlockStage = function () {
+    if (Bangle.isLocked()) return 0;
+    else if (dualStageTaps < config.dualStageUnlock) return 1;
+    else return 2;
+  }
+
+
+  const DIGIT_WIDTH = 40; // How much width is allocated for each digit, 37 pixels + 3 pixels of space (which will go off of the screen on the right edge)
+  const COLON_WIDTH = 19; // How much width is allocated for the colon, 16 pixels + 3 pixels of space
+  const HHMM_TOP = 27;    // 24 pixels for widgets + 3 pixels of space
+  const DIGIT_HEIGHT = 64; // How tall the digits are
+
+  const SECONDS_TOP = HHMM_TOP + DIGIT_HEIGHT + 3;    // The top edge of the seconds, top of hours and minutes + digit height + space
+  const SECONDS_LEFT = 2 * DIGIT_WIDTH + COLON_WIDTH; // The left edge of the seconds: displayed after 2 digits and the colon
+  const DATE_LETTER_HEIGHT = DIGIT_HEIGHT / 2;        // Each letter of the day of week and date will be half the height of the time digits
+
+  const DATE_CENTER_X = SECONDS_LEFT / 2;                       // Day of week and date will be centered between left edge of screen and where seconds start
+  const DOW_CENTER_Y = SECONDS_TOP + (DATE_LETTER_HEIGHT / 2);  // Day of week will be the top row
+  const DATE_CENTER_Y = DOW_CENTER_Y + DATE_LETTER_HEIGHT;      // Date will be the bottom row
+  const DOW_DATE_CENTER_Y = SECONDS_TOP + (DIGIT_HEIGHT / 2);   // When displaying both on one row, center it
+  const BOTTOM_CENTER_Y = ((SECONDS_TOP + DIGIT_HEIGHT + 3) + g.getHeight()) / 2;
+
+  // Draw a bar with the given top and bottom position
+  let drawBar = function (x1, y1, x2, y2) {
+    // Draw a day progress bar at the given position with given width and height
+    let drawDayProgress = function (x1, y1, x2, y2) {
+      // Get a floating point number from 0 to 1 representing how far between the user-defined start and end points we are
+      let getDayProgress = function (now) {
+        let start = config.bar.dayProgress.start;
+        let current = now.getHours() * 100 + now.getMinutes();
+        let end = config.bar.dayProgress.end;
+        let reset = config.bar.dayProgress.reset;
+
+        // Normalize
+        if (end <= start) end += 2400;
+        if (current < start) current += 2400;
+        if (reset < start) reset += 2400;
+
+        // Convert an hhmm number into a floating-point hours
+        let toDecimalHours = function (time) {
+          let hours = Math.floor(time / 100);
+          let minutes = time % 100;
+
+          return hours + (minutes / 60);
+        }
+
+        start = toDecimalHours(start);
+        current = toDecimalHours(current);
+        end = toDecimalHours(end);
+        reset = toDecimalHours(reset);
+
+        let progress = (current - start) / (end - start);
+
+        if (progress < 0 || progress > 1) {
+          if (current < reset) return 1;
+          else return 0;
+        } else {
+          return progress;
+        }
+      }
+
+      let color = config.bar.dayProgress.color;
       g.setColor(color[0], color[1], color[2])
-        .fillRect(0, SECONDS_TOP + DIGIT_HEIGHT + 3, g.getWidth() * getDayProgress(now), g.getHeight());
-    } else {
+        .fillRect(x1, y1, x1 + (x2 - x1) * getDayProgress(now), y2);
+    }
+
+    // Draw a calendar bar at the given position with given width and height
+    let drawCalendar = function (x1, y1, x2, y2) {
+      let calendar = storage.readJSON('android.calendar.json', true) || [];
+      let now = (new Date()).getTime();
+      let endTime = now + config.bar.calendar.duration * 1000;
+      // Events must end in the future. Requirement to end in the future rather than start is so ongoing events display partially at the left
+      // Events must start before the end of the lookahead window
+      // Sort longer events first, so shorter events get placed on top. Tries to prevent the situation where an event entirely within the timespan of another gets completely covered
+      calendar = calendar.filter(event => ((now < 1000 * (event.timestamp + event.durationInSeconds)) && (event.timestamp * 1000 < endTime)))
+        .sort((a, b) => { return b.durationInSeconds - a.durationInSeconds; });
+
+      pipes = []; // Cache the pipes and draw them all at once, on top of the bar
+
+      for (let event of calendar) {
+        // left = boundary + how far event is in the future mapped from our allowed duration to a distance in pixels, clamped to x1
+        let leftUnclamped = x1 + (event.timestamp * 1000 - now) * (x2 - x1) / (config.bar.calendar.duration * 1000);
+        let left = Math.max(leftUnclamped, x1);
+        // right = unclamped left + how long the event is mapped from seconds to a distance in pixels, clamped to x2
+        let rightUnclamped = leftUnclamped + event.durationInSeconds * (x2 - x1) / (config.bar.calendar.duration)
+        let right = Math.min(rightUnclamped, x2);
+
+        //Draw the actual bar
+        if (event.color) g.setColor("#" + (0x1000000 + Number(event.color)).toString(16).padStart(6, "0")); // Line plagiarized from the agenda app
+        else {
+          let color = config.bar.calendar.defaultColor;
+          g.setColor(color[0], color[1], color[2]);
+        }
+        g.fillRect(left, y1, right, y2);
+
+        // Cache the pipes if necessary
+        if (leftUnclamped == left) pipes.push(left);
+        if (rightUnclamped == right) pipes.push(right);
+      }
+
+      // Draw the pipes
+      let color = config.bar.calendar.pipeColor;
+      g.setColor(color[0], color[1], color[2]);
+      for (let pipe of pipes) {
+        g.fillRect(pipe - 1, y1, pipe + 1, y2);
+      }
+    }
+
+    if (config.bar.type == 'dayProgress') {
+      drawDayProgress(x1, y1, x2, y2);
+    } else if (config.bar.type == 'calendar') {
+      drawCalendar(x1, y1, x2, y2);
+    } else if (config.bar.type == 'split') {
+      let xavg = (x1 + x2) / 2;
+      drawDayProgress(x1, y1, xavg, y2);
+      drawCalendar(xavg, y1, x2, y2);
+      g.setColor(g.theme.fg).fillRect(xavg - 1, y1, xavg + 1, y2);
+    }
+  }
+
+  // Return whether low battery behavior should be used.
+  //  - If the watch isn't charging and the battery is low, mark it low. Once the battery is marked low, it stays marked low for subsequent calls.
+  //  - When the watch sees external power, unmark the low battery.
+  // This allows us to redraw the full time in the low battery color to avoid only the seconds changing, but still do it once. And it avoids alternating.
+  let lowBattery = false;
+  let checkLowBattery = function () {
+    if (!Bangle.isCharging() && E.getBattery() <= config.lowBattColor.level) lowBattery = true;
+    else if (Bangle.isCharging()) lowBattery = false;
+    return lowBattery;
+  }
+
+  let onCharging = charging => {
+    checkLowBattery();
+    drawLockedSeconds(true);
+  }
+  Bangle.on('charging', onCharging);
+
+  // Draw the big seconds that are displayed when the screen is locked. Call drawClock if anything else needs to be updated
+  let drawLockedSeconds = function (forceDrawClock) {
+    // If the watch is in the second stage of unlock, call drawClock()
+    if (getUnlockStage() == 2) {
+      drawClock();
+      setNextDrawTimeout();
+      return
+    }
+
+    now = new Date();
+
+    // If we should not be displaying the seconds right now, call drawClock()
+    if (!shouldDisplaySeconds(now)) {
+      drawClock();
+      setNextDrawTimeout();
+      return;
+    }
+
+    // If the seconds are zero, or we are forced to raw the clock, call drawClock() but also display the seconds
+    else if (now.getSeconds() == 0 || forceDrawClock) {
+      drawClock();
+    }
+
+    // If none of the prior conditions are met, draw the seconds only and do not call drawClock()
+    g.reset()
+      .setFontAlign(0, 0)
+      .clearRect(SECONDS_LEFT, SECONDS_TOP, g.getWidth(), SECONDS_TOP + DIGIT_HEIGHT);
+
+    // If the battery is low, redraw the clock so it can change color
+    if (checkLowBattery()) {
+      let color = config.lowBattColor.color;
+      g.setColor(color[0], color[1], color[2]);
+    }
+
+    let tens = Math.floor(now.getSeconds() / 10);
+    let ones = now.getSeconds() % 10;
+    g.drawImage(FONT[tens], SECONDS_LEFT, SECONDS_TOP)
+      .drawImage(FONT[ones], SECONDS_LEFT + DIGIT_WIDTH, SECONDS_TOP);
+
+    setNextDrawTimeout();
+  }
+
+  // Draw the bottom text area
+  let drawBottomText = function () {
+    g.clearRect(0, SECONDS_TOP + DIGIT_HEIGHT, g.getWidth(), g.getHeight());
+
+    if (config.bottomLocked.display == 'progress') drawBar(0, SECONDS_TOP + DIGIT_HEIGHT + 3, g.getWidth(), g.getHeight());
+    else {
       let bottomString;
 
       if (config.bottomLocked.display == 'weather') bottomString = getWeatherString();
@@ -282,124 +304,214 @@ function draw() {
       else if (config.bottomLocked.display == 'health') bottomString = getHealthString();
       else bottomString = ' ';
 
-      g.setFont('Vector', getFontSize(bottomString.length, 176, 6, g.getHeight() - (SECONDS_TOP + DIGIT_HEIGHT + 3)))
+      g.reset()
+        .setFontAlign(0, 0)
+        .setFont('Vector', getFontSize(bottomString.length, 176, 6, g.getHeight() - (SECONDS_TOP + DIGIT_HEIGHT + 3)))
         .drawString(bottomString, g.getWidth() / 2, BOTTOM_CENTER_Y);
     }
+  }
 
-    // Draw the day progress bar between the rows if necessary
-    if (config.dayProgress.enabledLocked && config.bottomLocked.display != 'progress') {
-      let color = config.dayProgress.color;
-      g.setColor(color[0], color[1], color[2])
-        .fillRect(0, HHMM_TOP + DIGIT_HEIGHT, g.getWidth() * getDayProgress(now), SECONDS_TOP);
+  // Draw the clock
+  let drawClock = function (now) {
+    //Prepare to draw
+    g.reset()
+      .setFontAlign(0, 0);
+
+    if (checkLowBattery()) {
+      let color = config.lowBattColor.color;
+      g.setColor(color[0], color[1], color[2]);
     }
-  } else {
+    if (now == undefined) now = new Date();
 
-    //If the watch is unlocked
-    g.clearRect(0, 24, g.getWidth(), g.getHeight() / 2);
-    rows = [
-      `${getDayString(now)} ${getDateString(now)} ${locale.time(now, 1)}`,
-      getHealthString(),
-      getWeatherString(),
-      getWeatherRow2()
-    ];
-    if (shouldDisplaySeconds(now)) rows[0] += ':' + pad(now.getSeconds(), 2);
-    if (storage.readJSON('setting.json')['12hour']) rows[0] += ((now.getHours() < 12) ? ' AM' : ' PM');
+    //When the watch is locked or in first stage
+    if (getUnlockStage() < 2) {
 
-    let maxHeight = ((g.getHeight() / 2) - HHMM_TOP) / (config.dayProgress.enabledUnlocked ? (rows.length + 1) : rows.length);
+      //Draw the hours and minutes
+      g.clearRect(0, 24, g.getWidth(), SECONDS_TOP);
+      let x = 0;
 
-    let y = HHMM_TOP + maxHeight / 2;
-    for (let row of rows) {
-      let size = getFontSize(row.length, g.getWidth(), 6, maxHeight);
-      g.setFont('Vector', size)
-        .drawString(row, g.getWidth() / 2, y);
-      y += maxHeight;
+      for (let digit of locale.time(now, 1)) {  //apparently this is how you get an hh:mm time string adjusting for the user's 12/24 hour preference
+        if (digit != ' ') g.drawImage(FONT[digit], x, HHMM_TOP);
+        if (digit == ':') x += COLON_WIDTH;
+        else x += DIGIT_WIDTH;
+      }
+      if (storage.readJSON('setting.json')['12hour']) g.drawImage(FONT[(now.getHours() < 12) ? 'am' : 'pm'], 0, HHMM_TOP);
+
+      // If the seconds should be displayed, don't use the area when drawing the date
+      if (shouldDisplaySeconds(now)) {
+        g.clearRect(0, SECONDS_TOP, SECONDS_LEFT, SECONDS_TOP + DIGIT_HEIGHT)
+          .setFont('Vector', getFontSize(getDayString(now).length, SECONDS_LEFT, 6, DATE_LETTER_HEIGHT))
+          .drawString(getDayString(now), DATE_CENTER_X, DOW_CENTER_Y)
+          .setFont('Vector', getFontSize(getDateString(now).length, SECONDS_LEFT, 6, DATE_LETTER_HEIGHT))
+          .drawString(getDateString(now), DATE_CENTER_X, DATE_CENTER_Y);
+      }
+      // Otherwise, use the seconds area
+      else {
+        let string = getDayString(now) + ' ' + getDateString(now);
+        g.clearRect(0, SECONDS_TOP, g.getWidth(), SECONDS_TOP + DIGIT_HEIGHT)
+          .setFont('Vector', getFontSize(string.length, g.getWidth(), 6, DATE_LETTER_HEIGHT))
+          .drawString(string, g.getWidth() / 2, DOW_DATE_CENTER_Y);
+      }
+
+      drawBottomText();
+
+      // Draw the bar between the rows if necessary
+      if (config.bar.enabledLocked && config.bottomLocked.display != 'progress') drawBar(0, HHMM_TOP + DIGIT_HEIGHT, g.getWidth(), SECONDS_TOP);
     }
+    // When watch in second stage
+    else {
+      g.clearRect(0, 24, g.getWidth(), g.getHeight() / 2);
+      rows = [
+        `${getDayString(now)} ${getDateString(now)} ${locale.time(now, 1)}`,
+        getHealthString(),
+        getWeatherString(),
+        getWeatherRow2()
+      ];
+      if (shouldDisplaySeconds(now)) rows[0] += ':' + pad(now.getSeconds(), 2);
+      if (storage.readJSON('setting.json')['12hour']) rows[0] += ((now.getHours() < 12) ? ' AM' : ' PM');
 
-    if (config.dayProgress.enabledUnlocked) {
-      let color = config.dayProgress.color;
-      g.setColor(color[0], color[1], color[2])
-        .fillRect(0, y - maxHeight / 2, 176 * getDayProgress(now), y + maxHeight / 2);
+      let maxHeight = ((g.getHeight() / 2) - HHMM_TOP) / (config.bar.enabledUnlocked ? (rows.length + 1) : rows.length);
+
+      let y = HHMM_TOP + maxHeight / 2;
+      for (let row of rows) {
+        let size = getFontSize(row.length, g.getWidth(), 6, maxHeight);
+        g.setFont('Vector', size)
+          .drawString(row, g.getWidth() / 2, y);
+        y += maxHeight;
+      }
+
+      if (config.bar.enabledUnlocked) drawBar(0, y - maxHeight / 2, g.getWidth(), y + maxHeight / 2);
     }
   }
 
-  setNextDrawTimeout();
-}
-
-// Draw the icons. This is done separately from the main draw routine to avoid having to scale and draw a bunch of images repeatedly.
-function drawIcons() {
-  g.reset().clearRect(0, 24, g.getWidth(), g.getHeight());
-  for (let i = 0; i < 8; i++) {
-    let x = [0, 44, 88, 132, 0, 44, 88, 132][i];
-    let y = [88, 88, 88, 88, 132, 132, 132, 132][i];
-    let appId = config.shortcuts[i];
-    let appInfo = storage.readJSON(appId + '.info', 1);
-    if (!appInfo) continue;
-    icon = storage.read(appInfo.icon);
-    g.drawImage(icon, x, y, {
-      scale: 0.916666666667
-    });
+  // Draw the icons. This is done separately from the main draw routine to avoid having to scale and draw a bunch of images repeatedly.
+  let drawIcons = function () {
+    g.reset().clearRect(0, 24, g.getWidth(), g.getHeight());
+    for (let i = 0; i < 8; i++) {
+      let x = [0, 44, 88, 132, 0, 44, 88, 132][i];
+      let y = [88, 88, 88, 88, 132, 132, 132, 132][i];
+      let appId = config.shortcuts[i];
+      let appInfo = storage.readJSON(appId + '.info', 1);
+      if (!appInfo) continue;
+      icon = storage.read(appInfo.icon);
+      g.drawImage(icon, x, y, {
+        scale: 0.916666666667
+      });
+    }
   }
-}
 
-weather.on("update", draw);
-Bangle.on("step", draw);
-Bangle.on('lock', locked => {
-  //If the watch is unlocked, draw the icons
-  if (!locked) drawIcons();
-  draw();
-});
+  // Draw only the bottom row if we are in first or second stage unlock, otherwise call drawClock()
+  let drawBottomRowOrClock = function () {
+    if (getUnlockStage() < 2) drawBottomText();
+    else drawClock();
+  }
 
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
+  weather.on("update", drawBottomRowOrClock);
+  Bangle.on("step", drawBottomRowOrClock);
+  let onLock = locked => {
+    //If the watch is unlocked and the necessary number of dual stage taps have been performed, draw the shortcuts
+    if (!locked && dualStageTaps >= config.dualStageUnlock) drawIcons();
 
-// Launch an app given the current ID. Handles special cases:
-//    false: Do nothing
-//    '#LAUNCHER': Open the launcher
-//    nonexistent app: Do nothing
-function launch(appId) {
-  if (appId == false) return;
-  else if (appId == '#LAUNCHER') {
-    Bangle.buzz();
-    Bangle.showLauncher();
-  } else {
-    let appInfo = storage.readJSON(appId + '.info', 1);
-    if (appInfo) {
+    // If locked, reset dual stage taps to zero
+    else if (locked) dualStageTaps = 0;
+
+    drawLockedSeconds(true);
+  };
+  Bangle.on('lock', onLock);
+
+  // Launch an app given the current ID. Handles special cases:
+  //    false: Do nothing
+  //    '#LAUNCHER': Open the launcher
+  //    nonexistent app: Do nothing
+  let launch = function (appId, fast) {
+    if (appId == false) return;
+    else if (appId == '#LAUNCHER') {
       Bangle.buzz();
-      load(appInfo.src);
+      Bangle.showLauncher();
+    } else {
+      let appInfo = storage.readJSON(appId + '.info', 1);
+      if (appInfo) {
+        Bangle.buzz();
+        if (fast) Bangle.load(appInfo.src);
+        else load(appInfo.src);
+      }
     }
   }
-}
 
-//Set up touch to launch the selected app
-Bangle.on('touch', function (button, xy) {
-  let x = Math.floor(xy.x / 44);
-  if (x < 0) x = 0;
-  else if (x > 3) x = 3;
+  //Set up touch to launch the selected app, and to handle dual stage unlock
+  let dualStageTaps = 0;
 
-  let y = Math.floor(xy.y / 44);
-  if (y < 0) y = -1;
-  else if (y > 3) y = 1;
-  else y -= 2;
+  let onTouch = function (button, xy) {
+    // If only the first stage has been unlocked, increase the counter
+    if (dualStageTaps < config.dualStageUnlock) {
+      dualStageTaps++;
+      Bangle.buzz();
 
-  if (y < 0) {
-    Bangle.buzz();
-    Bangle.showLauncher();
-  } else {
-    let i = 4 * y + x;
-    launch(config.shortcuts[i]);
+      // If we reach the unlock threshold, redraw the screen because we have now done the second unlock stage
+      if (dualStageTaps == config.dualStageUnlock) {
+        drawIcons();
+        drawClock();
+        setNextDrawTimeout(); // In case we need to replace an every minute timeout with an every second timeout
+      }
+
+      // If we have unlocked both stages, handle a shortcut tap
+    } else {
+      let x = Math.floor(xy.x / 44);
+      if (x < 0) x = 0;
+      else if (x > 3) x = 3;
+
+      let y = Math.floor(xy.y / 44);
+      if (y < 0) y = -1;
+      else if (y > 3) y = 1;
+      else y -= 2;
+
+      if (y < 0) {
+        Bangle.buzz();
+        Bangle.showLauncher();
+      } else {
+        let i = 4 * y + x;
+        launch(config.shortcuts[i], config.fastLoad.shortcuts[i]);
+      }
+    }
+  };
+  Bangle.on('touch', onTouch);
+
+  //Set up swipe handler
+  let onSwipe = function (lr, ud) {
+    if (lr == -1) launch(config.swipe.left, config.fastLoad.swipe.left);
+    else if (lr == 1) launch(config.swipe.right, config.fastLoad.swipe.right);
+    else if (ud == -1) launch(config.swipe.up, config.fastLoad.swipe.up);
+    else if (ud == 1) launch(config.swipe.down, config.fastLoad.swipe.down);
+  };
+  Bangle.on('swipe', onSwipe);
+
+  // If the clock starts with the watch unlocked, the first stage of unlocking is skipped
+  if (!Bangle.isLocked()) {
+    dualStageTaps = config.dualStageUnlock;
+    drawIcons();
   }
-});
 
-//Set up swipe handler
-Bangle.on('swipe', function (direction) {
-  if (direction == -1) launch(config.swipe.left);
-  else if (direction == 0) launch(config.swipe.up);
-  else launch(config.swipe.right);
-});
+  // Show launcher when middle button pressed, and enable fast loading
+  Bangle.setUI({
+    mode: "clock", remove: () => {
+      if (drawTimeout !== undefined) {
+        clearTimeout(drawTimeout);
+        drawTimeout = undefined;
+      }
+      Bangle.removeListener('charging', onCharging);
+      weather.removeListener('update', drawBottomRowOrClock);
+      Bangle.removeListener('step', drawBottomRowOrClock);
+      Bangle.removeListener('lock', onLock);
+      Bangle.removeListener('touch', onTouch);
+      Bangle.removeListener('swipe', onSwipe);
+      g.reset();
+    }
+  });
 
-if (!Bangle.isLocked()) drawIcons();
+  // Load widgets
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
 
-draw();
\ No newline at end of file
+  drawLockedSeconds(true);
+
+}
\ No newline at end of file
diff --git a/apps/infoclk/configLoad.js b/apps/infoclk/configLoad.js
new file mode 100644
index 000000000..a9d43826e
--- /dev/null
+++ b/apps/infoclk/configLoad.js
@@ -0,0 +1,124 @@
+const storage = require("Storage");
+
+const SETTINGS_FILE = "infoclk.json";
+
+let defaultConfig = {
+    dualStageUnlock: 0,
+
+    seconds: {
+        // Displaying the seconds can reduce battery life because the CPU must wake up more often to update the display.
+        // The seconds will be shown unless one of these conditions is enabled here, and currently true.
+        hideLocked: false,  // Hide the seconds when the display is locked.
+        hideBattery: 20,    // Hide the seconds when the battery is at or below a defined percentage.
+        hideTime: true,     // Hide the seconds when between a certain period of time. Useful for when you are sleeping and don't need the seconds
+        hideStart: 2200,    //    The time when the seconds are hidden: first 2 digits are hours on a 24 hour clock, last 2 are minutes
+        hideEnd: 700,       //    The time when the seconds are shown again
+        hideAlways: false,  // Always hide (never show) the seconds
+        forceWhenUnlocked: 1, // Force the seconds to be displayed when the watch is unlocked, no matter the other settings. 0 = never, 1 = first or second stage unlock, 2 = second stage unlock only
+    },
+
+    date: {
+        // Settings related to the display of the date
+        mmdd: true,           // If true, display the month first. If false, display the date first.
+        separator: '-',       // The character that goes between the month and date
+        monthName: false,     // If false, display the month as a number. If true, display the name.
+        monthFullName: false, //    If displaying the name: If false, display an abbreviation. If true, display a full name.
+        dayFullName: false,   // If false, display the day of the week's abbreviation. If true, display the full name.
+    },
+
+    bottomLocked: {
+        display: 'weather'    // What to display in the bottom row when locked:
+        //    'weather': The current temperature and weather description
+        //    'steps': Step count
+        //    'health': Step count and bpm
+        //    'progress': Day progress bar
+        //    false: Nothing
+    },
+
+    shortcuts: [
+        //8 shortcuts, displayed in the bottom half of the screen (2 rows of 4 shortcuts) when unlocked
+        //    false = no shortcut
+        //    '#LAUNCHER' = open the launcher
+        //    any other string = name of app to open
+        'stlap', 'keytimer', 'pomoplus', 'alarm',
+        'rpnsci', 'calendar', 'torch', 'weather'
+    ],
+
+    swipe: {
+        // 4 shortcuts to launch upon swiping:
+        //    false = no shortcut
+        //    '#LAUNCHER' = open the launcher
+        //    any other string = name of app to open
+        up: 'messageui',       // Swipe up or swipe down, due to limitation of event handler
+        down: 'messageui',
+        left: '#LAUNCHER',
+        right: '#LAUNCHER',
+    },
+
+    fastLoad: {
+        shortcuts: [
+            false, false, false, false,
+            false, false, false, false
+        ],
+        swipe: {
+            up: false,
+            down: false,
+            left: false,
+            right: false
+        }
+    },
+
+    bar: {
+        enabledLocked: true,    // Whether this bar is enabled when the watch is locked
+        enabledUnlocked: false, // Whether the bar is enabled when the watch is unlocked
+        type: 'split',          // off = no bar, dayProgress = day progress bar, calendar = calendar bar, split = both
+
+        dayProgress: {          // A progress bar representing how far through the day you are
+            color: [0, 0, 1],   // The color of the bar
+            start: 700,         // The time of day that the bar starts filling
+            end: 2200,          // The time of day that the bar becomes full
+            reset: 300          // The time of day when the progress bar resets from full to empty
+        },
+
+        calendar: {
+            duration: 10800,
+            pipeColor: [1, 1, 1],
+            defaultColor: [0, 0, 1]
+        },
+    },
+
+    lowBattColor: {
+        // The text can change color to indicate that the battery is low
+        level: 20,        // The percentage where this happens
+        color: [1, 0, 0]  // The color that the text changes to
+    }
+}
+
+let storedConfig = storage.readJSON(SETTINGS_FILE, true) || {};
+
+// Ugly slow workaround because object.constructor doesn't exist on Bangle
+function isDictionary(object) {
+    return JSON.stringify(object)[0] == '{';
+}
+
+/** Merge two objects recursively. (Object.assign() cannot be used here because it is NOT recursive.)
+ * Any key that is in one object but not the other will be included as is.
+ * Any key that is in both objects, but whose value is not a dictionary in both objects, will have the version in overlay included.
+ * Any key that whose value is a dictionary in both properties will have its result be set to a recursive call to merge.
+ */
+function merge(overlay, base) {
+    let result = base;
+
+    for (objectKey in overlay) {
+        if (!Object.keys(base).includes(objectKey)) result[objectKey] = overlay[objectKey];     // If the key isn't there, add it
+        else if (isDictionary(base[objectKey]) && isDictionary(overlay[objectKey]))             // If the key is a dictionary in both, do recursive call
+            result[objectKey] = merge(overlay[objectKey], base[objectKey]);
+        else result[objectKey] = overlay[objectKey];                                            // Otherwise, override
+    }
+
+    return result;
+}
+
+exports.getConfig = () => {
+    return merge(storedConfig, defaultConfig);
+};
\ No newline at end of file
diff --git a/apps/infoclk/icon.js b/apps/infoclk/icon.js
index ae230d8f4..b3a47ad0f 100644
--- a/apps/infoclk/icon.js
+++ b/apps/infoclk/icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwgOAA4YFS/4AKEf5BlABcAjAgBjAfBAuhH/Apo"))
\ No newline at end of file
+require("heatshrink").decompress(atob("mEwgOAA4YFS/4AKEf5BlABcAjAgBjAfBAuhH/Apo"))
diff --git a/apps/infoclk/icon.png b/apps/infoclk/icon.png
index 24423fbd6..a38093c5f 100644
Binary files a/apps/infoclk/icon.png and b/apps/infoclk/icon.png differ
diff --git a/apps/infoclk/metadata.json b/apps/infoclk/metadata.json
index 134d87af3..0759528b0 100644
--- a/apps/infoclk/metadata.json
+++ b/apps/infoclk/metadata.json
@@ -1,8 +1,7 @@
 {
   "id": "infoclk",
   "name": "Informational clock",
-  "version": "0.08",
-  "dependencies": {"weather":"app"},
+  "version": "0.09",
   "description": "A configurable clock with extra info and shortcuts when unlocked, but large time when locked",
   "readme": "README.md",
   "icon": "icon.png",
@@ -24,6 +23,10 @@
       "name": "infoclk-font.js",
       "url": "font.js"
     },
+    {
+      "name": "infoclk-config.js",
+      "url": "configLoad.js"
+    },
     {
       "name": "infoclk.img",
       "url": "icon.js",
@@ -34,5 +37,8 @@
     {
       "name": "infoclk.json"
     }
-  ]
-}
+  ],
+  "dependencies": {
+    "weather": "app"
+  }
+}
\ No newline at end of file
diff --git a/apps/infoclk/settings.js b/apps/infoclk/settings.js
index 0bc3d4b15..a9adf87fc 100644
--- a/apps/infoclk/settings.js
+++ b/apps/infoclk/settings.js
@@ -2,71 +2,7 @@
     const SETTINGS_FILE = "infoclk.json";
     const storage = require('Storage');
 
-    let config = Object.assign({
-        seconds: {
-            // Displaying the seconds can reduce battery life because the CPU must wake up more often to update the display.
-            // The seconds will be shown unless one of these conditions is enabled here, and currently true.
-            hideLocked: false,  // Hide the seconds when the display is locked.
-            hideBattery: 20,    // Hide the seconds when the battery is at or below a defined percentage.
-            hideTime: true,     // Hide the seconds when between a certain period of time. Useful for when you are sleeping and don't need the seconds
-            hideStart: 2200,    //    The time when the seconds are hidden: first 2 digits are hours on a 24 hour clock, last 2 are minutes
-            hideEnd: 700,       //    The time when the seconds are shown again
-            hideAlways: false,  // Always hide (never show) the seconds
-        },
-
-        date: {
-            // Settings related to the display of the date
-            mmdd: true,           // If true, display the month first. If false, display the date first.
-            separator: '-',       // The character that goes between the month and date
-            monthName: false,     // If false, display the month as a number. If true, display the name.
-            monthFullName: false, //    If displaying the name: If false, display an abbreviation. If true, display a full name.
-            dayFullName: false,   // If false, display the day of the week's abbreviation. If true, display the full name.
-        },
-
-        bottomLocked: {
-            display: 'weather'    // What to display in the bottom row when locked:
-            //    'weather': The current temperature and weather description
-            //    'steps': Step count
-            //    'health': Step count and bpm
-            //    'progress': Day progress bar
-            //    false: Nothing
-        },
-
-        shortcuts: [
-            //8 shortcuts, displayed in the bottom half of the screen (2 rows of 4 shortcuts) when unlocked
-            //    false = no shortcut
-            //    '#LAUNCHER' = open the launcher
-            //    any other string = name of app to open
-            'stlap', 'keytimer', 'pomoplus', 'alarm',
-            'rpnsci', 'calendar', 'torch', 'weather'
-        ],
-
-        swipe: {
-            // 3 shortcuts to launch upon swiping:
-            //    false = no shortcut
-            //    '#LAUNCHER' = open the launcher
-            //    any other string = name of app to open
-            up: 'messages',       // Swipe up or swipe down, due to limitation of event handler
-            left: '#LAUNCHER',
-            right: '#LAUNCHER',
-        },
-
-        dayProgress: {
-            // A progress bar representing how far through the day you are
-            enabledLocked: true,    // Whether this bar is enabled when the watch is locked
-            enabledUnlocked: false, // Whether the bar is enabled when the watch is unlocked
-            color: [0, 0, 1],      // The color of the bar
-            start: 700,            // The time of day that the bar starts filling
-            end: 2200,              // The time of day that the bar becomes full
-            reset: 300             // The time of day when the progress bar resets from full to empty
-        },
-
-        lowBattColor: {
-            // The text can change color to indicate that the battery is low
-            level: 20,        // The percentage where this happens
-            color: [1, 0, 0]  // The color that the text changes to
-        }
-    }, storage.readJSON(SETTINGS_FILE));
+    let config = require('infoclk-config.js').getConfig();
 
     function saveSettings() {
         storage.writeJSON(SETTINGS_FILE, config);
@@ -172,6 +108,18 @@
                         }
                     }
                 });
+            },
+            '...unconditionally when unlocked': {
+                value: config.seconds.forceWhenUnlocked,
+                format: value => ['No', 'First or second stage', 'Second stage only'][value],
+                onchange: value => {
+                    config.seconds.forceWhenUnlocked = value;
+                    saveSettings();
+                },
+                min: 0,
+                max: 2,
+                step: 1,
+                wrap: false
             }
         });
     }
@@ -190,7 +138,7 @@
         { name: 'Weather', val: 'weather' },
         { name: 'Step count', val: 'steps' },
         { name: 'Steps + BPM', val: 'health' },
-        { name: 'Day progresss bar', val: 'progress' },
+        { name: 'Bar', val: 'progress' },
         { name: 'Nothing', val: false }
     ];
 
@@ -222,128 +170,260 @@
             },
             'Top first': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[0]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[0] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[0] = false;
                     saveSettings();
                 }
             },
             'Top second': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[1]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[1] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[1] = false;
                     saveSettings();
                 }
             },
             'Top third': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[2]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[2] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[2] = false;
                     saveSettings();
                 }
             },
             'Top fourth': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[3]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[3] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[3] = false;
                     saveSettings();
                 }
             },
             'Bottom first': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[4]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[4] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[4] = false;
                     saveSettings();
                 }
             },
             'Bottom second': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[5]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[5] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[5] = false;
                     saveSettings();
                 }
             },
             'Bottom third': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[6]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[6] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[6] = false;
                     saveSettings();
                 }
             },
             'Bottom fourth': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.shortcuts[7]),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.shortcuts[7] = shortcutOptions[value].val;
+                    config.fastLoad.shortcuts[7] = false;
                     saveSettings();
                 }
             },
             'Swipe up': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.swipe.up),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.swipe.up = shortcutOptions[value].val;
+                    config.fastLoad.swipe.up = false;
+                    saveSettings();
+                }
+            },
+            'Swipe down': {
+                value: shortcutOptions.map(item => item.val).indexOf(config.swipe.down),
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
+                min: 0,
+                max: shortcutOptions.length - 1,
+                wrap: false,
+                onchange: value => {
+                    config.swipe.down = shortcutOptions[value].val;
+                    config.fastLoad.swipe.down = false;
                     saveSettings();
                 }
             },
             'Swipe left': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.swipe.left),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.swipe.left = shortcutOptions[value].val;
+                    config.fastLoad.swipe.left = false;
                     saveSettings();
                 }
             },
             'Swipe right': {
                 value: shortcutOptions.map(item => item.val).indexOf(config.swipe.right),
-                format: value => shortcutOptions[value].name,
+                format: value => (value == -1) ? 'Unknown app!' : shortcutOptions[value].name,
                 min: 0,
                 max: shortcutOptions.length - 1,
                 wrap: false,
                 onchange: value => {
                     config.swipe.right = shortcutOptions[value].val;
+                    config.fastLoad.swipe.right = false;
                     saveSettings();
                 }
-            },
+            }
         });
     }
 
+    // The menu for configuring which apps can be fast loaded
+    function showFastLoadMenu() {
+        E.showMenu();
+        E.showAlert(/*LANG*/"WARNING! Only enable fast loading for apps that use widgets.").then(() => {
+            E.showMenu({
+                '': {
+                    'title': 'Shortcuts',
+                    'back': showMainMenu
+                },
+                'Top first': {
+                    value: config.fastLoad.shortcuts[0],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[0] = value;
+                        saveSettings();
+                    }
+                },
+                'Top second': {
+                    value: config.fastLoad.shortcuts[1],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[1] = value;
+                        saveSettings();
+                    }
+                },
+                'Top third': {
+                    value: config.fastLoad.shortcuts[2],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[2] = value;
+                        saveSettings();
+                    }
+                },
+                'Top fourth': {
+                    value: config.fastLoad.shortcuts[3],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[3] = value;
+                        saveSettings();
+                    }
+                },
+                'Bottom first': {
+                    value: config.fastLoad.shortcuts[4],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[4] = value;
+                        saveSettings();
+                    }
+                },
+                'Bottom second': {
+                    value: config.fastLoad.shortcuts[5],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[5] = value;
+                        saveSettings();
+                    }
+                },
+                'Bottom third': {
+                    value: config.fastLoad.shortcuts[6],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[6] = value;
+                        saveSettings();
+                    }
+                },
+                'Bottom fourth': {
+                    value: config.fastLoad.shortcuts[7],
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.shortcuts[7] = value;
+                        saveSettings();
+                    }
+                },
+                'Swipe up': {
+                    value: config.fastLoad.swipe.up,
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.swipe.up = value;
+                        saveSettings();
+                    }
+                },
+                'Swipe down': {
+                    value: config.fastLoad.swipe.down,
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.swipe.down = value;
+                        saveSettings();
+                    }
+                },
+                'Swipe left': {
+                    value: config.fastLoad.swipe.left,
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.swipe.left = value;
+                        saveSettings();
+                    }
+                },
+                'Swipe right': {
+                    value: config.fastLoad.swipe.right,
+                    format: value => value ? 'Fast' : 'Slow',
+                    onchange: value => {
+                        config.fastLoad.swipe.right = value;
+                        saveSettings();
+                    }
+                }
+            });
+        })
+    }
+
     const COLOR_OPTIONS = [
         { name: 'Black', val: [0, 0, 0] },
         { name: 'Blue', val: [0, 0, 1] },
@@ -355,11 +435,197 @@
         { name: 'White', val: [1, 1, 1] }
     ];
 
+    const BAR_MODE_OPTIONS = [
+        { name: 'None', val: 'off' },
+        { name: 'Day progress only', val: 'dayProgress' },
+        { name: 'Calendar only', val: 'calendar' },
+        { name: 'Split', val: 'split' }
+    ];
+
     // Workaround for being unable to use == on arrays: convert them into strings
     function colorString(color) {
         return `${color[0]} ${color[1]} ${color[2]}`;
     }
 
+    //Menu to configure the bar
+    function showBarMenu() {
+        E.showMenu({
+            '': {
+                'title': 'Bar',
+                'back': showMainMenu
+            },
+            'Enable while locked': {
+                value: config.bar.enabledLocked,
+                onchange: value => {
+                    config.bar.enableLocked = value;
+                    saveSettings();
+                }
+            },
+            'Enable while unlocked': {
+                value: config.bar.enabledUnlocked,
+                onchange: value => {
+                    config.bar.enabledUnlocked = value;
+                    saveSettings();
+                }
+            },
+            'Mode': {
+                value: BAR_MODE_OPTIONS.map(item => item.val).indexOf(config.bar.type),
+                format: value => BAR_MODE_OPTIONS[value].name,
+                onchange: value => {
+                    config.bar.type = BAR_MODE_OPTIONS[value].val;
+                    saveSettings();
+                },
+                min: 0,
+                max: BAR_MODE_OPTIONS.length - 1,
+                wrap: true
+            },
+            'Day progress': () => {
+                E.showMenu({
+                    '': {
+                        'title': 'Day progress',
+                        'back': showBarMenu
+                    },
+                    'Color': {
+                        value: COLOR_OPTIONS.map(item => colorString(item.val)).indexOf(colorString(config.bar.dayProgress.color)),
+                        format: value => COLOR_OPTIONS[value].name,
+                        min: 0,
+                        max: COLOR_OPTIONS.length - 1,
+                        wrap: false,
+                        onchange: value => {
+                            config.bar.dayProgress.color = COLOR_OPTIONS[value].val;
+                            saveSettings();
+                        }
+                    },
+                    'Start hour': {
+                        value: Math.floor(config.bar.dayProgress.start / 100),
+                        format: hourToString,
+                        min: 0,
+                        max: 23,
+                        wrap: true,
+                        onchange: hour => {
+                            minute = config.bar.dayProgress.start % 100;
+                            config.bar.dayProgress.start = (100 * hour) + minute;
+                            saveSettings();
+                        }
+                    },
+                    'Start minute': {
+                        value: config.bar.dayProgress.start % 100,
+                        min: 0,
+                        max: 59,
+                        wrap: true,
+                        onchange: minute => {
+                            hour = Math.floor(config.bar.dayProgress.start / 100);
+                            config.bar.dayProgress.start = (100 * hour) + minute;
+                            saveSettings();
+                        }
+                    },
+                    'End hour': {
+                        value: Math.floor(config.bar.dayProgress.end / 100),
+                        format: hourToString,
+                        min: 0,
+                        max: 23,
+                        wrap: true,
+                        onchange: hour => {
+                            minute = config.bar.dayProgress.end % 100;
+                            config.bar.dayProgress.end = (100 * hour) + minute;
+                            saveSettings();
+                        }
+                    },
+                    'End minute': {
+                        value: config.bar.dayProgress.end % 100,
+                        min: 0,
+                        max: 59,
+                        wrap: true,
+                        onchange: minute => {
+                            hour = Math.floor(config.bar.dayProgress.end / 100);
+                            config.bar.dayProgress.end = (100 * hour) + minute;
+                            saveSettings();
+                        }
+                    },
+                    'Reset hour': {
+                        value: Math.floor(config.bar.dayProgress.reset / 100),
+                        format: hourToString,
+                        min: 0,
+                        max: 23,
+                        wrap: true,
+                        onchange: hour => {
+                            minute = config.bar.dayProgress.reset % 100;
+                            config.bar.dayProgress.reset = (100 * hour) + minute;
+                            saveSettings();
+                        }
+                    },
+                    'Reset minute': {
+                        value: config.bar.dayProgress.reset % 100,
+                        min: 0,
+                        max: 59,
+                        wrap: true,
+                        onchange: minute => {
+                            hour = Math.floor(config.bar.dayProgress.reset / 100);
+                            config.bar.dayProgress.reset = (100 * hour) + minute;
+                            saveSettings();
+                        }
+                    }
+                });
+            },
+            'Calendar bar': () => {
+                E.showMenu({
+                    '': {
+                        'title': 'Calendar bar',
+                        'back': showBarMenu
+                    },
+                    'Look ahead duration': {
+                        value: config.bar.calendar.duration,
+                        format: value => {
+                            let hours = value / 3600;
+                            let minutes = (value % 3600) / 60;
+                            let seconds = value % 60;
+
+                            let result = (hours == 0) ? '' : `${hours} hr`;
+                            if (minutes != 0) {
+                                if (result == '') result = `${minutes} min`;
+                                else result += `, ${minutes} min`;
+                            }
+                            if (seconds != 0) {
+                                if (result == '') result = `${seconds} sec`;
+                                else result += `, ${seconds} sec`;
+                            }
+                            return result;
+                        },
+                        onchange: value => {
+                            config.bar.calendar.duration = value;
+                            saveSettings();
+                        },
+                        min: 900,
+                        max: 86400,
+                        step: 900
+                    },
+                    'Pipe color': {
+                        value: COLOR_OPTIONS.map(color => colorString(color.val)).indexOf(colorString(config.bar.calendar.pipeColor)),
+                        format: value => COLOR_OPTIONS[value].name,
+                        onchange: value => {
+                            config.bar.calendar.pipeColor = COLOR_OPTIONS[value].val;
+                            saveSettings();
+                        },
+                        min: 0,
+                        max: COLOR_OPTIONS.length - 1,
+                        wrap: true
+                    },
+                    'Default color': {
+                        value: COLOR_OPTIONS.map(color => colorString(color.val)).indexOf(colorString(config.bar.calendar.defaultColor)),
+                        format: value => COLOR_OPTIONS[value].name,
+                        onchange: value => {
+                            config.bar.calendar.defaultColor = COLOR_OPTIONS[value].val;
+                            saveSettings();
+                        },
+                        min: 0,
+                        max: COLOR_OPTIONS.length - 1,
+                        wrap: true
+                    }
+                });
+            }
+        });
+    }
+
     //Shows the top level menu
     function showMainMenu() {
         E.showMenu({
@@ -367,6 +633,16 @@
                 'title': 'Informational Clock',
                 'back': back
             },
+            'Dual stage unlock': {
+                value: config.dualStageUnlock,
+                format: value => (value == 0) ? "Off" : `${value} taps`,
+                min: 0,
+                step: 1,
+                onchange: value => {
+                    config.dualStageUnlock = value;
+                    saveSettings();
+                }
+            },
             'Seconds display': showSecondsMenu,
             'Day of week format': {
                 value: config.date.dayFullName,
@@ -433,108 +709,8 @@
                 }
             },
             'Shortcuts': showShortcutMenu,
-            'Day progress': () => {
-                E.showMenu({
-                    '': {
-                        'title': 'Day progress',
-                        'back': showMainMenu
-                    },
-                    'Enable while locked': {
-                        value: config.dayProgress.enabledLocked,
-                        onchange: value => {
-                            config.dayProgress.enableLocked = value;
-                            saveSettings();
-                        }
-                    },
-                    'Enable while unlocked': {
-                        value: config.dayProgress.enabledUnlocked,
-                        onchange: value => {
-                            config.dayProgress.enabledUnlocked = value;
-                            saveSettings();
-                        }
-                    },
-                    'Color': {
-                        value: COLOR_OPTIONS.map(item => colorString(item.val)).indexOf(colorString(config.dayProgress.color)),
-                        format: value => COLOR_OPTIONS[value].name,
-                        min: 0,
-                        max: COLOR_OPTIONS.length - 1,
-                        wrap: false,
-                        onchange: value => {
-                            config.dayProgress.color = COLOR_OPTIONS[value].val;
-                            saveSettings();
-                        }
-                    },
-                    'Start hour': {
-                        value: Math.floor(config.dayProgress.start / 100),
-                        format: hourToString,
-                        min: 0,
-                        max: 23,
-                        wrap: true,
-                        onchange: hour => {
-                            minute = config.dayProgress.start % 100;
-                            config.dayProgress.start = (100 * hour) + minute;
-                            saveSettings();
-                        }
-                    },
-                    'Start minute': {
-                        value: config.dayProgress.start % 100,
-                        min: 0,
-                        max: 59,
-                        wrap: true,
-                        onchange: minute => {
-                            hour = Math.floor(config.dayProgress.start / 100);
-                            config.dayProgress.start = (100 * hour) + minute;
-                            saveSettings();
-                        }
-                    },
-                    'End hour': {
-                        value: Math.floor(config.dayProgress.end / 100),
-                        format: hourToString,
-                        min: 0,
-                        max: 23,
-                        wrap: true,
-                        onchange: hour => {
-                            minute = config.dayProgress.end % 100;
-                            config.dayProgress.end = (100 * hour) + minute;
-                            saveSettings();
-                        }
-                    },
-                    'End minute': {
-                        value: config.dayProgress.end % 100,
-                        min: 0,
-                        max: 59,
-                        wrap: true,
-                        onchange: minute => {
-                            hour = Math.floor(config.dayProgress.end / 100);
-                            config.dayProgress.end = (100 * hour) + minute;
-                            saveSettings();
-                        }
-                    },
-                    'Reset hour': {
-                        value: Math.floor(config.dayProgress.reset / 100),
-                        format: hourToString,
-                        min: 0,
-                        max: 23,
-                        wrap: true,
-                        onchange: hour => {
-                            minute = config.dayProgress.reset % 100;
-                            config.dayProgress.reset = (100 * hour) + minute;
-                            saveSettings();
-                        }
-                    },
-                    'Reset minute': {
-                        value: config.dayProgress.reset % 100,
-                        min: 0,
-                        max: 59,
-                        wrap: true,
-                        onchange: minute => {
-                            hour = Math.floor(config.dayProgress.reset / 100);
-                            config.dayProgress.reset = (100 * hour) + minute;
-                            saveSettings();
-                        }
-                    }
-                });
-            },
+            'Fast load shortcuts': showFastLoadMenu,
+            'Bar': showBarMenu,
             'Low battery color': () => {
                 E.showMenu({
                     '': {
diff --git a/apps/inspire/ChangeLog b/apps/inspire/ChangeLog
index 267ee22c2..e8e154f2f 100644
--- a/apps/inspire/ChangeLog
+++ b/apps/inspire/ChangeLog
@@ -1 +1,2 @@
 0.01: First public version
+0.02: Disable screen lock when breathing
diff --git a/apps/inspire/README.md b/apps/inspire/README.md
index f5f8e3aa9..43df1b760 100644
--- a/apps/inspire/README.md
+++ b/apps/inspire/README.md
@@ -2,7 +2,7 @@
 
 A minimalistic app that will help you practive breathing.
 
-Author: Written by pancake in 2022, powered by insomnia
+Author: Written by pancake in 2022, updated in 2023, powered by insomnia
 
 ## Features
 
@@ -10,6 +10,7 @@ Author: Written by pancake in 2022, powered by insomnia
 * [x] Tap to start
 * [x] Subtle vibrations
 * [x] Drag to pause breathing
+* [x] Dont lock screen while breathing
 * [ ] Automatic buzz every hour during day
 
 ## Screenshots
diff --git a/apps/inspire/app.js b/apps/inspire/app.js
index 92b2c4ef2..818a6af76 100644
--- a/apps/inspire/app.js
+++ b/apps/inspire/app.js
@@ -14,6 +14,7 @@ var mode = 0;
 var sin = 0;
 var dragged = 0;
 var lastTime = Date.now();
+
 function breath(t) {
   var r = Math.abs(Math.sin(t / 100)) * w2;
   g.fillCircle(w/2,h/2, r);
@@ -26,7 +27,7 @@ setTimeout(()=>{Bangle.buzz(60);}, 500);
 
 function showTouchScreen() {
   g.setColor(1,1,1);
-  g.fillCircle (w2, h2, h2-5);
+  g.fillCircle(w2, h2, h2-5);
   g.setColor(0,0,0);
   g.setFont("Vector", 32);
   g.drawString("Tap to", w/6, h2-fs);
@@ -40,7 +41,7 @@ g.clear();
 function animateCircle() {
   g.clear();
   g.setColor(1,1,1);
-  g.fillCircle (w2, h2, radius);
+  g.fillCircle(w2, h2, radius);
   radius-=2;
   if (radius < 40) {
     breathing = true;
@@ -68,6 +69,9 @@ function main() {
       return;
     }
     started = true;
+    Bangle.setLCDPower(1);
+    Bangle.setLocked(0);
+    Bangle.setLCDTimeout(0);
     animateCircle();
     Bangle.buzz(40);
   }
@@ -78,48 +82,48 @@ function main() {
 main();
 
 function startBreathing() {
-var cicles = 3;
-g.setFont("Vector", fs);
-
-var interval = setInterval(function() {
-if (lastTime + 10 > Date.now()) {
-  return;
-}
-  lastTime = Date.now();
-  g.setColor(0, 0, 0);
-  g.clear();
-
-  g.setColor(0, 0.5, 1);
-  var b = breath(count);
-  g.setColor(0.5, 0.5, 1);
-  var c = breath(count + 50);
-  count++;
-  g.setColor(1, 1, 1);
-  if (b < c) {
-    g.drawString("inspire",8,ty);
-    if (mode) {
-      mode = 0;
-      Bangle.buzz(20);
-      if (!dragged ) {
-        cicles--;
+  var cicles = 3;
+  g.setFont("Vector", fs);
+  
+  function breathTime() {
+    if (lastTime + 10 > Date.now()) {
+      return;
+    }
+    lastTime = Date.now();
+    g.setColor(0, 0, 0);
+    g.clear();
+  
+    g.setColor(0, 0.5, 1);
+    var b = breath(count);
+    g.setColor(0.5, 0.5, 1);
+    var c = breath(count + 50);
+    count++;
+    g.setColor(1, 1, 1);
+    if (b < c) {
+      g.drawString("inspire",8,ty);
+      if (mode) {
+        mode = 0;
+        Bangle.buzz(20);
+        if (!dragged ) {
+          cicles--;
+        }
+      }
+    } else {
+      g.drawString("expire",8,ty);
+      if (!mode) {
+        mode = 1;
+       Bangle.buzz(20);
       }
     }
-  } else {
-    g.drawString("expire",8,ty);
-    if (!mode) {
-      mode = 1;
-     Bangle.buzz(20);
+    g.drawString(cicles, w-fs, ty);
+    if (cicles < 1) {
+      clearInterval(interval);
+      g.clear();
+      g.drawString("Thanks for",20,h/3);
+      g.drawString(" breathing!",20,(h/3) + 16);
+      Bangle.showClock();
     }
-  }
-  g.drawString(cicles, w-fs, ty);
-  if (cicles < 1) {
-    clearInterval(interval);
-    g.clear();
-    g.drawString("Thanks for",20,h/3);
-    g.drawString(" breathing!",20,(h/3) + 16);
-    Bangle.showClock();
-  }
     dragged = 0;
-
-}, 4);
+  }
+  var interval = setInterval(breathTime, 4);
 }
diff --git a/apps/inspire/metadata.json b/apps/inspire/metadata.json
index 85b7365be..3ffbc40e7 100644
--- a/apps/inspire/metadata.json
+++ b/apps/inspire/metadata.json
@@ -2,7 +2,7 @@
   "id": "inspire",
   "name": "Inspire Breathing",
   "shortName": "Inspire",
-  "version": "0.01",
+  "version": "0.02",
   "description": "exercise breathing every now and then",
   "icon": "app-icon.png",
   "tags": "tools,health",
diff --git a/apps/kanagsec/ChangeLog b/apps/kanagsec/ChangeLog
new file mode 100644
index 000000000..ed36aeeda
--- /dev/null
+++ b/apps/kanagsec/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App!
+0.02: Fixes temperature not loading at start.
+0.03: reduces energy consumption, fixes bug where app thinks that screen is still unlocked after receiving a message
diff --git a/apps/kanagsec/README.md b/apps/kanagsec/README.md
new file mode 100644
index 000000000..d396badec
--- /dev/null
+++ b/apps/kanagsec/README.md
@@ -0,0 +1,14 @@
+# Kanagawa clock
+
+This clock displays the great wave of kanagawa in the background.
+
+It also displays:
+- Hours, minutes and seconds.
+- Seconds are only displayed when screen is unlocked.
+- Years, monts and day as in numbers.
+- Name representation of the current day.
+- Current temperature from weather, if available.
+- Battery level in percent.
+
+![](screenshot.png)
+![](screenshot2.png)
\ No newline at end of file
diff --git a/apps/kanagsec/app-icon.js b/apps/kanagsec/app-icon.js
new file mode 100644
index 000000000..2d3758579
--- /dev/null
+++ b/apps/kanagsec/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+1YA/ABusBJIACGMwnFF0paGC6wvYDKATDCweHK54YGSY4RKAAOIwIaJC5YVKCJmHF4QzDF6gyFAYIMHwIABBgICGF7OlFYwvEqwEBMQWIL6gOCChAjBq8yruBrsyllXBgaRBAAIuRahQgBAIMyhFXGYMHmQ5Bw5eBJBIvUJoJZBq0shEIFoMIlkyF4IfFMgQtSF4kyQ4IpBAYICBFwQ4BrtdZogYBMRgvMFgQpBAIQHCg8HYQeIwRiESZiPKFoIvFMAQABqwZBwLDCMQaaGGRgHDw6ABqwvEAQUzrur0ouBXYa/LGBIIGwItDFwZXEw4WCGYKOMABReBGwJfBq4CBYIS9DGAOlCAI3CwOlFqgXBAAIFBGgKSCL4KEILgItUFgJ7BDQL1EAANdMIIvJMIKPUF4OHroqCE4IBCrqPBciQvOEILoCmVWAwOrR4Usca4AIbAWrMAIqBRILABFwJfkAAOIXIIwBq5lBd5QvYLgOrw+sdISSBFwQEBSDgcCEoWBLwNXFQIBBBQIGBY4OrAAgkLBgIOEDAssQwWBq4qBLIYHBGoQWFACWl0q7BAAKICcwIuCXIzzBq4VDDYOlEAQjDAgIBBBwITDwAACwK0EAYKGBdA4QBCgIaBD4YAJFIeAvVWqwCCJ4IvDEgIuHSYIPBEAIZBDwYATXQQsBhAuFcgqhCD5erFpZ3BDwIADw4pFGAoSCFxJFCFhGAZIIOBPwNXRRAIH1mHFxBCDwAuFFoZMDEg+rw5mFFoIHBKggaBAwRrBAoeA0mlFweIwNdLZCVHHIYaCE4LWBhA0ClkrlYEBqGACQddq8zq9dwOIxB0Cw+rFwIHBIAWIq5vCIoRHCw4yCfQTfDH4YEBrtdKIQoBE4TyGMgQ/Bq+IJYInBAwKFBN5BwCD4oeBq5FBJAISELoaFCHQRGClhaBPQMsbRC0HrtWF4LxGN4TnBGgIQBwOlq5bBA4Msg8yGBLnBIwddmcylh4BNQKqCEAJwBFwQ8BE4MyvWAaoQKBqwwBq5mBwQYBEQLqDq6jBAAIuCK4Q8DL4YyBAwOrCQMIq2AJQIxBAQIeBlkIliwCA4NWRAI8BAAL8BdQjLDFYQPBKwQIBEgQwBPwYDCEAI9BFgIGBhBcDCwLjDD4NdGYgoDGIIFBSIIhBGAQADveA0mk0oGBGgI3CAAN7ZgbBBSYQ3BHAaKBb4LsBHgI4ChBPBvWlAAJFCFoIyBGYd6PIRWDUQQACBYOragRGBBwMyg5FCBgIwBGIOB0pGBAAR7DAwWHd4JGBg8HLgIxCYoIpCZgSvDg8yrrNDqwcCJIaHCFwR8DSQb2BcwIUCEQLWBCgJIFmUrZ4NdEAWrRoVcCQgKBw4ACNYgXDA"))
\ No newline at end of file
diff --git a/apps/kanagsec/app.js b/apps/kanagsec/app.js
new file mode 100644
index 000000000..ed44bb057
--- /dev/null
+++ b/apps/kanagsec/app.js
@@ -0,0 +1,152 @@
+function getKanagawa() {
+  return require("heatshrink").decompress(atob("2GwxH+6AAC1nQ1erAQWr54GCBYIAG1gADBg4AT1mrD4ICBGBIAv63WA4w1sVYR2CAAR5E54YLHsinyB664kVgQCBAoKwEV5gA+PivWCxafjEaCvCAoae/Y3oZFDYQeSCR+rV4KyEAH6cnS4QACXDQkEEYwFDF4qwK1iU9KQipWC5p7ECYiAMBxI2IAAoKJVpav+RZTEMTIZsLAw4WEA4w5SbRbZEA4wAH1itBV7WrTCRcRRpInMWYo2KVRCvHDghPTEQprGehQAzHRZPGEbSvIRhqQGDI6QNDwgEFbwr7GAAesT96KXWhp/IS46VFV5AXIRxazRUoy9EVEC+WHBBBMKBptEGJijGEwiIGXw4QGKB41FV4xyTXmb9HaqQUSRRSgJYgjALKYwAHJYgaJ1iRiD+JgFZJp8ERJIlJChpXHUwoSFV5yzaORyfKBIwfMY6RAHRZxJDA4obFWCDGGFowYIVQKsaXaJWRAHTxIK5RZMEBAKJ1YABA4YEELr2swGAwIAB1gACwIuFWzAXDDaZ4EGpCdDFIiwMGCBJDY4YaFPIKxC56laEwKhDUgeB63XAAZUCAYIQDcUL/dQQ6vMWBYgEEZKvF1gBBKjSlCVw2s2SpDAA62B2Q4KPI6ddFQwQIWAYASGSgtFSIh3BVjGAVgKYBAAJOMBpPX1iEQT5ZmFTpSfFF4ypTV5BPLI4zLON6KtFKKjiBAAQFB2WH1erA4IsFJJ6aDM4yeKRQyBLV6YyIH5ABEWLeswKsBKC6jB1oCBwWzrvXAoPX2YDBWYJFUCYi2EOQiPLQIywacxK9GPhKaBNaOrVjCjCUgIDC2QCBxAAB64SFWISeFVxhrKV56qYEAoGKfZARFMwyyIDAmsVrAbC1mzq6uCV4WIEwKvFWIeBV5gLKTqavgD4pSMThAOKPg6tZWAeIwLOBEYSwBE4QHBF4QACAgOBJJhPGBASvTNA6ybAQoAYehSNBfjms2ezVoSvDBgYABVgOsVYS5DVRJpFNxCvyWoymQBBKOHVzyYCEIOswQCBOAi4DAAOzBQXX2WBUBakGK4auXAFKkLMJKtk2Ws6+B2alFFIYGDxA0BYYOs2QMB1er1gBBLY4ALV/6vKAIRRJQYfXGrHXAAIiET4K2DwICBGYoICAASuCEQfWd4Kw/WDpQKPIKBFVq4fDTIWBq+zWYesbA2sBoOyw+sq7SIV4JeCMBQKDV35OIABKtdQwPWDwKjCrqvCAAuIqywBTYIyCBYWyDIOIEYgkCAAZeNXwat/WJ52DEhwPMR4KJCV4QDCBweyBISsC1mz2ajCYA3XEIQTDAAOlKAZbKMIyz/V5iuPPAgOKUIOBRgKsBSYSVC6ybDWYWCwIUBCoOB2eBBYQHB2TFDGgSvHMRqv/VzqvIDAyWCSIIDCWQNWWYQPBwQLDWYjCEFwqzCaIOs1fQ0hcNV36tEKRqCDAB57CAoaSBVgQCBwWIrtdxGzTYSRCUQIICA4NdUgoABwWBXooLEXgSeDV/6rZAAJ/BVx6hB2SnBTAaUB2avCAQYOFAAVWgFWAoTIBAAYkEAATQBAoggB64iBrmsVZ6u9WASuOq6uPAAOIP4Z5B1uIwOyVYIMDWAYMBU4XXlcBgEAV4aiD2QaB2YHCC4IeCAgKtBAAQgBwIJBV6q1tFogECJaGBCQYrNOYKKBWYaGC2WyAgWCRYOzwOI2eslkBg+twKvBgIaBS4oRBZAi+CWoQMCFAQJDAAKuTVtur1fQIoiwRCIYtO6+zVgQACwMAAAVWBgK0BRIQCBVAKrBwWChECAwMHXwKqCAYQqBaILODBgImBF4S/Fw+rWBR8DAQiNLUq4HHHpKtPKA6tLO4NdVwmsVwaiBXYNdwKMCCwKvChGIlgEBAAQOBUwIDC2QtBAgKlBDwXXw7jDBYOt0oFBVwOs5/QAQIDBLwyLHPwawcV5YEDCQiwePgOswSMCAoIABTYMHVoKbBlaoCq6MCSAMHhANBYYbCBmTODCYPXbgIwBZITOCGALkFVgWrwACBK4SvDOIqCGWQoAWZZAsHVIasRIB6EB1uCTYR+CBYKHDg6rBr0zhCnBRQYNBVwKwCYYayBaQKuCV4QkB1rbDAAYSBVoWrUwIBB1irDLYwFJXwyuVV5SkSWDByB1p7EQYSMB1lWrusmSsCAAWC1ksAYOtV4wCCwIdBVYWBVQYjBVINXVogAEKIStDBAhbFVQgMFAoy1RDAbTFAD44OOoy2D62BTIMAxCuEgKVBUwSZBVoQCDZwOzxCqBFYjIBVIOzbgS/CHgfX1mlVIbvCwOrEAKDDMoyoMVyC2KGYi3bV6GIAQVWwIFC2czTQOCU4QFBVIQACgGsCAQABhEIlmBqwUBqybB2QkCAgPXTgOsw4FBWIYED1ioBX4hIDAgSvJVopvEOhrNHVo4ATI4JWBV449INoYADVgWIrqzBBAMIUYKmCUIStDAAOIlkBgQKDAAoqESYQzD6+HWgI9CUwIEDfRK6DEASFFSoqwTCYyOGWSyuBWAg1KPgWs2dXQoilDgMH1ifBAwSuCgSvFwIKBBIQMEV4eC1mySgSiBGAWy2esroMCIAIMBWYi5DBoWyDYbJBVIyWHBZK0NV4yuV6Gr1YFD54vJK4JcEwSLBWYMySQSmBrusS4cJhAECUQoJFBYsyFgLjDAASrBT4WyXIQMDCogABBwRNEAAiJGAQaXFV4yfFVg5LBVKwAF5/QD4erdBJXBlkAlYEBSoUAwOITggNBgCZBhMJUgy4EWIYUBxApBFQIwCAQOIrszUgqsC6+B2ayDBQIBBXQmIYIWC1i5DVYacHUJB3HWJIAjGJWBRIWCAgKSBgEHWoMCTIcrUAQHCWgIADhC4Cg4JEEwMyrqFCBAOI6+CD4KSBTISWEcwOBWoSsE2bFEA4ZXCV4KwDSQajOWBy0MGgSveqyYClaFCAAOsBQKuDS4MBhKkBAoKvEVwISEAQUHxACBlkIg6pBDYOzmc6hEzUgSVBWggHC65HBVQwTCBQRjEVwqjVDo4hFAganUXw48KwKUC1iUDgMHgCOBA4cBRoIPCroSEVwYCClYLCVgMPZotdFwNkmYYBSoPX66fC2SlE1YMB2Wz2a8DCYerPoK4CQQqMDN5AIFC4yJPWSomLAweCQAKSEgNXVgIGCR4UBh4HGC4SvCDYeIBoVkBAIUBAAS4BgEzmbRBq6nEUIYII2a9C6zED62swIUEM4qyEWhSbGCIgbFDQ6ueAAmBQoKXCg6sBAAMzAYSPCxCOBA4VdBIUPXIYADBQNeXILCFAodWSgSRDUAQACBIeHBAYUBVoIFCVoILDDYZoCOBoHGC4bIJV94ABgUCAYMsV4aLBRwSuCXoYJCskJVwoABry4DWAgECgChCSoKzCxAHBIAPXwQGB6+yToWyCIKuCXwOz2QTBDoYAB1ZrEV6IHIBgwOEbZAAJeAQCCWBusQQSWBQoMzSIKnBR4YIBA4Nerq6CgMIAAIQDAYUIXAqwDVwkHxFWVASmBwKWBAwQACAggHHXAZYCXIICBRYacMVyIXLAAy5QEhawBgCWCryKCg6LCTYWsBwKYDW4NesijClkHXAq2DmcsX4oeBq2sHQmISYXW2SnD2a7BBoQAC1oOBCATFBV4QADV4aeXV6qsQV53XrsAS4aVCnMyR4KNBTYddrqUChEPY4QZFBAbDCVQgRESASRBVAalB2QGDWIQDC2WzBwKiC62HXQa9EBoZtDOQq4OY6KdIWxwkM1kBg6ABg8AmcHmaQCgEChM5BoMslalDnUCT4TCBgOIW4kA1gKCCwddhEHTIKeCHIWIwSwB66jBxCmDCILAB2eCBwLJCXYfXrogDDASgVYg6XDDBacIVZKvP62IS4MsRYkAgFdgEIAAMB1uIXAKYChIDCmQDCmkIDALJCq6tEhMITwKEBxGySQSiCBIQODAAmBT4QUDAwioDMwIPDOAR9FSxB/MDIrMIDZSpEWYwAMOwOCRYMsgGCPIOIq8AmavBgEHTIi4CUgMBg8AxE0A4J+BWIQUEh8IboIZCUYyxDAgIFCX4ZIBBIVXwIEB2YWDUoqvEPIyoNS5QSRbogAJEp5xDOwJzBli1Bg8yWYKbEh8PUAcBrqdDgOIV4QAChE6hFkBwMJgTaB1mBIQanCZIK0CAgSuCI4QRBJIeBWYIwBNIoGBBAyvEVCKMFXqivNACmIPAi2CgKxBSwKuDmYHBskCAwKrCZQMAxEPVgMImcIlghBwSPFFYWycoKuCeAIQBVIRCC1gIBBITQCNxR4VBgjECCowFCBgYXJWArCMACJ7BTgMH1iaBVAKbBgB0BUoKvBmitBQYIIBg4TB1kJmcJxGImREBwCNBf4eBVAIZB2WzEwOzBISuC2RACXwKwCYISvCOAh1FPQp4OTggWIV4wjGHJAnHVSJwC1ivB1ivBgNeUoIABhyvBmUHgMyhEIUwKpBVgOCXIUIhM6YoMySoI8HS4SYCU4Q4E6+I64TD2XXXYSzCMwa0CABR0NBwYTFBIq9HZxS7IU5haCA4pkCO4csTwIBBWYMInIHEUoIFEAgIFBr2IWIIABQYKFEHI2s1YFCAAKbDd4XXAAOyXgRICwKGDQ4yLIO5qzGBZIDFWBYSFG5paBOoJmBPogJBNIR2BgMHTwUImcPg66BmcBhMJCQINBA4KvBVgauDHohKEAgSvBT4S3CBQI8BA4ZIB2QIB2YJCw4ZBCoQALTpB+IYCDQQCyKkCNAgLEV4UAUoKvErqlCUgUBr0BlgACA4IACYIKuBwQlCIxaZDIIb2EWYLsBfQOsYIQEB1mtCIKuMThJ+JfRC7EBpS5XOASiBWIivFrqYBV4MsTgdXAoMsq8yrsBxECVAWIYAUBVgIABlhXCLI4FC6A4CwLyECgJBDA4OCWAWB2YRB65WBq4XCCoKrHAIoAcLBAAcVgeIrptB2RwEmSmBVIUACga4BwICBg9eV4UAVgIACV4aYCLIoGDAYOs0ojBBIQsCCAa9ClgCBI4KyBHwYIDVo6IEHIoHGUQ4FQADOy2SuF2eBLAQDBq2IWAddmcIgMHgNWNYKfBCwUHVAMIgUsX4UyVwkJV4ZWKWAQzCAoaYE62rUwez64PDDAQDCCAasDAQqUOeQoKHK5YMCDhRpHKYYGFAAauDNIICBwKvBwLHE1usgErwS2BUoMsCIMzVwIDBhABBV4J2DTYYFGQonQqzpDMQ2s65FBw7BEAgLxBEgoAHPxSdLHQjQHEZYxIA4Wsw9dWAtdVAIABBYWzqwbFCgYEDxEBg9dgFdlkJVQUBgADCVwM6XQKnEJA6zFN4qsFV4jzBxCvDBYYeEDQo4ERZKpIUhofODhhTCKgIDCV4YACw5pB1mBVYYAC1bABlesmQCBU4UIUgKxFh8IAIMyMAh6IUg5WGAwRHC66wBI4SqBBwKyDaIbVEAwyHKZYgbGC5JTGfQgGFKweBVwqvEwJdCAoS2BA4JrCDAYCB1uBq+BmalClasBhAFBWwS4DhK6BV4hmEOIq+MUIRIDe4XX2SwCUhQFGRAoAJEAgNJJQwqFABlX1mHVwoAC2SoBAARgCBoOywIWBV4fQBoUswVXTwINDgMH1mImS2Ch85nSvEVA5jGRRmsqytBAgJGBAoIACDYopKQyDwGBRRHFCpLVFSQWzUoNdVwhfCBQIGC2QLD2S2DAALBD64CBEAOzAwYACQAUHhAACqxPEWQpmJRYgFDCwnQVQY0DZgx7FQJivPIQhFHLg4DHAAdWxCABSoOIUAOHTYiqDwIEECwWyDQYSC64QDXwsAgMBrtdhEJhMIwJ2GPg5rECYiiBPAnWewIxDA4JKBWgSuHAYoCEV5wQLBgglTAANdUYSHC66PFAARdBUoQOB6/X2QLDAQLKCB4YnBBgWsq6vCgMzhAACQI5SJBYq3EXY2s1ZbBBgSuCFoQCCVIo2GcxChHJgrgCJowhNB46FB65QBxCoDAglXSoVdBIeBlgQCD4SrDaQeywK5BCAOz1iwDVwUHQgSeFUQpuEAgqVJWw6jHW4QLFEQg3FSIrENABIRDCooFHwVdwKUCqymCAAKLBmSSB2S6DAgKWCmQjDBoWyrq4CA4Vdg8BqwXDV4UJg52FOY6BFUhKBIDAymGEpA5FHAakFVxBPFEAghGXhQhDTYNdAYOyRwQCBwMBgEswMAq3XAYMABwKWCCAKvDYIKxCDwVWq8BhIgBwWCV4kIlg9EMxCfJCxIARV5SCJUwoXECg6yGBo4FHEgmCRwVWwKOBw4PBxEBg8IgEBlfXliWB1mCrssrtX03XDQNdD4SyBagIFBDQKvBgNdmSvCWAMJZQKtILgZlFV6esAQTMUG4otOBg4XEK4i2IW41dQIKOB1mrSoXW1iKDg6ZBAgISBTYMHUAITBgNXDAWs2QCBg8s1qnDgMsgC2BA4UIwJeKVhyhCCoqtDAogMECwh4EAowMHYhw7IZ5AUN1igB1ixBrivDgEyg8ywWIg8CgKUCmcIgGIwSaCwWy64ABFQOBg8HBgUJDIOCrobBhEJV4pPFfYhwHABy9IFoouGAYQJIGB6vOAA6+HUgKKBVQIAEB4NdmUBlcyVQUBlibChC1CWgVW6+swQaBWQIfBCYgUBAwQHBhEyNBCtEO4wIGR44KEWAIbEW4p+IAIgIFV54YEFIqvNL4iHB1avI1mHrq8Bg6sBBQKcChECgOImYDBwPXmUsB4IXCAAKqBU4IbBZYbHBgKqGN4x1JXxZ/GExaAIRBQ+MWA7SFGJBKFAgWBfIKuHAAXX1lWlcyVwWsxCcCgFdxEImYQBgEAVQQOCV4QEBgNXlgGDhMP1h/GSYyeJQBC5IQIoUGPwwLHVBDPKCZpmIAAqnC1mBVwQpCAgIIC64xD2ShCgMJgOCUAcBxGsYIMAwUshOslgLBsgCBB4IHCWANXOgYDFAohaIAZJlGahAJFVwwJJSpDLHHpjWJAwuywNdVoS1CVwWsTQIIDCQIGBlaTCg8AwNXV4WBAoK4B1gJBV4UAhAPCg4CBgEPhEyQAgEGVxCzIUIp3HAQ7iFboyrLHRKzGKZDTJCIqlCqylFWwYIB6+s69d2YHBrqUBWAMBWoYCBlmsUAIBCmYJBmc5AgQADmcImesOBBgFOhSPGOoYMHYoqIGGAzlMaQrPKDpAMEbxFdUgWCVYdcVwnWAYOBBAeCgMHlkIVYUAAYUHq0B2eyxEBhIKBg8BnKsCAoMAg+sAILqBNxRaHQRa0GYZZ6GZQwtQIIjPGBQyvFNQoJEAANW1uBxGI1qsDAAK5DxABC1nX64DBmaZCgKlBwWsgDFCgECBIMyxEzVwMs6+zwMH2czxBtSPqIDFYiS/FDhzLFDRDkJABKIBq1WWIKvBSIIKCWQPXXQKeBAAMyAQMHgEH1kIg9XgEIr0sgINBgNXAoMJXoUPWgK8CAYMIhEyJgL1FJA69gTSCuNTgTDQBZRfG1ldrqgBxADBgFdPwK3BGYOz2SHCCAMz1kAAAMyrydBgMshNdXAINBYQIJBhCvBgKvCAAIGBgIaBIA6yiS5gfYEpIvPP4IABBRWBPwNdQwIGBAIS9B1ivB62yg8B1iTCgOCV4UzUQgCBg6wBBAMsgFemUsBAMBlcyhEIxCkHLpCvNBoYaIBAgfEXaYTLGRqlIAQYIDmWIUAOsTwMsQYOsBIOCXoYPC64WBmcCV4UImawCUwQABq8Ama0Bry1BE4IBBXgKvBlYVBhCeFfBAHONwJjCTaSKIXCarNUoYHFAAQOEAYOIRIIHBSIKqBq8HqwWDxGBVYMABIU5h6VBUIMBmcHUQKZBgNdgEr1kAaoITB2eBxErW4Ndg61BZYIpBJopbHMIykKBQXWfoINJX5o9KUIjdVVAiwELYesSoWsrsJhCaBTYNdC4oSClcB1sBr0JljKBgFXZQVXCAMBxDEBgGCUYMBwOCbgMzFYQaBxFeDIKcFWAy2GWJqvDQ6qNGFw4kGKBRMHABuIgMHUAMIhEHwMAmWsAIOy2QQB1kHmWzRoMIrszCgKXBgNkZQSvCY4gIBmQsB69dbga8B664Bq5NHfQqoHUBKsDCwoSIXhwaHTIoSJGYgATQYMHhEzh8IhKSBliXCVwIAB68sA4KOBg8znMIAwNeTAMIlmCVwXXPQKgBEIMHr0BwTYBC4LlBlmswLPBRooAMB4qBEOYiyDUpYaETwilHIJQ0HABurAAYIHgFdUwMzxEIQ4KZBg6IBCYNelhgBgGsxCVBgE5mYTBliSBmUIEAKuDAAYMBVwLYCZAItCboUImT/RNg6WFWxCuIRw6VHTh4ARVgizEWgaLBq54BmYABhEIg6BC1krRIMrCgUsWQIWBhCwBBAPXwUyrusVoqxEromBmcsEgNdrobBGwMIwKvYBIyyHEJbIEVEqqJAA2BPQKaChOs2avBP4MAPwMCliJBWAMAxAKBg6RBCYYFBYAPXV5PWBYJBBxFXlY1BFwUBhMsJwRaEAwoASSyyteUZmlAIQADwGkA4OsSQUymUBmczhEJBAMIVAMCAoIABAwMsRgVdAgNerwLBWAOsVxSxDWQPX1srEoMsq4wBmawDVggFCAYgANbgQAkHAwGDJoQACAgelwIAB1YBBVgQJCwGB0uAwFdwUHmZ4BPYMAhEInQCBVQcHAoKjCgOBCQMHAIIOBxAOBXYKsMA4zSBmddgDTBhOIJ4IAHM4ixIVLomIVA49DA4gAFUYOlAASsBWASsCVAIABVwQeBgKkBryRB1ksVAQJBAAScBXwIEBq+CRAMA1iyBD4QIBDwSvLW5FWlldg+CGwMPDwJSBLIRsBAYSyGPYq8FAQqWIB4gDCZoYXIGw6nEUYIGCwCjBT4KsCVAYAFwNWAQKmBUQUHmcCOoMHTAKvETgK5DBoK1BgFdlkAwNdq0yBwOs66vU68rgMrZ4czmJfCfgRjBAoS0DPhKLE6HQB5AYJDwwLJVpAFDU4aqIBANWrirBAAItBhEJlmswUIrqkDlgGBPIUzr0PhKwDAAMA1kHq+sCQMrq7SBVyoAC1iwBgEAmeIbQOBMgeBJ4OlWgJdBLwICBQhKSCBQaTLADCsEHgL6CVxYACV4OAvVWq+IgMJhOsOgNWTgKwBgQEBmZ7BBAKuBh4KBBAIDBmSxC62zq3X1jRBVqywDDgIzBGgMzfoRnBf4KsDAAQGB0oDDOoJ9CAYaLIAYLYEDQKVCCgjYDAgQuBAQQvBUJYADvSnBAQIGDA4JgBUwcHU4MHq0rvR0BlgIBhANBrqjBgNklkzh8BrszwUHmdXleB1mBWYOIVrIAB6+ClkAmUrgL4BNQYuBKwOlWYSPBLgKBCB4ITCYoQHBXAQICCATLEUQTXDCgIjBCgQQB1aPCDoqmIAohMBABASCwMsTYMy1msWIMsq64Bq0ABgKxDmbCDxC6DwTIBWoNdZANXwSubWAVdgNX1g7CKQKeCvV6KAJsCNIKoDP4aBEA4ITBSYYATUQ6jDGoSZCAYQ/CUolVAISsDAYRZBriVCqxeBlcHqANBgS6CVIczCQLCBgEIhIHBBAKEBBYSvBwPXVzpBBlkAAAKwBg+B1h0CFoPQwNW1ZlBPoyGEAYgFHAAR8CBoQhGaoIFDBgIODVAYANVwayEAAMsRwKUBg8BlkrfgN6TQM6gMAg8ACQKwBxAWBAASxBmi5CroIBgFWVzqvD1lWGQiwB1Z8CWgOBPAZ5BPQR9GB4gAGCwYFHVASsCA4WBcQItJACayBmSrC1mBg8Hq9dFgWs60rXAKfBOQUAgOImajBPoczhFeAQIHBlagRB5yuB2fXwLYCGQMrPgJYBQoYDB1ZjCBYZsFBIoPGCw4ACGAKdVERAICBY0HV4NW63Qa4mBOgVd1mIlkyUwUsxCwBUoQABrquBhFkmczljKBTp2Bw6wPxCxBCwI6CKIMHLARSBAAmBUoYLDPgJxEBwS3IQQ2rG4LWCVJoJLGA0xF4csg6wBg7eBmSuG60ylkrmWBwVdq0BgEHwUBPAKwCgACBmcImSuMVAmyMoKwMBgLCBEoSwCWQVdKQJcB1dVVgWBBIK0DOQawGAAiJGaIhPD1ipND4tVHYQrEHI4ECOwMrlkylZXCPorpCYIIPBwOIg6oBwUzZgayDq+zTJZfBWAtdwKwMHgRDD1kycIUsg5qCmJqHAwikFShCFI1ZEF1gdIaxKsFABINCUwJfBGQOl1er1hyHWIIABw8BvWswNWlarDgMIWQIbGV5IBCVwOs2aeBFoKwNwJPBDYOslmCeQIBBL4MrqsrleAwFPUIrACWggUCZA6MDwJSGGoKaGbIweEco4qED4mAg8H0vP6F61atHw+AWAYEC6AABAgOBWQUyAwKdCWJ9XxGsqyaBqrJO6+I1oRDPYMrgEBg7wCwKbBq1PUQQACOQQECAIMxAQKDDB4SNDEII7JWAqkDZ4IkFAATaDp4NCDQoAB1ek1fP5+rSI6rD1eBBwOHVgLEBwGABQJ9CViITCTAbHTCYQUBCwR8BrssTwSQCUwVVXIQAIPgIXDR45CLGYIQCDgLQBa4YCCmI6DCAK/CAQawEVYKtC6CuINwQACUgIQBJAIGCAAKqSV42sxCvU62IQQ60ENgJ/COQSDDAAyKCWhBiBKpovCFgIXCFwQCBA4MxdwYABW4QVBmVWp9W1fQVgKxC1myGZWsruBmUHIwOsgIABwIXLABjOC66vBSQYaRcpiwEUYgCFAAcsmIABSgYABwJALGoawDDIQoGA4IMCqraBYYRTBgGAVIKsC6GrVwJvMwKoCgUy1mBg8BlgYNAA+yw+HKwIABwOI2aYLWBeyC4wGCQASaCQJKkDBYcyXoeBGxrgHbIjRBA4Q4BqwoBg8ygMHgEr0itCAAWk0pzPVwSvBgMyg8CVyxYCVYKSBSYIACrvXDZwPDZgY6BAoNWA4iADUoZ9BWQiLDCoN6CIigGwQ3GWA4wEVwIpDAoOAwMHgMAgN6VgSvD1eAxGyM4orDNAQ3B1itBhEIWQUIIwYAUVQOzV4JdD2esq7SUI4OzZATSB1mIAYQpCTgiBCAIIABp6DClel1es1VVVwRuBEAUsgADBlavCPgYAF1iqBqwlBqzhBGoXQewN5FoPP1SsCVoWAEY+sw+HBQI9BxBhC1crVoUBwLHFACgoCGguswKyBB4hFEAorREIwIXCVYQAEWAUxmJ7Bp58BQQK0CV4VVqurPotXxGBgEBgAGBg46C69dmQqCIAuHEYQCCp7aC1QqCAAmrcIZnEMIYABLAICB2Z/B1nQ6GHmVcG4ynOUIQqCwNXAoWtAYTkBB4KZBXoVW2SqGWI4WCPYWIJoSvDBIJqBPYR9CAAKtCAAMyDwN6QwayBYYKuBg+CWYOzLQQFBlg3DF4RSCEwasB1YlC5ytMDwIcCLYWBPgXXllertd1mrGQgASwIxBJwIxDbQQACroJCBYnXwWtC4ZDDV45SBBYIeCxAiEDYdXPwdVAAMxlgGBMQOtmUswWIEIKFB6CxBlcsliyBgAlCg9WAwMyldWxAeBwOBVogABaYasEVo5PDaQYAB1p6C2ddhAABryrUFQpKBS4gABwOIU4OB645C2QABUgOs2ZME2SlCFpQnECQKvFA4J9BVQUHgMBrteBQMygGIBAIAB1fQRINVldPTgwAGWQIABqwDCgIDC0itFaYKtINwQAC2ZwBhEycIWsh0JhMI6CvY2agCTAjjGro2BBQIBDB4THFUoivH64FEHxErgCjDmcHgAHCmYKDAAMr1aNB0kkUodQVYkAAQgADEoUAlUrkogB1ekZ4OBKQ2Hf4JsBPQcImder0IhFkVgMPVwMsMpgAK6+IwKbCDoWr66YDUoWCdoSmEw+tJIKvG1gKBHogjBIwdWNQxvFrqlFABSdB1fQwCdBp8xUooAFgCmBAArPBAARBJLwk5U4MIxEzUwMIVgIECBQJmDAAiuPSwYVFAwIlBIoIEBrq0CTAesX4g4FAgLHCEogGCEwWyKATyKCYNXmUsgEAWJusqqVBg8HBQKfBUAkrkkkAQNWq1PWoIbBMwOy6/XJggFBA4RbB2VkUgSrBAQkzLYIbFWKmCUYbNHBQSXCVoSFE66jDAAWzRYOs6AlEWBDUCBYkyAwh0CPwQ9BUoKoCAIIADWIeBUwgADlUqqoABYAOAwISD0qBIJQeHTgRnBLoMzV4syLYK/DQYIDBMQIAGR4w2FFIJuCCYNWW4mIFoIACboYACrq9E2deAoJICaIgYE64iDLoKpEDIMHxAsFMQQOCR4NXlivHA4cBWYOBwEqvWsVQICBvS1BldWEoZeGJAaVCAQQ3B2eIg5KBAAMzDwYTFAQSNBWA6pGGAQFB2ezF4SZBqwGBxAiBEIZHBxAZC64cCCQKvC2TmCg5KBJ4OyCILTBMxBdCUAbJEXAYoCHQY/C1poCwK1BWwsAles0tPqwABWwJ2IAAgqCAYI9BmeI6+Cq5HDgMHMwT2FJQiuDfoWHV5RVCU4WHroDBBQOtRIOyZouyDAQpCDYQLC2YbDHoWrlcznMsBgRxG1ldlmsmc6hAEBIYSwCrogBPgTQCdgheEdoIRBPYiaETYSpLAARKCg4DCHgVenMImRsDCoYwDV4ijKWBILG2YHBMgQxBaIInCVoSvEGgzpDgIHC0ulg8IhAuBCYRzFrqrCgIABmQqCrsBDINdDQJrBlkBJ4pAHAAKzDBYSHDK4wGBCYJpBOIJvBCQJRBgNdAAOCboh1IOgiID1jGB63QdASvHIoSsFAAOBw50BA4bTHL4S6EDAIHC2SVBg4KBwOrWAZLDwKwHmeIWAWBPAJDCBgJVCJwIPCcoibEUYQAB1eHLQJUDQggCBMg1WwMrAQJ8EE4arEVxeImddDgmtVwILBqwWIEQsrHAZLCOAQFBHIwYCwJPEPQaFDQwMy0urqyvEAAddMoesg+ClYZCxCWCXINkEIIACFIimDeowmDRoKCEwOIXAJiCPRCkHABYmCAAYGBr0JNQIACg/WGoITCWBz+F2SfBHRZmGYIaFBRwMyq+IgOrWAT3EAAMCwJeEg85gCgD2ZeCD4TiB6AEBAAMHdApHGH4RRHUCSnIcggjCxEHeQYAIV4KrImRTISYivE2RTKWAITBFoYfCgNelaTB1k5q3PWAWI2cBHIUHfIKwFKgcHNYMIgUCmddlgHB2UsCAYtBWJDzET6ARC6CqHQQyxFDAJ1BxFWKoMAAAJGBAgQfCqxLGRwSvGfxAbBwJJCWY50Jq8sHoIJBhEIwCwBqBSBg8IruzroDBEYqeDgI1BhAFChMsU4YQEg47FHgSDDWSAdGLYYfIA4gKDCo2IEIgFBFgoTDXAT1OF4WB67HCBwuBFwZoEToKGC1kzAoOr5OrqoSBxAIB1kJhIlF1ksT4eIxECAoS0CxBBBbQIACliwLQ4hhGWA5rCU4oFEAQQJErpwBU4RNBCYWtIAoKBQwQwCAoIDBXgQAMDIQABAgOBwJRDNAohFwJ+BxEBq2ImbKB1fP1bmBDQNXB4MJmY1GrqwEmYFDWAVd2YpBAAcyR4gDBd4SODBQwJG6xIBTIQXGCgkzmdeCAIxCnMIAAxLBAAiFDb4msw4sFABXQwI5DV4I2CJ4IHBAYQJBXQYuCgEAQQRSB1kywKwDw6eBhABBhGs6DNFUAZgCWAsIWA4eBAAxtEKQKvCNwalIwMIUQwVDAoMIhMJTwUzxD4Bg5FCgRCEAAQdB1avGcIhvE66wHVQIWDIYgABDoWIBAavEG4Msq4EBfgMCryvB1WrvRYCAIMJmWtmRAF1lWZwKwGU4WIdAIFBOgIABIISwJBY/XLgjBEwUHGgMPWYQWEPASvCWYQCCVg5VBgAaC1nQRomHTAKMGwOBAwhBB64SDf4uI2eyEQK/BDgQjD6+BHoUslhbBmcBwOr1awEWQWIFwMIWAomBmSwJU4KwDNwb/EMoikHXpgUBro1BhIABJQU5PIWz2YDBwRHBUgIACgT3CJ4MIlhBD63QqwxH6A7CHwhEF6+CJA6mBMIbHB69WfASwDg8Ag8Bg8zSQeIWAPP1WAmROBNAQbBg+IWAo/BqyhDU4kIwSwHmSZHWAVclcyruIWIq9IBAOBTAYACWoa2BP4uBq8sHQJKCAQKRBWAOB6HQUYqHDJgoJH1hPBZQSqCw4IBKgQECDQQnE62ITAI+BnMzV4crV4PO0l5DoMyg5hBAoMIA4IgDfIIoCUggADnILGgEsUIpDDCIjAFNoyxF1icBAAsCgUBKIS2Dr2IGwldFAQIBYYKdDW4KGEGo2BBQ+yD4OyqwKBVIezAgQIB2XXYILQBDoTvCgJLCLAawB1eq1ekw4uCmcH1lehDFBLAYlD1kHWA7IBQww2BWIwdClbBJBoT/CgC+EWQVWHBBmFBwJoCwJ3E1mHD4KCBGImrSAS3CAAOCCALyJDwPXAgPXWYmySYYrEAAJsBJQT5BKAiwB1Wq0sHlg7EwJdBV4IYBEYNdb4cyDwYAEnOsroLGSghED2YREgEAg7fBBwWyxAdElcywOC1mzI4UrDAI8IC4aDCEYIXBbwgwCVQeBwClHCAKwFOgSDDPQTWBYRKvDwMyegMsewZMEWAOr0omBq6KErsIlgCBhB0BAYJRBdQIjBAAyVBbgIAGLoOyPIRGBDoIPFTAMsBwQTBxBSBAA0yO4gACxEylgUBW4WBPwSAFxAaCTw6aCSY+y64iDOoIbBwWIfYQHCqz2DM4avE61WQQSvBnSwJYIOBlcrq1WWYeHWAKUCDoMIFocsNwQAFlreGF4WHJIZgB1lXCA0AZwJcEmQsEgBvBrsswOrRoICBUIdeKYJxDPYdXToyECVwivDWYmHAoIBB6xECKwbMFCIXWd4K1BdQnW2ZnEmZuFg6wB0lPlddlZODbAQtFmUHWAK9DBQMHWQ0Hry8BBQIMFEoixCVwoTCgErUoIACUQIKBW4UsAgWslanCxEHgJ2BAAapFTgiuCTwesqwNEWoQhCAwOzq2yB4ey2WIxANCPgIGBagYSDH4piCAQJOCAAUIRQOr1d5NQJtBwNWOoS4Bq2HBgOHA4MIGoOCKQsrUossmYvEXghsFDQLAGAAcyxAUCgMCD4opCIgNWgDyB65vEWIgzEXQpnCTQIVCAYYhCBoVdDgqXCGQJ6BAAJ6BbAQoEHwsyq6pCVQKwFLYOqWAIAB1mlMQMxq70EXoRFCq5vBGw0rTBQJBBYZgF2TzFIwynBAgZWCWoIDBlmAg5rFAAxIEGIRgBxFWTQeISQKJEw7DDBgLND60sg8sgIWBVwUImYSBEQQBCZofW6AZBMQcPWAi2D0mrz1P0t5vWAGgWrrldwOIAQNdlZBCAQRbCAARsCMoKzIA4kAEAL9C1mzmRBEhECUYIHCAgMAmS0FAQOBVhRwBAQIsCcwigB1gOBKgZaBCoJCBY4oGE60reIMBPYKvD1kzhEsCwi+BAgS0COYIBBVIawGwGr0gABAYNzz16dAerwNWAwddq9Wq0x1YZC0uAD4JWFJoLpBmWsKoK0EAQMyB4KlDPIMHCQVXwKmCE4OlKAcATAKuLRonWNogJDJYusaITyDA4IPG6z7Cg8zd4NeBYSzCmYcBFIywB65bCNwMCWApmCgN6V4SwB1WevOkvN6VgmHlcyQAIIB0qvB53PAYIAB1S3CvTNBCIIBBRoK0BAAkHlgiB1l6QYXQCYMBlfQ6GAAoIoBBQJOBaQKrIe4Z8ChEHCQIzEwR2BCQaiGFAOswWsdwKvG1kADgL9BLwMr1nXlkIhMIxHX6zoDw7rD61WDQKpFAAUChIDBp6RBSAKdB0uk1V5WgOlwFWq1cPIMyxFdrmAC4IABCgPPDoQICXQIECXoWlEIK8BvWAEwKfCksBOAUsla1C1ZGCZ4MBq6tIQwkHPQQACmXWVQOIgFdOwMATwwADR4VdxCuHF4SOEAAWsq6aBli1B6yrCDY+BWAcCWAq3Dg6qB0lzvWkQAKaBUAQMBSYLCBq2Bq1VCIShBAIPPWIQZDVoQKBAAQFC0vO1eklek1lWlkBlYABrpBBwIGCqErwKtHRYQACxCrDAAcB2UrV4UyOoSnFAAWBbIK6KcAiLCS4cyBAMIr2BB4Mrg7MKDAapDAwkHE4KsBAANPAgN6AQKVCT4SZBAAOjVoQAFBAIWBXYQAHagbABzyDBwGl0uevV0GYOlvVPp97vStH6CGHV4ZhEPIKuBAoMJBAdXWwImBDQNWqyqHVYgAECgJBBFgUsFQUzZ4PWrqXBAwKvGcYOBZYcHWI4CBlaVCz2lDgKOC0uAwC8CTQ6qBYQSzDAwgSCZgOq5wJDCITHCFAIFBcwNPlZ/B6B1GABSwBLAMAAAUyAoUslgEBruHg5zBBIKAERAoAPWAKWCSASgC2SdBhGIEpOsHQIYDWIoGBA4N6PgWeIwfQAAIFC1eBwOlXIISBAASWCXo4AB54JHDAS+DAAd6VoJVHVpYDCVIIADliuBgMzAIMyRYYDBV4LaDbwq0Q1grBGIadBg+sq8IgQEBZSKwIlelP4N6V4YBEABKPB1i4BwF5AAWeUYTEBlWr0rGEBgmAquAGYRRF2SnGrsylkHKYUHlldWQeIg6tCMwUAq5wDgQYCVgQABGAfQwIaBdJFWlZHCIAjUCxEshFWwQqCmeyDIQhIH4JJEWIwMBvSaBQQKxDWAy1LXhC9BAIIGDAoQACq2B1hSCJwibDr1dJwRKCAAinDWgczV4oACDAQLBGIKBDbgIHBGYKBCMoI+Ga4MBCYQcCYoUHxEIg4cBIAVdDANXFwQkFZISpDLopSEvOl0mA1atGABANLZQINDAopdBPQpICPoKrBrszJIitBg6qDAApaGA4IaCNoMzC4WIIwjdEHoQhCTYINDIYQKCroUCAYOylYJBwRFBrxAECIJbCEAgABOgMrKQZhBKYsHWIUBvWr1elTx6vMBI4nBVYquDg6iCgRGCUQoMCKAiwGAgOClgbBAoMsL4IRDg6UCV4qbBxAlEwPWXIOyCIMyBINXBAWCq+swQJBlZTBDQQ9CryuCwIDCNgXQNISxGDgYICXAkrvVWqySHwIABWBOBqwOCq0ylgrCEAQ9CV5EyHwakGU4oOGCIlWAQOIRgUAmYaFxB7FAoIIBg8zgQTCrqOCUAWsFYLKBTQOBCAOsq40Cq6SFlhcBPQQqBNIvQG4SxFdIhfENA4ADJwMBg9dUoWHqzRBAIIAFleBHgywKU4gEDUY5rEAQMHq2HFgThBnMHlkHgBjBCojqC1myeAKGCQoLCBnIUBJ4LODCIKbCAAYiCmYnCrssIgkHCwICBAAYlBAASvB6GyNoLSCNIacCABAREAYgRKHoQ1CVh6wEIYOBOYQAHMQMrqzjBL4QdFhEAmarBAAIGBaYh9EP4cHroGCDIIFBW4KbDCIOyBIWs6+swTaBgFXq0ArxQCFwWIhEImYxF2R8G6BvCq8rMwijEUQYkBBYIRDPwq9EfoTbBU6ANNAAxRCK4ZYDAAY8BhE6IASvBlmIqwxC6GyZQSbBKwWCDgWIUYWymYdBXgSPBAIOIYgZWDD4OCbwcBaAIABEYYAGKoQADLIrUBTAYAGhAEDVwksrpgCSyQAJWhRNFEphCBOQJQEgErxEylcywIbBlkHXAJXBg8AT4OsrlXHoOyq0yw6qCGBGyIwXWlkAmavCdYQCCDQUyV5a1HCQmlwJUBJQJOClZUBRo/QSZCtSAD51Bg6rCKAL9EAATBDgOsg8HwJiBVIIMBw5aBLgesXgVdV4yXD2QeBGAg5Dg+IrwGBaAey1YqEWwazGBAQAKU4QA/ToZxBWAQDBV42Aw4LBgWIQgOBXQSDCAA+r0qwIwNVAwtXq4wEFQLwEq4RC1jgCAYNWbYQyEXwIA/ACQ="));
+}
+
+
+
+Graphics.prototype.setFontDarumadropOneRegular = function () {
+  // Actual height 36 (42 - 7)
+  return this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ACHwAol+Aokf4AFDg4SEgP8CQl/AokPwASEJT1wAol8G4oxEv5KEn5KEn//CIn/DAYFF/4FJgILKDoQpDBY4FDj//TIcH//gDAilEn6rFAokAC4gAah/4AohLEAoIMDAoIMDKIP/UIUDAoP+QQgSDAoQfCOwISDOwOPCQQkBBwJgBEgOAIoZ8BgIYCn4PBcAQPCj4+BgYPBh7gBHoPAEIIYC+AICB4ISBVQQPB4F/GIf+JQoABN4i9DAoSxCCQR8CCQSPDOAJDBSoYFDGQTbEar4AJRgV8KAQwBn58CJwMPSokDJYS0BBAQeB8Z2DQQYYBQQauDR4jmCDDuAcAZQBJQYACSwgVBSs8DAQMwAQMBIIM/TwMBHYMPZ4RUBg7tCv/wgZjCj5UBMYTyBBwR8CwE/PgZvBPgfgCgJ8C/AUBDAX+AoIYD4auS/bgDDoIYCn///z5CCQT5CCQUBDARICv6CCOwMfPgKkeAoabCvBmBG4U/MwQCBVYUfAQMHB4ICCPgMH4BjC/+D+E/CQICB/kPYIJmBv+DLIJcBEYKxBDAOP/AYDQQIYDPgPDDAShCDAauN/75CAoRjD/1/EgISCFoKbC/+BAocDfIKncg4wCSwQqDKIStCAoRPCOwYLENAR8DfwR8CDAf/+YYE+AYDg/gn4YCgHAEAJEDZ4ITDHAImDHASJEVwYXCLAd/DAhLCDATIDGIQGBTYk/GwQZCJQYyBYwRlDAokfDAkDSoYAYIYpvBHoYFB/kBA4J1CgJFBMQXAv5ICDAMfH4KUB/kHPgJ7CgJ8BRwOfDAIzB/+HDAcf8P+DAQCBv/nGIIbBWoSnCw7HDDAK0Dg/wHIIeBJoI5BSwU/HIK6ChBMCVAiiFn6bbPwTBEG4Z3CBgYFCKAIFDHwYFCCQQFCCQV/AoIlCLYP1Z4SHB/EfY4J0BTYbHCFoI8Ev4rBv/H/E/SoMPTYMfSoXwGQIxCnC0EgjuDKIQSBDwIABHII9BAAISBKwQSCXQSuCBYgAXaQpJBIQY8HGwimEDwQYLJIaSCDAgXBgauBh4XBg52BgaMBh4aCXwLHE8CPDj/7AoIbBTQRMDAoTgEKQZKBAoYYCJYYFFPgK5Dg5pEgB7EADMD+EPFgQ+Bh4nCRIPvOQJdEPgZXEMYZ8CCQhQB//zOwIkBBQN/EoP/g/8HAU/wP/gYYBBAN/4AYBBAMf+E/DAN/JIMfDAMf84xGVAQxCJQ7gCMYSXC//xZoQlB/E/AoRJBgIFCgEMVDsPbIY+CAoowDWgJbBWgbnEfIpjBCQauC4FgKwP+R4N8DwUD/t/CQKxBCYKuC8AgBSoX4H4KVC/w/BJgV/4KVDcAZFBCASbEAohEDMYZdEv4FEZwIFDgF+VDsHZokH+KJDgf8PAKcDz57BTgXvUQcP+YYGJQkPKIcOgIkDABQ'))),
+    46,
+    atob("DBkiGhobHxkbHBsbDQ=="),
+    50 | 65536
+  );
+};
+
+Graphics.prototype.setFontDarumadropOneRegular_small = function () {
+  // Actual height 15 (16 - 2)
+  return this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('AAcwgEHwAECAAkHgEB/EAv8An/Ag/wgP8gEfC4PgC4oVD8EP/8A//wj8PgPwAgWA/PwBwfgg4lCEAegkEOg+B8/4j//wP/Agf8F4JKBAAlwuEPx4xB/Eej4dHh/nwF4NoeAuEeg8B814jnnCYN4DAZUBJ4PzNwsD+BZBKwKBBAgMIAQM//ED/+AAgMAvCmHj/hgP+nEf8eB904jw2B9/wjiuBg42DgQCB/wsBSoQdBJQPHgff+EZHYMPDAN8QwqmC4DRCj0BgPhNARtDFgIBBhzzEA4J8DCYM4jnzXomABwMHxg2FvxCBQwUQj1/XoRtCd4MPRAITBUgu8NoPAAgQABA'))),
+    46,
+    atob("BQoNCgoLDAoLCwsLBQ=="),
+    20 | 65536
+  );
+};
+
+// returns the temperature from weather json, if weather is provided trough 
+//android/ios .. if no temperature is available, it wont be displayed.
+//(returns empty string).
+function getTemperature() {
+  try {
+    var weatherJson = storage.readJSON('weather.json');
+    var weather = weatherJson.weather;
+    return "Temp: " + Math.round(weather.temp - 273.15);
+  } catch (ex) {
+    return "";
+  }
+}
+
+const storage = require('Storage');
+require("Font8x16").add(Graphics);
+
+var IMAGEWIDTH = 176;
+var IMAGEHEIGHT = 176;
+var energySave = false;
+var batteryLvl = E.getBattery() + "%";
+var temperature = getTemperature();
+
+// 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();
+  }, (energySave == true ? 60000 : 1000) - (Date.now() % (energySave == true ? 60000 : 1000)));
+}
+
+
+function draw() {
+  
+  // sometimes, when gadgetbridge sends a message, the locked event is not thrown after the messages was displayed.
+  // this checks the lock state manually and set the energysave.
+  if (!energySave && Bangle.isLocked()) { energySave=true; }
+
+  var date = new Date();
+  var x = 10;
+  var y = 2;
+
+  g.reset();
+
+  //draw main background image
+  g.drawImage(getKanagawa(), 0, 0);
+
+  // only update the batterylvl and temperature every 30 seconds or every minute if energysave is on
+  if (date.getSeconds() % 30 == 0) 
+  {
+    batteryLvl = E.getBattery() + "%";
+    temperature = getTemperature();
+  }
+
+  g.setFont("8x16");
+  g.drawString(temperature, 4, g.getHeight() - 40);
+  g.drawString(batteryLvl, g.getWidth() - g.stringWidth(batteryLvl) - 2, y);
+
+  // work out locale-friendly date/time
+  var h = date.getHours();
+  var m = date.getMinutes();
+  var s = date.getSeconds();
+
+  var timeStr = h.toString().padStart(2, 0) + ':' + m.toString().padStart(2, 0);
+  var timeStr2 = s.toString().padStart(2, 0);
+
+  var dateStr = require("locale").date(new Date(), 1);
+  dateStr = dateStr.replace(new RegExp('/', 'g'), '.');
+
+  var nameOfCurrentDay = require("locale").dow(date, 0).toUpperCase();
+
+  //---Hour and minute---
+  g.setColor("#000000");
+  g.setFont("DarumadropOneRegular");
+  g.drawString(timeStr, x, y);
+
+  // ---Seconds---
+  x += 2 + g.stringWidth(timeStr);
+  y += 24;
+
+  //only print seconds if screen is active and not locked
+  if (!energySave) {
+    g.setFont("DarumadropOneRegular_small");
+    g.drawString(timeStr2, x, y);
+  }
+
+  // ---draw date---
+  y += 45;
+  g.setColor("#000000");
+  g.setFont("8x16");
+  g.drawString(nameOfCurrentDay, 65, y);
+  y += 15;
+  g.drawString(dateStr, 65, y);
+
+  queueDraw();
+}
+
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lock', on => {
+  if (on) {
+    energySave = true;
+  }
+  else {
+    energySave = false;
+  }
+  draw();
+});
+
+g.clear();
+draw();
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+Bangle.loadWidgets();
+try {
+  require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
+}
+catch (ex) {
+  require("widget_utils").hide();
+}
diff --git a/apps/kanagsec/app.png b/apps/kanagsec/app.png
new file mode 100644
index 000000000..347ef3851
Binary files /dev/null and b/apps/kanagsec/app.png differ
diff --git a/apps/kanagsec/metadata.json b/apps/kanagsec/metadata.json
new file mode 100644
index 000000000..516b63eef
--- /dev/null
+++ b/apps/kanagsec/metadata.json
@@ -0,0 +1,23 @@
+{ 
+	"id": "kanagsec",
+	"name": "Kanagawa clock",
+	"shortName":"kanagawa",
+	"version":"0.03",
+	"description": "A clock that displays the great wave of kanagawa (image from wikipedia) with seconds in active mode.",
+	"icon": "app.png",
+	"tags": "clock, kanagawa, wave",
+	"type": "clock",
+	"supports" : ["BANGLEJS2"],  
+	"readme": "README.md",
+	"allow_emulator":true,
+	"storage": 
+	[
+		{"name":"kanagsec.app.js","url":"app.js"},
+		{"name":"kanagsec.img","url":"app-icon.js","evaluate":true}
+	],
+	"screenshots" : 
+	[
+		{ "url":"screenshot.png" },
+		{ "url":"screenshot2.png" } 
+	]
+}
\ No newline at end of file
diff --git a/apps/kanagsec/screenshot.png b/apps/kanagsec/screenshot.png
new file mode 100644
index 000000000..167eef0a8
Binary files /dev/null and b/apps/kanagsec/screenshot.png differ
diff --git a/apps/kanagsec/screenshot2.png b/apps/kanagsec/screenshot2.png
new file mode 100644
index 000000000..43ed6751b
Binary files /dev/null and b/apps/kanagsec/screenshot2.png differ
diff --git a/apps/kanawatch/ChangeLog b/apps/kanawatch/ChangeLog
index f2c991fd0..a50406917 100644
--- a/apps/kanawatch/ChangeLog
+++ b/apps/kanawatch/ChangeLog
@@ -2,4 +2,10 @@
 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.
+0.05: Tell clock widgets to hide
+0.06: Fix exception when showing missing hiragana 'WO'
+0.07: Fix regression in bitmap selection on some code paths
+0.08: Speedup next/prev and fix autogenerated hiragana bitmaps
+0.09: Optimize loading and rendering times, introduce transition animations
+0.10: Swipe up/down for Hiragana/Katakana, right/left for next/prev letter
+0.11: Sort by 'AIUEO' instead of 'AEIOU', draw Widgets every minute :?
diff --git a/apps/kanawatch/README.md b/apps/kanawatch/README.md
index e213949dc..d13550f4d 100644
--- a/apps/kanawatch/README.md
+++ b/apps/kanawatch/README.md
@@ -1,19 +1,25 @@
 # kanawatch
 
-A simple watchface design with hiragana and katakana
-cards for learning.
+A simple watchface design perfect for learning hiragana and katakana.
 
-## Changelog
+* Interact with the interface using swipes
+* Swipe up/down to switch between hiragana (H) and katakana (K)
+* Swipe right/left to display the next or previous letter
+* Tap to change accent color (always 24h, not configurable)
+* Non-intrustive transition animations
+* Low battery consumption
 
-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
+## TODO
+
+* Only render what needs to be repainted
+* Dont redraw the widgets if not necessary
+* Minigame to guess kata/hira phonem
 
 ## Author
 
-Written by pancake in 2022, powered by insomnia
+Written by pancake in 2022, maintained during 2023 and powered by insomnia
 
 ## Screenshots
 
-![hiragana and katakana](screenshot.png)
+![katakana](screenshot.png)
+![hiragana ](screenshot2.png)
diff --git a/apps/kanawatch/app.js b/apps/kanawatch/app.js
index 088dab785..a81852b1b 100644
--- a/apps/kanawatch/app.js
+++ b/apps/kanawatch/app.js
@@ -3,185 +3,214 @@ const stripe_pos = 40;
 const stripe2_pos = 110;
 const h = g.getHeight();
 const w = g.getWidth();
+const decompress = require("heatshrink").decompress;
 
-/// /////////////////////////////////////////
-const katakana = {};
-const hiragana = {};
+
+function benchStart() {
+  return {
+    now : +Date.now(),
+    diff: function() {
+      return (0+Date.now()) - this.now;
+    }
+  };
+}
+const startupTime = benchStart();
 function image(x,y,b) {
     return {
       bpp:1, width:x,height:y,
-      buffer:require('heatshrink').decompress(atob(b))
+      buffer: decompress(atob(b)),
     };
 }
-katakana['A'] = image(56, 51, "v//AAfwAon//AGF/wGT/gGM/A3F/BDEn/wJQoGCj4RB//gAxUB//AAwcDAwsH/+AAwcP/4tCAwMf/wGEn/8Awl/JYYGBKQkf/I9DAwJgBGwQGDGwRlBAwJsE+42DAwPzGwYGB+J7EQIIvDQIIFEAw5DEAwRDDgCIEAxCPBKIcAR4IhER4hnCLAg9BLAgoBAwgoBcQiCBMwj0BHogGBHogGBfoooEQQREFEIgGBAokAhAGFA=");
-katakana['I'] = image(54, 55, "AAkEAws+AokB/wGEg//Awk//gTE//gAwcPCYt/CYkDCYsfCYv//A0F4A0ECYg0BCYggBCYn/KwhBBGgl/EAgtBEAgMBEAZOBEAgMBEAYZB/+ABggTDBgQnDAoIaDJoIaDFgIABDQQFC74aBBgX8v4aBEwWBDQQgB/EHDQQ6BwEfGoX/+AJBDQMDWAKMBDQMPAQIaDiBFCPAgaDU4hrDDQiuDDX4acSAIaCA=");
-katakana['U'] = image(52, 55, "AAMP/gGE//ABlH/AAnvAon+Bk5EDv/vIgcHBkHPBgZwBBgn/Bi8B/+PBgcf/AMFw/wBgYEDgED/6qEv4MEKYK3F8AFDj7EED4LREv/4CQn/wASEFginBDAgfEDAIfDn67BC4YABH4QXBCQcHZoQkEEoYMCHAYlBFYZEBLwk/MgpQEAAw");
-katakana['E'] = image(58, 45, "h//AAfwgYGE/0AAwn/wE/AwngDgv4DjhDCv/wJQkf/gGEg//AwkB//AA4gc/Dn4cjbAv/34GF94GF/YGF/wcjwA=");
-katakana['O'] = image(57, 54, "AAcf+AGEh/8AwkH/wGEgf/AwkB/+AA4n/4AGEv/gAwk/GIsf/A4P/4AE+F/Awn4n4GE/kfAwn+h4cFg4GFwYGF4IGFKwYFBMQpxFAwJxEAwJxEAwJxEAwJxEK4JxEAwKqEMoQGE/o4En/8HAl//iqEAwKqEv/+VQgNBVQgNBcYgNBcYhLBcYhSCHAQKBAwI4CAwY4CD4IGBHASxBAYI4CAwY4CYwIGBHAQGBD4I4CBIJfCHASmDHAV/PYQ4Cj5QCHAUPLwQ4CgQGCOIgABOIgABHAIGEAAY=");
-katakana['KA'] = image(54, 54, "AAMP/AGEv/gAocB/+AAwcH/wTEj4arg//AAf+j4GE/F/AwnhAon/w4aZHAMP/hTEn/wKYn/4BTDgf/KYgQCDQYQCBIQQDBIQQCBIc/DQouCDQQuCEghJBEhITBH4RTBLoRTEBIJTGCAUPNwoTCDQQWBDoIuCj4TCJIX/CYQ/BZQInBH4U//0HwBTBGgPwXAXwh4PBXAXAv4PCZIIgBEYTJBn5SBDQXABAIzBCYJcCDQXwgbOCAwIDBQgI4CgEOJwIADkAGFA");
-katakana['KI'] = image(58, 55, "AAU+Awv/4AGEn/wAwkP/gGEgf/Dkk/CAc//4ABwAGBj4GC8ATBAAf4h4GE/woBAAmAAwvgFAYcIwAcD/BFDFARFD/kBIoYACv5FBAAcfRL94DgkfHgf/95EBD4RgDD4MHLwf8AogAd+CPFGwiJCS4XHJgSGB8CJEkCJJUwYABg5pDD4amTNwKmXYbgcDLoY=");
-katakana['KU'] = image(55, 55, "AAMHwAGEh/8Awkf/AGEv/wAwn/4AFDgf/EQkH/whF/4ACAwM/AoQQCBgY5BgIGDHIMHAwY5Bh4GD8AhEIAQFDIAIhBBIJACEIJpEj45CNIV/NgRpBDQIrBEoPgDQJlBEoQaDEoV/RwUP/wPBQ4Uf/gPBQ4QsBKAKSD8BvCSQXDDQYYBNYIaCGYIqBDQU//kPXoYYBj5QCEIPgj60DKoMcWga7FKoYABKogaDbojPBbojMDGob/ECYJBCbgYaDE4IaEPoIaDEAI1EbYQZECYgtBCZQGCLol/KwxxEAwJqEgIMFgIZEgA=");
-katakana['KE'] = image(60, 54, "AAMcAwsD/4HFn/wBxl/8AGEg/+BxkP/gOF//ABxcB/+AA4kf/BCGAAZOBv4HEIQIOGAwgOBh4OFGYIOFn4OFEgoOBAwvgh52BKgYDBOwJUDv5nBBwY6BAYM/BwIKBJgJjBBQSbCWoQVBRgK1D/4oDBwJJBWos/WIS1CgIVCJoRGBWowCCj61HYgpRCdIjEGLgTLEIwTLEfAv/GYqtBEghyBGYjoCAwwkDAwQVEYwYjEHQt/CopeBQgQOEIIgOBPgxeFgZ7FA");
-katakana['KO'] = image(49, 46, "v//AAYFF34FE74FE94FE+4FE/IFE/gFE/w0Dgf/AocB/+AAwf/4BHE8AFDn/wAocf/AFDh/8AocHGH4w6YZf7Aon9YYoFEejBhEAAIA=");
-katakana['SA'] = image(58, 53, "AAcD/wDBg4DC//AgEB/+AgE/+AKBv/ggEP/gGBj/4DgP/DnU//4A34CQ+DAIcEDAIcDDAQDDDAYDCDAYDD/4cDIgJADAAUfIAQACh4jCAAUHD4QACJwIfBAAQtBEYgGBI4QUDFQkP/4qEVYQvEAAIxCEIK5CBwV/AwsfAwocCAwYcCJogcBNIp3F");
-katakana['SI'] = image(56, 52, "gFwAwt+Awv/8AGF/gFDgP//4GGCocDAwIVDBoX/wAHCn4VFg4GB4AxEAwsfAworBEQYABv4GFj4DCjgrCBQYRFn/4JQfAIgIGD+F/JQcD/gGBMARQCOwcH/wNBCoUP/0PAwIrBj/8OwQGBn4fBGIIGCAQIlB+BcBAQKvDBIQRB8AfBIQUH4AXBP4RXBGgJmERoJsFAwv//yaFbYghBQIYaCeAi9FPQTZGdxKFCFASECFAZPBEIgNCJQaZEAwhDDAwRJDTAYGEQAiQBPIgAGA");
-katakana['SU'] = image(60, 51, "gH/AAYGBh4GD/AOG4AOF/gONDo+ABxAACgY7CAAd/+AGEg4OG//gAwkP/wGEgJCCAAcfKIQzEIQIzEIQozOj4zFEgIzFn4kHGYv/M4okIGYt/IQqXBFghuBHYs/bAY6DCwrJECod/HgYVB8ZLEcoMfLQYECCwYVB+BTBCwT7CCwYrBAYIKCCoQDC8BXBEIQSBNoQVBBYP4EAIoCOQPHCoYTB/xdBIwQ8B+6SET4N/dYn/4aCFFgKRFgC+EgPghivEAoI");
-katakana['SE'] = image(57, 53, "gEH/wGEgf/AwkB/+AA4n/4AGEv/gAwk/+AGEj/4AwkP/g4JjA4EBQQ4D/4DD4E/AwIuBv/vAoP/FwILCAAIuBv4GEBgn//wFEAwITEh//CgfwAwMfCIRGB/4BB/5xBAgJTBIQQGBwP/75CBAwOAD4JCBAwRmDDIKYBOIQGDOIQGDOIQbBAwSqBAwiqBAwiqBDYg4Cv4GCHAUfAwQ4Cg4GCHAUBbwbjnHAgADcYYADUYQxEEYq6CVwbDBdQi6CZQYqBAAZcCAwY1BEYi5DAAQ8CegfgA=");
-katakana['SO'] = image(52, 52, "gGAAol8AYUD/Ef4AGCn/3/wFCg/+v/wAwV/8//Bgk//AMD8f/FoQMBj/8Bgfg//gBgcPFoYMBFocP/kHFof/4AtDBgMDFoYMBFoYMBgIIBgADBwAtDj4dBHQQMCFoYqCHQQqCFoc/BIIPCCwQtDKYIpBB4IwDIAQwCh45CBIVAFgSmDFIaaDOIYfCVgYfBRYYfCTASTCUoY1BQgZPCD4l/D4kfH4g4BH4YYBH4gFBGQd//4yDBYIyDn4SEJQIlEBgRXEHAg+BFYZRGZYQADBYgAG");
-katakana['TA'] = image(55, 56, "AAMHwAGEh/8Awkf/AGEv/gAwn/4AFDgf/EQkH/4oF/4ACAwM/AoX+FAQGCHIMBCYY5BEIIAC+AhFIAIhDHIQFDF4IhBJQMHF4JDDNIUfHIRpCv5sCn/wDQJsCDwIaBEIIKBwEf/9gOAQaB/gbBFAIPB+YsC/AaB54RBFAIaBAIOAEoJvBOgPh/+DNAJWB+//DQPBQIZyBM4f4LQSQC8EPKAIpBFAMPPgKKCgEcYIZwBiAGDbohwEZ4bdEFILxFf4ghBXwLjEDQhLBCYoaEE4IaDdIQaDBgLBCDIRQENYYTIewRkEAwJCFHYicBOIkAEAhDBS4IAJ");
-katakana['TI'] = image(57, 54, "AAkGAwsfwAGE//gAocP//wBgn//gEBgIFBAAIeBAof/wAYBAwkHAof+gEDAwf4E4YAB4AGBv4TDAAM/AwoxDKQhABLQwiCAAV/MIglBMIglBHwRwDNARbF//3Awv7Awv9Awv+Awv/MQQAD34GF74GFKAUHOIYABSAJxGaYp4Uv54FP40/P4oGHQwQGKKgt/AwrUEMIQGEVYIGLg4bMFII+Fv5TGNAsPQgsHTIoAG");
-katakana['TU'] = image(54, 53, "AAMBwAGEj4FEgf8AYPwgFgn/4BIP/g+Av/ggEP/n/gP/4EAv/v/wQBFQP/z/4CAMAg/+DAMfEIICBDAN/FgN/8YYBBAIaBw4hDDQIVBAYMAn/wDAIhCCwIhDCwIBBwAIBHAIYBEIQYDBAIuBwAjBFQghCJgQhEAIIhDEYQPBh5HBM4IhDQQQhCwYeBCwMBCoSPB/0CIQQhBAQKWDvytBCYTBDv5tBZYYTCAAQTCAAYTFHAITEj4TF/4TEh4TFv4TEg//JgIMDMYIMEO4ImD/53BAAM/AwIsEEAgFBEAZNBIIgTCFocfJwo6BPgpHEgZAEgEOAogAGA==");
-katakana['TE'] = image(57, 51, "h//AAfwg4GE/kDAwn+gIGE/8AAwuAv4GE4E/Awngj4GFNWJNF/gGF/5UF/+/AwvfAwvvAwv3Awv7GJn8IQV/4BJEv59Fn/wAwkf/DJFEAYABg/+AwjJBAxbQBwAGFH4gGBH4gGIIwgGNG4IGEg//LYjyBAwiyBAxc/EQoGGFIJTLdYJvEgF+fIsYAwo=");
-katakana['TO'] = image(42, 54, "//AAgU/+AECh/8AgUD/4U/CgYPDn//wAUC/4VCCgIlDAgIKCCgIKCCgP//wUD//gCgQKCn/zBQQ+BDYP8CgMBEAQBBj4KBKYIKC54yBBQP7KYIKCG4QKB35YBBQIUCGQPjNAUD+BXDnB9Dgy8/CicAA=");
-katakana['MA'] = image(57, 50, "/4AE/l/A4s/AwvfAwoAN/YGF/oxGHokf/wGLh4GN/4GSg4GChgGDwARBAw3gAwv4Awo7BAwn/4ACBAwIKB+AGDgJtBAwcAUgOPAwYLB94GDgaFCAwTBDAwcfAwoyBAwgyBAwgyCAwgcBAwgyBNgL0ENgIADn6oHDijhFW4wcB4AGDKwPwBwl/fwzUJDgZOFgAGGngGFhADCA");
-katakana['MI'] = image(52, 53, "gPwAwkf/wFDgf///gAwU/AwIVCBgX//AME//8gEHAoQGCBgYGCv4GDFIMPBggoE4A2CCoIuCAweAAwc/BghYBMwswNw0PNwkBGAIbEG4gMCOoYMCOoQMDAwRnE4BYDKYQTEKYRuCKYY8GgCjDAAV+LAtgcTMDbYhTCHobICBwbBDBghZDZwmAZoYGCAogGBCYgiBEIidCBwQ2DS4QMCVYT2CSAb2DBoLpFn72EdJAA==");
-katakana['MU'] = image(59, 54, "AAMDwAHFv/AAwkf/gVF/4VG8AGEh4VHFgoVPFdZBdRogVBgP4CokBFogVBn/wTIkHEwYrCv4ODCoMP/wVDFIP/JYQVCBwgVBGYLICCoTIDCoQCBBwQhCn5RCCoR/DNoZCDDIRRDCoQODg4+CIQYvGCoZCCCoZRDAQV//4SBRAM//4ABwEfAgQAB/ARBAAkPAwvxAwv+Dgv/8YGF/gkD/xCB543DH4P5AoaBBewsAvgGFhgGFAAQ=");
-katakana['ME'] = image(55, 54, "AAcB8AGEgf/AwkP/wGEj/8Awk/+AGEv4iF//AFAuAAwcHFAsPFA34AYNwFAQvBgICCFAUHCAIoDDwQoDn4DBKIf/MYIoCDwIGB/5RBAwWDKIYGB456Dv//75RDAwP/JQQmBAwJ6Dj4GBOYYGCOYcP/5zEg//OYgGNDYw3BAwgvBAwaABAwgaBOARZC/wGDOoP8MQI1D+AGDFwPAAwJaBDAQNCJIc/AQJsBTYL3COQc/4ATBXoYdCSgU8J4SNCmCNCNQqoDAwQuBAwgFDFAITEAwK1DAAKZEAAIMFAA4=");
-katakana['MO'] = image(55, 49, "j//AAfAv4GFAon/wIGFgYFE/0HAwn8h4GE/AvF8A4Bv4DCAAQzBAocB/+AAwYxBCYkH/wGEh/8MIv4Awk/+AGEGyJfFAFP9AwpOBNuikeAwxfEHoLpFNoZACAwZABIgIACJYYABIAYGCIAYwCHIoABA=");
-katakana['NA'] = image(57, 55, "AAV/8AGEn/wAwkf/AGEh/8AwkH/wGEgf/AwkB/+AA4n/4A4rGoIAE/IGF/wGF/9/Awu/AwvfAwvvAwv3AwpQCOOqqEWLV/H4pGGn5GFAw0fJosfJooGGn4GGKgq6BLQoGEg4GFh4GFPoIpEDYIwFv5MFLQ4GFg6EFgaZFAAw");
-katakana['NI'] = image(56, 43, "h//AAf4A25+/AH4AuWggA5A=");
-katakana['NU'] = image(55, 51, "g//AAcAh4GFj4FD/0An4GD/kAv4GD/EADQnwgIGE8EDAwnAAwuAIIgvBAAcPF4IADn4vBAAd/8AGEFAIDBAQIsBFAMDCAIoDh4eBj4oCj4GBFAd/CIJRBgBZCAQIlD/+HQIIGD54oCNwZKDPQZPDOYRdDOYqmBOYi0BOYjCBBogGGYQSAEAwimDGATdDAwQTBH4JFBLIP8AwYTB+AqBAwITB4AGBE4bADBIJyBUIJ6CVgXgJAQzBg+BAoJkCgxcBCYRIEPArlEH4YGDO4ibBeQs+AokAsAGF");
-katakana['NE'] = image(61, 55, "AAX/4AGEg/+Bws/+AGEgP/wAHEh/8Cwt/8AGEgf/Bwsf/AMEAAYnBj4GDHwQOEDAMHA4hVBn4WFJIIADHwMPA4hgCAwZkFCQKCGBwpHBPQwOFFAJyGBwt/BwozBBwpwDGYiYEEgP+iAkF4IPDCoP8j7WCUAXhbwYVB/4RBU4n4QISfD54vBS4f+FASPD+AEB+AFB/IjBFIPnA4LzCGAfAeYIjBGAP4eYQCBwZuBeYUH/EfIwJRCAoIDBg6ACnCmDR4oqBDIKfEHgKuFS4g5CBwo8CWwqOCAAQ8DcYg8Vn48FAAo=");
-katakana['NO'] = image(47, 52, "AAcHAokP/gFDj/4Aod/+AFD//gAgUB//AAoUD/4oE/woJn4oLEQYoBwAoIh4oEj4oFJZ8HERU/EQhFEDgIiDH4JFDh4iEH4t/NAYcFHII/Dj4cEv4/DCwIcDCwIcDCwI5DCwhEBHIYQBKwf/GYYhBCwc/FoYKBFoYEBFoQKCE4RrBE4YFCHwQyBHAYnBJ4YFBcBN/AgcAPgYABA=");
-katakana['HA'] = image(62, 52, "AAP/wEH/gGCgf/gE/+AHCh4MB//AA4QMBCIQeD4ARCDwv4Dwt/8AeEgI4BDwkH/weFj4eEAgIeF8AeEAgQeEAgQeEAgQeEAgQeGMggeCMggeCQYiACQYYbCDwgbCIogbCIoZZDIoYTCMggTCEwn/CYJFDBYZFDBYYmDv4LBEwYDDg4aCh5JCDQYiDaIQWBNAQ5CMAYLDcgYmCCwgqCGIYTBFwL7EJIIWEAgPgh4WDNAPACwgMBCwiHB/wWEFwV/CwZVB/YWEDgPHXgYuBDwLbDKQPwh60CGwWAngGDgAFBkAHEsAFEAAQA==");
-katakana['HI'] = image(47, 51, "//AAgUB/+AAoUD/4QDg/+AocP/gFDj/4Aoc/+AFDv/gFw8BwIuDj+DFwf/FwcP/4uD///FwQKB/wuBJwIFBFwM/AoP8//PAgP/+IDCAAJdBAAXwg4FDEoQKCIIIgCLoQFBKYV//5qDB4aMuF1YFDFwIRDUIQAC+YFE8YFE44FEw4FEUgn+Aon8WwhKBXggA=");
-katakana['HU'] = image(49, 50, "/4AEv4FE34FE74FE94FE+4FE/YFE/oFE/w0Dg//AocD/+AAoUB//AI4ngAod/+AFDn4FEj/4Aon8AocPAokHHgg2BHhYFDHgJCLJBZCEAopIFAoxIEAoxOEApc/AojSBbwplEAoZxBAocPAojICBQhBCGYIFDBYRZCa4P/NYQuCPoYFBSoZGFZYsPAgYABA=");
-katakana['HE'] = image(61, 43, "AAMH8AHF/4HFh//wAOF/wOG/AHEv4eFg//DwoOBDwgOCDwk//YeEgf/x4eEn/8n4eDgP/4AeEj/8DAIeCBwPgLgkfDYIeECYQeDh4LBIwIeC//wDIIeCBYJdCDwV/BwIwBDwIOBCQYeBn4pCDwRIBIAQeCMIJPD/AOB4CED4BhBMwf/MISbD/kHPovwj4ODDwV/UYhYBKQJ2DRoIGDHQINEcARCCWYgGEDwIOFgb+FDwL2EDwQGFIQoeCBw0YA40AA==");
-katakana['HO'] = image(61, 54, "AAV/8AGEgf/Bwsf/AHF//AAwkH/wOFn/wAwkB/+AA4kP/g8Rg//AAngv4HFCYIAE/EfA4vAAwv+Eo3wn4HFwAGFJwZ5UgfAPIJzDn/x/+PEgR/BAoJzDP4N/8JzD//D/6KDFYI8BCwYrCCAItBPQOH/wWDCgIQBCwf/4P/wIWCCQIBDWgYBCZ4KJBE4LPDEYInBh5sBBgKLBNgQ0CJoIWB4ACCBgIiBBwP8EYU/TQLXBHQQECFAI8BCwIqB8DzCDYMPAgQbCMoI3BF4IRB44OBWwQUBv4TBJIV//InBHgQCBw4OBHgUH/EfNgKOCj0A3BsCQwNgeaSdCABA=");
-katakana['N'] = image(54, 50, "ggGFngFEgP+AwkPAws/AwkB/4GEh4GFn4Gaj///gNF/AGF4BEJAwITBgOAAwQTBh4GCnwJCCgVwLgRwMHAgTBHAgTGv4TEgYTFMIITEMAsHMBY0B+ClFCYiPFEAITEv//OIQMCTg3gBgggEDIIgDGYIgDMIJVDDAIABIIILCFoYYCJwZ0BHQgsBBgZnBBggnCKgYhBMIi3FgAFFgAA==");
-katakana['WA'] = image(51, 50, "/4Ay4A3E/AFCh4GBAoUBAoPgAwU///8AoUHBgOAD4nwAoUf//+AoUDGRYSBGQYSCGQd/94yDh/9GQZFB34yDn/zGQcPAgYSCG4YSBC4YSNv4SKJYJwDLwISEn5QDS4QSDDAJjDDAJ2DGIJ2DUYQ+DQYKcFFYYXBDASOCGIQFDGIQRCDwTaCG4YFBEgbHHN4hiFg6HEA=");
-katakana['WO'] = image(50, 52, "/4AE34FE94FE/YFE/wYYGocB/+AAwd/8AFDn/4AocP/gFDgf/KovADAnwDB43B45EE+IFE/F/KAkfBgmHAonhAonwDAn8h4MEN5X/N4l/N4k/KwkfRwgoBDwcHOohoBOoYFBEgY2BEgYFBEgYFBJIYXBFQYpBFQZ3CAoIWCKoQQCGwQLDHgR8CAoQdCAoQvCOYYFFn5gENgKREbYgAGA");
-katakana['RA'] = image(51, 50, "n//AAcHAongAon8j4GEwYFE+F/Aof+h4ME4IFE/BYr+4FE/wFE//fAon7BgpYE//vAon9CQo3Ev/gAocP/gFDgP/wASX+ASJgYSFXwJ2ECQivBDAoSEWIs//wFDbYIrDAoI+DAoIYDQ4IYCFIIABDALlDGIJhBewS/EJQQYCG4YkED4QFDD4JJF4AFDA");
-katakana['RI'] = image(43, 53, "AAf/7/4AgMf/f/AgMD/9/8AFBv/v/gEBh/9/+AgEB/+/+AKBn/3/wEBg/+//AFX4q3v4qDh/8FQQPBz4PDAYQvBEYQvCEYI/CGYRPBB4cfIYQpBB4cH/5TCDwJjD/4kCn4EBCgN/AgIUBDoP/FIJHBAAIyCDIYjBIYYaBQ4QaBJoZHDAAoA=");
-katakana['RU'] = image(61, 53, "AAUH/wHFn/wAgUB/+B/+AA4UP/gBBCgd/8ABBAwUD/4BBBwcf/ABBA4f/4ABBHQg8FHQI8/HksYHgwYBHgkPF4I8EvwlCHwOAg4gBEYI8CCIQjBHgITBCIP+HgU/CwIRBDAIgB4AMCAgMfEAIMBDAIOCBgQYCIwQMCPYJTBAQI8BBwUHEoN/8P/IYN/+AvBj4LBBwOAj/7BwZGB/4ABBwXAAQIODM4QOFHgIOC/4OBh4OCAYJGBv4OCn4OBHgJKBAYJkBIQISBaIYhCCwIOBSoTqBJQISBeYUHd4U+bYUwcAYAKA");
-katakana['RE'] = image(51, 51, "//AAocf/AFDgf/CQl/8AFDh/8AocB/+AAwc/+AFDg/+GX4ECgwyEgPgGQk+GQkP+IyDC4IyE//3GQc//gyDh//GQYYB8YyD//4GQc//wyDDAOBGQUH//gGQRvB/BlD/4DBGQU/CwIyCj4YBMoQkBBIIyBBAIYBGQIkBDAIDBGgIiD+AFBGoIyBv4eCGQIABJwQvBAAJnDEgTLCEgY8CIYLLDEgZVCAoZuBb4iaBfAj+EgE4AokAA");
-katakana['RO'] = image(50, 47, "/4AEn4FE94FE/YFE/wYF34YS4A1BgIYB+A8Cv/v/gFCj4YBAoUHDH4Y/DEbglDBQ8CAAYA==");
-katakana['YU'] = image(59, 46, "gP/AAX+A4M/A4fggEHAwf8BwIGD/4GBj4VFgYVGv4HDwEAh4GD+A+Eg46CAAf/4AGEj/4Coo6CCqJFBCot/KAIADh5QCQAhQBCrM/Myk/M3JQGh5QFMyIRBAH6NB");
-katakana['YO'] = image(50, 49, "v//AAefAonnAon5Aon+DDA1DgP/wA8E8AFDj/4AocHDFZjfDCJjxDD5WE/+/AonvAon7PgoYX/g3DAAQ");
-hiragana['A'] = image(52, 50, "gEB/wGEn/AAocD/gMcg//AAfgv4FD/wMYFIRNa54HDgYyCBgYsEBgX/+AGBHQYpBCQQaCh4JBJQPwgIdBBAP/wASB4H/j/8MIP8j5fBBIP/4P8gf+j/7/hVBj/jA4PH/C/Bn4RBv8Aj/3/Ef55FB/9/wI+D+/wj40BHwIWBL4QJB+BFBwAmB/4MBD4M/94MBD4JAB/4cBNYN/BgM//AsB/n/z4bBQgOHX4QVB/B3B/CQCAQTSC8BFCB4Q4CB4UAgIIBRQOAXojREn/gaIgAC");
-hiragana['I'] = image(58, 50, "v/gAgUggEf/AGCnkAg/+AwU/gEB/+AAwQZBDgcP/gcECQIcFCQIJCCol/4AGBgYLBj/wCokHCAIABFAIQCCon/DgQECn4cDCoItCAAI+BDggVCLoZeB+BgCCocPPQZUBwZdDJAQcEGAIcEGAIcEGQPDDghIBDggyBDggyBx4cBjxIC8aaCCAIyBLAMDM4IyBSARnC//HUIk/+IyBCASdBLAJKCGQOf/kDJQV/GQRKCJ4XgEYRPC/CoCDgOHNwl/8P/84jCDgM//5HCDgMHAwIjBgP8DwIsBQgYVBSQgVBaYZnCTIgtBbQhDCUAYkCfwYOCGIgAHA");
-hiragana['U'] = image(46, 50, "h//Aoc////8AFBAgIABgEDAofACwIAB/wWD//4CwgdBCIeAFQUfCwIADCwIAMj//+AEBv4tDAgQLBHAYFBAgf/8YFE54FECwRTB/wkCAoP7IAd/OgR2CKwcBQ4kH/hMEJYQcC4AWIh4WEn4tJg6EEj6EEVgIQDE4l/CAbABCAZqBBQgQDBQIQCXwIyCYYTIFeIhlCBQjxCLIQWBMgbdFvzYJ");
-hiragana['E'] = image(55, 50, "gF//4GE/4AB+AFBgIGC/+AgEDAwYNBg4FC/wGBh4GC/gGF/ArFFIQAD4BRVn42FLAIGEJQYGBLAhEBLAhEBLAf/8ArDBIIyEj5fCRYZYEEgJYEN4JNFDQouFDQKcBFwYGFMIIGDLQRJFAwgaBOYQuC8Y2DFwODAwcP/0HXAc//EPcQnAj5LCPAU/MwR4Cv5ECPAQ9CLoUBd4auE/guBVwf5PARaC+5qCAwXnJwSXB//HI4QGCw5ACAwUHNIn+gj/HAAg");
-hiragana['O'] = image(54, 50, "gEB/0AggGCg/4gE8AwUf8EA/gGCv+AB4QaDv/wDQn/CwIaCgP/4AaDgf/wAaCgPn/4PBAAXv/0HAwef/kfAoX+n/4v4GCAgPxCYfg/4jBAAWBGwQ1BgEDJoJQCJoJRBLYcPCAJrCgEcKAaGEHgSGDF4QPCJYYxCHoYMBn5YDBgoGBDIP8FQKiBDwabBFoIzCv/gEAJQCMwWfKAIbBh58BDQMH/l/4IaCh/xTgIaCn/P/BrD/8/4CGD/i3BDQfz/gaDv/P+AaCCAIaEHQQaDv/hGoV4h//g4VB8JnBa4ePZYRkBBwKNCbwPwCYR/C44CB4BtBfgSaD8ACBYQQWBAAYA==");
-hiragana['KA'] = image(55, 49, "gEH/AGEh/wAwkf8AGEn/AAwl/wEAhgGC/4CBngCBgP+AQP8AwMDAYIyDAYUPAwQ2CAwY2Cj/4gP/AAP4j/wgYGC/gGBg4GC/0/8EPAwsfCgd/4E/Awt/FIf/LgJmBE4IGCMwMf8JjBHwIPB4IDBgZmBv+DAYMHMwP/BQRfBOwIKCL4J2BOIQvBAgJxCGQIEBHAKPCCwIYDCwQBBQoRGBviIDIQJRC4AdCXAYdCKIcHboQ/CboY4BboghBboZKCFAYhBjAoDh/8nzME+CfBF4V/RgP/EgKVBwYGBFAMH/zIBFAQeBAwIoDboRRD4DrBJQUHAQJsDAAwA=");
-hiragana['KI'] = image(48, 50, "AAMB+AFDh4FL/AFDg4FIn//AAX4ArpHC/xNEAov/LQgFCDgYAlF4UfPx8/g/8CoQbBKgQhCAoMDFAkHAoeAh4FEDgQAB4E/FgIUBwE/HwQdBn/gAoM+AoPAAoMMAohFCAqIpCgI7C4BEBI4oICAoZfE4C9BAob2EAoISCaQgACA=");
-hiragana['KU'] = image(33, 45, "AAsB4ADC+ADC/wDBgf/wADMg//CYIDDh4DDD4UfAY/8AY34AZRDCh4DCg4DCgYbCgI/CgH/BgU/BgREBBgIQB8AMCFIRNDLoJ2Cv42DJwQdDFQIdDFQQdDFQIdDHYRkDgYhCgADDnwDChyzE");
-hiragana['KE'] = image(50, 49, "AAUB/0Ag/gAwN/wAICgEfBIIIBB4P4BAYPCh/wDAcD/gYE/4FBDAU/4AYEGIgOCDAQOBh//AAP+v+DAoX/7/AAof3+E/AoX9/gYD/9/gYFD/4YE/5QCGIJQDHYRvCJQU/N4JKCKAYYCKAQYWmAYEjwYEx6lDh/zUocDMgIYDv6cBKgUf/4yBBAMH/4eC4EBNQUfAQN/DYMPE4TjCAQQkCYgSJBDYLEBn7QCAQIbCE4UDDYP/PIV/CgLpD4EPP4UH+AkBAoIACCgIADh6LCAAMDAoYA==");
-hiragana['KO'] = image(52, 50, "h//AAX+gAFD//gBgn/BgvwBiWAAon4GwUBDIQACCQQFCn//4AFCg4lBCQc/DwYfBKQJdEDwYAB8CIihAFEgJJDIgQFEg5KEMgITEj/8D4hwED4JqEOIIfEv5eEg4fEFg0PHIwsEBigmFCYkOv65CJYPnbgn+ZgIAD8IMFewvgCYjRBE4IMDegQABIoUfAoK7HA==");
-hiragana['SA'] = image(51, 50, "AAMB/gFE/+AAwcf+AFDgf+DIl/4AFDg4fEgAfLgIfCj//AFQzCn/gLJYMELI5mEh6GGBgUHGAP4CAQ3COYILCBgUDIgYZBAoYmBn5REDwPgQQPgDAIVBj4fBJ4d+CQI1CgeAXhgSDKoYSEQQp1GQQpFBawXwD4IGBg42BaQngBgRlDBgmABgjzBRYZDCPIYvCv//MQoACA==");
-hiragana['SI'] = image(45, 50, "v/AAgUD/wKDj/wAof/wAECg/8BQc/8AbD/4bE/AbEFgcHFgk/FgcBFgkPDYhIgFgIKDFh8eFgn+FgcH/4sDv+/FgUD/osDn/vFgQ2BFgcf+YsD/+fFgUP/gsDv/HFgSKBLId/8IsCHgIXBSod/EIIKBwIhCv/4h4WBAQOAv/+IIP8AQIAC4AYBAAIkBn4KDJQIKDCwYpBCwRWCAoJhDAoK1DAAg=");
-hiragana['SU'] = image(52, 50, "AAUf8AFDgP+BjH/AYP/AAnvAon+BjJAUgf9BgZFB/4MDn4kEg4MFGIwMED4QME+E/+AyC/x0DFgPABwIMC/gMGDIn8gYMFv/4EwcP/+AKYf/BgRACBgYRB/4mCgF/AwJ6DBgoTCRohNDTZE/VAkP/gFDE4PAUQhGCI4YeEUIgYBD4gMBEpI4GgIFEAAo");
-hiragana['SE'] = image(56, 50, "AAcP/ADB//AAwP8AwkHA34FBAAn+A1JalmAGFvinFv4GF//PXghEBAwfBAwoNGEQP/+AGDn4GFh//8AGDg5PCgF/AYP/wAGEgj/CAwQADAw4mCAwZCCAAQ8BFQgGBAAQGBj4GFJQIGEJQIGEgYGFGIIGCIQQVDHQgACA");
-hiragana['SO'] = image(53, 50, "gP/AAXggEPAweAgF/AoX+gEDBgfwgEfCYoFD/EAg4MFAAQMCAAQwBBhQpBJQozBAAU/IAIACIYJUBAAV//gsJD4IsEn4sEOAn+NIn/+4FEAA39AwvvAwqQDAAP7UYhmCx5bDuBVB4BCDg5bEJ4JoEgJ1EEQKCESwIFEg5vEEA4TFh4TFv4TGYgiLBCYrFG/5dDd4YHCOQKkBDQjbDDQQwDWgR5DAwSGEEAgAEA==");
-hiragana['TA'] = image(52, 50, "gEP+AGE/4Mjgf/AAXAgE/AoX8BjUAgP+GYkf8AFDBhHnEIQMBEQQhBn/jFAWAgYMD/AMH/gMF4f/F4UH/kQGYd/KIIACg4VBBgmAQ4gMFUJcB/8DDQZgBv6iD/wuEn/gKIJGDEIl/4KCDC4KPE/+BBgYXBBgY5BAIImCj4MBTIKFB/wMBAAKSB8EPAwXnUYIMDCwLYD95RBEAIZCFQN/AwPBKISpBwEGQAgAGA==");
-hiragana['TI'] = image(51, 49, "gED/wGEv/AAocP/AFDgP/CQk/8AFDg/8Bgn/wAFDj/wBQYAqJ4M/LBZrMJYZ+Ch5aDv/f/4bCBQIABCoMDHAYTBv4+Ej4MEg4DB4IMCAoIcCwE/TwU/+ASBEQI8BVQJLCv/gS4cP/kBMgYWBjyoEgLbJEYYSCQQkHCQg2EHASCEv4SBgYOBOQ70BQoYrBEQIABFYR/DJASRED4YFCBgJDDA=");
-hiragana['TU'] = image(59, 45, "AAUP/4FFAAIGCAoX//EAg4GD//ACYYAB/kBAwgOBn4OFDgoOBAYX+BYP8j4GBwEAAgPDGwQ+C/F/BgIABCwOMLQl/+AGEg/+NIv/8BwF/gGEKwIqDAAM/HAYzDEhkfEgsDEgxJGh5JFHQPACqQrBCpkfCopXBCogcBCog5BK4jSCAwxtDDYK8EZIQcCAoQcDCYTjCJgQGCEYT0DIAYGGEgQGDEgRcEv5UEA=");
-hiragana['TE'] = image(57, 50, "/4AFv4GF34GF74GF94GF+4GF/YGF/oGF/w7Cn//4BCDAwOAAwpQEj4ZDAxP8AyUPAwwiFg4GMgZFFAw0BLQqlBNAkAv4GG8AGEn/wKgv4KhZGGHALeGH4oxNh4xFOJBjGEYt/VQwVFg//BwhOBAAI7Dv4GBHYYcBCwgcB/5CEDgQyFGYgrCUwkPKAwAC");
-hiragana['TO'] = image(46, 49, "gEH/AFDj/wAod/4AECgP/Cwn8C0cICwcDBoIWC/4NBCwMfEgV/4f/BoIWBv//LAMH/4AB8AWBAoWAgE/BQYlBDYUAh4FBHwQPEEIJQDFYJhCgYwCLQQqCDYQKDDYIKDn5xEEAYQB/x8JDYkDCAkPYIk/JoQWTAol/AocZQwR6B8aNCAAOPAgf+TIZqBAongT4QfCBYY9BW4R1BA=");
-hiragana['NA'] = image(55, 50, "AAd/wEAn4CBgH/BIXAgEB/wJEgf8AQIJCg/4AQIJBgEP+ACBBIMAj/gAQYsBEoIoCGwf/GwkB/8P/4AC4f+j4GDw/4n4GDj/wv4FC/0/8AMD/l/4IGD/H/wYGD+P/g4vELARtCMQRtDMQQKDL4YKCMQQKDMQQKDR4QKCTIYKCFYQ2bOoI2C4BgCGwWASAQ2BGQKJC8DNBBAIAB+DNBPYf4ZoKrDAgPwT4K7BAwRdBB4K3BVYIqCVYY6BAwKrB/0DVY3+v/hAwf8n4SBdIXwnxEBAwXgnBEBAwShBO4IbBSYSVCOYQAHA");
-hiragana['NI'] = image(57, 50, "AAMPwAGE//gAocf//wgFwgEH////kH/AZBAwP+gf+Bof/wP/gEDAwWAAIMBAwc/FgIGDj4sBv4GBE4P8HAIdBE4IqBAwYgBKAIGCKAYKBAwN/EYIGDn4jBAwZfBDAQfBLIPAAwZZBDgItENYN/CAIfBIAIGCLIRfDLIXwAwc/RQJmCHAPv/0PEoI4B+f/AwcH/P/w50D/l/wZ0CgP+j/BK4Q4Bg/gJoQ4BwIGBIwU/4EwAQI4CIYICCAYY/EJQMHHATcCbAQKEHARGBGgQqBCIc/D4IGDaITCDT4PAAQJfCQQRYDeQQGDSIIGEYYIGEE4IGEDgYFCcAQ+CGQZsCABAA=");
-hiragana['NU'] = image(58, 50, "gEP/AGEgf//wHE/4ABAwc/AwIPDh4OC8AGBg4GCEwUBAwX8Dod/EgoHC4AsF+BJFjAGDg4iEFgRfF/+AAwk/IwQjDFIgjDvAjDMYJlCgRHB4ABBFIUf/ABBFIXH/0HCoUf+BcBLwQpBCogpBCYIVDv+ACohNBn/wCoRxBCohNCMoIVBOIQVBAIJNCCAIVCEYIQBCoOAb4QtDCAQtC/gjCdIIXCN4QwBC4SVBDQIXBEYUP/gXBI4QEBHwPD/8ODgR/CwZNCCYN/8P/5/4GQOf+DtBKgXv/jtBKgX5/0PAwJxB/0/DAL8CvkDJYP/IYMMgFgg//fot/VYQACgYGFAAoA==");
-hiragana['NE'] = image(67, 45, "AAXwA43/4AHFn/8A4sPCA0B//+CAt///gA4kfCA0H/4QGA4IyFn4IBGQg5BIYsD//nCAt//F/CAkf/wzBCAYFBwH//BaE8ArBwBzFCAgNBLoQQCHIPADYIQD/6dBCAk/OQIQEHIQQEHIQkCCARaBO4YUCSYQQDHIQQFHIQQERQgQCLQQQEHIKBDCAPAn5fDCAP8gbNECAaJDCAbVECAPgvj+Gg72GdoqYFCAgHFKIoQDDA0AKIjODDA0ARYQAEhwHGAAIA==");
-hiragana['NO'] = image(54, 50, "h4GFn+AAocB/0IAwcH/F//4AB+Ef8IFC//A/+PAwcD/0fAoX8h/wDQk/4ITDAgMDAwcH/hGC/EAj/wIwXggF/4AGB/+AJIIFBGQJJCDQoWBDQf/wZlBDQIWBh41Dx5kE/0/Mgn4IgIGD8f8MgYaBL4IaEPQJrD/6RCGoRkCKAR/BKAgaBKAoaFNYoWCKIIaC8BKCDQWAIYQaCgJCCDQRyDDQRXDEoOBK4ahBW4K+CAgKcBDgLcBMwIwC/1/4JHBCYP5CoQwC4aND/atBRofDAgPgdQaSBHgX4hxXBHQXAhAOBAwKXCAAJlBbIIAH");
-hiragana['HA'] = image(50, 50, "AAMH/gFDgP/Bgl/4AFDj/wDBsH/4AD/oFE/9/AwoARJVXhAon4JQn+j4MEw4YLn4YEJTIfCAooYCAoX4DgQwCwBdEBgMDHoYMB//3Bgd/8AUC4A7BJQP//kHBwQGB4JYBFoX8KgMP/gGBz/+h//AIPjGAXA//wAoXwh/4DgX4gP8IgQnCF4QFBgOAEIKIEv6SCAA4A==");
-hiragana['HI'] = image(59, 50, "gP/AAOAA4U/AwPwAwUHAwP+CwYVC4AGCj4GB/AGCgYOCCod/AwPgGokH/g8GHQY8CHQYVCHQg8CwEfCAYEBgYQDAgV/JYYEBh5LDj/4GoJKEGoJLCAwP4JYZ9C/BLCNwSGDQgSGDOoaGDAwg6BEYQHDh//EomDAIP+ToaQBEIIvCKoJyCJgPH/yDCEIIVB4BNBMwIgB+CZCn/n4f+h5jBAQMw/+BOgKyCCoN/PIICBS4I0BCoQJBJQJqCBIP5NQfgD4KACn5tDGQSDEwADBTIJaBGQKZEDISvCToR8BeAQDBAQLbCb4RSCAAcHcQYACvwGFg45BAAj/DAAw=");
-hiragana['HU'] = image(55, 50, "gED/gGEg/4AwkP+EAhwGCj/ggF+AwU/4EB/wGCv+Ag4GD/4kBAwM//4AB84GBv4GC54GBAoX/x/+gIGDh/+gYFC/0P/kHAwX8AwMPAwX4j5cCGwJOBAwJIDj5jBv4QCAwIpBNoU/+AiBNoIGCJYJtBAwPhFwPANQXjAwOAgEEv+P/A2C/H+CoI2BTIIhBwY2Bh/xwH+UgUf+CwBUgSgBBYKkCn/gh/gToI1B4Ef4AvCBIM/4ZmCIAN/44oBSgKdCFAJ3CLAY0BUgQoBGgIGBEIUPAwSID+AGBQIZHBJQRECd4Q9DI4QvBJwQ2Cj4sBGATRBJwLcDFgTcDC4QGEEILqEAwIbDIARoCBgQAGA=");
-hiragana['HE'] = image(55, 50, "AAUf+AGEn/gAwl/4AECBQP/wAYC4EB/4YDwED/wYDwEH/gGCCIMP/AFBgIRBGwcDCIN/GwUH/EP/4bCDAP/AAI2C+4GCHwMfAoX/JgM/AwYjBv4GI8YGCFoN/wIGBgYCBFwIiBHYJfBNAPAn/8IwIGBwAaBh/wAwOD//4R4IfBg//+B2BDoJKB+AoBg/+JQPjOwMP/n/z/nQIMf/IOB76BBn/3/gVBMgN/94nBOQX/7/gAwKbBOwSOCHoJMCEIMH/v/CAJxBh/7/hcCF4X4KYLEC5/wj5KBEIOfGwJRCL4PzF4V/JIQvBCYJJCH4JxB4AGB/xCCFQIJDDoIMBBIRNBAQJdCIwKUCeAb5CPgQACSgIFDSgIFEAAg=");
-hiragana['HO'] = image(51, 50, "AAN+AokP+AFDgf+Bgl/4ASE/ASVv//AAX8h4FD/+BAonwn4FD/0HBgnAAogoBgP/HAk/8AFDg5LEgASM/gSFwADBFQIAC8E4Iof+/5FE5/wAof5/0fAwc/8YFD8f8PAYEB54MDJ4SRDJ4KRDj/gNYaoCLAYWBLAYWCLAQWCDYJvDgYSCCwV/NYQWBGQc/+AyDg4yBj4MBgYSBAQP4OwPwbIglBQAgpBBgZiBBgYYBBgY1CU4S0DFoIRCAAo=");
-hiragana['MA'] = image(55, 49, "gEP+AGEj/gAwk/4EAkAGCv+AgAPD/8AgYdCgP+EgkD/gdB/AGBg4DBv4GCj/w/wGCv////8AwQFB//4AwMBAwXwEQMDAwXgAwMHAwXAAwMPAwWAG4QvBLgQGBL4X/AwRfBKgIGCL4X8n/gLARUBn5YDMwM8NQaLBQYIoCAQSIDAQRZBRYaBDRYQhBFAIJCKIYyCDwKoBToZkBOAIJBPYKLCGwMH/h2CAwMfKoKKCI4PgSIYYB4afDJQMP/gpB+AhBMgIjB/AhC4EfAwIhCEoIGCwJdBaIIZBMgSkCjhMBgakBG4LICUgKDBAwQuBPgRKCjgGE4EQAwgEBAAIbBRAQACQgIDB");
-hiragana['MI'] = image(50, 50, "h+AAocD/gFDgP/CQl/4AFDn/gv//AAOP/E/AoXj/0HAoX4/+BAoX+DAuf+EfAoXn/gYD/P/gYEBG48f+AFDg5QMMYkf8BvE/BvE/wYE/4YEKAIYYgZSCDAMBJgQYCCgYDBFoYDBj4tCDAJlDDAMBGYYYBNYYYBn4xCg/4h6ECPgIHBPgfBDwaVBQgYvBToYYCFYauBaIIwB5/wcAfz/0PAoX8cAn/IgQFC55dBAoXxFILtC/grBGgL5BYIoAGA==");
-hiragana['MU'] = image(58, 50, "AAV/4AGEj/wAwkH/gGEgP/Aod+Dgv/wAcEj/gDgkH/AcEgP+Dgt/Dg3wn4mBHwYGBDAIyCAwP/8AGBAoQODh4GC/4sBgYGD/AcCAAO/IQQcC4IkCDgI7Bj5YBg//w/8EAIjCwIEBv/gMQPgLAMPFYP//h1BgZpC/4LCNwIxB4YoBFoIxB/AjBNIMH/v+n5UB/4qBn/fIoIJBv+PLYUPQwPhOIUD/gvBGYMH/3/BAX/457CBAP/84GBDgIlB/YGBCYJwB/qECDgKREwBCC34YBDgfvLYP+HIM/+YYCIwM/MoIYB/hGBMoQEBz4nBKQfDAwODGQXwKQQMB/P4j4GBAQP+ngtBUgIRBg6aBRwKiBwOAf4TNBAobjCAogAEA");
-hiragana['ME'] = image(57, 50, "gEP+AGEg/4AwkD/gGEgP+Dgv/Awt/wAGEn/Agf/BIUf8EP/40CHAMf/4tBAYP4AQImBCIP8n4GB4EH//+AwXgEwP/v4CB/EBAYIPBg4jBAwX8BYJFBCQRKDFYIGBJQJxBIgUfAQIrBAYMPCAIfBBQR8CAwR8DMAZ8Cv4GCGIQGDGIU/AwR8BAwKqCWoU/FoS1Cj4tCHASEBWogGBUAQKBAwItBHARpB8BlBBQKuCAQIKBO4SqCBQX8AwX4h/9/wGC/kP/n/DYSlCv+P/ArB4K+B4/4SIV+j/jWIX8n0P+JSBDoMOMwJWBAwOCMwM//ZOCMwI4C75nB/5bC45nBv+DAwPhTgXAb4PAoCfCQQifBYoYAHA");
-hiragana['MO'] = image(60, 50, "AAX//4GEv4HFj4GB/wGCg4GB//4AwMBAwX/4AcEDwcPAwYWBgYGDCwQVC54tCCoX8F4PgFYP4CYI+BgE//0P/gaB/ARB4F/4ApBwAVBg4OBj/8EgITB4AiB4InBBwQgBCAIOCPQPjD4MPJ4MH/0/+ALBwARB84kBBwQ0Bv/gBwc/+5bBj5tEHAR8Bn5lBBwInBBxY2CBwcDWIQOEGwIODJwIOFIoRKC4CNCBQP3AgKwCDIIOBKIQKB8/8IQJgBj4OB8E/MAfD/ytBEgX8J4KeBZwWDIgJCBCoP4ZgIzCAYIqBeYRQB8DnCK4gGBGoIDBwAyBF4IKCCQWBAwIVBEoPgF4RFBg/4F4Q2BAAQOBTwIADHoQADbIQAIA");
-hiragana['YA'] = image(54, 50, "gEf+AGEv/AAocB/4MEg/8DUv///Aj//wEDAwIcBAwMP//8BgIGBn//+IFBAwICB54GCDQQAC/0HAgXAn45BD4IDBn45Bv4MBAYPgGYJKCFAIbB8EAgf+DQRbEv/4LYYaBOQU/4EPCwIhCCYJrCgf8CYkP+BlBCYQaBv6GDOwQaECYIaEKwIaD4JWDgP+CYIaCg/4NQYTB8Z+BFwef+4aCMgN/74aCn/z/zXCIAOH/IaCh5CB44aBJoU+a4QyBwFwDQLGBCAOBX4adBGIJMBRIQaBUYI4CDQJnDFYJ7EDQKzCDQYECAA4");
-hiragana['YU'] = image(52, 49, "AAMf+AFDgP+Bgk/8AFDgYMM/gkD/4AC+EBAof/BkA5FhEAg45Cg/AgF/AQMBBIMP/4DB//gE4Xwn5dBn4GB74IBgY0Fv4FD8AfBAoYfB/gbBIAIiBg///A7B/+A/4rBCQIxBBAISB/ghBCQeBEoIMBCQI0BBgQSCDIYSB54MBgIlB+AMCj0H/0PBgIABHQQMBOgP4BgZBBBwTDCMYIMDKIIMRWQQmDAwUMYYqyBAoaxBN4IMEV4QMCcggMBWwbZCAweA");
-hiragana['YO'] = image(55, 50, "AAMHAwsP+AGEn/gAwl/4AFDgP/BgkD/whF/AGEj4oFEIsA/+AEIgoFg/8EIooFJQ3/JRcHJSgoGJQxEEg//FIkfAws/Cgv/AwUGJQX/HwMP8AoB74GBj/gh/+IoU/4BzBBQJBCJQIKBNQRzBv+AWoIIDJAP4SoMBIgIkBOYMDHoKTBAIIRBXgQBBB4IfBEIQYBFALgCCwMP/iVCJAXwJ4QfDcAX/4JRBSoRvBEIZ2DcAQGCFQIhBPoIYBcAQGBDAJqBCgQ6Bg7rIAAY=");
-hiragana['RA'] = image(48, 50, "gEP4AFDj//wAFE/gFE/4TCn4FBBgQFCBgQRC//gBgN/BYUP/EBAog3BGIIFCgH/BAIFCh4FEgQFEBoXwAqsfAoIuBAoROBEwIFBIwP+AoPnLIWALwZfBNQf/+AFE/AFBEIM/AoR6Bh/8OoIzBg4FBRgQFCL4UD/wlBAoikCAoM/W4QFBj5dCAoMGAohpDg4FEHYJ1EAog5DDgJWCb4Y/Cg7RDaARFCAoZFBAobiEeoruCAoQtCAoI+DAAgA=");
-hiragana['RI'] = image(40, 49, "ngEDn/AAg9/4Ef/AEBwF//4EBwP//4HBw4EB4F/x4EB8F/z4EB+H/n4EDAQIjBCwUPAgUAAgX+gEH/n//gEDHIMDAg3wAgP+AgvgAhBeBAhmAAiJ3BAhf8AgRUBAhBXBAAJtBAgSgCVgRcBAAJXCEwIEDj5SCBoJDCBAKSBBASSBXwKICAgQmCAgIcCv4SCAgI0DeAY=");
-hiragana['RU'] = image(51, 50, "gf/AAXAgF/AoX8gEPBgeAgIFD/EAn4MEg4FD8EACQoACn4lBAAUf/4FDDYOAAoQuBHwIACv/wDwgkEh/+DwoFDDw5ECDwRLDMwg5BLIZMBNgh/FGgIeB+AVB4AeBEYJmBBAJQBDgPBOocf/AoCVIU/Kwc/+5WDg/+Kwl/5/wh4mBh/4/A2CFgMOAoJDC8GBMgUHGAJQCCQKpCBgISBgf+SQMPCQN/4H/4YSBGIIwBCgMBDoTMCn/AEIROCLoKFEAIJvBTwZvCTAarFNIQFCXASyCYoYxBAoYAEA=");
-hiragana['RE'] = image(56, 50, "gEf8AGF+AGigP/wAGDg//GYQGBh//C4M/AYICB/AGDv///gGC+P/AwQKB+YGB/wNC+//w4GDBYMDAwn4AwQ3BFQIGF8AGF4AGFgAGEAYMDHwIGBAYIGDn5XBAwhlBAwd/Axh6CAwSPBAwMHAxEDAwqdBAwidDAw5IBOoQGDU4QGDUAIGE//fAwufCgrmCh4iCAwk4nwGE/EcAwbSBjAGFegReCUgIGJOYIUEQIYGCIYOAAwPgAwIAIA=");
-hiragana['RO'] = image(50, 50, "AAf4gEB/4AC8EAv4FC/kAj4MDwEHAofwDAgSBDAoACn/+AocfAokP/4FDE4OAApED//AAohJBAAI5BAocAIQIFEHghFCD4QFCBoU/KIQMBNQZ9BOAhOCQYYFE/B8CE4QFBM4JGB4YuDj/7AocD/xIE/+fP4c/84FDh/8QoZyBj5mE4aFDn5yEDAIFDGIIFDIgIXDDwKREv4eEv4eBiAFCDwMH+A8BIQLnEEgLnDSooqBQYQFCDgQ2DAoolCJAgAD");
-hiragana['WA'] = image(51, 50, "AAV/4AFDh/4AocB/4DBj/ggE/AQMD/0Ag/8DgWAgH/AQMP+ASB//AgISBAoIDC4Ef///+ASBh4FB/4SBgYFC+E/4IFC/8H/F///9//g/8f/3/x/+j/nAQPwv/j/H/wf+I4N/KAJlBv+P9/4MoMP/f9/xlBAIIqBwAUBn/vFwIdBg40BNIIOBIIR7B+BbC8B7BKoX4uAyCAwM+GQX5//f8IyCn/z/hHCK4N/4/8h/8/4EB/4lBF4P/z5wB8f+RYJjBPoPAFwO/BQP4IQX/wJkCTAUfVYf4gf4BgS4BbQRiCcgbSCAAILEcALkCAAM/DoYeCC4ZLBfoIeD/ASEDAhoBAoYlBDwcAg/ABggAEA=");
-hiragana['N'] = image(54, 50, "AAVgAYUP8EHwAGCv/Av4RD/8D/wFCgf8g/8DQf4j/4AwU/8E/+AaDwF//4VBgIfB/4GCD4MPAwcf+YFB/4jBn4FC/4jBAof/4AYC//n/+DBYeD/wZC/f/FgIrCGIQsCKYU/444CKYP/z4xCvxOBv+/8EBQQP4B4KFCCoJeCNIYPBQgQKBj53CAYSbBCYQDBHgJbCTYUDOQZHBM4QTBTYX/GQQxBP4Y8BDQRGBTYY4Eh5MDHgZTDAojdEbAYGEHgIGEv7/DHgIhFfAh1EEIg8GEIg8GTYYhDHhYAF");
-/// /////////////////////////////////////////
 
+const katakana = {
+A: image(56, 51, "v//AAfwAon//AGF/wGT/gGM/A3F/BDEn/wJQoGCj4RB//gAxUB//AAwcDAwsH/+AAwcP/4tCAwMf/wGEn/8Awl/JYYGBKQkf/I9DAwJgBGwQGDGwRlBAwJsE+42DAwPzGwYGB+J7EQIIvDQIIFEAw5DEAwRDDgCIEAxCPBKIcAR4IhER4hnCLAg9BLAgoBAwgoBcQiCBMwj0BHogGBHogGBfoooEQQREFEIgGBAokAhAGFA="),
+I: image(54, 55, "AAkEAws+AokB/wGEg//Awk//gTE//gAwcPCYt/CYkDCYsfCYv//A0F4A0ECYg0BCYggBCYn/KwhBBGgl/EAgtBEAgMBEAZOBEAgMBEAYZB/+ABggTDBgQnDAoIaDJoIaDFgIABDQQFC74aBBgX8v4aBEwWBDQQgB/EHDQQ6BwEfGoX/+AJBDQMDWAKMBDQMPAQIaDiBFCPAgaDU4hrDDQiuDDX4acSAIaCA="),
+U: image(52, 55, "AAMP/gGE//ABlH/AAnvAon+Bk5EDv/vIgcHBkHPBgZwBBgn/Bi8B/+PBgcf/AMFw/wBgYEDgED/6qEv4MEKYK3F8AFDj7EED4LREv/4CQn/wASEFginBDAgfEDAIfDn67BC4YABH4QXBCQcHZoQkEEoYMCHAYlBFYZEBLwk/MgpQEAAw"),
+E: image(58, 45, "h//AAfwgYGE/0AAwn/wE/AwngDgv4DjhDCv/wJQkf/gGEg//AwkB//AA4gc/Dn4cjbAv/34GF94GF/YGF/wcjwA="),
+  O: image(57, 54, "AAcf+AGEh/8AwkH/wGEgf/AwkB/+AA4n/4AGEv/gAwk/GIsf/A4P/4AE+F/Awn4n4GE/kfAwn+h4cFg4GFwYGF4IGFKwYFBMQpxFAwJxEAwJxEAwJxEAwJxEK4JxEAwKqEMoQGE/o4En/8HAl//iqEAwKqEv/+VQgNBVQgNBcYgNBcYhLBcYhSCHAQKBAwI4CAwY4CD4IGBHASxBAYI4CAwY4CYwIGBHAQGBD4I4CBIJfCHASmDHAV/PYQ4Cj5QCHAUPLwQ4CgQGCOIgABOIgABHAIGEAAY="),
+KA: image(54, 54, "AAMP/AGEv/gAocB/+AAwcH/wTEj4arg//AAf+j4GE/F/AwnhAon/w4aZHAMP/hTEn/wKYn/4BTDgf/KYgQCDQYQCBIQQDBIQQCBIc/DQouCDQQuCEghJBEhITBH4RTBLoRTEBIJTGCAUPNwoTCDQQWBDoIuCj4TCJIX/CYQ/BZQInBH4U//0HwBTBGgPwXAXwh4PBXAXAv4PCZIIgBEYTJBn5SBDQXABAIzBCYJcCDQXwgbOCAwIDBQgI4CgEOJwIADkAGFA"),
+KI: image(58, 55, "AAU+Awv/4AGEn/wAwkP/gGEgf/Dkk/CAc//4ABwAGBj4GC8ATBAAf4h4GE/woBAAmAAwvgFAYcIwAcD/BFDFARFD/kBIoYACv5FBAAcfRL94DgkfHgf/95EBD4RgDD4MHLwf8AogAd+CPFGwiJCS4XHJgSGB8CJEkCJJUwYABg5pDD4amTNwKmXYbgcDLoY="),
+KU: image(55, 55, "AAMHwAGEh/8Awkf/AGEv/wAwn/4AFDgf/EQkH/whF/4ACAwM/AoQQCBgY5BgIGDHIMHAwY5Bh4GD8AhEIAQFDIAIhBBIJACEIJpEj45CNIV/NgRpBDQIrBEoPgDQJlBEoQaDEoV/RwUP/wPBQ4Uf/gPBQ4QsBKAKSD8BvCSQXDDQYYBNYIaCGYIqBDQU//kPXoYYBj5QCEIPgj60DKoMcWga7FKoYABKogaDbojPBbojMDGob/ECYJBCbgYaDE4IaEPoIaDEAI1EbYQZECYgtBCZQGCLol/KwxxEAwJqEgIMFgIZEgA="),
+ KE: image(60, 54, "AAMcAwsD/4HFn/wBxl/8AGEg/+BxkP/gOF//ABxcB/+AA4kf/BCGAAZOBv4HEIQIOGAwgOBh4OFGYIOFn4OFEgoOBAwvgh52BKgYDBOwJUDv5nBBwY6BAYM/BwIKBJgJjBBQSbCWoQVBRgK1D/4oDBwJJBWos/WIS1CgIVCJoRGBWowCCj61HYgpRCdIjEGLgTLEIwTLEfAv/GYqtBEghyBGYjoCAwwkDAwQVEYwYjEHQt/CopeBQgQOEIIgOBPgxeFgZ7FA"),
+KO: image(49, 46, "v//AAYFF34FE74FE94FE+4FE/IFE/gFE/w0Dgf/AocB/+AAwf/4BHE8AFDn/wAocf/AFDh/8AocHGH4w6YZf7Aon9YYoFEejBhEAAIA="),
+SA: image(58, 53, "AAcD/wDBg4DC//AgEB/+AgE/+AKBv/ggEP/gGBj/4DgP/DnU//4A34CQ+DAIcEDAIcDDAQDDDAYDCDAYDD/4cDIgJADAAUfIAQACh4jCAAUHD4QACJwIfBAAQtBEYgGBI4QUDFQkP/4qEVYQvEAAIxCEIK5CBwV/AwsfAwocCAwYcCJogcBNIp3F"),
+SI: image(56, 52, "gFwAwt+Awv/8AGF/gFDgP//4GGCocDAwIVDBoX/wAHCn4VFg4GB4AxEAwsfAworBEQYABv4GFj4DCjgrCBQYRFn/4JQfAIgIGD+F/JQcD/gGBMARQCOwcH/wNBCoUP/0PAwIrBj/8OwQGBn4fBGIIGCAQIlB+BcBAQKvDBIQRB8AfBIQUH4AXBP4RXBGgJmERoJsFAwv//yaFbYghBQIYaCeAi9FPQTZGdxKFCFASECFAZPBEIgNCJQaZEAwhDDAwRJDTAYGEQAiQBPIgAGA"),
+SU: image(60, 51, "gH/AAYGBh4GD/AOG4AOF/gONDo+ABxAACgY7CAAd/+AGEg4OG//gAwkP/wGEgJCCAAcfKIQzEIQIzEIQozOj4zFEgIzFn4kHGYv/M4okIGYt/IQqXBFghuBHYs/bAY6DCwrJECod/HgYVB8ZLEcoMfLQYECCwYVB+BTBCwT7CCwYrBAYIKCCoQDC8BXBEIQSBNoQVBBYP4EAIoCOQPHCoYTB/xdBIwQ8B+6SET4N/dYn/4aCFFgKRFgC+EgPghivEAoI"),
+SE: image(57, 53, "gEH/wGEgf/AwkB/+AA4n/4AGEv/gAwk/+AGEj/4AwkP/g4JjA4EBQQ4D/4DD4E/AwIuBv/vAoP/FwILCAAIuBv4GEBgn//wFEAwITEh//CgfwAwMfCIRGB/4BB/5xBAgJTBIQQGBwP/75CBAwOAD4JCBAwRmDDIKYBOIQGDOIQGDOIQbBAwSqBAwiqBAwiqBDYg4Cv4GCHAUfAwQ4Cg4GCHAUBbwbjnHAgADcYYADUYQxEEYq6CVwbDBdQi6CZQYqBAAZcCAwY1BEYi5DAAQ8CegfgA="),
+SO: image(52, 52, "gGAAol8AYUD/Ef4AGCn/3/wFCg/+v/wAwV/8//Bgk//AMD8f/FoQMBj/8Bgfg//gBgcPFoYMBFocP/kHFof/4AtDBgMDFoYMBFoYMBgIIBgADBwAtDj4dBHQQMCFoYqCHQQqCFoc/BIIPCCwQtDKYIpBB4IwDIAQwCh45CBIVAFgSmDFIaaDOIYfCVgYfBRYYfCTASTCUoY1BQgZPCD4l/D4kfH4g4BH4YYBH4gFBGQd//4yDBYIyDn4SEJQIlEBgRXEHAg+BFYZRGZYQADBYgAG"),
+TA: image(55, 56, "AAMHwAGEh/8Awkf/AGEv/gAwn/4AFDgf/EQkH/4oF/4ACAwM/AoX+FAQGCHIMBCYY5BEIIAC+AhFIAIhDHIQFDF4IhBJQMHF4JDDNIUfHIRpCv5sCn/wDQJsCDwIaBEIIKBwEf/9gOAQaB/gbBFAIPB+YsC/AaB54RBFAIaBAIOAEoJvBOgPh/+DNAJWB+//DQPBQIZyBM4f4LQSQC8EPKAIpBFAMPPgKKCgEcYIZwBiAGDbohwEZ4bdEFILxFf4ghBXwLjEDQhLBCYoaEE4IaDdIQaDBgLBCDIRQENYYTIewRkEAwJCFHYicBOIkAEAhDBS4IAJ"),
+TI: image(57, 54, "AAkGAwsfwAGE//gAocP//wBgn//gEBgIFBAAIeBAof/wAYBAwkHAof+gEDAwf4E4YAB4AGBv4TDAAM/AwoxDKQhABLQwiCAAV/MIglBMIglBHwRwDNARbF//3Awv7Awv9Awv+Awv/MQQAD34GF74GFKAUHOIYABSAJxGaYp4Uv54FP40/P4oGHQwQGKKgt/AwrUEMIQGEVYIGLg4bMFII+Fv5TGNAsPQgsHTIoAG"),
+TU: image(54, 53, "AAMBwAGEj4FEgf8AYPwgFgn/4BIP/g+Av/ggEP/n/gP/4EAv/v/wQBFQP/z/4CAMAg/+DAMfEIICBDAN/FgN/8YYBBAIaBw4hDDQIVBAYMAn/wDAIhCCwIhDCwIBBwAIBHAIYBEIQYDBAIuBwAjBFQghCJgQhEAIIhDEYQPBh5HBM4IhDQQQhCwYeBCwMBCoSPB/0CIQQhBAQKWDvytBCYTBDv5tBZYYTCAAQTCAAYTFHAITEj4TF/4TEh4TFv4TEg//JgIMDMYIMEO4ImD/53BAAM/AwIsEEAgFBEAZNBIIgTCFocfJwo6BPgpHEgZAEgEOAogAGA=="),
+TE: image(57, 51, "h//AAfwg4GE/kDAwn+gIGE/8AAwuAv4GE4E/Awngj4GFNWJNF/gGF/5UF/+/AwvfAwvvAwv3Awv7GJn8IQV/4BJEv59Fn/wAwkf/DJFEAYABg/+AwjJBAxbQBwAGFH4gGBH4gGIIwgGNG4IGEg//LYjyBAwiyBAxc/EQoGGFIJTLdYJvEgF+fIsYAwo="),
+TO: image(42, 54, "//AAgU/+AECh/8AgUD/4U/CgYPDn//wAUC/4VCCgIlDAgIKCCgIKCCgP//wUD//gCgQKCn/zBQQ+BDYP8CgMBEAQBBj4KBKYIKC54yBBQP7KYIKCG4QKB35YBBQIUCGQPjNAUD+BXDnB9Dgy8/CicAA="),
+MA: image(57, 50, "/4AE/l/A4s/AwvfAwoAN/YGF/oxGHokf/wGLh4GN/4GSg4GChgGDwARBAw3gAwv4Awo7BAwn/4ACBAwIKB+AGDgJtBAwcAUgOPAwYLB94GDgaFCAwTBDAwcfAwoyBAwgyBAwgyCAwgcBAwgyBNgL0ENgIADn6oHDijhFW4wcB4AGDKwPwBwl/fwzUJDgZOFgAGGngGFhADCA"),
+MI: image(52, 53, "gPwAwkf/wFDgf///gAwU/AwIVCBgX//AME//8gEHAoQGCBgYGCv4GDFIMPBggoE4A2CCoIuCAweAAwc/BghYBMwswNw0PNwkBGAIbEG4gMCOoYMCOoQMDAwRnE4BYDKYQTEKYRuCKYY8GgCjDAAV+LAtgcTMDbYhTCHobICBwbBDBghZDZwmAZoYGCAogGBCYgiBEIidCBwQ2DS4QMCVYT2CSAb2DBoLpFn72EdJAA=="),
+MU: image(59, 54, "AAMDwAHFv/AAwkf/gVF/4VG8AGEh4VHFgoVPFdZBdRogVBgP4CokBFogVBn/wTIkHEwYrCv4ODCoMP/wVDFIP/JYQVCBwgVBGYLICCoTIDCoQCBBwQhCn5RCCoR/DNoZCDDIRRDCoQODg4+CIQYvGCoZCCCoZRDAQV//4SBRAM//4ABwEfAgQAB/ARBAAkPAwvxAwv+Dgv/8YGF/gkD/xCB543DH4P5AoaBBewsAvgGFhgGFAAQ="),
+ME: image(55, 54, "AAcB8AGEgf/AwkP/wGEj/8Awk/+AGEv4iF//AFAuAAwcHFAsPFA34AYNwFAQvBgICCFAUHCAIoDDwQoDn4DBKIf/MYIoCDwIGB/5RBAwWDKIYGB456Dv//75RDAwP/JQQmBAwJ6Dj4GBOYYGCOYcP/5zEg//OYgGNDYw3BAwgvBAwaABAwgaBOARZC/wGDOoP8MQI1D+AGDFwPAAwJaBDAQNCJIc/AQJsBTYL3COQc/4ATBXoYdCSgU8J4SNCmCNCNQqoDAwQuBAwgFDFAITEAwK1DAAKZEAAIMFAA4="),
+MO: image(55, 49, "j//AAfAv4GFAon/wIGFgYFE/0HAwn8h4GE/AvF8A4Bv4DCAAQzBAocB/+AAwYxBCYkH/wGEh/8MIv4Awk/+AGEGyJfFAFP9AwpOBNuikeAwxfEHoLpFNoZACAwZABIgIACJYYABIAYGCIAYwCHIoABA="),
+NA: image(57, 55, "AAV/8AGEn/wAwkf/AGEh/8AwkH/wGEgf/AwkB/+AA4n/4A4rGoIAE/IGF/wGF/9/Awu/AwvfAwvvAwv3AwpQCOOqqEWLV/H4pGGn5GFAw0fJosfJooGGn4GGKgq6BLQoGEg4GFh4GFPoIpEDYIwFv5MFLQ4GFg6EFgaZFAAw"),
+NI: image(56, 43, "h//AAf4A25+/AH4AuWggA5A="),
+NU: image(55, 51, "g//AAcAh4GFj4FD/0An4GD/kAv4GD/EADQnwgIGE8EDAwnAAwuAIIgvBAAcPF4IADn4vBAAd/8AGEFAIDBAQIsBFAMDCAIoDh4eBj4oCj4GBFAd/CIJRBgBZCAQIlD/+HQIIGD54oCNwZKDPQZPDOYRdDOYqmBOYi0BOYjCBBogGGYQSAEAwimDGATdDAwQTBH4JFBLIP8AwYTB+AqBAwITB4AGBE4bADBIJyBUIJ6CVgXgJAQzBg+BAoJkCgxcBCYRIEPArlEH4YGDO4ibBeQs+AokAsAGF"),
+NE: image(61, 55, "AAX/4AGEg/+Bws/+AGEgP/wAHEh/8Cwt/8AGEgf/Bwsf/AMEAAYnBj4GDHwQOEDAMHA4hVBn4WFJIIADHwMPA4hgCAwZkFCQKCGBwpHBPQwOFFAJyGBwt/BwozBBwpwDGYiYEEgP+iAkF4IPDCoP8j7WCUAXhbwYVB/4RBU4n4QISfD54vBS4f+FASPD+AEB+AFB/IjBFIPnA4LzCGAfAeYIjBGAP4eYQCBwZuBeYUH/EfIwJRCAoIDBg6ACnCmDR4oqBDIKfEHgKuFS4g5CBwo8CWwqOCAAQ8DcYg8Vn48FAAo="),
+NO: image(47, 52, "AAcHAokP/gFDj/4Aod/+AFD//gAgUB//AAoUD/4oE/woJn4oLEQYoBwAoIh4oEj4oFJZ8HERU/EQhFEDgIiDH4JFDh4iEH4t/NAYcFHII/Dj4cEv4/DCwIcDCwIcDCwI5DCwhEBHIYQBKwf/GYYhBCwc/FoYKBFoYEBFoQKCE4RrBE4YFCHwQyBHAYnBJ4YFBcBN/AgcAPgYABA="),
+HA: image(62, 52, "AAP/wEH/gGCgf/gE/+AHCh4MB//AA4QMBCIQeD4ARCDwv4Dwt/8AeEgI4BDwkH/weFj4eEAgIeF8AeEAgQeEAgQeEAgQeEAgQeGMggeCMggeCQYiACQYYbCDwgbCIogbCIoZZDIoYTCMggTCEwn/CYJFDBYZFDBYYmDv4LBEwYDDg4aCh5JCDQYiDaIQWBNAQ5CMAYLDcgYmCCwgqCGIYTBFwL7EJIIWEAgPgh4WDNAPACwgMBCwiHB/wWEFwV/CwZVB/YWEDgPHXgYuBDwLbDKQPwh60CGwWAngGDgAFBkAHEsAFEAAQA=="),
+HI: image(47, 51, "//AAgUB/+AAoUD/4QDg/+AocP/gFDj/4Aoc/+AFDv/gFw8BwIuDj+DFwf/FwcP/4uD///FwQKB/wuBJwIFBFwM/AoP8//PAgP/+IDCAAJdBAAXwg4FDEoQKCIIIgCLoQFBKYV//5qDB4aMuF1YFDFwIRDUIQAC+YFE8YFE44FEw4FEUgn+Aon8WwhKBXggA="),
+HU: image(49, 50, "/4AEv4FE34FE74FE94FE+4FE/YFE/oFE/w0Dg//AocD/+AAoUB//AI4ngAod/+AFDn4FEj/4Aon8AocPAokHHgg2BHhYFDHgJCLJBZCEAopIFAoxIEAoxOEApc/AojSBbwplEAoZxBAocPAojICBQhBCGYIFDBYRZCa4P/NYQuCPoYFBSoZGFZYsPAgYABA="),
+HE: image(61, 43, "AAMH8AHF/4HFh//wAOF/wOG/AHEv4eFg//DwoOBDwgOCDwk//YeEgf/x4eEn/8n4eDgP/4AeEj/8DAIeCBwPgLgkfDYIeECYQeDh4LBIwIeC//wDIIeCBYJdCDwV/BwIwBDwIOBCQYeBn4pCDwRIBIAQeCMIJPD/AOB4CED4BhBMwf/MISbD/kHPovwj4ODDwV/UYhYBKQJ2DRoIGDHQINEcARCCWYgGEDwIOFgb+FDwL2EDwQGFIQoeCBw0YA40AA=="),
+HO: image(61, 54, "AAV/8AGEgf/Bwsf/AHF//AAwkH/wOFn/wAwkB/+AA4kP/g8Rg//AAngv4HFCYIAE/EfA4vAAwv+Eo3wn4HFwAGFJwZ5UgfAPIJzDn/x/+PEgR/BAoJzDP4N/8JzD//D/6KDFYI8BCwYrCCAItBPQOH/wWDCgIQBCwf/4P/wIWCCQIBDWgYBCZ4KJBE4LPDEYInBh5sBBgKLBNgQ0CJoIWB4ACCBgIiBBwP8EYU/TQLXBHQQECFAI8BCwIqB8DzCDYMPAgQbCMoI3BF4IRB44OBWwQUBv4TBJIV//InBHgQCBw4OBHgUH/EfNgKOCj0A3BsCQwNgeaSdCABA="),
+N: image(54, 50, "ggGFngFEgP+AwkPAws/AwkB/4GEh4GFn4Gaj///gNF/AGF4BEJAwITBgOAAwQTBh4GCnwJCCgVwLgRwMHAgTBHAgTGv4TEgYTFMIITEMAsHMBY0B+ClFCYiPFEAITEv//OIQMCTg3gBgggEDIIgDGYIgDMIJVDDAIABIIILCFoYYCJwZ0BHQgsBBgZnBBggnCKgYhBMIi3FgAFFgAA=="),
+WA: image(51, 50, "/4Ay4A3E/AFCh4GBAoUBAoPgAwU///8AoUHBgOAD4nwAoUf//+AoUDGRYSBGQYSCGQd/94yDh/9GQZFB34yDn/zGQcPAgYSCG4YSBC4YSNv4SKJYJwDLwISEn5QDS4QSDDAJjDDAJ2DGIJ2DUYQ+DQYKcFFYYXBDASOCGIQFDGIQRCDwTaCG4YFBEgbHHN4hiFg6HEA="),
+WO: image(50, 52, "/4AE34FE94FE/YFE/wYYGocB/+AAwd/8AFDn/4AocP/gFDgf/KovADAnwDB43B45EE+IFE/F/KAkfBgmHAonhAonwDAn8h4MEN5X/N4l/N4k/KwkfRwgoBDwcHOohoBOoYFBEgY2BEgYFBEgYFBJIYXBFQYpBFQZ3CAoIWCKoQQCGwQLDHgR8CAoQdCAoQvCOYYFFn5gENgKREbYgAGA"),
+RA: image(51, 50, "n//AAcHAongAon8j4GEwYFE+F/Aof+h4ME4IFE/BYr+4FE/wFE//fAon7BgpYE//vAon9CQo3Ev/gAocP/gFDgP/wASX+ASJgYSFXwJ2ECQivBDAoSEWIs//wFDbYIrDAoI+DAoIYDQ4IYCFIIABDALlDGIJhBewS/EJQQYCG4YkED4QFDD4JJF4AFDA"),
+RI: image(43, 53, "AAf/7/4AgMf/f/AgMD/9/8AFBv/v/gEBh/9/+AgEB/+/+AKBn/3/wEBg/+//AFX4q3v4qDh/8FQQPBz4PDAYQvBEYQvCEYI/CGYRPBB4cfIYQpBB4cH/5TCDwJjD/4kCn4EBCgN/AgIUBDoP/FIJHBAAIyCDIYjBIYYaBQ4QaBJoZHDAAoA="),
+RU: image(61, 53, "AAUH/wHFn/wAgUB/+B/+AA4UP/gBBCgd/8ABBAwUD/4BBBwcf/ABBA4f/4ABBHQg8FHQI8/HksYHgwYBHgkPF4I8EvwlCHwOAg4gBEYI8CCIQjBHgITBCIP+HgU/CwIRBDAIgB4AMCAgMfEAIMBDAIOCBgQYCIwQMCPYJTBAQI8BBwUHEoN/8P/IYN/+AvBj4LBBwOAj/7BwZGB/4ABBwXAAQIODM4QOFHgIOC/4OBh4OCAYJGBv4OCn4OBHgJKBAYJkBIQISBaIYhCCwIOBSoTqBJQISBeYUHd4U+bYUwcAYAKA"),
+RE: image(51, 51, "//AAocf/AFDgf/CQl/8AFDh/8AocB/+AAwc/+AFDg/+GX4ECgwyEgPgGQk+GQkP+IyDC4IyE//3GQc//gyDh//GQYYB8YyD//4GQc//wyDDAOBGQUH//gGQRvB/BlD/4DBGQU/CwIyCj4YBMoQkBBIIyBBAIYBGQIkBDAIDBGgIiD+AFBGoIyBv4eCGQIABJwQvBAAJnDEgTLCEgY8CIYLLDEgZVCAoZuBb4iaBfAj+EgE4AokAA"),
+RO: image(50, 47, "/4AEn4FE94FE/YFE/wYF34YS4A1BgIYB+A8Cv/v/gFCj4YBAoUHDH4Y/DEbglDBQ8CAAYA=="),
+YU: image(59, 46, "gP/AAX+A4M/A4fggEHAwf8BwIGD/4GBj4VFgYVGv4HDwEAh4GD+A+Eg46CAAf/4AGEj/4Coo6CCqJFBCot/KAIADh5QCQAhQBCrM/Myk/M3JQGh5QFMyIRBAH6NB"),
+YO: image(50, 49, "v//AAefAonnAon5Aon+DDA1DgP/wA8E8AFDj/4AocHDFZjfDCJjxDD5WE/+/AonvAon7PgoYX/g3DAAQ"),
+
+};
+const hiragana = {
+
+// hiragana
+
+A: image(52, 50, "gEB/wGEn/AAocD/gMcg//AAfgv4FD/wMYFIRNa54HDgYyCBgYsEBgX/+AGBHQYpBCQQaCh4JBJQPwgIdBBAP/wASB4H/j/8MIP8j5fBBIP/4P8gf+j/7/hVBj/jA4PH/C/Bn4RBv8Aj/3/Ef55FB/9/wI+D+/wj40BHwIWBL4QJB+BFBwAmB/4MBD4M/94MBD4JAB/4cBNYN/BgM//AsB/n/z4bBQgOHX4QVB/B3B/CQCAQTSC8BFCB4Q4CB4UAgIIBRQOAXojREn/gaIgAC"),
+I:image(58, 50, "v/gAgUggEf/AGCnkAg/+AwU/gEB/+AAwQZBDgcP/gcECQIcFCQIJCCol/4AGBgYLBj/wCokHCAIABFAIQCCon/DgQECn4cDCoItCAAI+BDggVCLoZeB+BgCCocPPQZUBwZdDJAQcEGAIcEGAIcEGQPDDghIBDggyBDggyBx4cBjxIC8aaCCAIyBLAMDM4IyBSARnC//HUIk/+IyBCASdBLAJKCGQOf/kDJQV/GQRKCJ4XgEYRPC/CoCDgOHNwl/8P/84jCDgM//5HCDgMHAwIjBgP8DwIsBQgYVBSQgVBaYZnCTIgtBbQhDCUAYkCfwYOCGIgAHA"),
+U: image(46, 50, "h//Aoc////8AFBAgIABgEDAofACwIAB/wWD//4CwgdBCIeAFQUfCwIADCwIAMj//+AEBv4tDAgQLBHAYFBAgf/8YFE54FECwRTB/wkCAoP7IAd/OgR2CKwcBQ4kH/hMEJYQcC4AWIh4WEn4tJg6EEj6EEVgIQDE4l/CAbABCAZqBBQgQDBQIQCXwIyCYYTIFeIhlCBQjxCLIQWBMgbdFvzYJ"),
+E:image(55, 50, "gF//4GE/4AB+AFBgIGC/+AgEDAwYNBg4FC/wGBh4GC/gGF/ArFFIQAD4BRVn42FLAIGEJQYGBLAhEBLAhEBLAf/8ArDBIIyEj5fCRYZYEEgJYEN4JNFDQouFDQKcBFwYGFMIIGDLQRJFAwgaBOYQuC8Y2DFwODAwcP/0HXAc//EPcQnAj5LCPAU/MwR4Cv5ECPAQ9CLoUBd4auE/guBVwf5PARaC+5qCAwXnJwSXB//HI4QGCw5ACAwUHNIn+gj/HAAg"),
+O: image(54, 50, "gEB/0AggGCg/4gE8AwUf8EA/gGCv+AB4QaDv/wDQn/CwIaCgP/4AaDgf/wAaCgPn/4PBAAXv/0HAwef/kfAoX+n/4v4GCAgPxCYfg/4jBAAWBGwQ1BgEDJoJQCJoJRBLYcPCAJrCgEcKAaGEHgSGDF4QPCJYYxCHoYMBn5YDBgoGBDIP8FQKiBDwabBFoIzCv/gEAJQCMwWfKAIbBh58BDQMH/l/4IaCh/xTgIaCn/P/BrD/8/4CGD/i3BDQfz/gaDv/P+AaCCAIaEHQQaDv/hGoV4h//g4VB8JnBa4ePZYRkBBwKNCbwPwCYR/C44CB4BtBfgSaD8ACBYQQWBAAYA=="),
+
+KA: image(55, 49, "gEH/AGEh/wAwkf8AGEn/AAwl/wEAhgGC/4CBngCBgP+AQP8AwMDAYIyDAYUPAwQ2CAwY2Cj/4gP/AAP4j/wgYGC/gGBg4GC/0/8EPAwsfCgd/4E/Awt/FIf/LgJmBE4IGCMwMf8JjBHwIPB4IDBgZmBv+DAYMHMwP/BQRfBOwIKCL4J2BOIQvBAgJxCGQIEBHAKPCCwIYDCwQBBQoRGBviIDIQJRC4AdCXAYdCKIcHboQ/CboY4BboghBboZKCFAYhBjAoDh/8nzME+CfBF4V/RgP/EgKVBwYGBFAMH/zIBFAQeBAwIoDboRRD4DrBJQUHAQJsDAAwA="),
+KI: image(48, 50, "AAMB+AFDh4FL/AFDg4FIn//AAX4ArpHC/xNEAov/LQgFCDgYAlF4UfPx8/g/8CoQbBKgQhCAoMDFAkHAoeAh4FEDgQAB4E/FgIUBwE/HwQdBn/gAoM+AoPAAoMMAohFCAqIpCgI7C4BEBI4oICAoZfE4C9BAob2EAoISCaQgACA="),
+KU: image(33, 45, "AAsB4ADC+ADC/wDBgf/wADMg//CYIDDh4DDD4UfAY/8AY34AZRDCh4DCg4DCgYbCgI/CgH/BgU/BgREBBgIQB8AMCFIRNDLoJ2Cv42DJwQdDFQIdDFQQdDFQIdDHYRkDgYhCgADDnwDChyzE"),
+KE: image(50, 49, "AAUB/0Ag/gAwN/wAICgEfBIIIBB4P4BAYPCh/wDAcD/gYE/4FBDAU/4AYEGIgOCDAQOBh//AAP+v+DAoX/7/AAof3+E/AoX9/gYD/9/gYFD/4YE/5QCGIJQDHYRvCJQU/N4JKCKAYYCKAQYWmAYEjwYEx6lDh/zUocDMgIYDv6cBKgUf/4yBBAMH/4eC4EBNQUfAQN/DYMPE4TjCAQQkCYgSJBDYLEBn7QCAQIbCE4UDDYP/PIV/CgLpD4EPP4UH+AkBAoIACCgIADh6LCAAMDAoYA=="),
+KO: image(52, 50, "h//AAX+gAFD//gBgn/BgvwBiWAAon4GwUBDIQACCQQFCn//4AFCg4lBCQc/DwYfBKQJdEDwYAB8CIihAFEgJJDIgQFEg5KEMgITEj/8D4hwED4JqEOIIfEv5eEg4fEFg0PHIwsEBigmFCYkOv65CJYPnbgn+ZgIAD8IMFewvgCYjRBE4IMDegQABIoUfAoK7HA=="),
+
+SA:image(51, 50, "AAMB/gFE/+AAwcf+AFDgf+DIl/4AFDg4fEgAfLgIfCj//AFQzCn/gLJYMELI5mEh6GGBgUHGAP4CAQ3COYILCBgUDIgYZBAoYmBn5REDwPgQQPgDAIVBj4fBJ4d+CQI1CgeAXhgSDKoYSEQQp1GQQpFBawXwD4IGBg42BaQngBgRlDBgmABgjzBRYZDCPIYvCv//MQoACA=="),
+SI: image(45, 50, "v/AAgUD/wKDj/wAof/wAECg/8BQc/8AbD/4bE/AbEFgcHFgk/FgcBFgkPDYhIgFgIKDFh8eFgn+FgcH/4sDv+/FgUD/osDn/vFgQ2BFgcf+YsD/+fFgUP/gsDv/HFgSKBLId/8IsCHgIXBSod/EIIKBwIhCv/4h4WBAQOAv/+IIP8AQIAC4AYBAAIkBn4KDJQIKDCwYpBCwRWCAoJhDAoK1DAAg="),
+SU: image(52, 50, "AAUf8AFDgP+BjH/AYP/AAnvAon+BjJAUgf9BgZFB/4MDn4kEg4MFGIwMED4QME+E/+AyC/x0DFgPABwIMC/gMGDIn8gYMFv/4EwcP/+AKYf/BgRACBgYRB/4mCgF/AwJ6DBgoTCRohNDTZE/VAkP/gFDE4PAUQhGCI4YeEUIgYBD4gMBEpI4GgIFEAAo"),
+SE: image(56, 50, "AAcP/ADB//AAwP8AwkHA34FBAAn+A1JalmAGFvinFv4GF//PXghEBAwfBAwoNGEQP/+AGDn4GFh//8AGDg5PCgF/AYP/wAGEgj/CAwQADAw4mCAwZCCAAQ8BFQgGBAAQGBj4GFJQIGEJQIGEgYGFGIIGCIQQVDHQgACA"),
+SO: image(53, 50, "gP/AAXggEPAweAgF/AoX+gEDBgfwgEfCYoFD/EAg4MFAAQMCAAQwBBhQpBJQozBAAU/IAIACIYJUBAAV//gsJD4IsEn4sEOAn+NIn/+4FEAA39AwvvAwqQDAAP7UYhmCx5bDuBVB4BCDg5bEJ4JoEgJ1EEQKCESwIFEg5vEEA4TFh4TFv4TGYgiLBCYrFG/5dDd4YHCOQKkBDQjbDDQQwDWgR5DAwSGEEAgAEA=="),
+
+TA: image(52, 50, "gEP+AGE/4Mjgf/AAXAgE/AoX8BjUAgP+GYkf8AFDBhHnEIQMBEQQhBn/jFAWAgYMD/AMH/gMF4f/F4UH/kQGYd/KIIACg4VBBgmAQ4gMFUJcB/8DDQZgBv6iD/wuEn/gKIJGDEIl/4KCDC4KPE/+BBgYXBBgY5BAIImCj4MBTIKFB/wMBAAKSB8EPAwXnUYIMDCwLYD95RBEAIZCFQN/AwPBKISpBwEGQAgAGA=="),
+TI: image(51, 49, "gED/wGEv/AAocP/AFDgP/CQk/8AFDg/8Bgn/wAFDj/wBQYAqJ4M/LBZrMJYZ+Ch5aDv/f/4bCBQIABCoMDHAYTBv4+Ej4MEg4DB4IMCAoIcCwE/TwU/+ASBEQI8BVQJLCv/gS4cP/kBMgYWBjyoEgLbJEYYSCQQkHCQg2EHASCEv4SBgYOBOQ70BQoYrBEQIABFYR/DJASRED4YFCBgJDDA="),
+TU: image(59, 45, "AAUP/4FFAAIGCAoX//EAg4GD//ACYYAB/kBAwgOBn4OFDgoOBAYX+BYP8j4GBwEAAgPDGwQ+C/F/BgIABCwOMLQl/+AGEg/+NIv/8BwF/gGEKwIqDAAM/HAYzDEhkfEgsDEgxJGh5JFHQPACqQrBCpkfCopXBCogcBCog5BK4jSCAwxtDDYK8EZIQcCAoQcDCYTjCJgQGCEYT0DIAYGGEgQGDEgRcEv5UEA="),
+TE: image(57, 50, "/4AFv4GF34GF74GF94GF+4GF/YGF/oGF/w7Cn//4BCDAwOAAwpQEj4ZDAxP8AyUPAwwiFg4GMgZFFAw0BLQqlBNAkAv4GG8AGEn/wKgv4KhZGGHALeGH4oxNh4xFOJBjGEYt/VQwVFg//BwhOBAAI7Dv4GBHYYcBCwgcB/5CEDgQyFGYgrCUwkPKAwAC"),
+TO: image(46, 49, "gEH/AFDj/wAod/4AECgP/Cwn8C0cICwcDBoIWC/4NBCwMfEgV/4f/BoIWBv//LAMH/4AB8AWBAoWAgE/BQYlBDYUAh4FBHwQPEEIJQDFYJhCgYwCLQQqCDYQKDDYIKDn5xEEAYQB/x8JDYkDCAkPYIk/JoQWTAol/AocZQwR6B8aNCAAOPAgf+TIZqBAongT4QfCBYY9BW4R1BA="),
+
+NA: image(55, 49, "gEP+AGEj/gAwk/4EAkAGCv+AgAPD/8AgYdCgP+EgkD/gdB/AGBg4DBv4GCj/w/wGCv////8AwQFB//4AwMBAwXwEQMDAwXgAwMHAwXAAwMPAwWAG4QvBLgQGBL4X/AwRfBKgIGCL4X8n/gLARUBn5YDMwM8NQaLBQYIoCAQSIDAQRZBRYaBDRYQhBFAIJCKIYyCDwKoBToZkBOAIJBPYKLCGwMH/h2CAwMfKoKKCI4PgSIYYB4afDJQMP/gpB+AhBMgIjB/AhC4EfAwIhCEoIGCwJdBaIIZBMgSkCjhMBgakBG4LICUgKDBAwQuBPgRKCjgGE4EQAwgEBAAIbBRAQACQgIDB"),
+NI: image(50, 50, "h+AAocD/gFDgP/CQl/4AFDn/gv//AAOP/E/AoXj/0HAoX4/+BAoX+DAuf+EfAoXn/gYD/P/gYEBG48f+AFDg5QMMYkf8BvE/BvE/wYE/4YEKAIYYgZSCDAMBJgQYCCgYDBFoYDBj4tCDAJlDDAMBGYYYBNYYYBn4xCg/4h6ECPgIHBPgfBDwaVBQgYvBToYYCFYauBaIIwB5/wcAfz/0PAoX8cAn/IgQFC55dBAoXxFILtC/grBGgL5BYIoAGA=="),
+NU: image(58, 50, "AAV/4AGEj/wAwkH/gGEgP/Aod+Dgv/wAcEj/gDgkH/AcEgP+Dgt/Dg3wn4mBHwYGBDAIyCAwP/8AGBAoQODh4GC/4sBgYGD/AcCAAO/IQQcC4IkCDgI7Bj5YBg//w/8EAIjCwIEBv/gMQPgLAMPFYP//h1BgZpC/4LCNwIxB4YoBFoIxB/AjBNIMH/v+n5UB/4qBn/fIoIJBv+PLYUPQwPhOIUD/gvBGYMH/3/BAX/457CBAP/84GBDgIlB/YGBCYJwB/qECDgKREwBCC34YBDgfvLYP+HIM/+YYCIwM/MoIYB/hGBMoQEBz4nBKQfDAwODGQXwKQQMB/P4j4GBAQP+ngtBUgIRBg6aBRwKiBwOAf4TNBAobjCAogAEA"),
+NE: image(57, 50, "gEP+AGEg/4AwkD/gGEgP+Dgv/Awt/wAGEn/Agf/BIUf8EP/40CHAMf/4tBAYP4AQImBCIP8n4GB4EH//+AwXgEwP/v4CB/EBAYIPBg4jBAwX8BYJFBCQRKDFYIGBJQJxBIgUfAQIrBAYMPCAIfBBQR8CAwR8DMAZ8Cv4GCGIQGDGIU/AwR8BAwKqCWoU/FoS1Cj4tCHASEBWogGBUAQKBAwItBHARpB8BlBBQKuCAQIKBO4SqCBQX8AwX4h/9/wGC/kP/n/DYSlCv+P/ArB4K+B4/4SIV+j/jWIX8n0P+JSBDoMOMwJWBAwOCMwM//ZOCMwI4C75nB/5bC45nBv+DAwPhTgXAb4PAoCfCQQifBYoYAHA"),
+NO: image(60, 50, "AAX//4GEv4HFj4GB/wGCg4GB//4AwMBAwX/4AcEDwcPAwYWBgYGDCwQVC54tCCoX8F4PgFYP4CYI+BgE//0P/gaB/ARB4F/4ApBwAVBg4OBj/8EgITB4AiB4InBBwQgBCAIOCPQPjD4MPJ4MH/0/+ALBwARB84kBBwQ0Bv/gBwc/+5bBj5tEHAR8Bn5lBBwInBBxY2CBwcDWIQOEGwIODJwIOFIoRKC4CNCBQP3AgKwCDIIOBKIQKB8/8IQJgBj4OB8E/MAfD/ytBEgX8J4KeBZwWDIgJCBCoP4ZgIzCAYIqBeYRQB8DnCK4gGBGoIDBwAyBF4IKCCQWBAwIVBEoPgF4RFBg/4F4Q2BAAQOBTwIADHoQADbIQAIA"),
+
+HA: image(55, 50, "AAd/wEAn4CBgH/BIXAgEB/wJEgf8AQIJCg/4AQIJBgEP+ACBBIMAj/gAQYsBEoIoCGwf/GwkB/8P/4AC4f+j4GDw/4n4GDj/wv4FC/0/8AMD/l/4IGD/H/wYGD+P/g4vELARtCMQRtDMQQKDL4YKCMQQKDMQQKDR4QKCTIYKCFYQ2bOoI2C4BgCGwWASAQ2BGQKJC8DNBBAIAB+DNBPYf4ZoKrDAgPwT4K7BAwRdBB4K3BVYIqCVYY6BAwKrB/0DVY3+v/hAwf8n4SBdIXwnxEBAwXgnBEBAwShBO4IbBSYSVCOYQAHA"),
+HI: image(57, 50, "AAMPwAGE//gAocf//wgFwgEH////kH/AZBAwP+gf+Bof/wP/gEDAwWAAIMBAwc/FgIGDj4sBv4GBE4P8HAIdBE4IqBAwYgBKAIGCKAYKBAwN/EYIGDn4jBAwZfBDAQfBLIPAAwZZBDgItENYN/CAIfBIAIGCLIRfDLIXwAwc/RQJmCHAPv/0PEoI4B+f/AwcH/P/w50D/l/wZ0CgP+j/BK4Q4Bg/gJoQ4BwIGBIwU/4EwAQI4CIYICCAYY/EJQMHHATcCbAQKEHARGBGgQqBCIc/D4IGDaITCDT4PAAQJfCQQRYDeQQGDSIIGEYYIGEE4IGEDgYFCcAQ+CGQZsCABAA="),
+HU: image(58, 50, "gEP/AGEgf//wHE/4ABAwc/AwIPDh4OC8AGBg4GCEwUBAwX8Dod/EgoHC4AsF+BJFjAGDg4iEFgRfF/+AAwk/IwQjDFIgjDvAjDMYJlCgRHB4ABBFIUf/ABBFIXH/0HCoUf+BcBLwQpBCogpBCYIVDv+ACohNBn/wCoRxBCohNCMoIVBOIQVBAIJNCCAIVCEYIQBCoOAb4QtDCAQtC/gjCdIIXCN4QwBC4SVBDQIXBEYUP/gXBI4QEBHwPD/8ODgR/CwZNCCYN/8P/5/4GQOf+DtBKgXv/jtBKgX5/0PAwJxB/0/DAL8CvkDJYP/IYMMgFgg//fot/VYQACgYGFAAoA=="),
+HE: image(67, 45, "AAXwA43/4AHFn/8A4sPCA0B//+CAt///gA4kfCA0H/4QGA4IyFn4IBGQg5BIYsD//nCAt//F/CAkf/wzBCAYFBwH//BaE8ArBwBzFCAgNBLoQQCHIPADYIQD/6dBCAk/OQIQEHIQQEHIQkCCARaBO4YUCSYQQDHIQQFHIQQERQgQCLQQQEHIKBDCAPAn5fDCAP8gbNECAaJDCAbVECAPgvj+Gg72GdoqYFCAgHFKIoQDDA0AKIjODDA0ARYQAEhwHGAAIA=="),
+HO: image(53, 49, "h4GFv4FEg/4kAGDn/D/4ACwP+j4FC/kf+IMD8H/w4GDEAM/AoQEB4IMD4f+g4FCEoPwGIXggH/wEAgP/IIP8KQX4B4PAKQXAgP+AoMDAYMPEAQkC/+DEIIkBEAJVD/8/8IFD/P/h4GD5/wv5IDv+DBgfz/gTEz/gCYf4KIIABGgRRBLIZVDNIJVDNIRVDNIRlBNIZlCKwIDC+EDGYJpCwClCNIQMCCYIwBBgX8GAIBBJwRIBPofwJAIeBLwKCBBwIiCx/4H4IVCv/BFYIFB/f+KYIMCx6RD94YBwLfDwYTBGYV8LgJICgI5CBgUCgaGBLYQACAwLVBgA"),
+
+MA: image(50, 49, "AAMH/gFDgP/Bgl/4AFDj/wDBsH/4AD/oFE/9/AwoARJVXhAon4JQn+j4MEw4YLn4YEJTIfCAooYCAoX4DgQwCwBdEBgMDHoYMB//3Bgd/8AUC4A7BJQP//kHBwQGB4JYBFoX8KgMP/gGBz/+h//AIPjGAXA//wAoXwh/4DgX4gP8IgQnCF4QFBgOAEIKIEv6SCAAIA=="),
+MI: image(58, 49, "gP/AAOAA4V/AwPgAwUfAwP4AwUHAwP+DjAABgYcDDwYcDDwQcDDwQcFg/8gAXDDgMAn4XDv/Ah4XDj/wGgkPDgpQBDghPB+AcDMoXjDgQGCNwZsCNwYGEDgM/AwYcBPQQAC/kP/4IEw//MgIYC+f/wZHBCAP8//AGwMDEgKGBRAQVBz/4NYI2C44sBNYMP/PxFQI9BAQMY/+BFQKvCOoIsBEYKSCFQU/SQP8WYQCCGYIqCEwI0BFQQmBMgIDBJwOAfgXAAYItBRAJVCKIIVBAYN/FQIYBAYN/FoIrBTQSzCdgRfCAAg0BAAkfbwQACgY4BAAgGDA"),
+MU: image(55, 49, "gED/gGEg/4AwkP+EAhwGCj/ggF+AwU/4EB/wGCv+Ag4GD/4kBAwM//4AB84GBv4GC54GBAoX/x/+gIGDh/+gYFC/0P/kHAwX8AwMPAwX4j5cCGwJOBAwJIDj5jBv4QCAwIpBNoU/+AiBNoIGCJYJtBAwPhFwPANQXjAwOAgEEv+P/A2C/H+CoI2BTIIhBwY2Bh/xwH+UgUf+CwBUgSgBBYKkCn/gh/gToI1B4Ef4AvCBIM/4ZmCIAN/44oBSgKdCFAJ3CLAY0BUgQoBGgIGBEIUPAwSID+AGBQIZHBJQRECd4Q9DI4QvBJwQ2Cj4sBGATRBJwLcDFgTcDC4QGEEILqEAwIbDIARoCBgQ"),
+ME: image(55, 49, "AAUf+AGEn/gAwl/4AECBQP/wAYC4EB/4YDwED/wYDwEH/gGCCIMP/AFBgIRBGwcDCIN/GwUH/EP/4bCDAP/AAI2C+4GCHwMfAoX/JgM/AwYjBv4GI8YGCFoN/wIGBgYCBFwIiBHYJfBNAPAn/8IwIGBwAaBh/wAwOD//4R4IfBg//+B2BDoJKB+AoBg/+JQPjOwMP/n/z/nQIMf/IOB76BBn/3/gVBMgN/94nBOQX/7/gAwKbBOwSOCHoJMCEIMH/v/CAJxBh/7/hcCF4X4KYLEC5/wj5KBEIOfGwJRCL4PzF4V/JIQvBCYJJCH4JxB4AGB/xCCFQIJDDoIMBBIRNBAQJdCIwKUCeAb5CPgQACSgIFDSgIDC"),
+MO: image(50, 49, "AAN+Aokf8AFDh/4AocD/wSE/+AAod/4AeE+AFDg/8CAf/AAX8j4FD/8HAonBAonwDBY3OKwkBKxc/N5M/GwcHh42D3/DAofn/AFD/P+DAf+v/PBgeP+YFD8f+NAuAG4axBU4ZaCKAUBOAJQDOYIYE+AYEVYKFCDAaICDASICDAsPDAQxBgYYBj4rBAoOAYQPwPQPgE4JYDRQo6BAoglBPoQ0CAogMCAoYvBIwQA="),
+
+
+YA: image(53, 49, "AAVgAYUf4EPAoUB/8B/gGCg/4j/wAwU/4F/4ATDgf/BgUP/EPDQYRBn///wTBAQP//4OBCYMfAwP4CYPPAoP/8AnBAAeAh4FD/gMD/n/+ALD8H/z4EB/v/wf+CIUH/kP+4+CLoN/CYJhBCYmAgfwCYP7CYMeIwOcOoYiBBAOAPYXggZuCIwIrCTgQrCCYIMBFYP8gYZBC4Mf8B3CTQIPBQgYwBg4MDGAKYBGITABBgZnCL4QTCj5EFAAbUBAwgTBAoYTGYAITFcwQTPfQYTCTAITYMAQTDVgUAA="),
+YU: image(51, 49, "AAV/4AFDh/4AocB/4DBj/ggE/AQMD/0Ag/8DgWAgH/AQMP+ASB//AgISBAoIDC4Ef///+ASBh4FB/4SBgYFC+E/4IFC/8H/F///9//g/8f/3/x/+j/nAQPwv/j/H/wf+I4N/KAJlBv+P9/4MoMP/f9/xlBAIIqBwAUBn/vFwIdBg40BNIIOBIIR7B+BbC8B7BKoX4uAyCAwM+GQX5//f8IyCn/z/hHCK4N/4/8h/8/4EB/4lBF4P/z5wB8f+RYJjBPoPAFwO/BQP4IQX/wJkCTAUfVYf4gf4BgS4BbQRiCcgbSCAAILEcALkCAAM/DoYeCC4ZLBfoIeD/ASEDAhoBAoYlBDwcAg/AAoY"),
+YO: image(49, 49, "AAMP/AFDg/8AocD/wFDgP/DAn/wAFDv/AAoc/8AFDj/wGCH/AAIwDAAImCAoQmCv4FBEwU/AoImCj4FBEwUPAoJXCMO4wEM4IWDI4IwCKYQwCL4oFCDAQFDCQIXCNgQFDEoMP/iSC+EHEIJ5CAoSSCwYaBEwXhFoMf8Y4BEAJnBCYN/+Ef/AuBz41CLoPPUQd/4YFDj/AAocD4AuBPIXgDQJ/En6REA="),
+
+RA: image(47, 49, "gEP4AFDn//Aod///wAoX///+AgMDAoP/DIMHAoX4AowjC//gh/4gIXCj4mBj4wBn/gEoP8GYI/CvAzBwAFBkAaBIgYTCAAUHGARcCJ4YrBFAJcD4AZDFAI/CFAMPJYQOBK4XwLgZdBJwIFDMIQFCQod/+AIBOIXzO4nnRIQRB55dDDYJdDHgQEBIgM/OgUD/0+Nof8jBtDOYk/OYgyDYgQhCPwLOCFoQ4DMwIcCPYSBCAATkECwKBDCwIVCFoQFCIgSNCHASNBGIQA=="),
+RI: image(39, 49, "ngEDv+AAgX/AYUD/wGB4EH/EH//wh/wn4EBj/h/4EBn/HAgV/z4EB+P+v4EB8YCB4F/8//E4N/54VBFgIWB4AEB346BgP/v/8AgP+//4IQP9//ggBABC4UPAgJRBj4qCgBKBC4IwBF4QrBDgQrB/5vBgYcDEwIcCEwI5BEwP3EIU/94hCv/fEIImBn4+BRYKWCg/8EwSLBTQU/CwScCUYSoDj4zCBoIzCHoIuDKARjBJYJUCQAR7DQAQbDEASABbgU/BATqE"),
+RU: image(51, 49, "gf/AAXAgF/AoX8gEPBgeAgIFD/EAn4MEg4FD8EACQoACn4lBAAUf/4FDDYOAAoQuBHwIACv/wDwgkEh/+DwoFDDw5ECDwRLDMwg5BLIZMBNgh/FGgIeB+AVB4AeBEYJmBBAJQBDgPBOocf/AoCVIU/Kwc/+5WDg/+Kwl/5/wh4mBh/4/A2CFgMOAoJDC8GBMgUHGAJQCCQKpCBgISBgf+SQMPCQN/4H/4YSBGIIwBCgMBDoTMCn/AEIROCLoKFEAIJvBTwZvCTAarFNIQFCXASyCYoYxBAoQ"),
+RE: image(55, 49, "gEf8AGEn4GFv/AAwn/wAFDgP/BgkD/wGEg/8DoIkCh/4gf/+A2C+EPAwV///gAQIGB///4ICB+AuB/+PAQPgg4DBn4GE/wSB//AEoIABwABBj4FB/hODA4PwJwYgB4BOCHwROCNoQDBJwJtCLoM/PwJdBPYN/AQMPEoQvDDQMBBIV/DwMDF4QhCg4QBEIIlBh4QBLIIlBWoRRBWol/F4eAIYIlBMwR7BEoQQBUIYvCNgIlBF4SBBEoLsBHgI2DSwP9GwaWB+ZmEj/HGwIvCj+PFgKWBjk+RgSWB/E4Lgn4sBcCIII+CGwTjDWoZFBSYYRBYYgDBYYa5CLgIGBAAI"),
+RO: image(50, 49, "AAf4gEB/4AC8EAv4FC/kAj4MDwEHAofwDAgSBDAoACn/+AocfAokP/4FDE4OAApED//AAohJBAAI5BAocAIQIFEHghFCD4QFCBoU/KIQMBNQZ9BOAhOCQYYFE/B8CE4QFBM4JGB4YuDj/7AocD/xIE/+fP4c/84FDh/8QoZyBj5mE4aFDn5yEDAIFDGIIFDIgIXDDwKREv4eEv4eBiAFCDwMH+A8BIQLnEEgLnDSooqBQYQFCDgQ2DAoolCJAQA="),
+WA: image(54, 49, "gEf+AGEv/AAocB/4MEg/8DUv///Aj//wEDAwIcBAwMP//8BgIGBn//+IFBAwICB54GCDQQAC/0HAgXAn45BD4IDBn45Bv4MBAYPgGYJKCFAIbB8EAgf+DQRbEv/4LYYaBOQU/4EPCwIhCCYJrCgf8CYkP+BlBCYQaBv6GDOwQaECYIaEKwIaD4JWDgP+CYIaCg/4NQYTB8Z+BFwef+4aCMgN/74aCn/z/zXCIAOH/IaCh5CB44aBJoU+a4QyBwFwDQLGBCAOBX4adBGIJMBRIQaBUYI4CDQJnDFYJ7EDQKzCDQYECgA="),
+WO: image(52, 49, "AAMf+AFDgP+Bgk/8AFDgYMM/gkD/4AC+EBAof/BkA5FhEAg45Cg/AgF/AQMBBIMP/4DB//gE4Xwn5dBn4GB74IBgY0Fv4FD8AfBAoYfB/gbBIAIiBg///A7B/+A/4rBCQIxBBAISB/ghBCQeBEoIMBCQI0BBgQSCDIYSB54MBgIlB+AMCj0H/0PBgIABHQQMBOgP4BgZBBBwTDCMYIMDKIIMRWQQmDAwUMYYqyBAoaxBN4IMEV4QMCcggMBWwbZCAweA"), 
+N: image(54, 49, "AAMHAwsf8AGE/+AAocD/wTF+AGEv/ACZUP/ATKgP/CYv8Awk/IQgTBIQkHCYxCFCYxWTIQxWGFAhCBAwkPAwJCE/5KDCYQiBhhCBAwJlBn+Aj/+/49BDoP/8IDBgf8IQIDBKgUf/EPLAJUBv/gn/AFgKZCAIMHCIP4DQSXBAIIaC/+BCIIaBYwKZCLwIuBCYLRCFwIKBEYX/CYUfEYP4TIRACCYQ+BwZUBDwIYBOgITCRAQVCEIP//0BYISjB+CtDUYRNBAwQ5Bg7gDBQIA="),
+
+};
+const keys = [
+  "A","I","U","E","O",
+  "HA","HI","HU","HE","HO",
+  "KA","KI","KU","KE","KO",
+  "MA","MI","MU","ME","MO",
+  "NA","NI","NU","NE","NO",
+  "RA","RI","RU","RE","RO",
+  "SA","SI","SU","SE","SO",
+  "TA","TI","TU","TE","TO",
+  "WA","WO","YO","YU","N",
+ ];
 let kana = katakana.KA;
 let scroll = 0;
-
+// const keys = Object.keys(katakana).sort();
+// console.log(keys);
 let hiramode = false;
 let curkana = 'KA';
+
+console.log("StartupTime: "+startupTime.diff());
+
 function next () {
-  let found = false;
-  for (const k of Object.keys(katakana).sort()) {
-    if (found) {
-      kana = hiramode ? hiragana[k] : katakana[k];
-      curkana = k;
-      return;
-    }
-    if (curkana === k) {
-      found = true;
-    }
+  const off = keys.indexOf(curkana);
+  if (off !== -1 && off + 1 < keys.length) {
+    return keys[off + 1];
   }
-  curkana = 'KA';
-  kana = hiramode ? hiragana[curkana] : katakana[curkana];
-  updateWatch(ohhmm);
+  return keys[0];
 }
 
 function randKana() {
   try {
-    const keys = Object.keys(katakana);
-    const total = keys.length;
-    let index = 0 | (Math.random() * total);
+    let index = 0 | (Math.random() * keys.length);
     curkana = keys[index];
-    kana = hiramode ? hiragana[curkana] : katakana[curkana];
   } catch (e) {
     randKana();
   }
 }
+// const bench = benchStart();
+// console.log("-->" + bench.diff());
 
 function prev () {
-  let oldk = '';
-  let count = 0;
-  for (const k of Object.keys(katakana).sort()) {
-    if (curkana === k) {
-      if (count > 0) {
-        curkana = oldk;
-        kana = katakana[curkana];
-        return;
-      }
-    }
-    oldk = k;
-    count++;
+  const off = keys.indexOf(curkana);
+  if (off > 0) {
+    return keys[off - 1];
+  }
+  return keys[keys.length - 1];
+}
+let color = 0;
+const colors = [
+  () => g.setColor(0,1,0),
+  () => g.setColor(1,1,0),
+  () => g.setColor(0,1,1),
+  () => g.setColor(1,1,1),
+  // too dark
+  () => g.setColor(0,0,1),
+  () => g.setColor(0,0,0),
+  () => g.setColor(1,0,0),
+];
+
+function nextColor() {
+  if (color + 1 >= colors.length) {
+    color = 0;
+  } else {
+    color++;
+  }
+}
+function prevColor() {
+  if (color < 1) {
+    color = colors.length - 1;
+  } else {
+    color--;
   }
-  curkana = oldk;
-  kana = katakana[curkana];
-  updateWatch(ohhmm);
 }
 
-const kanacolors = {
-  A: []
-};
-
-
-function updateWatch (hhmm) {
+function render(hhmm) {
   g.setFontAlign(-1, -1, 0);
   g.setBgColor(0, 0, 0);
   g.setColor(0, 0, 0);
-    var whitecolor = false;
-    if (curkana.indexOf('A') != -1) {
-      g.setColor(1, 0, 0);
-      whitecolor = true;
-    } else if (curkana.indexOf('I') != -1) {
-      g.setColor(0, 1, 0);
-    } else if (curkana.indexOf('U') != -1) {
-      g.setColor(0, 0, 1);
-      whitecolor = true;
-    } else if (curkana.indexOf('E') != -1) {
-      g.setColor(1, 1, 0);
-    } else {
-      g.setColor(0, 1, 1);
-    }
-    g.fillRect(0, 0, w, h);
+    const whitecolor = color > 3;
+    colors[color]();
+    g.fillRect(0, 30, w, h);
 
     g.setFont('Vector', 50);
     if (whitecolor) {
@@ -199,9 +228,9 @@ function updateWatch (hhmm) {
     }
     g.drawString(hhmm, x, y - 1);
   
-  drawKana(4 + (g.getWidth() / 6), 60);
+  drawKana();
   drawMonthDay();
-  Bangle.drawWidgets();
+ // Bangle.drawWidgets(); // :? always draw?
 }
 
 function drawMonthDay() {
@@ -222,20 +251,47 @@ function getPhoneme(k) {
   }
   return k;
 }
-  
+
+var ohhmm = '';
+var ypos = 0;
+var xpos = 0;
+var zpos = 1;
 function drawKana (x, y) {
+  if (!x) {
+    x = 4 + (g.getWidth() / 6);
+  }
+  if (!y) {
+    y = 40;
+  }
+  x += xpos;
+  y += ypos;
   g.setColor(0, 0, 0);
-  g.fillRect(0, 0, g.getWidth(), 6 * (h / 8) + 1);
+  g.fillRect(0, 30, g.getWidth(), 6 * (h / 8) + 1);
   g.setColor(1, 1, 1);
-  g.drawImage(kana, x + 20, 40, { scale: 1.6 });
+  x -= ((zpos) - 1)*50;
+  y -= (zpos - 1)*50;
+  kana = hiramode ? hiragana[curkana] : katakana[curkana];
+  if (guard) {
+  g.setColor(0.8,0.8,0.8);
+  }
+  g.drawImage(kana, x + 20, y, { scale: 1.6 * zpos });
   g.setColor(1, 1, 1);
   g.setFont('Vector', 24);
   g.drawString(getPhoneme(curkana), 4, 32);
-  g.drawString(hiramode ? 'H' : 'K', w - 20, 32);
+  if (hiramode) {
+    g.setColor(0.2,0.2,0.2)
+    g.drawString('K', w - 20, 32);
+    g.setColor(1, 1, 1);
+    g.drawString('H', w - 20, 32+24);
+  } else {
+     g.setColor(1, 1, 1);
+    g.drawString('K', w - 20, 32);
+    g.setColor(0.2,0.2,0.2)
+    g.drawString('H', w - 20, 32+24);
+  }
+ // g.drawString(hiramode ? 'H' : 'K', w - 20, 32);
 }
 
-var ohhmm = '';
-
 function tickWatch () {
   const now = Date();
   month = now.getMonth() + 1;
@@ -245,28 +301,126 @@ function tickWatch () {
   }
   const hhmm = zpad(now.getHours()) + ':' + zpad(now.getMinutes());
   if (hhmm !== ohhmm) {
-    randKana();
-    updateWatch(hhmm);
     ohhmm = hhmm;
+    randKana();
+    render(hhmm);
   }
 }
+let guard = false;
+function hiraPush(d,dx) {
+  if (guard) {
+    return;
+  }
+  xpos = 0;
+  ypos = 0;
+  zpos = 1;
+  guard = true;
+  var count = 2;
+  function paint() {
+    count--;
+    if (count < 0) {
+      guard = false;
+      xpos = 0;
+      ypos = 0;
+      zpos = 1;
+      render(ohhmm);
+      return;
+    }
+    zpos -= 0.04;
+    render(ohhmm);
+    setTimeout(paint, 100);
+  }
+  setTimeout (paint, 5);
+}
+
+function hiraSwipe(d,dx, dostuff) {
+  if (guard) {
+    return;
+  }
+  if (dx) {
+    ypos = 0;
+  } else {
+    ypos = (d * 4);
+  }
+  xpos = 0;
+  guard = true;
+  var count = 2;
+  function paint() {
+    count--;
+    if (count < 0) {
+      if (dx) {
+        curkana = d>0?prev():next();
+      } else {
+        if (dostuff) {
+          hiramode = !hiramode;
+        }
+      }
+      guard = false;
+      xpos = 0;
+      ypos = 0;
+      render(ohhmm);
+      return;
+    }
+    if (dx) {
+      xpos += (8*d);
+    } else {
+      ypos -= (4*d);
+    }
+    render(ohhmm);
+    setTimeout(paint, 5);
+  }
+  setTimeout (paint, 5);
+}
 
 Bangle.on('touch', function (tap, top) {
-  if (top.x < w / 4) {
-    prev();
-  } else if (top.x > (w - (w / 4))) {
-    next();
+  if (top.y < (h / 1.5)) {
+    if (top.x > w /2) {
+    //hiramode = !hiramode;
+    if (hiramode) {
+      hiraSwipe(1,0, hiramode);
+    } else {
+      hiraSwipe(-1,0, !hiramode);
+    }
+    } else {
+      hiraSwipe(1,1,1);
+    }
+  } else if (top.x < w / 2) {
+    nextColor();
+    hiraPush();
+   // curkana = prev();
   } else {
-    hiramode = !hiramode;
+    prevColor();
+    hiraPush();
+   // curkana = next();
   }
-  kana = hiramode ? hiragana[curkana] : katakana[curkana];
-  updateWatch(ohhmm);
+  render(ohhmm);
+});
+Bangle.on('swipe', function (x,y) {
+  if (x > 0) {
+   // nextColor();
+    hiraSwipe(1, 1);
+  } else if (x < 0) {
+   // prevColor();
+    hiraSwipe(-1,1);
+  } else if (y < 0) {
+    hiraSwipe(1, 0, hiramode);
+  } else if (y > 0) {
+    hiraSwipe(-1, 0, !hiramode);
+  }
+  render(ohhmm);
 });
 
 g.clear(true);
 // show launcher when button pressed
 Bangle.setUI('clock');
 Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// redraw widgets every 10 minutes
+setInterval(function() {
+    // maybe not always necessary
+    Bangle.drawWidgets();
+}, 1000 * 60 * 10);
 tickWatch();
 setInterval(tickWatch, 1000 * 60);
 
diff --git a/apps/kanawatch/metadata.json b/apps/kanawatch/metadata.json
index b14703979..f3aaeae92 100644
--- a/apps/kanawatch/metadata.json
+++ b/apps/kanawatch/metadata.json
@@ -2,7 +2,7 @@
   "id": "kanawatch",
   "name": "Kanawatch",
   "shortName": "Kanawatch",
-  "version": "0.05",
+  "version": "0.11",
   "type": "clock",
   "description": "Learn Hiragana and Katakana",
   "icon": "app.png",
@@ -26,6 +26,9 @@
   "screenshots": [
     {
       "url": "screenshot.png"
+    },
+    {
+      "url": "screenshot2.png"
     }
   ]
 }
diff --git a/apps/kanawatch/screenshot.old.png b/apps/kanawatch/screenshot.old.png
new file mode 100644
index 000000000..b1ed879aa
Binary files /dev/null and b/apps/kanawatch/screenshot.old.png differ
diff --git a/apps/kanawatch/screenshot.png b/apps/kanawatch/screenshot.png
index b1ed879aa..4ef0ecbf2 100644
Binary files a/apps/kanawatch/screenshot.png and b/apps/kanawatch/screenshot.png differ
diff --git a/apps/kanawatch/screenshot2.png b/apps/kanawatch/screenshot2.png
new file mode 100644
index 000000000..3e85485de
Binary files /dev/null and b/apps/kanawatch/screenshot2.png differ
diff --git a/apps/kbmatry/ChangeLog b/apps/kbmatry/ChangeLog
new file mode 100644
index 000000000..76a6ce39d
--- /dev/null
+++ b/apps/kbmatry/ChangeLog
@@ -0,0 +1,8 @@
+1.00: New keyboard
+1.01: Change swipe interface to taps, speed up responses (efficiency tweaks).
+1.02: Generalize drawing and letter scaling. Allow custom and auto-generated character sets. Improve documentation.
+1.03: Attempt to improve keyboard load time.
+1.04: Make code asynchronous and improve load time.
+1.05: Fix layout issue and rename library
+1.06: Touch up readme, prep for IPO, add screenshots
+1.07: Fix widget display
\ No newline at end of file
diff --git a/apps/kbmatry/README.md b/apps/kbmatry/README.md
new file mode 100644
index 000000000..73767828d
--- /dev/null
+++ b/apps/kbmatry/README.md
@@ -0,0 +1,119 @@
+# Matryoshka Keyboard
+
+![icon](icon.png)
+
+![screenshot](screenshot.png) ![screenshot](screenshot6.png) 
+
+![screenshot](screenshot5.png) ![screenshot](screenshot2.png) 
+![screenshot](screenshot3.png) ![screenshot](screenshot4.png)
+
+Nested key input utility.
+
+## How to type
+
+Press your finger down on the letter group that contains the character you would like to type, then tap the letter you
+want to enter. Once you are touching the letter you want, release your
+finger.
+
+![help](help.png)
+
+Press "shft" or "caps" to access alternative characters, including upper case letters, punctuation, and special
+characters.
+Pressing "shft" also reveals a cancel button if you would like to terminate input without saving.
+
+Press "ok" to finish typing and send your text to whatever app called this keyboard.
+
+Press "del" to delete the leftmost character.
+
+## Themes and Colors
+
+This keyboard will attempt to use whatever theme or colorscheme is being used by your Bangle device.
+
+## How to use in a program
+
+This was developed to match the interface implemented for kbtouch, kbswipe, etc.
+
+In your app's metadata, add:
+
+```json
+  "dependencies": {"textinput": "type"}
+```
+
+From inside your app, call:
+
+```js
+const textInput = require("textinput");
+
+textInput.input({text: ""})
+         .then(result => {
+           console.log("The user entered: ", result);
+         });
+```
+
+Alternatively, if you want to improve the load time of the keyboard, you can pre-generate the data the keyboard needs
+to function and render like so:
+
+```js
+const textInput = require("textinput");
+
+const defaultKeyboard      = textInput.generateKeyboard(textInput.defaultCharSet);
+const defaultShiftKeyboard = textInput.generateKeyboard(textInput.defaultCharSetShift);
+// ...
+textInput.input({text: "", keyboardMain: defaultKeyboard, keyboardShift: defaultShiftKeyboard})
+         .then(result => {
+           console.log("The user entered: ", result);
+           // And it was faster!
+         });
+```
+
+This isn't required, but if you are using a large character set, and the user is interacting with the keyboard a lot,
+it can really smooth the experience.
+
+The default keyboard has a full set of alphanumeric characters as well as special characters and buttons in a
+pre-defined layout. If your application needs something different, or you want to have a custom layout, you can do so:
+
+```js
+const textInput = require("textinput");
+
+const customKeyboard = textInput.generateKeyboard([
+  ["1", "2", "3", "4"], ["5", "6", "7", "8"], ["9", "0", ".", "-"], "ok", "del", "cncl"
+]);
+// ...
+textInput.input({text: "", keyboardMain: customKeyboard})
+         .then(result => {
+           console.log("The user entered: ", result);
+           // And they could only enter numbers, periods, and dashes!
+         });
+```
+
+This will give you a keyboard with six buttons. The first three buttons will open up a 2x2 keyboard. The second three
+buttons are special keys for submitting, deleting, and cancelling respectively.
+
+Finally if you are like, super lazy, or have a dynamic set of keys you want to be using at any given time, you can 
+generate keysets from strings like so:
+
+```js
+const textInput = require("textinput");
+
+const customKeyboard = textInput.generateKeyboard(createCharSet("ABCDEFGHIJKLMNOP", ["ok", "shft", "cncl"]));
+const customShiftKeyboard = textInput.generateKeyboard(createCharSet("abcdefghijklmnop", ["ok", "shft", "cncl"]));
+// ...
+textInput.input({text: "", keyboardMain: customKeyboard, keyboardShift: customShiftKeyboard})
+         .then(result => {
+           console.log("The user entered: ", result);
+           // And the keyboard was automatically generated to include "ABCDEFGHIJKLMNOP" plus an OK button, a shift button, and a cancel button!
+         });
+```
+
+The promise resolves when the user hits "ok" on the input or if they cancel. If the user cancels, undefined is
+returned, although the user can hit "OK" with an empty string as well. If you define a custom character set and
+do not include the "ok" button your user will be soft-locked by the keyboard. Fair warning!
+
+At some point I may add swipe-for-space and swipe-for-delete as well as swipe-for-submit and swipe-for-cancel
+however I want to have a good strategy for the touch screen
+[affordance](https://careerfoundry.com/en/blog/ux-design/affordances-ux-design/).
+
+## Secret features
+
+If you long press a key with characters on it, that will enable "Shift" mode.
+
diff --git a/apps/kbmatry/app-icon.js b/apps/kbmatry/app-icon.js
new file mode 100644
index 000000000..a4b0ecc16
--- /dev/null
+++ b/apps/kbmatry/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwcBkmSpICVz//ABARGCBIRByA/Dk+AAgUH8AECgP4kmRCwX4n+PAoXH8YEC+IRC4HguE4/+P/EfCIXwgARHn4RG+P/j4RDJwgRBGQIRIEYNxCIRECGpV/CIXAgY1P4/8v41JOgeOn4RDGo4jER5Y1FCJWQg4RDYpeSNIQAMkmTCBwRBz4IG9YRIyA8COgJHBhMgI4+QyVJAYJrC9Mkw5rHwFAkEQCImSCJvAhIRBpazFGo3HEYVJkIjGCIIUCAQu/CKGSGo4jPLIhHMNayPLYo6zBYozpH9MvdI+TfaGSv4KHCI+Qg4GDI4IABg5HGyIYENYIAB45rGyPACKIIDx/4gF/CIPx/8fCIY1F4H8CJPA8BtCa4I1DCJFxCIYXBCILXBGpXHGplwn5HPuE4NaH4n6PLyC6CgEnYpeSpICDdJYRFz4RQARQ"))
\ No newline at end of file
diff --git a/apps/kbmatry/help.png b/apps/kbmatry/help.png
new file mode 100644
index 000000000..6eef5694b
Binary files /dev/null and b/apps/kbmatry/help.png differ
diff --git a/apps/kbmatry/icon.png b/apps/kbmatry/icon.png
new file mode 100644
index 000000000..058df4487
Binary files /dev/null and b/apps/kbmatry/icon.png differ
diff --git a/apps/kbmatry/lib.js b/apps/kbmatry/lib.js
new file mode 100644
index 000000000..ad65073a5
--- /dev/null
+++ b/apps/kbmatry/lib.js
@@ -0,0 +1,505 @@
+const widgetUtils = require("widget_utils");
+
+/**
+ * Attempt to lay out a set of characters in a logical way to optimize the number of buttons with the number
+ * of characters per button. Useful if you need to dynamically (or frequently) change your character set
+ * and don't want to create a layout for ever possible combination.
+ * @param text The text you want to parse into a character set.
+ * @param specials Any special buttons you want to add to the keyboard (must match hardcoded special string values)
+ * @returns {*[]}
+ */
+function createCharSet(text, specials) {
+  specials                 = specials || [];
+  const mandatoryExtraKeys = specials.length;
+  const preferredNumChars  = [1, 2, 4, 6, 9, 12];
+  const preferredNumKeys   = [4, 6, 9, 12].map(num => num - mandatoryExtraKeys);
+  let keyIndex             = 0, charIndex = 0;
+  let keySpace             = preferredNumChars[charIndex] * preferredNumKeys[keyIndex];
+  while (keySpace < text.length) {
+    const numKeys      = preferredNumKeys[keyIndex];
+    const numChars     = preferredNumChars[charIndex];
+    const nextNumKeys  = preferredNumKeys[keyIndex];
+    const nextNumChars = preferredNumChars[charIndex];
+    if (numChars <= numKeys) {
+      charIndex++;
+    } else if ((text.length / nextNumChars) < nextNumKeys) {
+      charIndex++;
+    } else {
+      keyIndex++;
+    }
+    keySpace = preferredNumChars[charIndex] * preferredNumKeys[keyIndex];
+  }
+  const charsPerKey = preferredNumChars[charIndex];
+  let charSet       = [];
+  for (let i = 0; i < text.length; i += charsPerKey) {
+    charSet.push(text.slice(i, i + charsPerKey)
+                     .split(""));
+  }
+  charSet = charSet.concat(specials);
+  return charSet;
+}
+
+/**
+ * Given the width, height, padding (between chars) and number of characters that need to fit horizontally /
+ * vertically, this function attempts to select the largest font it can that will still fit within the bounds when
+ * drawing a grid of characters. Does not handle multi-letter entries well, assumes we are laying out a grid of
+ * single characters.
+ * @param width The total width available for letters (px)
+ * @param height The total height available for letters (px)
+ * @param padding The amount of space required between characters (px)
+ * @param gridWidth The number of characters wide the rendering is going to be
+ * @param gridHeight The number of characters high the rendering is going to be
+ * @returns {{w: number, h: number, font: string}}
+ */
+function getBestFont(width, height, padding, gridWidth, gridHeight) {
+  let font            = "4x6";
+  let w               = 4;
+  let h               = 6;
+  const charMaxWidth  = width / gridWidth - padding * gridWidth;
+  const charMaxHeight = height / gridHeight - padding * gridHeight;
+  if (charMaxWidth >= 6 && charMaxHeight >= 8) {
+    w    = 6;
+    h    = 8;
+    font = "6x8";
+  }
+  if (charMaxWidth >= 12 && charMaxHeight >= 16) {
+    w    = 12;
+    h    = 16;
+    font = "6x8:2";
+  }
+  if (charMaxWidth >= 12 && charMaxHeight >= 20) {
+    w    = 12;
+    h    = 20;
+    font = "12x20";
+  }
+  if (charMaxWidth >= 20 && charMaxHeight >= 20) {
+    font       = "Vector" + Math.floor(Math.min(charMaxWidth, charMaxHeight));
+    const dims = g.setFont(font)
+                  .stringMetrics("W");
+    w          = dims.width
+    h          = dims.height;
+  }
+  return {w, h, font};
+}
+
+
+/**
+ * Generate a set of key objects given an array of arrays of characters to make available for typing.
+ * @param characterArrays
+ * @returns {Promise<void>}
+ */
+function getKeys(characterArrays) {
+  if (Array.isArray(characterArrays)) {
+    return Promise.all(characterArrays.map((chars, i) => generateKeyFromChars(characterArrays, i)));
+  } else {
+    return generateKeyFromChars(characterArrays, 0);
+  }
+}
+
+/**
+ * Given a set of characters, determine whether or not this needs to be a matryoshka key, a basic key, or a special key.
+ * Then generate that key. If the key is a matryoshka key, we queue up the generation of its sub-keys for later to
+ * improve load times.
+ * @param chars
+ * @param i
+ * @returns {Promise<unknown>}
+ */
+function generateKeyFromChars(chars, i) {
+  return new Promise((resolve, reject) => {
+    let special;
+    if (!Array.isArray(chars[i]) && chars[i].length > 1) {
+      // If it's not an array we assume it's a string. Fingers crossed I guess, lol. Be nice to my functions!
+      special = chars[i];
+    }
+    const key = getKeyByIndex(chars, i, special);
+    if (!special) {
+      key.chars = chars[i];
+    }
+    if (key.chars.length > 1) {
+      key.pendingSubKeys = true;
+      key.getSubKeys     = () => getKeys(key.chars);
+      resolve(key)
+    } else {
+      resolve(key);
+    }
+  })
+}
+
+
+/**
+ * Given a set of characters (or sets of characters) get the position and dimensions of the i'th key in that set.
+ * @param charSet An array where each element represents a key on the hypothetical keyboard.
+ * @param i The index of the key in the set you want to get dimensions for.
+ * @param special The special property of the key - for example "del" for a key used for deleting characters.
+ * @returns {{special, bord: number, pad: number, w: number, x: number, h: number, y: number, chars: *[]}}
+ */
+function getKeyByIndex(charSet, i, special) {
+  // Key dimensions
+  const keyboardOffsetY = 40;
+  const margin          = 3;
+  const padding         = 4;
+  const border          = 2;
+  const gridWidth       = Math.ceil(Math.sqrt(charSet.length));
+  const gridHeight      = Math.ceil(charSet.length / gridWidth);
+  const keyWidth        = Math.floor((g.getWidth()) / gridWidth) - margin;
+  const keyHeight       = Math.floor((g.getHeight() - keyboardOffsetY) / gridHeight) - margin;
+  const gridx           = i % gridWidth;
+  const gridy           = Math.floor(i / gridWidth) % gridWidth;
+  const x               = gridx * (keyWidth + margin);
+  const y               = gridy * (keyHeight + margin) + keyboardOffsetY;
+  const w               = keyWidth;
+  const h               = keyHeight;
+  // internal Character spacing
+  const numChars        = charSet[i].length;
+  const subGridWidth    = Math.ceil(Math.sqrt(numChars));
+  const subGridHeight   = Math.ceil(numChars / subGridWidth);
+  const bestFont        = getBestFont(w - padding, h - padding, 0, subGridWidth, subGridHeight);
+  const letterWidth     = bestFont.w;
+  const letterHeight    = bestFont.h;
+  const totalWidth      = (subGridWidth - 1) * (w / subGridWidth) + padding + letterWidth + 1;
+  const totalHeight     = (subGridHeight - 1) * (h / subGridHeight) + padding + letterHeight + 1;
+  const extraPadH       = (w - totalWidth) / 2;
+  const extraPadV       = (h - totalHeight) / 2;
+  return {
+    x,
+    y,
+    w,
+    h,
+    pad  : padding,
+    bord : border,
+    chars: [],
+    special,
+    subGridWidth,
+    subGridHeight,
+    extraPadH,
+    extraPadV,
+    font : bestFont.font
+  };
+}
+
+
+/**
+ * This is probably the most intense part of this keyboard library. If you don't do it ahead of time, it will happen
+ * when you call the keyboard, and it can take up to 0.5 seconds for a full alphanumeric keyboard. Depending on what
+ * is an acceptable user experience for you, and how many keys you are actually generating, you may choose to do this
+ * ahead of time and pass the result to the "input" function of this library. NOTE: This function would need to be
+ * called once per key set - so if you have a keyboard with a "shift" key you'd need to run it once for your base
+ * keyset and once for your shift keyset.
+ * @param charSets
+ * @returns {Promise<unknown>}
+ */
+function generateKeyboard(charSets) {
+  if (!Array.isArray(charSets)) {
+    // User passed a string. We will divvy it up into a real set of subdivided characters.
+    charSets = createCharSet(charSets, ["ok", "del", "shft"]);
+  }
+  return getKeys(charSets);
+}
+
+// Default layout
+const defaultCharSet = [
+  ["a", "b", "c", "d", "e", "f", "g", "h", "i"],
+  ["j", "k", "l", "m", "n", "o", "p", "q", "r"],
+  ["s", "t", "u", "v", "w", "x", "y", "z", "0"],
+  ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
+  [" ", "`", "-", "=", "[", "]", "\\", ";", "'"],
+  [",", ".", "/"],
+  "ok",
+  "shft",
+  "del"
+];
+
+// Default layout with shift pressed
+const defaultCharSetShift = [
+  ["A", "B", "C", "D", "E", "F", "G", "H", "I"],
+  ["J", "K", "L", "M", "N", "O", "P", "Q", "R"],
+  ["S", "T", "U", "V", "W", "X", "Y", "Z", ")"],
+  ["!", "@", "#", "$", "%", "^", "&", "*", "("],
+  ["~", "_", "+", "{", "}", "|", ":", "\"", "<"],
+  [">", "?"],
+  "ok",
+  "shft",
+  "del"
+];
+
+/**
+ * Given initial options, allow the user to type a set of characters and return their entry in a promise. If you do not
+ * submit your own character set, a default alphanumeric keyboard will display.
+ * @param options The object containing initial options for the keyboard.
+ * @param {string} options.text The initial text to display / edit in the keyboard
+ * @param {array[]|string[]} [options.keyboardMain] The primary keyboard generated with generateKeyboard()
+ * @param {array[]|string[]} [options.keyboardShift] Like keyboardMain, but displayed when shift / capslock is pressed.
+ * @returns {Promise<unknown>}
+ */
+function input(options) {
+  widgetUtils.hide();
+  options             = options || {};
+  let typed           = options.text || "";
+  let resolveFunction = () => {};
+  let shift           = false;
+  let caps            = false;
+  let activeKeySet;
+
+  const offsetX = 0;
+  const offsetY = 40;
+
+  E.showMessage("Loading...");
+  let keyboardPromise;
+  if (options.keyboardMain) {
+    keyboardPromise = Promise.all([options.keyboardMain, options.keyboardShift || Promise.resolve([])]);
+  } else {
+    keyboardPromise = Promise.all([generateKeyboard(defaultCharSet), generateKeyboard(defaultCharSetShift)])
+  }
+
+  let mainKeys;
+  let mainKeysShift;
+
+  /**
+   * Draw an individual keyboard key - handles special formatting and the rectangle pad, followed by the character
+   * rendering.
+   * @param key
+   */
+  function drawKey(key) {
+    let bgColor = g.theme.bg;
+    if (key.special) {
+      if (key.special === "ok") bgColor = "#0F0";
+      if (key.special === "cncl") bgColor = "#F00";
+      if (key.special === "del") bgColor = g.theme.bg2;
+      if (key.special === "spc") bgColor = g.theme.bg2;
+      if (key.special === "shft") {
+        bgColor = shift ? g.theme.bgH : g.theme.bg2;
+      }
+      if (key.special === "caps") {
+        bgColor = caps ? g.theme.bgH : g.theme.bg2;
+      }
+      g.setColor(bgColor)
+       .fillRect({x: key.x, y: key.y, w: key.w, h: key.h});
+    }
+    g.setColor(g.theme.fg)
+     .drawRect({x: key.x, y: key.y, w: key.w, h: key.h});
+    drawChars(key);
+  }
+
+  /**
+   * Draw the characters for a given key - this handles the layout of all characters needed for the key, whether the
+   * key has 12 characters, 1, or if it represents a special key.
+   * @param key
+   */
+  function drawChars(key) {
+    const numChars = key.chars.length;
+    if (key.special) {
+      g.setColor(g.theme.fg)
+       .setFont("12x20")
+       .setFontAlign(-1, -1)
+       .drawString(key.special, key.x + key.w / 2 - g.stringWidth(key.special) / 2, key.y + key.h / 2 - 10, false);
+    } else {
+      g.setColor(g.theme.fg)
+       .setFont(key.font)
+       .setFontAlign(-1, -1);
+      for (let i = 0; i < numChars; i++) {
+        const gridX       = i % key.subGridWidth;
+        const gridY       = Math.floor(i / key.subGridWidth) % key.subGridWidth;
+        const charOffsetX = gridX * (key.w / key.subGridWidth);
+        const charOffsetY = gridY * (key.h / key.subGridHeight);
+        const posX        = key.x + key.pad + charOffsetX + key.extraPadH;
+        const posY        = key.y + key.pad + charOffsetY + key.extraPadV;
+        g.drawString(key.chars[i], posX, posY, false);
+      }
+    }
+  }
+
+  /**
+   * Get the key set corresponding to the indicated shift state. Allows easy switching between capital letters and
+   * lower case by just switching the boolean passed here.
+   * @param shift
+   * @returns {*[]}
+   */
+  function getMainKeySet(shift) {
+    return shift ? mainKeysShift : mainKeys;
+  }
+
+  /**
+   * Draw all the given keys on the screen.
+   * @param keys
+   */
+  function drawKeys(keys) {
+    keys.forEach(key => {
+      drawKey(key);
+    });
+  }
+
+  /**
+   * Draw the text that the user has typed so far, includes a cursor and automatic truncation when the string is too
+   * long.
+   * @param text
+   * @param cursorChar
+   */
+  function drawTyped(text, cursorChar) {
+    let visibleText = text;
+    let ellipsis    = false;
+    const maxWidth  = 176 - 40;
+    while (g.setFont("12x20")
+            .stringWidth(visibleText) > maxWidth) {
+      ellipsis    = true;
+      visibleText = visibleText.slice(1);
+    }
+    if (ellipsis) {
+      visibleText = "..." + visibleText;
+    }
+    g.setColor(g.theme.bg2)
+     .fillRect(5, 5, 171, 30);
+    g.setColor(g.theme.fg2)
+     .setFont("12x20")
+     .drawString(visibleText + cursorChar, 15, 10, false);
+  }
+
+  /**
+   * Clear the space on the screen that the keyboard occupies (not the text the user has written).
+   */
+  function clearKeySpace() {
+    g.setColor(g.theme.bg)
+     .fillRect(offsetX, offsetY, 176, 176);
+  }
+
+  /**
+   * Based on a touch event, determine which key was pressed by the user.
+   * @param touchEvent
+   * @param keys
+   * @returns {*}
+   */
+  function getTouchedKey(touchEvent, keys) {
+    return keys.find((key) => {
+      let relX = touchEvent.x - key.x;
+      let relY = touchEvent.y - key.y;
+      return relX > 0 && relX < key.w && relY > 0 && relY < key.h;
+    })
+  }
+
+  /**
+   * On a touch event, determine whether a key is touched and take appropriate action if it is.
+   * @param button
+   * @param touchEvent
+   */
+  function keyTouch(button, touchEvent) {
+    const pressedKey = getTouchedKey(touchEvent, activeKeySet);
+    if (pressedKey == null) {
+      // User tapped empty space.
+      swapKeySet(getMainKeySet(shift !== caps));
+      return;
+    }
+    if (pressedKey.pendingSubKeys) {
+      // We have to generate the subkeys for this key still, but we decided to wait until we needed it!
+      pressedKey.pendingSubKeys = false;
+      pressedKey.getSubKeys()
+                .then(subkeys => {
+                  pressedKey.subKeys = subkeys;
+                  keyTouch(undefined, touchEvent);
+                })
+      return;
+    }
+    // Haptic feedback
+    Bangle.buzz(25, 1);
+    if (pressedKey.subKeys) {
+      // Hold press for "shift!"
+      if (touchEvent.type > 1) {
+        shift = !shift;
+        swapKeySet(getMainKeySet(shift !== caps));
+      } else {
+        swapKeySet(pressedKey.subKeys);
+      }
+    } else {
+      if (pressedKey.special) {
+        evaluateSpecialFunctions(pressedKey);
+      } else {
+        typed = typed + pressedKey.chars;
+        shift = false;
+        drawTyped(typed, "");
+        swapKeySet(getMainKeySet(shift !== caps));
+      }
+    }
+  }
+
+  /**
+   * Manage setting, generating, and rendering new keys when a key set is changed.
+   * @param newKeys
+   */
+  function swapKeySet(newKeys) {
+    activeKeySet = newKeys;
+    clearKeySpace();
+    drawKeys(activeKeySet);
+  }
+
+  /**
+   * Determine if the key contains any of the special strings that have their own special behaviour when pressed.
+   * @param key
+   */
+  function evaluateSpecialFunctions(key) {
+    switch (key.special) {
+      case "ok":
+        setTimeout(() => resolveFunction(typed), 50);
+        break;
+      case "del":
+        typed = typed.slice(0, -1);
+        drawTyped(typed, "");
+        break;
+      case "shft":
+        shift = !shift;
+        swapKeySet(getMainKeySet(shift !== caps));
+        break;
+      case "caps":
+        caps = !caps;
+        swapKeySet(getMainKeySet(shift !== caps));
+        break;
+      case "cncl":
+        setTimeout(() => resolveFunction(), 50);
+        break;
+      case "spc":
+        typed = typed + " ";
+        break;
+    }
+  }
+
+  let isCursorVisible = true;
+
+  const blinkInterval = setInterval(() => {
+    if (!activeKeySet) return;
+    isCursorVisible = !isCursorVisible;
+    if (isCursorVisible) {
+      drawTyped(typed, "_");
+    } else {
+      drawTyped(typed, "");
+    }
+  }, 200);
+
+
+  /**
+   * We return a promise but the resolve function is assigned to a variable in the higher function scope. That allows
+   * us to return the promise and resolve it after we are done typing without having to return the entire scope of the
+   * application within the promise.
+   */
+  return new Promise((resolve, reject) => {
+    g.clear(true);
+    resolveFunction = resolve;
+    keyboardPromise.then((result) => {
+      mainKeys      = result[0];
+      mainKeysShift = result[1];
+      swapKeySet(getMainKeySet(shift !== caps));
+      Bangle.setUI({
+        mode: "custom", touch: keyTouch
+      });
+      Bangle.setLocked(false);
+    })
+  }).then((result) => {
+    g.clear(true);
+    widgetUtils.show();
+    clearInterval(blinkInterval);
+    Bangle.setUI();
+    return result;
+  });
+}
+
+exports.input               = input;
+exports.generateKeyboard    = generateKeyboard;
+exports.defaultCharSet      = defaultCharSet;
+exports.defaultCharSetShift = defaultCharSetShift;
+exports.createCharSet       = createCharSet;
\ No newline at end of file
diff --git a/apps/kbmatry/metadata.json b/apps/kbmatry/metadata.json
new file mode 100644
index 000000000..c166c1f12
--- /dev/null
+++ b/apps/kbmatry/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "kbmatry",
+  "name": "Matryoshka Keyboard",
+  "version":"1.07",
+  "description": "A library for text input via onscreen keyboard. Easily enter characters with nested keyboards.",
+  "icon": "icon.png",
+  "type":"textinput",
+  "tags": "keyboard",
+  "supports" : ["BANGLEJS2"],
+  "screenshots": [{"url":"screenshot.png"},{"url":"screenshot6.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"},{"url":"screenshot4.png"},{"url":"screenshot5.png"},{"url": "help.png"}],
+  "readme": "README.md",
+  "storage": [
+    {"name":"textinput","url":"lib.js"}
+  ]
+}
diff --git a/apps/kbmatry/screenshot.png b/apps/kbmatry/screenshot.png
new file mode 100644
index 000000000..08bb366e4
Binary files /dev/null and b/apps/kbmatry/screenshot.png differ
diff --git a/apps/kbmatry/screenshot2.png b/apps/kbmatry/screenshot2.png
new file mode 100644
index 000000000..21874244d
Binary files /dev/null and b/apps/kbmatry/screenshot2.png differ
diff --git a/apps/kbmatry/screenshot3.png b/apps/kbmatry/screenshot3.png
new file mode 100644
index 000000000..1f0c73265
Binary files /dev/null and b/apps/kbmatry/screenshot3.png differ
diff --git a/apps/kbmatry/screenshot4.png b/apps/kbmatry/screenshot4.png
new file mode 100644
index 000000000..de2f90bee
Binary files /dev/null and b/apps/kbmatry/screenshot4.png differ
diff --git a/apps/kbmatry/screenshot5.png b/apps/kbmatry/screenshot5.png
new file mode 100644
index 000000000..b860c8438
Binary files /dev/null and b/apps/kbmatry/screenshot5.png differ
diff --git a/apps/kbmatry/screenshot6.png b/apps/kbmatry/screenshot6.png
new file mode 100644
index 000000000..20de7ddc1
Binary files /dev/null and b/apps/kbmatry/screenshot6.png differ
diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog
index 4ef8f7bda..defae902b 100644
--- a/apps/kbmulti/ChangeLog
+++ b/apps/kbmulti/ChangeLog
@@ -3,3 +3,4 @@
 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.
+0.06: Add ability to auto-lowercase after a capital letter insertion.
diff --git a/apps/kbmulti/README.md b/apps/kbmulti/README.md
index b6754711d..88b91fa80 100644
--- a/apps/kbmulti/README.md
+++ b/apps/kbmulti/README.md
@@ -12,6 +12,6 @@ Uses the multitap keypad logic originally from here: http://www.espruino.com/Mor
 ![](screenshot_2.png)
 ![](screenshot_3.png)
 
-Written by: [Sir Indy](https://github.com/sir-indy) and [Thyttan](https://github.com/thyttan)
+Written by: [Sir Indy](https://github.com/sir-indy), [Thyttan](https://github.com/thyttan) and [bobrippling](https://github.com/bobrippling).
 
 For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js
index 9b642a132..505132040 100644
--- a/apps/kbmulti/lib.js
+++ b/apps/kbmulti/lib.js
@@ -9,6 +9,7 @@ exports.input = function(options) {
   if (settings.firstLaunch===undefined) { settings.firstLaunch = true; }
   if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
   if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; }
+  if (settings.autoLowercase===undefined) { settings.autoLowercase = true; }
 
   var fontSize = "6x15";
   var Layout = require("Layout");
@@ -89,19 +90,21 @@ exports.input = function(options) {
   }
 
   function newCharacter(ch) {
-    displayText();
+    displayText(false);
     if (ch && textIndex < text.length) textIndex ++;
     charCurrent = ch;
     charIndex = 0;
   }
 
   function onKeyPad(key) {
+    var retire = 0;
     deactivateTimeout(charTimeout);
     // work out which char was pressed
     if (key==charCurrent) {
       charIndex = (charIndex+1) % letters[charCurrent].length;
       text = text.slice(0, -1);
     } else {
+      retire = charCurrent !== undefined;
       newCharacter(key);
     }
     var newLetter = letters[charCurrent][charIndex];
@@ -109,13 +112,22 @@ exports.input = function(options) {
     let post = text.slice(textIndex, text.length);
     
     text = pre + (caps ? newLetter.toUpperCase() : newLetter.toLowerCase()) + post;
+
+    if(retire)
+      retireCurrent();
     
     // set a timeout
     charTimeout = setTimeout(function() {
       charTimeout = undefined;
       newCharacter();
+      retireCurrent();
     }, settings.charTimeout);
-    displayText(charTimeout);
+    displayText(true);
+  }
+
+  function retireCurrent(why) {
+    if (caps && settings.autoLowercase)
+      setCaps();
   }
 
   var moveMode = false;
diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json
index 510454f79..0b44b0306 100644
--- a/apps/kbmulti/metadata.json
+++ b/apps/kbmulti/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbmulti",
   "name": "Multitap keyboard",
-  "version":"0.05",
+  "version":"0.06",
   "description": "A library for text input via multitap/T9 style keypad",
   "icon": "app.png",
   "type":"textinput",
diff --git a/apps/kbmulti/settings.js b/apps/kbmulti/settings.js
index 96e72b290..08dbb1925 100644
--- a/apps/kbmulti/settings.js
+++ b/apps/kbmulti/settings.js
@@ -3,6 +3,7 @@
       var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
       if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; }
       if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
+      if (settings.autoLowercase===undefined) { settings.autoLowercase = true; }
       return settings;
     }
       
@@ -21,6 +22,10 @@
         format: v => v,
         onchange: v => updateSetting("charTimeout", v),
       },
+      /*LANG*/'Lowercase after first uppercase': {
+        value: !!settings().autoLowercase,
+        onchange: v =>  updateSetting("autoLowercase", v)
+      },
       /*LANG*/'Show help button?': {
         value: !!settings().showHelpBtn,
         onchange: v =>  updateSetting("showHelpBtn", v)
diff --git a/apps/kbswipe/ChangeLog b/apps/kbswipe/ChangeLog
index a7b2d44c2..38d71986e 100644
--- a/apps/kbswipe/ChangeLog
+++ b/apps/kbswipe/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Keep drag-function in ram, hopefully improving performance and input reliability somewhat.
 0.06: Support input of numbers and uppercase characters.
 0.07: Support input of symbols.
+0.08: Redone patterns a,e,m,w,z.
diff --git a/apps/kbswipe/lib.js b/apps/kbswipe/lib.js
index ea6d78255..7d05d7a8e 100644
--- a/apps/kbswipe/lib.js
+++ b/apps/kbswipe/lib.js
@@ -10,11 +10,11 @@ on the left of the IDE, then do a stroke and copy out the Uint8Array line
 */
 exports.getStrokes = function(mode, cb) {
   if (mode === exports.INPUT_MODE_ALPHA) {
-    cb("a", new Uint8Array([58, 159, 58, 155, 62, 144, 69, 127, 77, 106, 86, 90, 94, 77, 101, 68, 108, 62, 114, 59, 121, 59, 133, 61, 146, 70, 158, 88, 169, 107, 176, 124, 180, 135, 183, 144, 185, 152]));
+    cb("a", new Uint8Array([31, 157, 33, 149, 37, 131, 42, 112, 46, 97, 49, 83, 52, 72, 56, 64, 59, 59, 63, 53, 68, 48, 74, 47, 80, 47, 88, 50, 98, 63, 109, 94, 114, 115, 116, 130, 117, 141]));
     cb("b", new Uint8Array([51, 47, 51, 77, 56, 123, 60, 151, 65, 163, 68, 164, 68, 144, 67, 108, 67, 76, 72, 43, 104, 51, 121, 74, 110, 87, 109, 95, 131, 117, 131, 140, 109, 152, 88, 157]));
     cb("c", new Uint8Array([153, 62, 150, 62, 145, 62, 136, 62, 123, 62, 106, 65, 85, 70, 65, 75, 50, 82, 42, 93, 37, 106, 36, 119, 36, 130, 40, 140, 49, 147, 61, 153, 72, 156, 85, 157, 106, 158, 116, 158]));
     cb("d", new Uint8Array([57, 178, 57, 176, 55, 171, 52, 163, 50, 154, 49, 146, 47, 135, 45, 121, 44, 108, 44, 97, 44, 85, 44, 75, 44, 66, 44, 58, 44, 48, 44, 38, 46, 31, 48, 26, 58, 21, 75, 20, 99, 26, 120, 35, 136, 51, 144, 70, 144, 88, 137, 110, 124, 131, 106, 145, 88, 153]));
-    cb("e", new Uint8Array([150, 72, 141, 69, 114, 68, 79, 69, 48, 77, 32, 81, 31, 85, 46, 91, 73, 95, 107, 100, 114, 103, 83, 117, 58, 134, 66, 143, 105, 148, 133, 148, 144, 148]));
+    cb("e", new Uint8Array([107, 50, 101, 46, 94, 42, 85, 40, 75, 40, 65, 40, 58, 40, 51, 40, 47, 40, 44, 43, 45, 54, 52, 68, 63, 79, 70, 84, 70, 85, 59, 89, 52, 96, 45, 108, 39, 119, 37, 126, 37, 132, 37, 137, 41, 143, 48, 147, 60, 148, 69, 148, 78, 148, 84, 148, 89, 148]));
     cb("f", new Uint8Array([157, 52, 155, 52, 148, 52, 137, 52, 124, 52, 110, 52, 96, 52, 83, 52, 74, 52, 67, 52, 61, 52, 57, 52, 55, 52, 52, 52, 52, 54, 52, 58, 52, 64, 54, 75, 58, 97, 59, 117, 60, 130]));
     cb("g", new Uint8Array([160, 66, 153, 62, 129, 58, 90, 56, 58, 57, 38, 65, 31, 86, 43, 125, 69, 152, 116, 166, 145, 154, 146, 134, 112, 116, 85, 108, 97, 106, 140, 106, 164, 106]));
     cb("h", new Uint8Array([58, 50, 58, 55, 58, 64, 58, 80, 58, 102, 58, 122, 58, 139, 58, 153, 58, 164, 58, 171, 58, 177, 58, 179, 58, 181, 58, 180, 58, 173, 58, 163, 59, 154, 61, 138, 64, 114, 68, 95, 72, 84, 80, 79, 91, 79, 107, 82, 123, 93, 137, 111, 145, 130, 149, 147, 150, 154, 150, 159]));
@@ -22,7 +22,7 @@ exports.getStrokes = function(mode, cb) {
     cb("j", new Uint8Array([130, 57, 130, 61, 130, 73, 130, 91, 130, 113, 130, 133, 130, 147, 130, 156, 130, 161, 130, 164, 130, 166, 129, 168, 127, 168, 120, 168, 110, 168, 91, 167, 81, 167, 68, 167]));
     cb("k", new Uint8Array([149, 63, 147, 68, 143, 76, 136, 89, 126, 106, 114, 123, 100, 136, 86, 147, 72, 153, 57, 155, 45, 152, 36, 145, 29, 131, 26, 117, 26, 104, 27, 93, 30, 86, 35, 80, 45, 77, 62, 80, 88, 96, 113, 116, 130, 131, 140, 142, 145, 149, 148, 153]));
     cb("l", new Uint8Array([42, 55, 42, 59, 42, 69, 44, 87, 44, 107, 44, 128, 44, 143, 44, 156, 44, 163, 44, 167, 44, 169, 45, 170, 49, 170, 59, 169, 76, 167, 100, 164, 119, 162, 139, 160, 163, 159]));
-    cb("m", new Uint8Array([49, 165, 48, 162, 46, 156, 44, 148, 42, 138, 42, 126, 42, 113, 43, 101, 45, 91, 47, 82, 49, 75, 51, 71, 54, 70, 57, 70, 61, 74, 69, 81, 75, 91, 84, 104, 94, 121, 101, 132, 103, 137, 106, 130, 110, 114, 116, 92, 125, 75, 134, 65, 139, 62, 144, 66, 148, 83, 151, 108, 155, 132, 157, 149]));
+    cb("m", new Uint8Array([36, 139, 36, 120, 36, 99, 36, 79, 36, 61, 41, 45, 56, 43, 71, 46, 77, 66, 77, 93, 77, 97, 84, 69, 93, 51, 107, 47, 118, 53, 123, 79, 124, 115, 124, 140]));
     cb("n", new Uint8Array([50, 165, 50, 160, 50, 153, 50, 140, 50, 122, 50, 103, 50, 83, 50, 65, 50, 52, 50, 45, 50, 43, 52, 52, 57, 67, 66, 90, 78, 112, 93, 131, 104, 143, 116, 152, 127, 159, 135, 160, 141, 150, 148, 125, 154, 96, 158, 71, 161, 56, 162, 49]));
     cb("o", new Uint8Array([107, 58, 104, 58, 97, 61, 87, 68, 75, 77, 65, 88, 58, 103, 54, 116, 53, 126, 55, 135, 61, 143, 75, 149, 91, 150, 106, 148, 119, 141, 137, 125, 143, 115, 146, 104, 146, 89, 142, 78, 130, 70, 116, 65, 104, 62]));
     cb("p", new Uint8Array([29, 47, 29, 55, 29, 75, 29, 110, 29, 145, 29, 165, 29, 172, 29, 164, 30, 149, 37, 120, 50, 91, 61, 74, 72, 65, 85, 61, 103, 61, 118, 63, 126, 69, 129, 76, 130, 87, 126, 98, 112, 108, 97, 114, 87, 116]));
@@ -32,10 +32,10 @@ exports.getStrokes = function(mode, cb) {
     cb("t", new Uint8Array([45, 55, 48, 55, 55, 55, 72, 55, 96, 55, 120, 55, 136, 55, 147, 55, 152, 55, 155, 55, 157, 55, 158, 56, 158, 60, 156, 70, 154, 86, 151, 102, 150, 114, 148, 125, 148, 138, 148, 146]));
     cb("u", new Uint8Array([35, 52, 35, 59, 35, 73, 35, 90, 36, 114, 38, 133, 42, 146, 49, 153, 60, 157, 73, 158, 86, 156, 100, 152, 112, 144, 121, 131, 127, 114, 132, 97, 134, 85, 135, 73, 136, 61, 136, 56]));
     cb("v", new Uint8Array([36, 55, 37, 59, 40, 68, 45, 83, 51, 100, 58, 118, 64, 132, 69, 142, 71, 149, 73, 156, 76, 158, 77, 160, 77, 159, 80, 151, 82, 137, 84, 122, 86, 111, 90, 91, 91, 78, 91, 68, 91, 63, 92, 61, 97, 61, 111, 61, 132, 61, 150, 61, 162, 61]));
-    cb("w", new Uint8Array([25, 46, 25, 82, 25, 119, 33, 143, 43, 153, 60, 147, 73, 118, 75, 91, 76, 88, 85, 109, 96, 134, 107, 143, 118, 137, 129, 112, 134, 81, 134, 64, 134, 55]));
+    cb("w", new Uint8Array([35, 37, 35, 44, 35, 58, 35, 81, 35, 110, 35, 129, 39, 136, 45, 140, 51, 141, 60, 137, 70, 121, 76, 99, 78, 79, 78, 70, 78, 69, 83, 89, 89, 112, 93, 127, 97, 135, 102, 136, 108, 131, 115, 116, 119, 93, 122, 72, 123, 55, 123, 43]));
     cb("x", new Uint8Array([56, 63, 56, 67, 57, 74, 60, 89, 66, 109, 74, 129, 85, 145, 96, 158, 107, 164, 117, 167, 128, 164, 141, 155, 151, 140, 159, 122, 166, 105, 168, 89, 170, 81, 170, 73, 169, 66, 161, 63, 141, 68, 110, 83, 77, 110, 55, 134, 47, 145]));
     cb("y", new Uint8Array([30, 41, 30, 46, 30, 52, 30, 63, 30, 79, 33, 92, 38, 100, 47, 104, 54, 107, 66, 105, 79, 94, 88, 82, 92, 74, 94, 77, 96, 98, 96, 131, 94, 151, 91, 164, 85, 171, 75, 171, 71, 162, 74, 146, 84, 130, 95, 119, 106, 113]));
-    cb("z", new Uint8Array([29, 62, 35, 62, 43, 62, 63, 62, 87, 62, 110, 62, 125, 62, 134, 62, 138, 62, 136, 63, 122, 68, 103, 77, 85, 91, 70, 107, 59, 120, 50, 132, 47, 138, 43, 143, 41, 148, 42, 151, 53, 155, 80, 157, 116, 158, 146, 158, 163, 158]));
+    cb("z", new Uint8Array([39, 38, 45, 38, 53, 38, 62, 38, 72, 38, 82, 38, 89, 38, 96, 38, 99, 39, 95, 48, 82, 68, 70, 87, 60, 100, 50, 117, 42, 132, 42, 140, 45, 143, 53, 143, 67, 143, 81, 143]));
     cb("SHIFT", new Uint8Array([100, 160, 100, 50]));
   } else if (mode === exports.INPUT_MODE_NUM) {
     cb("0", new Uint8Array([82, 50, 76, 50, 67, 50, 59, 50, 50, 51, 43, 57, 38, 68, 34, 83, 33, 95, 33, 108, 34, 121, 42, 136, 57, 148, 72, 155, 85, 157, 98, 155, 110, 149, 120, 139, 128, 127, 134, 119, 137, 114, 138, 107, 138, 98, 138, 88, 138, 77, 137, 71, 134, 65, 128, 60, 123, 58]));
@@ -210,7 +210,7 @@ exports.input = function(options) {
     if (o.stroke!==undefined && o.xy.length >= 6 && isStrokeInside(R, o.xy)) {
       var ch = o.stroke;
       if (ch=="\b") text = text.slice(0,-1);
-      else if (ch==="SHIFT") { shift=!shift; Bangle.drawWidgets(); }
+      else if (ch==="SHIFT") { shift=!shift; WIDGETS.kbswipe.draw(); }
       else text += shift ? ch.toUpperCase() : ch;
     }
     lastDrag = undefined;
@@ -226,7 +226,7 @@ exports.input = function(options) {
     shift = false;
     setupStrokes();
     show();
-    Bangle.drawWidgets();
+    WIDGETS.kbswipe.draw();
   }
 
   Bangle.on('stroke',strokeHandler);
@@ -239,7 +239,7 @@ exports.input = function(options) {
     area:"tl",
     width: 36, // 3 chars, 6*2 px/char
     draw: function() {
-      g.reset();
+      g.reset().clearRect(this.x, this.y, this.x + this.width-1, this.y + 23);
       g.setFont("6x8:2x3");
       g.setColor("#f00");
       if (input_mode === exports.INPUT_MODE_ALPHA) {
@@ -251,6 +251,7 @@ exports.input = function(options) {
       }
     }
   };
+  Bangle.drawWidgets();
 
   return new Promise((resolve,reject) => {
     Bangle.setUI({mode:"custom", drag:e=>{
diff --git a/apps/kbswipe/metadata.json b/apps/kbswipe/metadata.json
index 6b597a371..3f3fbffa3 100644
--- a/apps/kbswipe/metadata.json
+++ b/apps/kbswipe/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbswipe",
   "name": "Swipe keyboard",
-  "version":"0.07",
+  "version":"0.08",
   "description": "A library for text input via PalmOS style swipe gestures (beta!)",
   "icon": "app.png",
   "type":"textinput",
diff --git a/apps/kbtouch/ChangeLog b/apps/kbtouch/ChangeLog
index 17e824c00..5bd2159e6 100644
--- a/apps/kbtouch/ChangeLog
+++ b/apps/kbtouch/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Introduced settings to customize the layout and functionality of the keyboard.
+0.03: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/kbtouch/metadata.json b/apps/kbtouch/metadata.json
index 89d121d63..31dc8c9a8 100644
--- a/apps/kbtouch/metadata.json
+++ b/apps/kbtouch/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbtouch",
   "name": "Touch keyboard",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A library for text input via onscreen keyboard",
   "icon": "app.png",
   "type":"textinput",
@@ -12,5 +12,6 @@
     {"name":"textinput","url":"lib.js"},
     {"name":"kbtouch.settings.js","url":"settings.js"}
   ],
-  "sortorder":-1
+  "sortorder":-1,
+  "data":[{"name":"kbtouch.settings.json"}]
 }
diff --git a/apps/kbtouch/settings.js b/apps/kbtouch/settings.js
index 871cc5d32..227efaf2d 100644
--- a/apps/kbtouch/settings.js
+++ b/apps/kbtouch/settings.js
@@ -8,13 +8,13 @@
     if (settings.speedScaling===undefined) settings.speedScaling=24;
     return settings;
   }
-    
+
   function updateSetting(setting, value) {
     let settings = require('Storage').readJSON("kbtouch.settings.json", true) || {};
     settings[setting] = value;
     require('Storage').writeJSON("kbtouch.settings.json", settings);
   }
-  
+
   var mainmenu = {
     "" : { "title" : /*LANG*/"Touch Keyboard" },
     "< Back" : back,
@@ -25,22 +25,16 @@
       onchange: v => updateSetting("textSize", v)
     },
     /*LANG*/'Offset keyboard': {
-      value: settings().offsetKeyboard,
-      min: 0, max: 1,
-      format: v => [/*LANG*/"No",/*LANG*/"Yes"][v],
-      onchange: v => updateSetting("offsetKeyboard", v)
+      value: !!settings().offsetKeyboard,
+      onchange: v => updateSetting("offsetKeyboard", v?1:0)
     },
     /*LANG*/'Loop around': {
-      value: settings().loopAround,
-      min: 0, max: 1,
-      format: v => [/*LANG*/"No",/*LANG*/"Yes"][v],
-      onchange: v => updateSetting("loopAround", v)
+      value: !!settings().loopAround,
+      onchange: v => updateSetting("loopAround", v?1:0)
     },
     /*LANG*/'One-to-one input and release to select': {
-      value: settings().oneToOne,
-      min: 0, max: 1,
-      format: v => [/*LANG*/"No",/*LANG*/"Yes"][v],
-      onchange: v => updateSetting("oneToOne", v)
+      value: !!settings().oneToOne,
+      onchange: v => updateSetting("oneToOne", v?1:0)
     },
     /*LANG*/'Speed scaling': {
       value: settings().speedScaling,
@@ -49,10 +43,8 @@
       onchange: v => updateSetting("speedScaling", v)
     }
     ///*LANG*/'Release to select': {
-    //  value: 1|settings().fontSize,
-    //  min: 0, max: 1,
-    //  format: v => [/*LANG*/"No",/*LANG*/"Yes"][v],
-    //  onchange: v => updateSetting("releaseToSelect", v)
+    //  value: !!(1|settings().fontSize),
+    //  onchange: v => updateSetting("releaseToSelect", v?1:0)
     //}
   };
   E.showMenu(mainmenu);
diff --git a/apps/keytimer/ChangeLog b/apps/keytimer/ChangeLog
index c819919ed..d2481d44c 100644
--- a/apps/keytimer/ChangeLog
+++ b/apps/keytimer/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New app!
-0.02: Submitted to the app loader
\ No newline at end of file
+0.02: Submitted to the app loader
+0.03: Rewrote to use scheduler library
+0.04: Use theme colors
diff --git a/apps/keytimer/app.js b/apps/keytimer/app.js
index 7d235f9a8..820de1c76 100644
--- a/apps/keytimer/app.js
+++ b/apps/keytimer/app.js
@@ -1,27 +1,27 @@
-Bangle.keytimer_ACTIVE = true;
+const storage = require('Storage');
 const common = require("keytimer-com.js");
-const storage = require("Storage");
 
 const keypad = require("keytimer-keys.js");
 const timerView = require("keytimer-tview.js");
 
+Bangle.KEYTIMER = true;
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
-//Save our state when the app is closed
 E.on('kill', () => {
-  storage.writeJSON(common.STATE_PATH, common.state);
+  storage.writeJSON('keytimer.json', common.state);
 });
 
-//Handle touch here. I would implement these separately in each view, but I can't figure out how to clear the event listeners.
+// Handle touch here. I would implement these separately in each view, but I can't figure out how to clear the event listeners.
 Bangle.on('touch', (button, xy) => {
-  if (common.state.wasRunning) timerView.touch(button, xy);
+  if (common.timerExists()) timerView.touch(button, xy);
   else keypad.touch(button, xy);
 });
 
 Bangle.on('swipe', dir => {
-  if (!common.state.wasRunning) keypad.swipe(dir);
+  if (!common.timerExists()) keypad.swipe(dir);
 });
 
-if (common.state.wasRunning) timerView.show(common);
+if (common.timerExists()) timerView.show(common);
 else keypad.show(common);
diff --git a/apps/keytimer/boot.js b/apps/keytimer/boot.js
deleted file mode 100644
index f202bcbdf..000000000
--- a/apps/keytimer/boot.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const keytimer_common = require("keytimer-com.js");
-
-//Only start the timeout if the timer is running
-if (keytimer_common.state.running) {
-    setTimeout(() => {
-        //Check now to avoid race condition
-        if (Bangle.keytimer_ACTIVE === undefined) {
-            load('keytimer-ring.js');
-        }
-    }, keytimer_common.getTimeLeft());
-}
\ No newline at end of file
diff --git a/apps/keytimer/common.js b/apps/keytimer/common.js
index 8c702de66..6550fc118 100644
--- a/apps/keytimer/common.js
+++ b/apps/keytimer/common.js
@@ -1,42 +1,49 @@
-const storage = require("Storage");
-const heatshrink = require("heatshrink");
+const sched = require('sched');
+const storage = require('Storage');
 
-exports.STATE_PATH = "keytimer.state.json";
-
-exports.BUTTON_ICONS = {
-    play: heatshrink.decompress(atob("jEYwMAkAGBnACBnwCBn+AAQPgAQPwAQP8AQP/AQXAAQPwAQP8AQP+AQgICBwQUCEAn4FggyBHAQ+CIgQ")),
-    pause: heatshrink.decompress(atob("jEYwMA/4BBAX4CEA")),
-    reset: heatshrink.decompress(atob("jEYwMA/4BB/+BAQPDAQPnAQIAKv///0///8j///EP//wAQQICBwQUCEhgyCHAQ+CIgI="))
+exports.running = function () {
+    return sched.getAlarm('keytimer') != undefined;
 };
 
-//Store the minimal amount of information to be able to reconstruct the state of the timer at any given time.
-//This is necessary because it is necessary to write to flash to let the timer run in the background, so minimizing the writes is necessary.
-exports.STATE_DEFAULT = {
-    wasRunning: false,              //If the timer ever was running. Used to determine whether to display a reset button
-    running: false,                 //Whether the timer is currently running
-    startTime: 0,                   //When the timer was last started. Difference between this and now is how long timer has run continuously.
-    pausedTime: 0,                  //When the timer was last paused. Used for expiration and displaying timer while paused.
-    elapsedTime: 0,                 //How much time the timer had spent running before the current start time. Update on pause or user skipping stages.
-    setTime: 0,                     //How long the user wants the timer to run for
-    inputString: '0'                //The string of numbers the user typed in.
-};
-exports.state = storage.readJSON(exports.STATE_PATH);
-if (!exports.state) {
-    exports.state = exports.STATE_DEFAULT;
+exports.timerExists = function () {
+    return exports.running() || (exports.state.timeLeft != 0);
 }
 
 //Get the number of milliseconds until the timer expires
 exports.getTimeLeft = function () {
-    if (!exports.state.wasRunning) {
-        //If the timer never ran, the time left is just the set time
-        return exports.setTime
-    } else if (exports.state.running) {
-        //If the timer is running, the time left is current time - start time + preexisting time
-        var runningTime = (new Date()).getTime() - exports.state.startTime + exports.state.elapsedTime;
+    if (exports.running()) {
+        return sched.getTimeToAlarm(sched.getAlarm('keytimer'));
     } else {
-        //If the timer is not running, the same as above but use when the timer was paused instead of now.
-        var runningTime = exports.state.pausedTime - exports.state.startTime + exports.state.elapsedTime;
+        return exports.state.timeLeft;
     }
+}
 
-    return exports.state.setTime - runningTime;
+exports.state = storage.readJSON('keytimer.json') || {
+    inputString: '0',
+    timeLeft: 0
+};
+
+exports.startTimer = function (time) {
+    let timer = sched.newDefaultTimer();
+
+    timer.timer = time;
+    common.state.timeLeft = time;
+    timer.del = true;
+    timer.appid = 'keytimer';
+    timer.js = "load('keytimer-ring.js')";
+
+    sched.setAlarm('keytimer', timer);
+    sched.reload();
+}
+
+exports.pauseTimer = function () {
+    exports.state.timeLeft = exports.getTimeLeft();
+    sched.setAlarm('keytimer');
+    sched.reload();
+}
+
+exports.deleteTimer = function () {
+    sched.setAlarm('keytimer');
+    exports.state.timeLeft = 0;
+    sched.reload();
 }
\ No newline at end of file
diff --git a/apps/keytimer/keypad.js b/apps/keytimer/keypad.js
index a5edeb2f2..6b34d19f2 100644
--- a/apps/keytimer/keypad.js
+++ b/apps/keytimer/keypad.js
@@ -34,7 +34,6 @@ class NumberButton {
     onclick() {
         if (common.state.inputString == '0') common.state.inputString = this.label;
         else common.state.inputString += this.label;
-        common.state.setTime = inputStringToTime(common.state.inputString);
         feedback(true);
         updateDisplay();
     }
@@ -44,7 +43,6 @@ let ClearButton = {
     label: 'Clr',
     onclick: () => {
         common.state.inputString = '0';
-        common.state.setTime = 0;
         updateDisplay();
         feedback(true);
     }
@@ -53,10 +51,7 @@ let ClearButton = {
 let StartButton = {
     label: 'Go',
     onclick: () => {
-        common.state.startTime = (new Date()).getTime();
-        common.state.elapsedTime = 0;
-        common.state.wasRunning = true;
-        common.state.running = true;
+        common.startTimer(inputStringToTime(common.state.inputString));
         feedback(true);
         require('keytimer-tview.js').show(common);
     }
@@ -100,7 +95,8 @@ function getFontSize(length) {
 
 function updateDisplay() {
     let displayString = inputStringToDisplayString(common.state.inputString);
-    g.clearRect(0, 24, 175, 43).setColor(storage.readJSON('setting.json').theme.fg2).setFontAlign(1, -1).setFont("Vector", getFontSize(displayString.length)).drawString(displayString, 176, 24);
+    let t = storage.readJSON('setting.json').theme;
+    g.setBgColor(t.bg2).clearRect(0, 24, 175, 43).setColor(t.fg2).setFontAlign(1, -1).setFont("Vector", getFontSize(displayString.length)).drawString(displayString, 176, 24);
 }
 
 exports.show = function (callerCommon) {
diff --git a/apps/keytimer/metadata.json b/apps/keytimer/metadata.json
index a982594f1..43edf9957 100644
--- a/apps/keytimer/metadata.json
+++ b/apps/keytimer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "keytimer",
   "name": "Keypad Timer",
-  "version": "0.02",
+  "version": "0.04",
   "description": "A timer with a keypad that runs in the background",
   "icon": "icon.png",
   "type": "app",
@@ -10,6 +10,7 @@
     "BANGLEJS2"
   ],
   "allow_emulator": true,
+  "dependencies": {"scheduler":"type"},
   "storage": [
     {
       "name": "keytimer.app.js",
@@ -20,10 +21,6 @@
       "url": "icon.js",
       "evaluate": true
     },
-    {
-      "name": "keytimer.boot.js",
-      "url": "boot.js"
-    },
     {
       "name": "keytimer-com.js",
       "url": "common.js"
@@ -41,4 +38,4 @@
       "url": "timerview.js"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/apps/keytimer/ring.js b/apps/keytimer/ring.js
index c42c11394..9f4c01b30 100644
--- a/apps/keytimer/ring.js
+++ b/apps/keytimer/ring.js
@@ -1,28 +1,95 @@
-const common = require('keytimer-com.js');
-
-Bangle.loadWidgets()
-Bangle.drawWidgets()
-
-Bangle.setLocked(false);
-Bangle.setLCDPower(true);
-
-let brightness = 0;
-
-setInterval(() => {
-    Bangle.buzz(200);
-    Bangle.setLCDBrightness(1 - brightness);
-    brightness = 1 - brightness;
-}, 400);
-Bangle.buzz(200);
-
-function stopTimer() {
-    common.state.wasRunning = false;
-    common.state.running = false;
-    require("Storage").writeJSON(common.STATE_PATH, common.state);
+// Chances are boot0.js got run already and scheduled *another*
+// 'load(sched.js)' - so let's remove it first!
+if (Bangle.SCHED) {
+    clearInterval(Bangle.SCHED);
+    delete Bangle.SCHED;
 }
 
-E.showAlert("Timer expired!").then(() => {
-    stopTimer();
-    load();
-});
-E.on('kill', stopTimer);
\ No newline at end of file
+function showAlarm(alarm) {
+    const alarmIndex = alarms.indexOf(alarm);
+    const settings = require("sched").getSettings();
+
+    let message = "";
+    if (alarm.msg) {
+        message += alarm.msg;
+    } else {
+        message = (alarm.timer
+            ? atob("ACQswgD//33vRcGHIQAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAAAP/wAAAAAAAAAP/wAAAAAAAAAqqoAPAAAAAAqqqqoP8AAAAKqqqqqv/AAACqqqqqqq/wAAKqqqlWqqvwAAqqqqlVaqrAACqqqqlVVqqAAKqqqqlVVaqgAKqaqqlVVWqgAqpWqqlVVVqoAqlWqqlVVVaoCqlV6qlVVVaqCqVVfqlVVVWqCqVVf6lVVVWqKpVVX/lVVVVqqpVVV/+VVVVqqpVVV//lVVVqqpVVVfr1VVVqqpVVVfr1VVVqqpVVVb/lVVVqqpVVVW+VVVVqqpVVVVVVVVVqiqVVVVVVVVWqCqVVVVVVVVWqCqlVVVVVVVaqAqlVVVVVVVaoAqpVVVVVVVqoAKqVVVVVVWqgAKqlVVVVVaqgACqpVVVVVqqAAAqqlVVVaqoAAAKqqVVWqqgAAACqqqqqqqAAAAAKqqqqqgAAAAAAqqqqoAAAAAAAAqqoAAAAA==")
+            : atob("AC0swgF97///RcEpMlVVVVVVf9VVVVVVVVX/9VVf9VVf/1VVV///1Vf9VX///VVX///VWqqlV///1Vf//9aqqqqpf//9V///2qqqqqqn///V///6qqqqqqr///X//+qqoAAKqqv//3//6qoAAAAKqr//3//qqAAAAAAqq//3/+qoAADwAAKqv/3/+qgAADwAACqv/3/aqAAADwAAAqp/19qoAAADwAAAKqfV1qgAAADwAAACqXVWqgAAADwAAACqlVWqAAAADwAAAAqlVWqAAAADwAAAAqlVWqAAAADwAAAAqlVaoAAAADwAAAAKpVaoAAAADwAAAAKpVaoAAAADwAAAAKpVaoAAAAOsAAAAKpVaoAAAAOsAAAAKpVaoAAAAL/AAAAKpVaoAAAAgPwAAAKpVaoAAACAD8AAAKpVWqAAAIAA/AAAqlVWqAAAgAAPwAAqlVWqAACAAADwAAqlVWqgAIAAAAAACqlVVqgAgAAAAAACqVVVqoAAAAAAAAKqVVVaqAAAAAAAAqpVVVWqgAAAAAACqlVVVWqoAAAAAAKqlVVVVqqAAAAAAqqVVVVVaqoAAAAKqpVVVVVeqqoAAKqqtVVVVV/6qqqqqqr/VVVVX/2qqqqqqn/1VVVf/VaqqqqpV/9VVVf9VVWqqlVVf9VVVf1VVVVVVVVX9VQ==")
+        ) + /*LANG*/" TIMER"
+    }
+
+    Bangle.loadWidgets();
+    Bangle.drawWidgets();
+
+    let buzzCount = settings.buzzCount;
+
+    E.showPrompt(message, {
+        title: alarm.timer ? /*LANG*/"TIMER!" : /*LANG*/"ALARM!",
+        buttons: { /*LANG*/"Snooze": true, /*LANG*/"Stop": false } // default is sleep so it'll come back in some mins
+    }).then(function (sleep) {
+        buzzCount = 0;
+
+        if (sleep) {
+            if (alarm.ot === undefined) {
+                alarm.ot = alarm.t;
+            }
+            alarm.t += settings.defaultSnoozeMillis;
+        } else {
+            let del = alarm.del === undefined ? settings.defaultDeleteExpiredTimers : alarm.del;
+            if (del) {
+                alarms.splice(alarmIndex, 1);
+                let state = require('Storage').readJSON('keytimer.json');
+                state.timeLeft = 0;
+                require('Storage').writeJSON('keytimer.json', state);
+            } else {
+                if (!alarm.timer) {
+                    alarm.last = new Date().getDate();
+                }
+                if (alarm.ot !== undefined) {
+                    alarm.t = alarm.ot;
+                    delete alarm.ot;
+                }
+                if (!alarm.rp) {
+                    alarm.on = false;
+                }
+            }
+        }
+
+        // The updated alarm is still a member of 'alarms'
+        // so writing to array writes changes back directly
+        require("sched").setAlarms(alarms);
+        load();
+    });
+
+    function buzz() {
+        if (settings.unlockAtBuzz) {
+            Bangle.setLocked(false);
+        }
+
+        const pattern = alarm.vibrate || (alarm.timer ? settings.defaultTimerPattern : settings.defaultAlarmPattern);
+        require("buzz").pattern(pattern).then(() => {
+            if (buzzCount--) {
+                setTimeout(buzz, settings.buzzIntervalMillis);
+            } else if (alarm.as) { // auto-snooze
+                buzzCount = settings.buzzCount;
+                setTimeout(buzz, settings.defaultSnoozeMillis);
+            }
+        });
+    }
+
+    if ((require("Storage").readJSON("setting.json", 1) || {}).quiet > 1)
+        return;
+
+    buzz();
+}
+
+let alarms = require("sched").getAlarms();
+let active = require("sched").getActiveAlarms(alarms);
+if (active.length) {
+    // if there's an alarm, show it
+    showAlarm(active[0]);
+} else {
+    // otherwise just go back to default app
+    setTimeout(load, 100);
+}
\ No newline at end of file
diff --git a/apps/keytimer/timerview.js b/apps/keytimer/timerview.js
index 48c896ba0..1b01fec6c 100644
--- a/apps/keytimer/timerview.js
+++ b/apps/keytimer/timerview.js
@@ -1,20 +1,31 @@
+const heatshrink = require("heatshrink");
+const BUTTON_ICONS = {
+    play: heatshrink.decompress(atob("jEYwMAkAGBnACBnwCBn+AAQPgAQPwAQP8AQP/AQXAAQPwAQP8AQP+AQgICBwQUCEAn4FggyBHAQ+CIgQ")),
+    pause: heatshrink.decompress(atob("jEYwMA/4BBAX4CEA")),
+    reset: heatshrink.decompress(atob("jEYwMA/4BB/+BAQPDAQPnAQIAKv///0///8j///EP//wAQQICBwQUCEhgyCHAQ+CIgI="))
+};
+
 let common;
 
+let s = require("Storage").readJSON("setting.json");
+
 function drawButtons() {
     //Draw the backdrop
     const BAR_TOP = g.getHeight() - 24;
-    g.setColor(0, 0, 1).setFontAlign(0, -1)
+    g.setBgColor(s.theme.bg2).setColor(s.theme.fg2).setFontAlign(0, -1)
         .clearRect(0, BAR_TOP, g.getWidth(), g.getHeight())
-        .fillRect(0, BAR_TOP, g.getWidth(), g.getHeight())
-        .setColor(1, 1, 1)
+        .setColor(s.theme.fg2)
         .drawLine(g.getWidth() / 2, BAR_TOP, g.getWidth() / 2, g.getHeight())
 
         //Draw the buttons
-        .drawImage(common.BUTTON_ICONS.reset, g.getWidth() / 4, BAR_TOP);
-    if (common.state.running) {
-        g.drawImage(common.BUTTON_ICONS.pause, g.getWidth() * 3 / 4, BAR_TOP);
+        .setColor(s.theme.fg2)
+        .drawImage(BUTTON_ICONS.reset, g.getWidth() / 4, BAR_TOP + 12, {rotate:0}); // rotate option centers the image
+    if (common.running()) {
+        g.setColor(s.theme.fg2)
+        .drawImage(BUTTON_ICONS.pause, g.getWidth() * 3 / 4, BAR_TOP + 12, {rotate:0});
     } else {
-        g.drawImage(common.BUTTON_ICONS.play, g.getWidth() * 3 / 4, BAR_TOP);
+        g.setColor(s.theme.fg2)
+        .drawImage(BUTTON_ICONS.play, g.getWidth() * 3 / 4, BAR_TOP + 12, {rotate:0});
     }
 }
 
@@ -38,8 +49,6 @@ function drawTimer() {
             if (hours >= 1) return `${parseInt(hours)}:${pad(minutes)}:${pad(seconds)}`;
             else return `${parseInt(minutes)}:${pad(seconds)}`;
         })(), g.getWidth() / 2, g.getHeight() / 2)
-
-    if (timeLeft <= 0) load('keytimer-ring.js');
 }
 
 let timerInterval;
@@ -51,14 +60,14 @@ function setupTimerInterval() {
     setTimeout(() => {
         timerInterval = setInterval(drawTimer, 1000);
         drawTimer();
-    }, common.timeLeft % 1000);
+    }, common.getTimeLeft() % 1000);
 }
 
 exports.show = function (callerCommon) {
     common = callerCommon;
     drawButtons();
     drawTimer();
-    if (common.state.running) {
+    if (common.running()) {
         setupTimerInterval();
     }
 }
@@ -71,37 +80,22 @@ function clearTimerInterval() {
 }
 
 exports.touch = (button, xy) => {
-    if (xy.y < 152) return;
+    if (xy !== undefined && xy.y < 152) return;
 
     if (button == 1) {
         //Reset the timer
-        let setTime = common.state.setTime;
-        let inputString = common.state.inputString;
-        common.state = common.STATE_DEFAULT;
-        common.state.setTime = setTime;
-        common.state.inputString = inputString;
+        common.deleteTimer();
         clearTimerInterval();
         require('keytimer-keys.js').show(common);
     } else {
-        if (common.state.running) {
-            //Record the exact moment that we paused
-            let now = (new Date()).getTime();
-            common.state.pausedTime = now;
-
-            //Stop the timer
-            common.state.running = false;
+        if (common.running()) {
+            common.pauseTimer();
             clearTimerInterval();
-            drawTimer();
-            drawButtons();
         } else {
-            //Start the timer and record when we started
-            let now = (new Date()).getTime();
-            common.state.elapsedTime += common.state.pausedTime - common.state.startTime;
-            common.state.startTime = now;
-            common.state.running = true;
-            drawTimer();
+            common.startTimer(common.getTimeLeft());
             setupTimerInterval();
-            drawButtons();
         }
+        drawTimer();
+        drawButtons();
     }
 };
\ No newline at end of file
diff --git a/apps/lato/ChangeLog b/apps/lato/ChangeLog
new file mode 100644
index 000000000..686f3b707
--- /dev/null
+++ b/apps/lato/ChangeLog
@@ -0,0 +1,3 @@
+0.01: first release
+0.02: Use clock_info module as an app
+0.03: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/lato/app.js b/apps/lato/app.js
index 6045d7f17..88e723a78 100644
--- a/apps/lato/app.js
+++ b/apps/lato/app.js
@@ -37,13 +37,13 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
 {
   // 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 draw = function() {
     var date = new Date();
     var timeStr = require("locale").time(date,1);
     var h = g.getHeight();
     var w = g.getWidth();
-    
+
     g.reset();
     g.setColor(g.theme.bg);
     g.fillRect(Bangle.appRect);
@@ -66,7 +66,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
   /**
    * clock_info_support
    * this is the callback function that get invoked by clockInfoMenu.redraw();
-   * 
+   *
    * We will display the image and text on the same line and centre the combined
    * length of the image+text
    *
@@ -76,7 +76,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
     //g.reset().setFont('Vector',24).setBgColor(options.bg).setColor(options.fg);
     g.reset().setFontLatoSmall();
     g.setBgColor(options.bg).setColor(options.fg);
-    
+
     //use info.text.toString(), steps does not have length defined
     var text_w = g.stringWidth(info.text.toString());
     // gap between image and text
@@ -88,7 +88,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
 
     // clear the whole info line, allow additional 2 pixels in case LatoFont overflows area
     g.clearRect(0, options.y -2, g.getWidth(), options.y+ 23 + 2);
-    
+
     // draw the image if we have one
     if (info.img) {
       // image start
@@ -110,8 +110,8 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
   // clock_info_support
   // setup the way we wish to interact with the menu
   // the hl property defines the color the of the info when the menu is selected after tapping on it
-  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
-  
+  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app : "lato", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+
   // timeout used to update every minute
   var drawTimeout;
   g.clear();
diff --git a/apps/lato/lato.fast.js b/apps/lato/lato.fast.js
new file mode 100644
index 000000000..88e723a78
--- /dev/null
+++ b/apps/lato/lato.fast.js
@@ -0,0 +1,138 @@
+/**
+ *
+ * Lato Clock
+ *
+ * The entire clock code is contained within the block below this
+ * supports 'fast load'
+ *
+ * To add support for clock_info_supprt we add the code marked at [1] and [2]
+ *
+ */
+
+Graphics.prototype.setFontLato = function(scale) {
+  // Actual height 50 (54 - 5)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADkD8AHFg/wA4sP/AHVD44HHgPALD0OA40+F43+H4wHGn/8A4v/L4sH/5PFj//CxkD/6eFCw9/GooWHh//wAWLgP/TgoWHn5rFCw41BMYqCHaRDKGgzLYKAJgFv//LIhQBAAI7DWgIABU4adBAAJTDn4HCVAaOCQQhvDAYQuBDYaxBgJEDh4HBgYzDPgUDIYYECA5DUDgIHBg4HEEgIHfF44/EA45HDL4xvHP46PHT5CvHX47PDGYcDb4zvHf5AA/AA9wA4yoDZYq/DXAgHDXYQHEXYQHEj4HHXYQHDn6UCA4d/e4sAXYYHCd4gHCXwbADA86DFA/4HGAGA3Db40HA4UDe40Hc4YHCh7nDA4UfA4X/A4U/A4b/Cv7vGX4UB/A+CZ4YaCgf9A4sH+IHCHwfjA4JWDj/DA4s/wYHFv4kCA4f+A4pKBA4sD/AHCG4R9BA4YCBj/gA4s/4AECN4R5BA4f/gf/Mgn///+A4wZBA4d//6JBA4c/VATHEVASUEEwIHEAAbnDAGbyCAAg+DgKwDA4S4DLQSlCSYQHCn4HDFAV/bAX/4ADFCYgbCh4zHZ4SlBR4iSEA46XCe4QHCDgJWCngHOnwHGvwHRG4iFBI4ppBA4f4OIRnCN4MD9+AO4f///v8CHCDoP/54CBS4f/44CBU4f/wYHBX4f/EQLHDh6gB/6jDZQaTDAEUcA40/A4xODYoYHGgYHGh4HGNIIuG74uGz4uGj4uF/gHFh/4A4sf+AHFn/AA4q0BA4kBVgIHEFwIHFFwIHFj7jBA4guBA4rjCA4YuCA4guCA4r0BAATgBA75SEa4wHvAEEBA40DUYIAEg4HDgZ0Bh67BXAQHCZYJMBA4UHA4KPCA4SXEAgQHL4IEBgIHC/AMCgP4CQUDFgIHoIQY3DA4wCEDggHFO4YHB/iHDCQX+gE/S4IHCOIP/U4IHCv6CBA4k/A4K1CEQKpBEIIHDh//HILSDTQK+CAAd/f64Amn4GFgLxCAAZfBSIIADN4heDP4YeDR4Z5CEwN/U4IABg4NBj6ADEwLHDIoQtBVgQuCHoIHDFwIHBe4QLB/14A4kH/i1BeQQuB/AHFn/wA4pLBA4guBwAHELoMAA4o9BA4Q3BgYFBJ4gCCA4pqBvxvDf4T2Bh4HCIIc/R4MCKISfBS4aQCU4gHDX4ioBY4paBNwQAD/6uDAAUOf4wAjO4QHNdQYHYmAHGW4gUEA4kPA4z7BA4v/A4qYBY4QHCh63CA4c/V4QHDV4Y6DV4YHCDwYHDDwYHDv7ODA4MBZwgHBcwL1DA4MfdogHBDwgHB+LtFgf3DwhMCDwgHCDwhcFA4geEA4IeFA4IeFd5AArj77EsCgB/gGCg5QBOQkf/6oB/77D//DA4JrCv//44HB4DkC//n/E/MgIcCRIMPA4X8RIUHegQCBFoL8DA4cBA4QaBv4HGvwHBTgMHHQM+HgIHhF44HFJ5RfGN45/Bz6NBP4SPHT4XnT4ivHX47PHgCQCb4bvIAHxdBMgRfD/58CKgf/WgIADP4JlFR4J1ET4QHCiACBQwQEBuC/CDIIHBX4QtBn+Aa4sfZ4bvCh+Ah4HGUAUHA4d/AgIHEa4QHDwJyCA4eDKIQHDx5pCA4bPDG4c/RIRPCjwuCA4aJBUwZnCRAcBP4SgE/+D/7+ET4ImDA4jIEX4KvFh7HGgbXGgF+f6oAggZeBSgShEb4RYCagQHGh5iDA5QXEE443HADoA=='))),
+    46,
+    atob("DhglJSUlJSUlJSUlEA=="),
+    64+(scale<<8)+(1<<16)
+  );
+  return this;
+}
+
+
+Graphics.prototype.setFontLatoSmall = function(scale) {
+  // Actual height 25 (24 - 0)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADE//lwj/+nEP/kcDCGAgEfAQIAFgfwgEB/AZIggCB4YCBsO8gEz/0Av/8gP/DgP+jAiBhvggO/+ED//gh/9wEH+HAgEYsEAhhMJkEB8E4gf4h0B70HgPDgOA4P//f///9//4mEYjk4h0PnkDgZEBwH8FhMfAQXAiEYDoMMjE8g0MDwOOnBgBvEAnwCBgFwAQJsBgHn8ACBGIPjg0B4ODgPA4OA4FxNoIvBgEHAQIAGVIMBTAM4/6bB8PAv/gsE4+BmCJQMHhgvB50D4F2gHgLwMwh7eCFwM+JwJhBZwgAHGwMAvwNJe4QCBv4TBVYPB/EB/J0Bj1AgECC4rZC8/AgfxDAPgn//4BsCABECEQMBkCkDCgaBBGQICBhJhCwAgIUgVgAQMwAQJ4CIoMB/4pB/6uCD4QYLABMHJgMDJgT0CO48GSogxMAA0cAQMOGIQMFVoMBAQMHAQMPEoM/agcBMoJIDGYTWDTIMHXQMH4H4g+Aj0DwEHJgIBBDAPAJgNgnEAuEPXgIeBSoQCBj49BABYjBjA+BhgCBgwCBga3B/+AAQPAv5EBZZIAK4CKB8D5B+ACB/CQB9iwB8ywB8Y9B8OA8Hg4E/8FgKwMwPILkLhA/BWgM8gY0CuACBnEMAAMGAAMDg5jB4eDMYPjGIO/4EPx6dBeAYACAoTZCZATOBgPMAQPGZQPDAQOBwDEBSYKPBSoyLDOgIAJjixB/4gB/+B4FxwFgmHAmEYsEYhk4CYMcjhjB/0BwP+D4N8FZSFBgEHLQMPCoMPPgMPGIMe4FgjwzBjwzBhwuBgkPToMDFwQCCBAIAFe4prBgTgBg6gBh6EBj8AsE+gEwKAMYIYMNUgMHVQJPCXIwADEIMH5/gg///EHj0OcAeDDQPBGYNgAIM4+Fwh/8vEH841B8ICBABZBCh4RBg57Bg8HGIMBx4vB58A4FvgFwv0AngCBGIJdBAQIMBFY8CgGAcoPggPACAJPBCQ0ICYI2B2CaB+A4BExBUCcwSTBgZaBgOwAQPcBgPGAQPjB4KGBJQIkBdIJ/MAAczAQMZDwMMDwMGsA0BmAxBzAPB5gCBswYKAB7QBI4ICBjhNBgwuBge4B4PYAQN8AQMcAQMOUoYAJDoMAVIUYhk4hkPjkGh6pBxxcB/wPBbIJTBD4s/LQN/foN4jyYBV4LVCmF+nEwv+MjFw80MuEjLIMw4cYmFhx/8mHH/0wseBzC2BxkGZAMB8bLBv40Bh6VBAAb0BPoIMCc4MfI4QLB/+Agf44ED+FggPgO4P8F4M/xgdBNoQYCg/wAwIJCh4xEPAv/+Ef//4h///kGAAMDAAMBwOBwHAAANgAAM4uFwj/8nEH+/4gPx/gmBvDHGgILBgZdBg//8BuB/CpBjgCBg8BNAOA8AEBsC0CcoL4BnD4BjkHaoIQBA4NAUwIAIMYo3B/0DH4J6BAIKmBGIydBjAxEhwxDf4SPBUgKhCOQQAHN4P/gICBwACBSocwAAMYAAMMAAKuKJQIsJAAJjDGIrGBMIJkBGAJhBMgIwBgAwBJQJ9Be47KEEoOAFYPwgPgvB8CY41wSo5hBhkHgZjBwOHLwIlBuF/wEQn45IMZR7DMYIwBAQIyBMgICBeQRjBMggYBv//8DNB+D5CTxcAY4QYFCpgyDPgIGB8ACBQIMAvEPGgJjB/hjBHRpKCDAP8PgRjGXAIIBEIMD7wCB47HB4HgAQM8YQMPC4IEBSwkgGgoxFVwSWHV6QAEVxEHEYR4Cj4aCRwQJGCYIWCAQUPIYIOCnwCBvgxKcCsHUIgoDh5AEgDyCjwCBCwiVKABH8C4P/XgI3BDoN8gPAhwCBY4PgAgNwgHgVgMwVgMYh0AjkHgEOCYIEB8ACBnhRBOwIrCGgN+H5I9BCQJ8FF4bcBhjcBgzcBgb1BgPBPgPxAQM/RgMPAQJSBFgkfQoM/R4N//xKCwE4CYM4gFwjkAnBjCGYx8ICoP4g+BVAXzwF/8C1B4CLBAA75FY4RjGwBXBF4VgR4M4m+Ah/5UYP4nkB/BPBDQIqCNQIABZ4Q9BIAPwMYM4Y4MOGYMHGYOBwJjB8IzBvPgjEf8EMg6ZBE4J8BF4ZKBAYKkCsACBNoRjFg//QQIYOcQIAGTYPwfILHBfgTbEQYKBBAQL9BY4ICBg4dCCoICCg/AVwPAJQKCBE4IxDJQRuCBYUfGAMD/DLCEIXwAwK7BgEPCYQMBv4cDDASuBAQIoBg5CCPgoqCv4GBj/8AwJKBDIIGCGIU/BgQfBBYIrCn4UBj5CCGIMDLQU/AwxhCBIIcD8ClBwEHKwimDAANAY4NgVIPwGIPwgfBDwP5EgMfNQQtEJoUH74CBwfgh+A/B8Bjx8BgcBFwOAP4TbCnhgCdAStCvgJCPIJUCAQPAB4Q3CHoUPAQKuGMQYABMYUwMAMYXIMMgP8g0B+xIB8cBwfhwHD4HAs/AsE34EwdYMYJoMMg8AgxjCGAoADv///8/AQOYBAPMAQNkAQMQfhDdCgZ5CnwCBg5tBQAgXCBITLBC4JmBgIxC543B84CBEYQAKkC4EewQWBgIsCAQTEGBIQ1BABcMAQMGMQRvFZIK9CEAa9BDAwMDjh7CD4oANLYMw/gpBvwfBsYsBmOAg0Y4EDhlggPmIAN/O4MfDAIALTwPgcAIuBuBMBmBWBmBWBjBvBhhPBg8BGIP3OQIbBgE/PAQAEgY6Bgf/AQPvwEDwHgEAIuB4CIBsAxEjiBBgykCAAouCv5NBn18gE4hxKGEAJKBXoXA8E///4j//Phf+PoS5B/pjB804gFjJQMxwwxB4YxBsJ8BmPAgP4GIN8d4QABoDnEUoICCwACB4DPBE4IzBZ4IZCgUAh0T4EP3/wh//jEGmeMgcI40BwwdB4wdBu4dBn+O8Efw/gPgPgEYKXHPgqzBMAICESoLKBAQLlBLQTXBn4YBgaMCAAhcBgHjewNx//wnAYCAAliAQMzx///PHB4IYBbQIAHOoP+g6VCgCkCXoLwBAQN/HIN5ZQN4BgMwfIMQLYRJDAAd/GgL5PHAPAgZjBgB8CAQRACcAUcKIeAgIYBAQPgSoYYIj4uDDAY+JZwauBKILEDY4xrCEAVwDAhHBagR8GB4IIBn5pBnzKBnCVBjApBhgpBGIJ8BLYJjBFgN/ZoMfAQMHaZJKBagJpBHwNgO4Nghh8BFIIxFg4sBDAJeBAQUfQo8DZoKVBAoPnDAOAVwOAFwPAjAxEAQMMMwJ/B/AbBdpSuIg6rEGIKuHcAQACg+GAQPDMYPwJQMYSoOOJQPHJQNhHoM4AQMIngeDgg0FPgJWB+BWDSoxFBA4LjDVwIFBDALKBN4R5BFIZbJAQKIBDAgAEhBpCDQMDdgV/AQMP8ADBDAUeTIQCBTYMBE4IYCcoILBHgQ5CnwCBj4hBgIYBeAcBBIKcBBAY3CSIUfIgQ6Cn4YEGoUPPgQLBGIS2BAASVCY4OB8EB+IbBn4CBh4YBgYCCLoMH7wCBw4YBwAYBgEQEwdAJRHwS4N+BQMPQYRUBJoUHGgJpCj7MEfITgDwFwKQN4SoN8fIP2MYPzfIPhwAkBJQPgsCuBmAYBOghUBgHB4OB///+P/7/8HgMGYAMDkDJEABEDDYP9AQLOCABJcCmYCBjPHx8cDAP8j4CBGwIaIH4MAOQICDL4LUDRIUHQwYDBLYMATwMAUgIbDAA8gS4NwnEAvAnBv8MgH+4kA/MygP4zsB+FOwfwl1D8EUk/ghkX4EEh/AgUHWAL8BgOBwEDIQUAnEGgUYh8BxEPwF0j9Aj0fkEPn0Qh2+hEOvkEgk8gRvBgZtCXRYANg8f/kDz/+gPD/4WNdwTcBgP/LgPgT4PgRoNgRQM/BgLXB4F8WoLWB4AEBDAOAagQAEMQMARQIrBweAeYPAEgPgAoMwjkYjEMAAMGAAIXBgcB4KjBbgPAIQT9EAA8wbwJ4BPgICBgeOHQQPB4KhBsBTBnBsBj/wgEd7kAHgIqJPQInBwMggPwyEAn1IBIPkBoJjBgF/EoP//EB/VAgfxkED8GQgPADALhOj/4v/v/k/EoIALjhsBz6SB//Dwf88HBx04sHHhkwsPHjEw8f8jk//kEh+8EYpKBAYJeBgCxBAAcIAQMOPgQVCDgsH/ACBx4SBEYMGnEwg1/zECv/mgdwucB2EcwGYg1ApkDkE2gOQjeBzEE4HMgazC4ACBmA8Bh88OYLjBAAsIK4MMSAMGtARBkhQByzGCUoS1MD4MBFYMD44FBxIWBj4OBn6KBniHBhCECABcwAQMYAQJcBJAICBM4IrBIISyCsACBnxOEh4MCAA6uJGoICBjEC//2gd//cB2PAVwNgVwM4kE3n0QjP77EEvHsIwMcVx50CL554CiBWEgYPBgbHBgYwBgOGBgPDAQNhVoQCBg7KIgw5BgY5BgOBCAPAFINgsED/+wgP/7CxBF4IYMAA8MK4MOnAaBPATABgP7B4N5I4VADAhzBDAdMDAMmDAP/B4N/DAMBbZKVE8ACETYQAGn//8Ef//wh//e4LzBWY8YJIQCDDALdB/6jGg4CCHAMHEwMHdgKeBLoQXB/40Bv///gvIg4PBwYCB8ICB8BIIbQgZCFYMDCYMBO4QAMgSzBgegAwPwAQKzBAA8QJoUggEcAwMPNIgjBDA8PIYMPIAMGKgMDhBJBwgPB9y6CAQMOJ5cOQgMDzwGBGoWcFgPhOAM9AQMHOwTAGLo0cLocILoMMLoMeLoM8PYl4Qgi2BUIPgU4PQgeB5ACB40BbwI4BHYY+DgjGCOwMHgkGgf+g75Bh4NBMwUcAQI9CHQVwAQPxw0B8PHgPA4+A4FnOAM+fYMOfY0DjACBwxFByIJB5gaBv/B8Ed8YeBgZQBg7LCVwkeX4M8hqBBjmAAQNgiDxCfYICBM4J2DgaQBgbIBgOOgPHwcA8fBwFx4A4BUAICBLQLDDEoR6C/weB/kgg/4jA3Bh0/xkDn8GgHegcAl4qBgf4FQM/FQIYBEIN/AQMPGgTbCGIRtBNwISEG4JZCfoMAj/GgHfLgPvNgPnfINh/lgmEfOQg7BT4QxCbAQxCGhkDGgMDz/GgOfGgPPGgNnGgM5GgMMGiaGBcIcfQwQFB/8B4P/gHH+IuDmfAsEN/Ewh1/jEGPgQYBTYjBBMAgxCeYYxBCQUf4JvBwPA/+A8bHBgfwsEB8EwgH8jDgCg8D/0BDAJmFRgIoBGIkAGIIgBCQY3Cn4LBv/AmKSBnpjBiXwjEPv0MgbgCgJmCDAUD/DEESoQxCTwsPBAMfAoM/C4l9BAJsBgJsHCIJfBn//IQMf/EMAAMGAAMDAAMBwOBwHAAANgAAMwAAIgBAIIAFVobABFYLCBg/AjkA8ACBnEOgEco5dB0ZjB6OAgO4DoPcuAVBnEAuAVBuECgBaBABEf//4h///nH//+sZaBnJaBxxZB4ZaGAAJzDgABBABaMCGIqMChYxBhoxBxgxB5wwBswwBmQxDgABBABf///Av//8G/GgPYDYPMJoNmGgMzGgMZGgOGGgPBMwaJLFw/nMYPzzAuBxjwHSoWcMYguJ4ACBsACBnIuBxwCB4ZgCIhgABgoVBwwCB4xKCBYMDAQMBCQUgAQI7CmYVBjICBxgbCCoWAAYNAAQI7CuACBiISBwB8FGIQYBgJgCGQcYAQLPBg///0DDYMBEISFB4CFDAALpDhCeBgCeBwEHFYIEBuACBj0HBQIhBEoI8Bn6JKj///EP//8IIUA+BJBnkAh0PwEGgPgSQN4GgMeYIMDJoIWBMoM8LQZ8EY5UfI4QyBv43BngyBnEB404gFzjjvB50Ajl2OYMbUIJzD8AEBXAPgCoPgg+BKIP/FYQ9Bh62DAAcB/AjB/64CDAPA/ApBjilFwQxB4ZwBsewgEzzhKBxxKBw6OBCoMORYKJBn4rCNIMA/h8V4G4gFw7kAnB8C8x8BuZYBjJKBwxKB4J8niZ8BjoxBxgxB4x8CmEAmBKFo58m475CVwIxDgx8BgZ8EzhKB5x8YAAUYhhbBLIMDcIMA9wCBnwCBBYIeBKYMOEgMOJYIYCgRFBABJsEwF///AvhBBdIU4gfwjkD3EOMQMGg5sBg8DPoK/B94VBvxpBUwPgj+B+EfNgMMNhzmD//8gP//8QOIOMBwPnAQNxKQMYoEAhkgO4cHAQh9BMAOAcwOAj7jIAAIxB/EAGgK6BPIILBKILgBGIMcGIMGmBEBUYMDzAdB5ACBDAMDOYJdBh4CBMYKxKv/+WII0BRIQxBnBjCGIMHAQMBGIMA5wCB8YCBuB8BuAFB/AxB/CVB/BjBVBQxBwBKB+AYB/gfBhxjCzhgDgFgAQMxAQM5BIMcQYMcBAM+GIJdBAQV/+AxDaILCEKIMBBwU+YwcBD4PhZAPxAQP54APB4F8gFAYYMBAQMADwRICRgIAGTwPwNgP4NgLtB4CaBsEYgEwhkAjEGJQMHJQMDIIPnJwKVCn7cCFw7gCTAQCB/BsCEwMMgcDg8BwfBwHD+HAue4sEfx1wh+D+EBwJkCFgw3Bh/AoOH8Ex40wjnDjEPsOMgOw40Aj1mLQLdBdpkAvBzBvxMBn52BmOAi0Y4E7hlgnOGmEY+cwhE/SoMPcAIAJgY0BNQMGsP4g1xxkHmHGgcYscBxgxBs+ZwEZSoMAv7YCABEeTgMfwFjPgNzxlgmJKBPgQ0BxkDnnMgeP/5DBPgIoKGgMw/kHPgMDzhKEgx8BkZ8C81gjl/YgMfPgIAJg6xBY4J8CjnjjEfJQMIY4MG7AxB98zJoSSBPgTKLhjKBh0/JQMw4CfBsBUBmEA404gFzAQMfKAMHKAMH94CBmIYIjAYBhgYBxwSB4w3BIwIADv4CCBIN9SoNwjlAmEHkEYgfQhkBdoMA7kDwAVB4FgRY4eBJQuHJQNjJQM5JQMOJQVjJQM5JQMPJQMD8aLHQoICBTYM/SQIYCjHDgHssOA8yVBGIUh5lwgF+P4MfGgIAFgJNBgP/gER/fAjIYBjhKBhhKBg0xw0DzAxBt1jwED+JEB/CcFAAMPJoMP/EDx/egPODAJKCY4oxCh1zjkCj+MY4gABF4MAVIU5//whn//ECv5aBABE3//Amf/8AYCO4UCAQMDAQUf/8Bx//wHnDAKNBgE4AQMcAQMEGIU//0Dz4YBOg0/AQN/8EQnhNBnEcg3Yg0D9g2B80BwFzgHAvnA8BQB8C3BcASeHAAUHJQMTCQM4CIMYAQMMQwMDK4MBzACB5wYB44YBFYcf+AoHBAMHNIMH78Aw5oBsawBnOAmEO4CXBsEMQwMOcYP+HAICBgACCAAsfJYI3Cj98T4MHKgJ8Bmx8BP4IxDiBoBPgP4FwICBgYCBAA1/AQQuBvvwg1wFgMwVwMYgcBxgxB8wxBmeAPgKrDAQMPAQIAFgJ/BSQMAmP34E54FwVwMYVwMMGISuBGIPOgeA4f/wAuBAQM/AQKuKgOHVwPnVwJ8CKQLYBGIMOGISuBgKuPYYMAgwCBgZgCHoMI4kAh1nHQJ9BgeZSoIYLABM/xACBRIM8boM4n0AjE7EgLYBXYPAgdwMYPwuEA/p2B/4CBs4CBQoxpC//AWgPwiAsBJgJ8BJwKNBJwoCBDAPgDARWJj/4dILdBg4uBBQLwCmEOLYICBhh+Bg0CQYQYBwAYEAA9/EIKCCz4uBJoOABQPAsDgBbwMwjgxBFIMYDAJzBj4YBABBjBNgJmBh1//h8BhwsBZY3AVINgnACBhH/OYIYBFA0IVwQaBgaRCv0BOAPHwA4B4eAn+DwAMBwAhBwYnBgZnBXYIbBHgTZF///+YCB/EDwInBwD5BwB+B4B5BsDiBnCzBj5/BewUAAQRrCAYRQDCIMP4EjwP4+PAn5IBg/wkAMBnEfwEcv8Agl8DYKGBgEQgA='))),
+    32,
+    atob("BQkKDw8UEgYICAoPBQkFCQ8PDw8PDw8PDw8GBg8PDwoVERAREw8OEhMICxENFxMUDxQQDQ8SERkQEBAICQgPCggNDgwODQgNDgYGDQYVDg4ODgoLCQ4NEw0NDAgICA8AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAADAAFCQ8PDw8IDQgUCQwPABQICg8ICAgOEQcICAoMEhISChERERERERcRDw8PDwgICAgUExQUFBQUDxQSEhISEA8PDQ0NDQ0NFAwNDQ0NBgYGBg4ODg4ODg4PDg4ODg4NDg0="),
+    25+(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 draw = function() {
+    var date = new Date();
+    var timeStr = require("locale").time(date,1);
+    var h = g.getHeight();
+    var w = g.getWidth();
+
+    g.reset();
+    g.setColor(g.theme.bg);
+    g.fillRect(Bangle.appRect);
+
+    //g.setFont('Vector', w/3);
+    g.setFontLato();
+    g.setFontAlign(0, 0);
+    g.setColor(g.theme.fg);
+    g.drawString(timeStr, w/2, h/2);
+    clockInfoMenu.redraw();   // clock_info_support
+
+    // schedule a draw for the next minute
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(function() {
+      drawTimeout = undefined;
+      draw();
+    }, 60000 - (Date.now() % 60000));
+  };
+
+  /**
+   * clock_info_support
+   * this is the callback function that get invoked by clockInfoMenu.redraw();
+   *
+   * We will display the image and text on the same line and centre the combined
+   * length of the image+text
+   *
+   *
+   */
+  let clockInfoDraw = (itm, info, options) => {
+    //g.reset().setFont('Vector',24).setBgColor(options.bg).setColor(options.fg);
+    g.reset().setFontLatoSmall();
+    g.setBgColor(options.bg).setColor(options.fg);
+
+    //use info.text.toString(), steps does not have length defined
+    var text_w = g.stringWidth(info.text.toString());
+    // gap between image and text
+    var gap = 10;
+    // width of the image and text combined
+    var w = gap + (info.img ? 24 :0) + text_w;
+    // different fg color if we tapped on the menu
+    if (options.focus) g.setColor(options.hl);
+
+    // clear the whole info line, allow additional 2 pixels in case LatoFont overflows area
+    g.clearRect(0, options.y -2, g.getWidth(), options.y+ 23 + 2);
+
+    // draw the image if we have one
+    if (info.img) {
+      // image start
+      var x = (g.getWidth() / 2) - (w/2);
+      g.drawImage(info.img, x, options.y);
+      // draw the text to the side of the image (left/centre alignment)
+      g.setFontAlign(-1,0).drawString(info.text, x + 23 + gap, options.y+12);
+    } else {
+      // text only option, not tested yet
+      g.setFontAlign(0,0).drawString(info.text, g.getWidth() / 2, options.y+12);
+    }
+
+  };
+
+  // clock_info_support
+  // retrieve all the clock_info modules that are installed
+  let clockInfoItems = require("clock_info").load();
+
+  // clock_info_support
+  // setup the way we wish to interact with the menu
+  // the hl property defines the color the of the info when the menu is selected after tapping on it
+  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app : "lato", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+
+  // timeout used to update every minute
+  var drawTimeout;
+  g.clear();
+
+  // Show launcher when middle button pressed, add updown button handlers
+  Bangle.setUI({
+    mode : "clock",
+    remove : function() {
+      if (drawTimeout) clearTimeout(drawTimeout);
+      drawTimeout = undefined;
+      // remove info menu
+      clockInfoMenu.remove();
+      delete clockInfoMenu;
+      // delete the custom fonts
+      delete Graphics.prototype.setFontLato;
+      delete Graphics.prototype.setFontLatoSmall;
+    }
+  });
+
+  // Load widgets
+  Bangle.loadWidgets();
+  draw();
+  setTimeout(Bangle.drawWidgets,0);
+}  // end of clock
diff --git a/apps/lato/lato.slow.js b/apps/lato/lato.slow.js
new file mode 100644
index 000000000..f0d1c09a7
--- /dev/null
+++ b/apps/lato/lato.slow.js
@@ -0,0 +1,120 @@
+/**
+ *
+ * Lato Clock
+ *
+ * lato.slow.js, a version of Lato that does not use fast load
+ * To add support for clock_info_supprt we add the code marked at [1] and [2]
+ *
+ */
+
+Graphics.prototype.setFontLato = function(scale) {
+  // Actual height 50 (54 - 5)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADkD8AHFg/wA4sP/AHVD44HHgPALD0OA40+F43+H4wHGn/8A4v/L4sH/5PFj//CxkD/6eFCw9/GooWHh//wAWLgP/TgoWHn5rFCw41BMYqCHaRDKGgzLYKAJgFv//LIhQBAAI7DWgIABU4adBAAJTDn4HCVAaOCQQhvDAYQuBDYaxBgJEDh4HBgYzDPgUDIYYECA5DUDgIHBg4HEEgIHfF44/EA45HDL4xvHP46PHT5CvHX47PDGYcDb4zvHf5AA/AA9wA4yoDZYq/DXAgHDXYQHEXYQHEj4HHXYQHDn6UCA4d/e4sAXYYHCd4gHCXwbADA86DFA/4HGAGA3Db40HA4UDe40Hc4YHCh7nDA4UfA4X/A4U/A4b/Cv7vGX4UB/A+CZ4YaCgf9A4sH+IHCHwfjA4JWDj/DA4s/wYHFv4kCA4f+A4pKBA4sD/AHCG4R9BA4YCBj/gA4s/4AECN4R5BA4f/gf/Mgn///+A4wZBA4d//6JBA4c/VATHEVASUEEwIHEAAbnDAGbyCAAg+DgKwDA4S4DLQSlCSYQHCn4HDFAV/bAX/4ADFCYgbCh4zHZ4SlBR4iSEA46XCe4QHCDgJWCngHOnwHGvwHRG4iFBI4ppBA4f4OIRnCN4MD9+AO4f///v8CHCDoP/54CBS4f/44CBU4f/wYHBX4f/EQLHDh6gB/6jDZQaTDAEUcA40/A4xODYoYHGgYHGh4HGNIIuG74uGz4uGj4uF/gHFh/4A4sf+AHFn/AA4q0BA4kBVgIHEFwIHFFwIHFj7jBA4guBA4rjCA4YuCA4guCA4r0BAATgBA75SEa4wHvAEEBA40DUYIAEg4HDgZ0Bh67BXAQHCZYJMBA4UHA4KPCA4SXEAgQHL4IEBgIHC/AMCgP4CQUDFgIHoIQY3DA4wCEDggHFO4YHB/iHDCQX+gE/S4IHCOIP/U4IHCv6CBA4k/A4K1CEQKpBEIIHDh//HILSDTQK+CAAd/f64Amn4GFgLxCAAZfBSIIADN4heDP4YeDR4Z5CEwN/U4IABg4NBj6ADEwLHDIoQtBVgQuCHoIHDFwIHBe4QLB/14A4kH/i1BeQQuB/AHFn/wA4pLBA4guBwAHELoMAA4o9BA4Q3BgYFBJ4gCCA4pqBvxvDf4T2Bh4HCIIc/R4MCKISfBS4aQCU4gHDX4ioBY4paBNwQAD/6uDAAUOf4wAjO4QHNdQYHYmAHGW4gUEA4kPA4z7BA4v/A4qYBY4QHCh63CA4c/V4QHDV4Y6DV4YHCDwYHDDwYHDv7ODA4MBZwgHBcwL1DA4MfdogHBDwgHB+LtFgf3DwhMCDwgHCDwhcFA4geEA4IeFA4IeFd5AArj77EsCgB/gGCg5QBOQkf/6oB/77D//DA4JrCv//44HB4DkC//n/E/MgIcCRIMPA4X8RIUHegQCBFoL8DA4cBA4QaBv4HGvwHBTgMHHQM+HgIHhF44HFJ5RfGN45/Bz6NBP4SPHT4XnT4ivHX47PHgCQCb4bvIAHxdBMgRfD/58CKgf/WgIADP4JlFR4J1ET4QHCiACBQwQEBuC/CDIIHBX4QtBn+Aa4sfZ4bvCh+Ah4HGUAUHA4d/AgIHEa4QHDwJyCA4eDKIQHDx5pCA4bPDG4c/RIRPCjwuCA4aJBUwZnCRAcBP4SgE/+D/7+ET4ImDA4jIEX4KvFh7HGgbXGgF+f6oAggZeBSgShEb4RYCagQHGh5iDA5QXEE443HADoA=='))),
+    46,
+    atob("DhglJSUlJSUlJSUlEA=="),
+    64+(scale<<8)+(1<<16)
+  );
+  return this;
+};
+
+
+Graphics.prototype.setFontLatoSmall = function(scale) {
+  // Actual height 25 (24 - 0)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADE//lwj/+nEP/kcDCGAgEfAQIAFgfwgEB/AZIggCB4YCBsO8gEz/0Av/8gP/DgP+jAiBhvggO/+ED//gh/9wEH+HAgEYsEAhhMJkEB8E4gf4h0B70HgPDgOA4P//f///9//4mEYjk4h0PnkDgZEBwH8FhMfAQXAiEYDoMMjE8g0MDwOOnBgBvEAnwCBgFwAQJsBgHn8ACBGIPjg0B4ODgPA4OA4FxNoIvBgEHAQIAGVIMBTAM4/6bB8PAv/gsE4+BmCJQMHhgvB50D4F2gHgLwMwh7eCFwM+JwJhBZwgAHGwMAvwNJe4QCBv4TBVYPB/EB/J0Bj1AgECC4rZC8/AgfxDAPgn//4BsCABECEQMBkCkDCgaBBGQICBhJhCwAgIUgVgAQMwAQJ4CIoMB/4pB/6uCD4QYLABMHJgMDJgT0CO48GSogxMAA0cAQMOGIQMFVoMBAQMHAQMPEoM/agcBMoJIDGYTWDTIMHXQMH4H4g+Aj0DwEHJgIBBDAPAJgNgnEAuEPXgIeBSoQCBj49BABYjBjA+BhgCBgwCBga3B/+AAQPAv5EBZZIAK4CKB8D5B+ACB/CQB9iwB8ywB8Y9B8OA8Hg4E/8FgKwMwPILkLhA/BWgM8gY0CuACBnEMAAMGAAMDg5jB4eDMYPjGIO/4EPx6dBeAYACAoTZCZATOBgPMAQPGZQPDAQOBwDEBSYKPBSoyLDOgIAJjixB/4gB/+B4FxwFgmHAmEYsEYhk4CYMcjhjB/0BwP+D4N8FZSFBgEHLQMPCoMPPgMPGIMe4FgjwzBjwzBhwuBgkPToMDFwQCCBAIAFe4prBgTgBg6gBh6EBj8AsE+gEwKAMYIYMNUgMHVQJPCXIwADEIMH5/gg///EHj0OcAeDDQPBGYNgAIM4+Fwh/8vEH841B8ICBABZBCh4RBg57Bg8HGIMBx4vB58A4FvgFwv0AngCBGIJdBAQIMBFY8CgGAcoPggPACAJPBCQ0ICYI2B2CaB+A4BExBUCcwSTBgZaBgOwAQPcBgPGAQPjB4KGBJQIkBdIJ/MAAczAQMZDwMMDwMGsA0BmAxBzAPB5gCBswYKAB7QBI4ICBjhNBgwuBge4B4PYAQN8AQMcAQMOUoYAJDoMAVIUYhk4hkPjkGh6pBxxcB/wPBbIJTBD4s/LQN/foN4jyYBV4LVCmF+nEwv+MjFw80MuEjLIMw4cYmFhx/8mHH/0wseBzC2BxkGZAMB8bLBv40Bh6VBAAb0BPoIMCc4MfI4QLB/+Agf44ED+FggPgO4P8F4M/xgdBNoQYCg/wAwIJCh4xEPAv/+Ef//4h///kGAAMDAAMBwOBwHAAANgAAM4uFwj/8nEH+/4gPx/gmBvDHGgILBgZdBg//8BuB/CpBjgCBg8BNAOA8AEBsC0CcoL4BnD4BjkHaoIQBA4NAUwIAIMYo3B/0DH4J6BAIKmBGIydBjAxEhwxDf4SPBUgKhCOQQAHN4P/gICBwACBSocwAAMYAAMMAAKuKJQIsJAAJjDGIrGBMIJkBGAJhBMgIwBgAwBJQJ9Be47KEEoOAFYPwgPgvB8CY41wSo5hBhkHgZjBwOHLwIlBuF/wEQn45IMZR7DMYIwBAQIyBMgICBeQRjBMggYBv//8DNB+D5CTxcAY4QYFCpgyDPgIGB8ACBQIMAvEPGgJjB/hjBHRpKCDAP8PgRjGXAIIBEIMD7wCB47HB4HgAQM8YQMPC4IEBSwkgGgoxFVwSWHV6QAEVxEHEYR4Cj4aCRwQJGCYIWCAQUPIYIOCnwCBvgxKcCsHUIgoDh5AEgDyCjwCBCwiVKABH8C4P/XgI3BDoN8gPAhwCBY4PgAgNwgHgVgMwVgMYh0AjkHgEOCYIEB8ACBnhRBOwIrCGgN+H5I9BCQJ8FF4bcBhjcBgzcBgb1BgPBPgPxAQM/RgMPAQJSBFgkfQoM/R4N//xKCwE4CYM4gFwjkAnBjCGYx8ICoP4g+BVAXzwF/8C1B4CLBAA75FY4RjGwBXBF4VgR4M4m+Ah/5UYP4nkB/BPBDQIqCNQIABZ4Q9BIAPwMYM4Y4MOGYMHGYOBwJjB8IzBvPgjEf8EMg6ZBE4J8BF4ZKBAYKkCsACBNoRjFg//QQIYOcQIAGTYPwfILHBfgTbEQYKBBAQL9BY4ICBg4dCCoICCg/AVwPAJQKCBE4IxDJQRuCBYUfGAMD/DLCEIXwAwK7BgEPCYQMBv4cDDASuBAQIoBg5CCPgoqCv4GBj/8AwJKBDIIGCGIU/BgQfBBYIrCn4UBj5CCGIMDLQU/AwxhCBIIcD8ClBwEHKwimDAANAY4NgVIPwGIPwgfBDwP5EgMfNQQtEJoUH74CBwfgh+A/B8Bjx8BgcBFwOAP4TbCnhgCdAStCvgJCPIJUCAQPAB4Q3CHoUPAQKuGMQYABMYUwMAMYXIMMgP8g0B+xIB8cBwfhwHD4HAs/AsE34EwdYMYJoMMg8AgxjCGAoADv///8/AQOYBAPMAQNkAQMQfhDdCgZ5CnwCBg5tBQAgXCBITLBC4JmBgIxC543B84CBEYQAKkC4EewQWBgIsCAQTEGBIQ1BABcMAQMGMQRvFZIK9CEAa9BDAwMDjh7CD4oANLYMw/gpBvwfBsYsBmOAg0Y4EDhlggPmIAN/O4MfDAIALTwPgcAIuBuBMBmBWBmBWBjBvBhhPBg8BGIP3OQIbBgE/PAQAEgY6Bgf/AQPvwEDwHgEAIuB4CIBsAxEjiBBgykCAAouCv5NBn18gE4hxKGEAJKBXoXA8E///4j//Phf+PoS5B/pjB804gFjJQMxwwxB4YxBsJ8BmPAgP4GIN8d4QABoDnEUoICCwACB4DPBE4IzBZ4IZCgUAh0T4EP3/wh//jEGmeMgcI40BwwdB4wdBu4dBn+O8Efw/gPgPgEYKXHPgqzBMAICESoLKBAQLlBLQTXBn4YBgaMCAAhcBgHjewNx//wnAYCAAliAQMzx///PHB4IYBbQIAHOoP+g6VCgCkCXoLwBAQN/HIN5ZQN4BgMwfIMQLYRJDAAd/GgL5PHAPAgZjBgB8CAQRACcAUcKIeAgIYBAQPgSoYYIj4uDDAY+JZwauBKILEDY4xrCEAVwDAhHBagR8GB4IIBn5pBnzKBnCVBjApBhgpBGIJ8BLYJjBFgN/ZoMfAQMHaZJKBagJpBHwNgO4Nghh8BFIIxFg4sBDAJeBAQUfQo8DZoKVBAoPnDAOAVwOAFwPAjAxEAQMMMwJ/B/AbBdpSuIg6rEGIKuHcAQACg+GAQPDMYPwJQMYSoOOJQPHJQNhHoM4AQMIngeDgg0FPgJWB+BWDSoxFBA4LjDVwIFBDALKBN4R5BFIZbJAQKIBDAgAEhBpCDQMDdgV/AQMP8ADBDAUeTIQCBTYMBE4IYCcoILBHgQ5CnwCBj4hBgIYBeAcBBIKcBBAY3CSIUfIgQ6Cn4YEGoUPPgQLBGIS2BAASVCY4OB8EB+IbBn4CBh4YBgYCCLoMH7wCBw4YBwAYBgEQEwdAJRHwS4N+BQMPQYRUBJoUHGgJpCj7MEfITgDwFwKQN4SoN8fIP2MYPzfIPhwAkBJQPgsCuBmAYBOghUBgHB4OB///+P/7/8HgMGYAMDkDJEABEDDYP9AQLOCABJcCmYCBjPHx8cDAP8j4CBGwIaIH4MAOQICDL4LUDRIUHQwYDBLYMATwMAUgIbDAA8gS4NwnEAvAnBv8MgH+4kA/MygP4zsB+FOwfwl1D8EUk/ghkX4EEh/AgUHWAL8BgOBwEDIQUAnEGgUYh8BxEPwF0j9Aj0fkEPn0Qh2+hEOvkEgk8gRvBgZtCXRYANg8f/kDz/+gPD/4WNdwTcBgP/LgPgT4PgRoNgRQM/BgLXB4F8WoLWB4AEBDAOAagQAEMQMARQIrBweAeYPAEgPgAoMwjkYjEMAAMGAAIXBgcB4KjBbgPAIQT9EAA8wbwJ4BPgICBgeOHQQPB4KhBsBTBnBsBj/wgEd7kAHgIqJPQInBwMggPwyEAn1IBIPkBoJjBgF/EoP//EB/VAgfxkED8GQgPADALhOj/4v/v/k/EoIALjhsBz6SB//Dwf88HBx04sHHhkwsPHjEw8f8jk//kEh+8EYpKBAYJeBgCxBAAcIAQMOPgQVCDgsH/ACBx4SBEYMGnEwg1/zECv/mgdwucB2EcwGYg1ApkDkE2gOQjeBzEE4HMgazC4ACBmA8Bh88OYLjBAAsIK4MMSAMGtARBkhQByzGCUoS1MD4MBFYMD44FBxIWBj4OBn6KBniHBhCECABcwAQMYAQJcBJAICBM4IrBIISyCsACBnxOEh4MCAA6uJGoICBjEC//2gd//cB2PAVwNgVwM4kE3n0QjP77EEvHsIwMcVx50CL554CiBWEgYPBgbHBgYwBgOGBgPDAQNhVoQCBg7KIgw5BgY5BgOBCAPAFINgsED/+wgP/7CxBF4IYMAA8MK4MOnAaBPATABgP7B4N5I4VADAhzBDAdMDAMmDAP/B4N/DAMBbZKVE8ACETYQAGn//8Ef//wh//e4LzBWY8YJIQCDDALdB/6jGg4CCHAMHEwMHdgKeBLoQXB/40Bv///gvIg4PBwYCB8ICB8BIIbQgZCFYMDCYMBO4QAMgSzBgegAwPwAQKzBAA8QJoUggEcAwMPNIgjBDA8PIYMPIAMGKgMDhBJBwgPB9y6CAQMOJ5cOQgMDzwGBGoWcFgPhOAM9AQMHOwTAGLo0cLocILoMMLoMeLoM8PYl4Qgi2BUIPgU4PQgeB5ACB40BbwI4BHYY+DgjGCOwMHgkGgf+g75Bh4NBMwUcAQI9CHQVwAQPxw0B8PHgPA4+A4FnOAM+fYMOfY0DjACBwxFByIJB5gaBv/B8Ed8YeBgZQBg7LCVwkeX4M8hqBBjmAAQNgiDxCfYICBM4J2DgaQBgbIBgOOgPHwcA8fBwFx4A4BUAICBLQLDDEoR6C/weB/kgg/4jA3Bh0/xkDn8GgHegcAl4qBgf4FQM/FQIYBEIN/AQMPGgTbCGIRtBNwISEG4JZCfoMAj/GgHfLgPvNgPnfINh/lgmEfOQg7BT4QxCbAQxCGhkDGgMDz/GgOfGgPPGgNnGgM5GgMMGiaGBcIcfQwQFB/8B4P/gHH+IuDmfAsEN/Ewh1/jEGPgQYBTYjBBMAgxCeYYxBCQUf4JvBwPA/+A8bHBgfwsEB8EwgH8jDgCg8D/0BDAJmFRgIoBGIkAGIIgBCQY3Cn4LBv/AmKSBnpjBiXwjEPv0MgbgCgJmCDAUD/DEESoQxCTwsPBAMfAoM/C4l9BAJsBgJsHCIJfBn//IQMf/EMAAMGAAMDAAMBwOBwHAAANgAAMwAAIgBAIIAFVobABFYLCBg/AjkA8ACBnEOgEco5dB0ZjB6OAgO4DoPcuAVBnEAuAVBuECgBaBABEf//4h///nH//+sZaBnJaBxxZB4ZaGAAJzDgABBABaMCGIqMChYxBhoxBxgxB5wwBswwBmQxDgABBABf///Av//8G/GgPYDYPMJoNmGgMzGgMZGgOGGgPBMwaJLFw/nMYPzzAuBxjwHSoWcMYguJ4ACBsACBnIuBxwCB4ZgCIhgABgoVBwwCB4xKCBYMDAQMBCQUgAQI7CmYVBjICBxgbCCoWAAYNAAQI7CuACBiISBwB8FGIQYBgJgCGQcYAQLPBg///0DDYMBEISFB4CFDAALpDhCeBgCeBwEHFYIEBuACBj0HBQIhBEoI8Bn6JKj///EP//8IIUA+BJBnkAh0PwEGgPgSQN4GgMeYIMDJoIWBMoM8LQZ8EY5UfI4QyBv43BngyBnEB404gFzjjvB50Ajl2OYMbUIJzD8AEBXAPgCoPgg+BKIP/FYQ9Bh62DAAcB/AjB/64CDAPA/ApBjilFwQxB4ZwBsewgEzzhKBxxKBw6OBCoMORYKJBn4rCNIMA/h8V4G4gFw7kAnB8C8x8BuZYBjJKBwxKB4J8niZ8BjoxBxgxB4x8CmEAmBKFo58m475CVwIxDgx8BgZ8EzhKB5x8YAAUYhhbBLIMDcIMA9wCBnwCBBYIeBKYMOEgMOJYIYCgRFBABJsEwF///AvhBBdIU4gfwjkD3EOMQMGg5sBg8DPoK/B94VBvxpBUwPgj+B+EfNgMMNhzmD//8gP//8QOIOMBwPnAQNxKQMYoEAhkgO4cHAQh9BMAOAcwOAj7jIAAIxB/EAGgK6BPIILBKILgBGIMcGIMGmBEBUYMDzAdB5ACBDAMDOYJdBh4CBMYKxKv/+WII0BRIQxBnBjCGIMHAQMBGIMA5wCB8YCBuB8BuAFB/AxB/CVB/BjBVBQxBwBKB+AYB/gfBhxjCzhgDgFgAQMxAQM5BIMcQYMcBAM+GIJdBAQV/+AxDaILCEKIMBBwU+YwcBD4PhZAPxAQP54APB4F8gFAYYMBAQMADwRICRgIAGTwPwNgP4NgLtB4CaBsEYgEwhkAjEGJQMHJQMDIIPnJwKVCn7cCFw7gCTAQCB/BsCEwMMgcDg8BwfBwHD+HAue4sEfx1wh+D+EBwJkCFgw3Bh/AoOH8Ex40wjnDjEPsOMgOw40Aj1mLQLdBdpkAvBzBvxMBn52BmOAi0Y4E7hlgnOGmEY+cwhE/SoMPcAIAJgY0BNQMGsP4g1xxkHmHGgcYscBxgxBs+ZwEZSoMAv7YCABEeTgMfwFjPgNzxlgmJKBPgQ0BxkDnnMgeP/5DBPgIoKGgMw/kHPgMDzhKEgx8BkZ8C81gjl/YgMfPgIAJg6xBY4J8CjnjjEfJQMIY4MG7AxB98zJoSSBPgTKLhjKBh0/JQMw4CfBsBUBmEA404gFzAQMfKAMHKAMH94CBmIYIjAYBhgYBxwSB4w3BIwIADv4CCBIN9SoNwjlAmEHkEYgfQhkBdoMA7kDwAVB4FgRY4eBJQuHJQNjJQM5JQMOJQVjJQM5JQMPJQMD8aLHQoICBTYM/SQIYCjHDgHssOA8yVBGIUh5lwgF+P4MfGgIAFgJNBgP/gER/fAjIYBjhKBhhKBg0xw0DzAxBt1jwED+JEB/CcFAAMPJoMP/EDx/egPODAJKCY4oxCh1zjkCj+MY4gABF4MAVIU5//whn//ECv5aBABE3//Amf/8AYCO4UCAQMDAQUf/8Bx//wHnDAKNBgE4AQMcAQMEGIU//0Dz4YBOg0/AQN/8EQnhNBnEcg3Yg0D9g2B80BwFzgHAvnA8BQB8C3BcASeHAAUHJQMTCQM4CIMYAQMMQwMDK4MBzACB5wYB44YBFYcf+AoHBAMHNIMH78Aw5oBsawBnOAmEO4CXBsEMQwMOcYP+HAICBgACCAAsfJYI3Cj98T4MHKgJ8Bmx8BP4IxDiBoBPgP4FwICBgYCBAA1/AQQuBvvwg1wFgMwVwMYgcBxgxB8wxBmeAPgKrDAQMPAQIAFgJ/BSQMAmP34E54FwVwMYVwMMGISuBGIPOgeA4f/wAuBAQM/AQKuKgOHVwPnVwJ8CKQLYBGIMOGISuBgKuPYYMAgwCBgZgCHoMI4kAh1nHQJ9BgeZSoIYLABM/xACBRIM8boM4n0AjE7EgLYBXYPAgdwMYPwuEA/p2B/4CBs4CBQoxpC//AWgPwiAsBJgJ8BJwKNBJwoCBDAPgDARWJj/4dILdBg4uBBQLwCmEOLYICBhh+Bg0CQYQYBwAYEAA9/EIKCCz4uBJoOABQPAsDgBbwMwjgxBFIMYDAJzBj4YBABBjBNgJmBh1//h8BhwsBZY3AVINgnACBhH/OYIYBFA0IVwQaBgaRCv0BOAPHwA4B4eAn+DwAMBwAhBwYnBgZnBXYIbBHgTZF///+YCB/EDwInBwD5BwB+B4B5BsDiBnCzBj5/BewUAAQRrCAYRQDCIMP4EjwP4+PAn5IBg/wkAMBnEfwEcv8Agl8DYKGBgEQgA='))),
+    32,
+    atob("BQkKDw8UEgYICAoPBQkFCQ8PDw8PDw8PDw8GBg8PDwoVERAREw8OEhMICxENFxMUDxQQDQ8SERkQEBAICQgPCggNDgwODQgNDgYGDQYVDg4ODgoLCQ4NEw0NDAgICA8AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAADAAFCQ8PDw8IDQgUCQwPABQICg8ICAgOEQcICAoMEhISChERERERERcRDw8PDwgICAgUExQUFBQUDxQSEhISEA8PDQ0NDQ0NFAwNDQ0NBgYGBg4ODg4ODg4PDg4ODg4NDg0="),
+    25+(scale<<8)+(1<<16)
+  );
+  return this;
+};
+
+function draw() {
+  var date = new Date();
+  var timeStr = require("locale").time(date,1);
+  var h = g.getHeight();
+  var w = g.getWidth();
+
+  g.reset();
+  g.setColor(g.theme.bg);
+  g.fillRect(Bangle.appRect);
+
+  //g.setFont('Vector', w/3);
+  g.setFontLato();
+  g.setFontAlign(0, 0);
+  g.setColor(g.theme.fg);
+  g.drawString(timeStr, w/2, h/2);
+  clockInfoMenu.redraw();   // clock_info_support
+  queueDraw(); // queue draw in one 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();
+  }, 60000 - (Date.now() % 60000));
+}
+
+/**
+ * clock_info_support
+ * this is the callback function that get invoked by clockInfoMenu.redraw();
+ *
+ * We will display the image and text on the same line and centre the combined
+ * length of the image+text
+ *
+ *
+ */
+function clockInfoDraw(itm, info, options) {
+  g.reset().setFontLatoSmall();
+  g.setBgColor(options.bg).setColor(options.fg);
+
+  //use info.text.toString(), steps does not have length defined
+  var text_w = g.stringWidth(info.text.toString());
+  // gap between image and text
+  var gap = 10;
+  // width of the image and text combined
+  var w = gap + (info.img ? 24 :0) + text_w;
+  // different fg color if we tapped on the menu
+  if (options.focus) g.setColor(options.hl);
+
+  // clear the whole info line, allow additional 2 pixels in case LatoFont overflows area
+  g.clearRect(0, options.y -2, g.getWidth(), options.y+ 23 + 2);
+
+  // draw the image if we have one
+  if (info.img) {
+    // image start
+    var x = (g.getWidth() / 2) - (w/2);
+    g.drawImage(info.img, x, options.y);
+    // draw the text to the side of the image (left/centre alignment)
+    g.setFontAlign(-1,0).drawString(info.text, x + 23 + gap, options.y+12);
+  } else {
+    // text only option, not tested yet
+    g.setFontAlign(0,0).drawString(info.text, g.getWidth() / 2, options.y+12);
+  }
+}
+
+// clock_info_support
+// retrieve all the clock_info modules that are installed
+let clockInfoItems = require("clock_info").load();
+
+/**
+ * clock_info_support: setup the way we wish to interact with the menu
+ * the hl property defines the color the of the info when the menu is
+ * selected after tapping on it
+ *
+ */
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app : "lato", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+
+g.clear();
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+draw();
diff --git a/apps/lato/metadata.json b/apps/lato/metadata.json
index 0b5e4a0f3..406413790 100644
--- a/apps/lato/metadata.json
+++ b/apps/lato/metadata.json
@@ -1,14 +1,15 @@
 {
   "id": "lato",
   "name": "Lato",
-  "version": "0.01",
+  "version": "0.03",
   "description": "A Lato Font clock with fast load and clock_info",
   "readme": "README.md",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot3.png"}],
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "supports": ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
   "storage": [
     {"name":"lato.app.js","url":"app.js"},
     {"name":"lato.img","url":"icon.js","evaluate":true}
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index 7deef5a4b..d4a5eb53b 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -24,3 +24,6 @@
 0.24: Add ability to disable alarm functionality.
 0.25: Add more colors to the settings and add the ability to disable the data charts+Markup.
 0.26: Use widget_utils.
+0.27: Report latest HRM rather than HRM 10 minutes ago (fix #2395)
+0.28: Battery Vref implemented correctly.
+0.29: Support fastload.
\ No newline at end of file
diff --git a/apps/lcars/README.md b/apps/lcars/README.md
index 1564b4179..89918ae87 100644
--- a/apps/lcars/README.md
+++ b/apps/lcars/README.md
@@ -25,7 +25,8 @@ the "sched" app must be installed on your device.
 ## Data that can be configured
  * Steps - Steps loaded via the wpedom app.
  * Battery - Current battery level in %
- * VREF - Voltage of battery
+ * BattVolt - Voltage of battery
+ * VREF - Internal Voltage Reference
  * HRM - Last measured HRM
  * Temp - Weather temperature loaded via the weather module + gadgetbridge
  * Humidity - Humidity loaded via the weather module + gadgetbridge
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 4a5539c7a..858ef51dd 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -1,7 +1,8 @@
+{
 const TIMER_IDX = "lcars";
 const SETTINGS_FILE = "lcars.setting.json";
 const locale = require('locale');
-const storage = require('Storage')
+const storage = require('Storage');
 const widget_utils = require('widget_utils');
 let settings = {
   alarm: -1,
@@ -18,7 +19,7 @@ let settings = {
 };
 let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
 for (const key in saved_settings) {
-  settings[key] = saved_settings[key]
+  settings[key] = saved_settings[key];
 }
 
 /*
@@ -36,10 +37,10 @@ let cGrey = "#424242";
  */
 let lcarsViewPos = 0;
 // let hrmValue = 0;
-var plotMonth = false;
+let plotMonth = false;
 
 
-function convert24to16(input)
+let convert24to16 = function(input)
 {
   let RGB888 = parseInt(input.replace(/^#/, ''), 16);
   let r = (RGB888 & 0xFF0000) >> 16;
@@ -55,17 +56,17 @@ function convert24to16(input)
   RGB565 = RGB565 | b;
 
   return "0x"+RGB565.toString(16);
-}
+};
 
-var color1C = convert24to16(color1);//Converting colors to the correct format.
-var color2C = convert24to16(color2);
-var color3C = convert24to16(color3);
+let color1C = convert24to16(color1);//Converting colors to the correct format.
+let color2C = convert24to16(color2);
+let color3C = convert24to16(color3);
 
 /*
 * Requirements and globals
 */
 
-var colorPalette = new Uint16Array([//Used to change the color of the image if the user selects a color that is diffrent than the default.
+let colorPalette = new Uint16Array([//Used to change the color of the image if the user selects a color that is diffrent than the default.
   0x0000, // not used
   color2C,  // second
   color3C, // third
@@ -84,73 +85,73 @@ var colorPalette = new Uint16Array([//Used to change the color of the image if t
   0x0000  // not used
 ],0,1);
 
-var bgLeftFullscreen =  {
+let bgLeftFullscreen =  {
   width : 27, height : 176, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress((atob("/4AB+VJkmSAQV///+BAtJn//5IIFkmf/4IGyVP/gIGpMnF41PHIImGF4ImHJoQmGJoIdK8hNHNY47C/JNGBIJZGyYJBQA5GCKH5Q/KAQAoUP7y/KH5QGDoQAy0hGF34JB6RGFr4JB9JkFl4JB+gdFy4JB/QdFpYJB/odFkqrCS4xGCWoyDCKH5Q1GShlJChQLCCg5TCHw5TMAD35FAoIIkgJB8hGGv/8Mg8/+QIFp4cB5IRGBIIvI/4IFybyCF4wTCDp5NBHZZiGz4JBLJKAGk4JBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4"))),
   palette: colorPalette
 };
 
-var bgLeftNotFullscreen = {
+let bgLeftNotFullscreen = {
   width : 27, height : 152, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress((atob("/4AB+VJkmSAQV///+BAtJn//5IIFkmf/4IGyVP/gIGpMnF41PHIImGF4ImHJoQmGJoIdK8hNHNY47C/JNGBIJZGyYJBQA5GCKH5Q/KAQAy0hGF34JB6RGFr4JB9JkFl4JB+gdFy4JB/QdFpYJB/odFkqrCS4xGCWoyhCKH5Q1GShlJChQLCCg5TCHw5TMAD35FAoIIkgJB8hGGv/8Mg8/+QIFp4cB5IRGBIIvI/4IFybyCF4wTCDp5NBHZZiGz4JBLJKAGk4JBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4A=="))),
   palette: colorPalette
 };
 
-var bgRightFullscreen =  {
+let bgRightFullscreen =  {
   width : 27, height : 176, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress((atob("yVJkgCCyf/AAPJBAYCBk4JB8gUFyVP//yBAoCB//5BAwUCAAIUHAAIgGChopGv5TIn5TIz4yLKYxxC/iGI/xxGKH5Q/agwAnUP7y/KH4yGeVYAJ0hGF34JB6RGFr4JB9JkFl4JB+gdFy4JB/QdFpYJB/odFkp4CS4xGCWoyhCKH5QuDoxQCDpI7GDoJZGHYIRGLIQvGO4QvGMQRNJADv+GIqTC/5PGz4JBJ41JBIPJCg2TD4QLGn4JB/gUaHwRTGHwRTHBIRTGNAQyJ8gyI+QdFp4JB/IdFk5lLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJoyJC/4A=="))),
   palette: colorPalette
 };
 
-var bgRightNotFullscreen =  {
+let bgRightNotFullscreen =  {
   width : 27, height : 152, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress((atob("yVJkgCCyf/AAPJBAYCBk4JB8gUFyVP//yBAoCB//5BAwUCAAIUHAAIgGChopGv5TIn5TIz4yLKYxxC/iGI/xxGKH5Q/agwAx0hGF34JB6RGFr4JB9JkFl4JB+gdFy4JB/QdFpYJB/odFkqrCS4xGCWoyhCKH5QuDoxQCDpI7GDoJZGHYIRGLIQvGO4QvGMQRNJADv+GIqTC/5PGz4JBJ41JBIPJCg2TD4QLGn4JB/gUaHwRTGHwRTHBIRTGNAQyJ8gyI+QdFp4JB/IdFk5lLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJoyJC/4A="))),
   palette: colorPalette
 };
 
-var bgLeft = settings.fullscreen ? bgLeftFullscreen : bgLeftNotFullscreen;
-var bgRight= settings.fullscreen ? bgRightFullscreen : bgRightNotFullscreen;
+let bgLeft = settings.fullscreen ? bgLeftFullscreen : bgLeftNotFullscreen;
+let bgRight= settings.fullscreen ? bgRightFullscreen : bgRightNotFullscreen;
 
-var iconEarth = {
+let iconEarth = {
   width : 50, height : 50, bpp : 3,
   buffer : require("heatshrink").decompress(atob("AFtx48ECBsDwU5k/yhARLjgjBjlzAQMQEZcIkOP/fn31IEZgCBnlz58cEpM4geugEgwU/8+WNZJHDuHHvgmBCQ8goEOnVgJoMnyV58mACItHI4X8uAFBuVHnnz4BuGxk4////Egz3IkmWvPgNw8f/prB//BghTC+AjE7848eMjNnzySBwUJkmf/BuGuPDAQIjBiPHhhTCSQnjMo0ITANJn44Dg8MuFBggCCiFBcAJ0Bv5xEh+ITo2OhHkyf/OIQdBWwVHhgjBNwUE+fP/5EEgePMoYLBhMgyVJk/+BQQdC688I4XxOIc8v//NAvr+QEBj/5NwKVBy1/QYUciPBhk1EAJrC+KeC489QYaMBgU/8BNB9+ChEjz1Jkn/QYMBDQIgCcYTCCiP/nlzJQmenMAgV4//uy/9wRaB/1J8iVCcAfHjt9TYYICnhKCgRKBw159/v//r927OIeeoASBDQccvv3791KYVDBYPLJQeCnPnz//AAP6ocEjEkXgMgJQtz79fLAP8KYkccAcJ8Gf/f/xu/cAMQ4eP5MlyQRCMolx40YsOGBAPfnnzU4KVDpKMBvz8Dh0/8me7IICgkxJQXPIgZTD58sEgcJk+eNoONnFBhk4/5uB/pcDg5KD+4mEv4CBXISVDhEn31/8/+mH7x//JQK5CAAMB4JBCnnxJQf/+fJEgkAa4L+CAQOOjMn/1bXIRxDJQXx58f//Hhlz/88EgsChMgz/Zs/+nfkyV/8huDOI6SD498NwoACi1Z8+S/Plz17/+QCI7jC+ZxBmfPnojIAAMDcYWSp//2wRJEwq2GABECjMgNYwAmA="))
 };
 
-var iconSaturn = {
+let iconSaturn = {
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("AH4A/AEkQuPHCJ0ChEAwARNjAjBjgjOhs06Q2OEYVx4ARMhEggUMkANIDoIgBoEEgEBNxJEC6ZrBAAMwNxAjDNYcHNxIjB7dtEwIHBwRoKj158+cuPEjlwCRAjC23bpu0wRNDAAsHEYWeEwaSJ6YjCAQUNSRQjEzxQBWZMNEYlsmg2JWAIjCz95SoJuJggjDtuw6dMG5JKCz998wFBJRVNEYW0yaVBJRNhJQN9+4pCzhKJmBKC4YpB/fINxIgCzFxSoQ3J4ENm3CAQPb98wbpEcAQMYWwKYBNxMDXgc2/fv3g2IEAOAgAjBjy5CEhEMfYICBgfPnjdLjj+CgMHiC3JknDhhoINw4jCAB0IJQIANR4QjPAH4A/AFA"))
 };
 
-var iconMoon = {
+let iconMoon = {
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("AH4AQjlx44CCCZsg8eOkHDwAQKEYgmPhEgEQM48AOIgMHEYoCB4ATI8UAmH/x04JoRuJsImHuBKLn37EwZuIgEQOI8cEpXj/yYBhE8+YNGgkYoJxITBUPnAaC///nC+FjBuIOJZEB8YeCh/8AoYACoMEEAnEjhQDPQJKJ/DCDAoi5DoLdHAoMQgLjFWYPOnngh02IwXzwDjEgPGEYS8BI4MBYoSVG4fP/nghkAgZrDkngJQqSG4gvBg4sBQgkImHihEAWwP8ZBMBEYl5/+cSoVAGQIUFh04weJn///0gj/OEw5KEz45BzhuCTYQAEgePB4IACAoJuBnAQEa4XHjxKB//xFgWHJQsCRgMDEonipwjENwUBDQNx8+evvn/hTDLw3igE+EgZxB8UOXIvEJQUfEYOfv53DEQkgga5BJQvzx84cAj+CDoNh8/eEYJKDuCSEcocnEon+/7xEgFBIIcfB4Mf/IICXI2DgDdBAAn758gCIq5Dv4zBvJuIOIfjEgvP/ARHgwdCB4P3AoTdFAAk4EYk8SQgAFTALaDSQwAGh08//vnDmBABYmEEZYAzA=="))
 };
 
-var iconMars = {
+let iconMars = {
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("AH4ATjlwCJ+Dh0wwAQMg0cuPHjFhCZkDps0yVJkmQCBMEjFx42atOmzQmLhMkEYQCCCREQoOGEYmmzB0IEY4CBkARGoJKBEYQCEzgSGkGSpAjDyYCCphuGiFhJQgCD8ASFgRHGAQKbB6BuHJRGeOIsINxEk6dNmARDgMEjQjHAQPnVQojIyZKB6YSDNwK5FAQt54BuDXJIjBEwK5EgxKKXgq5BJRdgXIojJAQJKMcAM0EwM2JUApDoCVFExa7FkGCgAmIkAREEwUEjAmHCIgABhEggQmFpACBCIojBEwRQCzVhwkQU4YADgQmBwQCCI4IFBCAojFAQojGJQQjDAQgRGEZICBEo4gFyUIkilFJQUYEAZrBAQMYNw5KDSQSbCNwwABgOGEwgCBsPACQ5xGwdNnARJcAVh48evvnCJK8Chs+/fv33gCRcB48cuPHCBYA/ADAA=="))
 };
 
-var iconSatellite =  {
+let iconSatellite =  {
   width : 50, height : 50, bpp : 3,
   transparent : 2,
   buffer : require("heatshrink").decompress(atob("pMkyQC/ATGXhIRPyNl0gmPjlwCJ9ly1aCJ1c+fHJR1Hy1ZJR1I+fPnlx6QRLpe+/JKBr5KMuYjBJQMdCJce/fvJQW0CJUlEYQCBSpvvJQbXJjl0NwnzNxGQwEOnHhgF78+WqQyIrFx48cAQXz4ShJgAABh0+8cP//9LJEhg4jDuP3//0LhGQgYlBgeAn///5cIy8MuAmDCIP/9I4HkmCEYMOgHfCQWkCI0cuBuDgF/CIP+CI1Ny1IkeAgHANwIAB/QRFrj7BhkxEwQRC/4RFpbXDgSVBg4RCSorXDI4MJAQMfCIP8cwImDn37fwN58+kwHgLgSVFub7CI4NyBAJKDLgkuEYX78+evKtCLg0jEYRKC58JMoRcFkwjDJQTFDl65EkojEAQMdcwn/+gFC3YjEJQLXEpYRDWwQmEdI6SHAQO0CJUkx4jDF4gCIJQgRMXIjCEARIjCCJ2XEYPKCJqJBJQIROcAUpCJ0kybaDARtdCKAC2kAA="))
 };
 
-var iconCharging =   {
+let iconCharging =   {
   width : 50, height : 50, bpp : 3,
   transparent : 5,
   buffer : require("heatshrink").decompress(atob("23btugAwUBtoICARG0h048eODQYCJ6P/AAUCCJfbo4SDxYRLtEcuPHjlwgoRJ7RnIloUHoYjDAQfAExEAwUIkACEkSAIEYwCBhZKH6EIJI0CJRFHEY0BJRWBSgf//0AJRYSE4BKLj4SE8BKLv4RD/hK/JS2AXY0gXwRKG4cMmACCJQMAg8csEFJQsBAwfasEAm379u0gFbcBfHzgFBz1xMQZKBjY/D0E2+BOChu26yVEEYdww+cgAFCg+cgIfB6RKF4HbgEIkGChEAthfCJQ0eEAIjBBAMxk6GCJQtgtyVBwRKBAQMbHAJKGXIIFCgACBhl54qVG2E+EAJKBJoWAm0WJQ6SCXgdxFgMLJQvYjeAEAUwFIUitEtJQ14NwUHgEwKYZKGwOwNYX7XgWCg3CJQ5rB4MevPnAoPDJRJrCgEG/ECAoNsJRUwoEesIIBiJKI3CVDti/CJRKVDiJHBSo0YsOGjED8AjBcAcIgdhcAXAPIUAcAYIBcA4dBAQUG8BrBgBuCgOwcBEeXIK2BBAIFBgRqBGoYAChq8CcYUE4FbUYOACQsHzgjDgwFBCIImBAQsDtwYD7cAloRI22B86YBw5QBgoRJ7dAgYEDCJaeBJoMcsARMAQNoJIIRE6A"))
 };
 
-var iconWarning = {
+let iconWarning = {
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("kmSpIC/AWMyoQIFsmECJFJhMmA4QXByVICIwODAQ4RRFIQGD5JVLkIGDzJqMyAGDph8MiRKGyApEAoZKFyYIDQwMkSQNkQZABBhIIOOJRuEL5gRIAUKACVQMhmUSNYNDQYJTBBwYFByGTkOE5FJWYNMknCAQKYCiaSCpmGochDoSYBhMwTAZrChILBhmEzKPBF4ImBTAREBDoMmEwJVDoYjBycJFgWEJQRuLJQ1kmQCCjJlCBYbjCagaDBwyDBmBuBF4TjJAUQKINBChCDQxZBcZIIQF4NIgEAgKSDiQmEVQKMBoARBAAMCSQLLBVoxqKL4gaCChVCNwoRKOIo4CJIgABBoSMHpIRFgDdJOIJUBCAUJRgJuEAQb+DIIgRIAX4C/ASOQA"))
@@ -172,26 +173,26 @@ Graphics.prototype.setFontAntonioLarge = function(scale) {
 /*
  * Draw watch face
  */
-var drawTimeout;
-function queueDraw() {
+let drawTimeout;
+let queueDraw = function() {
 
   // Faster updates during alarm to ensure that it is
   // shown correctly...
-  var timeout = isAlarmEnabled() ? 10000 : 60000;
+  let timeout = isAlarmEnabled() ? 10000 : 60000;
 
   if (drawTimeout) clearTimeout(drawTimeout);
   drawTimeout = setTimeout(function() {
     drawTimeout = undefined;
     draw();
   }, timeout - (Date.now() % timeout));
-}
+};
 
 /**
  * This function plots a data row in LCARS style.
  * Note: It can be called async and therefore, the text alignment and
  * font is set each time the function is called.
  */
-function printRow(text, value, y, c){
+let printRow = function(text, value, y, c){
   g.setFontAntonioMedium();
   g.setFontAlign(-1,-1,0);
 
@@ -210,23 +211,23 @@ function printRow(text, value, y, c){
   g.setColor(c);
   g.setFontAlign(1,-1,0);
   g.drawString(value, 126, y);
-}
+};
 
 
-function drawData(key, y, c){
+let drawData = function(key, y, c){
   try{
     _drawData(key, y, c);
   } catch(ex){
     // Show last error - next try hopefully works.
   }
-}
+};
 
 
-function _drawData(key, y, c){
+let _drawData = function(key, y, c){
   key = key.toUpperCase()
-  var text = key;
-  var value = "ERR";
-  var should_print= true;
+  let text = key;
+  let value = "ERR";
+  let should_print= true;
 
   if(key == "STEPS"){
     text = "STEP";
@@ -239,21 +240,24 @@ function _drawData(key, y, c){
   } else if (key == "VREF"){
     value = E.getAnalogVRef().toFixed(2) + "V";
 
+  } else if (key =="BATTVOLT" ) {
+    text = "BATV";
+    value = (E.getAnalogVRef()*analogRead(3)*4).toFixed(2) + "V";
   } else if(key == "HRM"){
-    value = Math.round(Bangle.getHealthStatus("last").bpm);
+    value = Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm);
 
   } else if (key == "TEMP"){
-    var weather = getWeather();
+    let weather = getWeather();
     value = weather.temp;
 
   } else if (key == "HUMIDITY"){
     text = "HUM";
-    var weather = getWeather();
+    let weather = getWeather();
     value = weather.hum;
 
   } else if (key == "WIND"){
     text = "WND";
-    var weather = getWeather();
+    let weather = getWeather();
     value = weather.wind;
 
   } else if (key == "ALTITUDE"){
@@ -277,18 +281,18 @@ function _drawData(key, y, c){
   if(should_print){
     printRow(text, value, y, c);
   }
-}
+};
 
-function drawHorizontalBgLine(color, x1, x2, y, h){
+let drawHorizontalBgLine = function(color, x1, x2, y, h){
   g.setColor(color);
 
-  for(var i=0; i<h; i++){
+  for(let i=0; i<h; i++){
     g.drawLine(x1, y+i, x2,y+i);
   }
-}
+};
 
 
-function drawInfo(){
+let drawInfo = function(){
   if(lcarsViewPos != 0 || !settings.fullscreen){
     return;
   }
@@ -310,9 +314,9 @@ function drawInfo(){
     g.setColor(color3);
     g.drawString("LOCK", 128, 53);
   }
-}
+};
 
-function drawState(){
+let drawState = function(){
   if(lcarsViewPos != 0){
     return;
   }
@@ -322,11 +326,11 @@ function drawState(){
   g.setFontAntonioMedium();
 
   if(!isAlarmEnabled()){
-    var bat = E.getBattery();
-    var flash = storage.getFree() / process.env.STORAGE;
-    var current = new Date();
-    var hours = current.getHours();
-    var iconMsg =
+    let bat = E.getBattery();
+    let flash = storage.getFree() / process.env.STORAGE;
+    let current = new Date();
+    let hours = current.getHours();
+    let iconMsg =
         Bangle.isCharging() ? { icon: iconCharging, text: "STATUS" } :
         bat < 30 ? { icon: iconWarning, text: "BAT" } :
         flash < 0.1 ? { icon: iconWarning, text: "DISK" } :
@@ -348,12 +352,12 @@ function drawState(){
   }
 
   g.setFontAlign(-1, -1, 0);
-}
+};
 
 
-function drawPosition0(){
+let drawPosition0 = function(){
   // Draw background image
-  var offset = settings.fullscreen ? 0 : 24;
+  let offset = settings.fullscreen ? 0 : 24;
   g.drawImage(bgLeft, 0, offset);
   drawHorizontalBgLine(color1, 25, 120, offset, 4);
   drawHorizontalBgLine(color1, 130, 176, offset, 4);
@@ -363,13 +367,13 @@ function drawPosition0(){
   drawHorizontalBgLine(color2, 120, 176, 87, 4);
 
   // The last line is a battery indicator too
-  var bat = E.getBattery() / 100.0;
-  var batStart = 19;
-  var batWidth = 172 - batStart;
-  var batX2 = parseInt(batWidth * bat + batStart);
+  let bat = E.getBattery() / 100.0;
+  let batStart = 19;
+  let batWidth = 172 - batStart;
+  let batX2 = parseInt(batWidth * bat + batStart);
   drawHorizontalBgLine(color2, batStart, batX2, 171, 5);
   drawHorizontalBgLine(cGrey, batX2, 172, 171, 5);
-  for(var i=0; i+batStart<=172; i+=parseInt(batWidth/4)){
+  for(let i=0; i+batStart<=172; i+=parseInt(batWidth/4)){
     drawHorizontalBgLine(cBlack, batStart+i, batStart+i+3, 168, 8)
   }
 
@@ -379,8 +383,8 @@ function drawPosition0(){
   // Write time
   g.setFontAlign(-1, -1, 0);
   g.setColor(cWhite);
-  var currentDate = new Date();
-  var timeStr = locale.time(currentDate,1);
+  let currentDate = new Date();
+  let timeStr = locale.time(currentDate,1);
   g.setFontAntonioLarge();
   if(settings.fullscreen){
     g.drawString(timeStr, 27, 10);
@@ -392,13 +396,13 @@ function drawPosition0(){
   g.setColor(cWhite);
   g.setFontAntonioMedium();
   if(settings.fullscreen){
-    var dayStr = locale.dow(currentDate, true).toUpperCase();
+    let dayStr = locale.dow(currentDate, true).toUpperCase();
     dayStr += " " + currentDate.getDate();
     dayStr += " " + locale.month(currentDate, 1).toUpperCase();
     g.drawString(dayStr, 30, 56);
   } else {
-    var dayStr = locale.dow(currentDate, true).toUpperCase();
-    var date = currentDate.getDate();
+    let dayStr = locale.dow(currentDate, true).toUpperCase();
+    let date = currentDate.getDate();
     g.drawString(dayStr, 128, 35);
     g.drawString(date, 128, 55);
   }
@@ -412,11 +416,11 @@ function drawPosition0(){
 
   // Draw state
   drawState();
-}
+};
 
-function drawPosition1(){
+let drawPosition1 = function(){
   // Draw background image
-  var offset = settings.fullscreen ? 0 : 24;
+  let offset = settings.fullscreen ? 0 : 24;
   g.drawImage(bgRight, 149, offset);
   if(settings.fullscreen){
     drawHorizontalBgLine(color1, 0, 140, offset, 4);
@@ -444,8 +448,8 @@ function drawPosition1(){
 
   // Plot HRM graph
   if(plotMonth){
-    var data = new Uint16Array(32);
-    var cnt = new Uint8Array(32);
+    let data = new Uint16Array(32);
+    let cnt = new Uint8Array(32);
     health.readDailySummaries(new Date(), h=>{
       data[h.day]+=h.bpm;
       if (h.bpm) cnt[h.day]++;
@@ -462,9 +466,9 @@ function drawPosition1(){
     });
 
     // Plot step graph
-    var data = new Uint16Array(32);
+    data = new Uint16Array(32);
     health.readDailySummaries(new Date(), h=>data[h.day]+=h.steps/1000);
-    var gridY = parseInt(Math.max.apply(Math, data)/2);
+    let gridY = parseInt(Math.max.apply(Math, data)/2);
     gridY = gridY <= 0 ? 1 : gridY;
     require("graph").drawBar(g, data, {
       axes : true,
@@ -490,8 +494,8 @@ function drawPosition1(){
 
   // Plot day
   } else {
-    var data = new Uint16Array(24);
-    var cnt = new Uint8Array(24);
+    let data = new Uint16Array(24);
+    let cnt = new Uint8Array(24);
     health.readDay(new Date(), h=>{
       data[h.hr]+=h.bpm;
       if (h.bpm) cnt[h.hr]++;
@@ -508,9 +512,9 @@ function drawPosition1(){
     });
 
     // Plot step graph
-    var data = new Uint16Array(24);
+    data = new Uint16Array(24);
     health.readDay(new Date(), h=>data[h.hr]+=h.steps);
-    var gridY = parseInt(Math.max.apply(Math, data)/1000)*1000;
+    let gridY = parseInt(Math.max.apply(Math, data)/1000)*1000;
     gridY = gridY <= 0 ? 1000 : gridY;
     require("graph").drawBar(g, data, {
       axes : true,
@@ -534,9 +538,9 @@ function drawPosition1(){
       g.drawString("DAY", 154, 115);
     }
   }
-}
+};
 
-function draw(){
+let draw = function(){
     // Queue draw first to ensure that its called in one minute again.
     queueDraw();
 
@@ -557,14 +561,14 @@ function draw(){
     } else {
       Bangle.drawWidgets();
     }
-}
+};
 
 
 /*
  * Step counter via widget
  */
-function getSteps() {
-  var steps = 0;
+let getSteps = function() {
+  let steps = 0;
   try{
       if (WIDGETS.wpedom !== undefined) {
           steps = WIDGETS.wpedom.getSteps();
@@ -578,15 +582,15 @@ function getSteps() {
   }
 
   return steps;
-}
+};
 
 
-function getWeather(){
-  var weatherJson;
+let getWeather = function(){
+  let weatherJson;
 
   try {
     weatherJson = storage.readJSON('weather.json');
-    var weather = weatherJson.weather;
+    let weather = weatherJson.weather;
 
     // Temperature
     weather.temp = locale.temp(weather.temp-273.15);
@@ -596,7 +600,7 @@ function getWeather(){
 
     // Wind
     const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
-    var speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
+    let speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
     weather.wind = Math.round(wind[1] * speedFactor);
 
     return weather
@@ -613,15 +617,15 @@ function getWeather(){
     wdir: " ? ",
     wrose: " ? "
   };
-}
+};
 
 /*
  * Handle alarm
  */
-function isAlarmEnabled(){
+let isAlarmEnabled = function(){
   try{
-    var alarm = require('sched');
-    var alarmObj = alarm.getAlarm(TIMER_IDX);
+    let alarm = require('sched');
+    let alarmObj = alarm.getAlarm(TIMER_IDX);
     if(alarmObj===undefined || !alarmObj.on){
       return false;
     }
@@ -630,35 +634,35 @@ function isAlarmEnabled(){
 
   } catch(ex){ }
   return false;
-}
+};
 
-function getAlarmMinutes(){
+let getAlarmMinutes = function(){
   if(!isAlarmEnabled()){
       return -1;
   }
 
-  var alarm = require('sched');
-  var alarmObj =  alarm.getAlarm(TIMER_IDX);
+  let alarm = require('sched');
+  let alarmObj =  alarm.getAlarm(TIMER_IDX);
   return Math.round(alarm.getTimeToAlarm(alarmObj)/(60*1000));
-}
+};
 
-function increaseAlarm(){
+let increaseAlarm = function(){
   try{
-      var minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
-      var alarm = require('sched')
+      let minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
+      let alarm = require('sched')
       alarm.setAlarm(TIMER_IDX, {
         timer : (minutes+5)*60*1000,
       });
       alarm.reload();
   } catch(ex){ }
-}
+};
 
-function decreaseAlarm(){
+let decreaseAlarm = function(){
   try{
-      var minutes = getAlarmMinutes();
+      let minutes = getAlarmMinutes();
       minutes -= 5;
 
-      var alarm = require('sched')
+      let alarm = require('sched')
       alarm.setAlarm(TIMER_IDX, undefined);
 
       if(minutes > 0){
@@ -669,13 +673,13 @@ function decreaseAlarm(){
 
       alarm.reload();
   } catch(ex){ }
-}
+};
 
 
 /*
  * Listeners
  */
-Bangle.on('lcdPower',on=>{
+let onLcdPower = on=>{
   if (on) {
     // Whenever we connect to Gadgetbridge, reading data from
     // health failed. Therefore, we update only partially...
@@ -685,32 +689,35 @@ Bangle.on('lcdPower',on=>{
     if (drawTimeout) clearTimeout(drawTimeout);
     drawTimeout = undefined;
   }
-});
+};
+Bangle.on('lcdPower', onLcdPower);
 
-Bangle.on('lock', function(isLocked) {
+let onLock = function(isLocked) {
   drawInfo();
-});
+};
+Bangle.on('lock', onLock);
 
-Bangle.on('charging',function(charging) {
+
+let onCharge = function(charging) {
   drawState();
-});
+};
+Bangle.on('charging', onCharge);
 
-function feedback(){
+let feedback = function(){
   Bangle.buzz(40, 0.3);
-}
+};
 
-// Touch gestures to control clock. We don't use swipe to be compatible with the bangle ecosystem
-Bangle.on('touch', function(btn, e){
-  var left = parseInt(g.getWidth() * 0.2);
-  var right = g.getWidth() - left;
-  var upper = parseInt(g.getHeight() * 0.2);
-  var lower = g.getHeight() - upper;
+let onTouch = function(btn, e){
+  let left = parseInt(g.getWidth() * 0.2);
+  let right = g.getWidth() - left;
+  let upper = parseInt(g.getHeight() * 0.2);
+  let lower = g.getHeight() - upper;
+
+  let is_left = e.x < left;
+  let is_right = e.x > right;
+  let is_upper = e.y < upper;
+  let is_lower = e.y > lower;
 
-  var is_left = e.x < left;
-  var is_right = e.x > right;
-  var is_upper = e.y < upper;
-  var is_lower = e.y > lower;
-  
   if(!settings.disableData){
     if(is_left && lcarsViewPos == 1){
       feedback();
@@ -744,16 +751,30 @@ Bangle.on('touch', function(btn, e){
     draw();
     return;
   }
-});
-
+};
+// Touch gestures to control clock. We don't use swipe to be compatible with the bangle ecosystem
+Bangle.on('touch', onTouch);
 
+let themeBefore = g.theme;
 /*
  * Lets start widgets, listen for btn etc.
  */
 // Show launcher when middle button pressed
-Bangle.setUI("clock");
+Bangle.setUI({mode:"clock",remove:function() {
+    if (drawTimeout) clearTimeout(drawTimeout);
+    delete Graphics.prototype.setFontAntonioMedium;
+    delete Graphics.prototype.setFontAntonioLarge;
+    Bangle.removeListener("lcdPower",onLcdPower);
+    Bangle.removeListener("lock",onLock);
+    Bangle.removeListener("charging",onCharge);
+    Bangle.removeListener("touch",onTouch);
+    require('sched').setAlarm(TIMER_IDX, undefined);
+    g.setTheme(themeBefore);
+    widget_utils.cleanup();
+}});
 Bangle.loadWidgets();
 
 // Clear the screen once, at startup and draw clock
 g.setTheme({bg:"#000",fg:"#fff",dark:true}).clear();
 draw();
+}
\ No newline at end of file
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 7837eb4d1..81c71020f 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -26,7 +26,7 @@
   }
 
 
-  var dataOptions = ["Steps", "Battery", "VREF", "HRM", "Temp", "Humidity", "Wind", "Altitude", "CoreT"];
+  var dataOptions = ["Steps", "Battery", "BattVolt", "VREF", "HRM", "Temp", "Humidity", "Wind", "Altitude", "CoreT"];
   var speedOptions = ["kph", "mph"];
   var color_options = ['Green','Orange','Cyan','Purple','Red','Blue','Yellow','White','Purple','Pink','Light Green','Dark Green'];
   var bg_code = ['#00ff00','#FF9900','#0094FF','#FF00DC','#ff0000','#0000ff','#ffef00','#FFFFFF','#FF00FF','#6C00FF','#99FF00','#556B2F'];
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index 787ca9046..5fbb8dcf2 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.26",
+  "version":"0.29",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "Library Computer Access Retrieval System (LCARS) clock.",
@@ -16,5 +16,6 @@
     {"name":"lcars.app.js","url":"lcars.app.js"},
     {"name":"lcars.img","url":"lcars.icon.js","evaluate":true},
     {"name":"lcars.settings.js","url":"lcars.settings.js"}
-  ]
+  ],
+  "data":[{"name":"lcars.setting.json"}]
 }
diff --git a/apps/lcdclock/ChangeLog b/apps/lcdclock/ChangeLog
index 5560f00bc..56ea03c2c 100644
--- a/apps/lcdclock/ChangeLog
+++ b/apps/lcdclock/ChangeLog
@@ -1 +1,3 @@
 0.01: New App!
+0.02: Use clock_info module as an app
+0.03: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/lcdclock/app.js b/apps/lcdclock/app.js
index 2bc23247c..3808f46fe 100644
--- a/apps/lcdclock/app.js
+++ b/apps/lcdclock/app.js
@@ -79,6 +79,6 @@ let clockInfoDraw = (itm, info, options) => {
 
 };
 let clockInfoItems = require("clock_info").load();
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:R.x, y:R.y, w:midX-2, h:barY-R.y-2, draw : clockInfoDraw});
-let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { x:midX+2, y:R.y, w:midX-3, h:barY-R.y-2, draw : clockInfoDraw});
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app:"lcdclock", x:R.x, y:R.y, w:midX-2, h:barY-R.y-2, draw : clockInfoDraw});
+let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, {  app:"lcdclock", x:midX+2, y:R.y, w:midX-3, h:barY-R.y-2, draw : clockInfoDraw});
 }
diff --git a/apps/lcdclock/metadata.json b/apps/lcdclock/metadata.json
index d7d09b106..b144c125e 100644
--- a/apps/lcdclock/metadata.json
+++ b/apps/lcdclock/metadata.json
@@ -1,12 +1,13 @@
 { "id": "lcdclock",
   "name": "LCD Clock",
-  "version":"0.01",
+  "version":"0.03",
   "description": "A Casio-style clock, with ClockInfo areas at the top and bottom. Tap them and swipe up/down to toggle between different information",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",
   "tags": "clock,clkinfo",
   "supports" : ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
   "storage": [
     {"name":"lcdclock.app.js","url":"app.js"},
     {"name":"lcdclock.img","url":"app-icon.js","evaluate":true}
diff --git a/apps/legoremote/ChangeLog b/apps/legoremote/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/legoremote/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/legoremote/README.md b/apps/legoremote/README.md
new file mode 100644
index 000000000..a95b7b154
--- /dev/null
+++ b/apps/legoremote/README.md
@@ -0,0 +1,28 @@
+# LEGO Remote control
+
+This app allows you to control LEGO models from Bangle.js
+
+Right now the only supported control device is the Mould King M-0006
+Bluetooth remote for LEGO Power Functions: http://www.espruino.com/LEGO+Power+Functions+Clone
+
+LEGO Power Functions does not have an official Bluetooth remote controller. Hopefully
+in the future this app will be able to support other types of remote (see below).
+
+## Usage
+
+Run the app, and ensure you're not connected to your watch via Bluetooth
+(a warning will pop up if so).
+
+Now press the arrow keys on the screen to control the robot.
+
+It is expected that the robot is controlled by two motors, one on the left
+side (connected to the `A` output) and one on the right (connected to the `B` output).
+
+## Future additions
+
+In the future it would be great to add:
+
+* Recording a series of movements and playing them back
+* Support for official LEGO bluetooth remotes (via [Pybricks](https://pybricks.com/))
+* Support for different robot styles and configurations
+* Using the Bangle's compass (or even GPS) to allow better robot control.
diff --git a/apps/legoremote/app-icon.js b/apps/legoremote/app-icon.js
new file mode 100644
index 000000000..850e0eda6
--- /dev/null
+++ b/apps/legoremote/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4X/8H5A4NH/4ABJf4A/AFMC1Uq1QABhWqBYYJDAAegBYWqxWogWohQBCBYWpqsVqoABytVBYUC0u5rf5rf1q/xtQLBhWW/t//2/AYVKBYWX/u//z3B3//rRGCr/1/+H/v9/1/BYn2/lT+v6/oXDlF/4//9/78/5F4epv/X//f7/3+v9I4Wp38b/9v7//+4LD0P/HgN/7f/EgMoBYOlJ4IACDAP1O4QLH6ibCBYI7Br/+qf/iwLC1NIquhq2lquprWAWQVVoNVgtU0NVlQLCZQ7XDbgLWJEgOCdgLZBdwgA/AH4AaA"))
diff --git a/apps/legoremote/app.js b/apps/legoremote/app.js
new file mode 100644
index 000000000..1c76a54a8
--- /dev/null
+++ b/apps/legoremote/app.js
@@ -0,0 +1,70 @@
+var lego = require("mouldking");
+lego.start();
+E.on('kill', () => {
+  // return to normal Bluetooth advertising
+  NRF.setAdvertising({},{showName:true});
+});
+// You must leave one second after 'start' to allow the remote to be paired
+
+var arrowIcon = atob("IiiBAAAAwAAAAPwAAAB/gAAAP/AAAB/+AAAP/8AAB//4AAP//wAA///gAH///AA///8AH///4A////wH////gf////D////8f////5/////n////+f////4AP/8AAA//wAAD//AAAP/8AAA//wAAD//AAAH/8AAAf/wAAB//AAAH/8AAAf/gAAB/+AAAH/4AAAf/gAAB/+AAAH/4AAAP/gAAA/+AAAD/wAAAD8AA");
+var controlState = "";
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+var R = Bangle.appRect;
+// we'll divide up into 3x3
+function getBoxCoords(x,y) {
+  return {
+    x : R.x + R.w*x/3,
+    y : R.y + R.h*y/3
+  };
+}
+
+function draw() {
+  g.reset().clearRect(R);
+  var c, ninety = Math.PI/2;
+  var colOn = "#f00", colOff = g.theme.fg;
+  c = getBoxCoords(1.5, 0.5);
+  g.setColor(controlState=="up"?colOn:colOff).drawImage(arrowIcon,c.x,c.y,{rotate:0});
+  c = getBoxCoords(2.5, 1.5);
+  g.setColor(controlState=="right"?colOn:colOff).drawImage(arrowIcon,c.x,c.y,{rotate:ninety});
+  c = getBoxCoords(0.5, 1.5);
+  g.setColor(controlState=="left"?colOn:colOff).drawImage(arrowIcon,c.x,c.y,{rotate:-ninety});
+  c = getBoxCoords(1.5, 1.5);
+  g.setColor(controlState=="down"?colOn:colOff).drawImage(arrowIcon,c.x,c.y,{rotate:ninety*2});
+  if (NRF.getSecurityStatus().connected) {
+    c = getBoxCoords(1.5, 2.5);
+    g.setFontAlign(0,0).setFont("6x8").drawString("WARNING:\nBluetooth Connected\nYou must disconnect\nbefore LEGO will work",c.x,c.y);
+  }
+}
+draw();
+NRF.on('connect', draw);
+NRF.on('disconnect', draw);
+
+function setControlState(s) {
+  controlState = s;
+  var c = {};
+  var speed = 3;
+  if (s=="up") c={a:-speed,b:-speed};
+  if (s=="down") c={a:speed,b:speed};
+  if (s=="left") c={a:speed,b:-speed};
+  if (s=="right") c={a:-speed,b:speed};
+  draw();
+  lego.set(c);
+}
+
+Bangle.on('drag',e => {
+  var x = Math.floor(E.clip((e.x - R.x) * 3 / R.w,0,2.99));
+  var y = Math.floor(E.clip((e.y - R.y) * 3 / R.h,0,2.99));
+  if (!e.b) {
+    setControlState("");
+    return;
+  }
+  if (y==0) { // top row
+    if (x==1) setControlState("up");
+  } else if (y==1) {
+    if (x==0) setControlState("left");
+    if (x==1) setControlState("down");
+    if (x==2) setControlState("right");
+  }
+});
diff --git a/apps/legoremote/app.png b/apps/legoremote/app.png
new file mode 100644
index 000000000..727049e2b
Binary files /dev/null and b/apps/legoremote/app.png differ
diff --git a/apps/legoremote/metadata.json b/apps/legoremote/metadata.json
new file mode 100644
index 000000000..c86251860
--- /dev/null
+++ b/apps/legoremote/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "legoremote",
+  "name": "LEGO Remote control",
+  "shortName":"LEGO Remote",
+  "version":"0.01",
+  "description": "Use your Bangle.js to control LEGO models. See the README for compatibility",
+  "icon": "app.png",
+  "tags": "toy,lego,bluetooth",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"legoremote.app.js","url":"app.js"},
+    {"name":"legoremote.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/lightswitch/ChangeLog b/apps/lightswitch/ChangeLog
index c4aeb2c1e..4f62ab799 100644
--- a/apps/lightswitch/ChangeLog
+++ b/apps/lightswitch/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Add masking widget input to other apps (using espruino/Espruino#2151), add a oversize option to increase the touch area.
 0.05: Prevent drawing into app area.
 0.06: Fix issue where .draw was being called by reference (not allowing widgets to be hidden)
+0.07: Handle the swipe event that is generated when draging to change light intensity, so it doesn't trigger some other swipe handler.
diff --git a/apps/lightswitch/README.md b/apps/lightswitch/README.md
index 67d070f5c..c17a6a4ed 100644
--- a/apps/lightswitch/README.md
+++ b/apps/lightswitch/README.md
@@ -1,6 +1,6 @@
 # Light Switch Widget
 
-With this widget I wanted to create a solution to quickly en-/disable the LCD backlight and even change the brightness.  
+With this widget I wanted to create a solution to quickly en-/disable the LCD backlight and even change the brightness.
 In addition it shows the lock status with the option to personalize the lock icon with a tiny image.
 
 All touch and drag inputs related to this widget are cached/masked to prevent actions in the active app.
@@ -9,32 +9,32 @@ All touch and drag inputs related to this widget are cached/masked to prevent ac
 ---
 ### Control
 ---
-* __On / off__  
+* __On / off__
   Single touch the widget to en-/disable the backlight.
-* __Change brightness__ _(can be disabled)_  
+* __Change brightness__ _(can be disabled)_
   First touch the widget, then quickly touch the screen again and drag up/down until you reach your wished brigthness.
-* __Double tap to flash backlight__ _(can be disabled)_  
-  By defaut you can double tap on the right side of your bangle to flash the backlight for a short duration.  
+* __Double tap to flash backlight__ _(can be disabled)_
+  By defaut you can double tap on the right side of your bangle to flash the backlight for a short duration.
   (While the backlight is active your bangle will be unlocked.)
-* __Double tap to unlock__ _(disabled by default)_  
+* __Double tap to unlock__ _(disabled by default)_
   If a side is defined in the app settings, your bangle will be unlocked if you double tap on that side.
 
 ---
 ### Settings
 ---
 #### Widget - Change the apperance of the widget:
-* __Bulb col__  
-  _red_ / _yellow_ / _green_ / __cyan__ / _blue_ / _magenta_  
-  Define the color used for the lightbulbs inner circle.  
+* __Bulb col__
+  _red_ / _yellow_ / _green_ / __cyan__ / _blue_ / _magenta_
+  Define the color used for the lightbulbs inner circle.
   The selected color will be dimmed depending on the actual brightness value.
-* __Image__  
-  __default__ / _random_ / _..._  
+* __Image__
+  __default__ / _random_ / _..._
   Set your favourite lock icon image. (If no image file is found _no image_ will be displayed.)
     * _random_ -> Select a random image on each time the widget is drawn.
 
 #### Control - Change when and how to use the widget:
-* __Touch__  
-  _on def clk_ / _on all clk_ / _clk+setting_ / _clk+launch_ / _except apps_ / __always on__  
+* __Touch__
+  _on def clk_ / _on all clk_ / _clk+setting_ / _clk+launch_ / _except apps_ / __always on__
   Select when touching the widget is active to en-/disable the backlight.
     * _on def clk_ -> only on your selected main clock face
     * _on all clk_ -> on all apps of the type _clock_
@@ -42,32 +42,34 @@ All touch and drag inputs related to this widget are cached/masked to prevent ac
     * _clk+launch_ -> on all apps of the types _clock_ and _launch_
     * _except apps_ -> on all apps of the types _clock_ and _launch_ and in the settings
     * _always on_ -> always enabled when the widget is displayed
-* __Oversize__  
-  _0px_ / _1px_ / _..._ / __20px__ / _..._ / _50px_  
+* __Oversize__
+  _0px_ / _1px_ / _..._ / __20px__ / _..._ / _50px_
   To make it easier to hit the widget, this value extends the touch area of the widget in all directions.
-* __Drag Delay__  
-  _off_ / _50ms_ / _100ms_ / _..._ / __500ms__ / _..._ / _1000ms_  
+* __Drag Delay__
+  _off_ / _50ms_ / _100ms_ / _..._ / __500ms__ / _..._ / _1000ms_
   Change the maximum delay between first touch and re-touch/drag to change the brightness or disable changing the brightness completely.
-* __Min Value__  
-  _1%_ / _2%_ / _..._ / __10%__ / _..._ / _100%_  
-  Set the minimal level of brightness you can change to.
+* __Min Value__
+  _1%_ / _2%_ / _..._ / __10%__ / _..._ / _100%_
+ Set the minimal level of brightness you can change to.
+* __Tap to lock__
+ Tapping the widget locks the screen, rather than toggling brightness.
 
 #### Unlock - Set double tap side to unlock:
-* __TapSide__  
+* __TapSide__
   __off__ / _left_ / _right_ / _top_ / _bottom_ / _front_ / _back_
 
 #### Flash - Change if and how to flash the backlight:
-* __TapSide__  
-  _off_ / _left_ / __right__ / _top_ / _bottom_ / _front_ / _back_  
+* __TapSide__
+  _off_ / _left_ / __right__ / _top_ / _bottom_ / _front_ / _back_
   Set double tap side to flash the backlight or disable completely.
-* __Tap__  
-  _on locked_ / _on unlocked_ / __always on__  
+* __Tap__
+  _on locked_ / _on unlocked_ / __always on__
   Select when a double tap is recognised.
-* __Timeout__  
-  _0.5s_ / _1s_ / _..._ / __2s__ / _..._ / _10s_  
+* __Timeout__
+  _0.5s_ / _1s_ / _..._ / __2s__ / _..._ / _10s_
   Change how long the backlight will be activated on a flash.
-* __Min Value__  
-  _1%_ / _2%_ / _..._ / __20%__ / _..._ / _100%_  
+* __Min Value__
+  _1%_ / _2%_ / _..._ / __20%__ / _..._ / _100%_
   Set the minimal level of brightness for the backlight on a flash.
 
 ---
@@ -81,7 +83,7 @@ All touch and drag inputs related to this widget are cached/masked to prevent ac
 
 Examples in default light and dark theme.
 
-| Lock | Heart | Invader | JS | Smiley | Skull | Storm | 
+| Lock | Heart | Invader | JS | Smiley | Skull | Storm |
 |:----:|:-----:|:-------:|:--:|:------:|:-----:|:-----:|
 | ![](images/image_lock.png) | ![](images/image_heart.png) | ![](images/image_invader.png) | ![](images/image_js.png) | ![](images/image_smiley.png) | ![](images/image_skull.png) | ![](images/image_storm.png) |
 
diff --git a/apps/lightswitch/metadata.json b/apps/lightswitch/metadata.json
index d1a8d6e2a..f1f0160b8 100644
--- a/apps/lightswitch/metadata.json
+++ b/apps/lightswitch/metadata.json
@@ -2,7 +2,7 @@
   "id": "lightswitch",
   "name": "Light Switch Widget",
   "shortName": "Light Switch",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A fast way to switch LCD backlight on/off, change the brightness and show the lock status. All in one widget.",
   "icon": "images/app.png",
   "screenshots": [
diff --git a/apps/lightswitch/settings.js b/apps/lightswitch/settings.js
index 5ac70bc28..e83e51562 100644
--- a/apps/lightswitch/settings.js
+++ b/apps/lightswitch/settings.js
@@ -10,6 +10,7 @@
     oversize: 20,
     dragDelay: 500,
     minValue: 0.1,
+    tapToLock: false,
     unlockSide: "",
     tapSide: "right",
     tapOn: "always",
@@ -32,7 +33,7 @@
       var w = WIDGETS.lightswitch;
       // assign changes to widget
       w = Object.assign(w, settings);
-      // redraw widgets if neccessary
+      // redraw widgets if necessary
       if (drawWidgets) Bangle.drawWidgets();
     }
   }
@@ -45,9 +46,9 @@
       // return entry for string value
       return {
         value: entry.value.indexOf(settings[key]),
-        min : 0,
-        max : entry.value.length - 1,
-        wrap : true,
+        min: 0,
+        max: entry.value.length - 1,
+        wrap: true,
         format: v => entry.title ? entry.title[v] : entry.value[v],
         onchange: function(v) {
           writeSetting(key, entry.value[v], entry.drawWidgets);
@@ -58,10 +59,10 @@
       // return entry for numerical value
       return {
         value: settings[key] * entry.factor,
-        min : entry.min,
-        max : entry.max,
+        min: entry.min,
+        max: entry.max,
         step: entry.step,
-        wrap : true,
+        wrap: true,
         format: v => v > 0 ? v + entry.unit : "off",
         onchange: function(v) {
           writeSetting(key, v / entry.factor, entry.drawWidgets);
@@ -119,6 +120,11 @@
       max: 100,
       step: 1
     },
+    tapToLock: {
+      title: ["on", "off"],
+      value: [true, false],
+      drawWidgets: false
+    },
     unlockSide: {
       title: ["off", "left", "right", "top", "bottom", "front", "back"],
       value: ["", "left", "right", "top", "bottom", "front", "back"]
@@ -146,17 +152,18 @@
         title: "Light Switch"
       },
       "< Back": () => back(),
-      "-- Widget": 0,
+      "-- Widget": {},
       "Bulb col": getEntry("colors"),
       "Image": getEntry("image"),
-      "-- Control": 0,
+      "-- Control": {},
       "Touch": getEntry("touchOn"),
       "Oversize": getEntry("oversize"),
       "Drag Delay": getEntry("dragDelay"),
       "Min Value": getEntry("minValue"),
-      "-- Unlock": 0,
+      "Tap to lock": getEntry("tapToLock"),
+      "-- Unlock": {},
       "TapSide": getEntry("unlockSide"),
-      "-- Flash": 0,
+      "-- Flash": {},
       "TapSide ": getEntry("tapSide"),
       "Tap": getEntry("tapOn"),
       "Timeout": getEntry("tOut"),
diff --git a/apps/lightswitch/widget.js b/apps/lightswitch/widget.js
index 9eb488aca..6b573355b 100644
--- a/apps/lightswitch/widget.js
+++ b/apps/lightswitch/widget.js
@@ -7,6 +7,7 @@
     oversize: 20,
     dragDelay: 500,
     minValue: 0.1,
+    tapToLock: false,
     unlockSide: "",
     tapSide: "right",
     tapOn: "always",
@@ -164,13 +165,12 @@
       w.changeValue(value, event.b);
 
       // masks this drag event by messing up the event handler
-      // see https://github.com/espruino/Espruino/issues/2151
-      Bangle.removeListener("drag", w.dragListener);
-      Bangle["#ondrag"] = [w.dragListener].concat(Bangle["#ondrag"]);
+      E.stopEventPropagation&&E.stopEventPropagation();
 
       // on touch release remove drag listener and reset drag status to indicate stopped drag action
       if (!event.b) {
         Bangle.removeListener("drag", w.dragListener);
+        Bangle.removeListener("swipe", w.swipeListener);
         w.dragStatus = "off";
       }
 
@@ -180,6 +180,11 @@
       value = undefined;
     },
 
+    swipeListener: function(_,__) {
+      // masks this swipe event by messing up the event handler
+      E.stopEventPropagation&&E.stopEventPropagation();
+    },
+
     // listener function //
     // touch listener for light control
     touchListener: function(button, cursor) {
@@ -196,20 +201,26 @@
           Bangle.buzz(25);
           // check if drag is disabled
           if (w.dragDelay) {
-            // add drag listener at first position
+            // add drag and swipe listeners at respective first position
             Bangle["#ondrag"] = [w.dragListener].concat(Bangle["#ondrag"]);
+            Bangle["#onswipe"] = [w.swipeListener].concat(Bangle["#onswipe"]);
             // set drag timeout
             w.dragStatus = setTimeout((w) => {
-              // remove drag listener
+              // remove drag and swipe listeners
               Bangle.removeListener("drag", w.dragListener);
+              Bangle.removeListener("swipe", w.swipeListener);
               // clear drag timeout
               if (typeof w.dragStatus === "number") clearTimeout(w.dragStatus);
               // reset drag status to indicate stopped drag action
               w.dragStatus = "off";
             }, w.dragDelay, w);
           }
-          // switch backlight
-          w.changeValue();
+          if (w.tapToLock) {
+            Bangle.setLocked(true);
+          } else {
+            // switch backlight
+            w.changeValue();
+          }
           // masks this touch event by messing up the event handler
           // see https://github.com/espruino/Espruino/issues/2151
           Bangle.removeListener("touch", w.touchListener);
@@ -251,7 +262,7 @@
       w = undefined;
     }
   });
-  
+
   Bangle.on("lock", locked => {
     var w = WIDGETS.lightswitch;
     // set lcd brightness on unlocking
diff --git a/apps/limelight/metadata.json b/apps/limelight/metadata.json
index 0e5dfd565..5c6bcfd76 100644
--- a/apps/limelight/metadata.json
+++ b/apps/limelight/metadata.json
@@ -13,5 +13,8 @@
     {"name":"limelight.app.js","url":"limelight.app.js"},
     {"name":"limelight.settings.js","url":"limelight.settings.js"},
     {"name":"limelight.img","url":"limelight.icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"limelight.json"}
   ]
 }
diff --git a/apps/linuxclock/ChangeLog b/apps/linuxclock/ChangeLog
index 71ca3afbb..5529034be 100644
--- a/apps/linuxclock/ChangeLog
+++ b/apps/linuxclock/ChangeLog
@@ -1,4 +1,5 @@
 0.01: New App.
 0.02: Performance improvements.
 0.03: Update clock_info to avoid a redraw
-0.04: Fix clkinfo -- use .get instead of .show
\ No newline at end of file
+0.04: Fix clkinfo -- use .get instead of .show
+0.05: Use clock_info module as an app
diff --git a/apps/linuxclock/metadata.json b/apps/linuxclock/metadata.json
index 68915b832..ccd9db5e7 100644
--- a/apps/linuxclock/metadata.json
+++ b/apps/linuxclock/metadata.json
@@ -1,18 +1,19 @@
 {
   "id": "linuxclock",
   "name": "Linux Clock",
-  "version": "0.04",
+  "version": "0.05",
   "description": "A Linux inspired clock.",
   "readme": "README.md",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot_2.png"}],
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "supports": ["BANGLEJS2"],
-  "allow_emulator": true,
+  "dependencies" : { "clock_info":"module" },
   "storage": [
     {"name":"linuxclock.app.js","url":"app.js"},
     {"name":"linuxclock.img","url":"app-icon.js","evaluate":true},
     {"name":"linuxclock.settings.js","url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"linuxclock.setting.json"}]
 }
diff --git a/apps/loadingscreen/ChangeLog b/apps/loadingscreen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/loadingscreen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/loadingscreen/README.md b/apps/loadingscreen/README.md
new file mode 100644
index 000000000..2d6128a53
--- /dev/null
+++ b/apps/loadingscreen/README.md
@@ -0,0 +1,15 @@
+# Loading Screen Settings
+
+This app allows you to choose the loading screen that's displayed when swapping between apps on Bangle.js.
+
+## Usage
+
+Go to the Launcher, then `Settings`, then `Apps` and click on `Loading Screen` - you can then click to choose the loading screen you'll see.
+
+## Internals
+
+When reloading an app (fast load doesn't display anything), Bangle.js looks for a file called `.loading` (in versions 2v18+)  which should be
+an image. If it doesn't exist, the default `Loading...` screen is displayed. If it does exist and is less than 3 bytes long,
+nothing is displayed, or if it's an image it is displayed, centered.
+
+This app sets that image file accordingly, but you can always upload your own file.
\ No newline at end of file
diff --git a/apps/loadingscreen/app.png b/apps/loadingscreen/app.png
new file mode 100644
index 000000000..f9f36d1fc
Binary files /dev/null and b/apps/loadingscreen/app.png differ
diff --git a/apps/loadingscreen/metadata.json b/apps/loadingscreen/metadata.json
new file mode 100644
index 000000000..1815e4ce8
--- /dev/null
+++ b/apps/loadingscreen/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "loadingscreen",
+  "name": "Loading Screen",
+  "version":"0.01",
+  "description": "On Bangle.js 2v18+, this lets you customize the app loading screen via an new menu in Settings -> Apps",
+  "icon": "app.png",
+  "screenshots" : [ { "url":"screenshot1.png" }, { "url":"screenshot2.png" } ],
+  "tags": "tool",
+  "type": "settings",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"loadingscreen.settings.js","url":"settings.js"}
+  ],
+  "data":[{"name":".loading"}]
+}
diff --git a/apps/loadingscreen/screenshot1.png b/apps/loadingscreen/screenshot1.png
new file mode 100644
index 000000000..2eb4055c8
Binary files /dev/null and b/apps/loadingscreen/screenshot1.png differ
diff --git a/apps/loadingscreen/screenshot2.png b/apps/loadingscreen/screenshot2.png
new file mode 100644
index 000000000..3f5f81eef
Binary files /dev/null and b/apps/loadingscreen/screenshot2.png differ
diff --git a/apps/loadingscreen/settings.js b/apps/loadingscreen/settings.js
new file mode 100644
index 000000000..8489423a2
--- /dev/null
+++ b/apps/loadingscreen/settings.js
@@ -0,0 +1,81 @@
+(function(back) {
+  function goBack() {
+    var im = require("Storage").read(".loading");
+    if (im && im.length>3) {
+      var i = g.imageMetrics(im);
+      g.reset().drawImage(im, (g.getWidth()-i.width)/2, (g.getHeight()-i.height)/2);
+    }
+    setTimeout(back, 500);
+  }
+
+  function savePattern(pattern) {
+    E.showMessage("Please wait...");
+    var im = Graphics.createImage(pattern,"string");
+    var w = g.getWidth(), h = g.getHeight();
+    var b = Graphics.createArrayBuffer(w,h,1,{msb:true});
+    for (var y=0;y<h;y+=im.height)
+      for (var x=0;x<w;x+=im.width)
+        b.drawImage(im,x,y);
+    b.transparent = 0;
+    require("Storage").write(".loading",b.asImage("string"));
+    goBack();
+  }
+
+  function iconHourglass() {
+    // To get FG+BG+transparent, convert a monochrome image as a 2 bit greyscale using the image converter
+    return require("heatshrink").decompress(atob("mE4wUBqAOJgtABZMBGjH/ABALlBhA8LBIJrBBZCDCBZEFqoLJqoLO4BBDgYLcn/wBYcP/gLFCYIbBBY38BYYFBBYVACIILE+EBBYY1BLgX/BYgVBEAQECBYSQCJAQcCRwNVqg8CBYIDCioLDCYQbDBYRUBFYPwBwJ8BBQQ8BCgQaCHQQLNEZQ7LKZZrLQYbKDQYabDAASbFYoQACWYg2DAQrjPNIRtCBYjKCBYLMCBaIKBAAILGAAwLNRwQLHgrJCBY8BRIQLHSoYLJBQ4MDBcYAWNYIAIgKDBABEFA="));
+  }
+
+  function iconRetro() {
+    // A mac-style loading window
+      return require("heatshrink").decompress(atob("rk1gP/ABP4DBMDwALJnAWK39/+4tH3EEgIWJoEXC34WZORSghZ1oW/CzkB8AQC4AWFhgEBgOMFowSCjAtGhkPx8HzncuwWE4OMjHY41sDgQWCjHPzOMs3MCwuNzOYCw9Y7IWI5oWE5uwCwUf5+O53es187aJJFogAFFooAEg4HCcv4Wbn//ACnwA"))
+  }
+
+  E.showMenu({
+    "": {title:/*LANG*/"Loading Screen"},
+    "Default" : () => {require("Storage").erase(".loading");goBack()},
+    "No Screen" : () => {require("Storage").write(".loading","NO");goBack()}, // less than 3 chars and nothing is rendered
+    "Hourglass" : () => {require("Storage").write(".loading",iconHourglass());goBack()},
+    "Retro" : () => {require("Storage").write(".loading",iconRetro());goBack()},
+    "Stripes" : () => savePattern(`
+XX..XX..
+.XX..XX.
+..XX..XX
+X..XX..X
+XX..XX..
+.XX..XX.
+..XX..XX
+X..XX..X
+`),
+    "Lines" : () => savePattern(`
+XXXXXXXX
+........
+XXXXXXXX
+........
+XXXXXXXX
+........
+XXXXXXXX
+........
+`),
+    "Dots" : () => savePattern(`
+......
+..XX..
+.XXXX.
+.XXXX.
+..XX..
+......
+`)
+  });
+
+  /* For testing, this generates an image with a different colour surrounding on it
+require("FontSinclair").add(Graphics);
+var b = Graphics.createArrayBuffer(84,12,2);
+b.setBgColor(1).clear();
+b.transparent = 1;
+b.setFont("Sinclair").setColor(0);
+for (var y=-2;y<=2;y++) for (var x=-2;x<=2;x++) b.drawString("LOADING...",2+x,2+y);
+b.setColor(3).drawString("LOADING...",2,2);
+g.drawImage(b.asImage("string"));
+  */
+
+})
\ No newline at end of file
diff --git a/apps/locale/locale.html b/apps/locale/locale.html
index 6eb0d94ea..72c862da0 100644
--- a/apps/locale/locale.html
+++ b/apps/locale/locale.html
@@ -156,7 +156,7 @@ exports = { name : "en_GB", currencySym:"£",
           "%-m": "d.getMonth()+1",
           "%d":  "('0'+d.getDate()).slice(-2)",
           "%-d": "d.getDate()",
-          "%HH": "('0'+getHours(d)).slice(-2)",
+          "%HH": "getHours(d)",
           "%MM": "('0'+d.getMinutes()).slice(-2)",
           "%SS": "('0'+d.getSeconds()).slice(-2)",
           "%A":  `${js(locale.day)}.split(',')[d.getDay()]`,
@@ -191,9 +191,9 @@ function round(n, dp) {
 var is12;
 function getHours(d) {
   var h = d.getHours();
-  if (is12===undefined) is12 = (require('Storage').readJSON('setting.json',1)||{})["12hour"];
-  if (!is12) return h;
-  return (h%12==0) ? 12 : h%12;
+  if (is12 === undefined) is12 = (require('Storage').readJSON('setting.json', 1) || {})["12hour"];
+  if (!is12) return ('0' + h).slice(-2);
+  return ((h % 12 == 0) ? 12 : h % 12).toString();
 }
 exports = {
   name: ${js(locale.lang)},
diff --git a/apps/locale/locales.js b/apps/locale/locales.js
index 7b3146e15..cd720ba62 100644
--- a/apps/locale/locales.js
+++ b/apps/locale/locales.js
@@ -1,6 +1,7 @@
 /* jshint esversion: 6 */
 const distanceUnits = { // how many meters per X?
   "m": 1,
+  "ft": 0.3048,
   "yd": 0.9144,
   "mi": 1609.34,
   "km": 1000,
@@ -160,7 +161,7 @@ var locales = {
     currency_symbol: "$", currency_first: true,
     int_curr_symbol: "USD",
     speed: "mph",
-    distance: { 0: "m", 1: "mi" },
+    distance: { 0: "ft", 1: "mi" },
     temperature: "°F",
     ampm: { 0: "am", 1: "pm" },
     timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" },
diff --git a/apps/longpressbuzz/ChangeLog b/apps/longpressbuzz/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/longpressbuzz/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/longpressbuzz/README.md b/apps/longpressbuzz/README.md
new file mode 100644
index 000000000..6394faa75
--- /dev/null
+++ b/apps/longpressbuzz/README.md
@@ -0,0 +1,17 @@
+# Long Press, Buzz!
+
+Buzz at boot after a long press to indicate the watch was reinitiated at your command.
+
+To infinity and beyond, space ranger!
+
+## Usage
+
+Just install and it will run as boot code.
+
+## Requests
+
+Mention @[thyttan](https://github.com/thyttan) in an issue to the official [BangleApps repository](https://github.com/espruino/BangleApps/issues) for feature requests and bug reports.
+
+## Creators
+
+[thyttan](https://github.com/thyttan) and [Gordon Williams](https://github.com/gfwilliams).
diff --git a/apps/longpressbuzz/app.png b/apps/longpressbuzz/app.png
new file mode 100644
index 000000000..e3951d784
Binary files /dev/null and b/apps/longpressbuzz/app.png differ
diff --git a/apps/longpressbuzz/boot.js b/apps/longpressbuzz/boot.js
new file mode 100644
index 000000000..05bc4a9b3
--- /dev/null
+++ b/apps/longpressbuzz/boot.js
@@ -0,0 +1 @@
+if (BTN.read()) Bangle.buzz(80,0.40);
diff --git a/apps/longpressbuzz/metadata.json b/apps/longpressbuzz/metadata.json
new file mode 100644
index 000000000..56e06f0bd
--- /dev/null
+++ b/apps/longpressbuzz/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "longpressbuzz",
+  "name": "Long Press, Buzz!",
+  "shortName":"LPB",
+  "version":"0.01",
+  "description": "Buzz at boot after a long press to indicate the watch was reinitiated at your command.",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "system",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"longpressbuzz.0.boot.js","url":"boot.js"}
+  ]
+}
diff --git a/apps/marioclock/ChangeLog b/apps/marioclock/ChangeLog
index 276c65c6b..1ef3a571d 100644
--- a/apps/marioclock/ChangeLog
+++ b/apps/marioclock/ChangeLog
@@ -13,3 +13,4 @@
 0.13: Fix drawPyramid function so pyramids are drawn in correct Y position
 0.14: Add jumping frame for characters
 0.15: Disable notification buzz during Quiet Mode
+0.16: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/marioclock/marioclock-app.js b/apps/marioclock/marioclock-app.js
index 6289a2568..1f2e3a30a 100644
--- a/apps/marioclock/marioclock-app.js
+++ b/apps/marioclock/marioclock-app.js
@@ -73,7 +73,7 @@ let lastTemp = 0;
 
 const phone = {
   get status() {
-    return NRF.getSecurityStatus().connected ? "Yes" : "No";
+    return NRF.getSecurityStatus().connected ? /*LANG*/"Yes" : /*LANG*/"No";
   },
   message: null,
   messageTimeout: null,
@@ -92,6 +92,7 @@ function writeSettings(newSettings) {
 }
 
 function phoneOutbound(msg) {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify(msg));
 }
 
diff --git a/apps/marioclock/metadata.json b/apps/marioclock/metadata.json
index a0282405e..f8cd98ac3 100644
--- a/apps/marioclock/metadata.json
+++ b/apps/marioclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "marioclock",
   "name": "Mario Clock",
-  "version": "0.15",
+  "version": "0.16",
   "description": "Animated retro Mario clock, with Gameboy style 8-bit grey-scale graphics.",
   "icon": "marioclock.png",
   "type": "clock",
diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index d061e6642..7fa45c496 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -87,3 +87,16 @@
 0.62: Remove '.show' field, tidyup and fix .open if fast load not enabled
 0.63: Fix messages app loading on clock without fast load
 0.64: Ensure we don't get 'undefined' as the message body
+0.65: Make sure messages are saved if not in the clock app (fix #2460)
+0.66: Updated Navigation handling to work with new Gadgetbridge release
+0.67: Support for 'Ignore' for messages from Gadgetbridge
+      Message view is now taller, and we use swipe left/right to dismiss messages rather than buttons
+0.68: More navigation icons (for roundabouts)
+0.69: More navigation icons (keep/uturn left/right)
+      Nav messages with '/' now get split on newlines
+0.70: Handle nav messages from newer Gadgetbridge builds that output distance as a String
+      If we receive a 'music' message and we're in the messages app (but not showing a message) show music (#2814)
+0.71: Cancel buzzing when watch unlocked, or when different messages viewed
+      On 2v18.64+ firmware, 'No Messages' now has a 'back' button
+0.72: Nav message updastes don't automatically launch navigation menu unless they're new
+0.73: Add sharp left+right nav icons
\ No newline at end of file
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index e944aff3c..2df9875a3 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -13,9 +13,11 @@
 /* For example for maps:
 
 // a message
-require("messages").pushMessage({"t":"add","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"})
+require("messages").pushMessage({"t":"add","id":1575479849,"src":"Skype","title":"My Friend","body":"Hey! How's everything going?",positive:1,negative:1})
 // maps
-require("messages").pushMessage({"t":"add","id":1,"src":"Maps","title":"0 yd - High St","body":"Campton - 11:48 ETA","img":"GhqBAAAMAAAHgAAD8AAB/gAA/8AAf/gAP/8AH//gD/98B//Pg/4B8f8Afv+PP//n3/f5//j+f/wfn/4D5/8Aef+AD//AAf/gAD/wAAf4AAD8AAAeAAADAAA="});
+GB({t:"nav",src:"maps",title:"Navigation",instr:"High St towards Tollgate Rd",distance:"966yd",action:"continue",eta:"08:39"})
+GB({t:"nav",src:"maps",title:"Navigation",instr:"High St",distance:"12km",action:"left_slight",eta:"08:39"})
+GB({t:"nav",src:"maps",title:"Navigation",instr:"Main St / I-29 ALT / Centerpoint Dr",distance:12345,action:"left_slight",eta:"08:39"})
 // call
 require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bob","body":"12421312",positive:true,negative:true})
 */
@@ -25,7 +27,8 @@ var fontSmall = "6x8";
 var fontMedium = g.getFonts().includes("6x15")?"6x15":"6x8:2";
 var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2";
 var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4";
-var active; // active screen
+var fontVLarge = g.getFonts().includes("6x15")?"12x20:2":"6x8:5";
+var active; // active screen (undefined/"list"/"music"/"map"/"message"/"scroller"/"settings")
 var openMusic = false; // go back to music screen after we handle something else?
 // hack for 2v10 firmware's lack of ':size' font handling
 try {
@@ -59,14 +62,16 @@ var onMessagesModified = function(type,msg) {
   msg.handled = true;
   require("messages").apply(msg, MESSAGES);
   // TODO: if new, show this new one
-  if (msg && msg.id!=="music" && msg.new && active!="map" &&
+  if (msg && msg.id!=="music" && msg.id!=="nav" && msg.new &&
       !((require('Storage').readJSON('setting.json', 1) || {}).quiet)) {
     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
-    if (active!="music") return; // don't open music over other screens
+    if ((active!=undefined) && (active!="list") && (active!="music")) return; // don't open music over other screens (but do if we're in the main menu)
   }
+  if (msg && msg.id=="nav" && msg.t=="modify" && active!="map")
+    return; // don't show an updated nav message if we're just in the menu
   showMessage(msg&&msg.id);
 };
 Bangle.on("message", onMessagesModified);
@@ -78,30 +83,54 @@ E.on("kill", saveMessages);
 
 function showMapMessage(msg) {
   active = "map";
-  var m, distance, street, target, eta;
-  m=msg.title.match(/(.*) - (.*)/);
-  if (m) {
-    distance = m[1];
-    street = m[2];
-  } else street=msg.title;
-  m=msg.body.match(/(.*) - (.*)/);
-  if (m) {
-    target = m[1];
-    eta = m[2];
-  } else target=msg.body;
+  require("messages").stopBuzz(); // stop repeated buzzing while the map is showing
+  var m, distance, street, target, img;
+  if ("string"==typeof msg.distance) // new gadgetbridge
+    distance = msg.distance;
+  else if ("number"==typeof msg.distance) // 0.74 gadgetbridge
+    distance = require("locale").distance(msg.distance);
+  if (msg.instr) {
+    var instr = msg.instr.replace(/\s*\/\s*/g," \/\n"); // convert slashes to newlines
+    if (instr.includes("towards") || instr.includes("toward")) {
+      m = instr.split(/towards|toward/);
+      target = m[0].trim();
+      street = m[1].trim();
+    }else
+      target = instr;
+  }
+  switch (msg.action) {
+  case "continue": img = "EBgBAIABwAPgD/Af+D/8f/773/PPY8cDwAPAA8ADwAPAA8AAAAPAA8ADwAAAA8ADwAPA";break;
+  case "left": img = "GhcBAYAAAPAAAHwAAD4AAB8AAA+AAAf//8P///x///+PAAPx4AA8fAAHD4ABwfAAcDwAHAIABwAAAcAAAHAAABwAAAcAAAHAAABwAAAc";break;
+  case "right": img = "GhcBAABgAAA8AAAPgAAB8AAAPgAAB8D///j///9///+/AAPPAAHjgAD44AB8OAA+DgAPA4ABAOAAADgAAA4AAAOAAADgAAA4AAAOAAAA";break;
+  case "left_slight": img = "ERgB//B/+D/8H4AP4Af4A74Bz4Dj4HD4OD4cD4AD4ADwADwADgAHgAPAAOAAcAA4ABwADgAH";break;
+  case "right_slight": img = "ERgBB/+D/8H/4APwA/gD/APuA+cD44Phw+Dj4HPgAeAB4ADgAPAAeAA4ABwADgAHAAOAAcAA";break;
+  case "left_sharp": img = "GBaBAAAA+AAB/AAH/gAPjgAeBwA8BwB4B+DwB+HgB+PAB+eAB+8AB+4AB/wAB/gAB//gB//gB//gBwAABwAABwAABwAABw=="; break;
+  case "right_sharp": img = "GBaBAB8AAD+AAH/gAHHwAOB4AOA8AOAeAOAPB+AHh+ADx+AB5+AA9+AAd+AAP+AAH+AH/+AH/+AH/+AAAOAAAOAAAOAAAA==";break;
+  case "keep_left": img = "ERmBAACAAOAB+AD+AP+B/+H3+PO+8c8w4wBwADgAHgAPAAfAAfAAfAAfAAeAAeAAcAA8AA4ABwADgA==";break;
+  case "keep_right": img = "ERmBAACAAOAA/AD+AP+A//D/fPueeceY4YBwADgAPAAeAB8AHwAfAB8ADwAPAAcAB4ADgAHAAOAAAA==";break;
+  case "uturn_left": img = "GRiBAAAH4AAP/AAP/wAPj8APAfAPAHgHgB4DgA8BwAOA4AHAcADsOMB/HPA7zvgd9/gOf/gHH/gDh/gBwfgA4DgAcBgAOAAAHAAADgAABw==";break;
+  case "uturn_right": img = "GRiBAAPwAAf+AAf/gAfj4AfAeAPAHgPADwHgA4DgAcBwAOA4AHAcBjhuB5x/A+57gP99wD/84A/8cAP8OAD8HAA4DgAMBwAAA4AAAcAAAA==";break;
+  case "finish": img = "HhsBAcAAAD/AAAH/wAAPB4AAeA4AAcAcAAYIcAA4cMAA48MAA4cMAAYAcAAcAcAAcA4AAOA4AAOBxjwHBzjwHjj/4Dnn/4B3P/4B+Pj4A8fj8Acfj8AI//8AA//+AA/j+AB/j+AB/j/A";break;
+  case "roundabout_left": img = "HBaCAAADwAAAAAAAD/AAAVUAAD/wABVVUAD/wABVVVQD/wAAVABUD/wAAVAAFT/////wABX/////8AAF//////AABT/////wABUP/AAD/AAVA/8AA/8AVAD/wAD//VQAP/AAP/1QAA/wAA/9AAADwAAD/AAAAAAAA/wAAAAAAAP8AAAAAAAD/AAAAAAAA/wAAAAAAAP8AAAAAAAD/AA=";break;
+  case "roundabout_right": img = "HRaCAAAAAAAA8AAAP/8AAP8AAD///AA/8AA////AA/8AP/A/8AA/8A/wAP8AA/8P8AA/////8/wAD///////AAD//////8AAP////8P8ABUAAP/A/8AVQAD/wA//1UAA/8AA//VAAP/AAA/9AAA/wAAAPwAAA8AAAA/AAAAAAAAD8AAAAAAAAPwAAAAAAAA/AAAAAAAAD8AAAAAAAAPwAAAAAAA=";break;
+  case "roundabout_straight": img = "EBuCAAADwAAAD/AAAD/8AAD//wAD///AD///8D/P8/z/D/D//A/wPzAP8AwA//UAA//1QA//9VA/8AFUP8AAVD8AAFQ/AABUPwAAVD8AAFQ/wABUP/ABVA//9VAD//VAAP/1AAAP8AAAD/AAAA/wAA==";break;
+  case "roundabout_uturn": img = "ICCBAAAAAAAAAAAAAAAAAAAP4AAAH/AAAD/4AAB4fAAA8DwAAPAcAADgHgAA4B4AAPAcAADwPAAAeHwAADz4AAAc8AAABPAAAADwAAAY8YAAPPPAAD73gAAf/4AAD/8AABf8AAAb+AAAHfAAABzwAAAcYAAAAAAAAAAAAAAAAAAAAAAA";break;
+  }
+  //FIXME: what about countries where we drive on the right? How will we know to flip the icons?
+
   layout = new Layout({ type:"v", c: [
-    {type:"txt", font:fontMedium, label:target, bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:2 },
-    {type:"h", bgCol:g.theme.bg2, col: g.theme.fg2,  fillx:1, c: [
+    {type:"txt", font:street?fontMedium:fontLarge, label:target, bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:3 },
+    street?{type:"h", bgCol:g.theme.bg2, col: g.theme.fg2,  fillx:1, c: [
       {type:"txt", font:"6x8", label:"Towards" },
       {type:"txt", font:fontLarge, label:street }
-    ]},
+    ]}:{},
     {type:"h",fillx:1, filly:1, c: [
-      msg.img?{type:"img",src:atob(msg.img), scale:2}:{},
+      img?{type:"img",src:atob(img), scale:2, pad:6}:{},
       {type:"v", fillx:1, c: [
-        {type:"txt", font:fontLarge, label:distance||"" }
+        {type:"txt", font:fontVLarge, label:distance||"" }
       ]},
     ]},
-    {type:"txt", font:"6x8:2", label:eta }
+    {type:"txt", font:"6x8:2", label:msg.eta?`ETA ${msg.eta}`:"" }
   ]});
   g.reset().clearRect(Bangle.appRect);
   layout.render();
@@ -193,7 +222,7 @@ function showMessageScroller(msg) {
   var bodyFont = fontBig;
   g.setFont(bodyFont);
   var lines = [];
-  if (msg.title) lines = g.wrapString(msg.title, g.getWidth()-10)
+  if (msg.title) lines = g.wrapString(msg.title, g.getWidth()-10);
   var titleCnt = lines.length;
   if (titleCnt) lines.push(""); // add blank line after title
   lines = lines.concat(g.wrapString(msg.body, g.getWidth()-10),["",/*LANG*/"< Back"]);
@@ -206,7 +235,7 @@ function showMessageScroller(msg) {
       g.setBgColor(idx<titleCnt ? g.theme.bg2 : g.theme.bg).
         setColor(idx<titleCnt ? g.theme.fg2 : g.theme.fg).
         clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
-      g.setFont(bodyFont).drawString(lines[idx], r.x, r.y);
+      g.setFont(bodyFont).setFontAlign(0,-1).drawString(lines[idx], r.x+r.w/2, r.y);
     }, select : function(idx) {
       if (idx>=lines.length-2)
         showMessage(msg.id);
@@ -217,7 +246,7 @@ function showMessageScroller(msg) {
 
 function showMessageSettings(msg) {
   active = "settings";
-  E.showMenu({"":{"title":/*LANG*/"Message"},
+  var menu = {"":{"title":/*LANG*/"Message"},
     "< Back" : () => showMessage(msg.id),
     /*LANG*/"View Message" : () => {
       showMessageScroller(msg);
@@ -226,6 +255,19 @@ function showMessageSettings(msg) {
       MESSAGES = MESSAGES.filter(m=>m.id!=msg.id);
       checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
     },
+  };
+  if (Bangle.messageIgnore && msg.src)
+    menu[/*LANG*/"Ignore"] = () => {
+      E.showPrompt(/*LANG*/"Ignore all messages from "+E.toJS(msg.src)+"?", {title:/*LANG*/"Ignore"}).then(isYes => {
+        if (isYes) {
+          Bangle.messageIgnore(msg);
+          MESSAGES = MESSAGES.filter(m=>m.id!=msg.id);
+        }
+        checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+      });
+    };
+
+  menu = Object.assign(menu, {
     /*LANG*/"Mark Unread" : () => {
       msg.new = true;
       checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
@@ -243,6 +285,7 @@ function showMessageSettings(msg) {
       });
     },
   });
+  E.showMenu(menu);
 }
 
 function showMessage(msgid) {
@@ -256,7 +299,7 @@ function showMessage(msgid) {
     cancelReloadTimeout(); // don't auto-reload to clock now
     return showMusicMessage(msg);
   }
-  if (msg.src=="Maps") {
+  if (msg.id=="nav") {
     cancelReloadTimeout(); // don't auto-reload to clock now
     return showMapMessage(msg);
   }
@@ -281,20 +324,21 @@ function showMessage(msgid) {
       title = (lines.length>2) ? lines.slice(0,2).join("\n")+"..." : lines.join("\n");
     }
   }
-  // If body of message is only two lines long w/ large font, use large font.
-
-  if (body) {
-    var w = g.getWidth()-10;
-    if (g.setFont(bodyFont).stringWidth(body) > w * 2) {
+  if (body) { // Try and find a font that fits...
+    var w = g.getWidth()-2, h = Bangle.appRect.h-60;
+    if (g.setFont(bodyFont).wrapString(body, w).length*g.getFontHeight() > h) {
       bodyFont = fontBig;
-      if (settings.fontSize!=1 && g.setFont(bodyFont).stringWidth(body) > w * 3)
+      if (settings.fontSize!=1 && g.setFont(bodyFont).wrapString(body, w).length*g.getFontHeight() > h) {
         bodyFont = fontMedium;
+      }
     }
-    if (g.setFont(bodyFont).stringWidth(body) > w) {
-      lines = g.setFont(bodyFont).wrapString(msg.body, w);
-      var maxLines = Math.floor((g.getHeight()-110) / g.getFontHeight());
-      body = (lines.length>maxLines) ? lines.slice(0,maxLines).join("\n")+"..." : lines.join("\n");
-    }
+    // Now crop, given whatever font we have available
+    lines = g.setFont(bodyFont).wrapString(body, w);
+    var maxLines = Math.floor(h / g.getFontHeight());
+    if (lines.length>maxLines) // if too long, wrap with a bit less spae so we have room for '...'
+      body = g.setFont(bodyFont).wrapString(body, w-10).slice(0,maxLines).join("\n")+"...";
+    else
+      body = lines.join("\n");
   }
   function goBack() {
     layout = undefined;
@@ -302,26 +346,26 @@ function showMessage(msgid) {
     cancelReloadTimeout(); // don't auto-reload to clock now
     checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic:openMusic});
   }
-  var buttons = [
-  ];
-  if (msg.positive) {
-    buttons.push({type:"btn", src:atob("GRSBAAAAAYAAAcAAAeAAAfAAAfAAAfAAAfAAAfAAAfBgAfA4AfAeAfAPgfAD4fAA+fAAP/AAD/AAA/AAAPAAADAAAA=="), cb:()=>{
-      msg.new = false;
-      cancelReloadTimeout(); // don't auto-reload to clock now
-      Bangle.messageResponse(msg,true);
-      checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
-    }});
-  }
+  var negHandler,posHandler,footer = [ ];
   if (msg.negative) {
-    if (buttons.length) buttons.push({width:32}); // nasty hack...
-    buttons.push({type:"btn", src:atob("FhaBADAAMeAB78AP/4B/fwP4/h/B/P4D//AH/4AP/AAf4AB/gAP/AB/+AP/8B/P4P4fx/A/v4B//AD94AHjAAMA="), cb:()=>{
+    negHandler = ()=>{
       msg.new = false;
       cancelReloadTimeout(); // don't auto-reload to clock now
       Bangle.messageResponse(msg,false);
       checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
-    }});
+    }; footer.push({type:"img",src:atob("PhAB4A8AAAAAAAPAfAMAAAAAD4PwHAAAAAA/H4DwAAAAAH78B8AAAAAA/+A/AAAAAAH/Af//////w/gP//////8P4D///////H/Af//////z/4D8AAAAAB+/AfAAAAAA/H4DwAAAAAPg/AcAAAAADwHwDAAAAAA4A8AAAAAAAA=="),col:"#f00",cb:negHandler});
   }
+  footer.push({fillx:1}); // push images to left/right
+  if (msg.positive) {
+    posHandler = ()=>{
+      msg.new = false;
+      cancelReloadTimeout(); // don't auto-reload to clock now
+      Bangle.messageResponse(msg,true);
+      checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
+    };
+        footer.push({type:"img",src:atob("QRABAAAAAAAAAAOAAAAABgAAA8AAAAADgAAD4AAAAAHgAAPgAAAAAPgAA+AAAAAAfgAD4///////gAPh///////gA+D///////AD4H//////8cPgAAAAAAPw8+AAAAAAAfB/4AAAAAAA8B/gAAAAAABwB+AAAAAAADAB4AAAAAAAAABgAA=="),col:"#0f0",cb:posHandler});
 
+  }
 
   layout = new Layout({ type:"v", c: [
     {type:"h", fillx:1, bgCol:g.theme.bg2, col: g.theme.fg2,  c: [
@@ -342,8 +386,14 @@ function showMessage(msgid) {
       // allow tapping to show a larger version
       showMessageScroller(msg);
     } },
-    {type:"h",fillx:1, c: buttons}
+    {type:"h",fillx:1, c: footer}
   ]},{back:goBack});
+
+  Bangle.swipeHandler = lr => {
+    if (lr>0 && posHandler) posHandler();
+    if (lr<0 && negHandler) negHandler();
+  };
+  Bangle.on("swipe", Bangle.swipeHandler);
   g.reset().clearRect(Bangle.appRect);
   layout.render();
 }
@@ -354,17 +404,23 @@ function showMessage(msgid) {
   clockIfAllRead : bool
   showMsgIfUnread : bool
   openMusic : bool      // open music if it's playing
+  dontStopBuzz : bool   // don't stuf buzzing (any time other than the first this is undefined/false)
 }
 */
 function checkMessages(options) {
   options=options||{};
+  // If there's been some user interaction, it's time to stop repeated buzzing
+  if (!options.dontStopBuzz)
+    require("messages").stopBuzz();
   // If no messages, just show 'no messages' and return
   if (!MESSAGES.length) {
+    active=undefined; // no messages
     if (!options.clockIfNoMsg) return E.showPrompt(/*LANG*/"No Messages",{
       title:/*LANG*/"Messages",
       img:require("heatshrink").decompress(atob("kkk4UBrkc/4AC/tEqtACQkBqtUDg0VqAIGgoZFDYQIIM1sD1QAD4AIBhnqA4WrmAIBhc6BAWs8AIBhXOBAWz0AIC2YIC5wID1gkB1c6BAYFBEQPqBAYXBEQOqBAnDAIQaEnkAngaEEAPDFgo+IKA5iIOhCGIAFb7RqAIGgtUBA0VqobFgNVA")),
-      buttons : {/*LANG*/"Ok":1}
-    }).then(() => { load() });
+      buttons : {/*LANG*/"Ok":1},
+      back: () => load()
+    }).then(() => load());
     return load();
   }
   // we have >0 messages
@@ -389,7 +445,7 @@ function checkMessages(options) {
   // no new messages - go to clock?
   if (options.clockIfAllRead && newMessages.length==0)
     return load();
-  active = "main";
+  active = "list";
   // Otherwise show a menu
   E.showScroller({
     h : 48,
@@ -428,7 +484,10 @@ function checkMessages(options) {
       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
     },
-    select : idx => showMessage(MESSAGES[idx].id),
+    select : idx => {
+      if (idx < MESSAGES.length)
+        showMessage(MESSAGES[idx].id);
+    },
     back : () => load()
   });
 }
@@ -454,5 +513,13 @@ setTimeout(() => {
   var musicMsg = MESSAGES.find(m => m.id === "music");
   checkMessages({
     clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1,
-    openMusic: ((musicMsg&&musicMsg.new) && settings.openMusic) || (musicMsg&&musicMsg.state=="show") });
+    openMusic: ((musicMsg&&musicMsg.new) && settings.openMusic) || (musicMsg&&musicMsg.state=="show"),
+    dontStopBuzz: 1 });
 }, 10); // if checkMessages wants to 'load', do that
+
+/* If the Bangle is unlocked by the user, treat that
+as a queue to stop repeated buzzing */
+Bangle.on('lock',locked => {
+  if (!locked)
+    require("messages").stopBuzz();
+});
diff --git a/apps/messagegui/lib.js b/apps/messagegui/lib.js
index a9436a77b..54d79866a 100644
--- a/apps/messagegui/lib.js
+++ b/apps/messagegui/lib.js
@@ -29,7 +29,7 @@ exports.listener = function(type, msg) {
   }
 
   const appSettings = require("Storage").readJSON("messages.settings.json", 1) || {};
-  let loadMessages = (Bangle.CLOCK || event.important); // should we load the messages app?
+  let loadMessages = (Bangle.CLOCK || msg.important); // should we load the messages app?
   if (type==="music") {
     if (Bangle.CLOCK && msg.state && msg.title && appSettings.openMusic) loadMessages = true;
     else return;
diff --git a/apps/messagegui/metadata.json b/apps/messagegui/metadata.json
index 3504122f9..31d7fe262 100644
--- a/apps/messagegui/metadata.json
+++ b/apps/messagegui/metadata.json
@@ -2,7 +2,7 @@
   "id": "messagegui",
   "name": "Message UI",
   "shortName": "Messages",
-  "version": "0.64",
+  "version": "0.73",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messagegui/screenshot.png b/apps/messagegui/screenshot.png
index a64416f7d..bd8662c8a 100644
Binary files a/apps/messagegui/screenshot.png and b/apps/messagegui/screenshot.png differ
diff --git a/apps/messageicons/ChangeLog b/apps/messageicons/ChangeLog
index 1dd1f3d9e..f420615cb 100644
--- a/apps/messageicons/ChangeLog
+++ b/apps/messageicons/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Fix icons broken in 0v02 (#2386)
       Store all icons in a separate binary file (much faster lookup)
 0.04: Add message icon for 'clock'
+0.05: Add message icon for 'jira'
diff --git a/apps/messageicons/icons.img b/apps/messageicons/icons.img
index 104168357..66ecb53f8 100644
Binary files a/apps/messageicons/icons.img and b/apps/messageicons/icons.img differ
diff --git a/apps/messageicons/icons/generate.js b/apps/messageicons/icons/generate.js
index e857032af..b77cfc26e 100755
--- a/apps/messageicons/icons/generate.js
+++ b/apps/messageicons/icons/generate.js
@@ -87,6 +87,7 @@ exports.getColor = function(msg,options) {
   if (st.iconColorMode == 'mono') return options.default;
   const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   return {
+    // This file is generated by /icons/generate.js. If you need to modify its content, you should do it there instead.
     // 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": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/
@@ -107,6 +108,7 @@ exports.getColor = function(msg,options) {
     "google home": "#fbbc05",
 // "home assistant": "#41bdf5", // ha-blue is #41bdf5, but that's the background
     "instagram": "#ff0069", // https://about.instagram.com/brand/gradient
+    "jira": "#0052cc", //https://atlassian.design/resources/logo-library
     "lieferando": "#ff8000",
     "linkedin": "#0a66c2", // https://brand.linkedin.com/
     "messenger": "#0078ff",
diff --git a/apps/messageicons/icons/icon_names.json b/apps/messageicons/icons/icon_names.json
index f7a743e85..7c09cd397 100644
--- a/apps/messageicons/icons/icon_names.json
+++ b/apps/messageicons/icons/icon_names.json
@@ -42,6 +42,7 @@
   { "app":"google play store", "icon":"google play store.png" },
   { "app":"home assistant", "icon":"home assistant.png" },
   { "app":"instagram", "icon":"instagram.png" },
+  { "app":"jira", "icon":"jira.png" },
   { "app":"kalender", "icon":"kalender.png" },
   { "app":"keep notes", "icon":"google keep.png" },
   { "app":"lieferando", "icon":"lieferando.png" },
diff --git a/apps/messageicons/icons/jira.png b/apps/messageicons/icons/jira.png
new file mode 100644
index 000000000..fe3d83b6a
Binary files /dev/null and b/apps/messageicons/icons/jira.png differ
diff --git a/apps/messageicons/lib.js b/apps/messageicons/lib.js
index 314840c13..f7efa2d16 100644
--- a/apps/messageicons/lib.js
+++ b/apps/messageicons/lib.js
@@ -2,7 +2,7 @@ exports.getImage = function(msg) {
   if (msg.img) return atob(msg.img);
   let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   if (msg.id=="music") s="music";
-  let match = ",default|0,airbnb|1,alarm|2,alarmclockreceiver|2,amazon shopping|3,bibel|4,bitwarden|5,1password|5,lastpass|5,dashlane|5,bring|6,calendar|7,etar|7,chat|8,chrome|9,clock|2,corona-warn|10,bmo|11,desjardins|11,rbc mobile|11,nbc|11,rabobank|11,scotiabank|11,td (canada)|11,discord|12,drive|13,element|14,facebook|15,messenger|16,firefox|17,firefox beta|17,firefox nightly|17,f-droid|5,neo store|5,aurora droid|5,github|18,gitlab|19,gmx|20,google|21,google home|22,google play store|23,home assistant|24,instagram|25,kalender|26,keep notes|27,lieferando|28,linkedin|29,maps|30,organic maps|30,osmand|30,mastodon|31,fedilab|31,tooot|31,tusky|31,mattermost|32,n26|33,netflix|34,news|35,cbc news|35,rc info|35,reuters|35,ap news|35,la presse|35,nbc news|35,nextbike|36,nina|37,outlook mail|38,paypal|39,phone|40,plex|41,pocket|42,post & dhl|43,proton mail|44,reddit|45,sync pro|45,sync dev|45,boost|45,infinity|45,slide|45,signal|46,skype|47,slack|48,snapchat|49,starbucks|50,steam|51,teams|52,telegram|53,telegram foss|53,threema|54,tiktok|55,to do|56,opentasks|56,tasks|56,transit|57,twitch|58,twitter|59,uber|60,lyft|60,vlc|61,warnapp|62,whatsapp|63,wordfeud|64,youtube|65,newpipe|65,zoom|66,meet|66,music|67,sms message|0,mail|0,gmail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
+  let match = ",default|0,airbnb|1,alarm|2,alarmclockreceiver|2,amazon shopping|3,bibel|4,bitwarden|5,1password|5,lastpass|5,dashlane|5,bring|6,calendar|7,etar|7,chat|8,chrome|9,clock|2,corona-warn|10,bmo|11,desjardins|11,rbc mobile|11,nbc|11,rabobank|11,scotiabank|11,td (canada)|11,discord|12,drive|13,element|14,facebook|15,messenger|16,firefox|17,firefox beta|17,firefox nightly|17,f-droid|5,neo store|5,aurora droid|5,github|18,gitlab|19,gmx|20,google|21,google home|22,google play store|23,home assistant|24,instagram|25,jira|26,kalender|27,keep notes|28,lieferando|29,linkedin|30,maps|31,organic maps|31,osmand|31,mastodon|32,fedilab|32,tooot|32,tusky|32,mattermost|33,n26|34,netflix|35,news|36,cbc news|36,rc info|36,reuters|36,ap news|36,la presse|36,nbc news|36,nextbike|37,nina|38,outlook mail|39,paypal|40,phone|41,plex|42,pocket|43,post & dhl|44,proton mail|45,reddit|46,sync pro|46,sync dev|46,boost|46,infinity|46,slide|46,signal|47,skype|48,slack|49,snapchat|50,starbucks|51,steam|52,teams|53,telegram|54,telegram foss|54,threema|55,tiktok|56,to do|57,opentasks|57,tasks|57,transit|58,twitch|59,twitter|60,uber|61,lyft|61,vlc|62,warnapp|63,whatsapp|64,wordfeud|65,youtube|66,newpipe|66,zoom|67,meet|67,music|68,sms message|0,mail|0,gmail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
   return require("Storage").read("messageicons.img", (match===null)?0:match[1]*76, 76);
 };
 
@@ -13,6 +13,7 @@ exports.getColor = function(msg,options) {
   if (st.iconColorMode == 'mono') return options.default;
   const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   return {
+    // This file is generated by /icons/generate.js. If you need to modify its content, you should do it there instead.
     // 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": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/
@@ -33,6 +34,7 @@ exports.getColor = function(msg,options) {
     "google home": "#fbbc05",
 // "home assistant": "#41bdf5", // ha-blue is #41bdf5, but that's the background
     "instagram": "#ff0069", // https://about.instagram.com/brand/gradient
+    "jira": "#0052cc", //https://atlassian.design/resources/logo-library
     "lieferando": "#ff8000",
     "linkedin": "#0a66c2", // https://brand.linkedin.com/
     "messenger": "#0078ff",
diff --git a/apps/messageicons/metadata.json b/apps/messageicons/metadata.json
index 0d1db227b..13f218508 100644
--- a/apps/messageicons/metadata.json
+++ b/apps/messageicons/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messageicons",
   "name": "Message Icons",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Library containing a list of icons and colors for apps",
   "icon": "app.png",
   "type": "module",
diff --git a/apps/messagelist/ChangeLog b/apps/messagelist/ChangeLog
index 8db873bb9..37854d8ae 100644
--- a/apps/messagelist/ChangeLog
+++ b/apps/messagelist/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New app!
 0.02: Fix music updates while app is already open
+0.03: Fix invalid use of Bangle.setUI
\ No newline at end of file
diff --git a/apps/messagelist/app.js b/apps/messagelist/app.js
index 3e71f9544..dfa7e43d4 100644
--- a/apps/messagelist/app.js
+++ b/apps/messagelist/app.js
@@ -86,7 +86,8 @@
 
   const setUI = function(options, cb) {
     delete Bangle.uiRemove; // don't clear out things when switching UI within the app
-    options = Object.assign({remove: () => uiRemove()}, options);
+    options = Object.assign({mode:"custom", remove: () => uiRemove()}, options);
+    // If options={} assume we still want `remove` to be called when leaving via fast load (so we must have 'mode:custom')
     Bangle.setUI(options, cb);
   };
 
@@ -1164,6 +1165,7 @@
 
   // Internal setUI suppresses Bangle.uiRemove between internal screens, so we
   // need to call setUI to run uiRemove from previous app when fast-loaded.
+  // GW: This shouldn't be needed! When fast loading setUI() gets called automatically
   Bangle.setUI();
   Bangle.loadWidgets();
   require("messages").toggleWidget(false);
diff --git a/apps/messagelist/metadata.json b/apps/messagelist/metadata.json
index 72404263f..37fed5795 100644
--- a/apps/messagelist/metadata.json
+++ b/apps/messagelist/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messagelist",
   "name": "Message List",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Display notifications from iOS and Gadgetbridge/Android as a list",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 7d3414c1a..416363c45 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -2,3 +2,5 @@
 0.56: Fix handling of music messages
 0.57: Optimize saving empty message list
 0.58: show/hide "messages" widget directly, instead of through library stub
+0.59: fixes message timeout by using setinterval, as it was intended. So the buzz is triggered every x seconds until the timeout occours.
+0.60: Bump version to allow new buzz.js module to be loaded - fixes memory/performance hog when buzz called
diff --git a/apps/messages/README.md b/apps/messages/README.md
index 83524d7c8..dce2a26c1 100644
--- a/apps/messages/README.md
+++ b/apps/messages/README.md
@@ -1,6 +1,6 @@
 # Messages library
 
-This library handles the passing of messages. It can storess a list of messages 
+This library handles the passing of messages. It can stores a list of messages
 and allows them to be retrieved by other apps.
 
 ## Example
@@ -37,18 +37,10 @@ myMessageListener = Bangle.on("message", (type, message)=>{
 });
 ```
 
-Apps can launch the full GUI by calling `require("messages").openGUI()`, if you
-want to write your own GUI, it should include boot code that listens for
-`"messageGUI"` events:
-
-```js
-Bangle.on("messageGUI", message=>{
-  if (message.handled) return; // another app already opened it's GUI
-  message.handled = true; // prevent other apps form launching
-  Bangle.load("my_message_gui.app.js");
-})
-
-```
+Apps can launch the currently installed Message GUI by calling `require("messages").openGUI()`.
+If you want to write your own GUI, it should include a library called `messagegui`
+with a method called `open` that will cause it to be opened, with the
+optionally supplied message. See `apps/messagegui/lib.js` for an example.
 
 
 ## Requests
diff --git a/apps/messages/lib.js b/apps/messages/lib.js
index f301a91cd..f3ae253e6 100644
--- a/apps/messages/lib.js
+++ b/apps/messages/lib.js
@@ -107,7 +107,7 @@ exports.dismiss = function(msg) {
 };
 
 /**
- * Emit a "type=openGUI" event, to open GUI app
+ * Open the Messages GUI app
  *
  * @param {object} [msg={}] Message the app should show
  */
@@ -215,8 +215,9 @@ exports.buzz = function(msgSrc) {
 
   let repeat = msgSettings.repeat;
   if (repeat===undefined) repeat = 4; // repeat may be zero
-  if (repeat) {
-    exports.buzzTimeout = setTimeout(() => require("buzz").pattern(pattern), repeat*1000);
+  if (repeat)
+  {
+    exports.buzzInterval = setInterval(() => require("buzz").pattern(pattern), repeat*1000);
     let vibrateTimeout = msgSettings.vibrateTimeout;
     if (vibrateTimeout===undefined) vibrateTimeout = 60;
     if (vibrateTimeout && !exports.stopTimeout) exports.stopTimeout = setTimeout(exports.stopBuzz, vibrateTimeout*1000);
@@ -227,8 +228,8 @@ exports.buzz = function(msgSrc) {
  * Stop buzzing
  */
 exports.stopBuzz = function() {
-  if (exports.buzzTimeout) clearTimeout(exports.buzzTimeout);
-  delete exports.buzzTimeout;
+  if (exports.buzzInterval) clearInterval(exports.buzzInterval);
+  delete exports.buzzInterval;
   if (exports.stopTimeout) clearTimeout(exports.stopTimeout);
   delete exports.stopTimeout;
 };
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index 9c7c8b49e..e8aacd976 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.58",
+  "version": "0.60",
   "description": "Library to handle, load and store message events received from Android/iOS",
   "icon": "app.png",
   "type": "module",
diff --git a/apps/messages_light/ChangeLog b/apps/messages_light/ChangeLog
index 328e2a120..e4e91cb3f 100644
--- a/apps/messages_light/ChangeLog
+++ b/apps/messages_light/ChangeLog
@@ -4,4 +4,7 @@
     settings now points to message settings
     implemented use of the "messageicons" library
     removed lib no longer used
-1.3: icon changed
\ No newline at end of file
+1.3: icon changed
+1.4: new management of events implemented; removed code no longer used (from now the music will be managed by the Messagesgui app)
+1.5: Fix graphic bug; View via popup while there are other open apps
+1.6: fix for #2689; ( white screen )
\ No newline at end of file
diff --git a/apps/messages_light/README.md b/apps/messages_light/README.md
index 00fe39bd0..2bc162cb8 100644
--- a/apps/messages_light/README.md
+++ b/apps/messages_light/README.md
@@ -5,7 +5,17 @@ This app handles the display of messages and message notifications.
 It is a GUI replacement for the  `messages` apps.
 
 
+To work, you must install:
+- Messages
+- Messages UI
+- Messages Light (obviously)
+
+The Messages UI is recalled for the management of the "Music" notification (up to implementing a dedicated app)
+
+
 ## Creator
 
 Rarder44
 
+Thanks to @halemmerich for having "reviewed" the code. I applied some of your changes.
+
diff --git a/apps/messages_light/messages_light.app.js b/apps/messages_light/messages_light.app.js
index 5d5363d38..efb07f097 100644
--- a/apps/messages_light/messages_light.app.js
+++ b/apps/messages_light/messages_light.app.js
@@ -10,35 +10,39 @@
   }
 */
 
+
+
+
 let LOG=function(){  
   //print.apply(null, arguments);
 }
 
 
-
-
-let settings= (()=>{
-  let tmp={};
-  tmp.NewEventFileName="messages_light.NewEvent.json";
-
-  tmp.fontSmall = "6x8";
-  tmp.fontMedium = g.getFonts().includes("Vector")?"Vector:16":"6x8:2";
-  tmp.fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2";
-  tmp.fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4";
+let settings= {
+  NewEventFileName:"messages_light.NewEvent.json",
+  fontSmall : "6x8",
+  fontMedium : "Vector:16",
+  fontBig : "Vector:20",
+  fontLarge : "Vector:30",
   
+  colHeadBg : g.theme.dark ? "#141":"#4f4",
   
-  tmp.colHeadBg = g.theme.dark ? "#141":"#4f4";
-  tmp.colBg = g.theme.dark ? "#000":"#fff";
-  tmp.colLock = g.theme.dark ? "#ff0000":"#ff0000";
+  colBg : g.theme.dark ? "#000":"#fff",
+  colLock : g.theme.dark ? "#ff0000":"#ff0000",
+
+  quiet:!!((require('Storage').readJSON('setting.json', 1) || {}).quiet),
+  timeOut:(require('Storage').readJSON("messages_light.settings.json", true) || {}).timeOut || "Off",
+};
+
+
 
-  tmp.quiet=((require('Storage').readJSON('setting.json', 1) || {}).quiet)
 
-  return tmp;
-})();
 let EventQueue=[];    //in posizione 0, c'è quello attualmente visualizzato
 let callInProgress=false;
 
 
+let justOpened=true;
+
 
 
 //TODO: RICORDARSI DI FARE IL DELETE
@@ -46,68 +50,73 @@ var manageEvent = function(event) {
 
   event.new=true;
 
-
   LOG("manageEvent");
-  if( event.id=="call")
-  {
-    showCall(event);
-    return;
+  LOG(event);
+
+  if( event.id=="call"){
+      showCall(event);
   }
-  switch(event.t)
-  {
-    case "add":
-      EventQueue.unshift(event);
+  else if( event.id=="music"){
+      //la musica non la gestisco più ( uso l'app standard o un altra app)
+  }
+  else{ 
 
-      if(!callInProgress)
-        showMessage(event);
-    break;
-
-    case "modify":
-      //cerco l'evento nella lista, se lo trovo, lo modifico, altrimenti lo pusho
-      let find=false;
-      EventQueue.forEach(element => {
-        if(element.id == event.id)
-        {
-          find=true;
-          Object.assign(element,event);
-        }
-      });
-      if(!find)   //se non l'ho trovato, lo aggiungo in fondo
+    //-----------------
+    //notification
+    //-----------------
+    if(event.t=="add"){
         EventQueue.unshift(event);
-
-      if(!callInProgress)
-        showMessage(event);
-      break;
-
-    case "remove":
-      
-      //se non c'è niente nella queue e non c'è una chiamata in corso
-      if( EventQueue.length==0 && !callInProgress)
-        next();
-
-      //se l'id è uguale a quello attualmente visualizzato  ( e non siamo in chiamata ) 
-      if(!callInProgress &&  EventQueue[0] !== undefined && EventQueue[0].id == event.id)
-        next();   //passo al messaggio successivo ( per la rimozione ci penserà la next ) 
-
-      else{
-        //altrimenti rimuovo tutti gli elementi con quell'id( creando un nuovo array )
-        let newEventQueue=[];
+  
+        if(!callInProgress)
+          showMessage(event);
+    }
+    else if(event.t=="modify"){
+        //cerco l'evento nella lista, se lo trovo, lo modifico, altrimenti lo pusho
+        let find=false;
         EventQueue.forEach(element => {
-          if(element.id != event.id)
-            newEventQueue.push(element);
+          if(element.id == event.id)
+          {
+            find=true;
+            Object.assign(element,event);
+          }
         });
-        EventQueue=newEventQueue;
-      }
-      
-      
+        if(!find)   //se non l'ho trovato, lo aggiungo in fondo
+          EventQueue.unshift(event);
+  
+        if(!callInProgress)
+          showMessage(event);
+    }
+    else if(event.t=="remove"){       
+        //se non c'è niente nella queue e non c'è una chiamata in corso
+        if( EventQueue.length==0 && !callInProgress)
+          next();
+  
+        //se l'id è uguale a quello attualmente visualizzato  ( e non siamo in chiamata ) 
+        if(!callInProgress &&  EventQueue[0] !== undefined && EventQueue[0].id == event.id)
+          next();   //passo al messaggio successivo ( per la rimozione ci penserà la next ) 
+  
+        else{
+          //altrimenti rimuovo tutti gli elementi con quell'id( creando un nuovo array )
+          let newEventQueue=[];
+          EventQueue.forEach(element => {
+            if(element.id != event.id)
+              newEventQueue.push(element);
+          });
+
+          //non sovrascrivo, cosi uso lo stesso oggetto in memoria e dovrei avere meno problemi di memory leak
+          EventQueue.length=0;
+          newEventQueue.forEach(element => {
+            EventQueue.push(element);
+          });
+        }
+    }
+    //-----------------
+    //notification
+    //-----------------
+
 
-      
-      break;
-    case "musicstate":
-    case "musicinfo":
-        
-        break;
   }
+  
 };
 
 
@@ -118,6 +127,10 @@ var manageEvent = function(event) {
 let showMessage = function(msg){
   LOG("showMessage");
   LOG(msg);
+
+  updateTimeout();
+
+
   g.setBgColor(settings.colBg);
 
 
@@ -208,7 +221,7 @@ let showCall = function(msg)
   }
 
   callInProgress=true;
-
+  updateTimeout();
 
 
   //se è una chiamata ( o una nuova chiamata, diversa dalla precedente )
@@ -262,7 +275,6 @@ let showCall = function(msg)
 
 
 
-
   
 let next=function(){
   LOG("next");
@@ -274,9 +286,10 @@ let next=function(){
     EventQueue.shift();    //passa al messaggio successivo, se presente - tolgo il primo
 
   callInProgress=false; 
+  LOG(EventQueue.length);
   if( EventQueue.length == 0)
   {
-    LOG("no element in queue - closing")
+    LOG("no element in queue - closing");
     setTimeout(_ => load());
     return;
   }
@@ -288,31 +301,12 @@ let next=function(){
 
 
 
-
-
-
-
-
-
-
-
-let showMapMessage=function(msg) {
-
-  g.clearRect(Bangle.appRect);
-  PrintMessageStrings({body:"Not implemented!"});
-
-}
-
-
-
-
-
-let CallBuzzTimer=null;
+let CallBuzzTimer=undefined;
 let StopBuzzCall=function()
 {
   if (CallBuzzTimer){
     clearInterval(CallBuzzTimer);
-    CallBuzzTimer=null;
+    CallBuzzTimer=undefined;
   }
 }
 let DrawTriangleUp=function()
@@ -443,13 +437,16 @@ let PrintMessageStrings=function(msg)
 
 
 let doubleTapUnlock=function(data) {
+  updateTimeout();        
   if( data.double)  //solo se in double
   {
     Bangle.setLocked(false);
     Bangle.setLCDPower(1);
   }
 }
-let toushScroll=function(button, xy) { 
+let toushScroll=function(_, xy) { 
+  updateTimeout();
+
   let height=176; //g.getHeight(); -> 176 B2
   height/=2;
   
@@ -464,6 +461,24 @@ let toushScroll=function(button, xy) {
 }
 
 
+
+let timeout;
+const updateTimeout = function(){
+if (settings.timeOut!="Off"){
+    removeTimeout();
+    if( callInProgress) return; //c'è una chiamata in corso -> no timeout
+    //if( typeof music !== 'undefined'  && EventQueue.length==0 ) return; //ho aperto l'interfaccia della musica e non ho messaggi davanti -> no timeout
+
+
+    let time=parseInt(settings.timeOut);  //the "s" will be trimmed by the parseInt
+    timeout = setTimeout(next,time*1000); //next or Bangle.showClock/load()???
+  }
+};
+const removeTimeout=function(){
+  if (timeout) clearTimeout(timeout);
+}
+
+
 let main = function(){
   LOG("Main");
 
@@ -478,16 +493,18 @@ let main = function(){
   Bangle.on('tap', doubleTapUnlock);
   Bangle.on('touch', toushScroll);
 
-  //quando apro quest'app, do per scontato che c'è un messaggio da leggere posto in un file particolare ( NewMessage.json )
+  //quando apro quest'app, do per scontato che c'è un messaggio da leggere posto in un file particolare ( messages_light.NewEvent.json )
   let eventToShow = require('Storage').readJSON(settings.NewEventFileName, true);
   require("Storage").erase(settings.NewEventFileName)
   if( eventToShow!==undefined)
     manageEvent(eventToShow);
   else
   {
-    LOG("file not found!");
-    setTimeout(_ => load(), 0);
+    LOG("file event not found! -> ?? open debug text");
+    setTimeout(_=>{      GB({"t":"notify","id":15754117198411,"src":"Hangouts","title":"A Name","body":"Debug notification \nmessage contents  demo demo demo demo"})    },0);
   }
+  justOpened=false;
+
 };
 
 
diff --git a/apps/messages_light/messages_light.boot.js b/apps/messages_light/messages_light.boot.js
index 741d08b96..f28e50661 100644
--- a/apps/messages_light/messages_light.boot.js
+++ b/apps/messages_light/messages_light.boot.js
@@ -1,33 +1,13 @@
-/*
-//OLD CODE -> backup purpose
-
-let messageBootManager=function(type,event){
-    //se l'app non è aperta
-    if ("undefined"==typeof manageEvent)
-    {
-        if(event.t=="remove") return; //l'app non è aperta, non c'è nessun messaggio da rimuovere dalla queue -> non lancio l'app
-        
-        //la apro
-        require("Storage").writeJSON("messages_light.NewEvent.json",{"event":event,"type":type});
-        load("messages_light.app.js");  
-    }
-    else
-    {
-        //altrimenti gli dico di gestire il messaggio
-        manageEvent(type,event); 
-    }
-}
-Bangle.on("message", messageBootManager);
-Bangle.on("call", messageBootManager);*/
-
-
-
+//OLD Code
 //override require to filter require("message")
-global.require_real=global.require;
+/*global.require_real=global.require;
 global.require = (_require => file => {
-    if (file==="messages") file = "messagesProxy";
-    //else if (file==="messages_REAL") file = "messages";    //backdoor to real message
-    
+    if (file==="messages") file = "messagesProxy";    
     return _require(file);
-})(require);
-  
+})(require);*/
+
+//the file on the device is called "boot_messages_light.boot.js"
+//it's NOT an error!
+//it's for the boot order
+
+Bangle.on("message", (type, msg) => require("messages_light.listener.js").listener(type, msg));
diff --git a/apps/messages_light/messages_light.listener.js b/apps/messages_light/messages_light.listener.js
new file mode 100644
index 000000000..2525a52bd
--- /dev/null
+++ b/apps/messages_light/messages_light.listener.js
@@ -0,0 +1,122 @@
+
+let overlayTimeout=undefined;
+exports.listener = function(type, event) {
+
+    
+    //salva gli eventi che arrivano su file
+   /* events=require("Storage").readJSON("events_log",true) || [];
+    events.push ( event)
+    require("Storage").writeJSON("events_log",events);
+  */
+    //if (event.handled) return; // already handled/app open
+    if( type=="clearAll" || type=="music" || event.id=="music") return; //lo lascio gestire a qualcun altro
+
+    //se arrivo qua gestisco io
+    //non mi preoccupo di salvare ( a meno di problemi a mantenere tanti messaggi in queue nella ram...)
+    event.handled=true;
+
+
+    if( Bangle.CLOCK || global.__FILE__ === undefined || global.__FILE__ === ".bootcde" ||  global.__FILE__.startsWith("messages_light."))
+    {
+        //se non ci sono app aperte ( clock oppure c'è  messages_light)
+        //continuo con la visualizzazione dell messaggio
+
+        let callApp;
+        //se l'app non è aperta
+        if ("undefined"==typeof manageEvent)
+        {
+            if(event.t=="remove") return; //l'app non è aperta, non c'è nessun messaggio da rimuovere dalla queue -> non lancio l'app
+            
+            //chiamo la load dell'app
+            callApp=function(event){
+                require("Storage").writeJSON("messages_light.NewEvent.json",event);
+                load("messages_light.app.js");
+            }
+        }
+        else
+        {
+            //dico all'app di gestire l'evento
+            callApp=function(event){
+                manageEvent(event); 
+            }
+        }
+         
+     
+        callApp(event);
+
+
+    }
+    else{
+        //TODO: BHOO!!!
+        //vibro e basta?
+        //faccio comparire un overlay veloce? 
+        //uso l'overlay sempre? ( gestione di tutti gli eventi smadonnosa... )
+        //salvo lo stato dell'app attuale( NON SO COME ), lancio la mia app e alla chiusura torno allo stato precedente?
+        
+        console.log(event);
+        let ovr=undefined;
+        let palette;
+        let timeout;
+        
+        if(event.id=="call" && event.t!="remove")
+        {
+            let count=3;
+            let idInter= setInterval(()=>{
+              if(--count<=0)
+                clearInterval(idInter);
+
+              Bangle.buzz(100,1);
+            },200);
+
+            ovr = Graphics.createArrayBuffer(136,136,2,{msb:true});
+            ovr.setColor(1).fillRect({x:0,y:0,w:135,h:135,r:8});
+            ovr.setColor(2).setFont("Vector:30").setFontAlign(0,0).drawString("Call",68,20);
+            var lines=ovr.wrapString(event.title,136);
+            for(let i=0;i< lines.length;i++)
+            ovr.setColor(2).setFont("Vector:20").setFontAlign(0,0).drawString(lines[i],68,50+i*15);
+          
+            palette=[0,g.toColor("#141"),g.toColor("#fff"),g.toColor("#FFF")];
+            timeout=4000;
+        }
+        else if(event.t=="add" ||  event.t=="modify")
+        {
+            Bangle.buzz();
+            ovr = Graphics.createArrayBuffer(136,136,2,{msb:true});
+            ovr.setColor(1).fillRect({x:0,y:0,w:135,h:135,r:8});
+            ovr.setColor(2).setFont("Vector:20").setFontAlign(0,0).drawString(event.src,68,15);
+            ovr.setColor(2).setFont("Vector:15").setFontAlign(0,0).drawString(event.title,68,35);
+            var lines=ovr.wrapString(event.body,136);
+            for(let i=0;i< lines.length;i++)
+            ovr.setColor(2).setFont("Vector:15").setFontAlign(0,0).drawString(lines[i],68,60+i*15);
+          
+          
+            palette=[0,g.toColor("#09c"),g.toColor("#fff"),g.toColor("#FFF")];
+            timeout=5000;
+        }
+      
+      
+        if(ovr===undefined)
+          return;
+      
+      
+        Bangle.setLCDPower(true);
+      
+        Bangle.setLCDOverlay({
+        width:ovr.getWidth(), height:ovr.getHeight(),
+        bpp:2, transparent:0,
+        palette:new Uint16Array(palette),  
+        buffer:ovr.buffer
+        },20,20);
+
+        Bangle.setLCDPower(true);
+
+        if(overlayTimeout) clearTimeout(overlayTimeout);
+          overlayTimeout=setTimeout(()=>{
+            Bangle.setLCDOverlay();
+            overlayTimeout=undefined;
+          },timeout);
+    }
+
+}
+
+
diff --git a/apps/messages_light/messages_light.messagesProxy.js b/apps/messages_light/messages_light.messagesProxy.js
deleted file mode 100644
index 723397057..000000000
--- a/apps/messages_light/messages_light.messagesProxy.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-//gestisco il messaggio a modo mio
-exports.pushMessage = function(event) {
-
-    //TODO: now i can't handle the music, so i call the real message app
-    if( event.id=="music") return require_real("messages").pushMessage(event);
-
-    //se l'app non è aperta
-    if ("undefined"==typeof manageEvent)
-    {
-        if(event.t=="remove") return; //l'app non è aperta, non c'è nessun messaggio da rimuovere dalla queue -> non lancio l'app
-        
-        //la apro
-        require_real("Storage").writeJSON("messages_light.NewEvent.json",event);
-        load("messages_light.app.js");  
-    }
-    else
-    {
-        //altrimenti gli dico di gestire il messaggio
-        manageEvent(event); 
-    }
-}
-
-
-//Call original message library
-exports.clearAll = function() { return require_real("messages").clearAll()}
-exports.getMessages = function() { return require_real("messages").getMessages()}
-exports.status = function() { return require_real("messages").status()}
-exports.buzz = function() { return require_real("messages").buzz(msgSrc)} 
-exports.stopBuzz = function() { return require_real("messages").stopBuzz()}
\ No newline at end of file
diff --git a/apps/messages_light/messages_light.settings.js b/apps/messages_light/messages_light.settings.js
index b7197c70a..cd813d928 100644
--- a/apps/messages_light/messages_light.settings.js
+++ b/apps/messages_light/messages_light.settings.js
@@ -1 +1,27 @@
-eval(require("Storage").read("messages.settings.js"));
+(function(back) {
+    const SETTINGS_FILE_NAME="messages_light.settings.json";
+    let  settings = function() {
+        let settings = require('Storage').readJSON(SETTINGS_FILE_NAME, true) || {};
+        return settings;
+    }
+    function updateSetting(setting, value) {
+      let settings = require('Storage').readJSON(SETTINGS_FILE_NAME, true) || {};
+      settings[setting] = value;
+      require('Storage').writeJSON(SETTINGS_FILE_NAME, settings);
+    }
+    const timeOutChoices = [/*LANG*/"Off", "10s", "15s", "20s", "30s"];
+    var mainmenu = {
+      "" : { "title" : /*LANG*/"Messages Light" },
+      "< Back" : back,
+      /*LANG*/'Time Out': {
+        value: timeOutChoices.indexOf(settings.timeOut),
+        min: 0, max: timeOutChoices.length-1,
+        format: v => timeOutChoices[v],
+        onchange: m => {
+          updateSetting("timeOut", timeOutChoices[m]);
+        }
+      },
+    };
+    E.showMenu(mainmenu);
+  });
+  
\ No newline at end of file
diff --git a/apps/messages_light/metadata.json b/apps/messages_light/metadata.json
index 3515a75c2..f5f883ae2 100644
--- a/apps/messages_light/metadata.json
+++ b/apps/messages_light/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages_light",
   "name": "Messages Light",
-  "version": "1.3",
+  "version": "1.6",
   "description": "A light implementation of messages App (display notifications from iOS and Gadgetbridge/Android)",
   "icon": "app.png",
   "type": "app",
@@ -13,8 +13,8 @@
     {"name":"messages_light.app.js","url":"messages_light.app.js"},
     {"name":"messages_light.settings.js","url":"messages_light.settings.js"},
     {"name":"messages_light.img","url":"app-icon.js","evaluate":true},
-    {"name":"messagesProxy","url":"messages_light.messagesProxy.js"},
-    {"name":"messages_light.boot.js","url":"messages_light.boot.js"}
+    {"name":"boot_messages_light.boot.js","url":"messages_light.boot.js"},
+    {"name":"messages_light.listener.js","url":"messages_light.listener.js"}
   ],
   "data": [{"name":"messages_light.settings.json"},{"name":"messages_light.NewMessage.json"}],
   "screenshots": [{"url":"screenshot-notify.png"} ,{"url":"screenshot-long-text1.png"},{"url":"screenshot-long-text2.png"}, {"url":"screenshot-call.png"} ]
diff --git a/apps/messagesoverlay/ChangeLog b/apps/messagesoverlay/ChangeLog
new file mode 100644
index 000000000..8ce792783
--- /dev/null
+++ b/apps/messagesoverlay/ChangeLog
@@ -0,0 +1,5 @@
+0.01: Initial fork from messages_light
+0.02: Fix touch/drag/swipe handlers not being restored correctly if a message is removed
+0.03: Scroll six lines per swipe, leaving the previous top/bottom row visible.
+0.04: Use the event mechanism for getting messages
+0.05: Fix the overlay keeping the LCD on
diff --git a/apps/messagesoverlay/README.md b/apps/messagesoverlay/README.md
new file mode 100644
index 000000000..8ce1cc64d
--- /dev/null
+++ b/apps/messagesoverlay/README.md
@@ -0,0 +1,24 @@
+# Messages overlay app
+
+This app handles the display of messages and message notifications as an overlay pop up. 
+
+It is a GUI replacement for the `messages` apps.
+
+Messages are ephemeral and not stored on the Bangle.
+
+## Usage
+
+Close app by tapping the X and scroll by swiping. The border of the pop up changes color if the Bangle is locked. The color depends on your currently active theme.
+
+## Firmware hint
+Current stable firmware draws incorrect colors for emojis. Nightly firmware builds correct this.
+
+## Low memory mode
+
+If free memory is below 2000 blocks, the overlay automatically only uses 1 bit depth. Default uses roundabout 1300 blocks, while low memory mode uses about 600.
+
+## Creator
+
+[halemmerich](https://github.com/halemmerich)
+Forked from messages_light by Rarder44
+
diff --git a/apps/messagesoverlay/app.png b/apps/messagesoverlay/app.png
new file mode 100644
index 000000000..1f738504d
Binary files /dev/null and b/apps/messagesoverlay/app.png differ
diff --git a/apps/messagesoverlay/boot.js b/apps/messagesoverlay/boot.js
new file mode 100644
index 000000000..778f42339
--- /dev/null
+++ b/apps/messagesoverlay/boot.js
@@ -0,0 +1 @@
+Bangle.on("message", (type, msg) => require("messagesoverlay").message(type, msg));
\ No newline at end of file
diff --git a/apps/messagesoverlay/lib.js b/apps/messagesoverlay/lib.js
new file mode 100644
index 000000000..9af14bbe4
--- /dev/null
+++ b/apps/messagesoverlay/lib.js
@@ -0,0 +1,463 @@
+const ovrx = 10;
+const ovry = 10;
+const ovrw = g.getWidth()-2*ovrx;
+const ovrh = g.getHeight()-2*ovry;
+let _g = g;
+
+let lockListener;
+let quiet;
+
+let LOG = function() {
+  //print.apply(null, arguments);
+};
+
+let isQuiet = function(){
+  if (quiet == undefined) quiet = (require('Storage').readJSON('setting.json', 1) || {}).quiet;
+  return quiet;
+};
+
+let settings = {
+  fontSmall:"6x8",
+  fontMedium:"Vector:14",
+  fontBig:"Vector:20",
+  fontLarge:"Vector:30",
+};
+
+let eventQueue = [];
+let callInProgress = false;
+
+let show = function(ovr){
+  let img = ovr;
+  if (ovr.getBPP() == 1) {
+    img = ovr.asImage();
+    img.palette = new Uint16Array([_g.theme.fg,_g.theme.bg]);
+  }
+  Bangle.setLCDOverlay(img, ovrx, ovry);
+};
+
+let manageEvent = function(ovr, event) {
+  event.new = true;
+
+  LOG("manageEvent");
+  if (event.id == "call") {
+    showCall(ovr, event);
+    return;
+  }
+  switch (event.t) {
+    case "add":
+      eventQueue.unshift(event);
+
+      if (!callInProgress)
+        showMessage(ovr, event);
+      break;
+
+    case "modify":
+      let find = false;
+      eventQueue.forEach(element => {
+        if (element.id == event.id) {
+          find = true;
+          Object.assign(element, event);
+        }
+      });
+      if (!find)
+        eventQueue.unshift(event);
+
+      if (!callInProgress)
+        showMessage(ovr, event);
+      break;
+
+    case "remove":
+      if (eventQueue.length == 0 && !callInProgress)
+        next(ovr);
+
+      if (!callInProgress && eventQueue[0] !== undefined && eventQueue[0].id == event.id)
+        next(ovr);
+      else 
+        eventQueue = [];
+
+      break;
+  }
+};
+
+let roundedRect = function(ovr, x,y,w,h,filled){
+  var poly = [
+    x,y+4,
+    x+4,y,
+    x+w-5,y,
+    x+w-1,y+4,
+    x+w-1,y+h-5,
+    x+w-5,y+h-1,
+    x+4,y+h-1,
+    x,y+h-5,
+    x,y+4
+  ];
+  ovr.drawPoly(poly,true);
+  if (filled) ovr.fillPoly(poly,true);
+};
+
+let drawScreen = function(ovr, title, titleFont, src, iconcolor, icon){
+  ovr.setBgColor(ovr.theme.bg2);
+  ovr.clearRect(2,2,ovr.getWidth()-3,37);
+
+  ovr.setColor(ovr.theme.fg2);
+  ovr.setFont(settings.fontSmall);
+  ovr.setFontAlign(0,-1);
+
+  let textCenter = (ovr.getWidth()+35-26)/2;
+
+  if (src) {
+    let shortened = src;
+    while (ovr.stringWidth(shortened) > ovr.getWidth()-80) shortened = shortened.substring(0,shortened.length-2);
+    if (shortened.length != src.length) shortened += "...";
+    ovr.drawString(shortened, textCenter, 2);
+  }
+
+  ovr.setFontAlign(0,0);
+  ovr.setFont(titleFont);
+  if (title) ovr.drawString(title, textCenter, 38/2 + 5);
+
+  ovr.setColor(ovr.theme.fg2);
+
+  ovr.setFont(settings.fontMedium);
+  roundedRect(ovr, ovr.getWidth()-26,5,22,30,false);
+  ovr.setFont("Vector:16");
+  ovr.drawString("X",ovr.getWidth()-14,21);
+
+  ovr.setColor("#888");
+  roundedRect(ovr, 5,5,30,30,true);
+  ovr.setColor(ovr.getBPP() != 1 ? iconcolor : ovr.theme.bg2);
+  ovr.drawImage(icon,8,8);
+};
+
+let showMessage = function(ovr, msg) {
+  LOG("showMessage");
+  ovr.setBgColor(ovr.theme.bg);
+
+  if (typeof msg.CanscrollDown === "undefined")
+    msg.CanscrollDown = false;
+  if (typeof msg.CanscrollUp === "undefined")
+    msg.CanscrollUp = false;
+
+  // Normal text message display
+  let title = msg.title,
+    titleFont = settings.fontLarge,
+    lines;
+  if (title) {
+    let w = ovr.getWidth() - 35 - 26;
+    if (ovr.setFont(titleFont).stringWidth(title) > w)
+      titleFont = settings.fontMedium;
+    if (ovr.setFont(titleFont).stringWidth(title) > w) {
+      lines = ovr.wrapString(title, w);
+      title = (lines.length > 2) ? lines.slice(0, 2).join("\n") + "..." : lines.join("\n");
+    }
+  }
+
+  drawScreen(ovr, title, titleFont, msg.src || /*LANG*/ "Message", require("messageicons").getColor(msg), require("messageicons").getImage(msg));
+
+  if (!isQuiet() && msg.new) {
+    msg.new = false;
+    Bangle.buzz();
+  }
+
+  drawMessage(ovr, msg);
+};
+
+let drawBorder = function(ovr) {
+  LOG("drawBorder", isQuiet());
+  if (Bangle.isLocked())
+    ovr.setColor(ovr.theme.fgH);
+  else
+    ovr.setColor(ovr.theme.fg);
+  ovr.drawRect(0,0,ovr.getWidth()-1,ovr.getHeight()-1);
+  ovr.drawRect(1,1,ovr.getWidth()-2,ovr.getHeight()-2);
+  show(ovr);
+};
+
+let showCall = function(ovr, msg) {
+  LOG("showCall");
+  LOG(msg);
+
+  if (msg.t == "remove") {
+    LOG("hide call screen");
+    next(ovr); //dont shift
+    return;
+  }
+
+  callInProgress = true;
+
+  let title = msg.title,
+    titleFont = settings.fontLarge,
+    lines;
+  if (title) {
+    let w = ovr.getWidth() - 35 -26;
+    if (ovr.setFont(titleFont).stringWidth(title) > w)
+      titleFont = settings.fontMedium;
+    if (ovr.setFont(titleFont).stringWidth(title) > w) {
+      lines = ovr.wrapString(title, w);
+      title = (lines.length > 2) ? lines.slice(0, 2).join("\n") + "..." : lines.join("\n");
+    }
+  }
+
+  drawScreen(ovr, title, titleFont, msg.src || /*LANG*/ "Message", require("messageicons").getColor(msg), require("messageicons").getImage(msg));
+
+  stopCallBuzz();
+  if (!isQuiet()) {
+    if (msg.new) {
+      msg.new = false;
+      if (callBuzzTimer) clearInterval(callBuzzTimer);
+      callBuzzTimer = setInterval(function() {
+        Bangle.buzz(500);
+      }, 1000);
+
+      Bangle.buzz(500);
+    }
+  }
+  drawMessage(ovr, msg);
+};
+
+let next = function(ovr) {
+  LOG("next");
+  stopCallBuzz();
+
+  if (!callInProgress)
+    eventQueue.shift();
+
+  callInProgress = false;
+  if (eventQueue.length == 0) {
+    LOG("no element in queue - closing");
+    cleanup();
+    return;
+  }
+
+  showMessage(ovr, eventQueue[0]);
+};
+
+let showMapMessage = function(ovr, msg) {
+  ovr.clearRect(2,2,ovr.getWidth()-3,ovr.getHeight()-3);
+  drawMessage(ovr, {
+    body: "Not implemented!"
+  });
+};
+
+let callBuzzTimer = null;
+let stopCallBuzz = function() {
+  if (callBuzzTimer) {
+    clearInterval(callBuzzTimer);
+    callBuzzTimer = undefined;
+  }
+};
+
+let drawTriangleUp = function(ovr) {
+  ovr.reset();
+  ovr.fillPoly([ovr.getWidth()-9, 46,ovr.getWidth()-14, 56,ovr.getWidth()-4, 56]);
+};
+
+let drawTriangleDown = function(ovr) {
+  ovr.reset();
+  ovr.fillPoly([ovr.getWidth()-9, ovr.getHeight()-6, ovr.getWidth()-14, ovr.getHeight()-16, ovr.getWidth()-4, ovr.getHeight()-16]);
+};
+
+let linesScroll = 6;
+
+let scrollUp = function(ovr) {
+  msg = eventQueue[0];
+  LOG("up", msg);
+  if (typeof msg.FirstLine === "undefined")
+    msg.FirstLine = 0;
+  if (typeof msg.CanscrollUp === "undefined")
+    msg.CanscrollUp = false;
+
+  if (!msg.CanscrollUp) return;
+
+  msg.FirstLine = msg.FirstLine > 0 ? msg.FirstLine - linesScroll : 0;
+
+  drawMessage(ovr, msg);
+};
+
+let scrollDown = function(ovr) {
+  msg = eventQueue[0];
+  LOG("down", msg);
+  if (typeof msg.FirstLine === "undefined")
+    msg.FirstLine = 0;
+  if (typeof msg.CanscrollDown === "undefined")
+    msg.CanscrollDown = false;
+
+  if (!msg.CanscrollDown) return;
+
+  msg.FirstLine = msg.FirstLine + linesScroll;
+  drawMessage(ovr, msg);
+};
+
+let drawMessage = function(ovr, msg) {
+  let MyWrapString = function(str, maxWidth) {
+    str = str.replace("\r\n", "\n").replace("\r", "\n");
+    return ovr.wrapString(str, maxWidth);
+  };
+
+  if (typeof msg.FirstLine === "undefined") msg.FirstLine = 0;
+
+  let bodyFont = typeof msg.bodyFont === "undefined" ? settings.fontMedium : msg.bodyFont;
+  let Padding = 3;
+  if (typeof msg.lines === "undefined") {
+    ovr.setFont(bodyFont);
+    msg.lines = MyWrapString(msg.body, ovr.getWidth() - (Padding * 2));
+    if (msg.lines.length <= 2) {
+      bodyFont = ovr.getFonts().includes("Vector") ? "Vector:20" : "6x8:3";
+      ovr.setFont(bodyFont);
+      msg.lines = MyWrapString(msg.body, ovr.getWidth() - (Padding * 2));
+      msg.bodyFont = bodyFont;
+    }
+  }
+
+  let NumLines = 7;
+
+  let linesToPrint = (msg.lines.length > NumLines) ? msg.lines.slice(msg.FirstLine, msg.FirstLine + NumLines) : msg.lines;
+
+  let yText = 40;
+
+  ovr.setBgColor(ovr.theme.bg);
+  ovr.setColor(ovr.theme.fg);
+  ovr.clearRect(2, yText, ovrw-3, ovrh-3);
+  let xText = Padding;
+  yText += Padding;
+  ovr.setFont(bodyFont);
+  let HText = ovr.getFontHeight();
+
+  yText = ((ovrh - yText) / 2) - (linesToPrint.length * HText / 2) + yText;
+
+  if (linesToPrint.length <= 3) {
+    ovr.setFontAlign(0, -1);
+    xText = ovr.getWidth() / 2;
+  } else
+    ovr.setFontAlign(-1, -1);
+
+
+  linesToPrint.forEach((line, i) => {
+    ovr.drawString(line, xText, yText + HText * i);
+  });
+
+  if (msg.FirstLine != 0) {
+    msg.CanscrollUp = true;
+    drawTriangleUp(ovr);
+  } else
+    msg.CanscrollUp = false;
+
+  if (msg.FirstLine + linesToPrint.length < msg.lines.length) {
+    msg.CanscrollDown = true;
+    drawTriangleDown(ovr);
+  } else
+    msg.CanscrollDown = false;
+  show(ovr);
+  if (!isQuiet()) Bangle.setLCDPower(1);
+};
+
+let getSwipeHandler = function(ovr){
+  return (lr, ud) => {
+    if (ud == 1) {
+      scrollUp(ovr);
+    } else if (ud == -1){
+      scrollDown(ovr);
+    }
+  };
+};
+
+let getTouchHandler = function(ovr){
+  return (_, xy) => {
+    if (xy.y < ovry + 40){
+      next(ovr);
+    }
+  };
+};
+
+let restoreHandler = function(event){
+  LOG("Restore", event, backup[event]);
+  Bangle.removeAllListeners(event);
+  Bangle["#on" + event]=backup[event];
+  backup[event] = undefined;
+};
+
+let backupHandler = function(event){
+  if (backupDone) return; // do not backup, overlay is already up
+  backup[event] = Bangle["#on" + event];
+  LOG("Backed up", backup[event]);
+  Bangle.removeAllListeners(event);
+};
+
+let cleanup = function(){
+  if (lockListener) {
+    Bangle.removeListener("lock", lockListener);
+    lockListener = undefined;
+  }
+  restoreHandler("touch");
+  restoreHandler("swipe");
+  restoreHandler("drag");
+
+  Bangle.setLCDOverlay();
+  backupDone = false;
+  ovr = undefined;
+  quiet = undefined;
+};
+
+let backup = {};
+
+let backupDone = false;
+
+let main = function(ovr, event) {
+  LOG("Main", event, settings);
+
+  if (!lockListener) {
+    lockListener = function (){
+      drawBorder(ovr);
+    };
+    Bangle.on('lock', lockListener);
+  }
+  backupHandler("touch");
+  backupHandler("swipe");
+  backupHandler("drag");
+  if (!backupDone){
+    Bangle.on('touch', getTouchHandler(ovr));
+    Bangle.on('swipe', getSwipeHandler(ovr));
+  }
+  backupDone=true;
+
+  if (event !== undefined){
+    drawBorder(ovr);
+    manageEvent(ovr, event);
+  } else {
+    LOG("No event given");
+    cleanup();
+  }
+};
+
+let ovr;
+
+exports.message = function(type, event) {
+  LOG("Got message", type, event);
+  // only handle some event types
+  if(!(type=="text" || type == "call")) return;
+  if(type=="text" && event.id == "nav") return;
+  if(event.handled) return;
+
+  bpp = 4;
+  if (process.memory().free < 2000) bpp = 1;
+
+  if (!ovr) {
+    ovr = Graphics.createArrayBuffer(ovrw, ovrh, bpp, {
+      msb: true
+    });
+  } else {
+    ovr.clear();
+  }
+
+  g = ovr;
+
+  if (bpp == 4)
+    ovr.theme = g.theme;
+  else
+    ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 };
+
+  main(ovr, event);
+  if (!isQuiet()) Bangle.setLCDPower(1);
+  event.handled = true;
+  g = _g;
+};
diff --git a/apps/messagesoverlay/metadata.json b/apps/messagesoverlay/metadata.json
new file mode 100644
index 000000000..a043fff64
--- /dev/null
+++ b/apps/messagesoverlay/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "messagesoverlay",
+  "name": "Messages Overlay",
+  "version": "0.05",
+  "description": "An overlay based implementation of a messages UI (display notifications from iOS and Gadgetbridge/Android)",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "tool,system",
+  "supports": ["BANGLEJS2"],
+  "dependencies" : { "messageicons":"module","messages":"app" },
+  "readme": "README.md",
+  "storage": [
+    {"name":"messagesoverlay","url":"lib.js"},
+    {"name":"messagesoverlay.0.boot.js","url":"boot.js"}
+  ],
+  "screenshots": [{"url":"screen_call.png"} ,{"url":"screen_message.png"} ]
+}
diff --git a/apps/messagesoverlay/screen_call.png b/apps/messagesoverlay/screen_call.png
new file mode 100644
index 000000000..45326b37e
Binary files /dev/null and b/apps/messagesoverlay/screen_call.png differ
diff --git a/apps/messagesoverlay/screen_message.png b/apps/messagesoverlay/screen_message.png
new file mode 100644
index 000000000..f3cc3b6e5
Binary files /dev/null and b/apps/messagesoverlay/screen_message.png differ
diff --git a/apps/metronome/metadata.json b/apps/metronome/metadata.json
index 7f8582ca5..8ada5d98c 100644
--- a/apps/metronome/metadata.json
+++ b/apps/metronome/metadata.json
@@ -13,5 +13,6 @@
     {"name":"metronome.app.js","url":"metronome.js"},
     {"name":"metronome.img","url":"metronome-icon.js","evaluate":true},
     {"name":"metronome.settings.js","url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"metronome.settings.json"}]
 }
diff --git a/apps/mitherm/README.md b/apps/mitherm/README.md
index cdf3daa61..496c2f234 100644
--- a/apps/mitherm/README.md
+++ b/apps/mitherm/README.md
@@ -1,6 +1,15 @@
+# MiTherm
+
+![](screenshot.png)
+
 Reads BLE advertisement data from Xiaomi temperature/humidity sensors running the
 `pvvx` custom firmware (https://github.com/pvvx/ATC_MiThermometer).
 
+NOTE: If you flash your Mi Temperature device to the `pvvx` firmware,
+please ensure you disconnect it from your bluetooth source before
+attempting to run the app on the Bangle.
+
+
 ## Features
 
 * Display temperature
@@ -20,3 +29,4 @@ Reads BLE advertisement data from Xiaomi temperature/humidity sensors running th
 * Configurable scan length (currently 30s)
 * Alerts when temperature outside defined limits (with a widget or bootcode to
   work when app is inactive)
+
diff --git a/apps/mitherm/metadata.json b/apps/mitherm/metadata.json
index a8da6fd26..b1005c5ac 100644
--- a/apps/mitherm/metadata.json
+++ b/apps/mitherm/metadata.json
@@ -5,9 +5,11 @@
   "version": "0.01",
   "description": "Reads and displays data from Xiaomi temperature/humidity sensors running custom firmware",
   "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
   "tags": "xiaomi,mi,ble,bluetooth,thermometer,humidity",
   "readme": "README.md",
   "supports": ["BANGLEJS", "BANGLEJS2"],
+  "dependencies": {"textinput":"type"},
   "storage": [
     {"name":"mitherm.app.js","url":"app.js"},
     {"name":"mitherm.img","url":"app-icon.js","evaluate":true}
diff --git a/apps/mitherm/screenshot.png b/apps/mitherm/screenshot.png
new file mode 100644
index 000000000..87e1c9e20
Binary files /dev/null and b/apps/mitherm/screenshot.png differ
diff --git a/apps/mixdiganclock/ChangeLog b/apps/mixdiganclock/ChangeLog
index 13f27c06c..8ef626dd7 100644
--- a/apps/mixdiganclock/ChangeLog
+++ b/apps/mixdiganclock/ChangeLog
@@ -1,4 +1,5 @@
 0.01: fork from miclock, Added compatib with b widgets, devices(dynamic x,y) and themes(dynamic colors)
 0.02: Code refactored, change colors in real time
 0.03: Hour point size can be modified on real time.
-0.04: Background color can be changed on real time, it will change also the list of fg color
\ No newline at end of file
+0.04: Background color can be changed on real time, it will change also the list of fg color
+0.05: Main button can access to Messages, small improvements
\ No newline at end of file
diff --git a/apps/mixdiganclock/README.md b/apps/mixdiganclock/README.md
index d5efbc126..7b9fb2ff0 100644
--- a/apps/mixdiganclock/README.md
+++ b/apps/mixdiganclock/README.md
@@ -9,6 +9,13 @@ Compatible with BangleJS1,BangleJS2,and EMSCRIPTENx emulators
 Bangle.JS1
 ![](photo_mixdigan_bjs1.jpg)
 
+
+UI for bangleJS1
+![](bangle.js_UI.png)
+
+UI for bangleJS2
+![](bangle.js2_UI.png)
+
 Screenshot emulator (BJS2)
 ![](ss_mixdigan_ems2.png)
 
@@ -36,19 +43,26 @@ Open and see
 
 ## Features
 
-Compatibility with devices
-Dynamic positions x,y for different devices
-Dynamic Colours (FG and BG) and positions
-Support for bottom widgets
+ - Compatibility with different smartwatch models
+  - Dynamic positions x,y for different devices
+  - Dynamic Colours (FG and BG) and positions
+ - Realtime configuration
+ - Support for bottom widgets
+ - Shortcut to messages app
 
 
-## Controls
+## Controls/UI
 
-Exit : BTN2 (BJS1)
-Exit/launcher : left area 
-Change FG Color : right area
-Increase/Decrease Hour circle/Points : swipe right
-Change BG Color : swipe left
+ - BTN1 (BJS2): "Launcher" / open "Messages"
+ - BTN2 (BJS1): "Launcher" / open "Messages"
+ - BTN1 (BJS1): Change FG Color
+ - BTN3 (BJS1): Change BG Color
+ - Left area: Back/Exit/launcher 
+ - Right area: Change FG Color 
+ - Swipe left: Change BG Color 
+ - Swipe right: Increase/Decrease Hour circle/Points 
+ 
+ - BTN3 (long press)(BJS1): default Exit/kill app 
 
 
 ## Coming soon
diff --git a/apps/mixdiganclock/bangle.js2_UI.png b/apps/mixdiganclock/bangle.js2_UI.png
new file mode 100644
index 000000000..0c0f37fb5
Binary files /dev/null and b/apps/mixdiganclock/bangle.js2_UI.png differ
diff --git a/apps/mixdiganclock/bangle.js_UI.png b/apps/mixdiganclock/bangle.js_UI.png
new file mode 100644
index 000000000..d4e5df6d2
Binary files /dev/null and b/apps/mixdiganclock/bangle.js_UI.png differ
diff --git a/apps/mixdiganclock/metadata.json b/apps/mixdiganclock/metadata.json
index daf0924ec..4716a7ad2 100644
--- a/apps/mixdiganclock/metadata.json
+++ b/apps/mixdiganclock/metadata.json
@@ -1,13 +1,13 @@
 {
   "id": "mixdiganclock",
   "name": "Mix Dig&Anal Clock",
-  "version": "0.04",
-  "description": "A dual Analog and Digital Clock, that gives the user the power to improve the UI/UX on realtime. Too much sun and polarized sunglasses should not be a problem to read the time anymore if you change colors or aspect. Originally based in Mixed Clock ",
+  "version": "0.05",
+  "description": "A dual Analog, Digital Clock, that gives the user the power to improve the aspect on realtime. Too much sun and/or polarized sunglasses? Not be a problem anymore to see the time. Originally based in Mixed Clock ",
   "icon": "mixdiganclock.png",
   "type": "clock",
   "tags": "clock",
   "screenshots": [{"url":"ss_mixdigan_ems.png"}],
-  "supports": ["BANGLEJS","BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
   "storage": [
diff --git a/apps/mixdiganclock/mixdiganclock.app.js b/apps/mixdiganclock/mixdiganclock.app.js
index 940e1a7e2..da2c22f18 100644
--- a/apps/mixdiganclock/mixdiganclock.app.js
+++ b/apps/mixdiganclock/mixdiganclock.app.js
@@ -2,7 +2,7 @@
 compatible with BJS1, BJS2 and bottom widgets
 */
 var locale = require("locale");
-var v_mode_debug=0 //, 0=no, 1 min, 2 prone detail
+var v_mode_debug=0; //, 0=no, 1 min, 2 prone detail
 var v_model=process.env.BOARD;
 var v_array4colors=0; // 0 undef, 1 forDark, 2 forLight
 var a_colors=[]; //new Array(), values will depend on b_isarray4dark
@@ -23,8 +23,25 @@ var v_center_y;
 
 g.clear(); //ONLY 1ST TIME
 //show the exit button
-Bangle.setUI("clock"); //implies center button for launcher
 
+function setMainBtn() { 
+//if messages app installed shortcut otherwise default access to launcher 
+if  (require("Storage").read("messagegui.app.js")===undefined) 
+{
+  if (require("Storage").read("messagelist.app.js")===undefined)  Bangle.setUI("clock"); // implies btn2(js1)  btn(js2)- launcher
+   else if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') setWatch(function (){load("messagelist.app.js");}, BTN2, { repeat: true });   
+      else setWatch(function (){load("messagelist.app.js");}, BTN1, { repeat: true });
+}
+else if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') setWatch(function (){load("messagegui.app.js");}, BTN2, { repeat: true });   
+        else setWatch(function (){load("messagegui.app.js");}, BTN1, { repeat: true });
+}
+
+function setBJS1Btns() { 
+  //only for bjs1, btns complementary to touch 
+   setWatch(changeFGcolor, BTN1, { repeat: true });        
+   setWatch(changeBGcolor, BTN3, { repeat: true });             
+  }
+  
 Bangle.loadWidgets();
 
 function getColorArray4BG() {    //1st=0 1st compatible color (dark/light theme)
@@ -211,6 +228,42 @@ function drawMixedClock() {
    g.setColor(a_colors[v_color1]);
    g.fillCircle(v_center_x, v_center_y, Radius.center);
 }
+
+function changeFGcolor(){
+ //change color but monocolor watchface
+ if (v_mode_debug>0) console.log("v_count_col/total: "+v_count_col+"/"+a_colors.length);
+ if (v_count_col<a_colors.length){
+  v_color1=v_count_col;
+  v_color2=v_count_col;
+  v_color3=v_count_col;
+  v_count_col++; //next color
+ }
+ else setVariables();   //v_count_col=3; //reset to 1st common color
+ if (v_mode_debug>0) console.log("paint on color: "+v_count_col);
+ drawStaticRing(a_colors[v_color1]);
+ drawDailyTxt();
+}
+function changeBGcolor(){
+  //pend to refactor
+  //if black  bg
+ if (v_array4colors==1) v_array4colors=2; // then white
+ else if (v_array4colors==2) v_array4colors=1; //if white  bg         
+ getColorArray4BG(); //set new list of colors
+ g.setBgColor( v_color_erase);// 0 white, 1 black
+ ClearScreen();
+ //g.clear();//impact on widgets
+ drawStaticRing(a_colors[v_color1]);
+ drawDailyTxt(); //1st time
+ drawMixedClock();
+}
+function changeRadiusRing(){
+  drawStaticRing(v_color_erase);
+  if (Radius.circleH<13) Radius.circleH++;
+  else Radius.circleH=2;
+  if (v_mode_debug>0)  console.log("radio: "+Radius.circleH);
+  drawStaticRing(a_colors[v_color1]);
+}
+
 function UserInput(){
   Bangle.on('touch', function(button){
       switch(button){
@@ -218,55 +271,21 @@ function UserInput(){
             Bangle.showLauncher();
                break;
           case 2:
-            //change color but monocolor watchface
-               if (v_mode_debug>0) console.log("v_count_col/total: "+v_count_col+"/"+a_colors.length);
-               if (v_count_col<a_colors.length){
-                v_color1=v_count_col;
-                v_color2=v_count_col;
-                v_color3=v_count_col;
-                v_count_col++; //next color
-               }
-               else setVariables();   //v_count_col=3; //reset to 1st common color
-               if (v_mode_debug>0) console.log("paint on color: "+v_count_col);
-               drawStaticRing(a_colors[v_color1]);
-               drawDailyTxt();
+            changeFGcolor();
                break;
           case 3:
              //console.log("Touch 3 aka 1+2 not for BJS1 emul");//center 1+2
               break;
       }
   });
-  //changing dimensions
+  //changing dimensions right
   Bangle.on('swipe', dir => {
     if(dir == 1) {
-      drawStaticRing(v_color_erase);
-      if (Radius.circleH<13) Radius.circleH++
-      else Radius.circleH=2;
-      if (v_mode_debug>0)  console.log("radio: "+Radius.circleH);
-      drawStaticRing(a_colors[v_color1]);
-       }
-    else { //swipe left, pend to refactor
-      if (v_array4colors==1) { //if black  bg
-         v_array4colors=2; // then white
-         getColorArray4BG(); //set new list of colors
-         g.setBgColor( v_color_erase);// 0 white, 1 black
-         ClearScreen();
-         //g.clear();//impact on widgets
-         drawStaticRing(a_colors[v_color1]);
-         drawDailyTxt(); //1st time
-         drawMixedClock();
-      } else if (v_array4colors==2) { //if white  bg
-        v_array4colors=1;
-        getColorArray4BG();
-        console.log(a_colors[1]);
-         g.setBgColor(v_color_erase);// 0 white, 1 black
-         //g.clear();
-         ClearScreen();
-         drawStaticRing(a_colors[v_color1]);
-         drawDailyTxt(); //1st time
-         drawMixedClock(); //or just wait?
-        }
+      changeRadiusRing();      
        }
+    else { //swipe left,bg color 
+      changeBGcolor();
+        }      
   });
 }
 Bangle.on('lcdPower', function(on) {
@@ -274,9 +293,11 @@ Bangle.on('lcdPower', function(on) {
     drawMixedClock();
 });
 
+setMainBtn(); //assign btn to messages when installed
 setVariables();
 Bangle.drawWidgets();
 UserInput();
+if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') setBJS1Btns(); //assign btn1 and btn3
 setInterval(drawMixedClock, 30000);//not realtime update
 drawStaticRing(a_colors[v_color1]);
 drawDailyTxt();
diff --git a/apps/mixdiganclock/mixdiganclock.info b/apps/mixdiganclock/mixdiganclock.info
deleted file mode 100644
index 9675614c1..000000000
--- a/apps/mixdiganclock/mixdiganclock.info
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"mixdiganclock","name":"Mix Dig&Anal","type":"clock","src":"mixdiganclock.app.js","icon":"mixdiganclock.img","version":"0.04","tags":"clock","files":"mixdiganclock.info,mixdiganclock.app.js,mixdiganclock.img"}
\ No newline at end of file
diff --git a/apps/mixdiganclock/photo_mixdigan_bjs1.jpg b/apps/mixdiganclock/photo_mixdigan_bjs1.jpg
index 023183a59..a3d590647 100644
Binary files a/apps/mixdiganclock/photo_mixdigan_bjs1.jpg and b/apps/mixdiganclock/photo_mixdigan_bjs1.jpg differ
diff --git a/apps/mtnclock/ChangeLog b/apps/mtnclock/ChangeLog
new file mode 100644
index 000000000..98cd0cc94
--- /dev/null
+++ b/apps/mtnclock/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App!
+0.02: Get weather from weather.json
+0.03: Address unexpected undefined when reading weather.json
\ No newline at end of file
diff --git a/apps/mtnclock/README.md b/apps/mtnclock/README.md
index 58538509d..441754b83 100644
--- a/apps/mtnclock/README.md
+++ b/apps/mtnclock/README.md
@@ -4,7 +4,7 @@ Based on the Pebble watchface Weather Land.
 
 Mountain Pass Clock changes depending on time (day/night) and weather conditions.
 
-This clock requires Gadgetbridge and an app that Gadgetbridge can use to get the current weather from OpenWeatherMap (e.g. Weather Notification). To set up Gadgetbridge and weather, see https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Weather. 
+This clock requires Gadgetbridge and an app that Gadgetbridge can use to get the current weather from OpenWeatherMap (e.g. Weather Notification), or a Bangle app that will update weather.json such as OWM Weather. To set up Gadgetbridge and weather, see https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Weather.
 
 The scene will change according to the following OpenWeatherMap conditions: clear, cloudy, overcast, lightning, drizzle, rain, fog and snow. Each weather condition has night/day scenes.
 
diff --git a/apps/mtnclock/app.js b/apps/mtnclock/app.js
index 28ba25882..a65382dec 100644
--- a/apps/mtnclock/app.js
+++ b/apps/mtnclock/app.js
@@ -323,11 +323,28 @@ function setWeather() {
   draw(a);
 }
 
+function readWeather() {
+  var weatherJson = require("Storage").readJSON('weather.json', 1);
+  // save updated weather data if available and it has been an hour since last updated
+  if (weatherJson && weatherJson.weather && weatherJson.weather.time && (data.time === undefined || (data.time + 3600000) < weatherJson.weather.time)) {
+    data = {
+      time: weatherJson.weather.time,
+      temp: weatherJson.weather.temp,
+      code: weatherJson.weather.code
+    };
+    require("Storage").writeJSON('mtnclock.json', data);
+  }
+}
+
 const _GB = global.GB;
 global.GB = (event) => {
   if (event.t==="weather") {
-    data = event;
-    require("Storage").write('mtnclock.json', event);
+    data = {
+      temp: event.temp,
+      code: event.code,
+      time: Date.now()
+    };
+    require("Storage").writeJSON('mtnclock.json', data);
     setWeather();
   }
   if (_GB) setTimeout(_GB, 0, event);
@@ -340,11 +357,13 @@ function queueDraw() {
   if (drawTimeout) clearTimeout(drawTimeout);
   drawTimeout = setTimeout(function() {
     drawTimeout = undefined;
+    readWeather();
     setWeather();
     queueDraw();
   }, 60000 - (Date.now() % 60000));
 }
 
 queueDraw();
+readWeather();
 setWeather();
 Bangle.setUI("clock");
diff --git a/apps/mtnclock/metadata.json b/apps/mtnclock/metadata.json
index a3a173069..2d3d0a02f 100644
--- a/apps/mtnclock/metadata.json
+++ b/apps/mtnclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "mtnclock",
   "name": "Mountain Pass Clock",
   "shortName": "Mtn Clock",
-  "version": "0.01",
+  "version": "0.03",
   "description": "A clock that changes scenery based on time and weather.",
   "readme":"README.md",
   "icon": "app.png",
diff --git a/apps/multidice/ChangeLog b/apps/multidice/ChangeLog
new file mode 100644
index 000000000..cb0cce2aa
--- /dev/null
+++ b/apps/multidice/ChangeLog
@@ -0,0 +1,32 @@
+0.90: got most of the features done, lacking some polish and real-hardware testing
+1.00: overhauled the whole app, made some margins larger to be easier to tap on
+1.01: fixed bug that caused rolled dice on the right of screen to be writ off-screen
+1.02: added vibration when dice is rolled
+1.03: vibration caused the accelerometer to never stop
+1.04: decreased vibration strength
+1.05: toggled the acceleration handler to prevent infinite buzz loop
+1.06: increased vibration again
+1.07: IDK how to use promises properly
+1.08: still trying to fix the lack of vibrations
+1.09: hopefully now it's fixed?
+1.10: not having web bluetooth to debug is a PAIN
+1.11: decreased vibration time, decreased accel requirement
+1.12: issue with app calling roll function too many times at startup
+1.13: added a delay after the buzzer stops to prevent multi-rolling
+1.14: made the delay needlessly long to see if it even does anything
+1.15: moved accel & vibration commands to the accelHandler function
+1.16: enabled button usage & temporarily disabled acceleration
+1.17: made changes to when accelHandler gets overwritten, temporarily disabled button usage
+1.18: decided to keep around the button even while testing, disabled all safety round the accelHandler self-triggering
+1.19: added longer delay before resetting accelHandler
+1.20: removed all traces of accel b/c I've given up
+1.21: added a drawWidgets command to see if I have the padding right
+1.22: ok the buzzing *might* work now
+1.23: forgot to resolve the promise
+1.24: fixed dumb errors
+1.25: god I hope this works
+1.26: trying to add timeout after it's done buzzing... again
+1.27: OH GOD IT FINALLY WORKS
+1.28: increased vibration strength, added some comments, & some QOL
+1.29: changed image
+1.30: changed image, again
diff --git a/apps/multidice/README.md b/apps/multidice/README.md
new file mode 100644
index 000000000..72a2d8af5
--- /dev/null
+++ b/apps/multidice/README.md
@@ -0,0 +1,20 @@
+# multiple dice roller
+
+roll anywhere from 1-8 dice at the same time.
+
+## Usage
+
+![startup.png](startup.png)
+On the menu screen: tap on the dice to change what variant is selected, & shake/or press BTN to roll the dice
+![single_rolled.png](single_rolled.png)
+On the dice screen: tap anywhere on the screen to go back to the menu, or shake/or press BTN to roll the dice
+
+## Features
+
+roll anywhere from 1-8 dice (d4, d6, d8, d10, d12, d20, & d percentile). You can select multiple different dice at the same time
+![many_selected.png](many_selected.png)
+![many_rolled.png](many_rolled.png)
+
+## Controls
+
+App uses touchscreen to cycle through different dice, and accelerometer/BTN to roll them
diff --git a/apps/multidice/app-icon.js b/apps/multidice/app-icon.js
new file mode 100644
index 000000000..88feb83cd
--- /dev/null
+++ b/apps/multidice/app-icon.js
@@ -0,0 +1 @@
+atob("MDABAAAAA8AAAAAAB+AAf//+DDAAwAACGBgAwAADMAwAwAADYAYAgAAAwYMAgAABg+GAgAADBiDAgDwGBiBggH4MAmAwgMMYA8AYgIEwAAAMgIFg8AeGgIHBkAyDgMNBGAjDgH5BGAjDgDxh8A+DgAAwYAMGgAAYAYAMgAAMA+AYwAAGBiAwwAADBiBgwAADgmDAf//+w8Gwf///4AM8wAADMAYEzwADGA3En4ABDBvkmYABBjIkmYABI+IkH4ABPAPkjwABHAHEgDwBAHAEAH4BAPgEgGYBAIgEgGYBAIgEgH4BAPgEgDwBAHAEgADxHAHEgAH5PgPkgAGZIgIkgAGZIgIkgAH5PgPkwADzHAHEwAADAAAEcAAPwAAcP//8///w")
diff --git a/apps/multidice/app.js b/apps/multidice/app.js
new file mode 100644
index 000000000..53f67e21e
--- /dev/null
+++ b/apps/multidice/app.js
@@ -0,0 +1,185 @@
+var menu = true; // default to have the selection menu open
+const DICE_ARRAY = [0, 4, 6, 8, 10, 12, 20, 100]; // 0 means nothing selected
+const SELECTION_ARRAY = [6, 0, 0, 0, 0, 0, 0, 0]; // default to selecting a single d20
+
+// function to draw the selection menu
+function drawMenu() {
+  
+  stringArr = new Array ("", "", "", "", "", "", "", "");
+  for (i = 0; i < 8; i++) {
+    
+    if (SELECTION_ARRAY [i] != 0) {
+      
+      stringArr [i] = "" + DICE_ARRAY [SELECTION_ARRAY [i]];
+    } else {
+      
+      stringArr [i] = " . "; // more clearly defines where the user can tap
+    }
+  }
+  
+  g.clear();
+  g.setFont ("Vector", 40);
+  
+  // "   ".slice(-3) left-pads all numbers with spaces
+  g.drawString (("   " + stringArr [0]).slice (-3), 5, 10);
+  g.drawString (("   " + stringArr [1]).slice (-3), 5, 50);
+  g.drawString (("   " + stringArr [2]).slice (-3), 5, 90);
+  g.drawString (("   " + stringArr [3]).slice (-3), 5, 130);
+  g.drawString (("   " + stringArr [4]).slice (-3), 96, 10);
+  g.drawString (("   " + stringArr [5]).slice (-3), 96, 50);
+  g.drawString (("   " + stringArr [6]).slice (-3), 96, 90);
+  g.drawString (("   " + stringArr [7]).slice (-3), 96, 130);
+}
+
+// function to change what dice is selected in the menu
+function touchHandler (button, xy) {
+  
+  if (! menu) { // if menu isn't open, open it & return
+    
+    menu = true;
+    drawMenu();
+    return;
+  }
+  
+  if (xy.x <= 87) { // left
+    
+    if (xy.y <= 43) { // first
+      
+      selection = 0;
+    } else if (xy.y <= 87) { // second
+      
+      selection = 1;
+    } else if (xy.y <= 131) { // third
+      
+      selection = 2;
+    } else { // fourth
+      
+      selection = 3;
+    }
+  } else { // right
+    
+    if (xy.y <= 43) { // first
+      
+      selection = 4;
+    } else if (xy.y <= 87) { // second
+      
+      selection = 5;
+    } else if (xy.y <= 131) { // third
+      
+      selection = 6;
+    } else { // fourth
+      
+      selection = 7;
+    }
+  }
+  
+  if (SELECTION_ARRAY [selection] == SELECTION_ARRAY.length - 1) { // if last dice is selected, go back to first
+    
+    SELECTION_ARRAY [selection] = 0;
+  } else {
+    
+    SELECTION_ARRAY [selection] += 1;
+  }
+  
+  drawMenu();
+}
+
+function accelHandler (xyz) {
+  
+  if (xyz.diff >= 0.3) {
+    
+    menu = false;
+    mutex (rollDice).catch (() => {
+      
+      return; // not necessary, but prevents spamming the logs
+    });
+  }
+}
+
+// returns a resolved promise if no other mutex call is active, all further ones return a rejected one
+let lock = false;
+function mutex (functionRef) {
+  
+  if (lock) {
+    
+    return Promise.reject (new Error ("mutex is busy"));
+  }
+  
+  lock = true;
+  return new Promise ((resolve, reject) => {
+    
+    functionRef().then ((result) => {
+      
+      lock = false;
+      resolve (result);
+    }).catch ((error) => {
+      
+      lock = false;
+      reject (error);
+    });
+  });
+}
+
+// function to roll all selected dice, and display them
+function rollDice() {
+  
+  resultsArr = new Uint8Array (8);
+  for (i = 0; i < 8; i++) {
+    
+    if (SELECTION_ARRAY [i] != 0) {
+      
+      resultsArr [i] = random (DICE_ARRAY [SELECTION_ARRAY [i]]);
+    }
+  }
+  
+  g.clear();
+  g.setFont ("Vector", 40);
+  
+  for (i = 0; i < 4; i++) {
+    
+    if (SELECTION_ARRAY [i] != 0) {
+      
+      g.drawString (("   " + resultsArr [i]).slice (-3), 5, 10 + 40 * i);
+    }
+  }
+  
+  for (i = 4; i < 8; i++) {
+    
+    if (SELECTION_ARRAY [i] != 0) {
+      
+      g.drawString (("   " + resultsArr [i]).slice (-3), 96, 10 + 40 * (i - 4));
+    }
+  }
+  
+  return vibrate();
+}
+
+// triggers the vibration, then pauses before returning
+function vibrate() {
+  
+  return new Promise ((resolve, reject) => {
+    
+    return Bangle.buzz (50, 1).then ((value) => {
+      
+      setTimeout (() => {
+        
+        resolve (value);
+      }, 200);
+    });
+  });
+}
+
+// returns a integer [1, max]
+function random (max) {
+  
+  return Math.round (Math.random() * (max - 1) + 1);
+}
+
+drawMenu();
+Bangle.on ('touch', touchHandler);
+Bangle.on ('accel', accelHandler);
+setWatch (function() {
+  
+  menu = false;
+  mutex (rollDice);
+}, BTN, {repeat: true, edge: "falling", debounce: 10});
diff --git a/apps/multidice/app.png b/apps/multidice/app.png
new file mode 100644
index 000000000..75ee0514a
Binary files /dev/null and b/apps/multidice/app.png differ
diff --git a/apps/multidice/many_rolled.png b/apps/multidice/many_rolled.png
new file mode 100644
index 000000000..4cf34e9c7
Binary files /dev/null and b/apps/multidice/many_rolled.png differ
diff --git a/apps/multidice/many_selected.png b/apps/multidice/many_selected.png
new file mode 100644
index 000000000..137e2c363
Binary files /dev/null and b/apps/multidice/many_selected.png differ
diff --git a/apps/multidice/metadata.json b/apps/multidice/metadata.json
new file mode 100644
index 000000000..304c789e4
--- /dev/null
+++ b/apps/multidice/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "multidice",
+  "name": "multiple dice roller",
+  "shortName":"multidice",
+  "version":"1.30",
+  "description": "roll anywhere from 1-8 dice at the same time",
+  "icon": "app.png",
+  "tags": "tool,game",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "allow_emulator": true,
+  "storage": [
+    {"name":"multidice.app.js","url":"app.js"},
+    {"name":"multidice.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/multidice/single_rolled.png b/apps/multidice/single_rolled.png
new file mode 100644
index 000000000..3ce67ab74
Binary files /dev/null and b/apps/multidice/single_rolled.png differ
diff --git a/apps/multidice/startup.png b/apps/multidice/startup.png
new file mode 100644
index 000000000..587281e5c
Binary files /dev/null and b/apps/multidice/startup.png differ
diff --git a/apps/multitimer/ChangeLog b/apps/multitimer/ChangeLog
index 9a2ab0ff4..b708a990f 100644
--- a/apps/multitimer/ChangeLog
+++ b/apps/multitimer/ChangeLog
@@ -1,3 +1,6 @@
 0.01: Initial version
 0.02: Update for time_utils module
 0.03: Use default Bangle formatter for booleans
+0.04: Remove copied sched alarm.js & import newer features (oneshot alarms)
+0.05: Fix creating new alarms/timers in hardmode
+0.06: Support fastloading
diff --git a/apps/multitimer/README.md b/apps/multitimer/README.md
index f1e2eb281..04bdf4a6e 100644
--- a/apps/multitimer/README.md
+++ b/apps/multitimer/README.md
@@ -2,9 +2,10 @@
 With this app, you can set timers and chronographs (stopwatches) and watch them count down/up in real time. You can also set alarms - swipe left or right to switch between the three functions.
 
 "Hard mode" is also available for timers and alarms. It will double the number of buzz counts and you will have to swipe the screen five to eight times correctly - make a mistake, and you will need to start over.
+"Delete after expiration" can be set on a timer/alarm to have it delete itself once it's sounded (the same as the alarm app).
 
 ## WARNING
 * Editing timers in another app (such as the default Alarm app) is not recommended. Editing alarms should not be a problem (in theory).
-* This app uses the [Scheduler library](https://banglejs.com/apps/?id=sched). 
+* This app uses the [Scheduler library](https://banglejs.com/apps/?id=sched).
 * To avoid potential conflicts with other apps that uses sched (especially ones that make use of the data and js field), this app only lists timers and alarms that it created - any made outside the app will be ignored. GB alarms are currently an exception as they do not make use of the data and js field.
 * A keyboard app is only used for adding messages to timers and is therefore not strictly needed.
diff --git a/apps/multitimer/alarm.js b/apps/multitimer/alarm.js
index eb1b3b259..b202ae662 100644
--- a/apps/multitimer/alarm.js
+++ b/apps/multitimer/alarm.js
@@ -1,148 +1,89 @@
-//sched.js, modified
-// Chances are boot0.js got run already and scheduled *another*
-// 'load(sched.js)' - so let's remove it first!
-if (Bangle.SCHED) {
-  clearInterval(Bangle.SCHED);
-  delete Bangle.SCHED;
-}
-
-function hardMode(tries, max) {
-  var R = Bangle.appRect;
-
-  function adv() {
-    tries++;
-    hardMode(tries, max);
-  }
-
-  if (tries < max) {
-    g.clear();
-    g.reset();
-    g.setClipRect(R.x,R.y,R.x2,R.y2);
-    var code = Math.abs(E.hwRand()%4);
-    if (code == 0) dir = "up";
-    else if (code == 1) dir = "right";
-    else if (code == 2) dir = "down";
-    else dir = "left";
-    g.setFont("6x8:2").setFontAlign(0,0).drawString(tries+"/"+max+"\nSwipe "+dir, (R.x2-R.x)/2, (R.y2-R.y)/2);
-    var drag;
-    Bangle.setUI({
-    mode : "custom",
-    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
-          if (Math.abs(dx)>Math.abs(dy)+10) {
-            //left
-            if (dx<0 && code == 3) adv();
-            //right
-            else if (dx>0 && code == 1) adv();
-            //wrong swipe - reset
-            else startHM();
-          }
-          //vertical swipes
-          else if (Math.abs(dy)>Math.abs(dx)+10) {
-            //up
-            if (dy<0 && code == 0) adv();
-            //down
-            else if (dy>0 && code == 2) adv();
-            //wrong swipe - reset
-            else startHM();
-          }
-        }
-      }
-    });
-  }
-  else {
-    if (!active[0].timer) active[0].last = (new Date()).getDate();
-    if (!active[0].rp) active[0].on = false;
-    if (active[0].timer) active[0].timer = active[0].data.ot;
-    require("sched").setAlarms(alarms);
-    load();
-  }
-}
-
-function startHM() {
-  //between 5-8 random swipes
-  hardMode(0, Math.abs(E.hwRand()%4)+5);
-}
-
-function showAlarm(alarm) {
-  const settings = require("sched").getSettings();
-
-  let msg = "";
-  if (alarm.timer) msg += require("time_utils").formatTime(alarm.timer);
-  if (alarm.msg) {
-    msg += "\n"+alarm.msg;
-  }
-  else msg = atob("ACQswgD//33vRcGHIQAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAAAP/wAAAAAAAAAP/wAAAAAAAAAqqoAPAAAAAAqqqqoP8AAAAKqqqqqv/AAACqqqqqqq/wAAKqqqlWqqvwAAqqqqlVaqrAACqqqqlVVqqAAKqqqqlVVaqgAKqaqqlVVWqgAqpWqqlVVVqoAqlWqqlVVVaoCqlV6qlVVVaqCqVVfqlVVVWqCqVVf6lVVVWqKpVVX/lVVVVqqpVVV/+VVVVqqpVVV//lVVVqqpVVVfr1VVVqqpVVVfr1VVVqqpVVVb/lVVVqqpVVVW+VVVVqqpVVVVVVVVVqiqVVVVVVVVWqCqVVVVVVVVWqCqlVVVVVVVaqAqlVVVVVVVaoAqpVVVVVVVqoAKqVVVVVVWqgAKqlVVVVVaqgACqpVVVVVqqAAAqqlVVVaqoAAAKqqVVWqqgAAACqqqqqqqAAAAAKqqqqqgAAAAAAqqqqoAAAAAAAAqqoAAAAA==")+" "+msg;
-
-  Bangle.loadWidgets();
-  Bangle.drawWidgets();
-
-  let buzzCount = settings.buzzCount;
-
-  if (alarm.data.hm && alarm.data.hm == true) {
-    //hard mode extends auto-snooze time
-    buzzCount = buzzCount * 3;
-    startHM();
-  }
-
-  else {
-    E.showPrompt(msg,{
-      title: "TIMER!",
-      buttons : {"Snooze":true,"Ok":false} // default is sleep so it'll come back in 10 mins
-    }).then(function(sleep) {
-      buzzCount = 0;
-      if (sleep) {
-        if(alarm.ot===undefined) alarm.ot = alarm.t;
-        alarm.t += settings.defaultSnoozeMillis;
-      } else {
-        if (!alarm.timer) alarm.last = (new Date()).getDate();
-        if (alarm.ot!==undefined) {
-            alarm.t = alarm.ot;
-            delete alarm.ot;
-        }
-        if (!alarm.rp) alarm.on = false;
-      }
-      //reset timer value
-      if (alarm.timer) alarm.timer = alarm.data.ot;
-      // alarm is still a member of 'alarms', so writing to array writes changes back directly
-      require("sched").setAlarms(alarms);
-      load();
-    });
-  }
-
-  function buzz() {
-    if (settings.unlockAtBuzz) {
-      Bangle.setLocked(false);
-    }
-
-    require("buzz").pattern(alarm.vibrate === undefined ? "::" : alarm.vibrate).then(() => {
-      if (buzzCount--) {
-        setTimeout(buzz, settings.buzzIntervalMillis);
-      } else if (alarm.as) { // auto-snooze
-        buzzCount = settings.buzzCount;
-        setTimeout(buzz, settings.defaultSnoozeMillis);
-      }
-    });
-  }
-
-  if ((require("Storage").readJSON("setting.json", 1) || {}).quiet > 1)
-    return;
-
-  buzz();
-}
-
-// Check for alarms
-let alarms = require("sched").getAlarms();
-let active = require("sched").getActiveAlarms(alarms);
-if (active.length) {
-  // if there's an alarm, show it
-  showAlarm(active[0]);
-} else {
-  // otherwise just go back to default app
-  setTimeout(load, 100);
-}
+// called by getActiveAlarms(...)[0].js
+if (Bangle.SCHED) {
+  clearInterval(Bangle.SCHED);
+  delete Bangle.SCHED;
+}
+
+function hardMode(tries, max) {
+  var R = Bangle.appRect;
+
+  function adv() {
+    tries++;
+    hardMode(tries, max);
+  }
+
+  if (tries < max) {
+    g.clear();
+    g.reset();
+    g.setClipRect(R.x,R.y,R.x2,R.y2);
+    var code = Math.abs(E.hwRand()%4);
+    if (code == 0) dir = "up";
+    else if (code == 1) dir = "right";
+    else if (code == 2) dir = "down";
+    else dir = "left";
+    g.setFont("6x8:2").setFontAlign(0,0).drawString(tries+"/"+max+"\nSwipe "+dir, (R.x2-R.x)/2, (R.y2-R.y)/2);
+    var drag;
+    Bangle.setUI({
+      mode : "custom",
+      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
+          if (Math.abs(dx)>Math.abs(dy)+10) {
+            //left
+            if (dx<0 && code == 3) adv();
+            //right
+            else if (dx>0 && code == 1) adv();
+            //wrong swipe - reset
+            else startHM();
+          }
+          //vertical swipes
+          else if (Math.abs(dy)>Math.abs(dx)+10) {
+            //up
+            if (dy<0 && code == 0) adv();
+            //down
+            else if (dy>0 && code == 2) adv();
+            //wrong swipe - reset
+            else startHM();
+          }
+        }
+      }
+    });
+  }
+  else {
+    if (!active[0].timer) active[0].last = (new Date()).getDate();
+    if (!active[0].rp) active[0].on = false;
+    if (active[0].timer) active[0].timer = active[0].data.ot;
+    require("sched").setAlarms(alarms);
+    load();
+  }
+}
+
+function startHM() {
+  //between 5-8 random swipes
+  hardMode(0, Math.abs(E.hwRand()%4)+5);
+}
+
+function buzz() {
+  const settings = require("sched").getSettings();
+  let buzzCount = 3 * settings.buzzCount;
+
+  require("buzz").pattern(alarm.vibrate === undefined ? "::" : alarm.vibrate).then(() => {
+    if (buzzCount--) {
+      setTimeout(buzz, settings.buzzIntervalMillis);
+    } else if (alarm.as) { // auto-snooze
+      buzzCount = settings.buzzCount;
+      setTimeout(buzz, settings.defaultSnoozeMillis);
+    }
+  });
+}
+
+let alarms = require("sched").getAlarms();
+let active = require("sched").getActiveAlarms(alarms);
+let alarm = active[0];
+// active[0] is a HM alarm (otherwise we'd have triggered sched.js instead of this file)
+startHM();
+buzz();
diff --git a/apps/multitimer/app.js b/apps/multitimer/app.js
index 8832d1a25..079136431 100644
--- a/apps/multitimer/app.js
+++ b/apps/multitimer/app.js
@@ -1,11 +1,12 @@
+{
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
-var R = Bangle.appRect;
-var layer;
-var drag;
-var timerInt1 = [];
-var timerInt2 = [];
+const R = Bangle.appRect;
+let layer;
+let drag;
+let timerInt1 = [];
+let timerInt2 = [];
 
 function getCurrentTime() {
   let time = new Date();
@@ -56,10 +57,17 @@ function clearInt() {
   timerInt2 = [];
 }
 
+function setHM(alarm, on) {
+  if (on)
+    alarm.js = "(require('Storage').read('multitimer.alarm.js') !== undefined) ? load('multitimer.alarm.js') : load('sched.js')";
+  else
+    delete alarm.js;
+  alarm.data.hm = on;
+}
+
 function drawTimers() {
   layer = 0;
-  var timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer");
-  var alarms = require("sched").getAlarms();
+  const timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer");
 
   function updateTimers(idx) {
     if (!timerInt1[idx]) timerInt1[idx] = setTimeout(function() {
@@ -70,15 +78,15 @@ function drawTimers() {
     }, 1000 - (timers[idx].t % 1000));
   }
 
-  var s = E.showScroller({
+  E.showScroller({
     h : 40, c : timers.length+2,
     back : function() {load();},
     draw : (idx, r) => {
       function drawMenuItem(a) {
+        let msg = "";
         g.setClipRect(R.x,R.y,R.x2,R.y2);
         if (idx > 0 && timers[idx-1].msg) msg = "\n"+(timers[idx-1].msg.length > 10 ?
           timers[idx-1].msg.substring(0, 10)+"..." : timers[idx-1].msg);
-        else msg = "";
         return g.setColor(g.theme.bg2).fillRect({x:r.x+4,y:r.y+2,w:r.w-8, h:r.h-4, r:5})
         .setColor(g.theme.fg2).setFont("6x8:2").setFontAlign(-1,0).drawString(a+msg,r.x+12,r.y+(r.h/2));
       }
@@ -104,22 +112,22 @@ function drawTimers() {
       else if (idx > 0 && idx < timers.length+1) timerMenu(idx-1);
     }
   });
+  setUI();
 }
 
 function timerMenu(idx) {
   layer = -1;
-  var timers = require("sched").getAlarms();
-  var timerIdx = [];
-  var j = 0;
+  const timers = require("sched").getAlarms();
+  const timerIdx = [];
+  let a;
+
   for (let i = 0; i < timers.length; i++) {
     if (timers[i].timer && timers[i].appid == "multitimer") {
       a = i;
       timerIdx.push(a);
-      j++;
     }
   }
-  var a = timers[timerIdx[idx]];
-  var msg = "";
+  a = timers[timerIdx[idx]];
 
   function updateTimer() {
     if (timerInt1[0] == undefined) timerInt1[0] = setTimeout(function() {
@@ -130,7 +138,7 @@ function timerMenu(idx) {
     }, 1000 - (a.t % 1000));
   }
 
-  var s = E.showScroller({
+  E.showScroller({
     h : 40, c : 5,
     back : function() {
       clearInt();
@@ -145,6 +153,7 @@ function timerMenu(idx) {
       }
 
       if (i == 0) {
+        let msg = "";
         if (a.msg) msg = "\n"+(a.msg.length > 10 ? a.msg.substring(0, 10)+"..." : a.msg);
         if (a.on == true) {
           drawMenuItem(formatTime(a.t-getCurrentTime())+msg);
@@ -212,15 +221,12 @@ function timerMenu(idx) {
 
 function editTimer(idx, a) {
   layer = -1;
-  var timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer");
-  var alarms = require("sched").getAlarms();
-  var timerIdx = [];
-  var j = 0;
+  const timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer");
+  const alarms = require("sched").getAlarms();
+  const timerIdx = [];
   for (let i = 0; i < alarms.length; i++) {
     if (alarms[i].timer && alarms[i].appid == "multitimer") {
-      b = i;
-      timerIdx.push(b);
-      j++;
+      timerIdx.push(i);
     }
   }
   if (!a) {
@@ -228,12 +234,12 @@ function editTimer(idx, a) {
     else a = timers[idx];
   }
   if (!a.data) {
-    a.data = {};
-    a.data.hm = false;
+    a.data = { hm: false };
   }
-  var t = decodeTime(a.timer);
+  const t = decodeTime(a.timer);
 
-  function editMsg(idx, a) { 
+  function editMsg(idx, a) {
+    let msg;
     g.clear();
     idx < 0 ? msg = "" : msg = a.msg;
     require("textinput").input({text:msg}).then(result => {
@@ -249,16 +255,16 @@ function editTimer(idx, a) {
     E.showAlert("Must install keyboard app").then(function() {
       editTimer(idx, a);
     });
+    setUI();
   }
 
-  var menu = {
+  const menu = {
     "": { "title": "Timer" },
     "< Back": () => {
       a.t = getCurrentTime() + a.timer;
       a.last = 0;
       a.data.ot = a.timer;
       a.appid = "multitimer";
-      a.js = "(require('Storage').read('multitimer.alarm.js') !== undefined) ? load('multitimer.alarm.js') : load('sched.js')";
       if (idx < 0) alarms.push(a);
       else alarms[timerIdx[idx]] = a;
       require("sched").setAlarms(alarms);
@@ -267,7 +273,10 @@ function editTimer(idx, a) {
     },
     "Enabled": {
       value: a.on,
-      onchange: v => a.on = v
+      onchange: v => {
+        delete a.last;
+        a.on = v;
+      }
     },
     "Hours": {
       value: t.hrs, min: 0, max: 23, wrap: true,
@@ -292,14 +301,18 @@ function editTimer(idx, a) {
     },
     "Hard Mode": {
       value: a.data.hm,
-      onchange: v => a.data.hm = v
+      onchange: v => setHM(a, v),
     },
     "Vibrate": require("buzz_menu").pattern(a.vibrate, v => a.vibrate = v),
+    "Delete After Expiration": {
+      value: !!a.del,
+      onchange: v => a.del = v
+    },
     "Msg": {
       value: !a.msg ? "" : a.msg.length > 6 ? a.msg.substring(0, 6)+"..." : a.msg,
       //menu glitch? setTimeout required here
       onchange: () => {
-        var kbapp = require("Storage").read("textinput");
+        const kbapp = require("Storage").read("textinput");
         if (kbapp != undefined) setTimeout(editMsg, 0, idx, a);
         else setTimeout(kbAlert, 0);
       }
@@ -311,11 +324,12 @@ function editTimer(idx, a) {
   };
 
   E.showMenu(menu);
+  setUI();
 }
 
 function drawSw() {
   layer = 1;
-  var sw = require("Storage").readJSON("multitimer.json", true) || [];
+  const sw = require("Storage").readJSON("multitimer.json", true) || [];
 
   function updateTimers(idx) {
     if (!timerInt1[idx]) timerInt1[idx] = setTimeout(function() {
@@ -326,12 +340,13 @@ function drawSw() {
     }, 1000 - (sw[idx].t % 1000));
   }
 
-  var s = E.showScroller({
+  E.showScroller({
     h : 40, c : sw.length+2,
     back : function() {load();},
     draw : (idx, r) => {
 
       function drawMenuItem(a) {
+        let msg;
         g.setClipRect(R.x,R.y,R.x2,R.y2);
         if (idx > 0 && sw[idx-1].msg) msg = "\n"+(sw[idx-1].msg.length > 10 ?
           sw[idx-1].msg.substring(0, 10)+"..." : sw[idx-1].msg);
@@ -365,7 +380,7 @@ function drawSw() {
 
 function swMenu(idx, a) {
   layer = -1;
-  var sw = require("Storage").readJSON("multitimer.json", true) || [];
+  const sw = require("Storage").readJSON("multitimer.json", true) || [];
   if (sw[idx]) a = sw[idx];
   else {
     a = {"t" : 0, "on" : false, "msg" : ""};
@@ -382,9 +397,9 @@ function swMenu(idx, a) {
     }, 100 - (a.t % 100));
   }
 
-  function editMsg(idx, a) { 
+  function editMsg(idx, a) {
     g.clear();
-    msg = a.msg;
+    const msg = a.msg;
     require("textinput").input({text:msg}).then(result => {
     if (result != "") {
       a.msg = result;
@@ -400,9 +415,10 @@ function swMenu(idx, a) {
     E.showAlert("Must install keyboard app").then(function() {
       swMenu(idx, a);
     });
+    setUI();
   }
 
-  var s = E.showScroller({
+  E.showScroller({
     h : 40, c : 5,
     back : function() {
       clearInt();
@@ -417,6 +433,7 @@ function swMenu(idx, a) {
       }
 
       if (i == 0) {
+        let msg;
         if (a.msg) msg = "\n"+(a.msg.length > 10 ? a.msg.substring(0, 10)+"..." : a.msg);
         else msg = "";
         if (a.on == true) {
@@ -469,7 +486,7 @@ function swMenu(idx, a) {
       //edit message
       if (i == 3) {
         clearInt();
-        var kbapp = require("Storage").read("textinput");
+        const kbapp = require("Storage").read("textinput");
         if (kbapp != undefined) editMsg(idx, a);
         else kbAlert();
       }
@@ -486,17 +503,17 @@ function swMenu(idx, a) {
 
 function drawAlarms() {
   layer = 2;
-  var alarms = require("sched").getAlarms().filter(a => !a.timer);
+  const alarms = require("sched").getAlarms().filter(a => !a.timer);
 
-  var s = E.showScroller({
+  E.showScroller({
     h : 40, c : alarms.length+2,
     back : function() {load();},
     draw : (idx, r) => {
 
       function drawMenuItem(a) {
         g.setClipRect(R.x,R.y,R.x2,R.y2);
-        var on = "";
-        var dow = "";
+        let on = "";
+        let dow = "";
         if (idx > 0 && alarms[idx-1].on == true) on = " - on";
         else if (idx > 0 && alarms[idx-1].on == false) on = " - off";
         if (idx > 0 && idx < alarms.length+1) dow = "\n"+"SMTWTFS".split("").map((d,n)=>alarms[idx-1].dow&(1<<n)?d:".").join("");
@@ -512,7 +529,7 @@ function drawAlarms() {
         .setColor(g.theme.fg).setFont("6x8:2").setFontAlign(0,0).drawString("<   Swipe   >",r.x+(r.w/2),r.y+(r.h/2));
       }
       else if (idx > 0 && idx < alarms.length+1){
-        var str = formatTime(alarms[idx-1].t);
+        const str = formatTime(alarms[idx-1].t);
         drawMenuItem(str.slice(0, -3));
       }
     },
@@ -529,26 +546,24 @@ function editDOW(dow, onchange) {
     '': { 'title': 'Days of Week' },
     '< Back' : () => onchange(dow)
   };
-  for (var i = 0; i < 7; i++) (i => {
-    var dayOfWeek = require("locale").dow({ getDay: () => i });
+  for (let i = 0; i < 7; i++) (i => {
+    const dayOfWeek = require("locale").dow({ getDay: () => i });
     menu[dayOfWeek] = {
       value: !!(dow&(1<<i)),
       onchange: v => v ? dow |= 1<<i : dow &= ~(1<<i),
     };
   })(i);
   E.showMenu(menu);
+  setUI();
 }
 
 function editAlarm(idx, a) {
   layer = -1;
-  var alarms = require("sched").getAlarms();
-  var alarmIdx = [];
-  var j = 0;
+  const alarms = require("sched").getAlarms();
+  const alarmIdx = [];
   for (let i = 0; i < alarms.length; i++) {
     if (!alarms[i].timer) {
-      b = i;
-      alarmIdx.push(b);
-      j++;
+      alarmIdx.push(i);
     }
   }
   if (!a) {
@@ -556,12 +571,12 @@ function editAlarm(idx, a) {
     else a = require("sched").newDefaultAlarm();
   }
   if (!a.data) {
-    a.data = {};
-    a.data.hm = false;
+    a.data = { hm: false };
   }
-  var t = decodeTime(a.t);
+  const t = decodeTime(a.t);
 
-  function editMsg(idx, a) { 
+  function editMsg(idx, a) {
+    let msg;
     g.clear();
     idx < 0 ? msg = "" : msg = a.msg;
     require("textinput").input({text:msg}).then(result => {
@@ -577,13 +592,12 @@ function editAlarm(idx, a) {
     E.showAlert("Must install keyboard app").then(function() {
       editAlarm(idx, a);
     });
+    setUI();
   }
 
-  var menu = {
+  const menu = {
     "": { "title": "Alarm" },
     "< Back": () => {
-      if (a.data.hm == true) a.js = "(require('Storage').read('multitimer.alarm.js') !== undefined) ? load('multitimer.alarm.js') : load('sched.js')";
-      if (a.data.hm == false && a.js) delete a.js;
       if (idx >= 0) alarms[alarmIdx[idx]] = a;
       else alarms.push(a);
       require("sched").setAlarms(alarms);
@@ -592,7 +606,10 @@ function editAlarm(idx, a) {
     },
     "Enabled": {
       value: a.on,
-      onchange: v => a.on = v
+      onchange: v => {
+        delete a.last;
+        a.on = v;
+      }
     },
     "Hours": {
       value: t.hrs, min: 0, max: 23, wrap: true,
@@ -618,9 +635,13 @@ function editAlarm(idx, a) {
     },
     "Hard Mode": {
       value: a.data.hm,
-      onchange: v => a.data.hm = v
+      onchange: v => setHM(a, v),
     },
     "Vibrate": require("buzz_menu").pattern(a.vibrate, v => a.vibrate = v),
+    "Delete After Expiration": {
+      value: !!a.del,
+      onchange: v => a.del = v
+    },
     "Auto Snooze": {
       value: a.as,
       onchange: v => a.as = v
@@ -629,7 +650,7 @@ function editAlarm(idx, a) {
       value: !a.msg ? "" : a.msg.length > 6 ? a.msg.substring(0, 6)+"..." : a.msg,
       //menu glitch? setTimeout required here
       onchange: () => {
-        var kbapp = require("Storage").read("textinput");
+        const kbapp = require("Storage").read("textinput");
         if (kbapp != undefined) setTimeout(editMsg, 0, idx, a);
         else setTimeout(kbAlert, 0);
       }
@@ -645,15 +666,24 @@ function editAlarm(idx, a) {
   };
 
   E.showMenu(menu);
+  setUI();
 }
 
-drawTimers();
+function setUI() {
+  // E.showMenu/E.showScroller/E.showAlert call setUI, so we register onDrag() separately
+  // and tack on uiRemove after the fact to avoid interfering
+  Bangle.uiRemove = () => {
+    Bangle.removeListener("drag", onDrag);
+    Object.values(timerInt1).forEach(clearTimeout);
+    Object.values(timerInt2).forEach(clearTimeout);
+  };
+}
 
-Bangle.on("drag", e=>{
+function onDrag(e) {
   if (layer < 0) return;
   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;
@@ -670,4 +700,9 @@ Bangle.on("drag", e=>{
       else if (layer == 2) drawAlarms();
     }
   }
-});
+}
+
+drawTimers();
+
+Bangle.on("drag", onDrag);
+}
diff --git a/apps/multitimer/boot.js b/apps/multitimer/boot.js
new file mode 100644
index 000000000..70b9032f6
--- /dev/null
+++ b/apps/multitimer/boot.js
@@ -0,0 +1,8 @@
+{
+  const resetTimer = alarm => {
+    if (alarm.timer) alarm.timer = alarm.data.ot;
+  };
+
+  Bangle.on("alarmSnooze", resetTimer);
+  Bangle.on("alarmDismiss", resetTimer);
+}
diff --git a/apps/multitimer/metadata.json b/apps/multitimer/metadata.json
index ee77d2ecb..40d376986 100644
--- a/apps/multitimer/metadata.json
+++ b/apps/multitimer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "multitimer",
   "name": "Multi Timer",
-  "version": "0.03",
+  "version": "0.06",
   "description": "Set timers and chronographs (stopwatches) and watch them count down in real time. Pause, create, edit, and delete timers and chronos, and add custom labels/messages. Also sets alarms.",
   "icon": "app.png",
   "screenshots": [
@@ -14,6 +14,7 @@
   "readme": "README.md",
   "storage": [
     {"name":"multitimer.app.js","url":"app.js"},
+    {"name":"multitimer.boot.js","url":"boot.js"},
     {"name":"multitimer.alarm.js","url":"alarm.js"},
     {"name":"multitimer.img","url":"app-icon.js","evaluate":true}
   ],
diff --git a/apps/mylocation/ChangeLog b/apps/mylocation/ChangeLog
index afe1810e9..ea1c77bde 100644
--- a/apps/mylocation/ChangeLog
+++ b/apps/mylocation/ChangeLog
@@ -7,3 +7,4 @@
 0.07: Move mylocation app into 'Settings -> Apps'
 0.08: Allow setting location from webinterface in the AppLoader
 0.09: Fix web interface so app can be installed (replaced custom with interface html)
+0.10: Add waypoints as location source
diff --git a/apps/mylocation/README.md b/apps/mylocation/README.md
index 11a644262..7fecfdfcb 100644
--- a/apps/mylocation/README.md
+++ b/apps/mylocation/README.md
@@ -9,7 +9,7 @@ next to it - and you can choose your location on a map.
 
 **On Bangle.js** go to `Settings -> Apps -> My Location`
 
-* Select one of the preset Cities, setup through the GPS or use the webinterface from the AppLoader
+* Select one of the preset Cities, setup through the GPS, waypoints (if installed) or use the webinterface from the AppLoader
 * Other Apps can read this information to do calculations based on location
 * When the City shows ??? it means the location has been set through the GPS
 
diff --git a/apps/mylocation/metadata.json b/apps/mylocation/metadata.json
index 1c2974030..7e0d16d16 100644
--- a/apps/mylocation/metadata.json
+++ b/apps/mylocation/metadata.json
@@ -4,8 +4,8 @@
   "icon": "app.png",
   "type": "settings",
   "screenshots": [{"url":"screenshot_1.png"}],
-  "version":"0.09",
-  "description": "Sets and stores the latitude and longitude of your preferred City.  It can be set from GPS or webinterface. `mylocation.json` can be used by other apps that need your main location. See README for details.",
+  "version":"0.10",
+  "description": "Sets and stores the latitude and longitude of your preferred City. It can be set from GPS, waypoints or webinterface. `mylocation.json` can be used by other apps that need your main location. See README for details.",
   "readme": "README.md",
   "tags": "tool,utility",
   "supports": ["BANGLEJS", "BANGLEJS2"],
diff --git a/apps/mylocation/settings.js b/apps/mylocation/settings.js
index 7033500fa..fcae0389c 100644
--- a/apps/mylocation/settings.js
+++ b/apps/mylocation/settings.js
@@ -13,7 +13,7 @@ let s = {
 function loadSettings() {
   settings = require('Storage').readJSON(SETTINGS_FILE, 1) || {};
   for (const key in settings) {
-    s[key] = settings[key]
+    s[key] = settings[key];
   }
 }
 
@@ -31,7 +31,7 @@ function setFromGPS() {
     //console.log(".");
     if (gps.fix === 0) return;
     //console.log("fix from GPS");
-    s = {'lat': gps.lat, 'lon': gps.lon, 'location': '???' };
+    s = {'lat': gps.lat, 'lon': gps.lon, 'location': 'GPS' };
     Bangle.buzz(1500); // buzz on first position
     Bangle.setGPSPower(0, "mylocation");
     saveSettings();
@@ -50,6 +50,25 @@ function setFromGPS() {
   Bangle.setUI("updown", undefined);
 }
 
+function setFromWaypoint() {
+  wpmenu = {
+    '': { 'title': /*LANG*/'Waypoint' },
+    '< Back': ()=>{ showMainMenu(); },
+  };
+  require("waypoints").load().forEach(wp => {
+    if (typeof(wp.lat) === 'number' && typeof(wp.lon) === 'number') {
+      wpmenu[wp.name] = ()=>{
+          s.location = wp.name;
+          s.lat = parseFloat(wp.lat);
+          s.lon = parseFloat(wp.lon);
+          saveSettings();
+          showMainMenu();
+      };
+    }
+  });
+  return E.showMenu(wpmenu);
+}
+
 function showMainMenu() {
   //console.log("showMainMenu");
   const mainmenu = {
@@ -58,7 +77,13 @@ function showMainMenu() {
     /*LANG*/'City': {
       value: 0 | locations.indexOf(s.location),
       min: 0, max: locations.length - 1,
-      format: v => locations[v],
+      format: v => {
+        if (v === -1) {
+          return s.location;
+        } else {
+          return locations[v];
+        }
+      },
       onchange: v => {
         if (locations[v] !== "???") {
           s.location = locations[v];
@@ -70,6 +95,12 @@ function showMainMenu() {
     },
     /*LANG*/'Set From GPS': ()=>{ setFromGPS(); }
   };
+  try {
+    require("waypoints");
+    mainmenu[/*LANG*/'Set From Waypoint'] = ()=>{ setFromWaypoint(); };
+  } catch(err) {
+    // waypoints not installed, thats ok
+  }
   return E.showMenu(mainmenu);
 }
 
diff --git a/apps/mysticclock/metadata.json b/apps/mysticclock/metadata.json
index bd2df2f8d..51f44b79b 100644
--- a/apps/mysticclock/metadata.json
+++ b/apps/mysticclock/metadata.json
@@ -14,5 +14,8 @@
     {"name":"mysticclock.app.js","url":"mystic-clock-app.js"},
     {"name":"mysticclock.settings.js","url":"mystic-clock-settings.js"},
     {"name":"mysticclock.img","url":"mystic-clock-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"mysticclock.settings.json"}
   ]
 }
diff --git a/apps/mysticdock/metadata.json b/apps/mysticdock/metadata.json
index 2775b0b72..0ebff3b9b 100644
--- a/apps/mysticdock/metadata.json
+++ b/apps/mysticdock/metadata.json
@@ -13,5 +13,8 @@
     {"name":"mysticdock.boot.js","url":"mystic-dock-boot.js"},
     {"name":"mysticdock.settings.js","url":"mystic-dock-settings.js"},
     {"name":"mysticdock.img","url":"mystic-dock-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"mysticdock.settings.json"}
   ]
 }
diff --git a/apps/neonx/ChangeLog b/apps/neonx/ChangeLog
index e78686a00..b055d6a15 100644
--- a/apps/neonx/ChangeLog
+++ b/apps/neonx/ChangeLog
@@ -3,4 +3,5 @@
 0.03: Optional show lock status via color
 0.04: Ensure that widgets are always hidden in fullscreen mode
 0.05: Better lock/unlock animation
-0.06: Use widget_utils.
+0.06: Use widget_utils
+0.07: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/neonx/metadata.json b/apps/neonx/metadata.json
index c273cb05a..edd0e76b8 100644
--- a/apps/neonx/metadata.json
+++ b/apps/neonx/metadata.json
@@ -2,7 +2,7 @@
   "id": "neonx",
   "name": "Neon X & IO X Clock",
   "shortName": "Neon X Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Pebble Neon X & Neon IO X for Bangle.js",
   "icon": "neonx.png",
   "type": "clock",
diff --git a/apps/neonx/neonx.settings.js b/apps/neonx/neonx.settings.js
index 68e156dae..8edaf5c50 100644
--- a/apps/neonx/neonx.settings.js
+++ b/apps/neonx/neonx.settings.js
@@ -25,11 +25,9 @@
     "" : { "title":"Neon X & IO"},
     "< Back": back,
     "Neon IO X": {
-      value: 0 | neonXSettings.io,
-      min: 0, max: 1,
-      format: v => v ? "On" : "Off",
+      value: !!neonXSettings.io,
       onchange: v => {
-        neonXSettings.io = v;
+        neonXSettings.io = v?1:0;
         updateSettings();
       }
     },
@@ -43,27 +41,23 @@
       }
     },
     "Date on touch": {
-      value: 0 | neonXSettings.showDate,
-      min: 0, max: 1,
-      format: v => v ? "On" : "Off",
+      value: !!neonXSettings.showDate,
       onchange: v => {
-        neonXSettings.showDate = v;
+        neonXSettings.showDate = v?1:0;
         updateSettings();
       }
     },
     'Fullscreen': {
-      value: false | neonXSettings.fullscreen,
-      format: () => (neonXSettings.fullscreen ? 'Yes' : 'No'),
-      onchange: () => {
-        neonXSettings.fullscreen = !neonXSettings.fullscreen;
+      value: !!neonXSettings.fullscreen,
+      onchange: v => {
+        neonXSettings.fullscreen = v;
         updateSettings();
       },
     },
     'Show lock': {
-      value: false | neonXSettings.showLock,
-      format: () => (neonXSettings.showLock ? 'Yes' : 'No'),
-      onchange: () => {
-        neonXSettings.showLock = !neonXSettings.showLock;
+      value: !!neonXSettings.showLock,
+      onchange: v => {
+        neonXSettings.showLock = v;
         updateSettings();
       },
     },
diff --git a/apps/nesclock/ChangeLog b/apps/nesclock/ChangeLog
new file mode 100644
index 000000000..58bcd4648
--- /dev/null
+++ b/apps/nesclock/ChangeLog
@@ -0,0 +1,4 @@
+0.01: First release of clock with faces for mario1-3, kirby, and zelda 
+0.02: Fix issue witih plumbers font where some numbers were cut off.
+0.03: Fix issue with smb3 font on 24hr time. Better center time.
+0.04: Rearrange bitmap code to save memory.
diff --git a/apps/nesclock/README.md b/apps/nesclock/README.md
new file mode 100644
index 000000000..6b6ae9167
--- /dev/null
+++ b/apps/nesclock/README.md
@@ -0,0 +1,8 @@
+# NES Themed Clock
+
+NES Clock is a clock face that can display multiple themes based on a few NES(Nintendo Entertainment System) game title screens.
+
+This clock has the same base clock features as Anton Clock, but can be configured in settings to change the clock theme.
+
+## Compatibility
+This clock was built for Bangle.js 2. It was inteded to be run with widgets.
diff --git a/apps/nesclock/app-icon.js b/apps/nesclock/app-icon.js
new file mode 100644
index 000000000..d857ec7ee
--- /dev/null
+++ b/apps/nesclock/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AH4A/AH4A4/4A/AA8zACn/+cRAAsSkQAEkIOGn4XfABwXDiUzmQvUichkYXVAIRHSkczC4MzE4IvFC5UxA4cxI6IXFF7DnFkJSBmRYBCQJfIifzmYLBAQMxifd6cj7oXEDAKpCAQPxAQIOBj4XDloXGU4gvJmYvHd4pfGBgRYBHwIXDAAqPQAAq/P/5UBAAv/AAgMGCwIAXgAA/AH4A/AH4A2"))
diff --git a/apps/nesclock/app.js b/apps/nesclock/app.js
new file mode 100644
index 000000000..f4232d32d
--- /dev/null
+++ b/apps/nesclock/app.js
@@ -0,0 +1,266 @@
+{ // 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 sm256 = E.toString(require('heatshrink').decompress(atob('AFMf4EAg//4EB//++F//+8j//54RBiIRBDIoCBg+ABIl8AQMeGBEEAQMBCwV48ATBnwgBx+4gPj/0AHQOB///8ACBwE/+fghl4/AZC8BUB/ACB/wCB/+DAoMAKwOAmPjGAIZChxIBgODHwUgAQM4HoM/gED957B/IWB/4JBv/H4E//Pwj5KBh4zB4YCB+CRCj/P/kD/P/DgWAh/PEwPBS4MgGwQAGgUD4EDwP4gZ0Bgf4n/D/kH+YmB/Z+BgYCG37PBj/gv8HvEfgP+h8An8DWYYAGbYX8AQLwBh89+EH/EOgf8ZQPDwFgmF4jEMh5QBgPhwHAnlgnkHzAzBC4T+CwYtBmabBh/OUoPBWQPAPYMwhB3CIod8AQLHBAAisBgEffIMPwEcg4kBwbWCbQUYcIIMBFwPwgFwj+A/CIBIAJoBFIdwAQM8AQMGAQMBRhAADFQUBSgQdCXAKqB8BQBFgQMCjgZEWxTpBAoJSBAAQZFGYwMMcpIAGY4I2BDQQ2CE4QAGQAUHNAMHJoMHCwMH/gCBX4ICD/wCDgYCBgICBgF+bggnCIQgZC//AgbFBZAImBAQPgn///kP8H/gf8v+ABgn4DgJDBDIUPXgMBJ4KHBn8AvkPAgOD+AjB/hfBn4mBBgIcBA4IzCAwJDBI4IMG/AmBGILSCTAQ9BegIMDjEAwEPwF4GYSBBj4mBh4HB44mB8JnCGZAGBQIPvLQP7+C0BGYM+GYQmBN4JACAAlAfQM8gZAB4IcB+H+gf4z/A/3zGYN8GYSBBOgV/IAMfIAIJCgE9UoMEn42BAAp9CLwJCBCoICB4ACBBgLICM4KJBMYKoKWomAcYPgNoP4gEHOAt8H4/+g4zB86RB/v4EwN+EwPPwH/+fgn38BgO/n0D9/fwH7GYM+/4MCRwPnIAP4KAMgn5DBg4CBG4YZBAQP4OIJrBAQPgTYP4TYJIB8/PwPx+/gvl/BgOfBgX/wIwCvEPFogvCA4X+AQM/wCbBBILcBBg1wBgLpCLQJDCVAKBCVAa1FEwKkBgSjGAAUBFwN8DIJnGEAOBGAV7WQMe/8+BgPfBgYZCHoIjB+Y3BgF/cAJsDAAN4hCbBgeAWIPwh/8bIWfEwLmBv35+Efnn4GYP+XAQZBKAIJBMoICCn4CBAAfwvBkBnx4Bh+AgeBIYIANRQUBwEOgYwB4HggIsCnAYIkACBhgCBg7WBgJzC/jgEjwJBg+8QYPHBIPwBIN4ngPBDoMPDoI7BBIKJBwF4HwMegE8h5lBMQITBHgNwIw0NFgMDsAGB7ACBmwMEg4MBgIMCuxmHMYMIg4hBa4IzBvhSBj5ABBIJCBvBXGIYJkCWoJxEvJxBhyfBgaICvwCBNoIJBZARjChBHHBwS7CIAIbB8Pxgfw/vg/F/vE+n/eh//BgP/DQM/XATcC/DcIdoInBJQM/DQMP+f4g/sj8B4/54H3/94vf/70d//7x98n3h78P3F34fuj4MBwe//vA///uAJBEwP/GAPgh0An0DwEH+atB/5RBMoJNIDIIdBAQXAAQPwNwICCXYIvBgH/nxgBx7IB8YMFDgJDBEwIGBO4KPCEYIGBRgTJCdIN/BgKHB/gVB/4mBDIICBBgmfz8D8/nBgP9+AzCKYP/NoIZBEwUH84zBgP+GYMeIYRtCK4RQEDIPgj+DGYPgIAIuB4H8AgM/gIMB4F+A4WA/wUBn+HM4sAM4ZNJM43wv8D/k/BgOPBgYZCJoWABIPgYoQJBNQRdBbYaxDTZYMF/wMC3wMB5+/gfz950B/YMBgAMBwEfFwMDExoMG57PB+fgEIJTBn4nBh4vBgf74EAY4QLBAAkDDIMPBoLPEAwLpFn/nZ4SbB+DHB/oWBn9//BNB/0D+6bBBgUeBgMDz4tDewJNBZ4P+WoWBAQIrBV4JnBCwIDBwC1DLYeADIP4dIQZDExIWBGgIABZ55KBGwJ4BDgMDDgUGOgf8AgLPD4E/A4MfdIMHZ56OCEIRkB/kBYQYmBHAPwZAj2PhhaCOAQJBVAXwg/5GAV/4Eeh/wgcBM4U4AQMMGYbCMBgP8BgS+BOgLgBKQLJDv4hCBhF+AQMHVAIAGjgZCPgS1Bh5NBh5aBPAOAAQPgAQK9BAQKBBF4ICCn4CBBgKbBbARWBHAIJBAwI8BQAICBB4KUCF4QZBGwKoFWoSlC4EBGgUHM4UeLwQqBagU/cILPLewakBZ4ZhDV4IZLBgl/HgQACBAIcBEwgWB4B3B/AZCM4Xgn/vEwPhEwP4v+A/8fBgIWBDgP+DIZGB4CyCM4I6Bj6OBDoI/DJoxaMUIefFIPnbgP7FIKuFLQPgWIbMCWgYACj4MBIYQWB4ClCXARaCM4ODIAPgv5WBr/A/k/BgMfOgPHOgP4fQP/3/AQIQmBFoJ+E8EA+F4HwMMgJ9CB4Pwj50KQInH+8D/IpBBgOABgPwWoRaCHoQJB/hkB/0egEBgeAGoLwBAQUYHwMOv5+B7/gg/7LQP+/4mB77CN/1/BgPfBgPzBgIJBwF/x+Ag/DGYJ5BgEQAQJcBYoJFBVAL/EBgeBQJwMJ4IMBcoMDd4TeBEwI/BBgQAGEwLIC/gmCbgIzOUQIuDAgN/4DcFg4TBYQSBBDgIMBVYIfCAAQECn5+BGYOAGYLpD8BAB/DpCKgYNBDYMHIAInBgAtBIAYZEb4IVCEoIzEEIMDXYMAAQQACgwCBYQYZDJQJACQIwGBIAI9BQ4JNDAQKHBDoIkBJoQPBIgM/DIIdBLoXARARXCAoP4Cod/AQMfOwS6CTAUwLIdAAIM4gE4j4WBh/gh/nYQalCwBDCHgJrBFoV/IwJxCB4JqCDIN+v4jBHwMBwaJCvgCBhw+DUoUHBwJaBcwiODZIKBDOIJ0CJoYSBn7cBwYMB4E8gPggcAuAmBhACBj/B/kP+AZB/ivBDgL2B74MBEwbPEHIIzDJoIMBv/3BgPxBgP4BgP8IAN+FwJqDCwIADMwMAP4V+IwWAPQZ3BQIMPOwL/DAxYbBGYYJCh4CBgPAGYs+BoQXBNQQADKIYAFgITBgAgCCAQCCngCBgZCBgE4AQMEEBAABCIUwAQMMDYQMyAAhjCBoUORgYDBjACBgRdKABF/DYN/QYN/WoN//7WBAQX+AoWAh/z8ED/C9B/y9BBgf//kBXYPAAwImBBILNBEYLpDg69CvEHCwLZC4DYCEwP8DAIME/P5+E+v18BgPfGYZTB+EfDIImCgF+v4zBj4zBgICBIwV/MgZQDDIP+gP4n/A/0PIAMBIAPAn8DFwPAFwPgA4P4h/g/wEBGYRnDhBACJpJnG/8HGYPDBgP4BggZCCwP4BIJXBYoQJBNQTxCbYSxCTZYMG94MB/fvM4P7BgM+BgPP350BPIP4gIqBgE8ExoMF/jPBEwJTB5+AgfzEQP+f4M/3gMBSYIzBLwX4AwJqBTAIGBEwOAGAKbE/IzB/DCCDwM/v7CB77CBDIX9/7PBBgMHz6bB84tD4EfBALPCwICB8CrBFYKyBM4WAAYJSBv5QBn64BLYIiBYoYZDExIWBCYIABTaAjBGwM/DgKWBAQMBwB0DgAZB4E/Z4f8g4MBwL2OKAIMCEIJkBEwNAEILCEZwIADeyAGB4BwCBIPAQIP8gP+v4wBj/wg+DFYPAvwrBhyGCGYbCMBgS1BFoM/w5SBgJSCZIUfL4KBBBhDWBgKoBAA0HAQR8CWoMDMIJ1BwACB8ACB/ACBXoICBgACCn4CBh4CBBgIiBeoSHBHAIJCn48BQAICBB4KUCF4QZBGwKoGOgQGBDQN/GIInBK4RnBgEgagYTBCQLPLewSkBZ4ZhDV4IZMBgYSBTQk/MgQmECwPwJ4IJBaQaFBh/7EwP4v/A/0f8E/44MBCwIzCwAZCGYPwWQZnBOwIPBgAsBAARNGLRgMBUIPnFIP5FIP+FIIMDLQbJBWITMCWgYACg4MBIYQMBPwJ0CXARaBM4PgOgUfOgMXIAMPBgPHOgPxEAP+n6BB9/wQISYCwB+EI4M8jx2CgF+AgIPB/hDBOhKBE+P9IAN/wAMB8AMB/i1DLQI9CBIU+MgOHWQNA8A1BmACDgwPBgef4EB+/4gP+LQW/4F/+7COz4MB+4MB/gMCz/gj/j8EB+CoBnA4BggCBn5FBVAI8BQwL/DBgl/QJoMJ+AZBcoJdBEwXAEwI/BBgYAFEwLICC4ICBbgIzODYN/Fwd/j/wbgsBDITCBQIIcBBgKrBD4YABnhACPwIzBQoLfCGYP4IAP+dIZUCHIIgBEgICC4AtBIAYZEb4QVBn4wBGYYhBgA1BgEgQgkBXYLCEDIRKBIAaBGTAQ9BWAN/JoQCBQ4IdBEgJNCB4IZBE4LNC4BdB+CICK4QFBDIIVCj4CBg52CTQV8AQMMLIcQAIMOgEOg6EB4f4gf5YQhXB8BDDVYItDTAJxDB4JqD4Efz4jB44JBsCJCj4CBgaTCUocBBwV/QYKyCRwYwBZ4ZxBOgRNE//PbgPgBgPwh8AvEA4EcEQMCAQMH+F/gf8n4ZBV4M/572B+//FIQMBZ4g5BGYl/BgMf/oMB/l/LQImBv8PBgODWAQAMNwMAmACBJwLZCGYN/8f/x/88ALBCIVMAQMTAQMEFZhNBKII+OXAYCBgwWBgIzC54CB+f/75sB+7HBh7SBgJaFhgxRAA04DgkHAQMBf4VgQgYMEGwQZChxYCCwoMGEwoAHA=')));
+
+    Graphics.prototype.setFontSuperMario256 = function() {
+        // Actual height 26 (25 - 0)
+        return this.setFontCustom(
+            sm256,
+            32,
+            atob("DQgHFhMQFwMGBwcLBAsIDw4SExAUEQ8TEA8ICBYKFg4YExAQEQ8PERIJEhARHhIUERQSExUTFhsUEBEGDAkKEw0TEBARDw4REgkSEBEeEhQRFBITFRMWGxQQEREEERYA"),
+            26 | 65536
+        );
+    };
+
+    const spb = E.toString(require('heatshrink').decompress(atob('ABcP//v//+/4EBBIXAgH8AgYJLgfegE98AiBgH/+AECBJYYCAAMB/8/n/z+f/3/8nEzIIM/7/x/gZBGwMAn/wn//v4BC54BC4H/wEPwEA+AWBv+/MwIADhwCBH4PwDoMP8AVDNBMHDogABCgQABAgIjBAAX3AQKBCmBQBBwItB/wiBAgIJBgcQEAwEDRYgyCBwyRDEYMfwEB/AIEjwESEQoKHJwKrBVIqnB4CnCAIIACBwKpFQYodCFQRQBBgqQDEQb4BG4Uf/8HFIP4//+h9/wDgDh/vawLbChw2G342CgIXBv6PB+AmBUgLdGU4RKB/P8/+f//5//zwH/n4EBCgMf/j+DCYIADCYW///7fIOfCYQrBToIgBAIIABT4vAHYQnKAAf3BwITDngyCG4PwnATJgPh8EejwECBIsfwPhYIIABewMDSAWAh98gPj8E8j8HwATCg+egF58AERDAXA/E+j8B+fgh5MBGII2CHYITCAwL/Bh/zc4P+MoL5BE4JTDSA/xfgN/x/3DAN/94ECj4dBEQXgDQMDF4N/fQ0AEAIADBwJEBIoIAGh8PCYzaCAgI0BE4gTBAIJMCh67CE44TCE4oTKHYPwEoIEDJ5ZkB+ASBAgSYCJ5P8BQPH/98v47JEYIJICZIyCOQQuCBIJtFYAQxeCgJqBAgrlJDoXzBJDvHDpYTJd5DbRBIJxBDIN/4DHMHZByFFhRUJ5/v/gKBGAMOFgIPB+4DBn5UCF4gsHHIgODKgjqOx//HgQTGBIWAE54dJGI4AEVQIJICYXAh/+BwS+CAAQJCYQfwg//gf/+IhE/ABBh/8XpaNDh5pBGwQCBWQICCgE/DoM/CYMQXAgkIA=')));
+
+    Graphics.prototype.setFontSuperPlumberBrothers = function() {
+        // Actual height 20 (19 - 0)
+        return this.setFontCustom(
+            spb,
+            32,
+            atob("BQQIDAgJCQQFBQgKBAoECQgGCAgJCAgICAgEBAgKCAgNCAgICAgICAgECAgIDAgICAoICAgICAwICAgFCQU="),
+            20 | 65536
+        );
+    };
+
+    const kc = E.toString(require('heatshrink').decompress(atob('AC0P+cH/OABg88gEfA4kD8ARHoEDkUBz8A/8D/kB+Vgjfwj/gn1AjcggOQgAxGsEenEfxkI4Uf//ijGBx3A8/AgABBKQYBB4EEkECiHB/HAvPAgOAgeAg84g8/g0xwUQoEMsBZGnEAv0D2eD+HBzEgw0QoOImFsjkcgFPgE/wEcoEIkEAiH4DgKHCgInDv+A//w8Ec4EDNwsMgEjwFwCAKFBBwxaBOISaBgEwgEsgEyCYsQgEIgEEgECHoOAj/8g/+gBNCCAgAHGIQZBBAZdCA4NAD4QAGsBECXIc/gH4g/gWIJ6D4F/+F//k8n0cg8Px+H//B//ATwIUBhzcD/8H//H//hQ4LGCnE8EAM+j1/h1/EIPD/vg/nwhDYBXQMeGAOP2fHznj/3w//4IIMevjvEnjUCv8AvvA//8v/+n//CATxBSwMB4H9EYN4v88n+Ojvvh3/w8/wePMYUfcAP8j/+j/nh9zCAPBz/gRwISBuA+Bh0en8PMof/wLVBeIN4KYTeBQ4IBB4e88PcuBnBn4yBCoJpCgfwgf84J4B894vYSCh/8gf4cQUxwEY4DlF4Fj4ExBQ0BwB8BgBaBJANsgEzgEREIUMmEMjEGhgcFgEJTgOAgVAgI7ByEApEAkkAiQQGDowAB4OAsHAjFghlggUwgOYgHYbgTNBhx7BDQgJBIgMEjuCjnBxinCDAIAEfQP/wHAGIVH41n+cjjGRglIwUkv8Tv+YwFIsFgjlggbgCegMAn+Bbgf94F/8C2BgDjBh7gCKIP/8P/+DcBuecnfOj7rCwPvwAVBn+Av/wbQM+j0cg8Pg+H8/D+fA/LRCuAWB/whBh//w+B4fh8H/8E/IYJUDAYNwGgJUBIYXnnBDBnGOgECFAU4Kg+AnPAjjRD/0B//AGQPwvFwjk8v0ev8HL4MPwDNDEIN//hUBIZQpBCAZlBGQScBh/AgYQBnDsBCAX+h4lBVI8fPQP8j8/h0HU4KUBKwIQCGQJKCZAWAgOABwghB+EB/kD/0HAIP/4IQBj/4gEYaIRUCg4JB/4wBIYk/Z4UH/gfBOwWA8PAuHwCAP8h4yBD4JGDXQ874Ef4EH8EBFISUB4F/+BlBnEfjkH58H8///I/CPgLmCKgcP/+HnkD35WB8B2Bj0+gEGCwMB4eD/Ph/nx984uf8nn8h08CAKbEKgoyBZwKMCCAP/CAKaCgF4bg8D4CxBTgPAn/4WwRSCVIIQBJIQSCbgTJDgbRB/+An5DEv56ChkCh+Hw4uBAIKYDvxnBj0ACAJUBEYXgn/wIYN/gCIBjhlDgfDw/h54yD7k/h0eg8EgY5CKgP//n//1AgMggAMDMoRjBg4EBviiCAAUIgEkgETbwQTBAAQA==')));
+
+    Graphics.prototype.setFontKirbyClassic = function() {
+        // Actual height 16 (15 - 0)
+        return this.setFontCustom(
+            kc,
+            32,
+            atob("CQcIDgsQDwQHBwkOBQYFBgoHCgkLCgkKCgkDBg4ODgkRCgoKCgkJCQsECQkHDAkKCgoLCAkICgwJCQkHBgc="),
+            17 | 65536
+        );
+    };
+
+    const kcb = E.toString(require('heatshrink').decompress(atob('AH4A/AH4A/ADkP4AECjwCB///BAMD+AOBA4P/+F/wAOCAAMH/AOSFIM/FgQzCgPgPX4Apg//PYIADv//RQIOZAFhKdBwwA/ACsfAwsB+AOLvgOFg/AByFwBwt/Bwt/C4YOB///BwinBBwgGB/y8EAwi8CAwwjDAwYjDCgRZDEYP+LIgOBNAkH/xZCgYHBvxZCgYXBgxZC+ZZFj5ZFgZoF4ZEHAwhoCAwYbCAwwjDAwXxEYvwNAv8NAv3NAvwaItwcCQOMBogOBAwoOHAH5KD/EAn/gAwMB//ggf+BwU/WQIODUoIWBXga0BwCADh60BAYIOC/AbCvAGBj8BFQMHwAzB8EPBwM4BwMeEwLlBBwXAZgIODjhBBBwT9DAAQxBA4uDBwwdCj/AFgkBKQI7EBwpIBKQJZDMwPwLIUAJAN/wB3DKQIzBO4SFBRAIOD/hVBUgd/4Ef//AUgRBBKATEEEgYACJYL/wABhHGgLuCAAa7BOgQVDP4IHDXwYACSgIBBEgYbBngODYIK8CBwQTBBIIACb4MABwWABwUOAwLgBBwIdCh4OBAgInCHwLfBgYYBbQMA/j9Cj5ABh5ZCgZrCboZ6Cboc/HoQWBe4JqDn/wgLuDeIaAEDAKPEE4KeFGQb1EP4amCTohlBGQ0/UgYyQJAMfBIYyBagIYCGQTbEJAMfeQYyBQIP/VwQZBv4BCJAUHDYILBj4EDBILHDEQN4cAsDBwIGBcAgACDoZpDDoYACAgIJCLYXggZ6En7UCQAZZDPIZoDRAa8FgLqBTAoA6v7iFLIJKENAJvEMAQWEh7gEM4R3Dd4LiBv6GBBgPn+DdCTQQTBUwICBEQc/GIsBAQIxCJgQCB/Ef/AECBIV/K4MPfwUDGIQOBjwQBd4YOBgA0CdQMcBYJDCBwIiBn4RBBwZbBDosPFQInBFgI8Ch4TBBwKVBBwRUCKYMOAgKJCv/BEQQRBKYIiCJAUf+ZjCNwX/AYV/BwKRBWYagCbIqrDAoRJBBwkcMQLRE4E/CwkcV4JKBBwXH/AOEj//aITvD4E+BwjoBBwhXBO4QsCAQIOENoIOaAAQOEACc/FQIADUA//awIADQQLSCBwg/EBwIWFAwKwEBwQtEv7dDTQYOFIYLdFDwJaFh57GAFpjGAwJ6En4HCUIRxCQQcDAwZzCPAIeENAcfAYMB/xsDCwM/Qocf4EHOwl+gCbF+EPRYsBRgt4jgGEgbtFAGsBSAQACnEeAwkHwD1FNAJTECgJ5BCofggZ/DgP8SAIeD/4bBW4UBbQUHXQawCW4IACGIQGDEITZDFYI3CDgjwDAwgArgcAkCIFSIJBEwF8Bwn4S4sH4CmFnkfFgvh8AHEj08aQvzaYsPvBLFv4zEGgIzEWwIABFoayCSgYOOFgQzFg47G+47Fj5ZG8ZZFn0eO4vBQwt8h5vFwH4UgqeBBwkAIYswgT8vABbhFPIJpFB34OugP/AATUCj4HDwAOXNH4O5AH0EA43gLhkHBwsD/wNF//AA4l/dAgOCEgt/CosHRA18RX4AHg5XFKA4O/B0IA8gL+Gn+AKYv4Bwt/BykDFg0eMVkMAwsPVwsH/hKF/4OEgP/Bwv//4GGNAl/Dgs///gAwcfAwsP/59Eg//SYgGBHAhGB/xGFH45qFIwoOBOQsPH4gABXow0CKIg0CEAhtBGwhmBAAJTCDgQeECoZGCJQIWEFYYtDSQIACOQIkER4QkEHgKMBAAaXBEIQZCwAzBFAKmDWAZVBBwKiDv4OCKoQWBByCrDFgYWCLoOAa4YGBLJBoHO4yGFHAKVGUg4WENgQWDCoQtEf4jgFDwQGDAAN+f4oANj5/CAAUDHAaZDSwQACJQIOFKwYkDBwqOBBwpgBAwisBBwq7DEgikKWYzRDVgrRF4AOdd4v4JQpkCd4wAaj7aCPwUHAYUfRoR3CKQLRBV4ZGCV4YKBEIJdBBQRkBagKVD4CgCEgQdBBQIOBDIKgDZIYVCBwIkCWwQoCCoYOCAQQODLgIVCBYXgVwYODcAgCBcQYsCd4oFD74OF/JZEAAKGCGIfhO4hxBBwTgDNIKVDJgKkEOIIODQYYODTojGCv4DBMoQAEXwQADg6vBAAkOf5whDG4XgfwQhBfQYDBGALGCAYaKBCwIDBd4gDBfxBzCwCGBBwYwBBwIwBBwPAfwQ3CCQN//kD+CGBBwWAv4BBBwXwh4QBBwaECn4OFI4IOFj4OC/E//wdEZQQdDfwgOEagQOELITvDfIT+DAAWARQQACbgQHEfwfvHoUARwQvBWYR7BwYkCZwa6DAAc/ewwAVmAGFh7TBAAZcBBwqYBCopJDAAJbBBwpgBBwhiBBwiXCBwgVBBwgVBBwgVCBwiqDCooODaQYODAoO/BwYVB+YODCoP8TggVBWYSsBFYTRDd47+GHQYABbIIObFgM/A4mAX4IADe4jCGEAKkEByxrBBws/+D+F/z+Fg4VFAB8DOwI8FMAcB+EPVYIABAgPAcIZ/B/i+BGoLCC8KcCSoX+BQPAUgfgBIIjCAgIDBGgKaDCQIOD/h4BOIK/DEoIOEW4IOFKQQODBYIOC+IOGj4OH8AsEj/+FggOB/BKEOIQOFMYQOCHoRoD+AGCGwIMBRASGCBwKICUgIOBOoIABVYIOBGgQkBh4vBEgbNCCwS6Bg4vDFYLCBBQMDfqgAGKQJuBAAQzCA4aLBMAZECPwY8CRogcDKQYVDMIaUDOAQrDEoc/A4YlBTYaOEAAPzToQ6C/goBwBQEv4OBEgX4EIOAAQIbBwE/BwN//wEBKoIOC4YdEFQM//gdCF4ODfIQOC+BTDDoQ9DLILRBQ4aFBPQJ3EaIKACToaPDVgZ5CGYKtFaQgkDCwirCAAQtBeiEBF4i6CHwYpCJog4CdYQwKBxcfFIIODFIQODXQILBAQSeCBwiHBWYbjDTQQRCBwiVCBwbCDBwarCDQbJDHYQADJQYADLIQADWYIOETIQGDXQQOEZwhICBwrXDIAgOEbwhHDBwojCBwbSEPgK7Fn7oFgLgGg7/GABMPEArQDY4XgIoijBz5UDYAYWDTogWBXIZyCZ4aIDdgR6DEgglCbwbgEBwoqDBYL+CAgV/fwXgv/wMQIOB/wuBSQYOWFg47CDAOALIfx/4OBLIwgBLIp3GQw5wESoIlFUgIWB/azEg/+VwLzDh5NC4D5EcAjvIABhsCAwZSCBwhhBEYh/CLwIACPgYACfwRBDQwapBKQJvC/EDfwvAn7+EWYSNEZgLCC/l//z+EKYPhJoQ5Bj6PCDoQJB8ZFCAQL5BGAIOEMYYdCYQYOBwJMDBwP+AwQzBLIZ5DbAgkBfwjnCfwjnDAASPCOAbnDEobnCEoalDKAgWEDgYHCAwoAPFQMPfIcfwEBFoYECj5DCMQPAgYODAgQJBDofADoqSBE4IHCh4CBuBMUACEGA4wuGHAQADgafDAYSRDKAKwBWoZfBv5dBPAb0BPAt/eAIOECoZ9Cvw/EPoYA/ADkfUJR/DOAqEEAAV/BwyOBAAi4DSoYOHWIZCC3wGEgPzIYs/n5RF+IOFnzwBIQngKQt+aQsH4BDF/gIBc4t8Bwn4EwJREwE+KInwSwpQBKQgMBCAJRED4RREFwJREHoRREJgJREBIZRDgBSEEQJSEGIRSDIARSEeoRSDBYRSEDQRSDFIZSDKIJSFAH4AZUQLvFvj+FB34O/B34O/BxoA/ADBeD/AHCvwCBh+AAYMD8EAgIODn4CBj4GCgfwAQYLECIQaDEAQpEF4Q4DTokPAgKsEAgIJCKQQiBIQYiCKIYxCKIhACKIZPCKIgMCKIZSCKIgqCKIg5Bd4pIBfwxREKQRCEKQJREIYPhBws/KIgOB+ZREKQJREKQP7KIhDB/ziF/5CEBwP8Bwt/BwsHIQoOBKIhDBBwxCFIYJRFAH4AINpB8N/4GFcgoABOg0eAgcYQYLGDfIIODn/gFIMBEgMD/8PEQMcIoXwBwkHBw3/8F/BwcPFgq6CHYkfIoYEBgZFDgBvB/xoE+CAFv///iGE///fok//55EgP/EgglB/6PFn6PGAGs/cYpbBA4hTBUoIGCYIJyFAwRrDj//456DCoJ7CCwV/AYMDTAUPFIQDCgKjDn4CEBYJEBbgQWCTIN8JwYEBh5GDbgQ+BNAT1BdAJhB8D6Be4JIBJIMPgE+O4Q+B/ED4DiC8EHwE8OAPDMYN4BwMf4ED+AFBvAoBGAIUBC4I3BEYYXBIwIjCAQI1BEYdwAQIOCjkHgA1BBwMBBwICBBwscBwwsCBYICBhwOBNwI7BQAQJBHYQBBGwJKCPISOBnEDwDZBe4IFBniNCRwJ3DBwQ1CBwhBCBwakBIIRKBwLCDAANwLoJBBBwRsCcAfwhDbDEIjZBfoL6DKwKQDEIKNDA4U/wDECAATWB/wGDc4QYBFof/CogeBfoIAigI7EFoQ0FgZMBBwpLFBwIeFBwIeEAwIeEAwSKCgF/ZQYGFBwQGDDoQGEVgIiCAAKABSYQcEAwYcCh4GDJIQFC4YOF4B3DBwWDBwQsDBwY7ETIQsGQYIOEDwjSDA4Z+DJgakDd4KkFGwSkEQISzEBwxGBYQpGBSoIADg5DDHwa6CABs/eQggBF4pHBF4xNFbAp3BaIh3CBwgpBBwpoBAwgpBcAgOh8A9DBwP+SYOAv4ODn/4MoQOBAgIOFv4OE/4EB4AOCv/5eoILBNAnxHYR3EBwI5BAAahBegSGDcgIOFMIjgCEoPPUgYlB/izDgEf/+HGYTSDBILkFbgwAUEYJBCAAJLCNwIABNIYzDOwgcDMAh/EIYSOEFYhoDQwuASoolBEgTQBEoQDBCQKkCZ4QSCBwSRCaIQCCKoTvCMoT+ESwb+DBxIdGOYIsCbgYOCIYJkBDQJvCMgRZD/ArBLIZoDLoISBBwRdBO4pzBG4IOCH4QOCn5OCCwPwAQIVBJwcfbIc/GAN4f6YAEn4oCAAUHdYQADLgQADSogODUgQODd4wGEFIIOFDQIGEUggACWYYADB0D+FAQT+DAQRlEv7NBVgLgDP4K7BBwLGDv5oBBQIWBYoISBAYP8cYUAgKGGKQg/CfYJ+DEoQACW4QiBAAJGCNIjSDUYgWECoZTBFYYHDbYwAVh5ICAAUBEg0/MwQACMQIOMWokAgzEEPwqVCRoanBd4x4Bfy4Oc/y0DBwXgLIJjCBwZjDBxCGCBwiGBBxkf8AODPQIBBBwV/YAQYCgbzDn6GBjzMKg6kBd+oOFh/wd6I2Bd+QsGVwLCEAATRDMAYOfUgn/4DvBBwY+BvAODv7UFgapFgEEcSIAEj51CAAUHOwLwDgKMDHgaFDJYSjECojYCbIhqCFYQWEd4xBBAAX4fwYCCIgM/CQIHBEoIkBK4IDDv5HCCQJJCH4TvDG4QWBBwRkDBwR8CZgQOEZgQdIwB5CBwX4R4gRB4BBBBwRKBMAQOBAgIOFn4OFEQIOFh4sDToV/SAZWBgZ6CSoTwSAwsHDY1/ewbpCHIQADSAYOWNobvDKwIACcAYADD4IGEWYYADWYQOUFg6pCAAP8K4RKFO8gOHawQABWoKGFboaGEO7oOHFgw7HJQwAOgIzFFgqkBcHZKFcAYAPaQyJBPwprBdIhNCdAoWFBwQ7EJQYACLgQlEFgI8EYoQOEEwRTFv6GBC4oOFn4ONDowsGCoIOBUghKBcBgOBaIvABwp3BBwqGBc4wOERoSDBCoiDCFYYAWfwpZBNAh3BNArZBHYg8BBzpZEOAUfSorOCOwa/DeogeDPwIABDhA6DToqOBO4oVD/xNBGoJZC4ZKDBYPwEAQOCCQIZBFoIDBHwZoCGAISBBwMfEAJsCKYJlDv5LCX4jHFg5xDAAU8cCpKDPAjCFIALCF4CNEBwQGEBxIdGFg47GEoJkCj7iEKwQOBAAYO7h7CFKwLCNACiCBfYSmEfwKOEJQKsF4DgFUhEDBxmABwr+HgAOEQoUfCYZQFA4ZDD/wHCDwYPDfAajDMQQWDFwacEIoQGGBwd/Doh/EBwIGELIQUCEgZBDHQYUFVYhYDUYq6GaIIGEUgIsDYRTRHJYqHCFwZFDDAaWDFAS9EMoQGEDAIVEABaxCQAb+FToJJEFgJ3NBxosBQwosBQwhgCZAgABIYR8DFoZ1EfoxTDwCUGRYomFPIRRBYQqVBaIpZGd5B3FJgIOUFhA7EKQgAUSwT1DNIaGDcIb3GUoT3EUoRRFCogWCSphZBd446BBQT+BQwJHBA4KkCG4QwBBwJ6DBwZlCCwIOFv4ORFgQ4BAQZdCBwN/PYROEBQJCBDQJoELIKNEHASGEHAT2FP4ooBEogkBCwpdECogtDJoQeDNYYXCdwYAOgIhEEYQbFg5GDTAaVCBxb+Fd5JwEBwqzCA4gOcFg5lBLIMPKgZZCfIYOQ+EfVYYsBeIKQDv/4v4ODfwbtBc4iuDBwaVDb4TmDewSmEh78EVgbTEgIVFCwTaFn4rEAC5TCEwY0BNIq0DMIpMDOAaeDbAoVECwQrDGoaVCAAKmBcAolBHQIKCPQJ2BI4IHBBwI3DGAIOBY4Y0CMoYWCBwgpCBwv4DooMBFgY4B/wCBRInwfwKJEIwbrDNAgABwYGF/CGEVwQOGP4n3HIIlD/jsCDYiHBCwfggaLBFoRNCAAIeBNYZ1CdwYAOgJ+CAAd/AwsHGAiYCFQqkEBwYlFUgJhEM4jvEfwqNFBwyFFBy4sGKwJZCKghoBh5IBNAgqCBwa0BPQQTBgIyCO4a7BSIQ7BaQQtCPwz2EGoV/A4YeBgYWEGoLuCNAY5C/gWDOAWDCwYlB+AKBLwIWBAYJMBIgI8BI4RyDAAI4Bcosfco1/LQIADgKIDACEfFYsDHQc/IwM/EgRWBwBNBGYJGBH4N/IQTsCBwIZBQwWAv4lBQwYZBFAS5CCQKkEcQazCEoTCEwBDCv/5EoZGCJYLqBWYN/8AfBw4dC/wuDDoXwaYayDBwv4GwRZBAgPAKgZZB/xjDLIXgdQSGBj4ZBdQSGC8ARBUgUHDIIWBWYU/DIKrDgAvBgEQaiEDOQL5FbgsPYoQADG4YOhMgQOEAAZhBQYQACDQIGEPYYADOgIGEFIIObFg6oBCILBBJQaGrg7CGn7SGIoIATn52EFgJnDGAR+GO4oOGCwLCMFoIsEEoQ7DEoUBdAyDEGgQADv4OFFIIOUFgUfHYpKHfzxgFBwisCv6NFgYrFIYjYRgY+BPQoHFEgLdCBwaoFJQQ5CcAhIBBwhmCLIosEM4jgEHwZoDHwToEHwR4HA4guGLobTDIoY2CBwZMDBwQ8GZRpZDMQT+FCoLREJApQDK5SzFRgYOCAwg7BAwsBAwoAWTYLvFNASSDJQbJDNAi6BO4qGBBwggBBwofBBwvga4hsCZ4boEBwrwF4AGFJgQ1ELgItEEgQ8DDgUPeosBAwpDDAwYOCVwgOCA4iOGSw6lCV4hxDJQT5HAwYWBRwuAKIYODFYYOCCooOBYRjRGMQIOFLApQCFgReDTgQFDAC8PVIYsCUIYLCn4yCgadBJQJACAYRZBCQQ/BBwIeBUwJoD/BkCNAfhO4aVFbAhxDTojZCOALJFDwfAe4orBc4iPDUoYVCbIgOCXYYzCDgQlDcAoeBCoP+HoLREwDgF8AZCBwQKBLgIOCGASVCCQJcDBwMfJwS/EYQa3CAAd4c58BGYQADn6KDQoYoFcAY2DRYiqDI4h3CVQacDFwaVHUgggCe4gYCfwzKEBwTZDaQ4OCEohaEAAJsBIYiDCAoRxDJQSADCoRoGO46VGaQQODVgrvDFgjCFd4YADuDjPAAkPDosBKAcPNQM/MwUDH4I7EOQT+DLoIOEQQILBBwRzDBwTECBwi8CBwafCBwbSDBwThDBwbZDBwQcCBwf3AoP7BwYAB/w4CdweDBwvgBwv4I4QOCRAIOFwAOFTwIOEAYIOEbIQOEbogCBXYQOCj6zDCQX4WYSwDZw7dJAF7ADWga5DAAQOeMYtwjgGEg4OsQ7zMFYoLgCAAbvDBwf/wAOFeYSsFA4kD/70Fg///gHG/AuGIwquBA4s//5OFv5OGA4JOOHwpOBDwsHBwoHBBwsAhiydf1gOPQQIAD+CpBAAgOdQzoAHA==')));
+
+    Graphics.prototype.setFontKirbyClassicBig = function() {
+        // Actual height 58 (57 - 0)
+        return this.setFontCustom(
+            kcb,
+            32,
+            atob("HhgcMiY5NQ4XFx4yExQTFCQZIyEoIyEjIyEKFDIyMiA8JCMjJCAfICYNHx4aKR4jIyMnHR8dIikfHyAXFBc="),
+            60 | 65536
+        );
+    };
+
+    const zapf = E.toString(require('heatshrink').decompress(atob('AH4A/ADsOAQMD4ADBg/+AYN/BwX//EAh4CBAYP/8EB/+AgADBAgMf/gOBj4HB4f/EoIOC/8/BwuDBwoKBBwQsB4AsDHYPwHYkDCQRKDggCBgIVCAFg3DAARRBHApgBTQQODToQOLDoosGAC08AwrYDHYo0EJSHgJQoNEV6cYIwwZFgbfCF4gOFg/4g4GDsF/wb6BAAM+BwP/KYfgv//BwUB/0HMgIOCj4OHNYIOE84GBBwYFBBwoGCJYQODQQc/AwKQDFQRoDIAQcDgYGCBwZHB/53BmAVDw/4j4ODLIOPJQIOBNAoODLIUH/oOGO4sHwP+KYQOBoEf953IJYZ3C/zwDQosANAphDDgwODPwZ3F/jvDNAYOFLIIONvyrD+IOBIQd4O4NAAwUEd4JXDfwYGEgIqDAAUeAwoAPh7kBTgREBGgJ4DSoPwh/8BwS5B4JcBNIf8j5NDNIPhYQcPSoKgBXQnxTwasCx40CBwX4mF4GYQ0BwEDBwMD4A0BgE4BwM4HgPAgIOCHgIOBjAOBmAOB8AOCc4QAC+DgDAAQdCKAQdDPAQsDwAOCHYYOB/DTCJQJxB8B3Cn/4FYZoCNwKGDj/8IoKVCBwPHBwKkCh/4PAKzDv+BBwPAAwLOBIYLyDd4IzDAAUDEgbpDc4YAdgIpFHIIHFK4IGEVgJPDCoReDI4RtEewYlENoKLCBwXwgYOEjkAhwEBE4LMCsEAngJBbYMGGAIOCAQL9BGwSUBnynBDQI7Dh4uCHYUDLYZZCv5ZFj5iDbwODCoa4B+BaEd4IVEHQMHYIsBCoieCJALXFMgIVDEoKXEv6uBRAZeBfwheBMYJLDv5yCFwRIBaYIlCCoJbBZgZIBRwN8CocDwChCYQMAmEAhikDgbCGnDOCgEQBwIfBQAg7ES4Y7DXoZZDZgaIEXoKeFv6eFEoIkEgEHRoYAJggGFg5JEfIQzFJQJCEGYIWFv7CEEgLCEh/AAwIlCgf+MAIlDv/wAwJ3CDYOfBwn//IOEDYPfSoaLB/v8LQZPBQgI3BTQYEBcAbwBYgQOB4EPBYLRCjEAuALCcAUHBYLvCBwU/4AdDg8P8AOCj/ggZuBHYeAIYIsCj/4CAIsCNAODBwkP/E/+EDQweHTYN4SoXwv4fBBwUMR4PPZQi6Bfwi6CYQgOBaIjYBcAs/CopMBEgglCBwquBAwjbCComBBwv+g4OEPwM/IQqWCIQfgj4OE/0BHYgOBnwOFb4QsESgQABXgIkEVoL/CEog6EADhsFTQX4HIy4EBwKiFBxAdFFg4A1JgI+EAwIHEbAJjFAwT3Dj4GCNYUHBwYWCv4WFFYQABPYLXBAAeAZ4IGDEoI6DAALiBv4wCn/+GYKcDj40BvjyEGYInBAARiBNgkHgEOPYlwgAuBOgcAhgOEmEAbwgdBh4dGb4kfCAIWDgY5Bv4tCgJZCRQQDDO4yGFDQKrDSoS6EUgSzENoQlDGYIlFQYS7DQYYWCU4TSENgl/EYQA/AAsgYwIADh8HeIkB/BmEToOPdQjSBaYgdBz4sFvrxEEoPcCosNw40DgP8+Y0EaIQ0DXQQOF45DGFgsAno7Fg/PBwv8LIwkFO48Pw4zFuE4a/4AfgP+A4sfaQwO/By9//4ABdQUHAwX/wAOuQ34OpAH4AHkAEDg/Ag5iGuBiE+EOAwcDaIJrEn/4jgOF4fABwjwDBwf/R4v/EgkB//8BwkPCoolBFYgAsh5XEAAJ2BB34O8AE0YAwsH+A8Mj5LFgP/fws//gGEgYONDo4sGHY5KHLIwAOGg//IYt//5CFCosP//gIIn/IQhuBLAv//wqLn5mFGIwqGKoIqFj6ZGGIoOBSIsBOQoAKvjPGKQoGBGwhZBJgiEBAAI3CKQIWFCoSVDNAIACQoglEEgYlDAwZ6CBwwzDGgcfGAUfOgMBJwc8AQMcQYqGEhgCBjBsDBwScDBwQdHfQaXCG4RkBBwRKGNCqGHSo6kGWY7CGEoZVDCwQ6CFof+fwoUDAD8GA41wAwsHBwx0CX4cPAQMDMIYOCnAONvAGCj4vCBwT/DPAcfBYN/BwUDYQqsEBwS7DBwbKDBwSzDBwT3EBwUfBwozDd47+JEggOCEgboEJoThEEIQOFQwgACSogACUgYOKYQYAggPAA4v8AYUQQQSkDCQMfUgiYCZIbgBv7jCZIOATALJD/EB54OCBYOAnAODUIMHj4OEgFhBwQzB+EOF4Q/B/0A8bCDBQMcn5KCjgJB4YODLAM8BwsHBw14BwsPwf/BYIOBgf4n6GCj5TBBwj8CBwgHBQwIOE+AOKEYIOFO4P+Bw3gBwakB/gOEv4EBU4IGBBYKdBUgY0BEALnDAgKcDNIUH8D/HACkCAwsBKIQADn4tDHAJKEn5HBLIcHDQJ6BYQILBDQJjBQwTvBBwKGDBwSVD/0MFgKzD8BwBWYf8hiKBBwcAAgLsBgEegAOBBIT+CAIIJCCIIQBBweAgI8BDoQODDQQCBgZxBngODv+Ah4OCdoP/77+FAAJKD/7iBBwn3BIKGBBwiGD//nBwaDB/wOG4YOBWYV//g8Be4SSBwYYBYQfwGwKrCgILBIQYWBwDYEbYoAaj4GFSwQAEv4GFh4OGIQ0fBwsD74OFvIOFj47FgfBBwt4BwsPagMYCofAj77BCoYOBnAVDFoMDBwQVBBwN4CobjCBwT3DaIUDfwYOCZ4IObfgIOEawIOFAwYOCh4OFgIOGj77Bn8PO4bRCO4ZFCO4YOC8AOFviVEIoIFEAANgAwsEAwoAIhwGFgZNBAAl/8AGEPQIOF/7wFPQJEDh/wQw2PQwv4/40CbAMHFgPABwXgsE/Bwf+hj6CBwXAAgMcUgYECBwfhAgIYBDoQOJBIUP/0eBYIJBMoPhOoM8BwcfwEPBwhbBJQQOCA4IOGO4YODQwQOP8AGBUgQOBS4SwD4AGBYQR3BSgJCCNAMAn5CDn/AgYzDg4oBE4IkCBQV/aAYAfnAFEdIQHEAwI7DKARvDJYIGBLIYcCNAZwBA4R3CMwIACBwV/AwQlCEgakEAASzDBxQ0CGYZDCIQOAj+BBweAgYBBBwRGBmEAjgOBAQMHBYIOCF4IQBhgOBjEAhwEBBwYfCDoQOBj4dE4EBK4N8HYXwj/4v5KD4JZF/hbCNAYOCO4f+BwTBD4CVF/iIBZQc/4CmBYQf4UwIkCgEGSAT3FCoYAmgb8Dd4YyEK4JeCIAZeDBwZIFLwgODLwwkBj7EBBwZ4BBwqkEBYJ/BF4QOBgbCDBwRUEv/wEgIOCFIS7BBwgkBBwjqBBws/BwoBBd4YOBGYJKCBgI9BLIc/+IkEJ4JuDBwXjTokD/18Qwk/97BF/4cEBwKkFDoKkFn66Fg7QFgF+AwsHMgQADCowvDAwqOBA4t/IocBwD5FUgRNDj/4UgIwCNAPDSol//ykG86zEAgIOEGIP3VgbWCAALRCcoIACBwgbBBwcAJAMDBwXAAgUcBwICBngLCAQQECBwgBBBwgdN+EPbIIJBJQfAh5ZJNAJZEO4gOEO4SGCSpHjBwk//izEGgODWYkP+BFBJgIABiA2BGYQACE4IkCbYYVDAC0BEQpDBA4phBgEwGIZXBS4TNBK4OBLIZmBNIJoCJ4P/4aGE//+n6GCUgSHBUggOBfwYHB8IOCgP+g/+gl8BwQfB8DvEgF+gEMd4cDKAIOCHwLtBBwUYBwPADos4DQQCCg4QCBwJkBEgJKD8KGBJQZRBAAJZFd4gGDO4oOISor+ESoIABWYr+EGgbTDEgolDKYIWFdIgtBXIQAvZIIBBAAUP+ABBAwSeBwJLEn/4j5wDPAPDKYk//gBBBxf4BwwsBBwcfFgLCCSwQBCSwfAgazCAHMCSol8gFwSocf8EHSosATwR3C/EOQwuBPASVDngOFWgYdC/4kCSof+SoqdESoSdDSoSzDAH4ATNoZwDPgQACVgKLCAASOBAwiOBQgYABv59Fg4OGUQjgC//gBwqlBIQjADIQYOFZ4JDEgf+KQs/85DEg/8v5DEv/HBwkP/k/IYn/wZSEh72BIYZCBAIKUFj5DDQoIfBIYYqBD4JCDFQJDEAgJMBKIgJBIYYiBNQJCEE4TIEIYhPCKQYLCbQgaCIYYpDZYY4CIYgA/AGH/gb+F+E/ZIYO/B34O/B24A/AF58Cgf4AwMH/wDBv6HCn/gSAKHCgYOC/+AAYMf+ACBDoUB/4CDBwQLBCIQaDEAYpBBwIvCHAY+DIYI4BIQYEB8AJCIYhCDEQPwE4RDDAIIODIAJCEDYOBKIZDCIQgOB4ZCDIYRCEIYPHIQZDCBws/95CDBwP/IQhDB/5CEKAJCEIYIOFIYJCEBwRREIYJCEKQP/IQhDBBwpDBIQjXEIYgGEAH5nDK4sBQgpuBQgp9BAYMYRgaiBg6lCTYKmCFASiCQAcfSYKABTwKEDTwceEYP7BwYCBv+/BwQ3Bg+BBwYvB+AsDBwMOHYYdBgPgJQYsBn0AjhvC/EfNIkffopKBfooOBdwoOBfoh3BBwt/foqVBIASkDVgqDDEogVFfF49FgZqBLYgGBKgk/A4KzCPASBESwQWEOAV/MgUHBYV/FoT3CgKYCj4hCg62BgYwDagIZBSQYlBg4VBn4/BEoIVBj4uBvAEBNAX4g+ADARRCngnCMIP8gfAAIIVBeIMcgAQBMAUB8AfBOAXwhwuBOAcABwJwDBwXwTgI9BBwMPBwJTBuAFB+EHIgMGBAIXBvhoBEYQ1CgBBBBwVwOYQODPoJzBBwiJBBwk/FwIOCnBwB4A7B8DnCKYPgBwJoCAoS1BNAhZCO4lwRoX/QwQ5BBoNwKYN4BwJrBgKkBwF/KASiBnEHAwMGBgIQBO4bRBjznCjwqBIYRwB4DvCBwU4IQLqCLYIPBgEDCwJIBIQL3CUwYABvxiBUwIABPwQvCEQX/JYIADj/8AwgAZnAGFcYQAEGoo2BBwsDBw3/BwsfBwq1BBwkBMQzaBBwkP/CZCDgX8YIIcEwEYBwd/uEBBwc/wYqEh/gmAjE+EDIAibBBwixBBwiyBDorBB88AHYQOBL4JKDAwIXBUgQOC//HBwp3DBwZ3DBzsfBwoHEQwYHCWYgHCWYi6BYRitBBwq8CfxkfBwsAcAgWCBwyVChgOG8AOFhwOG+AsFh4HCv6zvB2nAh6kEN4NgQwsGQwnABwUYUgYOBgIOEUwIOCDoIBBWYkBFwIsCHIUAg4OC/EHJAJZF8E/O8WfBwv5BxcH//xBwl//0f/76CgZJBBwIGBL4P8E4J5BEoQYB/gGCDAYkCDAYkCAAcwAwoAjMQI6EIIJYDPAZRENwJgEDgJ+EVgYWDVgbzBfQIGC/wOCn4HCSogACBwV/aIozDcChDELAIvCIYJCBFAQODJwQDCgK3DvgCBjyJDBwQVCgE8AQMcAwQLCBwgLCBw6RDBxQdOW4c4JQsHFIJZEQwZoDHAS3Cg4ODAYKCBDoTlCv6VE4ACCBwX8CobKCKYYAQCgcYAQMONAsANAakCh5oFcAK6Cd5wO/ByoKCNAaGDO4bvGhgGCgYOCUgYOgHZd4YQsPLJMP+BzCO4YHBQy4wCv4GCFAUHBxROCgYGC/wOCn4HCNgUBGYo0EAwRDDQQYlCCocAj4rEFoYGEABqzDgLgJWYbCDOYSzEBQQDDSpYO/Bzn8gfwgIODgEeeYKVEAIKVEUwKVDBgLXBBwgBBBwodGBzDCCBwZKHLIgOBj5FBMgXggf8BwIKBgkAv4OCPYUfBwf+FYP/BwaFB/4OCgf/gE/BwQACBIQAEjAGFABggDC4RXBEwRoEAAKGCNAIABO4ZGCaIj+kB34OD4E/YwIOCYIL+ISoqmBSoQMBhiOBBwgBBWYi1DBwoACBw/wBwpGBBwkBYQIOFLoQOD/4NEBwP/fwsfFoIAjv49Fn//Fwi0CR4JLD//+Dgi6EZQgWDAwRzBMIYABNYUDbIY6EAAI8Cg7vGGYT+TA4ZDBLAIpBn5DCTgd/BwQKCAYcfIwUHBwTBDngCBjgGCgYOCAQMHBYYCCuALCBw8YAQN4Bw2ADooOH4A7CjxYCC4JKDT4J3CLISfBQwRkBBwkPCwIOEAYIOBQQUfcoIOBdwf8BwqhBBwYqBBwoACZgIGEbYIOHHYQOCU4YACvAGFNwQAEuAGFgQEDhgDCgIXCSoKwEhxVDBwQ4DnCGCGoz+DSof/AASVDAAQO/BzuAjwDCQwUBRAKGCSoIBBSoakBBwKkChCmDZYjfGWoYdIaIIOBaIYMBHYjCBJQLCD/EB+ADBUn7CsAYMfAYR1BAAN4UQrCDWIaVCUgIABUgbFDZwICDBYjCBAALCCFhzCBAALCEA4SV/B1iOCYVoUCYQbICFgYABjgsEEwPAYQYABvjCELwIOBMIf//hoEAAIOOwAOFFQIOMQgIOFUgv/K4IzGBwqEBEgwOECoIOE/zCFAAbCDAASVFTwQGFYQYADYQzRHcAzvHfw0PBQQDDTYpoFB34OcYoNwgIODgEHAIKVEBgKVCUgMf4CkDAgP/gEYXgc/doQACg78CAAY6ECoT9DagIVBKIYsBKITVChwVBAAIjENAv4O40DBwvgPIR3Ev4OEMIQODBQJEBQwhTCBwRlCBww1BSoiPBBwUOKoV/BwsDBw0fUgYHCBwSzBT4SWEAALCCAAcDDozCCFgYODHYQdDLIQsEawT+EVgakDWYwO/BzKOCWYbgCgF4SqDCDBwbFDYRTRKcA47CAAZODAAUBYwQADv4OFh4OFgf/Bwv/Bws/BwoVBNgYOCJIwADQxaVGh6kFg6zDBQN/aKYDBBwn+FgoLDHYQdBIgJKDEQJtBjAsEM4cBAwImCfQQHBRgYOCFwYOD/5kCBwacDBwYuDNoIeFBwwtHXIJMFg4OFFwbDEFwIOEEwQOEEwJSCYIb2FgB4Ed5EfM4RDDEYsBEY1/BIIeDj4EBWYQ5BYQsDKwU4IAsHSoYDBj7+LSooO/BySTCgIODUwYOCRgKGEhyuDBwS/DUgQODUgYdDvAOFh4OCawS2DBQUHNDYDBn4ODBYQOEKYJoD/7oCNAQOBIgJZDGIZoCj//R4R6CBwJqDBwQ8CBwg5CLIgWEv4WQU4YWHgYWdKYQWEToQWOd4gOEcALQBBwZtBn7CENQYOCBQJTBBwYWBKYKzD+AlBd6YLCL4YFEBwJsEAALmBBwoGFLIQAOnAGF//+AwhfBSg4oDUYRNEZIQWDOAZVCSYQtEUQIlEEgYlDEgSYBAwLACSpoORIYJCBHAMP/hnCH4SoCgKkDngCBjwGCgIOCXQccAQgABBwTXDhgOFDp0DHY18JQQWCn5ZDAYN/LIaGZGAQOEWZrRHIwTRDIQRDEPYYkFEoYkDEoYVDCwS9CSQQcEAA6nCWAgaDnACBhykDBwQiDvB3CBQQDDSqQO/ByoKCAYcPXwaVEhCVFUQKkFjABCBwi7DUgIbCFgYqDAAP8gI9DJQbuGBzriDBwYGDBw8H//+Bwl//5qBAAUD//8Bwk/GYsBEgolBCooAQgYlEKYQ8EJYI1EGgJTFIYI9ECoQWEAwRFDj4HC4EMNAQlCgYfBEgQlBD4IkD/8fD4KGBAAPxD4KkCAAO/BwIGD/YOGHoQGEFgMfLwX//v4gJlD/0GKIJkDQAMBQYc8AQMcQQfAAQYLEjAODDoQODFIQdEJIIOEn5+BHYZdB4EB/D6D/4OBDIKJB35ZBMwf5O42PMwIGD/DjBBwgfBBwnwv/wWYbCBBwKzD8BLBaIf8BwTRDwAOBIYf4gY7BGgYTBQAIlC4EDLwIlCNYM/PoIWBDQMHOoUfDgJPBQgSdDCoKVDWAUOAwUDwADBaIc4UATgDBwQ9BW4IyCQwgOCSogO/BysAvkDBwaECO4aGBnyGDSoMDcgIOCUgK/BUgUMSYK4EbQQrCDoQOBV4fwJgQkCh+An//V4RZECQJoMCwQOEdgQOI/oOGw4OF/A8BBwV/L4IODK4PwAQIOCn/+AQIOCgILCBwcPOoMHMIcIDIQOCAAUBBwYACh4OFYgIGFgYOGngGFAAsBRgQABj/gNAIICLwODNAZZB/h6BBwQTBCwLSCgaOBNAIOCQwP4g4OCWYXAj7CEFQIOF8EHLIIzB/6WBLIUfj4OBNAUB8A0CjgOBji0CgIOC4DDChgOBjBLBGQIOCwBuCBwY1BBwhPBKQIsDPAQsEKYPgBwUeMQRZD+AOB/qVCOYJDBQwf8KQI1CWQQOEGQKyBMQIOC/xSBMQIOC+KPCSoYBBGYQACGYjaDEgTpDUoIWFCogAUUYIbERgQxFBw6KBBwhHFgIcFSoQHFCosAhwEDCQSCCboIOFgYOGnAOFg4OCFgUBYQSiBAAQOCAwYO/Bzh3Dh6GNSp0BBwwoDAwqgDcAj2FfwIOG/wOGDwsfMoY0DBwr+EAARKNgH8BwyUFSogOGGwYODMgQODLgYOD+DCGBxzgVLoQOEIYQOHAYMDBwYKCgYODNgYOCSod8fwwOCbAc8TIoODAAccfYwOVnACBhgsDO4RKDBwRKDg4DCUAQDDh4ZCjyzDCoTRE8EfcA7vGJIYGGBwLtDBwRdFh5SDAAQwDBwYGFUggACNAYADEgwdHbgQOEGg3/Q4Z3EBwpaFO4SXCO4gOGA4iVKA4YGDIwQOEFwQOd8E/BwiVBA4QOCMwIHBQQoHBNQkAv4OFgIOGn7jMg6mFgIjEDIP+cAqUELIN/WYwjF/7hFBwLgGI4zvGHIgOCCosACo0PAwpKBAwsMBwwkGNAIsNEoxZHWAzWEd4gHEeor+EA4YGCA4YODA4YGDJwQOdh0BBwvAA4QOCSoQOFA4QdDAQIXBBwT1Cj4SCh4KBTAj2Bg4RCBYP+g6uEGIP8Sor4FBxAPFL4QHDO4YHDSskPj4OF8EHSowHCBwQCBA4JxEA4TwDSoSHDAAMDCosBPAgABO4ivBUwIACYQN/FQngv7ACNAYxFI4zCBGIpOGh4cFgBHGd4QAECoxKBAApIDnCVDQ4SkDA4V4DoowDFgbCDToYOCJQSdDh4lCRAZoCh4ODO4MBd4geBn7+E+EH4b+E4PwLIQOB/8+gIOE/5rDBwStEBwcYBwn/gYdF/wsFAAIOFEwYOH8IOFhkHBwvAn5EFBw3B+IOEh0+B4Q7D4EfHYgDBv4OETgSzFDwLCFj4ODBQTCDBQUBcAzvHfwyVDc4UASoUMWAYACBwYACDoYADFgY3GAAf+BwzeEO4QtFYQIeBfwgeCcAgeBd4o9BNATgCVoLvRB0reBBwngBwsOcwIOE4DmBBwYuETIgmBBwvAn4dDgaWBcAiGF8F+SoykGaQUYBwX8YQzZFh7oGCozvHCoxKBAAruFAAhZDAAZoCAAbgDHgUDQwUfdwJVDVQIOBj4OEgCtBBwYVCBwYDBn5zD/wVCcAfAaQQOCCoYODaI3gCoTvDbAQOECoQOChkDfwwVCBwZaB//7BwXDAwP+cAUMDgWDcAYAB8DvEEYKkDBwT+FQAIOFHIIOEQAQOESwLCCBwLpBeYazCRQQOCBYLRDJAIkBCIUPAYQnCAYICBn4ODCoQODFALjDWYS7CBwQVBTwIFBAH4ADVYTEDXQbaCB3kMKAlggCfCAAMGBz0BfQQADj/wAwjdBC4gOB/+AA4l/bwxWCDwouFg//Fwp5BOoIuFGws/Fx/8A4kDGwwuBLowWFFwIOBUkgOOfzoOlAGY=')));
+
+    Graphics.prototype.setFontZapf = function() {
+        // Actual height 56 (55 - 0)
+        return this.setFontCustom(
+            zapf,
+            32,
+            atob("EhQVLiUwNQsXFx4yEhcSESUlJSUlJSUlJSUUFDIyMh47Ky8pMismLzQaGTInOi4uKy4vJSstKzsnKCgXERc="),
+            60 | 65536
+        );
+    };
+
+    const nes = E.toString(require('heatshrink').decompress(atob('ACsPwH/3/7AQOA/AOFg/AvkHA4YFBwFwCAnh5//AAXh50cBBEAgeMplP/9Go98gIeCgfgkMCmce8EYg0Bx8xiERgHzg0ws3bs02sdt2YIBsEbgEwgZVFthTBJooAEkE/4xdBiEAwEWg0/4ANBgNghkD+EMAoIYCKAMQAQP/AogeBBwXwj8BEAQAKgeAnACKCo9wLpcHgfj8ANB/E/4f8sF2gdgm8DBATiBDIkzgcwm//v/3/6VDmBLCg9x+8fsf2ndn237v838c4CIUAgwyBg68B8duBwN3+9/sPgCIV4HYP4nOHzFxw44DgOAjBeB418u/Htk24YCCt/2/8HEYf+n/z/92eQL1Cs/2v8BCISOCAQNhBYIOB8F8g/ATQcDzg+CEAQCCBAU5agS9BvxlBCIlvv/nIILLIgeHnFzw4MHgMM8FAAwbsC4EkTgNGhkgCocCoEkARAOCCgNGDQMkEAM4EwJBFgFggx9B21gsxiBBwngv+H/F/8f/n/3/wICnwSDBYKwBuOGjFhw8YBAUP+CwCboaeMgH4n/j/1wu0DsE2gdwu8HmFgEYwOCsE3g8/4f8h5bCGpQCCsEwCI6NBAQqGCI4YsBI4ljs/2v9nNY4ZBDgVgBAV/CIQABKwhfHI4UAjkB+EfgALCAQIjDR4Q1EaAP+h/jz9w+8HEYkAHwjtBmACFEYzgB/EPwbyBLIoRIwE+CI0D/hlGLIk/LI9hw0YAQV/w/4FgIjIjdh20Pv/H/k/2AjIj1h81/v3398+NYUDw1+u/nfAc3sc3+d/gPgYojSCFIgIDB4UH/wLCTwp9DEYUH+BiCgfgj7dBR4IIBv4jDa4ngUJUHg99+/fTALFC/gICuFwLId8g/gvzuBHoV+BAN8B4UGg9h+0fs/2/dv2/jvk34dwR4QAB//4gOAiEAuBLBAIMHwEYgP/JQQ=')));
+
+    Graphics.prototype.setFontNES = function() {
+        // Actual height 12 (11 - 0)
+        return this.setFontCustom(
+            nes,
+            32,
+            atob("DAwMDAgLDAwFBQYKDAwMBAwMDAwMDAwMDAwMBAoKCgwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwFBAU="),
+            12 | 65536
+        );
+    };
+
+    let drawTimeout;
+
+    let settings = Object.assign({
+        currentFace: "Mario 3"
+    }, require("Storage").readJSON("nesclock.json", true) || {});
+
+    let currentFace = {};
+
+    if (settings.currentFace == "Mario 3") {
+        currentFace = {
+            'fontFace': "SuperMario256",
+            'dateFontFace': "NES",
+            'clockScale': 2,
+            'clockOffsetX': 0,
+            'clockOffsetY': 0,
+            'dateOffsetX': 0,
+            'dateOffsetY': 48,
+            'clockShadowOffsetX': 5,
+            'clockShadowOffsetY': 5,
+            'dateShadowOffsetX': 1,
+            'dateShadowOffsetY': 1,
+            'dateScale': 1,
+            'clockColor': "#4299f4",
+            'dateColor': "#ffffff",
+            'bgColor': "#f5bf66",
+            'bgImage': {
+                width: 176,
+                height: 165,
+                bpp: 3,
+                transparent: 1,
+                buffer: require("heatshrink").decompress(atob("kmT0mQtMkyVImmSpMkjQCByUNAQNJgwLCwYLCoOkBAMg6QIBEDpBCwEJBYNAggLCgQsCgIsCgAgCgAgCLwIIBgESBAIgdIIXAgJKBsEANYMwgBrBzEANYNMgBrBk0ANYOTgBrCwEDFIIgdAwOAiAdBgEIDoMAgkYAYMChgDBgMGboWDAYVBwADBkHAAYIgdIIKkeYsZB/yV0gFAm3aRgMbtqtBhu2wEIg3bFgMDtuggUB23QgMA7dogGAtu0EDqDBgGQKYMApBTBBQMSAYMShIDBhMEbwMEwVAeQNBkDyBkGQCAIgdYv7FCIIQUCKAIgCCgRxBEAY1CNAIgCGoRoBIIQgcIIKRBAHpICIP5B/IIThBAALhBAAMQAYUIAYUEAYUCAYUBDwbiDEDxBBpgGBkMmD4WTD4VJCAMEknAD4MSsAfBhMwCAOEzADBoQgeIINJAX4C/AX4C/AX4C/AX4C/AQPtgAABk3EIPU8h//AAUDIPUD//MAgMP/kCIPFOj//n///18/+MIPFI//P//ypP/z/wIPX//n//pB+AAP5IPdOjnP5n//18/+MIPFJgf5n/ypMP/kCIPM8h0EY4UDH24CD9u2gEAk3Ea5XQB4MCthQ6yfASQX/+E5IPOQn/85IEB//AIPPh//zQQPn5/4a5QCux/8IAMkz/5/8EIPJAB5//75B+AAKD88PM/iDB8/P/HEIPGQn+T/4EB//AH2wCCyfA8FPYwPwnJB5yVO7dggECtg+4AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AVWTwEYHe/YgEA7BBD8PgiRB1pEJAYMAHYWT//8IO1CAwcCIPY2EkAECv8DIOucGwkhxKDBwGEQGYCByAGFhK/0AQh4GwJB/IPUnggJFwxB/IP5B8kgGGyBB/IP5B/IP5B/IP5B/IP5B/IP5BVu0AgE2H2GT2A1BII+TwQFBwEEIN+QiQDBgBBHCQdAIN+EAwcJIJVIKQRBsAwlAIJdiINs4IKFJgEAjhBrkIGEpBBLkBCBZFcJAwsEIJsAIP8AgIWGAUVOFQ0AQZ0xIP6EBIPkkIIUHINFIBhRBLgBB/IP5BD4hB/IP4ACghB/IP5B/IP5B/IP5BFIAZB8hICBoBB8wALDkBB7gQLEIP5B9iQLEwEAhxB3kALGgEAhJB/AAJB/AAOEIP8AjBB1gBBJBQxBvBw5ACgZBik9ggEBILMAiRBhkCECVZJBzhIGDE5BBQsRBgpAGEwBB6uBBegQHCp8AoQyKyehkYuH7AFDDYuQILlI/+IpMngEJgENwEAwEGBwMEkcApMmC4dJgAlDiQsFhJBc8fwIIMOhEf+E/8EP/AWC8dIsOchunmHCukA5OJIMw7BAoOOnhBHgnDgOAgUMmHAgOGAoMxkmcII0BQcEP4MAuE4/l+nArCgcBwI7BgHAwMBDoI3BIMsAhxBBgAvBAAMDAQIrCQYJBBgRBBwFAgeAnJBSG4gA7IP5BCyf/AHyDDv4HC4BNCj4HC+AHCg4HC/gHCgIgDMwYgcQYOAIP7FCIYIABn4LC8AHCh4HC/AHCgYHC/w9DEgYgcIP5B/IImSczwkDEDhB/IP5B/II2TAYOABgU/BYXgA4UPA4X4A4UDA4X+HoYkDEDhB/IP5B/IP5B/IP5B/IP5B/IP5BV4AGDAHUkyRA+IP5B/IP5B/IP5B/IP5B/ACA"))
+            }
+        };
+    } else if (settings.currentFace == "Mario 2") {
+        currentFace = {
+            'fontFace': "SuperPlumberBrothers",
+            'dateFontFace': "NES",
+            'clockScale': 3,
+            'clockOffsetX': 0,
+            'clockOffsetY': -8,
+            'dateOffsetX': 0,
+            'dateOffsetY': 54,
+            'clockShadowOffsetX': 3,
+            'clockShadowOffsetY': 3,
+            'dateShadowOffsetX': 1,
+            'dateShadowOffsetY': 1,
+            'dateScale': 1,
+            'clockColor': "#ffffff",
+            'dateColor': "#ffffff",
+            'bgColor': "#9290ff",
+            'bgImage': {
+                width: 176,
+                height: 165,
+                bpp: 3,
+                transparent: 1,
+                buffer: require("heatshrink").decompress(atob("yVJkgC/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C8k3SIP8n+Q74tu3/4AB7VJ3//pM2BAX7tpBvm41CAB36INeTt4xC/0AgEHAoP8z4DB8AJB74QC/ukH0smFQMkF4WSoQMEpMhmVJhIYDzMkKYWSv//6Q7bk7yBAoNNNgX2P4QeRgA+B7YcC9IKC3/yIKs///JNAX/+dPIAMSbaggB/OnEAQKBEAJBWC4IjB//AgmR3/AUqtG/8CpEDZgQpDIKk3/R9B/b+DuznX7AFCzO3RIIpBD6lP/xeB/kEHawCKpGfE4Pf/IZTv//zdv8I+fAQcz/u0IYJBU8+T//JIMcn//k+ZBSk/yp837d/IM22/V5F4IZQ/TFB/1IH0ICD5M/YoM3CyIUBAAOCIMuRFYYWQn+f/sH78SIMuT33it/8/zcR8VH/xBnn/gzv/+TFRyVM6A+jAQdmwmTYqMk/iAmAQ0/CaE/IN/+CZ8n/xBsyc/+QTQbCRBbFyWfKiICaz/8CaEm/7YQATf///SCaHevxBsnwTQm/8yBBrwV//QTOp//8A+pAQdH//5CBt//kEINtIz//CBmTv+JH1YCDk9/0hBM/w+tAQf/8gNLz/8IOPv/hBM+BBxx5BN+RBxW4JB/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5BRwf+IOP/4hB/IJuTIOfkCBl+IOQNNIOe/BpfzpxBx/OnJ5n+QeX/BpX0z5Bz/mb5INHp4LBthBx9u0z/5QZPfQef+QZICB8VuIOP9g5PNQeX/BpfcvxBx/0+BpeTIOX/0hBMYufkIP5BO+RBxz5BMz5Bz/hB/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5B/IP5BygF/wBB+yVAkkEIPlMwEJghB9s3chMkYvtmzkBIP1O6BBBYo3+pM8yV/kn/5M/Bwd5nnyBwP+vM/AQIkB5MnDQJBZpH78EAIIsnyfJ/mT5/nyf5847BGQI7Byf/ng7BJoN/n+f/4CB5IzK8hBNp8csM+IIpxBpJBD/5BDRIP5HYX8IIn/z/PIJu+IJtM/fhYoxBDyVPQYpBLHwJBNwEgiRBMpMAhMkBgsnAQP/IIXzYo/zYoYRBIIRNBIJAtCwEAIJ0ggEBB5ICfk1JkMktPAIJ0ypBWBGrkAiBiJWAfv8ECIJlG+SDfgGCEBMD/0kgnOnxBNv/iv+BILsypKkJk/P4mE//+gBBN4fuQbtO/99PAIOH7//w/k95BOoGCv/4ILln/+P/+EBw///v38mQgmAShJBComT5pBKiVBIKQABII9IjUN/8EegOAQZlMz/4YpMghMgggLHn4CB/hBE/15/+GoQaBgAmDk9/4EkyMG8RBNyf+SZPf/JfBWBACEBANOQQP+kmYpMSpEABYNM4BGBgmfkn+IJuSuKDJ//8kjyI78SAQYICz/P8MmoVIfYSeBpnCpEEwGZwxBNpGQTwgCEpnTh0AYpEzyfJ+AIEkakCzAmBhMEgAgByUB/2A5//Ypn//AaBIJKvCQYl/8mT//6t/+zf/5MnN4XCAQPDhAWBgAaC4d9/8H5PkyBBKFAP5iRBLYoxBBfgMSIIOQv//IIYRDQYUkwAFBwdx/kH8MkGQJBJyVtIINunAPI//xdgQFB+V//n/+mSpoCC/8//1P/4aEj9P8hcBeQUAyfpIIKDKEYXgt0GOAIAF/GfwLXCAAXgAQP8FwIdBHoP/xIcHDoICCyFAgGD5EkwVBIJVJ/3AKwPfEY+SDQODBQqFBDoZBBDQ//8VNw4EB/0T//wweIIIL3IAQcEwEAgkfEw+SpkAQYXggM/Y4RBFyf/gEDDQjNB44jFj4wBgBBNgEIa4lIggODtukDRQCLg3zv/wBAUCDSRBBAoJBCwFAIIgCYk6+BgGSoEgIKYCDIIWQoA+aAQcT5MgU4MgVoYCXgMADrZoGgGAhIdYgUAUgI+eQAJlBeQQgXwEAghBckEApBiBoEAgSnfEEACeoCnBIPynBiEJIPtJgEAQfxABgRB+AX4C/AX4C/AX4C4A"))
+            }
+        };
+    } else if (settings.currentFace == "Mario 1") {
+        currentFace = {
+            'fontFace': "SuperPlumberBrothers",
+            'dateFontFace': "NES",
+            'clockScale': 4,
+            'clockOffsetX': 0,
+            'clockOffsetY': -8,
+            'dateOffsetX': 0,
+            'dateOffsetY': 54,
+            'clockShadowOffsetX': 3,
+            'clockShadowOffsetY': 3,
+            'dateShadowOffsetX': 1,
+            'dateShadowOffsetY': 1,
+            'dateScale': 1,
+            'clockColor': "#aa4e00",
+            'dateColor': "#ffffff",
+            'bgColor': "#9290ff",
+            'bgImage': {
+                width: 176,
+                height: 165,
+                bpp: 3,
+                transparent: 1,
+                buffer: require("heatshrink").decompress(atob("kmSpIC/AX4C/AX4C/AX4C/AX4C/AX4C/ATE8z1P/mf/8n//P/4gU+V/n/+v4gB5IFBBwYmB5P/+fJ8///IjLEAU/IgIpCk5BU+f/MQN5n5BBngCBBweeOIJuB84jNIIIgBz1/IINPIKv/IKGTIIKJBYpqDBz6VBQa5BDYoYFBBwiDDYoIjNMQYjBcAPP/5BULIKkDXIM/+RBG//zIIP/OIIjKPQXkyaVD8mSvIREsJWDyVPJqQCWnn+ZAZcBp8/GouTkkEAoPnOIJQBMQ59CyZ0MAR38YodPboPPk4FBGoZBC+fP8iqB/jIJAoSeFQaxBRdgJBNp//ILi8CHwPJHweT57FGHwd5YtICQoAsrAX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AREggEJIPtAH4OAghB8iQDByFAIPeQAYWAhBGCIPGEIIcJgRB6AYUggACBIPMhIIbDChJB4HIZBDwJB3pAJHyBB3oQJIghB2X4QJGoBB1yDPKJhICrwgMKgRB0AYUgBIkgQIMgF8MAU4WAhLxCggRHkIVG0gTBAoQaCILtC7ciGQNtyL7B23ICg4zDIIeg7aDCkmBIL82IIMJjZBBgmNIIOCCItIAYVAgAJC2HbthBCyBBg7NkwMbtmyoBBBrLyGoRBDBIeG7VEB4bdIAS2yrMtwNZlmW4Gsy1LsARFO4RBFy3bsgPDoBBdguS7dtyXJtu25Nk2wvBCImQDZGEPwtIKQYCYkMtHAI+BAQ1sgQ3FDY0lBIMMBAkCILcrHxBBDyQUDDZEl2mSCIIIDkBBapFbIJYCBpCVCIJOkyVMBYsJILNCHxYCC5DyBFpWApEEBAuBQbRBO4AUB7//4/+t//8f/m//+MGzcB/H/5v//l/83//0/+d//8f/O//+P/ggK/+b/4gS+VJg+QvMkwfInmSoPkj1JkHyh8kBwMHNQM8wfJkkeCIOSh4RBEH4gjgkAEAOCgAgCgAgCwAgCoAgCkEDEAMQgIgBhEAEEUH/xiC/4gC/+eEAP/54gBv/nEALmBEALmBMQTmDEEDF/EH8g+ALByF4BYIFBiQaBj0JDQMPggaBg+CDQOD4IsBoPgFgIgh/+B8jXB4Hya4PgNAMf+BoBh/4NAMH/gsBwf+FgL4BgfJEEPyv4gBvM/EAM8z/5MQNP/ggBk/+EAOT/4gB5P/WwX/EEWAgPAgFAgHggEggFwgEQgE4gEIgEcgEEgEOgECgEHgEBgEDwEAEEHf//H/1v//j/83//x/+b//4//N//8v/m//+n/zv//j/53//x/8EEHySQKkBSQPIcAKSBcAKzBcAIOBcAKzBUgKzBCIKzBCIIg/EEbUBEAOCgAgCgAgCwAgCoAgCkEDEAMQgIgBeoIgig/+MQX/EAX/zwgB//PEAN/84gBcwIgBcwJiCcwYggYv4g/kHwBYOQvALBAoMSDQMehIaBh8EDQMHwQaBwfBFgNB8AsBEEP/wPka4PA+TXB8BoBj/wNAMP/BoBg/8FgOD/wsBfAMD5Igh+V/EAN5n4gBnmf/JiBp/8EAMn/wgByf/EAPJ/62C/4giwEB4EAoEA8EAkEAuEAiEAnEAhEAjkAgkAh0AgUAg8AgMAgeAgAggA=="))
+            }
+        };
+    } else if (settings.currentFace == "Kirby") {
+        currentFace = {
+            'fontFace': "KirbyClassicBig",
+            'dateFontFace': "KirbyClassic",
+            'clockScale': 1,
+            'clockOffsetX': 0,
+            'clockOffsetY': 0,
+            'dateOffsetX': 0,
+            'dateOffsetY': 54,
+            'clockShadowOffsetX': 3,
+            'clockShadowOffsetY': 3,
+            'dateShadowOffsetX': 2,
+            'dateShadowOffsetY': 2,
+            'dateScale': 1,
+            'clockColor': "#ff00ff",
+            'dateColor': "#fe6ecc",
+            'bgColor': "#ffffff",
+            'bgImage': {
+                width: 176,
+                height: 165,
+                bpp: 3,
+                transparent: 2,
+                buffer: require("heatshrink").decompress(atob("pMl6VJkmSAS9L0gUSroROl/6ILVf+gUS/5WOIJ+924gKII0l9u9INIsB2w1Br3eIJsvtpWC+yPHIJ1L///9JBMtu272X23bqQOEy4cB6QIDlYUB+m923aEYu///+ILkvt/+7fVIINqIJl7v/272tKw5BPpN//7UNt9Jrdt3t7AoKwFFgt7vVK7dt9fbvRWGZw5BYHwQFCIJtLHwQFBIKjFRpMlYQJBGYpA7BlbCBIIzFPr/0y/9IJwFIFgPpl/6IIwFIkqzBv5WEAQ9dAQhBKtupvRBI3QCEHYVtpfUIJA+BAQQyLARF0II3//bFIAQ97t//7bFIARGXIJ1Lbosrttf1dt9MrIgIdLrdq/tbKYNbIgIyMcYJBUrd/IgRBBQZlK7f6C4JBCQZxBVFgP/cwNt1ICBDpdW75BBKwICBbRpBQ///EwIsC72vQANt22k1upDRW2+qYBrdt2pWBIJkvGIOkIKX2+mX2/btu30m93oaJCIIOB3wUB3sl9p0MIKFf//SIIgIBFgO1khBOyX+CgLaBIJsl//9YppBIpf7QaJWDQZ5BQYo3fAoMv/VfIIOpIJW2LgV/6X9IIIvLYqGXEAP/BAVeNYJoCR4IFDDpH27dvMQf7AoYCJKYNfWAJBLAQjCBVoQyDtosLKwiJB7dqIJl0AQjINAQmtIIIsCvRQFeQ5BC3oUBZYMk3QyTAR2V2o7B2/+BAW/ZBWt1JBB36zCdIgCSkvtXIQOI2///ovBIJ2V3//9opEIIzXBR4RBKl9t2+kfYJiCBwitBWYRBPCgNvIJf2cwUvCIgCFldt230cwPaBwwdBtpWE///KwIjHy5BBtQIDv6fBMo1vpYmBVQgCEvd/+3e1oUBqQOFpf//RBQyVf/62EII2XdINt9RBB2pBJvVKBwPrTATaLWAJuFd5v/bQhBB0hxB729fYRBISQI+BAoJBrHwQFCIJNJlbCBIJzFNAQzFIDQLCBIJoFIFhPSr/0IJ9L/2SKwg7FIJdtpfUIKF0AQhBOGQICCHYW26m9IJtv//bYqACbIILNBYplbtX9rdvAoJEBIM+V22v6u2+mVIgIRGpXb/Q+BIISDp1u/0hEBIIKDIq3fIIMrtoCBIgJBmktt/47B23UAQP0CI22+t/QANt2oXBIM5rBq6AB23bqVWIgIREy6MB3u+7dt3sl9vpIM17vVL7ftIIPSr3eIJGS/xBB1JBrpMvIIPayRBLr6DLuhBikv9QZe2//SpN/6X9IIIgFpf+IMFv/o1B/svIIPUCI327dvAoX//YFDIMkvtu2+gFC/4FDCIleYQK/BRIPbtSSF/4ABILytB2y/CvZHBfwIRHIIW9a4QOFIAP6ILwCBqxBBpZ3B3qwCIg2t1JBB36SHr//JQwCapXaIISqDr41Gyu///tDpBBjpNb//+6gsEII7CBt5BKYsJBBtu2HYhBHy5BBtQdI/5BXugLKvZBB0g4DFgKwGXJf9krgDILwjB/p6EIJACKy4CEIKVL/wUS/4UTAS5B/WAbdRYqj7YFgP6ECG/9MvCiK5N+gLJr5uS3QCDkqGbIL4CEQzb7MYqZBjDpALB15NJINB3CXJGXAQjpTEgPpILL7YINCDKATN/bqxBGcbZBiy/9kpBhYrmXAQhBer/0NAKngATldAQhB7ARN0IP9L/xB/IOEvtvpIP17tu9kmX2+kCJP///6INtbtu30vt23UIPNL7f/231tu27QRJr//6QgJkoLKILHSq3bt9eAoJBVl5BkHwQFCYqsvaMI7DrQFECI2X/sl/6PK//9IMYFHIIoCEDo5BB9JBhtVe0hBLARt/R5ICN3RBKv/+7RBxdJVK7dX9XbvVKIgd6UKTFXIJVW7/SIgJBBQYNe7dvC4PtF51f/2/IMG2/6/BrdqAQN6q3btvpvdt2pBO0mXIKrdB/oLGyu31f6QANt1MrtX2//t3tbtu20gvTILe93q5B+x9Cl9v+30yu27fX230IMsv/6bHIIMky5BCCIJBCy4+CAoJByyX+QY2SqzCBIM7FK2/+yVL/2XIINqHYpBmGQOS/5uBBYi5B7d6AoX/AoP27WX1JBpHwICCBYv27dvRIRHBqX27//2zFpARcrIIMl9u272S23V/QFDLI4CqkttIITUC259BIIaDey/pCiWt///tQIC347Bq3aAQJEBIOW27d6BAXq/yAB7dqpREBILm/IKe9HANSBAd7vpKCpfb6RBbv6vBcyf/PoIIDkv9JQRBel5BB0ihbQcMl//9DrJcC/+l/VL7RiaIIaDa23eEAf2AoTF3YQK/Bl9t23UILv6//0DrFKIIV7tu3MTICDl2SpZBOCIILJrdSIIN/9I+aASl/O4ILIld///aH1xBPtu27xB9l5BB6hBwr///4OK3//0gmU3RBoAS0l/Qdapf/DrZB/EZIABbqrFnIIX9DrJcB3/pYsF//4jaDQQdSuhBqVRLpKpf+IOdf+hBb/pB9pYaBIN////6cBzjLAS2XGoPSIK4ClIJlfBZQCDuhEk/77KIJ4ClIJbF/BYP9kv/IOO/9MvO5GXAQhBv3QCDkr+zARiGJIP44xtvpIP17tu9kmX2+kyVL///JQwCvrdt2+l9u26hBGpEOyX9kkA9eB6UAumSrl+gVf10CEYOXgICB9eAg9cgv/DQN6rkB68BuEA8EunVJkvArl0gXgvw4B7f/231tu27RKBv//KAVD//XjsgnEcvwCBghNCnVAkhBCyRBByEJgPA8eBGQIOB8EOnHguAgCiQXBwFIgk/j+AIIXSq3bt9eAoJBFjkOiRBBi8ckkH/hBE8BBG3BBCjp6BrkugVLwmHrkAi8IgC/Cw9IgE49KzBIIQ+CAoTFFHYJBBl0AEAMCoBBCgE6RIJBFw8BIIUggED0PAIIQXBcwOAyAsBIIgdBHYVJrQFDr/0y7mByX/wBBBWYUunELwhBBUgMAh0C8JBCuPAgeA3ED+PAofwHYOEwH8uEQPQIjBIIkJNYJBDI4ldAoICCUIOXOIMApeB68AQYNch0A9BuBBwOXAgM6AQMAoEP4Hgh2AhA7BgfwL4KDCkvArihBgEP/Q7BtVe0iJEHwICvOIR9Ev/+7RB2/56BAoVK7dX9XbvVKIgIUDkvt3pBxq3f6REBIIKDFl9t24UB+30INu2/47BrdqAQN6Cgcrtu2+m92yPFAUO///+AoWV2+r/SABtuplZEBCgV7v/272t23bqQjGgPSr+kwEduE6oEOyVLx2ArkF49AuEH8EB4FcgEHpeAIJG93r7B+xBB9Mvt5BEZwVt9bUBIItIv/68ekg8Dx/HgYvCgGHpEEwFDx0A8F+nHguE4/lwiQgBy//d4ZBBBAJBCpJBHpY+CAoJBFoeB4VD0kC8eEwH/IIcHpF0wED0iPBv24gEgi8D10CIJWS/yDKpMrYQJBIwmCoel4EBgEApEAIJVwIIhZBYpG3AoNL/2XIINqIIwFIAQNf+ECQYOSgMl48BuBBKl/48EgiEAv06pMl/9Jv/SRIW2eoaPBfYt7ttL6hBJpeAiXgkmAhNwnXgQYILBwFcgvAoEugQLBgFASoUBHYMlAQgmB+3bX4W9I4K8BIIdvJQLFJAU8rIIMl9u27wLErdq/tbBwNbJogCpkttIIX/d4ILCpXb/Q+BIISDNl9t9I1RVoIOK1v//9qBYtW75BBlZQBSoQsMtu9kmX25iEARFL7ZWC3oXBII227Z0G231v6ABtu1SoRBLCIO30rmB6hBMVoJWBTYO2Kw29IIL4FNAW93waCagK2LNwP/LIIsB7RBMr3f/u31YUBKw///wIFVQf+IIOpIJ/Sq3bt9eAoJBM7ywBXIP2AoKtMIIlfQaXSHwQFCIJw+CAoRBO23/EwN/6X9IIIXLHYdaAohBNpTCBIKBWBVoLUD/YFDIJgFHIJYFIC5jCBX4KJB7dqIJtqrzdBIJ/bqX1IKdJkpBC3pBBFgW6IJV//3aIJIgBIIv/+zFJy5EK1upIIO/+hKC/4UIpXbq/q7d6pREBFgv9CglW7W/qxTBqxEBCgm/KwoCEyu///tRghBJq3f6REBIIKDGII22/wXBIISDGIJjCBt5BO23/HYNbtQCBvRBKyu3IIJTBqRWHIJeXIIIsBBAV//5rFFger/QpBtuplYXELIP/cYTsB3tfQAIUBKwNSCgcvCgOkIJGSr5xCIJm93sl9v2FgPpl6bGIIYRBBwStDvaYEIJoCGCgKYHIIKYBIIQRBIIiwBFgZBCBAKtDIIpWBNw5BXyX+QZBBJKwSDHIKjFK2/+yVL/2XIIJxBYpW/AoNf+m/IINSYq4yByQUHy6tBNAWX/4FDFgX6DQRWCCgPSR4SbBAoRuC6RNBIKA+BAQQLFVoYyDNwkuAQhWFRIO27QjEugCEBAI="))
+            }
+        };
+    } else if (settings.currentFace == "Zelda") {
+        currentFace = {
+            'fontFace': "Zapf",
+            'dateFontFace': "NES",
+            'clockScale': 1,
+            'clockOffsetX': 0,
+            'clockOffsetY': -10,
+            'dateOffsetX': 0,
+            'dateOffsetY': 40,
+            'clockShadowOffsetX': 3,
+            'clockShadowOffsetY': 3,
+            'dateShadowOffsetX': 2,
+            'dateShadowOffsetY': 2,
+            'dateScale': 1,
+            'clockColor': "#994e00",
+            'dateColor': "#0c9300",
+            'bgColor': "#feccc5",
+            'bgImage': {
+                width: 176,
+                height: 165,
+                bpp: 8,
+                transparent: 254,
+                buffer: require("heatshrink").decompress(atob("/wA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4ASwOBIP4A/UMIACBA1WAYlWKX4A/V8KpEAgIFCgEAlYCBKf4A/V0GBlayFWINWVwSv/AH6vfUgKqFAwKuFWH4A/V8KpDAgmBV/4A/V8krlapBAQQKCV34A/V8arDUgSuDBYSv/AH6wiVwICBUgMrVoQCCBISv/AH6veqyjBWIKmCV4tWV/4A/V8CwEV4iwCXAaw/AH6vhqykDVgQLBlYKEKn4A/VzimBUQauCXQkrVv4A/WECiBAAKkBlavFwIKBKP4A/V76kBAAKvFAQYKCKX4A/V7yuClakBgCsEAQQLDKn4A/V7ijBUQYABBIYLCV/4A/V0CvGlYKDwIKEKn4A/V7tWqyjDgAGBXRBU/AH6welYABUYMrV4qwEKf4A/V7qjBUgivGqyv/AH6vgUgSvDlYJCBQyw/AH6vfUYkAqwIBBYIJEKf4A/VzqvCqyjBAYIKFV/4A/WEKjBAAivFXISv/AH6vfUgStCgCvCAQawDKf4A/V7qiBUgSyBgAJDAQIHBWH4A/V76mClcrWIKvCBIKv/AH6ujUYQACgErBQa7CV34A/V8CiEAAIGBBYi4BV34A/WEErAAKkBlavIKP4A/V76jBUgQABV41WBQRT/AH6vdUgSvDlYJCXY5U/AH6veUQYABV4YLCAYMrqxU/AH6ucUYVWVoIDBV4gGGCYJY/AH6wZVwIAEqypDAggFCAAMALH4A/V7CeCVoUAVQQBDVwsrgAABLP4A/V66eCVoShBVQivFVwav/AH6vYT4crWIKvEWAi+CV34A/VSquFV4krgCyBBQS4CCAavDWH4A/VyIAHVwKeDVAa6CAoiu/AH6vbgErUgKwCAoKnCAQi1DWH4A/Vy6qGAgUAV5IUBCAhg/AH6wTqyXCWASeDlYODYgiwCCwhg/AH6vRTAKZFAAisBVwSxDCoTADL/4A/VyKZBS4cAla1DAgIQEVwoXDL/4A/WCaXBWAaeCAASvHCAit/AH6vYAIKvFUIKqCAQauCgAVEL34A/V6gABTwitCUIIODwKoCAASvDWH4A/WCqfEAoKyBAoIODCAoOBV/4A/VyyeBVwaeCUAUrB4eBX4oEDV/4A/V6dWTwkrT4lWqwQDCIYPFL34A/V6qfDUgyvICASw/AH6vXTIi0EUgSvICApf/AH6vUTxMrB4QQBBIa7CAohg/AH6vRT4KYEAAtWBoIQBWwIABV34A/VzSbBAAUrqygCAgIQEAoK5DV34A/WC6vBWAakBAwIABV4qxCYIav/AH6vYAIKvFUoKvCAQYRFWH4A/V64ABTASiBVoShBBwavCCAQNBAgZf/AH6wUTwsrWQIFBBwYQFBoIWEL/4A/VyKeBS4atBAAQFBB4eBX4qvDL34A/V6aXDV4S1EUgIQDCIYPBCARd/AH6vWT4akHV44QCV34A/V66ZCVQakFV5AQEL34A/V6qeIAoIPCCAIJDXYYFDMH4A/V6KfBTwgAFqwNBCAIJFAohf/AH6uTlaYDldWUAQEBCAgRDBQKu/AH6wXToKwDUgQACV4oBBV4YVDL34A/V6qaDV4amBV4QCDYAyw/AH6vWAAKYCVgKtCUIIODwKoDCAQFDL/4A/WCifEAoKhDBwavGAohe/AH6uSUAKeFAAQFBVgIABVIoVEV/4A/V6dWTwipBUgi/ECIYPFL34A/V6qfDUgwOCYIwQBWH4A/V66ZEWgikBV5IQFL/4A/V6ieJlYPDwIJDXYQFEMH4A/V6KgBTAgAFVgIBBV4K2CX4IJCBYRg/AH6qNVgSTCA4ikBAAKuCBQgGFgAFEAIJo/AH6vLTQq1CW4UAAAKoFVwyvDAoLEBgBp/AH6uJRwKbBToSbCXAIABWAQLCDAjBDlcrAoSuCV/4A/V5KjDSYywBWIIHCCYavJDQyw/AH6vLSYSvHAoYUDAIQaEXQav/AH6vPAQiUDW4QFECoS5BWAoKDV34A/V5iSBla1DSgijBAwSoEVIoFBBQqv/AH6wMT4gDBVQa7CAAIFBU4ivHAQbMDNP4A/V46jBS4yTCXQKuBA4MrV5AbDAQYbDNP4A/V46QFAQMrV4gGBBAQUFAAbLFDYiw/AH6vLSYaSDWAIACAoINCCQMrCwbIDBQQcENX4A/VwyUCAoqoCVwYGBB4zHFDQ5p/AH6wIRgKUCAQKfCSgKjCAgKvGAgavGwKvBM/4A/V5KwCSggGBV4a1DgCnEVQa/CBQgUCNH4A/V5CjDAoioCla0BWwaoEV5AKCCgax/AH6vHSggFDSQUATAivCVoQVFBQsrV/4A/VxSYFAoKoDS4IACAoIRDA4KrFAAbEENX4A/V49WAAKXDqyUDUYK2DUggVDAowaEV/4A/WBMrlavESoadCAoQPEAQavHWAhp/AH6vHRoKUDAgSTClaZBTYavIDQgbGNP4A/V46OCAginCV4YABV4atEAw4bFWH4A/V5KZFSQawCAoYSCCgzLCBITGCCgNWFwpw/V36UClcrSQakLWIKuIAwoRBEAQfGlZ0/WHquBgCVFUhMABQoGBDIwbCV4a9DAwIvCOn6v8WASuFUhIRBCQK1DUoStDaQa6FZYQaBBQJ0/V/iCBVwikLBQQPCBQbDCD4SvECQQLCBIav/V/qEBV5CkHBIQLCUggfEBoYKCBAQoDBgJ0/V3iBCAgikKAAQEBBYjLEwILBAgYGFCoISEwJ5/V/CXCQ4qkKqy0CBQYECURITBBYbCECwIMBPX6w4U4KNDUhYGCBYS5CTgKdED4gSCEYQFBFoIKDAAR6/V+x9BR4qkLAQIKGCgKvJEIKqDDIIECDQav/V+5+CRwqkKAoiTDTgKvKABIaEWH6v4RwaPCUhKxCXIrCBDYqvFA4YXCDAILDwIjBH4hEFMTwgFFcRBe/yJFRwqgCUg6uBWQQPDZY7WHBIQgDlYWEdI4FElZMB65QCAYZtTFZReCV+ZiEQg4EDQwKkHXYq0EaBCvGE4bRDB4i2CCAYICGIZqUX4JsHFY5VCAQKuyMQiOKV4UrO4SkDA4QGCKwQSBMYTPHUQgbBZYYPEHZDfDQZ+OxwFHLgorLK4SvwMQxzNUoKkGA4IGCAAcrNpi9DDIgVFZIYFFCgigFVAgGDAAxtGFZywsIIhiFRxSkBJQywCBAYMEV4gcBAg5vDCox8FI4TlBAISCFUxQAJMQwrILgqNKTp4VPQQqvOfAYSCUgqTBA4IgFDYhmCWg43EOYQQIDYI2CGAQrDVymOFaBCDB4SHFAoybMCowgLV4x4GAgqkKBARXBTIjQLaowmCQRAECVYQrGV6wrPFgRXCAoITDgCMFgCuNCoggLcowFCRxSkJXQS7GMYZuHV44dCQY4DCFoYuDFYSvdFZoLBJgZTCKAKKEV5ISCZoggKSgg2EV5ikISgoKDGgZuGFYw+ECYYDFcwaDH6+y2SfCAgIGEAAYJC6/XFajxDKIhQDB4SvLCoogKD4Y2OG4ikIK4REEAATwEAAjVGEIIaCB46DDFI4ABTYIAIVoYJF2QrPF4qRDAAyuJV4wAQMJB4IEwakJBAa0BlYUBZ4QBDew4GDCp4rEHAlWV5S5KVYgECV4YGCH4RKGCplWVw4VHQARXCAATaDGxJ4JEAh+EaIgIBDAgJBLY4nFCqDmCbYbgD2WyU5QLHV4gsGOgTxDdRAVKRIYVMMYRSCwIEBRIQ2JRxYgEW4i0FTAogFGwYvECqJPCGIQ7Dx2OWBWO2YGFV4g1FAwhbCBAgxDCpQCBBoSDFCoyEDLAgvCGxB4LEAokHGwoUCBAIPEdgZbFCpytCAoI6CIIKbBUgwAC2S7GV5DpCeAo3CRgp7DCpIFECpRWDK4QSDGxR4KEAy6ECAZHGCwQPFbIivJCo4FBMoo7CV4WOVoyuBBQoHCGwyZGHggDDMQoVKDIgVJK4IMCRwh4FGwp4MEBAFDC4LxFcIRHFbAKwHLguBFYgECHAQ1FV4ey2YABVgYKDV5g7NKKJlDNAh4DL4p9DLQQmDGw54LDQYKFYIYECE4YVEI4hzGLwoECUgogGBQimFABOyAAIFCFgiXEOga7GcAoVLIQYKCV4ogCMQoVGGxB4QTIg2DMwpOCXQgaEVI47FFQhACEAgKEV54AFGw6ZDHZABBM4gVLIQh4DMJAVIGxJ4QTIr8DEIoMEaIivNAQYVEEBSvbF4avIBgZiECpJHCYIYVDTpQVGGxJ4VV5BMCIYYVECAwEGGw4VBEBExV7CTHBQgDEHYzKKIQKvJEAZiGCog2JPCgEEaoj3DCAYPDgDdGdhAVFEAgAF6+yVyWzGxo7GTAZiHM4oREPA6ZEAoYVEGxR4PBRL8GY4YCBeYQPCF4pcEBIYqFFYhnF2XXWKOz65HFIIoKEV5AQDSYYgKMRIGGEoYgRDwwLDJ4gmCSgZZGRwJpFdBRBFJggpBaAYKDV5AIC6+zVw2zFghBFdQo7HHAIRKMRYUIA4J6BPgQgQJowlCEAKPEJoRYHRQgqFJgyvHZQivDKQYKDToSwDVoYAE2QJD2RQEGJQJGMQYKGEBJiGZYYVFLQQKHEBISCGgZMDIoIKDBIR+CGBBYEXIZrBHZACDOQRMCEIY3CBQSqBTwOzAgYALV4r7FEoZwCH4TgDXQYKEEBJiFEoZ+CDQaaCSQYgOCoJMHPYQPEPwYgFCQKvKAgSvHAYIwHHIoKCVQOyUxGzBA+ONAivKUIgKLEBRiFJogxGL4QKFEBYFBAYZ+FBQgLCcARjIV4xdMV47+CAgavN2YKBV5rxHEoQPDV4RnCBQZPEAAxiGJogmHXoQKFX5A4DAQYlESYriDEogJDSARuGAgQvCMhCkEIIQHBCgIKEUgKlG2QJCXQwKBHhJXIMQQGDAYIGEA4K0GM4r8FMQwQEEBRtFNwavHEogQCBIQFBMIbTDFggxFApA8CcAoFDBQilC2akEBASvHBAKuIV4oKDV4xgDAoQTBRgoaEK5A2EEoggMNoihBOYyYGX4bFGAgLRCV44CFV5bNCE4YjCBQSlH2SvDxyuEBQSvLK4pAKSALDEZQpnDAQZMEEIg1HEBBtGVYhMDS4wKDGoYhDDgIWFV5I7CV5AdCV48xUoawCVwq6EBQaeEGwwwEX5QQBAgY9BUYoABV5ImFEowgJNoxvDEohKEDYqwFEAQHBG4pAHI47QHAwgADVI4AG2QOE2YwIGIxMJABgbEDIi6HV5IgJZYxyIbwYhCXwYfFBQhdGH4YlHAATPGHoQrG2XXWJyuD648FAgglDFYIACK4TFJBYcrEYzVNawxiKGIyTDGxQPBEYapEBQpdIX5JYFBQQ8EBQivIBAXX2auG2Y3GRI4JCAopSFH4R0CDYa9IMRZ4FMRJ4GAAQ2LUgQQCYooKEdY47He4rmGJAgDDToSwDVoYAE2QJD2QrFdhCQDWAYVKZQpaCPIZzEMRDCGMRAVFSITxFGwwQEAYJWDBQo7GAQYVFEgYKFD4YrGVQKeB2YEDABavJVAouBAISvHKAYJGDYJRGKQRiJTxCOHCoitCBoI2KB4gAEZAbDDV4wDBC4i/DXIogDFQwHBVQOyUxGzBA+OFYh4GRxBtDCoqACPIpJBEAxMFGxRiKCorAEGxQQCDYSOFBQZXIV5YKGAAT7FV5ezBQKvRAoIwHGISpIK4p3ENgQgEMRI2FMRQVFSgYKDDwIKDHISsCdYoKFc4yjDCoqvJJgqJEqykBUo2yBIS6GBQI8JRwpSCK4ZDFOQggFJgggEMRI2GMRIVFEwRGCQQYKGQwYKLdZIrJBQwHBAoYKEUoWzUggICV44IBVxAxFBIQ3FCoqvDLgoVEEAZiLaQxiIPAzACKI4KDD4IFDdgYKGV4wCDCop9HEoQiCEYYKCUo+yV4eOVwgKCV5YlCPAS2GB4RQDJg4VEEApiJGwhiKV46WCRwwKDAoogDBQw7GV44SBV5AdCJg8xUoawCVwq6EBQaTLKIyvFCo4KFCoggGMRIgFMRAVGbgiOFBQggCDoYADBQjmFAYgXFewogFFI4ABU4oAI2S4FHY4FCEojhCII4VFAgiUCABogKMRQPGXgYfEBQoA="))
+            }
+        };
+    }
+
+    // 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)
+
+        //Set Background color for face
+        g.setColor(currentFace.bgColor);
+        g.fillRect(Bangle.appRect);
+        g.drawImage(currentFace.bgImage, 0, 24);
+        var date = new Date();
+        var timeStr = require("locale").time(date, 1).trim(); // Hour and minute trimmed to center whole text instead of on colon
+        var dateStr = require("locale").date(date, 0).toUpperCase() + "\n" +
+            require("locale").dow(date, 0).toUpperCase();
+        //shadows
+        g.setColor(0, 0, 0);
+        g.setFontAlign(0, 0).setFont(currentFace.fontFace, currentFace.clockScale).drawString(timeStr, x + currentFace.clockOffsetX + currentFace.clockShadowOffsetX, y + currentFace.clockOffsetY + currentFace.clockShadowOffsetY);
+        g.setFontAlign(0, 0).setFont(currentFace.dateFontFace, currentFace.dateScale).drawString(dateStr, x + currentFace.dateOffsetX + currentFace.dateShadowOffsetX, y + currentFace.dateOffsetY + currentFace.dateShadowOffsetY);
+
+        //main text
+        g.setColor(currentFace.clockColor);
+        g.setFontAlign(0, 0).setFont(currentFace.fontFace, currentFace.clockScale).drawString(timeStr, x + currentFace.clockOffsetX, y + currentFace.clockOffsetY);
+        // Show date and day of week
+        g.setColor(currentFace.dateColor);
+        g.setFontAlign(0, 0).setFont(currentFace.dateFontFace, currentFace.dateScale).drawString(dateStr, x + currentFace.dateOffsetX, y + currentFace.dateOffsetY);
+
+
+
+        // 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.setFontMarioBrosDS;
+            delete Graphics.prototype.setFontSuperPlumberBrothers;
+            delete Graphics.prototype.setFontKirbyClassic;
+            delete Graphics.prototype.setFontKirbyClassicBig;
+            delete Graphics.prototype.setFontZapf;
+            delete Graphics.prototype.setFontNES;
+        }
+    });
+    // Load widgets
+    Bangle.loadWidgets();
+    draw();
+    setTimeout(Bangle.drawWidgets, 0);
+}
diff --git a/apps/nesclock/app.png b/apps/nesclock/app.png
new file mode 100644
index 000000000..2c6857fe3
Binary files /dev/null and b/apps/nesclock/app.png differ
diff --git a/apps/nesclock/kirby-screenshot.png b/apps/nesclock/kirby-screenshot.png
new file mode 100644
index 000000000..74a199fe7
Binary files /dev/null and b/apps/nesclock/kirby-screenshot.png differ
diff --git a/apps/nesclock/mario1-screenshot.png b/apps/nesclock/mario1-screenshot.png
new file mode 100644
index 000000000..a8fc053b7
Binary files /dev/null and b/apps/nesclock/mario1-screenshot.png differ
diff --git a/apps/nesclock/mario2-screenshot.png b/apps/nesclock/mario2-screenshot.png
new file mode 100644
index 000000000..b3acf75af
Binary files /dev/null and b/apps/nesclock/mario2-screenshot.png differ
diff --git a/apps/nesclock/mario3-screenshot.png b/apps/nesclock/mario3-screenshot.png
new file mode 100644
index 000000000..65a29f260
Binary files /dev/null and b/apps/nesclock/mario3-screenshot.png differ
diff --git a/apps/nesclock/metadata.json b/apps/nesclock/metadata.json
new file mode 100644
index 000000000..76b61fb91
--- /dev/null
+++ b/apps/nesclock/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "nesclock",
+  "name": "NES Clock",
+  "shortName": "NES Clock",
+  "version": "0.04",
+  "description": "A clock themed after different NES title screens.",
+  "readme":"README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"mario3-screenshot.png"},{"url":"mario1-screenshot.png"},{"url":"mario2-screenshot.png"},{"url":"kirby-screenshot.png"},{"url":"zelda-screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": false,
+  "storage": [
+    {"name":"nesclock.app.js","url":"app.js"},
+    {"name":"nesclock.settings.js","url":"settings.js"},
+    {"name":"nesclock.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"nesclock.json"}]
+}
diff --git a/apps/nesclock/settings.js b/apps/nesclock/settings.js
new file mode 100644
index 000000000..0bbecc2ce
--- /dev/null
+++ b/apps/nesclock/settings.js
@@ -0,0 +1,42 @@
+(function(back) {
+  var FILE = "nesclock.json";
+  var settings = Object.assign({
+    currentFace: "Mario 3",
+  }, require('Storage').readJSON(FILE, 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) {
+    return {
+      value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
+      format: v => values[v],
+      min: 0,
+      max: values.length - 1,
+      wrap: true,
+      step: 1,
+      onchange: v => {
+        writer(values[v]);
+        writeSettings();
+      }
+    };
+  }
+
+  // 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 = {
+    "": {
+      "title": "NES Clock"
+    },
+    "< Back": () => back(),
+    "Game Theme": stringInSettings("currentFace", ["Mario 3", "Mario 2", "Mario 1", "Kirby", "Zelda"]),
+  };
+
+  E.showMenu(mainmenu);
+
+});
diff --git a/apps/nesclock/zelda-screenshot.png b/apps/nesclock/zelda-screenshot.png
new file mode 100644
index 000000000..ab474f646
Binary files /dev/null and b/apps/nesclock/zelda-screenshot.png differ
diff --git a/apps/notanalog/ChangeLog b/apps/notanalog/ChangeLog
index 094125f52..e011c4ae1 100644
--- a/apps/notanalog/ChangeLog
+++ b/apps/notanalog/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Use alarm for timer instead of own alarm implementation.
 0.05: Use internal step counter if no widget is available.
 0.06: Use widget_utils.
+0.07: Respect system setting for 12h or 24h time
diff --git a/apps/notanalog/metadata.json b/apps/notanalog/metadata.json
index 319d396a9..851e95ec8 100644
--- a/apps/notanalog/metadata.json
+++ b/apps/notanalog/metadata.json
@@ -3,7 +3,7 @@
   "name": "Not Analog",
   "shortName":"Not Analog",
   "icon": "notanalog.png",
-  "version":"0.06",
+  "version":"0.07",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "An analog watch face for people that can not read analog watch faces.",
diff --git a/apps/notanalog/notanalog.app.js b/apps/notanalog/notanalog.app.js
index 29fb1730f..b37c34721 100644
--- a/apps/notanalog/notanalog.app.js
+++ b/apps/notanalog/notanalog.app.js
@@ -13,6 +13,9 @@ let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
 for (const key in saved_settings) {
     settings[key] = saved_settings[key]
 }
+const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})[
+  "12hour"
+];
 
 /*
  * Set some important constants such as width, height and center
@@ -199,6 +202,9 @@ function drawTime(){
 
     // Hour
     var h = state.currentDate.getHours();
+    if (is12Hour && h > 12) {
+      h = h - 12;
+    }
     var h1 = parseInt(h / 10);
     var h2 = h < 10 ? h : h - h1*10;
     drawTextCleared(h1, cx, posY+8);
diff --git a/apps/notify/ChangeLog b/apps/notify/ChangeLog
index d7b754ff9..f40490488 100644
--- a/apps/notify/ChangeLog
+++ b/apps/notify/ChangeLog
@@ -9,3 +9,4 @@
 0.10: Improvements to help notifications work with themes
 0.11: Fix regression that caused no notifications and corrupted background
 0.12: Add Bangle.js 2 support with Bangle.setLCDOverlay
+0.13: Add a default title background for the dark theme
diff --git a/apps/notify/metadata.json b/apps/notify/metadata.json
index 1cc8f52c1..bab68127c 100644
--- a/apps/notify/metadata.json
+++ b/apps/notify/metadata.json
@@ -2,7 +2,7 @@
   "id": "notify",
   "name": "Notifications (default)",
   "shortName": "Notifications",
-  "version": "0.12",
+  "version": "0.13",
   "description": "Provides the default `notify` module used by applications to display notifications on the screen. This module is installed by default by client applications such as the Gadgetbridge app.  Installing `Fullscreen Notifications` replaces this module with a version that displays the notifications using the full screen",
   "icon": "notify.png",
   "type": "notify",
diff --git a/apps/notify/notify_bjs1.js b/apps/notify/notify_bjs1.js
index fb56e4bbc..4ff8f88e9 100644
--- a/apps/notify/notify_bjs1.js
+++ b/apps/notify/notify_bjs1.js
@@ -103,7 +103,7 @@ exports.show = function(options) {
   b -= 2;h -= 2;
   // title bar
   if (options.title || options.src) {
-    g.setColor(options.titleBgColor||0x39C7).fillRect(x,y, r,y+20);
+    g.setColor("titleBgColor" in options ? options.titleBgColor : g.theme.dark ? 0x1 : 0x39C7).fillRect(x,y, r,y+20);
     const title = options.title||options.src;
     g.setColor(g.theme.fg).setFontAlign(-1, -1, 0).setFont("6x8", 2);
     g.drawString(title.trim().substring(0, 13), x+25,y+3);
diff --git a/apps/notify/notify_bjs2.js b/apps/notify/notify_bjs2.js
index c202e8c55..456c4e929 100644
--- a/apps/notify/notify_bjs2.js
+++ b/apps/notify/notify_bjs2.js
@@ -100,7 +100,7 @@ exports.show = function(options) {
   gg.clearRect(x,y, r,b);
   // title bar
   if (options.title || options.src) {
-    gg.setColor(options.titleBgColor||0x39C7).fillRect(x,y, r,y+20);
+    gg.setColor("titleBgColor" in options ? options.titleBgColor : g.theme.dark ? 0x1 : 0x39C7).fillRect(x,y, r,y+20);
     const title = options.title||options.src;
     gg.setColor(g.theme.fg).setFontAlign(-1, -1, 0).setFont("6x8", 2);
     gg.drawString(title.trim().substring(0, 13), x+25,y+3);
diff --git a/apps/numerals/ChangeLog b/apps/numerals/ChangeLog
index 57818c180..d6703a96b 100644
--- a/apps/numerals/ChangeLog
+++ b/apps/numerals/ChangeLog
@@ -7,4 +7,5 @@
 0.07: Add date on touch and some improvements (see settings and readme)
 0.08: Add new draw styles, tidy up draw functionality
 0.09: Tweak for faster rendering
-0.10: Enhance for use with Bangle2, insert new draw mode 'thickfill'
\ No newline at end of file
+0.10: Enhance for use with Bangle2, insert new draw mode 'thickfill'
+0.11: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/numerals/metadata.json b/apps/numerals/metadata.json
index 6ba850d86..6a1adc810 100644
--- a/apps/numerals/metadata.json
+++ b/apps/numerals/metadata.json
@@ -2,7 +2,7 @@
   "id": "numerals",
   "name": "Numerals Clock",
   "shortName": "Numerals Clock",
-  "version": "0.10",
+  "version": "0.11",
   "description": "A simple big numerals clock",
   "icon": "numerals.png",
   "type": "clock",
diff --git a/apps/numerals/numerals.settings.js b/apps/numerals/numerals.settings.js
index ae321322a..b4d5d4286 100644
--- a/apps/numerals/numerals.settings.js
+++ b/apps/numerals/numerals.settings.js
@@ -30,10 +30,8 @@
       onchange: v=> { numeralsSettings.drawMode=dm[v]; updateSettings();}
     },
     "Date on touch": {
-      value: 0|numeralsSettings.showDate,
-      min:0,max:1,
-      format: v=>v?"On":"Off",
-      onchange: v=> { numeralsSettings.showDate=v; updateSettings();}
+      value: !!numeralsSettings.showDate,
+      onchange: v=> { numeralsSettings.showDate=v?1:0; updateSettings();}
     },
     "< back": back
   };
diff --git a/apps/ohmcalc/ChangeLog b/apps/ohmcalc/ChangeLog
new file mode 100644
index 000000000..625982edd
--- /dev/null
+++ b/apps/ohmcalc/ChangeLog
@@ -0,0 +1,4 @@
+0.01: New App!
+0.02: New Results menu item to show the formula and values used.
+0.03: Adds haptics to Input screen and long press "C" to go back.
+0.04: Fix font size not resetting on subsequent values in results screen
diff --git a/apps/ohmcalc/README.md b/apps/ohmcalc/README.md
new file mode 100644
index 000000000..3add03736
--- /dev/null
+++ b/apps/ohmcalc/README.md
@@ -0,0 +1,22 @@
+# Ohm's Law Calculator
+
+This is a simple and intuitive Ohm's Law Calculator application designed for the Bangle.js 2 Smartwatch. The calculator focuses on providing an easy-to-navigate user interface with automatic calculation logic, allowing you to quickly and efficiently calculate electrical measurements, including Voltage, Current, Resistance, and Power.
+
+## Usage Guide
+
+* __Select the Electrical Measurement:__ On the main menu, select the electrical measurement that you wish to calculate (Voltage, Current, Resistance, or Power).
+* __Enter Known Values:__ You will then be prompted to enter the known values. The application will present a menu listing the remaining electrical measurements. Select one and you will be taken to a numeric input screen. Repeat this step for the second known value.
+* __View Results:__ Once the two known values have been entered, the application will automatically calculate and display the value of the selected electrical measurement. The Results menu will show the calculated value, the unit of measurement, and the formula used for calculation.
+* __Navigation:__ Whether you're deep in calculations or perusing the results, the power to navigate the app remains in your hands. While the 'Back' button is present in most scenarios, it isn't available in the Results menu and the Input screen. However, you can always return to the beginning by selecting 'Main Menu' from the Results menu. And if you're on the numeric Input screen, simply hold down the 'Clear' button to navigate back.
+
+## Compatibility
+
+This app was built and tested with Bangle.js 2.
+
+## Feedback
+
+If you have any issues or suggestions, please open an issue on this GitHub repository. Contributions to improve the application are also welcomed.
+
+## Creator
+
+[stweedo](https://github.com/stweedo)
diff --git a/apps/ohmcalc/app-icon.js b/apps/ohmcalc/app-icon.js
new file mode 100644
index 000000000..091392f44
--- /dev/null
+++ b/apps/ohmcalc/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4AyQBIvmnM/AAk5F8pWBFwoABMDweGgEHF48HCAw2VE4MGDAgvCRIIACSoIvFgEGG4wuPKAYZCgENn8UgFVqsAik/hoNDC4ouUAAMOLAYoBF4Ok0gGEFwUOTJQuPAAM4DIIJCFAI2GRYM4ZRguNg7pIh0NhpXDAwIVIGBguFdwJlHABbTCgwwPCIgQB1V6dYSXGQ4zzCvWqIwhNBMBwvBvVPbokUKQQADg7BBSQUAp5FBDojANFAQmCAoTxCgEsmc0mkzlgxCMoQwBFwYFBFxgvBgAaCcYcUgEBmdfAA0zCoJiCegc4BIIvNeQwuCg4qEg8rAwowDdhwvLI4IuFLIIHFGAT4EF5rdEJAkHgImHF41fI4p2BAAYtIg8HhpGECwK7FXAQvHBQJIEikNEYIxGgE5UQh2FLw0rlYvHMAwAEnIvDGgIJDigABAwUAlhTGwAvBmgABnQMDlgfDDwRVDMAYvETocOAwSOFLwPVp6wEGAY8BC4MOBgYvMqukgENXwU0Lw3V5+kAALDFBoLaBhsA0lVF6U4F4rFBFgXP6uANoovVR5U6RQlP6ryGR6jvMnTqCYQJeGd6AwBBIYAFRIIiEeQheGr7FBDxE5FwZgCCQMHhqkBIwZTGYYYKGRwJ4DDIMNEYIoCF4YxEAAIWEMBAIBLxhIBAAYtFGYwXEnAmHF4JeFA4J4EAwIrLF5JICGAq9GE4J2EF6JsBI4UNhx5EYY67CFwcOhp3DGB0AFQTQCAoU4AwUsmYAClgHBg5EChwGCAoaNQE4N6p4wDMQIxCAAcHRYYoBp96DoouLgyjE1QZBPYQAEnDmEAAUNIoOqbYkGGBTsFCIL0GABhsCJoZgOFAkHFxEOAASZDNwYVFFxgwHdogJCii+DXoIGCgyXGFxwwHboIoG0mkAwgWBgBnDFyIwFVYQICQgIoBqtVF4TrBBoQXFFyAwDeAI4GnJmDnImGSYIuUJQbKMKxAXGAC4eBF44oeGBCJBAAiVBF0hgCAA4vlGI4tnADg="))
diff --git a/apps/ohmcalc/app.js b/apps/ohmcalc/app.js
new file mode 100644
index 000000000..5ef30aaa5
--- /dev/null
+++ b/apps/ohmcalc/app.js
@@ -0,0 +1,371 @@
+let Layout = require("Layout");
+
+// Definitions for units and formulas for electrical measurements.
+const UNITS = {
+  "Voltage (V)": "Volts",
+  "Current (I)": "Amps",
+  "Resistance (R)": "Ohms",
+  "Power (P)": "Watts",
+};
+
+const FORMULAS = {
+  'Voltage (V)': {
+    'Current (I), Resistance (R)': { equation: "{0} * {1}", display: "V = I * R" },
+    'Power (P), Current (I)': { equation: "{0} / {1}", display: "V = P / I" },
+    'Power (P), Resistance (R)': { equation: "Math.sqrt({0} * {1})", display: "V = sqrt(P * R)" }
+  },
+  'Current (I)': {
+    'Voltage (V), Resistance (R)': { equation: "{0} / {1}", display: "I = V / R" },
+    'Power (P), Voltage (V)': { equation: "{0} / {1}", display: "I = P / V" },
+    'Power (P), Resistance (R)': { equation: "Math.sqrt({0} / {1})", display: "I = sqrt(P / R)" }
+  },
+  'Resistance (R)': {
+    'Voltage (V), Current (I)': { equation: "{0} / {1}", display: "R = V / I" },
+    'Power (P), Current (I)': { equation: "{0} / (Math.pow({1}, 2))", display: "R = P / I^2" },
+    'Power (P), Voltage (V)': { equation: "(Math.pow({1}, 2)) / {0}", display: "R = V^2 / P" }
+  },
+  'Power (P)': {
+    'Voltage (V), Current (I)': { equation: "{0} * {1}", display: "P = V * I" },
+    'Current (I), Resistance (R)': { equation: "(Math.pow({0}, 2)) * {1}", display: "P = I^2 * R" },
+    'Voltage (V), Resistance (R)': { equation: "(Math.pow({0}, 2)) / {1}", display: "P = V^2 / R" }
+  },
+};
+
+// Screen positioning settings
+let btnSize = 23;
+let xCenter = g.getWidth() / 2;
+let yCenter = g.getHeight() / 2;
+
+// Variables to hold state
+let lastStringWidth = 0;
+let halfStringWidth = lastStringWidth / 2;
+let calculatedVariable;
+let selectedVariable;
+let variableValues = {};
+let inputStr = "";
+let invalidInput = false;
+
+// Function references
+let handleEnter;
+let showVariableSelectionMenu;
+let showInputMenu;
+let resultsMenu;
+let mainMenu;
+
+// Setup the layout for input buttons
+let layout = new Layout({
+  type: "v",
+  c: [
+    { type: "txt", font: "6x8:3", label: "", id: "label" },
+    { type: "h", c: "123".split("").map(i => ({ type: "btn", font: "6x8:3", label: i, cb: () => { handleButtonPress(i); }, fillx: 1, filly: 1 })) },
+    { type: "h", c: "456".split("").map(i => ({ type: "btn", font: "6x8:3", label: i, cb: () => { handleButtonPress(i); }, fillx: 1, filly: 1 })) },
+    { type: "h", c: "789".split("").map(i => ({ type: "btn", font: "6x8:3", label: i, cb: () => { handleButtonPress(i); }, fillx: 1, filly: 1 })) },
+    { type: "h", c: ".0C".split("").map(i => ({ type: "btn", font: "6x8:3", label: i, cb: () => { handleButtonPress(i); }, cbl: i === "C" ? () => { showVariableSelectionMenu(); Bangle.buzz(20); } : undefined, fillx: 1, filly: 1 })) },
+    { type: "h", c: [{ type: "btn", font: "6x8:2", label: "Enter", cb: () => { handleEnter(); }, fillx: 1, filly: 1 }] }
+  ]
+}, { lazy: false });
+
+// Clears area at the top of the screen where the text is displayed
+function clearTextArea() { // Except Back Button
+  let x2 = g.getWidth();
+  g.clearRect(0, 0, x2, btnSize);
+}
+
+// Function to clear the entire screen, except for the Back button
+function clearScreen() {
+  let x2 = g.getWidth();
+  let y2 = g.getHeight();
+  g.clearRect(btnSize, 0, x2, btnSize);
+  g.clearRect(0, btnSize, x2, y2);
+}
+
+// Function to set up and display the calculator input screen
+function showCalculatorInputScreen(variable) {
+  selectedVariable = variable;
+  layout.setUI();
+  layout.render();
+}
+
+// Function to set and display the current value of the input
+// Adjusts the font size to fit the screen width
+function setValue(newStr) {
+  clearTextArea();
+  inputStr = newStr;
+
+  // Here we check the width of the string and adjust the font size
+  // Start with a standard font size and increase if the string is too wide
+  let fontSize = "6x8:3";  // start with a standard size
+  g.setFont(fontSize);
+
+  // If the string is too long to fit on the screen, adjust the font size
+  while (g.stringWidth(inputStr) > g.getWidth() - 10 && fontSize !== "6x8:1") {
+    fontSize = "6x8:" + (Number(fontSize.split(":")[1]) - 1).toString();
+    g.setFont(fontSize);
+  }
+
+  layout.label.label = inputStr;
+  g.drawString(inputStr, layout.label.x, layout.label.y + 11);
+  lastStringWidth = g.stringWidth(inputStr);
+}
+
+// Function to handle the press of a button and append its value to the current input
+function handleButtonPress(value) {
+  Bangle.buzz(20);
+  if (invalidInput) {
+    return; // Don't allow input if an invalid input error message is displayed
+  }
+  inputStr = value === 'C' ? '' : inputStr + value;
+  setValue(inputStr);
+}
+
+// Function to format the unit of measurement
+function formatUnit(unit, value) {
+  return parseFloat(value) === 1 ? unit.slice(0, -1) : unit;
+}
+
+// Calculates the value of the selected variable based on the entered values
+// Also handles rounding and trimming of long decimal numbers
+function calculateValue(calculatedVariable, variableValues) {
+  let formulas = FORMULAS[calculatedVariable];
+  let formulaKeys = Object.keys(formulas);
+  for (let i = 0; i < formulaKeys.length; i++) {
+    let formulaKey = formulaKeys[i];
+    let variables = formulaKey.split(', ');
+    if (variables.every(variable => variableValues.hasOwnProperty(variable))) {
+      let formulaData = formulas[formulaKey];
+      let formula = formulaData.equation;
+      let formulaDisplay = formulaData.display;
+      let formulaValues = variables.map(variable => variableValues[variable]);
+      let calculatedValue = eval(formula.replace(/\{(\d+)\}/g, (_, index) => formulaValues[index]));
+
+      // Check if the number is an integer
+      let isInteger = Math.floor(calculatedValue) === calculatedValue;
+
+      // Round and trim long decimal numbers
+      if (!isInteger) {
+        calculatedValue = calculatedValue.toFixed(3);
+        calculatedValue = calculatedValue.replace(/\.0+$/, '').replace(/(\.\d*[1-9])0+$/, '$1');
+      }
+
+      let result = Object.entries(variableValues).map(function (entry) {
+        let variable = entry[0];
+        let value = entry[1];
+        return [variable, `${value} ${formatUnit(UNITS[variable], value.toString())}`];
+      });
+      result.push([calculatedVariable, `${calculatedValue} ${formatUnit(UNITS[calculatedVariable], calculatedValue.toString())}`]);
+      return {
+        formula: formulaDisplay.replace(/\{(\d+)\}/g, (_, index) => formulaValues[index]),
+        value: calculatedValue,
+        unit: formatUnit(UNITS[calculatedVariable], calculatedValue),
+        result: result,
+      };
+    }
+  }
+}
+
+// Main function to initialize the application and setup the main menu
+(function () {
+  mainMenu = {
+    '': { 'title': 'Ohm\'s Law Calc' },
+    '< Back': () => Bangle.showClock()
+  };
+
+  Object.keys(UNITS).forEach(unit => {
+    mainMenu[unit] = () => handleUnitSelection(unit);
+  });
+
+  // Function to present the menu for selecting the variable
+  // Filters out the calculated variable and already set variables from the menu
+  showVariableSelectionMenu = function () {
+    clearScreen();
+    let variableSelectionMenu = {
+      '': { 'title': 'Select Variable' },
+      '< Back': () => {
+        E.showMenu(mainMenu);
+        variableValues = {};
+      }
+    };
+    let variables = Object.keys(UNITS);
+    let remainingVariables = variables.filter(v => v !== calculatedVariable && !variableValues[v]);
+    remainingVariables.forEach(variable => {
+      variableSelectionMenu[variable] = function () {
+        showInputMenu(variable);
+      };
+    });
+    E.showMenu(variableSelectionMenu);
+  };
+
+  // Function to handle the input of variable values
+  // It sets the current selected variable and displays the calculator input screen
+  showInputMenu = function (variable) {
+    setValue("");
+    selectedVariable = variable;
+    let inputMenu = {
+      '': { 'title': variable },
+    };
+    E.showMenu(inputMenu);
+    showCalculatorInputScreen(variable);
+  };
+
+  // Function to handle the event of pressing 'Enter'
+  // It checks if the input is valid, if so, it saves the value and 
+  // either calculates the result (if enough variables are present) or opens variable selection menu
+  handleEnter = function () {
+    // Check if the input is valid
+    if (inputStr === "" || isNaN(inputStr) || (inputStr.match(/\./g) || []).length > 1) {
+      // Show error message
+      setValue("Invalid Input");
+      invalidInput = true;  // Prevent further input
+      // Clear error message after 2 seconds
+      setTimeout(() => {
+        setValue('');
+        invalidInput = false;  // Allow input again
+      }, 2000);
+      return;
+    }
+
+    if (calculatedVariable === null) {
+      return;
+    }
+    variableValues[selectedVariable] = parseFloat(inputStr);
+    if (Object.keys(variableValues).length === 2) {
+      let result = calculateValue(calculatedVariable, variableValues);
+      showResultsScreen(result);
+      calculatedVariable = null;
+      variableValues = {};
+    } else {
+      setValue("");
+      showVariableSelectionMenu();
+      return;
+    }
+    return;
+  };
+
+  // Function to handle the selection of a unit of electical measurement
+  function handleUnitSelection(unit) {
+    calculatedVariable = unit;
+    showVariableSelectionMenu();
+  }
+
+  // Function to display the results screen with the calculated value
+  function drawValueScreen
+  (result) {
+    let drawPage = function () {
+      clearScreen();
+      let fontSize = g.getHeight() / 3;
+      g.setFontVector(fontSize);
+
+      // Reduce the font size until both the value and unit fit on the screen
+      while (g.stringWidth(result.value) > g.getWidth() - 10 || g.getFontHeight() > g.getHeight() / 2) {
+        fontSize--;
+        g.setFontVector(fontSize);
+      }
+
+      let valueY = yCenter - g.getFontHeight() / 2;
+      let unitY = yCenter + g.getFontHeight() / 2;
+      let valueWidth = g.stringWidth(result.value);
+      let unitWidth = g.stringWidth(result.unit);
+      let valueX = (g.getWidth() - valueWidth) / 2;
+      let unitX = (g.getWidth() - unitWidth) / 2;
+
+      g.drawString(result.value, valueX, valueY);
+      g.drawString(result.unit, unitX, unitY);
+      g.flip();
+    };
+
+    // Shows the back button on the value screen
+    return function () {
+      clearScreen();
+      let valueMenu = {
+        '': { 'title': 'Results' },
+        '< Back': function () {
+          E.showMenu(resultsMenu);
+        }
+      };
+      E.showMenu(valueMenu);
+      drawPage();
+    };
+  }
+
+  // Function to display the results screen with the values from the result.result array
+  function drawResultScreen(result) {
+    let drawPage = function() {
+      clearScreen();
+      // Define the vertical positions of the titles
+      let titlePositions = [10, 72, 132];
+      let lineSpacing = 15; // Space between lines
+      for (let i = 0; i < result.result.length; i++) {
+        let fontSize = 30;  // Initial font size
+        let currentResult = result.result[i];
+        let resultTitle = currentResult[0];
+        let resultValue = currentResult[1];
+
+        // Draw title
+        g.setFontVector(fontSize / 2); // Small font for title
+        let titleX = (g.getWidth() - g.stringWidth(resultTitle)) / 2;
+        let titleY = titlePositions[i]; // Get the vertical position for the title
+        g.drawString(resultTitle, titleX, titleY); // Draw at the desired position
+
+        let underlineYPosition = titleY + g.getFontHeight() - 3;
+        g.drawLine(titleX, underlineYPosition, titleX + g.stringWidth(resultTitle), underlineYPosition); // Draw underline
+
+        let valueX;
+        let valueY = titleY + g.getFontHeight(); // Draw below the title
+
+        // Calculate the font size for value dynamically
+        g.setFontVector(fontSize);
+        while (g.stringWidth(resultValue) > g.getWidth() - 10) {
+          fontSize--; // Reduce the font size by 1
+          g.setFontVector(fontSize);
+        }
+
+        valueY += g.getFontHeight() / 2 + 2;
+        valueX = (g.getWidth() - g.stringWidth(resultValue)) / 2;
+        g.drawString(resultValue, valueX, valueY); // Draw at the desired position
+
+        // Move down for the next entry
+        let nextTitleY = (i + 1 < titlePositions.length) ? titlePositions[i + 1] : titleY + 1.5 * fontSize + lineSpacing;
+        yPosition = nextTitleY;
+      }
+      g.flip();
+    };
+
+    // Shows the back button on the result screen
+    return function() {
+      clearScreen();
+      let resultMenu = {
+        '': { 'title': 'Results' },
+        '< Back': function() {
+          E.showMenu(resultsMenu);
+        }
+      };
+      E.showMenu(resultMenu);
+      drawPage();
+    };
+  }
+
+  // Shows the results menu with the calculated results and options
+  function showResultsScreen(result) {
+    let backButton = function () {
+      clearScreen();
+      E.showMenu(resultsMenu);
+    };
+    g.clear();
+    resultsMenu = {
+      '': { 'title': 'Results' },
+      'Main Menu': function () {
+        E.showMenu(mainMenu);
+      },
+    };
+    resultsMenu[result.value + ' ' + result.unit] = drawValueScreen(result);
+    resultsMenu[result.formula] = drawResultScreen(result);
+    resultsMenu['Exit'] = function () {
+      Bangle.showClock();
+    };
+    E.showMenu(resultsMenu);
+  }
+
+  clearTextArea();
+  E.showMenu(mainMenu);
+
+})();
diff --git a/apps/ohmcalc/app.png b/apps/ohmcalc/app.png
new file mode 100644
index 000000000..65d6c2bf2
Binary files /dev/null and b/apps/ohmcalc/app.png differ
diff --git a/apps/ohmcalc/metadata.json b/apps/ohmcalc/metadata.json
new file mode 100644
index 000000000..252ece421
--- /dev/null
+++ b/apps/ohmcalc/metadata.json
@@ -0,0 +1,23 @@
+{
+  "id": "ohmcalc",
+  "name": "Ohm's Law Calculator",
+  "shortName": "Ohm's Law Calc",
+  "version": "0.04",
+  "description": "A smart and simple calculator for Ohm's Law calculations, designed specifically for Bangle.js 2 smartwatches. Handles voltage, current, resistance, and power calculations with smart logic to prevent invalid inputs.",
+  "icon": "app.png",
+  "type": "app",
+  "tags": "calculator, utilities, electric",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "allow_emulator": true,
+  "storage": [{
+      "name": "ohmcalc.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "ohmcalc.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    }
+  ]
+}
diff --git a/apps/openstmap/ChangeLog b/apps/openstmap/ChangeLog
index 7f788c139..3d08bdf46 100644
--- a/apps/openstmap/ChangeLog
+++ b/apps/openstmap/ChangeLog
@@ -16,3 +16,13 @@
       Support for zooming in on map
       Satellite count moved to widget bar to leave more room for the map
 0.15: Make track drawing an option (default off)
+0.16: Draw waypoints, too.
+0.17: With new Recorder app allow track to be drawn in the background
+      Switch tile layer URL for faster/more reliable map tiles
+0.18: Prefer map with highest resolution
+0.19: Remember latitude, longitude & scale
+0.20: Make Satellite counter widget 24px wide (was 48)
+      Move 'Center GPS' to the top of the menu
+      If 'Recorder' app installed, add a 'Record' menu item
+0.21: Draw a current position marker (Bangle.js 2 only)
+      Enable/Disable previous position marker in new setting "Draw cont. position"
diff --git a/apps/openstmap/README.md b/apps/openstmap/README.md
index f19b13bd1..bf247c7b7 100644
--- a/apps/openstmap/README.md
+++ b/apps/openstmap/README.md
@@ -17,20 +17,20 @@ To add a map:
 * Scroll and zoom to the area of interest or use the Search button in the top left
 * Now choose the size you want to upload (Small/Medium/etc)
 * On Bangle.js 1 you can choose if you want a 3 bits per pixel map (this is lower
-quality but uploads faster and takes less space). On Bangle.js 2 you only have a 3bpp
-display so can only use 3bpp.
+quality, but uploads faster and takes less space). Bangle.js 2 is limited to 3bpp.
 * Click `Get Map`, and a preview will be displayed. If you need to adjust the area you
 can change settings, move the map around, and click `Get Map` again.
 * When you're ready, click `Upload`
 
 ## Bangle.js App
 
-The Bangle.js app allows you to view a map - it also turns the GPS on and marks
-the path that you've been travelling (if enabled).
+The Bangle.js app allows you to view a map. It also turns the GPS on
+and marks the path that you've been travelling (if enabled), and
+displays waypoints in the watch (if dependencies exist).
 
 * Drag on the screen to move the map
-* Press the button to bring up a menu, where you can zoom, go to GPS location
-, put the map back in its default location, or choose whether to draw the currently
+* Press the button to bring up a menu, where you can zoom, go to GPS location,
+put the map back in its default location, or choose whether to draw the currently
 recording GPS track (from the `Recorder` app).
 
 **Note:** If enabled, drawing the currently recorded GPS track can take a second
diff --git a/apps/openstmap/app.js b/apps/openstmap/app.js
index 89e2d2ddb..43c747ba7 100644
--- a/apps/openstmap/app.js
+++ b/apps/openstmap/app.js
@@ -5,12 +5,32 @@ var fix = {};
 var mapVisible = false;
 var hasScrolled = false;
 var settings = require("Storage").readJSON("openstmap.json",1)||{};
+var plotTrack;
+let checkMapPos = false; // Do we need to check the if the coordinates we have are valid
+
+if (settings.lat !== undefined && settings.lon !== undefined && settings.scale !== undefined) {
+  // restore last view
+  m.lat = settings.lat;
+  m.lon = settings.lon;
+  m.scale = settings.scale;
+  checkMapPos = true;
+}
 
 // Redraw the whole page
 function redraw() {
   g.setClipRect(R.x,R.y,R.x2,R.y2);
-  m.draw();
+  const count = m.draw();
+  if (checkMapPos && count === 0) {
+    // no map at these coordinates, lets try again with first map
+    m.lat = m.map.lat;
+    m.lon = m.map.lon;
+    m.scale = m.map.scale;
+    checkMapPos = false;
+    m.draw();
+  }
+  drawPOI();
   drawMarker();
+  drawLocation();
   // if track drawing is enabled...
   if (settings.drawTrack) {
     if (HASWIDGETS && WIDGETS["gpsrec"] && WIDGETS["gpsrec"].plotTrack) {
@@ -19,84 +39,167 @@ function redraw() {
     }
     if (HASWIDGETS && WIDGETS["recorder"] && WIDGETS["recorder"].plotTrack) {
       g.setColor("#f00").flip(); // force immediate draw on double-buffered screens - track will update later
-      WIDGETS["recorder"].plotTrack(m);
+      plotTrack = WIDGETS["recorder"].plotTrack(m, { async : true, callback : function() {
+        plotTrack = undefined;
+      }});
     }
   }
   g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
 }
 
+// Draw the POIs
+function drawPOI() {
+  try {
+    var waypoints = require("waypoints").load();
+  } catch (ex) {
+    // Waypoints module not available.
+    return;
+  }
+  g.setFont("Vector", 18);
+  waypoints.forEach((wp, idx) => {
+    var p = m.latLonToXY(wp.lat, wp.lon);
+    var sz = 2;
+    g.setColor(0,0,0);
+    g.fillRect(p.x-sz, p.y-sz, p.x+sz, p.y+sz);
+    g.setColor(0,0,0);
+    g.drawString(wp.name, p.x, p.y);
+    //print(wp.name);
+  })
+}
+
 // Draw the marker for where we are
 function drawMarker() {
-  if (!fix.fix) return;
+  if (!fix.fix || !settings.drawMarker) return;
   var p = m.latLonToXY(fix.lat, fix.lon);
   g.setColor(1,0,0);
   g.fillRect(p.x-2, p.y-2, p.x+2, p.y+2);
 }
 
+// Draw current location with LCD Overlay (Bangle.js 2 only)
+function drawLocation() {
+  if (!Bangle.setLCDOverlay) {
+    return; // Overlay not supported
+  }
+
+  if (!fix.fix || !mapVisible) {
+    if (this.hasOverlay) {
+      Bangle.setLCDOverlay(); // clear if map is not visible or no fix
+      this.hasOverlay = false;
+    }
+    return;
+  }
+
+  const icon = require("heatshrink").decompress(atob("jEYwYPMyVJkgHEkgICyAHCgIIDyQIChIIEoAIDC4IIEBwOAgEEyVIBAY4DBD4sGHxBQIMRAIIPpAyCHAYILUJEAiVJkAIFgVJXo5fCABQA==")); // 24x24px
+  var p = m.latLonToXY(fix.lat, fix.lon);
+  Bangle.setLCDOverlay(icon, p.x-24/2, p.y-24);
+  this.hasOverlay = true;
+}
+
 Bangle.on('GPS',function(f) {
   fix=f;
-  if (HASWIDGETS) WIDGETS["sats"].draw(WIDGETS["sats"]);
-  if (mapVisible) drawMarker();
+  if (HASWIDGETS && WIDGETS["sats"]) WIDGETS["sats"].draw(WIDGETS["sats"]);
+  if (mapVisible) {
+    drawMarker();
+    drawLocation();
+  }
 });
 Bangle.setGPSPower(1, "app");
 
 if (HASWIDGETS) {
   Bangle.loadWidgets();
-  WIDGETS["sats"] = { area:"tl", width:48, draw:w=>{
-    var txt = (0|fix.satellites)+" Sats";
-    if (!fix.fix) txt += "\nNO FIX";
-      g.reset().setFont("6x8").setFontAlign(0,0)
-        .drawString(txt,w.x+24,w.y+12);
-    }
-  };
+  if (!WIDGETS["gps"]) { // one GPS Widget is enough
+    WIDGETS["sats"] = { area:"tl", width:24, draw:w=>{
+      var sats = 0|fix.satellites;
+      g.reset().clearRect(w.x,w.y,w.x+23,w.y+23).           drawImage(atob("EhPCAP//vmU0Cv++BUAAAANVQAAANVUAAANVVSoA/VVWqA/VqqqA/1VVoA/9VVkAP/VVlAP/1VVAP/9VVQD//WVUA//2VUA//9VUAX//1UBV///0BVX//ABVVAAABVVAAAA="), w.x,w.y+5); // 18x19
+      if (fix.fix) g.setFont("6x8").setFontAlign(1,-1).drawString(sats,w.x+23,w.y);
+      else g.setFont("4x6:2").setColor("#f00").setFontAlign(1,-1).drawString("X",w.x+23,w.y);
+    }};
+  }
   Bangle.drawWidgets();
 }
 R = Bangle.appRect;
 
+function writeSettings() {
+  settings.lat = m.lat;
+  settings.lon = m.lon;
+  settings.scale = m.scale;
+  require("Storage").writeJSON("openstmap.json",settings);
+}
+
+function showMenu() {
+  if (plotTrack && plotTrack.stop)
+    plotTrack.stop();
+  mapVisible = false;
+  drawLocation();
+  var menu = {
+    "":{title:/*LANG*/"Map"},
+    "< Back": ()=> showMap(),
+  };
+  // If we have a GPS fix, add a menu item to center it
+  if (fix.fix) menu[/*LANG*/"Center GPS"]=() =>{
+    m.lat = fix.lat;
+    m.lon = fix.lon;
+    showMap();
+  };
+  menu = Object.assign(menu, {
+  /*LANG*/"Zoom In": () =>{
+    m.scale /= 2;
+    showMap();
+  },
+  /*LANG*/"Zoom Out": () =>{
+    m.scale *= 2;
+    showMap();
+  },
+  /*LANG*/"Draw Track": {
+    value : !!settings.drawTrack,
+    onchange : v => { settings.drawTrack=v; writeSettings(); }
+  },
+  /*LANG*/"Draw cont. position": {
+    value : !!settings.drawMarker,
+    onchange : v => { settings.drawMarker=v; writeSettings(); }
+  },
+  /*LANG*/"Center Map": () =>{
+    m.lat = m.map.lat;
+    m.lon = m.map.lon;
+    m.scale = m.map.scale;
+    showMap();
+  }
+  });
+  // If we have the recorder widget, add a menu item to start/stop recording
+  if (WIDGETS.recorder) {
+    menu[/*LANG*/"Record"] = {
+      value : WIDGETS.recorder.isRecording(),
+      onchange : isOn => {
+        E.showMessage(/*LANG*/"Please Wait...");
+        WIDGETS.recorder.setRecording(isOn).then(showMap);
+      }
+    };
+  }
+  menu[/*LANG*/"Exit"] = () => load();
+  E.showMenu(menu);
+}
+
 function showMap() {
   mapVisible = true;
   g.reset().clearRect(R);
   redraw();
   Bangle.setUI({mode:"custom",drag:e=>{
+    if (plotTrack && plotTrack.stop) plotTrack.stop();
     if (e.b) {
       g.setClipRect(R.x,R.y,R.x2,R.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;
+      drawLocation();
     } else if (hasScrolled) {
       hasScrolled = false;
       redraw();
     }
-  }, btn: btn=>{
-    mapVisible = false;
-    var menu = {"":{title:"Map"},
-    "< Back": ()=> showMap(),
-    /*LANG*/"Zoom In": () =>{
-      m.scale /= 2;
-      showMap();
-    },
-    /*LANG*/"Zoom Out": () =>{
-      m.scale *= 2;
-      showMap();
-    },
-    /*LANG*/"Draw Track": {
-      value : !!settings.drawTrack,
-      onchange : v => { settings.drawTrack=v; require("Storage").writeJSON("openstmap.json",settings); }
-    },
-    /*LANG*/"Center Map": () =>{
-      m.lat = m.map.lat;
-      m.lon = m.map.lon;
-      m.scale = m.map.scale;
-      showMap();
-    }};
-    if (fix.fix) menu[/*LANG*/"Center GPS"]=() =>{
-      m.lat = fix.lat;
-      m.lon = fix.lon;
-      showMap();
-    };
-    E.showMenu(menu);
-  }});
+  }, btn: () => showMenu() });
 }
 
 showMap();
+
+// Write settings on exit via button
+setWatch(() => writeSettings(), BTN, { repeat: true, edge: "rising" });
diff --git a/apps/openstmap/imagefilter.js b/apps/openstmap/imagefilter.js
new file mode 100644
index 000000000..aa976dc0f
--- /dev/null
+++ b/apps/openstmap/imagefilter.js
@@ -0,0 +1,106 @@
+/* Image filtering code that helps to transform the OSM tile
+into something that's usable on a 3bpp screen.
+
+Stick this in a file so we can
+*/
+
+
+function imageFilterFor3BPP(srcData, dstData, options) {
+  options = options || {};
+  if (options.colLo === undefined)
+    options.colLo = 140; // when adding contrast/saturation, this is the max saturaton we add
+  if (options.colHi === undefined)
+    options.colHi = 250;
+  if (options.sharpen === undefined)
+    options.sharpen = true;
+  if (options.dither === undefined)
+    options.dither = false;
+
+  const width = srcData.width;
+  const height = srcData.height;
+  var rgbaSrc = srcData.data;
+  var rgbaDst = dstData.data;
+  function getPixel(x,y) {
+    if (x<0) x=0;
+    if (y<0) y=0;
+    if (x>=width) x=width-1;
+    if (y>=height) y=height-1;
+    var i = (x + y*width)*4;
+    return [
+      rgbaSrc[i+0], rgbaSrc[i+1], rgbaSrc[i+2]
+    ];
+  }
+  function dmul(a, mul) { return a.map(a => a.map(n=>n*mul)); }
+  const KS = 5; // kernel size
+  const KO = 2; // kernel offset
+  const K = dmul([ // 5x5 sharpening kernel
+    [ 1,4,6,4,1 ],
+    [4,16,24,16,4],
+    [6,24,-476,24,6],
+    [4,16,24,16,4],
+    [ 1,4,6,4,1 ],
+  ], -1/256);
+  /*const KS = 7; // kernel size
+  const KO = 3; // kernel offset
+  const K = dmul([ // 7x7 sharpening (gaussian -  2x middle pixel)
+    [ 0, 0, 1, 2, 1, 0, 0 ],
+    [ 0, 3,13,22,13, 3, 0 ],
+    [ 1,13,59,97,59,13, 1 ],
+    [ 2,22,97,159-2006,97,22,2 ],
+    [ 1,13,59,97,59,13, 1 ],
+    [ 0, 3,13,22,13, 3, 0 ],
+    [ 0, 0, 1, 2, 1, 0, 0 ],
+  ], -1/1003);*/
+  const DITHERM = 3; // dither width -1 (dither must be power 2)
+  const DITHER = dmul([ // dithering matrix
+    [ 0,1,2,3 ],
+    [ 1,2,3,0 ],
+    [ 2,3,2,1 ],
+    [ 3,2,1,0 ],
+  ], 256/4);
+
+
+  var idx=0;
+  for (var y=0;y<height;y++) {
+    for (var x=0;x<width;x++) {
+      var col;
+      if (options.sharpen) {
+        // Apply a sharpening filter
+        var col = [0,0,0];
+        for (var ky=0;ky<KS;ky++)
+          for (var kx=0;kx<KS;kx++) {
+            var c = getPixel(x+kx-KO, y+ky-KO);
+            col[0] += c[0] * K[kx][ky];
+            col[1] += c[1] * K[kx][ky];
+            col[2] += c[2] * K[kx][ky];
+          }
+        for (var n=0;n<3;n++) {
+          col[n] = Math.round(col[n]);
+          if (col[n]<0) col[n]=0;
+          if (col[n]>255) col[n]=255;
+        }
+      } else { // if not sharpening, just get pixel
+        col = getPixel(x,y);
+      }
+      // increase saturation / contrast
+      var min = Math.min(col[0], col[1], col[2]);
+      var max = Math.max(col[0], col[1], col[2]);
+      var d = max-min;
+      if (min>options.colLo) min=options.colLo;
+      if (max<options.colHi) max=options.colHi;
+      d = max-min;
+      for (var n=0;n<3;n++) {
+        col[n] = (col[n]-min) * 256 / d;
+        if (options.dither) { //  && col[n]<192 is more pleasant
+          if (col[n] > DITHER[x&DITHERM][y&DITHERM]) // dither
+            col[n] = 255;
+          else
+            col[n] = 0;
+        }
+        rgbaDst[idx+n] = col[n];
+      }
+      rgbaDst[idx+3] = 255;
+      idx+=4;
+    }
+  }
+}
diff --git a/apps/openstmap/interface.html b/apps/openstmap/interface.html
index 0bf2268a4..0d9ef3152 100644
--- a/apps/openstmap/interface.html
+++ b/apps/openstmap/interface.html
@@ -69,7 +69,7 @@
     <script src="../../webtools/heatshrink.js"></script>
     <script src="../../webtools/imageconverter.js"></script>
     <script src="https://unpkg.com/leaflet-geosearch@3.6.0/dist/bundle.min.js"></script>
-
+    <script src="imagefilter.js"></script>
     <script>
     /*
 
@@ -87,8 +87,8 @@ TODO:
       However some don't allow cross-origin use */
       //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';
+      var TILELAYER = 'https://tile.openstreetmap.org/{z}/{x}/{y}.png';
+      var PREVIEWTILELAYER = 'https://tile.openstreetmap.org/{z}/{x}/{y}.png';
 
       var loadedMaps = [];
 
@@ -183,7 +183,7 @@ TODO:
                     }).addTo(map);
                     let marker = new L.marker(latlon).addTo(map);
                     map.fitBounds(latlon.toBounds(2000/*meters*/), {animation: false});
-                  }, 100);
+                  }, 500);
                 }
                 resolve();
               });
@@ -239,6 +239,8 @@ TODO:
         document.getElementById("mapContainer").style.display = "";
         document.getElementById("maptiles").style.display="none";
         document.getElementById("uploadbuttons").style.display="none";
+        map.invalidateSize();
+        map.locate({setView: true, maxZoom: 16, enableHighAccuracy:true});
       }
 
       // -----------------------------------------------------
@@ -260,27 +262,10 @@ TODO:
           turn the saturation up to maximum, so when thresholded it
           works a lot better */
           var imageData = ctx.getImageData(0,0,width,height);
-          var rgba = imageData.data;
-          var l = width*height*4;
-          for (var i=0;i<l;i+=4) {
-             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 || (d<8 && max<215)) { // black, or a darker grey
-               rgba[i+0]=0;
-               rgba[i+1]=0;
-               rgba[i+2]=0;
-             } else if (min>240 || d<8) { // white or grey
-               rgba[i+0]=255;
-               rgba[i+1]=255;
-               rgba[i+2]=255;
-             } else { // another colour - use max saturation
-               rgba[i+0] = (rgba[i+0]-min) * 255 / d;
-               rgba[i+1] = (rgba[i+1]-min) * 255 / d;
-               rgba[i+2] = (rgba[i+2]-min) * 255 / d;
-             }
-          }
-          ctx.putImageData(imageData,0,0);
+          var dstData = ctx.createImageData(width, height);
+          var filterOptions = {};
+          imageFilterFor3BPP(imageData, dstData, filterOptions);
+          ctx.putImageData(dstData,0,0);
         }
         console.log("Compression options", options);
         var w = Math.round(width / TILESIZE);
@@ -294,7 +279,7 @@ TODO:
             options.width = TILESIZE;
             options.height = TILESIZE;
             var imgstr = imageconverter.RGBAtoString(rgba, options);
-            ctx.putImageData(imageData,x*TILESIZE, y*TILESIZE); // write preview
+            //ctx.putImageData(imageData,x*TILESIZE, y*TILESIZE); // write preview
             /*var compress = 'require("heatshrink").decompress('
             if (!imgstr.startsWith(compress)) throw "Data in wrong format";
             imgstr = imgstr.slice(compress.length,-1);*/
diff --git a/apps/openstmap/metadata.json b/apps/openstmap/metadata.json
index 819dc4122..1b4ab2d7c 100644
--- a/apps/openstmap/metadata.json
+++ b/apps/openstmap/metadata.json
@@ -2,7 +2,7 @@
   "id": "openstmap",
   "name": "OpenStreetMap",
   "shortName": "OpenStMap",
-  "version": "0.15",
+  "version": "0.21",
   "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",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/openstmap/openstmap.js b/apps/openstmap/openstmap.js
index 692344357..0a8f35f66 100644
--- a/apps/openstmap/openstmap.js
+++ b/apps/openstmap/openstmap.js
@@ -30,16 +30,19 @@ m.maps = require("Storage").list(/openstmap\.\d+\.json/).map(f=>{
   map.center = Bangle.project({lat:map.lat,lon:map.lon});
   return map;
 });
+m.maps.sort((a,b) => b.scale-a.scale); // sort by scale so highest resolution is drawn last
 // we base our start position on the middle of the first map
 m.map = m.maps[0];
 m.scale = m.map.scale; // current scale (based on first map)
 m.lat = m.map.lat; // position of middle of screen
 m.lon = m.map.lon;  // position of middle of screen
 
+// return number of tiles drawn
 exports.draw = function() {
   var cx = g.getWidth()/2;
   var cy = g.getHeight()/2;
   var p = Bangle.project({lat:m.lat,lon:m.lon});
+  let count = 0;
   m.maps.forEach((map,idx) => {
     var d = map.scale/m.scale;
     var ix = (p.x-map.center.x)/m.scale + (map.imgx*d/2) - cx;
@@ -67,12 +70,15 @@ exports.draw = function() {
     }
     var mx = g.getWidth();
     var my = g.getHeight();
-    for (var x=ox,ttx=tx; x<mx && ttx<map.w; x+=s,ttx++)
+    for (var x=ox,ttx=tx; x<mx && ttx<map.w; x+=s,ttx++) {
       for (var y=oy,tty=ty;y<my && tty<map.h;y+=s,tty++) {
         o.frame = ttx+(tty*map.w);
         g.drawImage(img,x,y,o);
+        count++;
       }
+    }
   });
+  return count;
 };
 
 /// Convert lat/lon to pixels on the screen
diff --git a/apps/openstmap/test/index.html b/apps/openstmap/test/index.html
new file mode 100644
index 000000000..f17761b9c
--- /dev/null
+++ b/apps/openstmap/test/index.html
@@ -0,0 +1,116 @@
+<html>
+  <head>
+    <title>3 bit filter test</title>
+  </head>
+    <style>
+
+    </style>
+  </head>
+  <body>
+    <p>This file tests imagefilter.js to allow different filtering options
+      to be tested, so we can quickly see the easiest way of transforming OpenStreetMap tiles
+      into 3 bits
+    </p>
+    <canvas id="maptiles" style="display:none"></canvas>
+
+    <button id="getmap">Test</button><br/>
+    <input type="checkbox" id="finaldither" checked></input><span>Final dither (Bangle.js preview)</span><br/>
+    <input type="checkbox" id="sharpen" checked></input><span>Sharpen</span>
+    <input type="checkbox" id="dither"></input><span>Line Dither</span><br/>
+    <input type="range" id="slider_lo" min="0" max="255" value="140">Lo threshold<br/>
+    <input type="range" id="slider_hi" min="0" max="255" value="250">Hi threshold<br/>
+
+    <script src="../../../webtools/heatshrink.js"></script>
+    <script src="../../../webtools/imageconverter.js"></script>
+    <script src="../imagefilter.js"></script>
+    <script>
+      var TILESIZE = 96
+
+      // convert canvas into an actual tiled image file
+      function tilesLoaded(ctx, width, height, mapImageFile) {
+        var filterOptions = {
+          colLo : 0|document.getElementById("slider_lo").value,
+          colHi : 0|document.getElementById("slider_hi").value,
+          sharpen : 0|document.getElementById("sharpen").checked,
+          dither : 0|document.getElementById("dither").checked
+        }
+        console.log("filterOptions", filterOptions);
+        var preview = document.getElementById("finaldither").checked;
+
+
+        var options = {
+          compression:false, output:"raw",
+          mode:"3bit",
+          diffusion:"bayer2"
+        };
+        /* If in 3 bit mode, go through all the data beforehand and
+        turn the saturation up to maximum, so when thresholded it
+        works a lot better */
+        var imageData = ctx.getImageData(0,0,width,height);
+        var dstData = ctx.createImageData(width, height);
+        imageFilterFor3BPP(imageData, dstData, filterOptions);
+        ctx.putImageData(dstData,0,0);
+
+        console.log("Compression options", options);
+        var tiledImage;
+        if (preview) {
+          var w = Math.round(width / TILESIZE);
+          var h = Math.round(height / TILESIZE);
+
+          for (var y=0;y<h;y++) {
+            for (var x=0;x<w;x++) {
+              var imageData = ctx.getImageData(x*TILESIZE, y*TILESIZE, TILESIZE, TILESIZE);
+              var rgba = imageData.data;
+              options.rgbaOut = rgba;
+              options.width = TILESIZE;
+              options.height = TILESIZE;
+              var imgstr = imageconverter.RGBAtoString(rgba, options);
+              ctx.putImageData(imageData,x*TILESIZE, y*TILESIZE); // write preview
+              /*var compress = 'require("heatshrink").decompress('
+              if (!imgstr.startsWith(compress)) throw "Data in wrong format";
+              imgstr = imgstr.slice(compress.length,-1);*/
+              if (tiledImage) tiledImage += imgstr.substr(3); // skip header
+              else tiledImage = imgstr; // for first image, keep the header
+            }
+          }
+        }
+        return [{
+          name:mapImageFile,
+          content:tiledImage
+        }];
+      }
+
+
+
+      // Render everything to a canvas...
+      var canvas = document.getElementById("maptiles");
+      canvas.style.display="";
+      var ctx = canvas.getContext('2d');
+
+
+      var img = new Image();
+      img.crossOrigin = "Anonymous";
+      img.onload = function(){
+        canvas.width = img.width;
+        canvas.height = img.height;
+        ctx.drawImage(img,0,0);
+        tilesLoaded(ctx, canvas.width, canvas.height, "");
+      };
+      img.src = "osm-test.png"
+
+      function update() {
+        ctx.drawImage(img,0,0);
+        tilesLoaded(ctx, canvas.width, canvas.height, "");
+      }
+
+      document.getElementById("getmap").addEventListener("click", update);
+      document.getElementById("slider_lo").addEventListener("change",update);
+      document.getElementById("slider_hi").addEventListener("change",update);
+      document.getElementById("finaldither").addEventListener("click",update);
+      document.getElementById("sharpen").addEventListener("click",update);
+      document.getElementById("dither").addEventListener("click",update);
+
+
+    </script>
+  </body>
+</html>
diff --git a/apps/openstmap/test/osm-test.png b/apps/openstmap/test/osm-test.png
new file mode 100644
index 000000000..af22331f5
Binary files /dev/null and b/apps/openstmap/test/osm-test.png differ
diff --git a/apps/openwind/metadata.json b/apps/openwind/metadata.json
index 01d7ca124..5e0a60972 100644
--- a/apps/openwind/metadata.json
+++ b/apps/openwind/metadata.json
@@ -6,10 +6,11 @@
   "icon": "openwind.png",
   "readme": "README.md",
   "tags": "ble,outdoors,gps,sailing",
-  "supports" : ["BANGLEJS", "BANGLEJS2"],  
+  "supports" : ["BANGLEJS", "BANGLEJS2"],
   "storage": [
     {"name":"openwind.app.js","url":"app.js"},
     {"name":"openwind.img","url":"app-icon.js","evaluate":true},
     {"name":"openwind.settings.js", "url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"openwindsettings.json"}]
 }
diff --git a/apps/owmweather/ChangeLog b/apps/owmweather/ChangeLog
index dba6a755a..6b4a80e23 100644
--- a/apps/owmweather/ChangeLog
+++ b/apps/owmweather/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Do first update request 5s after boot to boot up faster
+0.03: Fix updating weather too often
diff --git a/apps/owmweather/boot.js b/apps/owmweather/boot.js
index 737413940..5ac32c55a 100644
--- a/apps/owmweather/boot.js
+++ b/apps/owmweather/boot.js
@@ -1,19 +1,21 @@
 {
   let waiting = false;
-  let settings = require("Storage").readJSON("owmweather.json", 1) || {
-    enabled: false
-  };
+  let settings = Object.assign(
+    require('Storage').readJSON("owmweather.default.json", true) || {},
+    require('Storage').readJSON("owmweather.json", true) || {}
+  );
   
   let completion = function(){
     waiting = false;
+    settings.updated = Date.now();
+    require('Storage').writeJSON("owmweather.json", settings);
   }
 
   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 (!settings.updated || settings.updated + settings.refresh * 1000 * 60 < Date.now()){
       setTimeout(() => {
         if (!waiting){
           waiting = true;
diff --git a/apps/owmweather/lib.js b/apps/owmweather/lib.js
index 6ba52b498..67cdc115b 100644
--- a/apps/owmweather/lib.js
+++ b/apps/owmweather/lib.js
@@ -25,7 +25,7 @@ function parseWeather(response) {
 
     json.weather = weather;
     require("Storage").writeJSON('weather.json', json);
-    require("weather").emit("update", json.weather);
+    if (require("Storage").read("weather")!==undefined) require("weather").emit("update", json.weather);
     return undefined;
   } else {
     return /*LANG*/"Not OWM data";
diff --git a/apps/owmweather/metadata.json b/apps/owmweather/metadata.json
index 56f9afca7..7ea3dc9bb 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.02",
+  "version":"0.03",
   "description": "Pulls weather from OpenWeatherMap (OWM) API",
   "icon": "app.png",
   "type": "bootloader",
diff --git a/apps/patriotclk/ChangeLog b/apps/patriotclk/ChangeLog
new file mode 100644
index 000000000..c9f08fcc2
--- /dev/null
+++ b/apps/patriotclk/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Show the date inside the widget bar
\ No newline at end of file
diff --git a/apps/patriotclk/app-icon.js b/apps/patriotclk/app-icon.js
new file mode 100644
index 000000000..1dfde113e
--- /dev/null
+++ b/apps/patriotclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4UA///8H55lCsHZHmEKgEVqoLIBQNVqgLGh4KBAANQBAUQBY1VoApBB4QLFDYoL/Bf4L/BbLrBBZAKBgEBBY0KAQIABgoLCCYQLEgEVBQYLGAAoL/Bf4LPAFw"))
\ No newline at end of file
diff --git a/apps/patriotclk/app-preview-btm.png b/apps/patriotclk/app-preview-btm.png
new file mode 100644
index 000000000..98008996b
Binary files /dev/null and b/apps/patriotclk/app-preview-btm.png differ
diff --git a/apps/patriotclk/app-preview.png b/apps/patriotclk/app-preview.png
new file mode 100644
index 000000000..b79009c94
Binary files /dev/null and b/apps/patriotclk/app-preview.png differ
diff --git a/apps/patriotclk/app.js b/apps/patriotclk/app.js
new file mode 100644
index 000000000..e618b0106
--- /dev/null
+++ b/apps/patriotclk/app.js
@@ -0,0 +1,89 @@
+Graphics.prototype.setFontAudiowide = function() {
+  // Actual height 33 (36 - 4)
+  return this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('AB/wAgcB/AFVgFgHbkYAok4AogvEgYFEg4FEj4FEn4FE//gKQf/4AcD/4QDh/8Djf+DhN/T4YcFgYcKh4cEh68Eh4cDAoOAAocORYkMf1JxBIYcf/6PDn//MIYEB/5KBOIIABKwIFFO4V/UQMHEIMfFQMHAQP3AQJ3BDIKABh/ggf7ApHAg/5AonxAocPAokf8IFE4IFDn4FEv+BAokBAof/AofB/wFE/gFD4YFE4/4AohgBAoXPAonvMAIFD4AFCVgIFBQYX3wCGCR4T+CTYqtLX4rLC/zXIcYoAQQYIFiJoR9CArgAlToIpDRQIFDSwI7C4CiBApN/Apb1D4F+Av4Fd8H+Aof/AoaTB/gFIgaBBAoSrB+AFCgF/8AFDAESP/Av3wv0HZYYABYoYAB+AFGZYIAB8DLCAAPAZYQFBZUhHC/gFE/wFaAAN+Av4Fqv53EboYFdAFIvB4EBGofwAon4Aon8ApX+AofAAot+Av4Fev8DAojFDAo0/S4IFGAAMf//gV4mAAoUD/zYgFwP8AoRGB/4FCAgI1CgIFC4A5BAoRHBg4FCKYMH/l+n5fC+F+g5rC8F+PoYFFZf7XVw7XNAALXNTYLXCVoYAQF4IFZjAFEnAFELIZCBAojRDAoMfAol/AohrCAoJfBNYIFBNYOAAoUf/xBDv/8AoXBRAcP4aCDh/PDgSNCDgQFCHIIFDUoafFAoJ3EGYQFCDgYFBXgZuBGYQAba4pDEhzvE/4ABKoMBAogbBAAJKBg4EBw4FEX4Z9BgIFC8AFE4F+Av5HFKYhfFAoRxCO4qDFgF/AokATYgfCZwcD/zTdAAV/Z4RBCHIZNBJYI5D/gFFOJEP+DF/a7N+ZYQFG+F+g7XFRYIFFbobLBboajCAoTRCcYTiEUQYAdgYCBsACBMwJlCAqUHJYLxDAAMgHSQ'))),
+    46,
+    atob("CiAsESQjJSQkHyQkDA=="),
+    48|65536
+  );
+};
+
+{
+
+  let img = require("Storage").read("patriotclk.bg.img");
+  let options = require("Storage").readJSON("patriotclk.opts",1)||{};
+
+  // timeout used to update every minute
+  let drawTimeout, widgetTimeout;
+
+  // draw everything
+  let draw = function() {
+    var x = g.getWidth()/2;
+    var y;
+    if (options.bottomText)
+      y = g.getHeight() - 24;
+    else
+      y = 4+(g.getHeight())/2; // middle
+    g.reset();
+    g.drawImage(img,0,0);
+    // work out locale-friendly date/time
+    var date = new Date();
+    var timeStr = require("locale").time(date,1);
+    var dateStr = require("locale").date(date);
+    // draw time
+    g.setFontAlign(0,0).setFont("Audiowide");
+    // draw a shadow by shifting left/right/up/down
+    g.drawString(timeStr,x-6,y);
+    g.drawString(timeStr,x+6,y);
+    g.drawString(timeStr,x,y-6);
+    g.drawString(timeStr,x,y+6);
+    g.drawString(timeStr,x-4,y+4);
+    g.drawString(timeStr,x+4,y+4);
+    g.drawString(timeStr,x-4,y-4);
+    g.drawString(timeStr,x+4,y-4);
+    // finally draw in the foreground color
+    g.setColor(g.theme.bg).drawString(timeStr,x,y);
+    // draw date
+    //y += 35;
+    //g.setFontAlign(0,0).setFont("6x8").g.setColor(g.theme.fg);
+    //g.drawString(dateStr,x,y);
+    // queue draw in one minute
+    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() { //f ree memory
+    if (drawTimeout) clearTimeout(drawTimeout);
+    if (widgetTimeout) clearTimeout(widgetTimeout);
+    require("widget_utils").show();
+    var e = WIDGETS["patriot"];
+    g.reset().clearRect(e.x,e.y,e.x+63,e.y+23);
+    delete WIDGETS["patriot"];
+    delete Graphics.prototype.setFontAudiowide;
+  }});  
+  // Load widgets (make them swipeable)
+  Bangle.loadWidgets();
+  WIDGETS["patriot"] = {
+    area:"tl",
+    width: 64, // how wide is the widget? You can change this and call Bangle.drawWidgets() to re-layout
+    draw : function(e) {
+      g.reset().clearRect(e.x,e.y,e.x+63,e.y+23);
+      var d = new Date();
+      g.setFont("6x8").setFontAlign(-1,0).drawString(require("locale").dow(d,0), e.x+2, e.y+8);
+      g.setFont("6x8").setFontAlign(-1,0).drawString(require("locale").date(d).trim(), e.x+2, e.y+16);
+      widgetTimeout = setTimeout(function() { // redraw every hour (it's just easier that working out timezones)
+        widgetTimeout = undefined;
+        WIDGETS["patriot"].draw(WIDGETS["patriot"]);
+      }, 3600000 - (Date.now() % 3600000));
+    }
+  };
+  require("widget_utils").swipeOn();
+  // Clear the screen once, at startup
+  g.clear();
+  // draw immediately at first, queue update
+  draw();  
+}
\ No newline at end of file
diff --git a/apps/patriotclk/app.png b/apps/patriotclk/app.png
new file mode 100644
index 000000000..781ab8c60
Binary files /dev/null and b/apps/patriotclk/app.png differ
diff --git a/apps/patriotclk/custom.html b/apps/patriotclk/custom.html
new file mode 100644
index 000000000..a6fc36abc
--- /dev/null
+++ b/apps/patriotclk/custom.html
@@ -0,0 +1,143 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <style>
+      .flag {
+        width : 100px;
+        cursor: pointer;
+      }
+      #preview {
+        width : 176px;
+        height: 176px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>Please choose your country's flag:</p>
+    <div id="flaglist"></div>
+    <p>Is your flag not here? Please <a href="https://github.com/espruino/BangleApps/tree/master/apps/patriotclk/img" target="_blank">add it here</a>! </p>
+    <div style="float:right">Preview:<br/><canvas width="176" height="176" id="preview"></canvas></div>
+    <div class="form-group">
+      <label class="form-switch">
+        <input type="checkbox" id="box_zoom">
+        <i class="form-icon"></i> Zoom
+      </label>
+      <label class="form-switch">
+        <input type="checkbox" id="box_textbottom">
+        <i class="form-icon"></i> Time at bottom
+      </label>      
+    </div>
+
+    
+    <p>Click <button id="upload" class="btn btn-primary disabled" style>Upload</button></p>
+    
+    <img id="preview_overlay" src="app-preview.png" style="display:none">
+    <img id="preview_overlay_btm" src="app-preview-btm.png" style="display:none">
+    
+
+    <script src="../../core/lib/customize.js"></script>
+    <script src="../../webtools/imageconverter.js"></script>
+
+    <script>
+      var FLAGS = `
+      icons8-australia-480.png
+      icons8-austria-480.png
+      icons8-belgium-480.png
+      icons8-brazil-480.png
+      icons8-canada-480.png
+      icons8-china-480.png
+      icons8-denmark-480.png
+      icons8-england-480.png
+      icons8-flag-of-europe-480.png
+      icons8-france-480.png
+      icons8-germany-480.png
+      icons8-great-britain-480.png
+      icons8-greece-480.png
+      icons8-hungary-480.png
+      icons8-italy-480.png
+      icons8-lgbt-flag-480.png
+      icons8-netherlands-480.png
+      icons8-new-zealand-480.png
+      icons8-norway-480.png
+      icons8-scotland-480.png
+      icons8-spain-480.png
+      icons8-sweden-480.png
+      icons8-switzerland-480.png
+      icons8-ukraine-480.png
+      icons8-usa-480.png
+      icons8-wales-480.png
+      `.trim().split("\n").map(s=>s.trim());
+      // If we can't map a flag direct to 3 bit color, enable dithering
+      var DITHERED_FLAGS = `
+      icons8-lgbt-flag-480.png
+      icons8-ukraine-480.png
+      `.trim().split("\n").map(s=>s.trim()); 
+
+      var selectedImage;
+      var bgImageData;
+      var clockOptions = {
+        bottomText : false
+      };
+
+      document.getElementById("flaglist").innerHTML = 
+        FLAGS.map(f => `<img class="flag" src="img/${f}" data-file="${f}"/>`).join("\n");
+      var elements = document.querySelectorAll(".flag");
+      for (var i=0;i<elements.length;i++)
+        elements[i].addEventListener("click", function(e) {
+          selectedImage = e.target;
+          drawPreview();
+          document.getElementById("upload").classList.remove("disabled")
+        });
+
+
+      function drawPreview() {
+        if (!selectedImage) return;
+        var imgFile = selectedImage.getAttribute("data-file");
+        var zoom = document.getElementById("box_zoom").checked;
+        clockOptions.bottomText = document.getElementById("box_textbottom").checked;
+        const canvas = document.getElementById("preview");
+        canvas.width = 176; // setting size clears canvas
+        canvas.height = 176;
+        const ctx = canvas.getContext("2d");
+        var y = 0;
+        if (clockOptions.bottomText)
+          y = -28;
+        if (zoom) 
+          ctx.drawImage(selectedImage, 90, 90, 300, 300, 0, y, 176, 176);
+        else
+          ctx.drawImage(selectedImage, 20, 20, 440, 440, 0, y, 176, 176);
+        var options = {
+          mode:"3bit", 
+          output:"raw", 
+          compression:false, 
+          updateCanvas:true, 
+          transparent:false,
+          contrast:128
+        };
+        if (DITHERED_FLAGS.includes(imgFile))
+          options.diffusion = "bayer2";
+        bgImageData = imageconverter.canvastoString(canvas, options);
+        ctx.drawImage(document.getElementById(clockOptions.bottomText?"preview_overlay_btm":"preview_overlay"),0,0);        
+      }
+
+      // If options changed
+      document.getElementById("box_zoom").addEventListener("click", function() {
+        drawPreview();
+      });
+      document.getElementById("box_textbottom").addEventListener("click", function() {
+        drawPreview();
+      });
+      // When the 'upload' button is clicked...
+      document.getElementById("upload").addEventListener("click", function() {
+        // send finished app (in addition to contents of metadata.json)
+        if (bgImageData) sendCustomizedApp({
+          storage:[
+            {name:"patriotclk.bg.img", content:bgImageData},
+            {name:"patriotclk.opts", content:JSON.stringify(clockOptions)}, // we don't save as .json or we'd have a sanitycheck warning
+          ]
+        });
+      });
+
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/apps/patriotclk/img/README.md b/apps/patriotclk/img/README.md
new file mode 100644
index 000000000..53c26165c
--- /dev/null
+++ b/apps/patriotclk/img/README.md
@@ -0,0 +1,9 @@
+Flags
+------
+
+These flags come from https://icons8.com/icon/set/flags/color and are 480x480px
+
+If you want to add your own flag ensure it's in the same style and then also list the image file in custom.html in the root directory.
+
+If your flag is listed in https://icons8.com/icon/set/flags/color and you can't download it in the right size, please file an issue and we'll download it with our account.
+
diff --git a/apps/patriotclk/img/icons8-australia-480.png b/apps/patriotclk/img/icons8-australia-480.png
new file mode 100644
index 000000000..edf34cdee
Binary files /dev/null and b/apps/patriotclk/img/icons8-australia-480.png differ
diff --git a/apps/patriotclk/img/icons8-austria-480.png b/apps/patriotclk/img/icons8-austria-480.png
new file mode 100644
index 000000000..8450a8840
Binary files /dev/null and b/apps/patriotclk/img/icons8-austria-480.png differ
diff --git a/apps/patriotclk/img/icons8-belgium-480.png b/apps/patriotclk/img/icons8-belgium-480.png
new file mode 100644
index 000000000..395fef8d1
Binary files /dev/null and b/apps/patriotclk/img/icons8-belgium-480.png differ
diff --git a/apps/patriotclk/img/icons8-brazil-480.png b/apps/patriotclk/img/icons8-brazil-480.png
new file mode 100644
index 000000000..570ee39f9
Binary files /dev/null and b/apps/patriotclk/img/icons8-brazil-480.png differ
diff --git a/apps/patriotclk/img/icons8-canada-480.png b/apps/patriotclk/img/icons8-canada-480.png
new file mode 100644
index 000000000..3d3080768
Binary files /dev/null and b/apps/patriotclk/img/icons8-canada-480.png differ
diff --git a/apps/patriotclk/img/icons8-china-480.png b/apps/patriotclk/img/icons8-china-480.png
new file mode 100644
index 000000000..c3c3faba7
Binary files /dev/null and b/apps/patriotclk/img/icons8-china-480.png differ
diff --git a/apps/patriotclk/img/icons8-denmark-480.png b/apps/patriotclk/img/icons8-denmark-480.png
new file mode 100644
index 000000000..2add9dbce
Binary files /dev/null and b/apps/patriotclk/img/icons8-denmark-480.png differ
diff --git a/apps/patriotclk/img/icons8-england-480.png b/apps/patriotclk/img/icons8-england-480.png
new file mode 100644
index 000000000..5c9a836a6
Binary files /dev/null and b/apps/patriotclk/img/icons8-england-480.png differ
diff --git a/apps/patriotclk/img/icons8-flag-of-europe-480.png b/apps/patriotclk/img/icons8-flag-of-europe-480.png
new file mode 100644
index 000000000..654da87ba
Binary files /dev/null and b/apps/patriotclk/img/icons8-flag-of-europe-480.png differ
diff --git a/apps/patriotclk/img/icons8-france-480.png b/apps/patriotclk/img/icons8-france-480.png
new file mode 100644
index 000000000..e3cb56348
Binary files /dev/null and b/apps/patriotclk/img/icons8-france-480.png differ
diff --git a/apps/patriotclk/img/icons8-germany-480.png b/apps/patriotclk/img/icons8-germany-480.png
new file mode 100644
index 000000000..0f86aa568
Binary files /dev/null and b/apps/patriotclk/img/icons8-germany-480.png differ
diff --git a/apps/patriotclk/img/icons8-great-britain-480.png b/apps/patriotclk/img/icons8-great-britain-480.png
new file mode 100644
index 000000000..0acdcc191
Binary files /dev/null and b/apps/patriotclk/img/icons8-great-britain-480.png differ
diff --git a/apps/patriotclk/img/icons8-greece-480.png b/apps/patriotclk/img/icons8-greece-480.png
new file mode 100644
index 000000000..319cf93cb
Binary files /dev/null and b/apps/patriotclk/img/icons8-greece-480.png differ
diff --git a/apps/patriotclk/img/icons8-hungary-480.png b/apps/patriotclk/img/icons8-hungary-480.png
new file mode 100644
index 000000000..ab838afea
Binary files /dev/null and b/apps/patriotclk/img/icons8-hungary-480.png differ
diff --git a/apps/patriotclk/img/icons8-italy-480.png b/apps/patriotclk/img/icons8-italy-480.png
new file mode 100644
index 000000000..f917cd85a
Binary files /dev/null and b/apps/patriotclk/img/icons8-italy-480.png differ
diff --git a/apps/patriotclk/img/icons8-lgbt-flag-480.png b/apps/patriotclk/img/icons8-lgbt-flag-480.png
new file mode 100644
index 000000000..10f869a0a
Binary files /dev/null and b/apps/patriotclk/img/icons8-lgbt-flag-480.png differ
diff --git a/apps/patriotclk/img/icons8-netherlands-480.png b/apps/patriotclk/img/icons8-netherlands-480.png
new file mode 100644
index 000000000..b271c5448
Binary files /dev/null and b/apps/patriotclk/img/icons8-netherlands-480.png differ
diff --git a/apps/patriotclk/img/icons8-new-zealand-480.png b/apps/patriotclk/img/icons8-new-zealand-480.png
new file mode 100644
index 000000000..fc1ca7ec1
Binary files /dev/null and b/apps/patriotclk/img/icons8-new-zealand-480.png differ
diff --git a/apps/patriotclk/img/icons8-norway-480.png b/apps/patriotclk/img/icons8-norway-480.png
new file mode 100644
index 000000000..270f5af8b
Binary files /dev/null and b/apps/patriotclk/img/icons8-norway-480.png differ
diff --git a/apps/patriotclk/img/icons8-scotland-480.png b/apps/patriotclk/img/icons8-scotland-480.png
new file mode 100644
index 000000000..991652211
Binary files /dev/null and b/apps/patriotclk/img/icons8-scotland-480.png differ
diff --git a/apps/patriotclk/img/icons8-spain-480.png b/apps/patriotclk/img/icons8-spain-480.png
new file mode 100644
index 000000000..19c8dac04
Binary files /dev/null and b/apps/patriotclk/img/icons8-spain-480.png differ
diff --git a/apps/patriotclk/img/icons8-sweden-480.png b/apps/patriotclk/img/icons8-sweden-480.png
new file mode 100644
index 000000000..60f412840
Binary files /dev/null and b/apps/patriotclk/img/icons8-sweden-480.png differ
diff --git a/apps/patriotclk/img/icons8-switzerland-480.png b/apps/patriotclk/img/icons8-switzerland-480.png
new file mode 100644
index 000000000..801ba4776
Binary files /dev/null and b/apps/patriotclk/img/icons8-switzerland-480.png differ
diff --git a/apps/patriotclk/img/icons8-ukraine-480.png b/apps/patriotclk/img/icons8-ukraine-480.png
new file mode 100644
index 000000000..3762c1112
Binary files /dev/null and b/apps/patriotclk/img/icons8-ukraine-480.png differ
diff --git a/apps/patriotclk/img/icons8-usa-480.png b/apps/patriotclk/img/icons8-usa-480.png
new file mode 100644
index 000000000..d6288404e
Binary files /dev/null and b/apps/patriotclk/img/icons8-usa-480.png differ
diff --git a/apps/patriotclk/img/icons8-wales-480.png b/apps/patriotclk/img/icons8-wales-480.png
new file mode 100644
index 000000000..6c2941342
Binary files /dev/null and b/apps/patriotclk/img/icons8-wales-480.png differ
diff --git a/apps/patriotclk/metadata.json b/apps/patriotclk/metadata.json
new file mode 100644
index 000000000..689f1422d
--- /dev/null
+++ b/apps/patriotclk/metadata.json
@@ -0,0 +1,18 @@
+{ "id": "patriotclk",
+  "name": "Patriotic Clock",
+  "shortName":"Patriot",
+  "version":"0.02",
+  "description": "Show your Patriotism with your Country's flag as a clock face (configurable). Swipe down to show widgets and date.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock,flag",
+  "supports" : ["BANGLEJS2"],  
+  "custom": "custom.html",
+  "storage": [
+    {"name":"patriotclk.app.js","url":"app.js"},
+    {"name":"patriotclk.bg.img"},
+    {"name":"patriotclk.opts"},
+    {"name":"patriotclk.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/patriotclk/screenshot.png b/apps/patriotclk/screenshot.png
new file mode 100644
index 000000000..1f8b1f5f5
Binary files /dev/null and b/apps/patriotclk/screenshot.png differ
diff --git a/apps/pebble/metadata.json b/apps/pebble/metadata.json
index 0ccb8e2af..49dbcd820 100644
--- a/apps/pebble/metadata.json
+++ b/apps/pebble/metadata.json
@@ -15,5 +15,8 @@
     {"name":"pebble.app.js","url":"pebble.app.js"},
     {"name":"pebble.settings.js","url":"pebble.settings.js"},
     {"name":"pebble.img","url":"pebble.icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"pebble.settings.json"}
   ]
 }
diff --git a/apps/pebbled/ChangeLog b/apps/pebbled/ChangeLog
index d2f71f908..a0127ffce 100644
--- a/apps/pebbled/ChangeLog
+++ b/apps/pebbled/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Tell clock widgets to hide.
 0.03: Swipe down to see widgets
       Support for fast loading
+0.04: Localisation request: added Miles and AM/PM
diff --git a/apps/pebbled/metadata.json b/apps/pebbled/metadata.json
index 9e71a914b..8924e600a 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.03",
+  "version": "0.04",
   "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",
@@ -14,5 +14,6 @@
     {"name":"pebbled.app.js","url":"pebbled.app.js"},
     {"name":"pebbled.settings.js","url":"pebbled.settings.js"},
     {"name":"pebbled.img","url":"pebbled.icon.js","evaluate":true}
-  ]
+  ],
+  "data":[{"name":"pebbleDistance.json"}]
 }
diff --git a/apps/pebbled/pebbled.app.js b/apps/pebbled/pebbled.app.js
index 627a7651c..54b56712c 100644
--- a/apps/pebbled/pebbled.app.js
+++ b/apps/pebbled/pebbled.app.js
@@ -16,6 +16,15 @@ let drawTimeout;
 let loadSettings = function() {
   settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75};
 };
+  
+let tConv24 = function(time24) {
+  var ts = time24;
+  var H = +ts.substr(0, 2);
+  var h = (H % 12) || 12;
+  h = (h < 10)?("0"+h):h;
+  ts = h + ts.substr(2, 3);
+  return ts;
+}
 
 const img = require("heatshrink").decompress(atob("oFAwkEogA/AH4A/AH4A/AH4A/AE8AAAoeXoAfeDQUBmcyD7A+Dh///8QD649CiAfaHwUvD4sEHy0DDYIfEICg+Cn4fHICY+DD4nxcgojOHwgfEIAYfRCIQaDD4ZAFD5r7DH4//kAfRCIZ/GAAnwD5p9DX44fTHgYSBf4ofVDAQEBl4fFUAgfOXoQzBgIfFBAIfPP4RAEAoYAB+cRiK/SG4h/WIBAfXIA7CBAAswD55AHn6fUIBMCD65AHl4gCmcziAfQQJqfQQJpiDgk0IDXxQLRAEECaBM+QgRYRYgUIA0CD4ggSQJiDCiAKBICszAAswD55AHABKBVD7BAFABIqBD5pAFABPxD55AOD6BADiIAJQAyxLABwf/gaAPAH4A/AH4ARA=="));
 
@@ -30,16 +39,19 @@ let batteryWarning = false;
 let draw = function() {
   let date = new Date();
   let da = date.toString().split(" ");
-  let timeStr = da[4].substr(0,5);
+  let timeStr = settings.localization === "US" ? tConv24(da[4].substr(0,5)) : da[4].substr(0,5);
   const t = 6;
   let stps = Bangle.getHealthStatus("day").steps;
+  const distInKm = (stps / 1000 * settings.avStep).toFixed(2);
+  const distance = settings.localization === "US" ? (distInKm / 1.609).toFixed(2) : distInKm;
+  const distanceStr = settings.localization === "US" ? distance + ' MI' : distance + ' KM';
 
-  // turn the warning on once we have dipped below 15%
-  if (E.getBattery() < 15)
+  // turn the warning on once we have dipped below 25%
+  if (E.getBattery() < 25)
     batteryWarning = true;
 
-  // turn the warning off once we have dipped above 20%
-  if (E.getBattery() > 20)
+  // turn the warning off once we have dipped above 30%
+  if (E.getBattery() > 30)
     batteryWarning = false;
 
   g.reset();
@@ -88,7 +100,7 @@ let draw = function() {
     g.setColor('#fff'); // white on blue or red best contrast
   else
     g.setColor('#000'); // otherwise black regardless of theme
-  g.drawString((stps / 1000 * settings.avStep).toFixed(2) + ' KM', w/2, ha + 107);
+  g.drawString(distanceStr, w/2, ha + 107);
 
   // queue next draw
   if (drawTimeout) clearTimeout(drawTimeout);
diff --git a/apps/pebbled/pebbled.settings.js b/apps/pebbled/pebbled.settings.js
index d6c84d5d1..f4ca1d394 100644
--- a/apps/pebbled/pebbled.settings.js
+++ b/apps/pebbled/pebbled.settings.js
@@ -2,7 +2,7 @@
     const SETTINGS_FILE = "pebbleDistance.json";
 
     // initialize with default settings...
-    let s = {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75};
+    let s = {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75, 'localization': 'World'};
 
     // ...and overwrite them with any saved values
     // This way saved values are preserved if a new version adds more settings
@@ -20,9 +20,10 @@
 
     var color_options = ['Green','Orange','Cyan','Purple','Red','Blue'];
     var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f'];
+    var local_options = ['World', 'US'];
 
     E.showMenu({
-        '': { 'title': 'Pebble Clock' },
+        '': { 'title': 'PebbleD Clock' },
         '< Back': back,
         'Color': {
             value: 0 | color_options.indexOf(s.color),
@@ -43,6 +44,15 @@
                 s.avStep = v;
                 save();
             }
+        },
+        'Localization': {
+            value: 0 | local_options.indexOf(s.localization),
+            min: 0, max: 1,
+            format: v => local_options[v],
+            onchange: v => {
+                s.localization = local_options[v];
+                save();
+            },
         }
     });
 });
diff --git a/apps/pebblepp/ChangeLog b/apps/pebblepp/ChangeLog
new file mode 100644
index 000000000..f3886a42e
--- /dev/null
+++ b/apps/pebblepp/ChangeLog
@@ -0,0 +1,4 @@
+0.01: First release
+0.02: clock_info now uses app name to maintain settings specifically for this clock face
+      ensure clockinfo text is usppercase (font doesn't render lowercase)
+0.03: Use smaller font if clock_info test doesn't fit in area
\ No newline at end of file
diff --git a/apps/pebblepp/app.js b/apps/pebblepp/app.js
new file mode 100644
index 000000000..5121f450e
--- /dev/null
+++ b/apps/pebblepp/app.js
@@ -0,0 +1,144 @@
+Graphics.prototype.setFontLECO1976Regular42 = function(scale) {
+  // Actual height 42 (41 - 0)
+  return g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAA/AAAAAAAAH/AAAAAAAA//AAAAAAAP//AAAAAAB///AAAAAAP///AAAAAB////AAAAAf////AAAAD////4AAAAf////AAAAH////4AAAA////+AAAAA////wAAAAA///+AAAAAA///gAAAAAA//8AAAAAAA//gAAAAAAA/4AAAAAAAA/AAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////gD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4B/gH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/wB////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/wB////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAH+AAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), 46, atob("ERkmHyYmJiYmJCYmEQ=="), 60+(scale<<8)+(1<<16));
+};
+
+Graphics.prototype.setFontLECO1976Regular22 = function(scale) {
+  // Actual height 22 (21 - 0)
+  return g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gAD+AAPwAAAAAD+AAP4AA/gAAAAAAAAAAAAAcOAP//A//8D//wP//AHDgAcOAP//A//8D//wP//AHDgAAAAAAAAH/jgf+OB/44H/jj8OP/w4//Dj/8OPxw/4HD/gcP+Bw/4AAAAAAAP+AA/8AD/wQOHHA4c8D//wP/8A//gAD4AAfAAH/8A//wP//A84cDjhwIP/AA/8AB/wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8ABwAAAAAAAAD8AAP4AA/gAD8AAAAAAAAAAAEAAD+AB//A///v/D//gB/wABwAAAAAADgAA/wAf/4P8///wf/4AP8AAOAAAAAAAAAyAAHcAAPwAD/gAP/AA/8AA/AAH8AAMwAAAAAAAAAAAAADgAAOAAA4AAf8AD/wAP/AA/8AAOAAA4AADgAAAAAAAAAAD8AAfwAB/AAD8AAAAAAAADgAAOAAA4AADgAAOAAA4AADgAAAAAAAAAADgAAOAAA4AADgAAAAAAAAABwAB/AA/8A//gP/gA/wADwAAIAAAAAAD//wP//A//8D//wOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA4AcDgBwOAHA//8D//wP//A//8AABwAAHAAAcAAAAAAAA+f8D5/wPn/A+f8DhxwOHHA4ccDhxwP/HA/8cD/xwP/HAAAAAAAAOAHA4AcDhxwOHHA4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/wAP/AA/8AD/wAAHAAAcAABwAAHAA//8D//wP//A//8AAAAAAAA/98D/3wP/fA/98DhxwOHHA4ccDhxwOH/A4f8Dh/wOH/AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccDh/wOH/A4f8Dh/wAAAAAAAD4AAPgAA+AADgAAOAAA4AADgAAP//A//8D//wP//AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA//8D//wP//A//8AAAAAAAAOA4A4DgDgOAOA4AAAAAAAAOA/A4H8DgfwOA/AAAAAAAAB4AAPwAA/AAD8AAf4ABzgAPPAA8cAHh4AAAAAAAAAAAAHHAAccABxwAHHAAccABxwAHHAAccABxwAHHAAAAAAAAAOHAA4cADzwAPPAAf4AB/gAD8AAPwAAeAAB4AAAAAAAAA+AAD4AAPgAA+ecDh9wOH3A4fcDhwAP/AA/8AD/wAP/AAAAAAAAAP//4///j//+P//44ADjn/OOf845/zjnHOP8c4//zj//OP/84AAAAAAAP//A//8D//wP//A4cADhwAOHAA4cAD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA//8D//wP9/A/j8AAAAAAAA//8D//wP//A//8DgBwOAHA4AcDgBwOAHA4AcDgBwOAHAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA8A8D//wH/+AP/wAf+AAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4ccDhxwOAHA4AcAAAAAAAA//8D//wP//A//8DhwAOHAA4cADhwAOHAA4cADgAAOAAAAAAD//wP//A//8D//wOAHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA//8D//wP//A//8ABwAAHAAAcAABwAP//A//8D//wP//AAAAAAAAP//A//8D//wP//AAAAAAAAOAHA4AcDgBwOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA//8D//wP//A//8AHwAA/AAP8AB/wAPn/A8f8DB/wIH/AAAAAAAAP//A//8D//wP//AAAcAABwAAHAAAcAABwAAHAAAAAAAAP//A//8D//wP//Af8AAP+AAH/AAD8AAHwAD/AB/wAf8AP+AA//8D//wP//AAAAAAAAP//A//8D//wP//AfwAAfwAAfwAAfwAAfwP//A//8D//wAAAAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHAA4cADhwAOHAA/8AD/wAP/AA/8AAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//+P//4///j//+AAA4AADgAAAP//A//8D//wP//A4eADh+AOH8A4f4D/3wP/HA/8MD/wQAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA4AADgAAOAAA//8D//wP//A//8DgAAOAAA4AADgAAAAAA//8D//wP//A//8AABwAAHAAAcAABwP//A//8D//wP//AAAADAAAPgAA/wAD/4AB/8AA/8AAfwAB/AA/8Af+AP/AA/wAD4AAMAAA4AAD+AAP/gA//8AH/wAB/AAf8Af/wP/4A/4AD/gAP/4AH/8AB/wAB/AB/8D//wP/gA/gADgAAIABA4AcDwDwPw/Afn4Af+AA/wAD/AA//AH5+A/D8DwDwOAHAgAEAAAAP/AA/8AD/wAP/AAAf8AB/wAH/AAf8D/wAP/AA/8AD/wAAAAAAAADh/wOH/A4f8Dh/wOHHA4ccDhxwOHHA/8cD/xwP/HA/8cAAAAAAAAf//9///3///f//9wAA3AADcAAMAAAOAAA/gAD/wAH/8AB/8AA/wAAPAAAEAAAAHAADcAANwAB3///f//9///wAA"), 32, atob("BwYLDg4UDwYJCQwMBgkGCQ4MDg4ODg4NDg4GBgwMDA4PDg4ODg4NDg4GDQ4MEg8ODQ8ODgwODhQODg4ICQg="), 22+(scale<<8)+(1<<16));
+};
+
+Graphics.prototype.setFontLECO1976Regular14 = function() {
+  // Actual height 14 (13 - 0)
+  return this.setFontCustom(
+    atob('AAAAAAAAAAAD+w/sAAAAA8APAAAA8APAAAAMwP/D/wMwDMD/w/8DMAAAAAD8w/M8z/M/zPM/DPwAAAAPwD8QzcP/D/AHgD/D/wzMI/APwAAAAD/w/8MzDMwzMM/DPwDAAADwA8AAAAAAD8H/74f4BwAAAA4B/z8/8D8AAAAAeAPwD8AeAHgAAAAAAAAYAGAH4B+AGABgAAAAAAHgB4AAAAAYAGABgAYAAAAAABgAYAAAAQA8D/D+A8AAAAAA/8P/DAwwMMDD/w/8AAAAAwMMDD/w/8ADAAwAAO/DvwzMMzDMw/MPzAAAAAMDDMwzMMzDMw/8P/AAAAAPwD8ADAAwAMA/8P/AAAAAP3D9wzMMzDMwz8M/AAAAAP/D/wzMMzDMwz8M/AAA4AOADAAwAMAD/w/8AAAAA/8P/DMwzMMzD/w/8AAAAA/MPzDMwzMMzD/w/8AAAAAYYGGAAAAAGHhh4AABwAcAPgDYB3AYwAAAAAZgGYBmAZgGYBmAAAAABjAdwDYA+AHABwAAA4AOADOwzsMwD8A/AAAAAA//P/zAM37N+zZs/7P+wAAAAP/D/wzAMwDMA/8P/AAAAAP/D/wzMMzDMw/8P/AAAAAP/D/wwMMDDAwwMMDAAAAAP/D/wwMMDDhw/8H+AAAAAP/D/wzMMzDMwzMMDAAAAAP/D/wzAMwDMAzAMAAAA/8P/DAwzMMzDPwz8AAAAA/8P/AMADAAwD/w/8AAAAA/8P/AAAwMMDDAwwMMDD/w/8AAAAA/8P/AcAPAPwDvwj8AAAAA/8P/AAwAMADAAwAAP/D/w/AB+AHwA8B+B+A/8P/AAA/8P/D/wfAB8AHw/8P/AAAAAP/D/wwMMDDAw/8P/AAAAAP/D/wzAMwDMA/APwAAA/8P/DAwwMMDD/8//AAwAA/8P/DOAzwM/D9w/EAAAAA/MPzDMwzMMzDPwz8AADAAwAMAD/w/8MADAAwAAAD/w/8ADAAwAMP/D/wAAPAD8AP4AfAHwP4PwDgAAAPgD/gH8AfB/w/AP4A/wA8D/D/A8AAADAw4cP/A/APwH+DzwwMAAAAA/APwAPwD8A/D8A/AAAAAAz8M/DMwzMMzD8w/MAAAAA/////ADwA4ADwA/wB/ADwAAMAPAD////8A'),
+    32,
+    atob("BAQHCQkNCQQGBggIBAYEBgkHCQkJCQkICQkEBAcIBwkKCQkJCQkICQkECAkHDAkJCAkJCQgJCQ0JCQkFBgU="),
+    14|65536
+  );
+}
+
+{
+const SETTINGS_FILE = "pebblepp.json";
+let settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'bg': '#0f0', 'color': 'Green', 'theme':'System', 'showlock':false};
+let theme;
+let drawTimeout;
+
+const h = g.getHeight();
+const w = g.getWidth();
+const ha = 2*h/5 - 4;
+const h2 = 3*h/5 - 10;
+const h3 = 7*h/8;
+
+let draw = function() {
+  let locale = require("locale");
+  let date = new Date();
+  let time = locale.time(date, 1);
+
+  g.reset();
+  g.setBgColor(theme.bg).clearRect(0, h2, w, h3);
+  g.setFontLECO1976Regular42().setFontAlign(0, -1);
+  g.setColor(theme.fg);
+  g.drawString(time, w/2, h2 + 8);
+
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+};
+
+let loadThemeColors = function() {
+  theme = {fg: g.theme.fg, bg: g.theme.bg, day: g.toColor(0,0,0)};
+  if (settings.theme === "Dark") {
+    theme.fg = g.toColor(1,1,1);
+    theme.bg = g.toColor(0,0,0);
+  } else if (settings.theme === "Light") {
+    theme.fg = g.toColor(0,0,0);
+    theme.bg = g.toColor(1,1,1);
+  }
+  // day and steps
+  if (settings.color == 'Blue' || settings.color == 'Red')
+    theme.day = g.toColor(1,1,1); // white on blue or red best contrast
+};
+loadThemeColors();
+
+// Load the clock infos
+let clockInfoItems = require("clock_info").load();
+let clockInfoDraw = (itm, info, options) => {
+  // itm: the item containing name/hasRange/etc
+  // info: data returned from itm.get() containing text/img/etc
+  // options: options passed into addInteractive
+  // Clear the background - if focussed, add a border
+  g.reset().setBgColor(theme.bg).setColor(theme.fg);
+  var b = 0; // border
+  if (options.focus) { // white border
+    b = 4;
+    g.clearRect(options.x, options.y, options.x+options.w-1, options.y+options.h-1);
+  }
+  g.setBgColor(settings.bg).clearRect(options.x+b, options.y+b, options.x+options.w-1-b, options.y+options.h-1-b);
+  // we're drawing center-aligned here
+  var midx = options.x+options.w/2;
+  if (info.img) { // draw the image
+    // TODO: we could replace certain images with our own ones here...
+    var y = options.y+8;
+    if (g.floodFill) {
+      /* img is (usually) a black and white transparent image. But we really would like the bits in
+      the middle of it to be white. So what we do is we draw a slightly bigger rectangle in white,
+      draw the image, and then flood-fill the rectangle back to the background color. floodFill
+      was only added in 2v18 so we have to check for it and fallback if not. */
+      g.setBgColor(theme.bg).clearRect(midx-25,y-1,midx+24,y+48);
+      g.drawImage(info.img, midx-24,y,{scale:2});
+      g.floodFill(midx-25,y,settings.bg);
+    } else { // fallback
+      g.drawImage(info.img, midx-24,y,{scale:2});
+    }
+  }
+  g.setFontLECO1976Regular22().setFontAlign(0, 0);
+  var txt = info.text.toString().toUpperCase();
+  if (g.stringWidth(txt) > options.w-4) // if too big, smaller font
+    g.setFontLECO1976Regular14();
+  if (g.stringWidth(txt) > options.w-4) {// if still too big, split to 2 lines
+    var l = g.wrapString(txt, options.w-2);
+    txt = l.slice(0,2).join("\n") + (l.length>2)?"...":"";
+  }
+  g.drawString(txt, midx,options.y+options.h-12); // draw the text
+};
+
+let clockInfoMenuA = require("clock_info").addInteractive(clockInfoItems, {
+  app:"pebblepp",
+  x : 0, y: 0, w: w/2, h:h/2,
+  draw : clockInfoDraw
+});
+let clockInfoMenuB = require("clock_info").addInteractive(clockInfoItems, {
+  app:"pebblepp",
+  x : w/2, y: 0, w: w/2, h:h/2,
+  draw : clockInfoDraw
+});
+
+// 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;
+    clockInfoMenuA.remove();
+    clockInfoMenuB.remove();
+    delete Graphics.prototype.setFontLECO1976Regular22;
+    delete Graphics.prototype.setFontLECO1976Regular42;
+    delete Graphics.prototype.setFontLECO1976Regular14;
+    require("widget_utils").show(); // re-show widgets
+  }});
+
+Bangle.loadWidgets();
+require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
+g.setBgColor(settings.bg).clear(); // start off with completely clear background
+// contrast bar (top)
+g.setColor(theme.fg).fillRect(0, h2 - 6, w, h2);
+// contrast bar (bottom)
+g.setColor(theme.fg).fillRect(0, h3, w, h3 + 6);
+
+draw();
+}
diff --git a/apps/pebblepp/app.png b/apps/pebblepp/app.png
new file mode 100644
index 000000000..cfdf584a1
Binary files /dev/null and b/apps/pebblepp/app.png differ
diff --git a/apps/pebblepp/icon.js b/apps/pebblepp/icon.js
new file mode 100644
index 000000000..34cb133c6
--- /dev/null
+++ b/apps/pebblepp/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwcBpMkyQC/AUVIBZEh4QROoMP/QIFoEkiQIFjl//4IEwUIkGChIIDyH/AAI+Ggg1Fw4RCDQgCBkARJ8J0MHwcIEZgC/ATJrCwDRFBALXHWwIIFQYwjDyAjNEAMECILREfZACgagYCNgAAQ/4Aj+PHAQUcv///lxAoQCBuIRBwEH//wHgIRBBAMAgf+BAMBEZHHEYUAv0HEYf+EYIAB8F/4AFC8YLEAAIjGAoQjJI4oFBI4wjCCI4jBCIgjDn6IF8YDCwJHFTQxHC/gjCQwQ1DNYKPICI8ccgRHFAGikBd4QCMJ4QAOpMkyQC/AQg="))
\ No newline at end of file
diff --git a/apps/pebblepp/metadata.json b/apps/pebblepp/metadata.json
new file mode 100644
index 000000000..881b558db
--- /dev/null
+++ b/apps/pebblepp/metadata.json
@@ -0,0 +1,22 @@
+{
+  "id": "pebblepp",
+  "name": "Pebble++ Clock",
+  "shortName": "Pebble++",
+  "version": "0.03",
+  "description": "A pebble style clock (based on the 'Pebble Clock' app) but with two configurable ClockInfo items at the top",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock,clkinfo",
+  "supports": ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
+  "allow_emulator": true,
+  "storage": [
+    {"name":"pebblepp.app.js","url":"app.js"},
+    {"name":"pebblepp.settings.js","url":"settings.js"},
+    {"name":"pebblepp.img","url":"icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"pebblepp.settings.json"}
+  ]
+}
diff --git a/apps/pebblepp/screenshot.png b/apps/pebblepp/screenshot.png
new file mode 100644
index 000000000..5c36309a7
Binary files /dev/null and b/apps/pebblepp/screenshot.png differ
diff --git a/apps/pebblepp/settings.js b/apps/pebblepp/settings.js
new file mode 100644
index 000000000..b84a477e1
--- /dev/null
+++ b/apps/pebblepp/settings.js
@@ -0,0 +1,50 @@
+(function(back) {
+  const SETTINGS_FILE = "pebblepp.json";
+
+  // TODO Only the color/theme indices should be written in the settings file so the labels can be translated
+
+  // Initialize with default settings...
+  let s = {'bg': '#0f0', 'color': 'Green', 'theme':'System', 'showlock':false}
+
+  // ...and overwrite them with any saved values
+  // This way saved values are preserved if a new version adds more settings
+  const storage = require('Storage');
+  let settings = storage.readJSON(SETTINGS_FILE, 1) || s;
+  const saved = settings || {};
+  for (const key in saved) {
+    s[key] = saved[key]
+  }
+
+  function save() {
+    settings = s;
+    storage.write(SETTINGS_FILE, settings);
+  }
+
+  var color_options = ['Green','Orange','Cyan','Purple','Red','Blue'];
+  var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f'];
+  var theme_options = ['System', 'Light', 'Dark'];
+
+  E.showMenu({
+    '': { 'title': 'Pebble++ Clock' },
+    /*LANG*/'< Back': back,
+    /*LANG*/'Colour': {
+      value: 0 | color_options.indexOf(s.color),
+      min: 0, max: 5,
+      format: v => color_options[v],
+      onchange: v => {
+        s.color = color_options[v];
+        s.bg = bg_code[v];
+        save();
+      }
+    },
+    /*LANG*/'Theme': {
+      value: 0 | theme_options.indexOf(s.theme),
+      min: 0, max: theme_options.length - 1,
+      format: v => theme_options[v],
+      onchange: v => {
+        s.theme = theme_options[v];
+        save();
+      }
+    }
+  });
+});
diff --git a/apps/podadrem/ChangeLog b/apps/podadrem/ChangeLog
index 3c68f15ac..2f6fa8764 100644
--- a/apps/podadrem/ChangeLog
+++ b/apps/podadrem/ChangeLog
@@ -7,3 +7,6 @@ Addict.
 0.06: Add compatibility with Fastload Utils.
 0.07: Remove just the specific listeners to not interfere with Quick Launch
 when fastloading.
+0.08: Issue newline before GB commands (solves issue with console.log and ignored commands)
+0.09: Don't send the gadgetbridge wake command twice. Once should do since we
+	issue newline before GB commands.
diff --git a/apps/podadrem/app.js b/apps/podadrem/app.js
index 9c9ed8b04..6f8721126 100644
--- a/apps/podadrem/app.js
+++ b/apps/podadrem/app.js
@@ -67,7 +67,6 @@ let touchHandler = function(_, xy) {
   } 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.removeListener("touch", touchHandler);
@@ -144,6 +143,7 @@ let simpleSearchTerm = function() { // input a simple search term without tags,
 
 let searchPlayWOTags = function() { //make a search and play using entered terms
   searchString = simpleSearch;
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({
     t: "intent",
     action: "android.media.action.MEDIA_PLAY_FROM_SEARCH",
@@ -157,6 +157,7 @@ let searchPlayWOTags = function() { //make a search and play using entered terms
 };
 
 let gadgetbridgeWake = function() {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({
     t: "intent",
     target: "activity",
@@ -174,6 +175,7 @@ let actFn = function(actName, activOrServ) {
 // Send the intent message to Gadgetbridge
 let btMsg = function(activOrServ, cls, actName, xtra) {
 
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({
     t: "intent",
     action: actFn(actName, activOrServ),
diff --git a/apps/podadrem/metadata.json b/apps/podadrem/metadata.json
index c58b9241d..718cbc0ef 100644
--- a/apps/podadrem/metadata.json
+++ b/apps/podadrem/metadata.json
@@ -2,7 +2,7 @@
   "id": "podadrem",
   "name": "Podcast Addict Remote",
   "shortName": "PA Remote",
-  "version": "0.07",
+  "version": "0.09",
   "description": "Control Podcast Addict on your android device.",
   "readme": "README.md",
   "type": "app",
diff --git a/apps/pokeclk/screenshot (1).png b/apps/pokeclk/screenshot.png
similarity index 100%
rename from apps/pokeclk/screenshot (1).png
rename to apps/pokeclk/screenshot.png
diff --git a/apps/polymath/README.md b/apps/polymath/README.md
new file mode 100644
index 000000000..6e7d5ce43
--- /dev/null
+++ b/apps/polymath/README.md
@@ -0,0 +1,17 @@
+
+Intended for the dark theme.
+The clock does not show widgets but a custom battery indicator.
+
+You can revert this in the code easily by uncommenting the respective lines.
+
+![Image](polymathclock.jpg "photo")
+
+The top line shows battery status.
+The line below indicates noon and midnight on 24h timeline.
+ToDo: show daylight sunshine duration according to geolocation.
+Number in the middle is hour and minutes, in 12h format.
+Bottom row: days in the week, with current date, 
+and current moon phase placed on the date of 
+next change of moon quartal (full moon, half moon etc)
+
+Please report any bugs and feature requests in the forum.
diff --git a/apps/polymath/app-icon.js b/apps/polymath/app-icon.js
new file mode 100644
index 000000000..260b57219
--- /dev/null
+++ b/apps/polymath/app-icon.js
@@ -0,0 +1 @@
+atob("MDCEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFEQEBEBEQAQEBAAAAAAAAABAAAAAAAAABEQAVEREWUBARYQAAAAAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEVFRERERAAAAAAAAAAAAAAAAAAAAAAAv////////AAAAAAAAAAAAAAAAAAAAAAAv////////UAAAAAAAAAAAAAAAAAAAAAAv///////yABIhIRAAEiIQAAAAAAAAAAAv/z//M//1ABEiIgABIiIiEAAAAAAAAAAvIQAAET8gAAEiIQARERIiEAAAAAAAAAATEAAAAfMAAAASIAAAAAIiEAAAAAAAAAAAAAAAA/IAAAAiQAAAAAIiAAAAAAAAAAAAAAAAHzAAAAAiIAAAABJAAAAAAAAAAAAAAAABPxAAAAAiEAAAASIWAAAAAAAAAAAAAAAB8wAAAAAiEAAAAUIiEAAAAAAAAAAAAAAD8QAAAAEiQAAAAAEiIAAAAAAAAAAAAAAvMAAAABIiIhAAAAAiIQAAAAAAAAAAAAE/EAAAABERERAAAAEiIAAAAAAAAAAAAALyAAAAAAAAAAAAAAEiEAAAAAAAAAAAAB8xAAAAAAAAAAAAARIhAAAAAAAAAAAAAD8gAAAAAAAAAAABIhEAAAAAAAAAAAAAAf8QAAAAAAAAAAASIRAAAAAAAAAAAAAAAvIAAAAAAAAAAAABAAAAAAAAAAAAAAAAHzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAIAAAAAAAAAAAAAAAAAAAAAACMwAAAAABMAAAAAAAAAAAAAAAAAAAAAAAEwAAAAAEMAAAAAAAAAAAAAAAABAAAAEAIxAQAAABIAABUQERERAAEQAAACAAAAIAExEgAAAREAABERERIREREwAAACAAAAIBIgFAAAARAAABERERIRERHwAAACAAAAIBEAEQAAARAAACIRERMRERHwAAACAAAAIAAAEQAAARAAABERERIQEREw==")
\ No newline at end of file
diff --git a/apps/polymath/app.js b/apps/polymath/app.js
new file mode 100644
index 000000000..592365d48
--- /dev/null
+++ b/apps/polymath/app.js
@@ -0,0 +1,244 @@
+// Clock with date day and moon based on the "Anton Clock"
+
+
+Graphics.prototype.setFontmoonphases = function() {
+  // Actual height 23 (23 - 1)
+  return this.setFontCustom(
+    atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACAH/nAH/nAAACAAAAAAAAAAAAAHwAAH4AAAAAAAAAAGAAAH4AAHgAAAAAAAAAAAQgAAQhAAQ/AA/4AH8gAGQgAAQjAAR/AA/4AH4gAEQgAAQgAAA4APg8APwMAY4EAQ4EB///AQcEAQcMAcP8AeP4AADwAAAAAB4AAD8AAHOAAECBAECDAGGGAH8cAD44AABgAAHAAAMAAAY+ABz/ADDDAGCBAECBAADnAAB+AAA8AAAAAAAAAAB8AAD+ADz/AH+DAGeBAEOBAEPBAELhAH5zADw6ABg+AAEeAAF/AAHnAAGDAAEBAAABAAAAAAAAAH4AAHwAAAAAAAAAAP/gA//4B8B8DgAOGAACEAADAAAAAAAAEAADGAACDgAOB8B8A//4AP/gAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAP8AAAAAAAAAAAAAAH4AAf+AB//gD//wD//wH//4H//8P//8P//8P//8P//8P//8P//8P//8H//4H//4D//wB//gA//AAf+AADwAAAABAAAxAAA+AAA8AAAAAAAAAAAAAABgAABgAABgAABgAABgAABgAAAAAAAAAAACAAAHAAAHAAACAAAAAAAHAAA8AAHwAA+AADwAAHAAAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAP8AAAAAAAAAAAAAABABADABACABAH//AH//AAABAAABAAABAAAAAAAAAAAAAHAHAHAHAEAPAEAbAEAzAGBjAHPDAD+DAD8DAAADAAAAAAAAADAPAHADAGABAEEBAEEBAEGBAGODAH7HAD7+AAh8AAAAAAA4AAB4AAHYAAMYAAYYABwYADgYAH//AH//AAAYAAAYAAAAAAAAAAAGAH8PAGEDAGEBAGEBAGEBAGGDAGGDAGD+AAD8AAAQAAAAAA/4AB/+ADyPAGGDAEEBAEEBAEGBAGHHAHD+AAB8AAAAAAAAAAAAAHgAAGABAGAHAGAeAGB4AGHgAGeAAH4AAHgAAEAAAAAAABx8AD7+AH/HAGOBAEEBAEEBAGODAH/HAD7+ABx8AAAAAAAAAB8GAD+HAHvBAGDBAEBBAEBBAGBDAHjOAD/8AB/4AAAAAAAAAAICAAcHAAcHAAICAAAAAAAAAAAAAAABAHAzAHA+AHA8AAAAAAAAAAAAAAGAAAHAAANAAANgAAZgAAYwAAwwAAwYAAgYABgIABAMAAAAAAAAAAAAABAMABgIAAgYAAwQAAQwAAYgAAJgAANgAAPAAAHAAAGAAAAAAAAAAAAAAHAAAGAAAEAHAED3AECHAGGAAH8AAD8AAAwAAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACQAACQAACQAACYAAGIAAEMAAMGAAYDAAwBgBgA8PAAH4AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA5nAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8F//oCf+QBjxgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+f//+L//0N//sEf+ICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+b//2J//kMP8MEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+X//6Y//GIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+X//6QBgCYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+f//+f//+QAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f//+f//+fAA+YAAGQAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8P//8f4H+eAAeYAAGQAACQAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH//4P//8PgB8eAAeYAAGQAACQAACQAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD//wH8P4PAA8OAAcYAAGYAAGQAACQAACQAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB//gD4HwHAA4OAAcMAAMYAAGYAAGQAACQAACQAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAH4AA//AB4HgDgBwGAAYMAAMIAAEYAAGQAACQAACQAACQAACQAACQAACYAAGIAAEMAAMEAAICAAQBgBgA4HAAP8AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACQAACQAACQAACYAAGIAAEMAAMGAAYDgBwB4HgA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACQAACQAACYAAGYAAGMAAMOAAcHAA4D4HwB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACQAACQAACYAAGcAAOOAAcPAA8H8P4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACQAACYAAGYAAGeAAePgB8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACQAACYAAGeAAef4H+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACYAAGfgB+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQAACQAACQAACf//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEYAAGQH4CX//6f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMAAMIAAEY//GX//6f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEAAIMf+MJ//kf//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABgBgCAAQEf+IN//sL//0f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAP8AA4HABjxgCf+QF//oP//8P//8f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAH4AAAAAAAAAAH4AA8PAB//gD//wH//4P//8P//8f//+f//+f//+f//+f//+f//+f//+f//+P//8P//8H//4D//wB//gA//AAP8AAAAAAAAAAAAAD///D///CAADCAADCAABAAAAAHAAAB4AAAfAAAD4AAAeAAADAAAAAAAACAABCAADCAADD///D///AAAAAAAA'),
+    32,
+    atob("GAgKDAwUEwQICBgXBggGBxgMDAwMDAwMDAwHBw4ADgsYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgIBwg="),
+    24|65536
+  );
+}
+
+Graphics.prototype.setFontInknutAntiqua24 = function() {
+  // Actual height 24 (23 - 0)
+  return this.setFontCustom(
+    atob('AAAAAB4AAD4AAD4AAD4AABwAAAAAAAAAAAAAAAAPAAD/AA/4AP+AD/gAf4AAeAAAAAAAAAAAAYAAB/AAD/gAH/wAP/4APH4AcB4AcA4AcA4AcA4AeA4AfBwAf/wAP/gAH/AAD+AAA4AAAAAAAAAAIAYAcAYAcA4Af/4Af/4Af/4Af/4AcAYAYAYAAAQAAAAACAIAGAYAOA4AeB4AcD4AcH4AcP4Aef4Af94Af54APx4APh4ADH4AAH8AAAAAAAAACAAAGAAYOAAYeAA4cCAwcHBwefBwf/ngP//gPz/AHj+ACB8AAAwAAAAAAAwAABwAAHwAAPwAAfwAA8wABwwADgwAPBwAP//wf//wf//wf//gAAwAAAwAAAwAAAAAAHAGD/AOH/AMHvgMHngcHnwYHn44Hj/wHj/wfh/gfw/AAAeAAAAAAAAAAAAAAB8AAP/AAf/gA//wB//4D8D4HwB4HsA4POA4ePA4cPh44H/w4H/gAD/AAB+AAAYAAAAAAAAA/gAAfgAAeAAYeAB4eAHweAfAeB8AeHwAePAAe8AAf4AAfgAAeAAAYAAAAAAAAAAAAAeADg/APx/gP7/gf//w/+Dw4+Bw4fBw4fBw8fhw//zwf3/gfj/gPD/AAB+AAAYAAAAAAAAAA+AAD/AAH/gYH/wYP/w4OD5wcA5wcAzgeAPgfAfAP/+AP/8AH/4AD/wAB/AAAAAAAAAAAAAAHB4APj4APj4APj4APBwAAAAAAAAA'),
+    46,
+    atob("CAkTDBANEQ8SEBISCA=="),
+    24|65536
+  );
+};
+
+Graphics.prototype.setFontInknutAntiqua66 = function() {
+  // Actual height 66 (65 - 0)
+  return this.setFontCustom(
+    atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAH/AAAAAAAAAP/AAAAAAAAAf/gAAAAAAAAf/gAAAAAAAA//wAAAAAAAA//wAAAAAAAA//wAAAAAAAB//gAAAAAAAA//gAAAAAAAA//gAAAAAAAA//AAAAAAAAAf+AAAAAAAAAP8AAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAfAAAAAAAAAH/AAAAAAAAB//AAAAAAAAf//AAAAAAAH///AAAAAAB///8AAAAAA////AAAAAAP///wAAAAAD///8AAAAAA////AAAAAAP///wAAAAAD///8AAAAAA////AAAAAAf///gAAAAAH///4AAAAAAf//+AAAAAAAf//gAAAAAAAf/4AAAAAAAAf+AAAAAAAAAfgAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAf/gAAAAAAAB//8AAAAAAAH//+AAAAAAAP///gAAAAAAf///wAAAAAA////4AAAAAB////8AAAAAD////8AAAAAH////+AAAAAP/////AAAAAP/////AAAAAf/////AAAAAf+AH//gAAAA/wAA//gAAAA/gAAf/gAAAB/AAAH/gAAAB/AAAD/wAAAD/AAAB/wAAAD+AAAB/wAAAD+AAAB/wAAAD+AAAA/wAAAD+AAAA/wAAAD/AAAA/gAAAH/AAAA/gAAAH/AAAA/gAAAD/gAAA/gAAAD/gAAB/AAAAD/wAAB/AAAAD/8AAD/AAAAD//AAH+AAAAD//4A/+AAAAB/////8AAAAB/////8AAAAA/////4AAAAA/////wAAAAAf////gAAAAAP////gAAAAAP////AAAAAAH///+AAAAAAB///4AAAAAAA///wAAAAAAAP//AAAAAAAAD/8AAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAA4AAAAHgAAAD4AAAAPgAAAD8AAAAfgAAAD8AAAAfgAAAD8AAAA/gAAAD8AAAB/gAAAD+AAAD/gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD//////gAAAD/gAAA/gAAAD/AAAAfgAAAD+AAAAfgAAAD+AAAAfgAAAD8AAAAPgAAAD4AAAAPgAAADwAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAHgAAAAD8AAAPgAAAAD8AAAfgAAAAH4AAA/gAAAAP4AAB/gAAAAfwAAD/gAAAA/wAAD/gAAAA/wAAH/gAAAB/gAAP/gAAAD/gAAf/gAAAD/gAA//gAAAD/AAB//gAAAD/AAB//gAAAD/AAD//gAAAD/AAH//gAAAD/AAP//gAAAD/gAf//gAAAD/gB///gAAAD/wD///gAAAD/8P/f/gAAAD///+f/gAAAD///+f/gAAAD///8f/gAAAB///4f/gAAAB///wf/gAAAB///gf/gAAAA///Af/gAAAA//+Af/gAAAAf/8Af/gAAAAf/4Af/gAAAAP/wAf/gAAAAH/AA//gAAAAB8AH//gAAAAAAAP//wAAAAAAAP//wAAAAAAAP//wAAAAAAAP//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAADwAAAAAAcAAH4AAAAAAfAAH4AAAAAA/AAPwAAAAAA/AAfwAAAAAA/AA/gAAAAAB+AB/gAAAAAB+AB/AAAAAAD+AD/AAAAAAD8AH/AAAAAAH8AH+AAAAAAH4AH+AAHgAAP4AH+AAPwAAP4AH/AAfwAAfwAH/AA/4AAfwAH/gD/4AA/gAH/4P/8AB/gAH////+AD/AAD/////AH/AAD/////wf+AAD///////+AAB///v///8AAB///P///8AAA//+H///4AAA//8H///wAAAf/4D///wAAAP/wB///gAAAP/gB///AAAAD+AA//+AAAAA4AAf/8AAAAAAAAP/wAAAAAAAAH/AAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAB8AAAAAAAAAH8AAAAAAAAAP8AAAAAAAAAf8AAAAAAAAA/8AAAAAAAAB/8AAAAAAAAH/8AAAAAAAAP/8AAAAAAAAf/8AAAAAAAA//8AAAAAAAB/38AAAAAAAH/n8AAAAAAAP/H8AAAAAAAf+H8AAAAAAA/4H8AAAAAAD/wH8AAAAAAH/gH8AAAAAAP/AH8AAAAAAf8AH8AAAAAA/4AH8AAAAAD/wAH8AAAAAH/gAH8AAAAAP/AAH8AAAAAf8AAH8AAAAA////////8AA////////4AB////////4AB////////4AB////////wAD////////wAD////////wAD////////gAH////////gAH////////AAH////////AAAAAAAH8AAAAAAAAAH8AAAAAAAAAH8AAAAAAAAAH8AAAAAAAAAH8AAAAAAAAAH8AAAAAAAAAH8AAAAAAAAAH8AAAAAAAAAH4AAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAH4AAAAPgAAAH4AAAH/gAAAH4AAD//wAAAPwAB///wAAAPwAf///wAAAPwA////4AAAfgA////4AAAfgA//D/8AAAfgA//D/8AAA/AA//D/8AAA/AA//B/+AAB/AA//B/+AAB+AA//A//AAD+AA//A//AAD+AA//A//gAH8AA//Af/wAP8AA//Af/wAP4AA//AP/4A/4AA//AP/+D/wAA//AH////wAA//AH////gAA//AD////gAA//AD////AAA//AB///+AAB//AB///+AAP//AA///8AAf//gAf//4AAf//gAP//wAAf//gAH//gAAf//gAD//AAAAAAAAB/8AAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/8AAAAAAAB///gAAAAAAP///4AAAAAA////+AAAAAB/////AAAAAH/////gAAAAP/////wAAAAf/////4AAAA//////8AAAB//////8AAAD//////+AAAH//////+AAAP//4B///AAAf/+AAH//AAA//wAAB//AAB//AAAAf/AAD/+AAAAP/gAD/4AAAAH/gAH/wMAAAD/gAP/geAAAD/gAP+B+AAAB/gAf8B/AAAB/gA/4B/gAAB/AA/wB/gAAB/AB/wB/wAAB/AB/gB/4AAD/AD/AB/+AAD+AH+AA//gAP+AH8AA//8A/8AP8AA/////8AP4AAf////4AfwAAf////4AfgAAP////wAfgAAH////gAPAAAH////AACAAAD///+AAAAAAB///8AAAAAAA///4AAAAAAAf//wAAAAAAAH//AAAAAAAAB/8AAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//4AAAAAAAH//4AAAAAAAD//8AAAAAAAD//8AAAAAAAD//wAAAAAAAD//AAAAAACAD/8AAAAAAPAD/8AAAAAA/AD/8AAAAAD/gD/8AAAAAP/gD/8AAAAA//AD/8AAAAD/8AD/8AAAAP/wAD/8AAAAf/AAD/8AAAB/8AAD/8AAAH/wAAD/8AAAf/AAAD/8AAB/+AAAD/8AAH/4AAAD/8AAf/gAAAD/8AB/+AAAAD/8AD/4AAAAD/8AP/gAAAAD/8A/+AAAAAD/8D/4AAAAAD/8P/gAAAAAD/8//AAAAAAD///8AAAAAAD///wAAAAAAD///AAAAAAAD//8AAAAAAAD//wAAAAAAAD//AAAAAAAAD/8AAAAAAAAD/wAAAAAAAAD/gAAAAAAAAD+AAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAD/wAAAAAAAAH/8AAAAAAAAf/+AAAAf4AA///AAAB/+AB///gAAD//AB///wAAH//gD///4AAf//wH///4AAf//4P///8AA///8P///8AB///+f///+AD///+////+AD/////gD/+AH////+AA//AP////8AAP/AP+D//4AAH/AP4A//wAAD/AfwAf/4AAD/AfwAP/8AAB/gfgAH/8AAB/gfgAD/+AAA/g/gAD/+AAA/g/wAB//AAA/gfwAA//gAA/gf4AA//wAA/gf8AD//wAB/Af/AP//4AB/Af/////8AD/Af//////AH+AP///z//gf+AP///j////8AH///B////4AH//+B////4AD//8A////wAB//4Af///gAA//wAf///AAAf/AAP///AAAP8AAH//+AAAAgAAD//4AAAAAAAB//wAAAAAAAAf/gAAAAAAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAD//gAAAAAAAH//4AAAAAAAf//8AAAAAAA///+AAAAAAB////AAAAAAD////gAAMAAH////gAAfAAP////wAA/gAP////4AA/AAf////4AB/AAf////8AD+AA/+A//8AD+AA/wAH/8AH8AB/gAB/+AP8AB/AAAf+Af4AD/AAAP+Af4AD+AAAH+A/wAD+AAAH+B/wAD+AAAD+D/gAD+AAAB+H/AAD/AAAB4P/AAH/AAAAwf+AAD/gAAAA/8AAD/wAAAD/8AAD/4AAAH/4AAD/8AAAf/wAAD//AAD//gAAD//8Af//gAAB///////AAAB//////+AAAA//////8AAAA//////4AAAAf/////wAAAAP/////gAAAAH/////AAAAAD////8AAAAAB////4AAAAAAf///gAAAAAAH//+AAAAAAAB//wAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAB8AAAAAD/AAH+AAAAAP/gAP/AAAAAP/gAf/gAAAAf/wAf/gAAAA//wA//wAAAA//wA//wAAAA//wA//wAAAA//wA//gAAAA//gA//gAAAA//gA//gAAAA//AA//AAAAAf/AAf+AAAAAP+AAP8AAAAAH4AAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
+    46,
+    atob("FhczISslMCkyKzMyFg=="),
+    66|65536
+  );
+};
+
+Graphics.prototype.setFontInknutAntiqua88 = function() {
+  // Actual height 88 (87 - 0)
+  return this.setFontCustom(
+    atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAA/4AAAAAAAAAAAAH/wAAAAAAAAAAAA//gAAAAAAAAAAAH//AAAAAAAAAAAA//+AAAAAAAAAAAD//4AAAAAAAAAAAf//gAAAAAAAAAAB//+AAAAAAAAAAAH//4AAAAAAAAAAAf//gAAAAAAAAAAB//+AAAAAAAAAAAH//4AAAAAAAAAAAf//AAAAAAAAAAAB//8AAAAAAAAAAAH//gAAAAAAAAAAAP/8AAAAAAAAAAAAf/gAAAAAAAAAAAA/8AAAAAAAAAAAAB/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAP8AAAAAAAAAAAAP/wAAAAAAAAAAAf//AAAAAAAAAAAf//8AAAAAAAAAAf///wAAAAAAAAAf////AAAAAAAAAf////wAAAAAAAAf////wAAAAAAAAf////gAAAAAAAAf////gAAAAAAAAf////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAA/////gAAAAAAAAP////gAAAAAAAAA////AAAAAAAAAAD///AAAAAAAAAAAH//AAAAAAAAAAAAf/AAAAAAAAAAAAB/AAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAB//wAAAAAAAAAAAf//wAAAAAAAAAAH///wAAAAAAAAAB////wAAAAAAAAAP////gAAAAAAAAB/////gAAAAAAAAP/////AAAAAAAAB/////+AAAAAAAAP/////4AAAAAAAB//////wAAAAAAAP//////gAAAAAAB///////AAAAAAAP//////8AAAAAAA///////4AAAAAAH///////gAAAAAAf//////+AAAAAAD//AB///8AAAAAAf/gAAf//wAAAAAB/8AAAf//AAAAAAH/gAAAf/+AAAAAA/8AAAAf/4AAAAAD/gAAAA//gAAAAAf+AAAAD/+AAAAAB/wAAAAH/4AAAAAH/AAAAAP/gAAAAAf8AAAAA/+AAAAAD/wAAAAD/4AAAAAP/AAAAAH/gAAAAA/8AAAAAf+AAAAAD/wAAAAB/4AAAAAP/AAAAAH/gAAAAA/+AAAAAf+AAAAAD/4AAAAB/wAAAAAP/gAAAAH/AAAAAA//AAAAAf8AAAAAD/+AAAAD/gAAAAAP/8AAAAP+AAAAAA//4AAAB/4AAAAAD//wAAAP/AAAAAAH//wAAB/8AAAAAAf//4AAf/gAAAAAB////A//+AAAAAAD///////wAAAAAAP///////AAAAAAAf//////4AAAAAAB///////AAAAAAAD//////8AAAAAAAP//////gAAAAAAAf/////8AAAAAAAA//////gAAAAAAAB/////8AAAAAAAAD/////gAAAAAAAAH////8AAAAAAAAAP////gAAAAAAAAAP///4AAAAAAAAAAf//+AAAAAAAAAAAf//gAAAAAAAAAAAH/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAHgAAAAAB8AAAAAB+AAAAAAPwAAAAAP8AAAAAB/AAAAAA/wAAAAAP8AAAAAD/AAAAAA/wAAAAAP8AAAAAH/AAAAAA/4AAAAA/8AAAAAD/gAAAAH/wAAAAAP+AAAAA//AAAAAA////////8AAAAAD////////wAAAAAP////////AAAAAA////////8AAAAAD////////wAAAAAP////////AAAAAA////////8AAAAAD////////wAAAAAP////////AAAAAA////////8AAAAAD////////wAAAAAP////////AAAAAA////////8AAAAAD////////wAAAAAP////////AAAAAA//AAAAAf8AAAAAD/4AAAAA/wAAAAAP/gAAAAD/AAAAAA/8AAAAAP8AAAAAD/gAAAAA/wAAAAAP8AAAAAB/AAAAAA/gAAAAAH8AAAAAD+AAAAAAfwAAAAAHwAAAAAA8AAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAB8AAAAAAAPgAAAAPwAAAAAAB/AAAAB/AAAAAAAP8AAAAP8AAAAAAB/wAAAB/wAAAAAAP+AAAAH/AAAAAAA/4AAAA/8AAAAAAH/AAAAH/wAAAAAA/8AAAA//AAAAAAH/gAAAH/8AAAAAA/+AAAAf/wAAAAAD/4AAAD//AAAAAAf/AAAAf/8AAAAAB/8AAAD//wAAAAAP/wAAAf//AAAAAA/+AAAD//8AAAAAD/4AAAf//wAAAAAP/gAAB///AAAAAA/+AAAP//8AAAAAD/4AAB///wAAAAAP/gAAP///AAAAAA//AAB///8AAAAAD/8AAP///wAAAAAP/wAB////AAAAAA//gAf///8AAAAAD//AD/9//wAAAAAP/+A//n//AAAAAA/////8f/8AAAAAD/////h//wAAAAAH////+H//AAAAAAf////wf/8AAAAAB////+B//wAAAAAH////wH//AAAAAAP///+Af/8AAAAAA////wB//wAAAAAD///+AH//AAAAAAH///wAf/8AAAAAAf//+AB//wAAAAAA///wAH//AAAAAAB//+AAf/8AAAAAAD//wAB//wAAAAAAP/8AAH//AAAAAAAP/gAB//8AAAAAAAf4AA///wAAAAAAAAAAP///gAAAAAAAAAB///+AAAAAAAAAAH///4AAAAAAAAAAP///gAAAAAAAAAA////AAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAB4AAAAAAAADgAAAP4AAAAAAAAP4AAA/gAAAAAAAA/gAAH+AAAAAAAAH+AAA/wAAAAAAAAf4AAH/AAAAAAAAB/AAA/4AAAAAAAAP8AAD/gAAAAAAAA/wAAf8AAAAAAAAH+AAD/wAAAAAAAAf4AAf+AAAAAAAAB/gAD/4AAAAAAAAP8AAP/gAAAAAAAA/wAA/+AAAAAAAAH/AAD/wAAAAAAAAf4AAP/AAAHwAAAD/gAB/8AAA/gAAAP8AAD/4AAH+AAAB/wAAP/gAA/8AAAH/AAA/+AAH/4AAA/4AAD/8AA//gAAH/gAAP/4AP//AAAf8AAA//8H//+AAD/wAAD//////8AAf+AAAP//////4AD/4AAAf//////wA//AAAB///////9//8AAAH//////////gAAAP///8/////+AAAA////j/////wAAAD///+H/////AAAAH///wf////4AAAAf//+A/////AAAAA///wD////4AAAAB//+AH////gAAAAD//wAf///8AAAAAH/+AA////gAAAAAP/gAB///8AAAAAAf8AAD///gAAAAAAOAAAP//8AAAAAAAAAAAf//AAAAAAAAAAAAf/wAAAAAAAAAAAA/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAH8AAAAAAAAAAAAA/wAAAAAAAAAAAAH/AAAAAAAAAAAAA/8AAAAAAAAAAAAH/wAAAAAAAAAAAB//AAAAAAAAAAAAP/8AAAAAAAAAAAB//wAAAAAAAAAAAP//AAAAAAAAAAAB//8AAAAAAAAAAAf//wAAAAAAAAAAD///AAAAAAAAAAAf//8AAAAAAAAAAD/9/wAAAAAAAAAA//n/AAAAAAAAAAH/8f8AAAAAAAAAA//h/wAAAAAAAAAH/4H/AAAAAAAAAA//Af8AAAAAAAAAP/4B/wAAAAAAAAB//AH/AAAAAAAAAP/4Af8AAAAAAAAB/+AB/wAAAAAAAAP/wAH/AAAAAAAAD/+AAf8AAAAAAAAf/wAB/wAAAAAAAD/8AAH/AAAAAAAAf/gAAf8AAAAAAAD/8AAB/wAAAAAAA//gAAH/AAAAAAAH/8AAAf8AAAAAAA//AAAB/wAAAAAAH//////////+AAAf//////////4AAB///////////gAAP//////////8AAA///////////wAAD///////////AAAf//////////4AAB///////////gAAP//////////+AAA///////////wAAD///////////AAAf//////////8AAB///////////gAAH//////////+AAA///////////wAAAAAAAAAH/AAAAAAAAAAAAAf8AAAAAAAAAAAAB/wAAAAAAAAAAAAH/AAAAAAAAAAAAAf8AAAAAAAAAAAAB/wAAAAAAAAAAAAH/AAAAAAAAAAAAAf8AAAAAAAAAAAAB/wAAAAAAAAAAAAH/AAAAAAAAAAAAAf8AAAAAAAAAAAAB+AAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAfwAAAAAAfAAAAAB/gAAAAA/+AAAAAH8AAAAB//4AAAAA/wAAAD///gAAAAD/AAAH////AAAAAP4AAP////8AAAAB/gAD/////wAAAAH+AAP/////gAAAA/wAA/////+AAAAD/AAD//g//4AAAAP8AAP/+D//wAAAB/gAA//4H//AAAAH+AAD//gf/+AAAA/4AAP/+B//4AAAD/AAA//4D//wAAAP8AAD//gP//AAAB/wAAP/+A//+AAAH+AAA//4B//4AAA/4AAD//gH//wAAH/AAAP/+AP//AAAf8AAA//4A//+AAD/wAAD//gD//8AAf+AAAP/+AH//4AD/4AAA//4Af//wAf/AAAD//gA///gH/8AAAP/+AD//////gAAA//4AH/////+AAAD//gAf/////wAAAP/+AA//////AAAA//4AD/////4AAAD//gAH/////AAAAP/+AAf////8AAAD//4AA/////gAAA///gAB////8AAAf///AAH////gAAD///8AAP///+AAAP///wAAf///wAAAf///AAA///+AAAB///+AAB///gAAAH///4AAD//8AAAAAAAAAAAD//AAAAAAAAAAAAB/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB//8AAAAAAAAAAB///+AAAAAAAAAAf///+AAAAAAAAAP////+AAAAAAAAD/////+AAAAAAAAf/////8AAAAAAAH//////8AAAAAAA///////4AAAAAAP///////wAAAAAB////////gAAAAAP///////+AAAAAB////////8AAAAAP////////4AAAAB/////////gAAAAP/////////AAAAB/////////8AAAAP///8Af///wAAAB///4AAD///gAAAP//8AAAB//+AAAB///AAAAB//4AAAH//wAAAAD//wAAA//8AAAAAD//AAAH//gAAAAAH/8AAA//4AAAAAAP/wAAD//AGAAAAA//AAAf/4B4AAAAB/8AAD/+APwAAAAH/wAAP/wD/AAAAAf/AAB/+AP+AAAAA/8AAP/wA/8AAAAD/gAA/+AD/wAAAAP+AAH/4AP/gAAAA/4AAf/AA//AAAAH/gAD/4AD/+AAAAf8AAf/AAP/8AAAB/wAB/4AAf/8AAAP/AAP/AAB//8AAB/4AA/8AAH//8AAf/gAH/gAAP///gf/8AAf8AAA///////wAD/gAAD//////+AAP+AAAH//////4AB/wAAAf//////AAH+AAAA//////4AA/4AAAB//////AAA/AAAAH/////8AAA4AAAAP/////gAAAAAAAAf////8AAAAAAAAA/////gAAAAAAAAB////8AAAAAAAAAD////AAAAAAAAAAH///4AAAAAAAAAAH//+AAAAAAAAAAAH//gAAAAAAAAAAAH/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB///8AAAAAAAAAAH///4AAAAAAAAAAP///gAAAAAAAAAA///+AAAAAAAAAAD///8AAAAAAAAAAP///gAAAAAAAAAA///wAAAAAAAAAAB//8AAAAAAAAGAAH//AAAAAAAAB8AAf/8AAAAAAAAPwAB//wAAAAAAAD/gAH//AAAAAAAA/+AAf/8AAAAAAAP/8AB//wAAAAAAD//gAH//AAAAAAA//4AAf/8AAAAAAP/+AAB//wAAAAAD//gAAH//AAAAAAf/8AAAf/8AAAAAH//AAAB//wAAAAB//wAAAH//AAAAAf/8AAAAf/8AAAAH//AAAAB//wAAAB//wAAAAH//AAAAf/8AAAAAf/8AAAD//AAAAAB//wAAA//4AAAAAH//AAAP/+AAAAAAf/8AAD//gAAAAAB//wAA//4AAAAAAH//AAP/+AAAAAAAf/8AD//gAAAAAAB//wA//4AAAAAAAH//AH/+AAAAAAAAf/8B//wAAAAAAAB//wf/8AAAAAAAAH//H//AAAAAAAAAf/9//wAAAAAAAAB////8AAAAAAAAAH////AAAAAAAAAAf///wAAAAAAAAAB///8AAAAAAAAAAH///gAAAAAAAAAAf//4AAAAAAAAAAB//+AAAAAAAAAAAH//gAAAAAAAAAAAf/4AAAAAAAAAAAB/+AAAAAAAAAAAAH/gAAAAAAAAAAAAf4AAAAAAAAAAAAB/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAA//gAAAAAAAAAAAH//gAAAAAAAAAAA///AAAAAACAAAAP//+AAAAAD/wAAB///8AAAAA//wAAP///4AAAAH//wAA////wAAAA///gAH////gAAAH///AA/////AAAA///+AH////8AAAH///8A/////4AAA////4D/////gAAH////wf/////AAA/////D/////8AAH////+f/////4AAf////9//v///gAD///////AA//+AAf//////wAA//8AB//////+AAA//wAP//////wAAB//AA/+A///+AAAD/8AH/wA///wAAAH/4Af8AB///AAAAP/gB/wAB//+AAAA/+AP+AAD//4AAAB/4A/4AAP//wAAAH/gD/gAAf//AAAAP+AP+AAA//+AAAA/4A/4AAB//8AAAD/gD/gAAH//wAAAP+AP+AAAP//gAAA/4A/8AAAf//AAAD/gD/wAAB//8AAAP+AP/wAAf//4AAA/4A//gAH///wAAH/AD//gB////gAAf8AH////////AAD/wAf///////+AAf+AB/////3//+AH/4AD////+P//+B//AAP////w//////8AA////+B//////gAB////wH/////+AAD///+AP/////wAAP///wAf////+AAAf//+AB/////wAAA///wAD/////AAAB//+AAH////4AAAD//gAAP////AAAAH/8AAA////4AAAAD/AAAB////AAAAAAAAAAD///4AAAAAAAAAAD//+AAAAAAAAAAAH//wAAAAAAAAAAAP/8AAAAAAAAAAAAP/AAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAAAAAAA//+AAAAAAAAAAAP//8AAAAAAAAAAD///8AAAAAAAAAAf///4AAAAAAAAAH////wAAAAAAAAA/////gAAAAAAAAH/////AAAAAAAAA/////+AAAAYAAAH/////8AAAD4AAA//////wAAAfwAAD//////gAAB/gAAf//////AAAP+AAD//////8AAB/wAAP//////4AAH/AAB///////gAA/4AAH/+Af//+AAH/gAA//AAH//8AAf8AAD/wAAD//wAD/wAAf+AAAD//AAf+AAB/wAAAH/+AD/4AAH/AAAAP/4Af/AAA/8AAAAf/gB/4AAD/gAAAA/+AP/gAAP+AAAAB/4B/8AAA/4AAAAD/gP/wAAH/gAAAAP+B/+AAAf/AAAAAf4P/4AAB/8AAAAB+B//AAAH/wAAAADgP/4AAAf/gAAAAMB//gAAB/+AAAAAAP/8AAAH/8AAAAAD//gAAAf/4AAAAAf/+AAAB//wAAAAH//wAAAD//wAAAB//+AAAAP//wAAAf//wAAAA///4AAP//+AAAAB////Af///4AAAAH/////////AAAAAf////////4AAAAA/////////AAAAAD////////4AAAAAH////////AAAAAAP///////4AAAAAA////////AAAAAAB///////4AAAAAAD//////+AAAAAAAH//////wAAAAAAAP/////+AAAAAAAAP/////gAAAAAAAAf////4AAAAAAAAAf///+AAAAAAAAAAP///AAAAAAAAAAAH//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH+AAAD/AAAAAAAA/8AAAf+AAAAAAAH/4AAD/8AAAAAAA//wAAf/4AAAAAAH//gAD//wAAAAAA//+AAf//AAAAAAD//4AB//8AAAAAAf//gAP//wAAAAAB//+AA///AAAAAAH//4AD//8AAAAAAf//gAP//wAAAAAB//+AA///AAAAAAH//4AD//8AAAAAAf//AAP//gAAAAAB//8AA//+AAAAAAD//gAB//wAAAAAAH/8AAD/+AAAAAAAf/gAAP/wAAAAAAAf8AAAP+AAAAAAAAfAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'),
+    46,
+    atob("HR9FLTkxQDdDOkNDHQ=="),
+    88|65536
+  );
+};
+
+{ // 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 drawStatusTimeout;
+  
+let drawStatus = function(){ // battery and 24h line clock, remove if ou want  to display wigets instead
+  
+g.clearRect(0,22,175,22);
+g.setColor(g.theme.fg); // draw battery 
+g.drawLine(0,2,E.getBattery()*1.75,2);
+  // draw line for 24 h clock
+  var x = g.getWidth() / 2;
+  var y = g.getHeight() / 2;
+  var ix;
+  var shade;
+  var w ;
+  var date = new Date();
+  for ( ix = 0; ix < 176; ix=ix+4){
+    shade = 2*Math.PI * ((date.getHours()-6)/24);
+    shade = Math.sin(2*Math.PI* ix/176 + shade );
+    shade = shade * 0.5 + 0.5;
+    shade = 1- shade ;
+g.setColor(shade,shade,shade);
+g.drawLine(ix,18, ix+3,18);
+  }
+g.setColor(g.theme.fg); // draw dots at noon / midnight
+ix = x-(((date.getHours())%12)/24)*176;
+g.drawLine(ix,16,ix+2,18);
+g.drawLine(ix+2,18,ix, 20);
+g.drawLine(ix,20,ix-2,18);
+g.drawLine(ix-2,18,ix,16);
+  
+ix = ix + 176/2;
+g.drawLine(ix,16,ix+2,18);
+g.drawLine(ix+2,18,ix, 20);
+g.drawLine(ix,20,ix-2,18);
+g.drawLine(ix-2,18,ix,16);
+
+// queue next drawStatus
+  if (drawStatusTimeout) clearTimeout(drawStatusTimeout);
+  drawStatusTimeout = setTimeout(function() {
+    drawStatusTimeout = undefined;
+    drawStatus();
+    //draw();
+    //drawWeek();    
+  }, 30*60000 - (Date.now() % 30*60000));
+  
+};//------------------<< status
+  
+  
+  
+let drawWeekTimeout;
+  
+let drawWeek = function() {
+  //  date and day of week, moonphase, next quater moon
+  var date = new Date();
+  var weekday = Math.abs(date.getDay() -1 % 7);
+  var dateStr = date.getDate() ;
+  
+  g.reset().clearRect(0,175-36,175,175-36);
+  g.setColor(g.theme.fg);
+  g.fillRect(0, 175-15, 175, 175);
+  var pos;
+  var d;
+ for ( d=0; d< 7; d++){ 
+    pos = d * 25;
+     if (d < 5 ){
+       g.setColor(g.theme.bg);
+       g.fillRect(pos, 175-15, pos+22, 175);
+     }else{        
+       g.setColor(g.blendColor(g.theme.bg,g.theme.fg,0.25));
+       g.fillRect(pos, 175-15, pos+22, 175);
+     }
+    
+ }
+g.setColor(g.theme.fg);
+g.setFontAlign(0, 0).setFont("InknutAntiqua24", 1).drawString(dateStr,  weekday*(176/7)+11, g.getHeight() - 15);
+
+var mphaseq=-1; // moonphase 0-3
+var qday = -1; // day in week quater moon
+var moonssince; // full moons since May 5th 2023
+var lundaymo; // lunation day monday
+var tms = date.getTime() + 86400000;//
+var weekdayms = weekday * 86400000 ;//seconds since monday
+var startd = tms - weekdayms; // monday
+var perc;// percent of cycle
+tms = startd - 1683308000000 ;//may5th 1734h 2023;
+moonssince = tms /2551442823.5;//div ms in a lunar month
+perc = moonssince - Math.floor(moonssince); 
+lundaymo = perc * 29.530588235;
+mphaseq =Math.round((lundaymo)/ 7.38264705875);
+   
+qday = Math.round( 7.38264705875 - (lundaymo- (mphaseq* 7.38264705875))) % 7; // next quater phase day
+mphaseq = (mphaseq+1) % 4; // set to next quater phase
+  
+
+g.setColor(0,0,0); // black moon bg
+var yoffset = (qday == weekday )*24;
+g.setFontAlign(0, 0).setFont("moonphases", 1).drawString(String.fromCharCode(48), qday*(176/7)+11, g.getHeight() - 22- yoffset);
+g.setColor(1,1,1); // moonshape
+   //g.setFontAlign(0, 0).setFont("moonphases", 1).drawString(String.fromCharCode(65+mphaseq*26/4), qday*(176/7)+11, g.getHeight() - 26- yoffset); // next moon or :
+  // exception for full moon:
+  var char;
+  if (Math.round(65+perc*26)==77) { 
+       char = 48;
+      }else{
+   char = Math.round(65+perc*26);
+      }
+g.setFontAlign(0, 0).setFont("moonphases", 1).drawString(String.fromCharCode(char), qday*(176/7)+11, g.getHeight() - 22- yoffset);
+
+// queue next drawWeek
+  if (drawWeekTimeout) clearTimeout(drawWeekTimeout);
+  drawWeekTimeout = setTimeout(function() {
+    drawWeekTimeout = undefined;
+    draw();
+    drawWeek();
+  }, 180*60000 - (Date.now() % 180*60000)); 
+
+};//-------------------<< week
+  
+let drawTimeout;
+
+//  draw  clock
+let draw = function() {
+  var x = g.getWidth() / 2;
+  var y = g.getHeight() / 2;
+  var xoffset =0;
+  var minute;
+  var hour;
+  var hour_old;
+  var date;
+  var digit1;
+  var digit2;
+  
+  g.reset().clearRect(0,25,175,175-36); // clear area
+
+  date = new Date();
+  hour_old = hour;
+  hour = date.getHours(); // hour 
+  if (hour_old != hour){ // only draw if hour has changed
+  if (hour > 12) {
+    hour = hour % 12;
+  }
+  digit2 = hour % 10;
+  digit1 = hour - digit2;
+  if (digit1 > 0 ){ // draw hours, one or two digits
+  xoffset = -10;
+  g.setColor(g.theme.fg);
+   g.setFontAlign(1, 0).setFont("InknutAntiqua66",1).drawString(hour, x+xoffset, y);
+  }
+  else {
+    xoffset = -15;
+  g.setColor(g.theme.fg);
+  g.setFontAlign(1, 0).setFont("InknutAntiqua88",1).drawString(hour, x+xoffset, y);  
+  }
+  }
+   minute = date.getMinutes(); //   minutes
+  digit2 = minute % 10;
+  digit1 = Math.floor(minute / 10);
+  minute = digit1.toString() + digit2.toString();
+  
+    g.setColor(g.blendColor(g.theme.bg,g.theme.fg,0.5));
+  g.setFontAlign(-1, 0).setFont("InknutAntiqua66",1).drawString(minute, x+xoffset , y);
+  
+// queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+ 
+};//-----------------------<< clock  
+  
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    if (drawStatusTimeout) clearTimeout(drawStatusTimeout);
+    drawStatusTimeout = undefined;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    if (drawWeekTimeout) clearTimeout(drawWeekTimeout);
+    drawWeekTimeout = undefined;
+    delete Graphics.prototype.setFontmoonphases;
+    delete Graphics.prototype.setFontInknutAntiqua24;
+    delete Graphics.prototype.setFontInknutAntiqua66d;
+    delete Graphics.prototype.setFontInknutAntiqua88;
+    
+    
+  }});
+//Load widgets
+//Bangle.loadWidgets();
+g.reset().clearRect(0,0,g.getWidth(),g.getHeight());
+draw();
+drawWeek();
+drawStatus(); // remove if ou want wigets to draw instead
+//
+//setTimeout(Bangle.drawWidgets,0);
+}
diff --git a/apps/polymath/app.png b/apps/polymath/app.png
new file mode 100644
index 000000000..480f8a539
Binary files /dev/null and b/apps/polymath/app.png differ
diff --git a/apps/polymath/metadata.json b/apps/polymath/metadata.json
new file mode 100644
index 000000000..7d13f8537
--- /dev/null
+++ b/apps/polymath/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "polymath",
+  "name": "A Polymaths Clock",
+  "shortName":"Polymath",
+  "icon": "app.png",
+  "version":"0.01",
+  "description": "This is a graphical clock based on Anton Clock with date, day and moon phase. Beta",
+ "screenshots" : [ { "url":"screenshot.png" }, { "url":"polymathclock.jpg" } ],
+ "type":"clock",   
+  "tags": "clock",
+  "readme": "README.md", 
+ "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"polymath.app.js","url":"app.js"},
+    {"name":"polymath.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/polymath/polymathclock.jpg b/apps/polymath/polymathclock.jpg
new file mode 100644
index 000000000..c90b43f0f
Binary files /dev/null and b/apps/polymath/polymathclock.jpg differ
diff --git a/apps/polymath/screenshot.png b/apps/polymath/screenshot.png
new file mode 100644
index 000000000..cda54aef6
Binary files /dev/null and b/apps/polymath/screenshot.png differ
diff --git a/apps/pomoplus/metadata.json b/apps/pomoplus/metadata.json
index 84a82c0e1..0db15ab4d 100644
--- a/apps/pomoplus/metadata.json
+++ b/apps/pomoplus/metadata.json
@@ -32,5 +32,8 @@
       "name": "pomoplus.settings.js",
       "url": "settings.js"
     }
+  ],
+  "data": [
+    {"name":"pomoplus.settings.json"}
   ]
 }
diff --git a/apps/popconlaunch/ChangeLog b/apps/popconlaunch/ChangeLog
new file mode 100644
index 000000000..ec9bfa232
--- /dev/null
+++ b/apps/popconlaunch/ChangeLog
@@ -0,0 +1,5 @@
+0.01: New App!
+0.02: Trim old entries from the popcon app cache
+0.03: Avoid polluting global scope
+0.04: Add settings app for resetting popcon
+0.05: Handle info files potentially not existing
diff --git a/apps/popconlaunch/README.md b/apps/popconlaunch/README.md
new file mode 100644
index 000000000..18a5354a4
--- /dev/null
+++ b/apps/popconlaunch/README.md
@@ -0,0 +1,8 @@
+Popcon
+======
+
+Display apps sorted by regular use. No config - install the app and all your launchers will sort apps by most popular, based off launch counts within the last month, and then sort them by the most recently launched app.
+
+⚠️ Warning: this app overrides [`Storage.readJSON`], so may slow down your watch when using apps that perform I/O.
+
+[`Storage.readJSON`]: https://www.espruino.com/ReferenceBANGLEJS2#l_Storage_readJSON
diff --git a/apps/popconlaunch/app.png b/apps/popconlaunch/app.png
new file mode 100644
index 000000000..d7cd295e4
Binary files /dev/null and b/apps/popconlaunch/app.png differ
diff --git a/apps/popconlaunch/boot.js b/apps/popconlaunch/boot.js
new file mode 100644
index 000000000..e760b501e
--- /dev/null
+++ b/apps/popconlaunch/boot.js
@@ -0,0 +1,94 @@
+(function () {
+    var oldRead = require("Storage").readJSON;
+    var oneMonth = 1000 * 86400 * 28;
+    var monthAgo = Date.now() - oneMonth;
+    var cache;
+    var ensureCache = function () {
+        if (!cache) {
+            cache = oldRead("popcon.cache.json", true);
+            if (!cache)
+                cache = {};
+        }
+        return cache;
+    };
+    var trimCache = function (cache) {
+        var threeMonthsBack = Date.now() - oneMonth * 3;
+        var del = [];
+        for (var k in cache)
+            if (cache[k].last < threeMonthsBack)
+                del.push(k);
+        for (var _i = 0, del_1 = del; _i < del_1.length; _i++) {
+            var k = del_1[_i];
+            delete cache[k];
+        }
+    };
+    var saveCache = function (cache, orderChanged) {
+        trimCache(cache);
+        require("Storage").writeJSON("popcon.cache.json", cache);
+        if (orderChanged) {
+            var info = oldRead("popconlaunch.info", true) || { cacheBuster: true };
+            info.cacheBuster = !info.cacheBuster;
+            require("Storage").writeJSON("popconlaunch.info", info);
+        }
+    };
+    var sortCache = function () {
+        var ents = Object.values(cache);
+        ents.sort(function (a, b) {
+            var n;
+            var am = (a.last > monthAgo);
+            var bm = (b.last > monthAgo);
+            n = bm - am;
+            if (n)
+                return n;
+            n = b.pop - a.pop;
+            if (n)
+                return n;
+            n = b.last - a.last;
+            if (n)
+                return n;
+            if (a.name < b.name)
+                return -1;
+            if (a.name > b.name)
+                return 1;
+            return 0;
+        });
+        var i = 0;
+        var orderChanged = false;
+        for (var _i = 0, ents_1 = ents; _i < ents_1.length; _i++) {
+            var ent = ents_1[_i];
+            if (ent.sortorder !== i)
+                orderChanged = true;
+            ent.sortorder = i++;
+        }
+        return orderChanged;
+    };
+    require("Storage").readJSON = (function (fname, skipExceptions) {
+        var _a;
+        var j = oldRead(fname, skipExceptions);
+        if (j && /\.info$/.test(fname)) {
+            var cache_1 = ensureCache();
+            var so = void 0;
+            if (j.src && (so = (_a = cache_1[j.src]) === null || _a === void 0 ? void 0 : _a.sortorder) != null)
+                j.sortorder = so;
+            else
+                j.sortorder = 99;
+        }
+        return j;
+    });
+    var oldLoad = load;
+    global.load = function (src) {
+        if (src) {
+            var cache_2 = ensureCache();
+            var ent = cache_2[src] || (cache_2[src] = {
+                pop: 0,
+                last: 0,
+                sortorder: -10,
+            });
+            ent.pop++;
+            ent.last = Date.now();
+            var orderChanged = sortCache();
+            saveCache(cache_2, orderChanged);
+        }
+        return oldLoad(src);
+    };
+})();
diff --git a/apps/popconlaunch/boot.ts b/apps/popconlaunch/boot.ts
new file mode 100644
index 000000000..2802be59f
--- /dev/null
+++ b/apps/popconlaunch/boot.ts
@@ -0,0 +1,116 @@
+(() => {
+type Timestamp = number;
+type Cache = {
+	[key: string]: {
+		sortorder: number,
+		pop: number, // amount of launches
+		last: Timestamp,
+	}
+};
+
+const oldRead = require("Storage").readJSON;
+const oneMonth = 1000 * 86400 * 28;
+const monthAgo = Date.now() - oneMonth;
+let cache: undefined | Cache;
+
+const ensureCache = (): NonNull<typeof cache> => {
+	if(!cache){
+		cache = oldRead("popcon.cache.json", true) as Cache | undefined;
+		if(!cache)
+			cache = {};
+	}
+	return cache;
+};
+
+const trimCache = (cache: Cache) => {
+	const threeMonthsBack = Date.now() - oneMonth * 3;
+	const del = [];
+	for(const k in cache)
+		if(cache[k]!.last < threeMonthsBack)
+			del.push(k);
+
+	for(const k of del)
+		delete cache[k];
+};
+
+const saveCache = (cache: Cache, orderChanged: boolean) => {
+	trimCache(cache);
+	require("Storage").writeJSON("popcon.cache.json", cache);
+	if(orderChanged){
+		// ensure launchers reload their caches:
+		const info = (oldRead("popconlaunch.info", true) as undefined | AppInfo & { cacheBuster?: boolean }) || {cacheBuster:true};
+		info.cacheBuster = !info.cacheBuster;
+		require("Storage").writeJSON("popconlaunch.info", info);
+	}
+};
+
+const sortCache = () => {
+	const ents = Object.values(cache);
+
+	ents.sort((a, b) => {
+		// group the most recently launched apps in the last month,
+		// then sort by launch count
+		// then by name
+		let n;
+
+		const am = (a.last > monthAgo) as unknown as number;
+		const bm = (b.last > monthAgo) as unknown as number;
+		n = bm - am;
+		if(n) return n;
+
+		n = b.pop - a.pop;
+		if(n) return n;
+
+		// pops are the same, sort by most recent
+		n = b.last - a.last;
+		if(n) return n;
+
+		if(a.name<b.name) return -1;
+		if(a.name>b.name) return 1;
+		return 0;
+	});
+
+	let i = 0;
+	let orderChanged = false;
+	for(const ent of ents){
+		if(ent.sortorder !== i) orderChanged = true;
+		ent.sortorder = i++;
+	}
+	return orderChanged;
+};
+
+require("Storage").readJSON = ((fname, skipExceptions) => {
+	const j = oldRead(fname, skipExceptions) as AppInfo | undefined;
+	// technically only AppInfo if we're "*.info" ^
+
+	if(j && /\.info$/.test(fname)){
+		const cache = ensureCache();
+		let so;
+
+		if(j.src && (so = cache[j.src]?.sortorder) != null)
+			j.sortorder = so;
+		else
+			j.sortorder = 99;
+	}
+
+	return j;
+}) satisfies typeof oldRead;
+
+const oldLoad = load;
+global.load = (src: string) => {
+	if(src){
+		const cache = ensureCache();
+		const ent = cache[src] ||= {
+			pop: 0,
+			last: 0,
+			sortorder: -10,
+		};
+		ent.pop++;
+		ent.last = Date.now();
+		const orderChanged = sortCache();
+		saveCache(cache, orderChanged);
+	}
+
+	return oldLoad(src);
+};
+})()
diff --git a/apps/popconlaunch/icon.js b/apps/popconlaunch/icon.js
new file mode 100644
index 000000000..a64ed9747
--- /dev/null
+++ b/apps/popconlaunch/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AEvNAAItq6YAFGoYEBF9I1GQ7vTAIIAMS7YqIRAQADBYwunGAyTYFyAyJLzIlJGBYvYXJowcRRaaHCAYveAoYuIF4/NdzQATF6f+45KD6vV6gfD44ME6gNBBgguU3YAB4/U64AD6fHBYQMB6YME6gMDFyoAB6wiE6wLEBhgvWEInX6AvF6ANFF7fREInRF4oMLF6xSLNhgv/GA3JF6PJFywv/F8nCF6PCF8XBBYfBF/4vSQZabLF/4wI6IvP6IuYF4nQF5/QF/4vN5IvP5Iv/F6fIBQfIF8ZUKNRQvVGAYvUFywvz3YvPRzQvE6IvN6IvfACYv/AH4A/AH4Ar"))
diff --git a/apps/popconlaunch/metadata.json b/apps/popconlaunch/metadata.json
new file mode 100644
index 000000000..012ca6765
--- /dev/null
+++ b/apps/popconlaunch/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "popconlaunch",
+  "name": "Popcon Launcher",
+  "shortName": "Popcon",
+  "version": "0.05",
+  "description": "Launcher modification - your launchers will display your favourite (popular) apps first. Overrides `readJSON`, may slow down your watch",
+  "readme": "README.md",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "tool,system",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"popcon.boot.js","url":"boot.js"},
+    {"name":"popcon.img","url":"icon.js","evaluate":true},
+    {"name":"popcon.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"popcon.cache.json"}
+  ]
+}
diff --git a/apps/popconlaunch/settings.js b/apps/popconlaunch/settings.js
new file mode 100644
index 000000000..29528c5dd
--- /dev/null
+++ b/apps/popconlaunch/settings.js
@@ -0,0 +1,15 @@
+(function (back) {
+    var menu = {
+        '': { 'title': 'Popcon' },
+        '< Back': back,
+        'Reset app popularities': function () {
+            var S = require("Storage");
+            S.erase("popcon.cache.json");
+            var info = S.readJSON("popconlaunch.info", true);
+            info.cacheBuster = !info.cacheBuster;
+            S.writeJSON("popconlaunch.info", info);
+            E.showMessage("Popcon reset", "Done");
+        },
+    };
+    E.showMenu(menu);
+});
diff --git a/apps/popconlaunch/settings.ts b/apps/popconlaunch/settings.ts
new file mode 100644
index 000000000..6f02dc438
--- /dev/null
+++ b/apps/popconlaunch/settings.ts
@@ -0,0 +1,18 @@
+(function(back) {
+	const menu = {
+		'': {'title': 'Popcon'},
+		'< Back': back,
+		'Reset app popularities': () => {
+			const S = require("Storage");
+			S.erase("popcon.cache.json");
+
+			const info = S.readJSON("popconlaunch.info", true) as AppInfo & { cacheBuster?: boolean };
+			info.cacheBuster = !info.cacheBuster;
+			S.writeJSON("popconlaunch.info", info);
+
+			E.showMessage("Popcon reset", "Done");
+		},
+	};
+
+	E.showMenu(menu);
+}) satisfies SettingsFunc
diff --git a/apps/powermanager/ChangeLog b/apps/powermanager/ChangeLog
index a83e8c676..87bbc80c7 100644
--- a/apps/powermanager/ChangeLog
+++ b/apps/powermanager/ChangeLog
@@ -3,3 +3,12 @@
 0.03: Use default Bangle formatter for booleans
 0.04: Remove calibration with current voltage (Calibrate->Auto) as it is now handled by settings app
       Allow automatic calibration on every charge longer than 3 hours
+0.05: Add back button to settings menu.
+0.06: Allow logging of some things using power
+      Add widget for live monitoring of power use
+0.07: Convert Yes/No On/Off in settings to checkboxes
+0.08: Fix the wrapping of intervals/timeouts with parameters
+      Fix the widget drawing if widgets are hidden and Bangle.setLCDBrightness is called
+0.09: Accidental version bump
+0.10: Use charging state on boot for auto calibration
+      Log additional timestamp for trace log
diff --git a/apps/powermanager/README.md b/apps/powermanager/README.md
index 88b3c370a..804e986e7 100644
--- a/apps/powermanager/README.md
+++ b/apps/powermanager/README.md
@@ -7,6 +7,26 @@ Features:
 * Force monotonic battery percentage or voltage
 * Automatic calibration on charging uninterrupted longer than 3 hours (reloads of the watch reset the timer).
 
+
+## Widget
+
+The widget shows an approximate current power use. There is a power gauge showing the estimation of the currently used power and the currently active sensor with the biggest power draw.
+G for GPS, H for pulse sensor and C for compass.
+
+## Logging
+
+You can switch on logging in the options to diagnose unexpected power use. Currently the logging can capture the code running from timeouts and intervals and the power up and down of some devices. The captured times are probably not perfect but should be good enough to indicate problems.
+
+Do not use trace logging for extended time, it uses a lot of storage and can fill up the flash quite quick.
+
+### TODO
+
+* Wrap functions given as strings to setTimeout/setInterval
+* Handle eval in setTimeout/setInterval
+* Track functions executed as event handlers
+* Track buzzer
+* Modify browser interface to estimate power use like widget does
+
 ## Internals
 
 Battery calibration offset is set by writing `batFullVoltage` in setting.json 
@@ -14,6 +34,10 @@ Battery calibration offset is set by writing `batFullVoltage` in setting.json
 ## TODO
 
 * Optionally keep battery history and show as graph
+* Capture some more stuff in logging
+ * Event driven code execution
+ * Buzzer
+ * Better tracking of display on time
 
 ## Creator
 
diff --git a/apps/powermanager/boot.js b/apps/powermanager/boot.js
index 2bc2aaa35..c35ec1546 100644
--- a/apps/powermanager/boot.js
+++ b/apps/powermanager/boot.js
@@ -3,11 +3,116 @@
     require('Storage').readJSON("powermanager.default.json", true) || {},
     require('Storage').readJSON("powermanager.json", true) || {}
   );
-  
+
+  if (settings.log) {
+    let logFile = require('Storage').open("powermanager.log","a");
+    let def = require('Storage').readJSON("powermanager.def.json", true) || {};
+    if (!def.start) def.start = Date.now();
+    if (!def.deferred) def.deferred = {};
+    let hw = require('Storage').readJSON("powermanager.hw.json", true) || {};
+    if (!hw.start) hw.start = Date.now();
+    if (!hw.power) hw.power = {};
+
+    const saveEvery = 1000 * 60 * 5;
+    const TO_WRAP = ["GPS","Compass","Barometer","HRM","LCD"];
+
+    let save = ()=>{
+      let defExists = require("Storage").read("powermanager.def.json")!==undefined;
+      if (!(!defExists && def.saved)){
+        def.saved = Date.now();
+        require('Storage').writeJSON("powermanager.def.json", def);
+      }
+      let hwExists = require("Storage").read("powermanager.hw.json")!==undefined;
+      if (!(!hwExists && hw.saved)){
+        hw.saved = Date.now();
+        require('Storage').writeJSON("powermanager.hw.json", hw);
+      }
+    }
+
+    setInterval(save, saveEvery);
+
+    E.on("kill", ()=>{
+      for (let c of TO_WRAP){
+        if (lastPowerOn[c] && Bangle["is"+c+"On"]()){
+          hw.power[c] += Date.now() - lastPowerOn[c];
+        }
+      }
+      save();
+    });
+
+
+    let logPower = (type, oldstate, state, app) => {
+      logFile.write(Date.now() + ",p," + type + ',' + (oldstate?1:0) + ',' + (state?1:0) + ',' + app + "\n");
+    };
+    let logDeferred = (type, duration, source) => {
+      logFile.write(Date.now() + "," + type + ',' + duration + ',' + source.replace(/\n/g, " ").replace(/,/g,"") + "\n");
+    };
+
+    let lastPowerOn = {};
+
+    for (let c of TO_WRAP){
+      let functionName = "set" + c + "Power";
+      let checkName = "is" + c + "On";
+      let type = c + "";
+      lastPowerOn[type] = (!lastPowerOn[type] && Bangle[checkName]()) ? Date.now() : undefined;
+
+      lastPowerOn[type] = Date.now();
+
+      Bangle[functionName] = ((o) => (a,b) => {
+        let oldstate = Bangle[checkName]();
+        let result = o(a,b);
+        if (!lastPowerOn[type] && result) {
+          //switched on, store time
+          lastPowerOn[type] = Date.now();
+        } else if (lastPowerOn[type] && !result){
+          //switched off
+          hw.power[type] += Date.now() - lastPowerOn[type];
+          lastPowerOn[type] = undefined;
+        }
+
+        if (settings.logDetails) logPower(type, oldstate, result, b);
+        return result;
+      })(Bangle[functionName]);
+    }
+
+    let functions = {};
+    let wrapDeferred = ((o,t) => (a) => {
+      if (a == eval || typeof a == "string") {
+        return o.apply(this, arguments);
+      } else {
+        let wrapped = a;
+        if (!a.__wrapped){
+          wrapped = ()=>{
+            let start = Date.now();
+            let result = a.apply(undefined, arguments.slice(2)); // function arguments for deferred calls start at index 2, first is function, second is time
+            let end = Date.now()-start;
+            let f = a.toString().substring(0,100);
+            if (settings.logDetails) logDeferred(t, end, f);
+            if (!def.deferred[f]) def.deferred[f] = 0;
+            def.deferred[f] += end;
+            return result;
+          };
+          //copy over properties of functions
+          for (let p in a){
+            wrapped[p] = a[p];
+          }
+          //mark function as wrapped
+          wrapped.__wrapped = true;
+        }
+        let newArgs = arguments.slice();
+        newArgs[0] = wrapped;
+        return o.apply(this, newArgs);
+      }
+    });
+
+    global.setTimeout = wrapDeferred(global.setTimeout, "t");
+    global.setInterval = wrapDeferred(global.setInterval, "i");
+  }
+
   if (settings.warnEnabled){
     var chargingInterval;
 
-    function handleCharging(charging){
+    let handleCharging = (charging) => {
         if (charging){
           if (chargingInterval) clearInterval(chargingInterval);
           chargingInterval = setInterval(()=>{
@@ -20,12 +125,12 @@
         clearInterval(chargingInterval);
         chargingInterval = undefined;
       }
-    }
+    };
 
     Bangle.on("charging",handleCharging);
     handleCharging(Bangle.isCharging());
   }
-  
+
   if (settings.forceMonoPercentage){
     var p = (E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/4;
     var op = E.getBattery;
@@ -47,11 +152,12 @@
       return v;
     };
   }
-  
+
   if (settings.autoCalibration){
     let chargeStart;
+    if (Bangle.isCharging()) chargeStart = Date.now();
     Bangle.on("charging", (charging)=>{
-      if (charging) chargeStart = Date.now();
+      if (!chargeStart && charging) chargeStart = Date.now();
       if (chargeStart && !charging && (Date.now() - chargeStart > 1000*60*60*3)) require("powermanager").setCalibration();
       if (!charging) chargeStart = undefined;
     });
diff --git a/apps/powermanager/default.json b/apps/powermanager/default.json
index 6c929dc38..457f79610 100644
--- a/apps/powermanager/default.json
+++ b/apps/powermanager/default.json
@@ -2,5 +2,6 @@
   "warnEnabled": false,
   "warn": 96,
   "forceMonoVoltage": false,
-  "forceMonoPercentage": false
+  "forceMonoPercentage": false,
+  "log": false
 }
diff --git a/apps/powermanager/interface.html b/apps/powermanager/interface.html
new file mode 100644
index 000000000..2cab4561a
--- /dev/null
+++ b/apps/powermanager/interface.html
@@ -0,0 +1,323 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+
+    <style> 
+      .table_wrapper{
+        display: block;
+        overflow-x: auto;
+        margin-right: 0.8rem;
+        white-space: nowrap;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="content"></div>
+
+    <script src="../../core/lib/interface.js"></script>
+    <script>
+
+var domContent = document.getElementById("content");
+
+function download(filename, callback) {
+  Util.showModal("Downloading power info...");
+  Util.readStorage(filename, data => {
+    Util.hideModal();
+    callback(data);
+  });
+}
+function show() {
+  Util.showModal("Loading...");
+  domContent.innerHTML = "";
+    var htmlOverview = `<table class="table table-striped table-hover">
+      <div>This needs "Logging" to be enabled in power manager settings. The deferred function calls table is only updated on the bangle on reloads.</div>
+      <thead>
+        <tr>
+          <th>Type</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+          <tr>
+            <td>Deferred function calls</td>
+            <td>
+              <button class="btn btn-primary" filename="powermanager.def.json" task="deftable">Table</button>
+              <button class="btn btn-error" filename="powermanager.def.json" task="clear" style="float: right;margin-right: 5px;">Clear</button>
+            </td>
+          </tr>
+          <tr>
+            <td>Hardware</td>
+            <td>
+              <button class="btn btn-primary" filename="powermanager.hw.json" task="hardwaretable">Table</button>
+              <button class="btn btn-error" filename="powermanager.hw.json" task="clear" style="float: right;margin-right: 5px;">Clear</button>
+            </td>
+          </tr>
+          <tr>
+            <td>Details (Trace)</td>
+            <td>
+              <button class="btn btn-primary" filename="powermanager.log" task="detailstable">Table</button>
+              <button class="btn btn-error" filename="powermanager.log" task="detailsclear" style="float: right;margin-right: 5px;">Clear</button>
+            </td>
+          </tr>
+        </tbody>
+    </table>`;
+  domContent.innerHTML = htmlOverview;
+  Util.hideModal();
+  var buttons = domContent.querySelectorAll("button");
+  for (var i=0;i<buttons.length;i++) {
+    buttons[i].addEventListener("click",event => {
+      var button = event.currentTarget;
+      var filename = button.getAttribute("filename");
+      if (!filename) return;
+      var task = button.getAttribute("task");
+      if (task=="detailsclear") {
+        Util.showModal("Clearing...");
+        Util.eraseStorageFile(filename,()=>{
+          Util.hideModal();
+          show();
+        });
+      }
+      if (task=="clear") {
+        Util.showModal("Clearing...");
+        Util.eraseStorage(filename,()=>{
+          Util.hideModal();
+          show();
+        });
+      }
+      if (task=="deftable") {
+        viewDeferredTable(filename);
+      }
+      if (task=="hardwaretable") {
+        viewHardwareTable(filename);
+      }
+      if (task=="detailstable") {
+        viewDetailsTable(filename);
+      }
+    });
+  }
+}
+
+function viewDeferredTable(filename) {
+  Puck.eval(`require("Storage").list("powermanager.def.json").length > 0`, (f)=>{
+    if (f) {
+      Util.showModal("Reading summarized info...");
+      Util.readStorage(
+        filename, data => {
+          Util.hideModal();
+          let parsed = JSON.parse(data);
+          
+          let sum = 0;
+          let rows = [];
+          for (var i in parsed.deferred) {
+            sum += parsed.deferred[i];
+            rows.push({func: i, time: parsed.deferred[i]});
+          }
+          rows.sort((a,b)=>{return b.time/sum - a.time/sum;});
+          let tableRows = "";
+          for (var i in rows) {
+            let c = rows[i];
+            tableRows += `<tr>
+            <td>${timeFormat(c.time)}</td>
+            <td>${(c.time/sum*100).toFixed(2)}%</td>
+            <td><pre>${c.func}</pre></td>`
+          }
+
+          let duration = parsed.saved - parsed.start;
+
+          var htmlOverview = `<h1>Deferred function calls</h1>
+            <button class="btn btn-primary" id="back" style="float: right;margin-right: 5px;margin-left: 10px;">Back</button>
+            <div>
+              This are functions used in timeouts and intervals and their accumulated execution times. Recorded in a time span of <b>${timeFormat(duration)}</b>. Timeouts/intervals have run for <b>${timeFormat(sum)} (${(sum/duration*100).toFixed(2)}%)</b>. Percentages are calculated from summarized timeout/interval running time.
+            </div>           
+
+            <div class="table_wrapper">
+
+              <table class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th>Time</th>
+                  <th>Percentage</th>
+                  <th>Function</th>
+                </tr>
+              </thead>
+              <tbody>\n`;
+          htmlOverview += tableRows;
+          htmlOverview += `</tbody></table></div>`;
+          domContent.innerHTML = htmlOverview;
+          domContent.querySelector("#back").addEventListener("click",event => {
+            show();
+          });
+
+          //try finding possible sources for the given function, currently does not work because function.toString() not being identical to code in the *.js files.
+
+          /*Puck.eval(`require("Storage").list(/.*.js$/)`, (f)=>{
+            console.log("Found files:", f, rows[1].func);
+            for (let file of f){
+              let query = `require("Storage").read('${file}').includes('${rows[1].func}')`;
+              console.log("Query: " + query);
+              Puck.eval(query, (r)=>{
+                if (r) domContent.querySelector("#row_1").innerHTML = file;
+                console.log("Found", file, r)
+              });
+            }
+          });*/
+        });
+      } else {
+        var htmlOverview = `<h1>Deferred function calls</h1>
+          <button class="btn btn-primary" id="back" style="float: right;margin-right: 5px;">Back</button>
+          <div>
+            No data available.
+          </div>`;
+        domContent.innerHTML = htmlOverview;
+        domContent.querySelector("#back").addEventListener("click",event => {
+          show();
+        });
+    }
+  });
+}
+
+
+function viewHardwareTable(filename) {
+  Puck.eval(`require("Storage").list("powermanager.hw.json").length > 0`, (f)=>{
+    if (f) {
+      Util.showModal("Reading hardware info...");
+      Util.readStorage(
+        filename, data => {
+          Util.hideModal();
+          let parsed = JSON.parse(data);
+          console.log("Hardware", parsed);
+          let duration = parsed.saved - parsed.start;
+          
+          let rows = [];
+          for (var i in parsed.power) {
+            rows.push({func: i, time: parsed.power[i]});
+          }
+          rows.sort((a,b)=>{return b.time/duration - a.time/duration;});
+          let tableRows = "";
+          for (var i in rows) {
+            let c = rows[i];
+            tableRows += `<tr>
+            <td>${timeFormat(c.time)}</td>
+            <td>${(c.time/duration*100).toFixed(2)}%</td>
+            <td>${c.func}</td>`
+          }
+
+
+          var htmlOverview = `<h1>Hardware power</h1>
+            <button class="btn btn-primary" id="back" style="float: right;margin-right: 5px;margin-left: 10px;">Back</button>
+            <div>
+              Recorded in a time span of <b>${timeFormat(duration)}</b>. Percentages are calculated from recording time.
+            </div>
+            <table class="table table-striped table-hover">
+            <thead>
+              <tr>
+                <th>Time</th>
+                <th>Percentage</th>
+                <th>Device</th>
+              </tr>
+            </thead>
+            <tbody>\n`;
+          htmlOverview += tableRows;
+          htmlOverview += `</tbody></table>`;
+          domContent.innerHTML = htmlOverview;
+          domContent.querySelector("#back").addEventListener("click",event => {
+            show();
+          });
+        });
+      } else {
+        var htmlOverview = `<h1>Hardware power</h1>
+          <button class="btn btn-primary" id="back" style="float: right;margin-right: 5px;">Back</button>
+          <div>
+            No data available.
+          </div>`;
+        domContent.innerHTML = htmlOverview;
+        domContent.querySelector("#back").addEventListener("click",event => {
+          show();
+        });
+    }
+  });
+}
+
+
+function viewDetailsTable(filename) {
+  Util.showModal("Reading details info...");
+  Util.readStorageFile(
+    filename, data => {
+      Util.hideModal();
+      
+      var htmlOverview = `<h1>Detailed logging</h1>
+      <button class="btn btn-primary" id="back" style="float: right;margin-right: 5px;">Back</button>
+      <div>
+        This is a trace log of all logged entries. Power is logged with type, state transition (old &rarr; new) and calling app if available. Functions are logged with execution duration and source if available.
+      </div>
+      <div class="table_wrapper">
+
+        <table class="table table-striped table-hover">
+        <thead>
+          <tr>
+            <th>Time</th>
+            <th>Type</th>
+            <th>Info</th>
+          </tr>
+        </thead>
+        <tbody>\n`;
+        let rows = data.trim().split("\n");
+        let firstTimestamp;
+        for (var row of rows) {
+          let cols = row.split(",");
+          let col = 0;
+          if (!firstTimestamp) firstTimestamp = cols[0];
+
+          if (cols[1] == "p"){
+            cols[1] = "Power";
+            htmlOverview += `<tr>
+            <td>${timeFormat(cols[col++]-firstTimestamp)}</td>
+            <td>${cols[col++]}</td>
+            <td>${cols[col++]}</br>${cols[col++]} &rarr; ${cols[col++]}</br>${cols[col++]}</td>
+            </tr>`
+          } else {
+            htmlOverview += `<tr>
+            <td>${timeFormat(cols[col++]-firstTimestamp)}</td>
+            <td>${cols[col++]=="t"?"Timeout":"Interval"}</td>
+            <td>${new Number(cols[col++]).toFixed(0)}ms</br><pre>${cols[col++]}</pre></td>
+            </tr>`
+          }
+      }
+      htmlOverview += `</tbody></table></div>`;
+
+
+      domContent.innerHTML = htmlOverview;
+      domContent.querySelector("#back").addEventListener("click",event => {
+         show();
+      });
+    });
+}
+
+function onInit() {
+  show();
+}
+
+function timeFormat(time) {
+  let secs = time / 1000;
+
+  if (secs < 60)
+    return secs.toFixed(2) + "s";
+
+  let mins = secs / 60;
+  secs %= 60;
+  if (mins < 60)
+    return mins.toFixed(0) + "m" + secs.toFixed(0) + "s";
+
+  let hrs = mins / 60;
+  mins %= 60;
+  if (hrs < 24)
+    return hrs.toFixed(0) + "h" + mins.toFixed(0) + "m" + secs.toFixed(0) + "s";
+
+  let days = hrs / 24;
+  hrs %= 24;
+  return days.toFixed(0) + "d" + hrs.toFixed(0) + "h" + mins.toFixed(0) + "m" + secs.toFixed(0) + "s";
+}
+
+    </script>
+  </body>
+</html>
diff --git a/apps/powermanager/metadata.json b/apps/powermanager/metadata.json
index 0777feee3..55c7a662e 100644
--- a/apps/powermanager/metadata.json
+++ b/apps/powermanager/metadata.json
@@ -2,17 +2,25 @@
   "id": "powermanager",
   "name": "Power Manager",
   "shortName": "Power Manager",
-  "version": "0.04",
+  "version": "0.10",
   "description": "Allow configuration of warnings and thresholds for battery charging and display.",
   "icon": "app.png",
   "type": "bootloader",
   "tags": "tool",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
+  "interface": "interface.html",
   "storage": [
     {"name":"powermanager.boot.js","url":"boot.js"},
     {"name":"powermanager.settings.js","url":"settings.js"},
+    {"name":"powermanager.wid.js","url":"widget.js"},
     {"name":"powermanager","url":"lib.js"},
     {"name":"powermanager.default.json","url":"default.json"}
+  ],
+  "data": [
+    {"name":"powermanager.hw.json"},
+    {"name":"powermanager.def.json"},
+    {"name":"powermanager.json"},
+    {"name":"powermanager.log"}
   ]
 }
diff --git a/apps/powermanager/settings.js b/apps/powermanager/settings.js
index 9eeb29e00..d2b2097f8 100644
--- a/apps/powermanager/settings.js
+++ b/apps/powermanager/settings.js
@@ -23,6 +23,10 @@
     '': {
       'title': 'Power Manager'
     },
+    "< Back" : back,
+    'Widget': function() {
+      E.showMenu(submenu_widget);
+    },
     'Monotonic percentage': {
       value: !!settings.forceMonoPercentage,
       onchange: v => {
@@ -40,6 +44,9 @@
     },
     'Calibrate': function() {
       E.showMenu(submenu_calibrate);
+    },
+    'Logging': function() {
+      E.showMenu(submenu_logging);
     }
   };
 
@@ -99,7 +106,6 @@
     },
     'Enabled': {
       value: !!settings.warnEnabled,
-      format: v => settings.warnEnabled ? "On" : "Off",
       onchange: v => {
         writeSettings("warnEnabled", v);
       }
@@ -116,5 +122,74 @@
     }
   };
 
+  var submenu_logging = {
+    '': {
+      title: "Logging",
+      back: function() {
+        E.showMenu(mainmenu);
+      },
+    },
+    'Enabled': {
+      value: !!settings.log,
+      onchange: v => {
+        writeSettings("log", v);
+      }
+    },
+    'Trace': {
+      value: !!settings.logDetails,
+      onchange: v => {
+        writeSettings("logDetails", v);
+      }
+    },
+    'Clear logs': function (){
+      E.showPrompt("Delete logs and reload?").then((v)=>{
+        if (v) {
+          require('Storage').open("powermanager.log","w").erase();
+          require("Storage").erase("powermanager.def.json");
+          require("Storage").erase("powermanager.hw.json");
+          load();
+        } else 
+          E.showMenu(submenu_logging); 
+       }).catch(()=>{
+        E.showMenu(submenu_logging);
+      });
+    }
+  }
+
+  var submenu_widget = {
+    '': {
+      title: "Widget",
+      back: function() {
+        E.showMenu(mainmenu);
+      },
+    },
+    'Enabled': {
+      value: !!settings.widget,
+      onchange: v => {
+        writeSettings("widget", v);
+      }
+    },
+    'Refresh': {
+      min: 0.5,
+      max: 60,
+      step: 0.5,
+      value: settings.refreshUnlocked || 1,
+      format: v => v + "s",
+      onchange: v => {
+        writeSettings("refreshUnlocked", v);
+      }
+    },
+    'Refresh locked': {
+      min: 5,
+      max: 120,
+      step: 5,
+      value: settings.refreshLocked || 60,
+      format: v => v + "s",
+      onchange: v => {
+        writeSettings("refreshLocked", v);
+      }
+    }
+  }
+
   E.showMenu(mainmenu);
 })
diff --git a/apps/powermanager/widget.js b/apps/powermanager/widget.js
new file mode 100644
index 000000000..3147c40ac
--- /dev/null
+++ b/apps/powermanager/widget.js
@@ -0,0 +1,116 @@
+/* run widgets in their own function scope so they don't interfere with
+currently-running apps */
+(() => {
+  const s = require("Storage").readJSON("powermanager.json") || {};
+  
+  if (!s.widget) return;
+
+  const SYSTICKMAX = peek32(0xE000E014);
+  const SYSTICKWAIT = SYSTICKMAX/64000; // 64 MHz clock rate, Systick counting down on every non idle clock
+
+  const GU = require("graphics_utils");
+  const APPROX_IDLE = 0.3;
+  const APPROX_HIGH_BW_BLE = 0.5;
+  const APPROX_COMPASS = process.HWVERSION == 2 ? 5.5 : 2;
+  const APPROX_HRM = process.HWVERSION == 2 ? 1 : 2.5;
+  const APPROX_CPU = 3;
+  const APPROX_GPS = process.HWVERSION == 2 ? 25 : 30;
+  const APPROX_TOUCH = 2.5;
+  const APPROX_BACKLIGHT = process.HWVERSION == 2 ? 16 : 40;
+  const MAX = APPROX_IDLE + APPROX_HIGH_BW_BLE + APPROX_COMPASS + APPROX_HRM + APPROX_CPU + APPROX_GPS + APPROX_TOUCH + APPROX_BACKLIGHT;
+
+  let settings = require("Storage").readJSON("setting.json") || {};
+
+  let brightnessSetting = settings.brightness || 1;
+  Bangle.setLCDBrightness = ((o) => (a) => {
+    brightnessSetting = a;
+    WIDGETS.powermanager.draw(WIDGETS.powermanager);
+    return o(a);
+  })(Bangle.setLCDBrightness);
+
+  let brightness = () => {
+    return process.HWVERSION == 2 ? (brightnessSetting * APPROX_BACKLIGHT) : (brightnessSetting * 0.9 * 33 + 7);
+  };
+
+  function doDraw(w, cpu){
+    g.reset();
+
+    let current = APPROX_IDLE + cpu * APPROX_CPU;
+    let mostExpensive = "P";
+
+    if (!Bangle.isLocked()) current += APPROX_TOUCH + brightness();
+    if (Bangle.isCompassOn()) {
+      current += APPROX_COMPASS;
+      mostExpensive = "C";
+    }
+    if (Bangle.isHRMOn()) {
+      current += APPROX_HRM;
+      mostExpensive = "H";
+    }
+    if (Bangle.isGPSOn()) {
+      current += APPROX_GPS;
+      mostExpensive = "G";
+    }
+
+    current = current / MAX;
+
+    g.clearRect(w.x, w.y, w.x + 23, w.y + 23);
+
+    g.setColor(g.theme.fg);
+
+    g.setFont6x15();
+    g.setFontAlign(0, 0);
+    g.drawString(mostExpensive, w.x + 12, w.y + 15);
+    let end = 135 + (current * (405 - 135));
+    g.setColor(current > 0.7 ? "#f00" : (current > 0.3 ? "#ff0" : "#0f0"));
+    GU.fillArc(g, w.x + 12, w.y + 12, 9, 12, GU.degreesToRadians(135), GU.degreesToRadians(end), GU.degreesToRadians(30));
+
+    g.setColor(g.theme.fg);
+    let endCpu = 135 + (cpu * (405 - 135));
+    GU.fillArc(g, w.x + 12, w.y + 12, 5.5, 8, GU.degreesToRadians(135), GU.degreesToRadians(endCpu), GU.degreesToRadians(30));
+  }
+  let sTimeout;
+  let s2Timeout;
+  let systickDiff;
+  function draw(w) {
+    let nextRefresh = Bangle.isLocked() ?  ((s.refreshLocked || 60) * 1000 ): ((s.refreshUnlocked || 1) * 1000)
+
+    if (s2Timeout) clearTimeout(s2Timeout);
+    if (sTimeout) clearTimeout(sTimeout);
+
+    let t,systickNow;
+    sTimeout = setTimeout(()=>{
+      systickNow = peek32(0xE000E018);
+      t = Date.now();
+    }, nextRefresh - SYSTICKWAIT - 100);
+
+    s2Timeout = setTimeout(() => {
+      let tLater = Date.now();
+      let systickLater = peek32(0xE000E018);
+      systickDiff = systickLater - systickNow;
+      if (systickDiff < 0) systickDiff += SYSTICKMAX;
+    }, nextRefresh - 100);
+
+    doDraw(w, systickDiff ? (1 - systickDiff/SYSTICKMAX) : 0);
+
+    if (w.timeoutId !== undefined) {
+      clearTimeout(w.timeoutId);
+    }
+    w.timeoutId = setTimeout(() => {
+      w.timeoutId = undefined;
+      w.draw(w);
+    }, nextRefresh);
+  }
+
+  // add your widget
+  WIDGETS.powermanager = {
+    area: "tl",
+    width: 24,
+    draw: draw
+  };
+
+  Bangle.on("lock", ()=>{WIDGETS.powermanager.draw(WIDGETS.powermanager);});
+
+  // conserve memory
+  delete settings;
+})();
\ No newline at end of file
diff --git a/apps/qcenter/ChangeLog b/apps/qcenter/ChangeLog
index 900b9017c..436949dc9 100644
--- a/apps/qcenter/ChangeLog
+++ b/apps/qcenter/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New App!
 0.02: Fix fast loading on swipe to clock
+0.03: Adds a setting for going back to clock on a timeout
+0.04: Fix timeouts closing fast loaded apps
\ No newline at end of file
diff --git a/apps/qcenter/app.js b/apps/qcenter/app.js
index be28db3b6..bd22c87e1 100644
--- a/apps/qcenter/app.js
+++ b/apps/qcenter/app.js
@@ -110,6 +110,8 @@ let layout = new Layout({
 }, {
   remove: ()=>{
     Bangle.removeListener("swipe", onSwipe);
+    Bangle.removeListener("touch", updateTimeout);
+    if (timeout) clearTimeout(timeout);
     delete Graphics.prototype.setFont8x12;
   }
 });
@@ -117,6 +119,16 @@ g.clear();
 layout.render();
 Bangle.drawWidgets();
 
+let timeout;
+const updateTimeout = function(){
+if (settings.timeout){
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(Bangle.showClock,settings.timeout*1000);
+  }
+};
+
+updateTimeout();
+
 // swipe event listener for exit gesture
 let onSwipe = function (lr, ud) {
   if(exitGesture == "swipeup" && ud == -1) Bangle.showClock();
@@ -126,4 +138,5 @@ let onSwipe = function (lr, ud) {
 }
 
 Bangle.on("swipe", onSwipe);
+Bangle.on("touch", updateTimeout);
 }
diff --git a/apps/qcenter/metadata.json b/apps/qcenter/metadata.json
index a325de10f..cd3e350a4 100644
--- a/apps/qcenter/metadata.json
+++ b/apps/qcenter/metadata.json
@@ -2,7 +2,7 @@
   "id": "qcenter",
   "name": "Quick Center",
   "shortName": "QCenter",
-  "version": "0.02",
+  "version": "0.04",
   "description": "An app for quickly launching your favourite apps, inspired by the control centres of other watches.",
   "icon": "app.png",
   "tags": "",
diff --git a/apps/qcenter/settings.js b/apps/qcenter/settings.js
index 2c97f8a5f..5d38b079e 100644
--- a/apps/qcenter/settings.js
+++ b/apps/qcenter/settings.js
@@ -49,6 +49,11 @@
       E.showMenu(exitGestureMenu);
     };
 
+    // Set Timeout
+    mainmenu["Timeout: " + (settings.timeout ? (settings.timeout+"s") : "Off")] = function () {
+      E.showMenu(timeoutMenu);
+    };
+
     //List all pinned apps, redirecting to menu with options to unpin and reorder
     pinnedApps.forEach((app, i) => {
       mainmenu[app.name] = function () {
@@ -129,5 +134,22 @@
     showMainMenu();
   };
 
+  // menu for setting timeout
+  var timeoutMenu = {
+    "": { title: "Timeout", back: showMainMenu }
+  };
+  timeoutMenu["Off"] = function () {
+    save("timeout", 0);
+    showMainMenu();
+  };
+  let timeoutvalues = [10,20,30,60];
+  for (c in timeoutvalues){
+    let v = timeoutvalues[c];
+    timeoutMenu[v+"s"] = function () {
+      save("timeout", v);
+      showMainMenu();
+    };
+  }
+
   showMainMenu();
 });
diff --git a/apps/qmsched/ChangeLog b/apps/qmsched/ChangeLog
index 88185f337..897d06c26 100644
--- a/apps/qmsched/ChangeLog
+++ b/apps/qmsched/ChangeLog
@@ -8,3 +8,4 @@
       Changed time selection to 5-minute intervals
 0.08: Support new Bangle.js 2 menu
 0.09: Use default Bangle formatter for booleans
+0.10: Allow using theme files
diff --git a/apps/qmsched/README.md b/apps/qmsched/README.md
index 660bda787..e55a92084 100644
--- a/apps/qmsched/README.md
+++ b/apps/qmsched/README.md
@@ -14,6 +14,6 @@ Automatically turn Quiet Mode on or off at set times, and display a widget when
 Switch to dark theme during Quiet Mode.
  * **NOTE**: This switches between the default "Dark BW" and "Light BW" themes, so custom theme settings will be lost.
 
-### LCD Settings:
+### Options:
 
-If set, these override the default LCD settings while Quiet Mode is active.
\ No newline at end of file
+If set, these override the default LCD and theme settings while Quiet Mode is active.
diff --git a/apps/qmsched/app.js b/apps/qmsched/app.js
index da43dd7d6..023c247ee 100644
--- a/apps/qmsched/app.js
+++ b/apps/qmsched/app.js
@@ -4,7 +4,8 @@ Bangle.drawWidgets();
 const modeNames = [/*LANG*/"Off", /*LANG*/"Alarms", /*LANG*/"Silent"];
 const B2 = process.env.HWVERSION===2;
 // load global settings
-let bSettings = require('Storage').readJSON('setting.json',true)||{};
+const STORAGE = require('Storage');
+let bSettings = STORAGE.readJSON('setting.json',true)||{};
 let current = 0|bSettings.quiet;
 delete bSettings; // we don't need any other global settings
 
@@ -17,8 +18,8 @@ delete bSettings; // we don't need any other global settings
  * Save settings to qmsched.json
  */
 function save() {
-  require('Storage').writeJSON('qmsched.json', settings);
-  eval(require('Storage').read('qmsched.boot.js')); // apply new schedules right away
+  STORAGE.writeJSON('qmsched.json', settings);
+  eval(STORAGE.read('qmsched.boot.js')); // apply new schedules right away
 }
 function get(key, def) {
   return (key in settings) ? settings[key] : def;
@@ -37,12 +38,12 @@ let settings,
  * Load settings file, check if we need to migrate old setting formats to new
  */
 function loadSettings() {
-  settings = require('Storage').readJSON("qmsched.json", true) || {};
+  settings = STORAGE.readJSON("qmsched.json", true) || {};
 
   if (Array.isArray(settings)) {
     // migrate old file (plain array of schedules, qmOptions stored in global settings file)
-    require("Storage").erase("qmsched.json"); // need to erase old file, or Things Break, somehow...
-    let bOptions = require('Storage').readJSON('setting.json',true)||{};
+    STORAGE.erase("qmsched.json"); // need to erase old file, or Things Break, somehow...
+    let bOptions = STORAGE.readJSON('setting.json',true)||{};
     settings = {
       options: bOptions.qmOptions || {},
       scheds: settings,
@@ -51,7 +52,7 @@ function loadSettings() {
     save();
     // and clean up qmOptions from global settings file
     delete bOptions.qmOptions;
-    require('Storage').writeJSON('setting.json',bOptions);
+    STORAGE.writeJSON('setting.json',bOptions);
   }
   // apply defaults
   settings = Object.assign({
@@ -82,8 +83,7 @@ function formatTime(t) {
  * Apply theme
  */
 function applyTheme() {
-  const theme = (require("Storage").readJSON("setting.json", 1) || {}).theme;
-  if (theme && theme.dark===g.theme.dark) return; // already correct
+  const theme = (STORAGE.readJSON("setting.json", 1) || {}).theme;
   g.theme = theme;
   delete g.reset;
   g._reset = g.reset;
@@ -95,6 +95,33 @@ function applyTheme() {
   m.draw();
 }
 
+/**
+ * This creates menu entries for setting themes. This code is lifted from the setting app.
+ * @returns 
+ */
+function showThemeMenu(back, quiet){
+  const option = quiet ? "quietTheme" : "normalTheme";
+  function cl(x) { return g.setColor(x).getColor(); }
+  var themesMenu = {
+    '':{title:/*LANG*/'Theme', back: back},
+    /*LANG*/'Default': ()=>{
+      unset(option);
+      back();
+    }
+  };
+
+  STORAGE.list(/^.*\.theme$/).forEach(
+    n => {
+      let newTheme = STORAGE.readJSON(n);
+      themesMenu[newTheme.name ? newTheme.name : n] = () => {
+        set(option, n);
+        back();
+      };
+    }
+  );
+  E.showMenu(themesMenu);
+}
+
 /**
  * Library uses this to make the app update itself
  * @param {int} mode New Quite Mode
@@ -109,8 +136,8 @@ function setAppQuietMode(mode) {
 
 let m;
 function showMainMenu() {
-  let menu = {"": {"title": /*LANG*/"Quiet Mode"},};
-  menu[B2 ? /*LANG*/"< Back" : /*LANG*/"< Exit"] = () => {load();};
+  let menu = {"": {"title": /*LANG*/"Quiet Mode"}};
+  menu[B2 ? "< Back" : /*LANG*/"< Exit"] = () => {load();};
   menu[/*LANG*/"Current Mode"] = {
     value: current,
     min:0, max:2, wrap: true,
@@ -127,7 +154,7 @@ function showMainMenu() {
     value: !!get("switchTheme"),
     onchange: v => v ? set("switchTheme", v) : unset("switchTheme"),
   };
-  menu[/*LANG*/"LCD Settings"] = () => showOptionsMenu();
+  menu[/*LANG*/"Options"] = () => showOptionsMenu();
   m = E.showMenu(menu);
 }
 
@@ -142,7 +169,7 @@ function showEditMenu(index) {
     mode = s.mode;
   }
   let menu = {"": {"title": (isNew ? /*LANG*/"Add Schedule" : /*LANG*/"Edit Schedule")}};
-  menu[B2 ? /*LANG*/"< Back" : /*LANG*/"< Cancel"] =  () => showMainMenu();
+  menu[B2 ? "< Back" : /*LANG*/"< Cancel"] =  () => showMainMenu();
   menu[/*LANG*/"Hours"] = {
     value: hrs,
     min:0, max:23, wrap:true,
@@ -199,7 +226,7 @@ function showOptionsMenu() {
   let resetTimeout;
   const oMenu = {
     "": {"title": /*LANG*/"LCD Settings"},
-    /*LANG*/"< Back": () => showMainMenu(),
+    "< Back": () => showMainMenu(),
     /*LANG*/"LCD Brightness": {
       value: get("brightness", 0),
       min: 0, // 0 = use default
@@ -251,6 +278,10 @@ function showOptionsMenu() {
       onchange: () => {toggle("wakeOnTwist");},
     },
   };
+
+  oMenu[/*LANG*/"Normal Theme"] = () => showThemeMenu(showOptionsMenu, false);
+  oMenu[/*LANG*/"Quiet Theme"] = () => showThemeMenu(showOptionsMenu, true);
+
   m = E.showMenu(oMenu);
 }
 
diff --git a/apps/qmsched/lib.js b/apps/qmsched/lib.js
index 9696657cc..1d636f263 100644
--- a/apps/qmsched/lib.js
+++ b/apps/qmsched/lib.js
@@ -3,26 +3,70 @@
  * @param {int} mode Quiet Mode
  */
 function switchTheme(mode) {
-  if (!!mode === g.theme.dark) return; // nothing to do
-  let s = require("Storage").readJSON("setting.json", 1) || {};
-  // default themes, copied from settings.js:showThemeMenu()
   function cl(x) { return g.setColor(x).getColor(); }
-  s.theme = mode ? {
+  const readTheme = function(name) {
+    const n = require("Storage").readJSON(name);
+    return {
+      fg:cl(n.fg), bg:cl(n.bg),
+      fg2:cl(n.fg2), bg2:cl(n.bg2),
+      fgH:cl(n.fgH), bgH:cl(n.bgH),
+      dark:n.dark
+    };
+  }
+  const s = require("Storage").readJSON("setting.json", 1) || {};
+  // default themes, copied from settings.js:showThemeMenu()
+
+  const q = require("Storage").readJSON("qmsched.json", 1) || {};
+  let quietTheme = {
     // 'Dark BW'
-    fg: cl("#fff"), bg: cl("#000"),
-    fg2: cl("#0ff"), bg2: cl("#000"),
-    fgH: cl("#fff"), bgH: cl("#00f"),
-    dark: true
-  } : {
-    // 'Light BW'
-    fg: cl("#000"), bg: cl("#fff"),
-    fg2: cl("#000"), bg2: cl("#cff"),
-    fgH: cl("#000"), bgH: cl("#0ff"),
-    dark: false
+    fg:cl("#fff"), bg:cl("#000"),
+    fg2:cl("#fff"), bg2:cl("#004"),
+    fgH:cl("#fff"), bgH:cl("#00f"),
+    dark:true
   };
-  require("Storage").writeJSON("setting.json", s);
-  // reload clocks with new theme, otherwise just wait for user to switch apps
-  if (Bangle.CLOCK) load(global.__FILE__);
+  let normalTheme = {
+    // 'Light BW'
+    fg:cl("#000"), bg:cl("#fff"),
+    fg2:cl("#000"), bg2:cl("#cff"),
+    fgH:cl("#000"), bgH:cl("#0ff"),
+    dark:false
+  };
+
+  let miss = false;
+
+  // ensure referenced theme files actually exist or remove reference
+  if (q.normalTheme && require("Storage").read(q.normalTheme) == undefined){
+    delete q.normalTheme;
+    miss = true;
+  }
+  if (q.quietTheme && require("Storage").read(q.quietTheme) == undefined){
+    delete q.quietTheme;
+    miss = true;
+  }
+  if (miss) 
+    require("Storage").writeJSON("qmsched.json", q);
+
+  // load theme files
+  if (q.normalTheme)
+    normalTheme = readTheme(q.normalTheme);
+  if (q.quietTheme)
+    quietTheme = readTheme(q.quietTheme);
+
+
+  const newTheme = mode ? quietTheme : normalTheme;
+  let changed = false;
+  for (const c in newTheme) {
+      if (!(c in g.theme) || newTheme[c] !== g.theme[c]) {
+          changed = true;
+          break;
+      }
+  }
+  if (changed) {
+    s.theme = newTheme;
+    require("Storage").writeJSON("setting.json", s);
+    // reload clocks with new theme, otherwise just wait for user to switch apps
+    if (Bangle.CLOCK) load(global.__FILE__);
+  }
 }
 /**
  * Apply LCD options and theme for given mode
diff --git a/apps/qmsched/metadata.json b/apps/qmsched/metadata.json
index 23bdbd2e4..26019b6ba 100644
--- a/apps/qmsched/metadata.json
+++ b/apps/qmsched/metadata.json
@@ -2,7 +2,7 @@
   "id": "qmsched",
   "name": "Quiet Mode Schedule and Widget",
   "shortName": "Quiet Mode",
-  "version": "0.09",
+  "version": "0.10",
   "description": "Automatically turn Quiet Mode on or off at set times, change theme and LCD options while Quiet Mode is active.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot_b1_main.png"},{"url":"screenshot_b1_edit.png"},{"url":"screenshot_b1_lcd.png"},
diff --git a/apps/qrcode/metadata.json b/apps/qrcode/metadata.json
index 24af7b813..89c859a0c 100644
--- a/apps/qrcode/metadata.json
+++ b/apps/qrcode/metadata.json
@@ -1,6 +1,7 @@
 {
   "id": "qrcode",
   "name": "Custom QR Code",
+  "shortName": "QR Code",
   "version": "0.06",
   "description": "Use this to upload a customised QR code to Bangle.js",
   "icon": "app.png",
diff --git a/apps/quicklaunch/ChangeLog b/apps/quicklaunch/ChangeLog
index 2f9f648dd..383e6ee2c 100644
--- a/apps/quicklaunch/ChangeLog
+++ b/apps/quicklaunch/ChangeLog
@@ -7,3 +7,12 @@
 0.07: Revert version 0.06. This version is the same as 0.05.
 0.08: Respect appRect on touch events
 0.09: Do not react if clkinfo is focused
+0.10: Extend the functionality via a quicklaunch.app.js file that can be launched
+	with quicklaunch itself.
+0.11: Add hints to the extension app. Tweak remove function.
+0.12: Stackable extension screens. After updating, please visit the quicklaunch
+	settings page to prompt an automatic update of the quicklaunch.json settings file with
+	new key names.
+0.13: Touch and hold to pause the timeout to clock temporarily.
+0.14: Extension: Don't go down a path if nothing waits at the end. Revisit the current intersection instead.
+0.15: Extension: Compatibility with "Fastload Utils" app history feature.
diff --git a/apps/quicklaunch/README.md b/apps/quicklaunch/README.md
new file mode 100644
index 000000000..b5bffc4be
--- /dev/null
+++ b/apps/quicklaunch/README.md
@@ -0,0 +1,24 @@
+**PLEASE NOTE: With v0.12 of Quick Launch the keys of the settings file have been changed. Please just visit Settings->Apps->Quick Launch to prompt an automatic update. Quick Launch will not be responsive until this has been done. This is a consequence of how the new stackable extension screens are implemented.**
+
+Tap or swipe left/right/up/down on your clock face to launch up to five apps of your choice. The extension (included) can be chosen as one of the apps, in turn providing fast access to up to five additional apps per extension screen - which can be stacked indefinitely. Configurations can be accessed through Settings->Apps.
+
+Below are extension screens where current apps have been set like so: 
+- left swipe is "PA Remote",
+- right swipe is "Remote for Spotify" and
+- down swipe is another extension screen where new apps are accessible. 
+
+![](screenshot0.png)
+
+*Extension screen.*
+
+
+![](screenshot1.png)
+
+*Extension screen when Fastload Utils is present.*
+
+## Contributors
+
+frigis1 (Creator),
+halemmerich,
+thyttan,
+glemco.
diff --git a/apps/quicklaunch/app.js b/apps/quicklaunch/app.js
new file mode 100644
index 000000000..8a56d6c44
--- /dev/null
+++ b/apps/quicklaunch/app.js
@@ -0,0 +1,79 @@
+{
+  const storage = require("Storage");
+  let settings = storage.readJSON("quicklaunch.json", true) || {};
+
+  let reset = function(name){
+    if (!settings[name]) settings[name] = {"name":"(none)"};
+    if (!storage.read(settings[name].src)) settings[name] = {"name":"(none)"};
+    storage.write("quicklaunch.json", settings);
+  };
+
+  let leaveTrace = function(trace) {
+    if (settings[trace+"app"].name != "") {
+      settings.trace = trace;
+      storage.writeJSON("quicklaunch.json", settings);
+    } else { trace = trace.substring(0, trace.length-1); }
+    return trace;
+  };
+
+  let launchApp = function(trace) {
+    if (settings[trace+"app"]) {
+      if (settings[trace+"app"].src){
+        if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src);
+      }
+    }
+  };
+
+  let trace = (settings[settings.trace+"app"].src=="quicklaunch.app.js") ? settings.trace : settings.trace.substring(0, settings.trace.length-1); // If the stored trace leads beyond extension screens, walk back to the last extension screen. Compatibility with "Fastload Utils" App History feature.
+
+  let touchHandler = (_,e) => {
+    if (e.type == 2) return;
+    let R = Bangle.appRect;
+    if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return;
+    trace = leaveTrace(trace+"t"); // t=tap.
+    launchApp(trace);
+  };
+
+  let swipeHandler = (lr,ud) => {
+    if (lr == -1) trace = leaveTrace(trace+"l"); // l=left, 
+    if (lr == 1) trace = leaveTrace(trace+"r"); // r=right,
+    if (ud == -1) trace = leaveTrace(trace+"u"); // u=up,
+    if (ud == 1) trace = leaveTrace(trace+"d"); // d=down.
+    launchApp(trace);
+  };
+
+  let onLongTouchDoPause = (e)=>{
+    if (e.b == 1 && timeoutToClock) {clearTimeout(timeoutToClock); timeoutToClock = false;}
+    if (e.b == 0 && !timeoutToClock) updateTimeoutToClock();
+  };
+
+  Bangle.setUI({
+    mode: "custom",
+    touch: touchHandler,
+    swipe : swipeHandler,
+    drag : onLongTouchDoPause,
+    remove: ()=>{if (timeoutToClock) clearTimeout(timeoutToClock);} // Compatibility with Fastload Utils.
+  });
+
+  g.clearRect(Bangle.appRect);
+  "Bangle.loadWidgets()"; // Hack: Fool Fastload Utils that we call Bangle.loadWidgets(). This way we get the fastest possibe loading in whichever environment we find ourselves.
+
+  // taken from Icon Launcher with some alterations
+  let timeoutToClock;
+  const updateTimeoutToClock = function(){
+    let time = 1500; // milliseconds
+    if (timeoutToClock) clearTimeout(timeoutToClock);
+    timeoutToClock = setTimeout(load,time);
+  };
+  updateTimeoutToClock();
+
+  let R = Bangle.appRect; 
+
+  // Draw app hints
+  g.setFont("Vector", 11)
+    .setFontAlign(0,1,3).drawString(settings[trace+"lapp"].name, R.x2, R.y+R.h/2)
+    .setFontAlign(0,1,1).drawString(settings[trace+"rapp"].name, R.x, R.y+R.h/2)
+    .setFontAlign(0,1,0).drawString(settings[trace+"uapp"].name, R.x+R.w/2, R.y2)
+    .setFontAlign(0,-1,0).drawString(settings[trace+"dapp"].name, R.x+R.w/2, R.y)
+    .setFontAlign(0,0,0).drawString(settings[trace+"tapp"].name, R.x+R.w/2, R.y+R.h/2);
+}
diff --git a/apps/quicklaunch/boot.js b/apps/quicklaunch/boot.js
index 774b41d3d..99a6f7175 100644
--- a/apps/quicklaunch/boot.js
+++ b/apps/quicklaunch/boot.js
@@ -1,28 +1,43 @@
 {
-  let settings = require("Storage").readJSON("quicklaunch.json", true) || {};
   const storage = require("Storage");
+  let settings = storage.readJSON("quicklaunch.json", true) || {};
 
   let reset = function(name){
     if (!settings[name]) settings[name] = {"name":"(none)"};
-    if (!require("Storage").read(settings[name].src)) settings[name] = {"name":"(none)"};
+    if (!storage.read(settings[name].src)) settings[name] = {"name":"(none)"};
     storage.write("quicklaunch.json", settings);
   };
 
+  let leaveTrace = function(trace) {
+    settings.trace = trace;
+    storage.writeJSON("quicklaunch.json", settings);
+    return trace;
+  };
+
+  let launchApp = function(trace) {
+    if (settings[trace+"app"].src){ 
+      if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src); 
+    }
+  }
+
+  let trace;
+
   Bangle.on("touch", (_,e) => {
     if (!Bangle.CLOCK) return;
     if (Bangle.CLKINFO_FOCUS) return;
     let R = Bangle.appRect;
     if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return;
-    if (settings.tapapp.src){ if (!storage.read(settings.tapapp.src)) reset("tapapp"); else load(settings.tapapp.src); }
+    trace = leaveTrace("t"); // t=tap
+    launchApp(trace);
   });
 
   Bangle.on("swipe", (lr,ud) => {
     if (!Bangle.CLOCK) return;
     if (Bangle.CLKINFO_FOCUS) return;
-
-    if (lr == -1 && settings.leftapp && settings.leftapp.src){ if (settings.leftapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.leftapp.src)) reset("leftapp"); else load(settings.leftapp.src); }
-    if (lr == 1 && settings.rightapp && settings.rightapp.src){ if (settings.rightapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.rightapp.src)) reset("rightapp"); else load(settings.rightapp.src); }
-    if (ud == -1 && settings.upapp && settings.upapp.src){ if (settings.upapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.upapp.src)) reset("upapp"); else load(settings.upapp.src); }
-    if (ud == 1 && settings.downapp && settings.downapp.src){ if (settings.downapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.downapp.src)) reset("downapp"); else load(settings.downapp.src); }
+    if (lr == -1) trace = leaveTrace("l"); // l=left,
+    if (lr == 1) trace = leaveTrace("r"); // r=right,
+    if (ud == -1) trace = leaveTrace("u"); // u=up,
+    if (ud == 1) trace = leaveTrace("d"); // d=down.
+    launchApp(trace);
   });
 }
diff --git a/apps/quicklaunch/metadata.json b/apps/quicklaunch/metadata.json
index 599929cda..5fd06ba95 100644
--- a/apps/quicklaunch/metadata.json
+++ b/apps/quicklaunch/metadata.json
@@ -2,14 +2,16 @@
   "id": "quicklaunch",
   "name": "Quick Launch",
   "icon": "app.png",
-  "version":"0.09",
+  "version": "0.15",
   "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",
+  "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "storage": [
-    {"name":"quicklaunch.settings.js","url":"settings.js"},
-    {"name":"quicklaunch.boot.js","url":"boot.js"}
+    {"name": "quicklaunch.settings.js", "url": "settings.js"},
+    {"name": "quicklaunch.boot.js", "url": "boot.js"},
+    {"name": "quicklaunch.app.js", "url": "app.js"}
   ],
-  "data": [{"name":"quicklaunch.json"}]
+  "data": [{"name": "quicklaunch.json"}]
 }
diff --git a/apps/quicklaunch/screenshot0.png b/apps/quicklaunch/screenshot0.png
new file mode 100644
index 000000000..98bb25b5c
Binary files /dev/null and b/apps/quicklaunch/screenshot0.png differ
diff --git a/apps/quicklaunch/screenshot1.png b/apps/quicklaunch/screenshot1.png
new file mode 100644
index 000000000..04ada13cd
Binary files /dev/null and b/apps/quicklaunch/screenshot1.png differ
diff --git a/apps/quicklaunch/settings.js b/apps/quicklaunch/settings.js
index d8907553a..fc6149ac7 100644
--- a/apps/quicklaunch/settings.js
+++ b/apps/quicklaunch/settings.js
@@ -1,19 +1,58 @@
 (function(back) {
-var settings = Object.assign(require("Storage").readJSON("quicklaunch.json", true) || {});
+var storage = require("Storage");
+var settings = Object.assign(storage.readJSON("quicklaunch.json", true) || {});
 
-for (let c of ["leftapp","rightapp","upapp","downapp","tapapp"]){
-  if (!settings[c]) settings[c] = {"name":"(none)"};
+// Add default settings if they haven't been configured before. 
+for (let c of ["lapp","rapp","uapp","dapp","tapp"]){ // l=left, r=right, u=up, d=down, t=tap.
+  if (!settings[c]) settings[c] = {"name":""};
 }
 
-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));
+// Convert settings object from before v0.12 to v0.12.
+for (let c of ["leftapp","rightapp","upapp","downapp","tapapp"]){
+  if (settings[c]) {
+    let cNew = c.substring(0,1)+"app";
+    settings[cNew] = settings[c];
+    delete settings[c];
+    if (settings[cNew].name=="(none)") settings[cNew].name = "";
+
+    if (settings[cNew].name=="Quick Launch Extension"){
+      settings[cNew].name = "Extension";
+      for (let d of ["extleftapp","extrightapp","extupapp","extdownapp","exttapapp"]){
+        if (settings[d]) {
+          let dNew = cNew.substring(0,1)+d.substring(3,4)+"app";
+          settings[dNew] = settings[d];
+          delete settings[d];
+          if (settings[dNew].name=="(none)") settings[dNew].name = "";
+        }
+      }
+    }
+    storage.writeJSON("quicklaunch.json",settings);
+  } 
+}
+for (let d of ["extleftapp","extrightapp","extupapp","extdownapp","exttapapp"]){
+  if (settings[d]) delete settings[d];
+}
+
+
+var apps = storage.list(/\.info$/).map(app=>{var a=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));
 
 // Add psuedo app to trigger Bangle.showLauncher later
 apps.push({
     "name": "Show Launcher",
-    "type": undefined, "sortorder": -10,
-    "src": "no sorce"
+    "type": undefined,
+    "sortorder": -12,
+    "src": "no source"
    });
 
+// Add the Quick Launch extension app
+let extension = {
+    "name": "Extension",
+    "type": "app",
+    "sortorder": -11,
+    "src": "quicklaunch.app.js"
+   };
+apps.push(extension);
+
 apps.sort((a,b)=>{
   var n=(0|a.sortorder)-(0|b.sortorder);
   if (n) return n; // do sortorder first
@@ -22,112 +61,74 @@ apps.sort((a,b)=>{
   return 0;
 });
 
+function findPath(key) {return key.substring(0, key.length-3);}
+
 function save(key, value) {
+  let path = findPath(key);
+  // If changing from extension app (to something else) remove downstream settings entries.
+  if (settings[key].name == extension.name && value.name != extension.name) {
+      for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) {
+        delete settings[c];
+      }
+    }
+
+  // If changing to extension app (from something else) add downstream settings entries.
+  if (value.name == extension.name && settings[key].name != extension.name) {
+      for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) {
+        settings[c] = {"name":""};
+        storage.write("quicklaunch.json",settings);
+      }
+    }
+  
+  // Now change the setting on the current level in the path.
   settings[key] = value;
-  require("Storage").write("quicklaunch.json",settings);
+  storage.writeJSON("quicklaunch.json",settings);
 }
 
-// Quick Launch menu
 function showMainMenu() {
+    // Quick Launch menu
   var mainmenu = {
     "" : { "title" : "Quick Launch" },
     "< Back" : ()=>{load();}
   };
 
-  //List all selected apps
-  mainmenu["Left: "+settings.leftapp.name] = function() { E.showMenu(leftmenu); };
-  mainmenu["Right: "+settings.rightapp.name] = function() { E.showMenu(rightmenu); };
-  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); };
+  // List all selected apps.
+  for (let key of Object.keys(settings)) {
+    if (key == "trace") continue;
+    let keyCurrent = key;
+    let entry = findPath(key).toUpperCase();
+    if (entry=="L") entry = "Left";
+    if (entry=="R") entry = "Right";
+    if (entry=="U") entry = "Up";
+    if (entry=="D") entry = "Down";
+    if (entry=="T") entry = "Tap";
+    // If no app is selected the name is an empty string, but we want to display "(none)".
+    let appName = settings[key].name==""?"(none)":settings[key].name;
+    mainmenu[entry+ ": "+appName] = function() {showSubMenu(keyCurrent);};
+  }
 
   return E.showMenu(mainmenu);
 }
 
-//Left swipe menu
-var leftmenu = {
-  "" : { "title" : "Left Swipe" },
-  "< Back" : showMainMenu
-};
-
-leftmenu["(none)"] = function() {
-  save("leftapp", {"name":"(none)"});
-  showMainMenu();
-};
-apps.forEach((a)=>{
-  leftmenu[a.name] = function() {
-    save("leftapp", a);
+function showSubMenu(key) {
+  var submenu = {
+    "" : { "title" : "Path: "+findPath(key).toUpperCase()},
+    "< Back" : showMainMenu
+  };
+  
+  submenu["(none)"] = function() {
+    save(key, {"name":""});
     showMainMenu();
-    };
-});
+  };
+  apps.forEach((a)=>{
+    submenu[a.name] = function() {
+      save(key, a);
+      showMainMenu();
+      };
+  });
 
-//Right swipe menu
-var rightmenu = {
-  "" : { "title" : "Right Swipe" },
-  "< Back" : showMainMenu
-};
-
-rightmenu["(none)"] = function() {
-  save("rightapp", {"name":"(none)"});
-  showMainMenu();
-};
-apps.forEach((a)=>{
-  rightmenu[a.name] = function() {
-    save("rightapp", a);
-    showMainMenu();
-    };
-});
-
-//Up swipe menu
-var upmenu = {
-  "" : { "title" : "Up Swipe" },
-  "< Back" : showMainMenu
-};
-
-upmenu["(none)"] = function() {
-  save("upapp", {"name":"(none)"});
-  showMainMenu();
-};
-apps.forEach((a)=>{
-  upmenu[a.name] = function() {
-    save("upapp", a);
-    showMainMenu();
-    };
-});
-
-//Down swipe menu
-var downmenu = {
-  "" : { "title" : "Down Swipe" },
-  "< Back" : showMainMenu
-};
-
-downmenu["(none)"] = function() {
-  save("downapp", {"name":"(none)"});
-  showMainMenu();
-};
-apps.forEach((a)=>{
-  downmenu[a.name] = function() {
-    save("downapp", a);
-    showMainMenu();
-    };
-});
-
-//Tap menu
-var tapmenu = {
-  "" : { "title" : "Tap" },
-  "< Back" : showMainMenu
-};
-
-tapmenu["(none)"] = function() {
-  save("tapapp", {"name":"(none)"});
-  showMainMenu();
-};
-apps.forEach((a)=>{
-  tapmenu[a.name] = function() {
-    save("tapapp", a);
-    showMainMenu();
-    };
-});
+  return E.showMenu(submenu);
+}
 
 showMainMenu();
 })
diff --git a/apps/ratchet_launch/ChangeLog b/apps/ratchet_launch/ChangeLog
index af7f83942..e60ca42d2 100644
--- a/apps/ratchet_launch/ChangeLog
+++ b/apps/ratchet_launch/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial release
+0.02: Cache the app-launch info
diff --git a/apps/ratchet_launch/app.js b/apps/ratchet_launch/app.js
index 11018080a..156106894 100644
--- a/apps/ratchet_launch/app.js
+++ b/apps/ratchet_launch/app.js
@@ -9,27 +9,38 @@ var blankImage = Graphics.createImage(` `);
 var rowHeight = g.getHeight()/3;
 
 // Load apps list
-var apps = Storage.list(/\.info$/).map(app=>{
-  var a=Storage.readJSON(app,1);
-  return a&&{
-    name:a.name,
-    type:a.type,
-    icon:a.icon ? Storage.read(a.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;
-});
+var apps;
+
+var launchCache = s.readJSON("launch.cache.json", true)||{};
+var launchHash = require("Storage").hash(/\.info/);
+if (launchCache.hash==launchHash) {
+  apps = launchCache.apps;
+} else {
+  apps = Storage.list(/\.info$/).map(app=>{
+    var a=Storage.readJSON(app,1);
+    return a&&{
+      name:a.name,
+      type:a.type,
+      icon:a.icon ? Storage.read(a.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;
+  });
+
+  launchCache = { apps, hash: launchHash };
+  s.writeJSON("launch.cache.json", launchCache);
+}
 
 // Uncomment for testing in the emulator without apps:
 // apps = [
diff --git a/apps/ratchet_launch/metadata.json b/apps/ratchet_launch/metadata.json
index 45057b0b9..7ebe0c4cd 100644
--- a/apps/ratchet_launch/metadata.json
+++ b/apps/ratchet_launch/metadata.json
@@ -2,7 +2,7 @@
   "id": "ratchet_launch",
   "name": "Ratchet Launcher",
   "shortName": "Ratchet",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Launcher with discrete scrolling for quicker app selection",
   "icon": "app.png",
   "type": "launch",
diff --git a/apps/rebble/metadata.json b/apps/rebble/metadata.json
index c380204a4..6242236c8 100644
--- a/apps/rebble/metadata.json
+++ b/apps/rebble/metadata.json
@@ -15,5 +15,8 @@
     {"name":"rebble.app.js","url":"rebble.app.js"},
     {"name":"rebble.settings.js","url":"rebble.settings.js"},
     {"name":"rebble.img","url":"rebble.icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"rebble.settings.json"}
   ]
 }
diff --git a/apps/recorder/ChangeLog b/apps/recorder/ChangeLog
index c4d1fa8c1..991b811cb 100644
--- a/apps/recorder/ChangeLog
+++ b/apps/recorder/ChangeLog
@@ -25,3 +25,13 @@
 0.19: Fix track plotting code
 0.20: Automatic translation of some more strings.
 0.21: Speed report now uses speed units from locale
+0.22: Convert Yes/No On/Off in settings to checkboxes
+0.23: Add graphing for HRM, fix some other graphs
+      Altitude graphing now uses barometer altitude if it exists
+      plotTrack in widget allows track to be drawn in the background (doesn't block execution)
+0.24: Can now specify `setRecording(true, {force:...` to not show a menu
+0.25: Widget now has `isRecording()` for retrieving recording status.
+0.26: Now record filename based on date
+0.27: Fix first ever recorded filename being log0 (now all are dated)
+0.28: Automatically create new track if the filename is different
+0.29: When plotting with OpenStMap scale map to track width & height
diff --git a/apps/recorder/README.md b/apps/recorder/README.md
index 87be34424..6da739b1c 100644
--- a/apps/recorder/README.md
+++ b/apps/recorder/README.md
@@ -1,4 +1,4 @@
-# Recorder
+**# Recorder
 
 ![icon](app.png)
 
@@ -15,15 +15,45 @@ You can record
 
 * **Time** The current time
 * **GPS** GPS Latitude, Longitude and Altitude
-* **Steps** Steps counted by the step counter
 * **HR** Heart rate and confidence
 * **BAT** Battery percentage and voltage
-* **Core** CoreTemp body temperature
+* **Steps** Steps counted by the step counter
+* **Baro** (Bangle.js 2) Using the built-in barometer to record Temperature, Pressure and Altitude
+* **Core** CoreTemp body temperature *if* you have a CoreTemp device and the https://banglejs.com/apps/?id=coretemp app installed
+
+You can then start/stop recording from the Recorder app itself (and as long as widgets are
+enabled in the app you're using, you can move to another app and continue recording).
+Some apps like the [Run app](https://banglejs.com/apps/?id=run) are able to automatically start/stop the Recorder too.
 
 **Note:** It is possible for other apps to record information using this app
 as well. They need to define a `foobar.recorder.js` file - see the `getRecorders`
 function in `widget.js` for more information.
 
+## Graphing
+
+You can download the information to the PC using [the App Loader](https://banglejs.com/apps/?id=recorder). Connect
+to your Bangle, then in `My Apps` click the disk icon next to the `Recorder` app to download data.
+
+You can also view some information on the watch.
+
+* Tap `View Tracks`
+* Tap on the Track number you're interested in, and you'll see a page with information about that track...
+  * `Plot Map` plots a map using GPS coordinates
+  * `Plot OpenStMap` plots a map using GPS coordinates on top of an OpenStreetMap map (if the app is installed)
+  * `Plot Alt` plots altitude over time
+  * `Plot Speed` plots speed over time
+  * `Plot HRM` plots heart rate over time
+
+## Usage in code
+
+As long as widgets are loaded, you can:
+
+* Call `WIDGETS["recorder"].setRecording(true)` to start recording (it returns a promise, and may show a menu)
+* Call `WIDGETS["recorder"].setRecording(true, {force:"new"/"append"/"overwrite")` to start recording (it returns a promise, and will not show a menu)
+* Call `WIDGETS["recorder"].setRecording(false)` to stop recording
+
+
+
 ## Tips
 
 When recording GPS, it usually takes several minutes for the watch to get a [GPS fix](https://en.wikipedia.org/wiki/Time_to_first_fix). There is a red satellite symbol, which you will see turn green when you get an actual GPS Fix. You can [upload assistant files](https://banglejs.com/apps/#assisted%20gps%20update) to speed up the time spent on getting a GPS fix.
diff --git a/apps/recorder/app-icon.js b/apps/recorder/app-icon.js
index 4181d2b12..cb80f4b5d 100644
--- a/apps/recorder/app-icon.js
+++ b/apps/recorder/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEw4cA///vPWvN8kvkuu14/s3OMjN0Kf4AQ2vaCB0Ftu3oARfgdt23AGsO2NaHQT+MB2XJCJ1MyXJsAQMgUky3JkARMjIRBpIRNvMl2VJlAQLldvtmSpN+CJcbt2ECJsBregggRBv4RRdJfbgEkyVLq3ACJ1Jq3dCBMKBYIRBpFW7d0CJUDsgRBhdbtvQCJHYgUTm1IgEttuwCI8GCIMSpMwA4MVEZPoCIUkaxj7BoQRPiQRCwARNpARByARNpMJCJyNBgKjBCJy1CCJ79BfZYNDCJoxBBoQnCABBVFN4IRJPIoRLV4sCpMgCJTbECJYKFCJUJBQsJfpoA/A"))
+require("heatshrink").decompress(atob("mEw4cA///8H5vPWvN8kvkuu13OMjN0HMsBkmACJ1JkmSCBsCCIVAA4WSpARHiQRCBgUEyVJCLIJBCIIMCCMpZICIwHBOAZZLABQRRUIsB2fNZZLFErnb5vgdJkC23e5uwHRkZCINtCJuZ2+ztu6CBckyds7dt/wRMyUGCJpbCCIX/WhARIEZkAm3bt77ICI9t5IFBABEJCIdsXYOQCJUDswRBAoLfCCI8ggWlu1sQYQRL0mSqgHBiQRNpDWMfYPUCJ8WCIKOLCIfaCIMgCJvbqQRO23agSgBCJ0ACKKyBwAQKgu26AROloRCgLoKBgNt2wfCawIRJhdt2gFCCJdbtugAoUEfRIRCAoYRMtAGECJULCIsSdZoA/A="))
diff --git a/apps/recorder/app-settings.json b/apps/recorder/app-settings.json
index 7410af213..cbabcb3f0 100644
--- a/apps/recorder/app-settings.json
+++ b/apps/recorder/app-settings.json
@@ -1,6 +1,5 @@
 {
   "recording":false,
-  "file":"recorder.log0.csv",
   "period":10,
   "record" : ["gps"]
 }
diff --git a/apps/recorder/app.js b/apps/recorder/app.js
index 8ac3ff627..a2218420a 100644
--- a/apps/recorder/app.js
+++ b/apps/recorder/app.js
@@ -33,10 +33,8 @@ function updateSettings() {
 function getTrackNumber(filename) {
   var trackNum = 0;
   var matches = filename.match(/^recorder\.log(.*)\.csv$/);
-  if (matches) {
-    trackNum = parseInt(matches[1]||0);
-  }
-  return trackNum;
+  if (matches) return matches[1];
+  return 0;
 }
 
 function showMainMenu() {
@@ -56,30 +54,19 @@ function showMainMenu() {
     '< Back': ()=>{load();},
     /*LANG*/'RECORD': {
       value: !!settings.recording,
-      format: v=>v?/*LANG*/"On":/*LANG*/"Off",
       onchange: v => {
         setTimeout(function() {
           E.showMenu();
           WIDGETS["recorder"].setRecording(v).then(function() {
-            print(/*LANG*/"Complete");
+            //print("Record start Complete");
             loadSettings();
-            print(settings.recording);
+            //print("Recording: "+settings.recording);
             showMainMenu();
           });
         }, 1);
       }
     },
-    /*LANG*/'File #': {
-      value: getTrackNumber(settings.file),
-      min: 0,
-      max: 99,
-      step: 1,
-      onchange: v => {
-        settings.recording = false; // stop recording if we change anything
-        settings.file = "recorder.log"+v+".csv";
-        updateSettings();
-      }
-    },
+    /*LANG*/'File' : {value:getTrackNumber(settings.file)},
     /*LANG*/'View Tracks': ()=>{viewTracks();},
     /*LANG*/'Time Period': {
       value: settings.period||10,
@@ -111,7 +98,7 @@ function viewTracks() {
   var found = false;
   require("Storage").list(/^recorder\.log.*\.csv$/,{sf:true}).forEach(filename=>{
     found = true;
-    menu[/*LANG*/"Track "+getTrackNumber(filename)] = ()=>viewTrack(filename,false);
+    menu[/*LANG*/getTrackNumber(filename)] = ()=>viewTrack(filename,false);
   });
   if (!found)
     menu[/*LANG*/"No Tracks found"] = function(){};
@@ -186,7 +173,7 @@ function viewTrack(filename, info) {
     '': { 'title': /*LANG*/'Track '+info.fn }
   };
   if (info.time)
-    menu[info.time.toISOString().substr(0,16).replace("T"," ")] = function(){};
+    menu[info.time.toISOString().substr(0,16).replace("T"," ")] = {};
   menu["Duration"] = { value : asTime(info.duration)};
   menu["Records"] = { value : ""+info.records };
   if (info.fields.includes("Latitude"))
@@ -199,7 +186,8 @@ function viewTrack(filename, info) {
       info.qOSTM = true;
       plotTrack(info);
     }
-  if (info.fields.includes("Altitude"))
+  if (info.fields.includes("Altitude") ||
+      info.fields.includes("Barometer Altitude"))
     menu[/*LANG*/'Plot Alt.'] = function() {
       plotGraph(info, "Altitude");
     };
@@ -207,6 +195,10 @@ function viewTrack(filename, info) {
     menu[/*LANG*/'Plot Speed'] = function() {
       plotGraph(info, "Speed");
     };
+  if (info.fields.includes("Heartrate"))
+    menu[/*LANG*/'Plot HRM'] = function() {
+      plotGraph(info, "Heartrate");
+    };
   // TODO: steps, heart rate?
   menu[/*LANG*/'Erase'] = function() {
     E.showPrompt(/*LANG*/"Delete Track?").then(function(v) {
@@ -232,6 +224,12 @@ function viewTrack(filename, info) {
     // Function to convert lat/lon to XY
     var getMapXY;
     if (info.qOSTM) {
+      // scale map to view full track
+      const max = Bangle.project({lat: info.maxLat, lon: info.maxLong});
+      const min = Bangle.project({lat: info.minLat, lon: info.minLong});
+      const scaleX = (max.x-min.x)/Bangle.appRect.w;
+      const scaleY = (max.y-min.y)/Bangle.appRect.h;
+      osm.scale = Math.ceil((scaleX > scaleY ? scaleX : scaleY)*1.1); // add 10% margin
       getMapXY = osm.latLonToXY.bind(osm);
     } else {
       getMapXY = function(lat, lon) { "ram"
@@ -332,14 +330,26 @@ function viewTrack(filename, info) {
     var l = f.readLine(f);
     l = f.readLine(f); // skip headers
     var nl = 0, c, i;
+    var factor = 1; // multiplier used for values when graphing
     var timeIdx = info.fields.indexOf("Time");
     if (l!==undefined) {
       c = l.split(",");
       strt = c[timeIdx];
     }
-    if (style=="Altitude") {
+    if (style=="Heartrate") {
+      title = /*LANG*/"Heartrate (bpm)";
+      var hrmIdx = info.fields.indexOf("Heartrate");
+      while(l!==undefined) {
+        ++nl;c=l.split(",");l = f.readLine(f);
+        if (c[hrmIdx]=="") continue;
+        i = Math.round(80*(c[timeIdx] - strt)/dur);
+        infn[i]+=+c[hrmIdx];
+        infc[i]++;
+      }
+    } else if (style=="Altitude") {
       title = /*LANG*/"Altitude (m)";
-      var altIdx = info.fields.indexOf("Altitude");
+      var altIdx = info.fields.indexOf("Barometer Altitude");
+      if (altIdx<0) altIdx = info.fields.indexOf("Altitude");
       while(l!==undefined) {
         ++nl;c=l.split(",");l = f.readLine(f);
         if (c[altIdx]=="") continue;
@@ -351,7 +361,7 @@ function viewTrack(filename, info) {
       // use locate to work out units
       var localeStr = require("locale").speed(1,5); // get what 1kph equates to
       let units = localeStr.replace(/[0-9.]*/,"");
-      var factor = parseFloat(localeStr)*3.6; // m/sec to whatever out units are
+      factor = parseFloat(localeStr)*3.6; // m/sec to whatever out units are
       // title
       title = /*LANG*/"Speed"+` (${units})`;
       var latIdx = info.fields.indexOf("Latitude");
@@ -387,6 +397,10 @@ function viewTrack(filename, info) {
     var min=100000,max=-100000;
     for (var i=0;i<infn.length;i++) {
       if (infc[i]>0) infn[i]=factor*infn[i]/infc[i];
+      else { // no data - search back and see if we can find something
+        for (var j=i-1;j>=0;j--)
+          if (infc[j]) { infn[i]=infn[j]; break; }
+      }
       var n = infn[i];
       if (n>max) max=n;
       if (n<min) min=n;
diff --git a/apps/recorder/app.png b/apps/recorder/app.png
index 036f5d132..f67ae63d6 100644
Binary files a/apps/recorder/app.png and b/apps/recorder/app.png differ
diff --git a/apps/recorder/metadata.json b/apps/recorder/metadata.json
index 45d588d99..e714abf8d 100644
--- a/apps/recorder/metadata.json
+++ b/apps/recorder/metadata.json
@@ -2,7 +2,7 @@
   "id": "recorder",
   "name": "Recorder",
   "shortName": "Recorder",
-  "version": "0.21",
+  "version": "0.29",
   "description": "Record GPS position, heart rate and more in the background, then download to your PC.",
   "icon": "app.png",
   "tags": "tool,outdoors,gps,widget",
@@ -15,5 +15,8 @@
     {"name":"recorder.wid.js","url":"widget.js"},
     {"name":"recorder.settings.js","url":"settings.js"}
   ],
-  "data": [{"name":"recorder.json","url":"app-settings.json"},{"wildcard":"recorder.log?.csv","storageFile":true}]
+  "data": [
+    {"name":"recorder.json","url":"app-settings.json"},
+    {"wildcard":"recorder.log?.csv","storageFile":true}
+  ]
 }
diff --git a/apps/recorder/widget.d.ts b/apps/recorder/widget.d.ts
new file mode 100644
index 000000000..30430eac4
--- /dev/null
+++ b/apps/recorder/widget.d.ts
@@ -0,0 +1,40 @@
+type RecorderWidget = Widget & {
+	getRecorders(): Recorders;
+
+	reload(): void,
+
+	isRecording(): boolean,
+
+	setRecording(
+		isOn: boolean,
+		options?: { force?: "append" | "new" | "overwrite" },
+	): Promise<boolean>;
+
+	plotTrack(
+		m: unknown /* osm module */,
+		options?: {
+			async: true,
+			callback?: ()=>void,
+		}
+	): { stop(): void };
+	plotTrack(
+		m: unknown /* osm module */,
+		options?: {
+			async?: false,
+			callback?: ()=>void,
+		}
+	): void;
+};
+
+type Recorders = {
+	[key: string]: Recorder;
+};
+
+type Recorder = () => {
+	name: string,
+	fields: string[],
+	getValues(): unknown[],
+	start(): void,
+	stop(): void,
+	draw(x: number, y: number): void,
+};
diff --git a/apps/recorder/widget.js b/apps/recorder/widget.js
index 87d4fb012..e34fecfbc 100644
--- a/apps/recorder/widget.js
+++ b/apps/recorder/widget.js
@@ -231,42 +231,63 @@
   },getRecorders:getRecorders,reload:function() {
     reload();
     Bangle.drawWidgets(); // relayout all widgets
-  },setRecording:function(isOn, forceAppend) {
+  },isRecording:function() {
+    return !!writeInterval;
+  },setRecording:function(isOn, options) {
+    /* options = {
+      force : [optional] "append"/"new"/"overwrite" - don't ask, just do what's requested
+    } */
     var settings = loadSettings();
-    if (isOn && !settings.recording && !settings.file) {
-      settings.file = "recorder.log0.csv";
-    } else if (isOn && !forceAppend && !settings.recording && require("Storage").list(settings.file).length){
-      var logfiles=require("Storage").list(/recorder.log.*/);
-      var maxNumber=0;
-      for (var c of logfiles){
-          maxNumber = Math.max(maxNumber, c.match(/\d+/)[0]);
+    options = options||{};
+    if (isOn && !settings.recording) {
+      var date=(new Date()).toISOString().substr(0,10).replace(/-/g,""), trackNo=10;
+      function getTrackFilename() { return "recorder.log" + date + trackNo.toString(36) + ".csv"; }
+      if (!settings.file || !settings.file.startsWith("recorder.log" + date)) {
+        // if no filename set or date different, set up a new filename
+        settings.file = getTrackFilename();
       }
-      var newFileName;
-      if (maxNumber < 99){
-        newFileName="recorder.log" + (maxNumber + 1) + ".csv";
-        updateSettings(settings);
-      }
-      var buttons={/*LANG*/"Yes":"overwrite",/*LANG*/"No":"cancel"};
-      if (newFileName) buttons[/*LANG*/"New"] = "new";
-      buttons[/*LANG*/"Append"] = "append";
-      return E.showPrompt(/*LANG*/"Overwrite\nLog " + settings.file.match(/\d+/)[0] + "?",{title:/*LANG*/"Recorder",buttons:buttons}).then(selection=>{
-        if (selection==="cancel") return false; // just cancel
-        if (selection==="overwrite")
+      if (require("Storage").list(settings.file).length){ // if file exists
+        if (!options.force) { // if not forced, ask the question
+          g.reset(); // work around bug in 2v17 and earlier where bg color wasn't reset
+          return E.showPrompt(
+                    /*LANG*/"Overwrite\nLog " + settings.file.match(/^recorder\.log(.*)\.csv$/)[1] + "?",
+                    { title:/*LANG*/"Recorder",
+                      buttons:{/*LANG*/"Yes":"overwrite",/*LANG*/"No":"cancel",/*LANG*/"New":"new",/*LANG*/"Append":"append"}
+                    }).then(selection=>{
+            if (selection==="cancel") return false; // just cancel
+            if (selection==="overwrite") return WIDGETS["recorder"].setRecording(1,{force:"overwrite"});
+            if (selection==="new") return WIDGETS["recorder"].setRecording(1,{force:"new"});
+            if (selection==="append") return WIDGETS["recorder"].setRecording(1,{force:"append"});
+            throw new Error("Unknown response!");
+          });
+        } else if (options.force=="append") {
+          // do nothing, filename is the same - we are good
+        } else if (options.force=="overwrite") {
+          // wipe the file
           require("Storage").open(settings.file,"r").erase();
-        if (selection==="new"){
+        } else if (options.force=="new") {
+          // new file - use the current date
+          var newFileName;
+          do { // while a file exists, add one to the letter after the date
+            newFileName = getTrackFilename();
+            trackNo++;
+          } while (require("Storage").list(newFileName).length);
           settings.file = newFileName;
-          updateSettings(settings);
-        }
-        // if (selection==="append") // we do nothing - all is fine
-        return WIDGETS["recorder"].setRecording(1,true/*force append*/);
-      });
+        } else throw new Error("Unknown options.force, "+options.force);
+      }
     }
     settings.recording = isOn;
     updateSettings(settings);
     WIDGETS["recorder"].reload();
     return Promise.resolve(settings.recording);
-  },plotTrack:function(m) { // m=instance of openstmap module
-    // Plots the current track in the currently set color
+  },plotTrack:function(m, options) { // m=instance of openstmap module
+    /* Plots the current track in the currently set color.
+      options can be {
+        async: if true, plots the path a bit at a time - returns an object with a 'stop' function to stop
+        callback: a function to call back when plotting is finished
+      }
+     */
+    options = options||{};
     if (!activeRecorders.length) return; // not recording
     var settings = loadSettings();
     // keep function to draw track in RAM
@@ -282,19 +303,35 @@
         c = l.split(",");
         l = f.readLine(f);
       }
-      if (l===undefined) return; // empty file?
-      mp = m.latLonToXY(+c[la], +c[lo]);
-      g.moveTo(mp.x,mp.y);
-      l = f.readLine(f);
-      var n = 200; // only plot first 200 points to keep things fast(ish)
-      while(l && n--) {
-        c = l.split(",");
-        if (c[la]) {
-          mp = m.latLonToXY(+c[la], +c[lo]);
-          g.lineTo(mp.x,mp.y);
-        }
+      var asyncTimeout;
+      var color = g.getColor();
+      function plotPartial() {
+        asyncTimeout = undefined;
+        if (l===undefined) return; // empty file?
+        mp = m.latLonToXY(+c[la], +c[lo]);
+        g.moveTo(mp.x,mp.y).setColor(color);
         l = f.readLine(f);
+        var n = options.async ? 20 : 200; // only plot first 200 points to keep things fast(ish)
+        while(l && n--) {
+          c = l.split(",");
+          if (c[la]) {
+            mp = m.latLonToXY(+c[la], +c[lo]);
+            g.lineTo(mp.x,mp.y);
+          }
+          l = f.readLine(f);
+        }
+        if (options.async && n<0)
+          asyncTimeout = setTimeout(plotPartial, 20);
+        else if (options.callback) options.callback();
       }
+      plotPartial();
+      if (options.async) return {
+        stop : function() {
+          if (asyncTimeout) clearTimeout(asyncTimeout);
+          asyncTimeout = undefined;
+          if (options.callback) options.callback();
+        }
+      };
     }
     plot(g);
   }};
diff --git a/apps/red7game/ChangeLog b/apps/red7game/ChangeLog
index 360b1a305..1356f492a 100644
--- a/apps/red7game/ChangeLog
+++ b/apps/red7game/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Fix mistake preventing game from ending in some cases.
 0.03: Update help screen with more details.
 0.04: Update cards to draw rounded on newer firmware. Make sure in-game menu can't be pulled up during end of game.
+0.05: add confirmation prompt to new game to prevent fat fingering new game during existing one.
diff --git a/apps/red7game/metadata.json b/apps/red7game/metadata.json
index 15fec4d21..8e8aca407 100644
--- a/apps/red7game/metadata.json
+++ b/apps/red7game/metadata.json
@@ -2,7 +2,7 @@
   "name": "Red 7 Card Game",
   "shortName" : "Red 7",
   "icon": "icon.png",
-  "version":"0.04",
+  "version":"0.05",
   "description": "An implementation of the card game Red 7 for your watch. Play against the AI and be the last player still in the game to win!",
   "tags": "game",
   "supports":["BANGLEJS2"],
diff --git a/apps/red7game/red7.js b/apps/red7game/red7.js
index 2b22488b9..e2fe50f50 100644
--- a/apps/red7game/red7.js
+++ b/apps/red7game/red7.js
@@ -814,8 +814,20 @@ function drawMainMenu() {
     }
   }
   menu["New Game"] = function() {
+    if(startedGame == true) {  
+      E.showPrompt("Discard and start new game?").then(function(v) {
+            if(v) {
+              E.showMenu();
+              resetToNewGame();  
+            } else {
+              E.showMenu();
+              drawScreen1();
+            }
+      });  
+    } else {
       E.showMenu();
       resetToNewGame();
+    }
     };
   menu["Help"] = function() {
       drawScreenHelp();
diff --git a/apps/rep/ChangeLog b/apps/rep/ChangeLog
new file mode 100644
index 000000000..142fd767e
--- /dev/null
+++ b/apps/rep/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New app!
+0.02: Fixed interaction with recorder UI listeners
diff --git a/apps/rep/README.md b/apps/rep/README.md
new file mode 100644
index 000000000..343837f4d
--- /dev/null
+++ b/apps/rep/README.md
@@ -0,0 +1,13 @@
+# Description
+
+A running/activity repetition app. Program your reps using the web interface, and then run through them with the app. The time left for the current rep is shown, along with the rep's description and total duration, and the next rep's description and duration.
+
+You can rewind, fast-forward and play/pause with the control buttons.
+
+
+# Todo
+
+- [X] Recorder functionality
+	- [ ] Recorder toggle functionality
+- [ ] Fastload: scoping, unregister layout handlers etc
+- [ ] Swipe handlers as well as "<<" / ">>" buttons
diff --git a/apps/rep/app-icon.js b/apps/rep/app-icon.js
new file mode 100644
index 000000000..6ad60b46f
--- /dev/null
+++ b/apps/rep/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+r/+ACIZBkgACAoIaSFiVJumYzwAEzF0p4yggFP4XC4YAB4QtBAwnCGLpbBzwjCuclklJAAUkkt0HYWepIxZgAgCzFPR4ZcCMQKPBpNPzARBugwSstlFwYcCKwIrDFQQ0CGYYPBIQQwDxgvQFwInBklzDwKPBRwiQCBgo3BGAiMSJoIyBXoRaBdYYJBMgMlGIIsBaYSSSgFPFwMkMIQiDEYNzLoNzBgI8DLoRhB4VPGCEAXYV0FwKUCcAUxmNbrYDBOISKCLoTDCF54bCuhhFP4Nbw2G2AACAoNbT4RdEJAKRPkhCBkphCD4UAwAtEGImANwQ/BDQkkF5q1BWYICBDQUrFpAxElZEDYwICCRxpHBkoCEudbxgvLxlbuZgBkoCESBikCOYJeCzEGLxhgCgxaBpIcDbQIvLFIN0pJbBAQNtqpRBgwABgAAEBARtBqtt4dJMYNJug1BF5dPFgIUFwxQBrYAKNwOGIgJKDDoNPF5tPF4R6BkovCwoAKF4SnDF4IgCF5hZBuYCBzGYkiwCF5uwkgVBVoKqB4QvMgFJgEkAQMlAQIvRDQMlAQMkEARf7TwV0X4WeF6eeX4V0X54v/F/4v/F9/CpNzAQOYzAvTCoNJ4VzAQIvMgFJgEkAQMlAQIvRDQMlAQMkEARf7TwVzX4XCkuGF5+GkvCX4Vzd6FzF4V0MQIvCrYAKF4TsCF4QdBF5huBCgYCBttVxgjBABVbxlVtpHBJQovLkmeRQPCzw1BzCwCABhuBUgNJDgkkF5cAzHDkoCEuZRBFxZtBLYOYkoCEgAvL/1zLQICCMAPClZgMw0rCINJMINzAQQuMSAIXBOYIaCI4WAGJGGrh3CIgYaCRxiQCunDulPUgQfDreGGIgFBrY/DbQVPDgSONGARdCCwOeKAXCDYMxmNbrYDBIYPCNwWeFYJhCFx4vBLouekrGB4YlBudJpKzBA4K1BkouBMIgvC4aRQzx/CEQV0boIqBFgWYug8DT4IuBRqAwELoUkEAIABuckkpeBAAMlBgphDFyYwDYYQeBLgWeLQJkBE4JiBTwK7CFyySDDgVPewIqBGYQrBGgNJp5CCRigwGVYInBEAKJBR4aVBHwTTCFwvN5oxVp4jCLgZiDAwVPLg4uVMYiPCAAiPCRTIyMgEkAAQFBDSVfA"))
diff --git a/apps/rep/app.js b/apps/rep/app.js
new file mode 100644
index 000000000..a30a96c09
--- /dev/null
+++ b/apps/rep/app.js
@@ -0,0 +1,270 @@
+var _a, _b, _c;
+{
+    var L = require("Layout");
+    var storeReps = require("Storage")
+        .readJSON("rep.json");
+    if (storeReps == null) {
+        E.showAlert("No reps in storage\nLoad them on with the app loader")
+            .then(function () { return load(); });
+        throw new Error("no storage");
+    }
+    var reps_1 = storeReps.map(function (r, i, a) {
+        var r2 = r;
+        r2.accDur = i > 0
+            ? a[i - 1].accDur + r.dur
+            : r.dur;
+        return r2;
+    });
+    var settings = (require("Storage").readJSON("rep.setting.json", true) || {});
+    (_a = settings.record) !== null && _a !== void 0 ? _a : (settings.record = false);
+    (_b = settings.recordStopOnExit) !== null && _b !== void 0 ? _b : (settings.recordStopOnExit = false);
+    (_c = settings.stepMs) !== null && _c !== void 0 ? _c : (settings.stepMs = 5 * 1000);
+    var fontSzMain = 54;
+    var fontScaleRep = 2;
+    var fontSzRep = 20;
+    var fontSzRepDesc = 12;
+    var blue_1 = "#205af7";
+    var ffStep_1 = settings.stepMs;
+    var state_1;
+    var drawInterval_1;
+    var lastRepIndex_1 = null;
+    var firstTime_1 = true;
+    var renderDuration = function (l) {
+        var lbl;
+        g.clearRect(l.x, l.y, l.x + l.w, l.y + l.h);
+        if (state_1) {
+            var _a = state_1.currentRepPair(), i = _a[0], repElapsed = _a[1];
+            if (i !== null) {
+                var thisDur = reps_1[i].dur;
+                var remaining = thisDur - repElapsed;
+                lbl = msToMinSec_1(remaining);
+                var fract = repElapsed / thisDur;
+                g.setColor(blue_1)
+                    .fillRect(l.x, l.y, l.x + fract * l.w, l.y + l.h);
+            }
+            else {
+                lbl = msToMinSec_1(repElapsed);
+            }
+        }
+        else {
+            lbl = "RDY";
+        }
+        if (l.font)
+            g.setFont(l.font);
+        g.setColor(l.col || g.theme.fg)
+            .setFontAlign(0, 0)
+            .drawString(lbl, l.x + (l.w >> 1), l.y + (l.h >> 1));
+    };
+    var layout_1 = new L({
+        type: "v",
+        c: [
+            {
+                type: "h",
+                c: [
+                    {
+                        id: "duration",
+                        lazyBuster: 1,
+                        type: "custom",
+                        font: "Vector:".concat(fontSzMain),
+                        fillx: 1,
+                        filly: 1,
+                        render: renderDuration,
+                    },
+                    {
+                        id: "repIdx",
+                        type: "txt",
+                        font: "6x8:".concat(fontScaleRep),
+                        label: "---",
+                        r: 1,
+                    },
+                ]
+            },
+            {
+                type: "txt",
+                font: "Vector:".concat(fontSzRepDesc),
+                label: "Activity / Duration",
+            },
+            {
+                id: "cur_name",
+                type: "txt",
+                font: "Vector:".concat(fontSzRep),
+                label: "",
+                col: blue_1,
+                fillx: 1,
+            },
+            {
+                type: "txt",
+                font: "Vector:".concat(fontSzRepDesc),
+                label: "Next / Duration",
+            },
+            {
+                id: "next_name",
+                type: "txt",
+                font: "Vector:".concat(fontSzRep),
+                label: "",
+                fillx: 1,
+            },
+            {
+                type: "h",
+                c: [
+                    {
+                        id: "prev",
+                        type: "btn",
+                        label: "<<",
+                        fillx: 1,
+                        cb: function () {
+                            buzzInteraction_1();
+                            state_1 === null || state_1 === void 0 ? void 0 : state_1.rewind();
+                            drawRep_1();
+                        },
+                    },
+                    {
+                        id: "play",
+                        type: "btn",
+                        label: "Play",
+                        fillx: 1,
+                        cb: function () {
+                            buzzInteraction_1();
+                            if (!state_1)
+                                state_1 = new State_1();
+                            state_1.toggle();
+                            if (state_1.paused) {
+                                clearInterval(drawInterval_1);
+                                drawInterval_1 = undefined;
+                            }
+                            else {
+                                drawInterval_1 = setInterval(drawRep_1, 1000);
+                            }
+                            drawRep_1();
+                        },
+                    },
+                    {
+                        id: "next",
+                        type: "btn",
+                        label: ">>",
+                        fillx: 1,
+                        cb: function () {
+                            buzzInteraction_1();
+                            state_1 === null || state_1 === void 0 ? void 0 : state_1.forward();
+                            drawRep_1();
+                        },
+                    }
+                ]
+            }
+        ]
+    }, { lazy: true });
+    var State_1 = (function () {
+        function State() {
+            this.paused = true;
+            this.begin = Date.now();
+            this.accumulated = 0;
+        }
+        State.prototype.toggle = function () {
+            if (this.paused) {
+                this.begin = Date.now();
+            }
+            else {
+                var diff = Date.now() - this.begin;
+                this.accumulated += diff;
+            }
+            this.paused = !this.paused;
+        };
+        State.prototype.getElapsedTotal = function () {
+            return (this.paused ? 0 : Date.now() - this.begin) + this.accumulated;
+        };
+        State.prototype.getElapsedForRep = function () {
+            return this.currentRepPair()[1];
+        };
+        State.prototype.currentRepPair = function () {
+            var elapsed = this.getElapsedTotal();
+            var i = this.currentRepIndex();
+            var repElapsed = elapsed - (i > 0 ? reps_1[i - 1].accDur : 0);
+            return [i, repElapsed];
+        };
+        State.prototype.currentRepIndex = function () {
+            var elapsed = this.getElapsedTotal();
+            var ent;
+            for (var i = 0; (ent = reps_1[i]); i++)
+                if (elapsed < ent.accDur)
+                    return i;
+            return null;
+        };
+        State.prototype.forward = function () {
+            this.accumulated += ffStep_1;
+        };
+        State.prototype.rewind = function () {
+            this.accumulated -= ffStep_1;
+        };
+        return State;
+    }());
+    var repToLabel_1 = function (i, id) {
+        var rep = reps_1[i];
+        if (rep)
+            layout_1["".concat(id, "_name")].label = "".concat(rep.label, " / ").concat(msToMinSec_1(rep.dur));
+        else
+            emptyLabel_1(id);
+    };
+    var emptyLabel_1 = function (id) {
+        layout_1["".concat(id, "_name")].label = "<none> / 0m";
+    };
+    var pad2_1 = function (s) { return ('0' + s.toFixed(0)).slice(-2); };
+    var msToMinSec_1 = function (ms) {
+        var sec = Math.floor(ms / 1000);
+        var min = Math.floor(sec / 60);
+        return min.toFixed(0) + ":" + pad2_1(sec % 60);
+    };
+    var drawRep_1 = function () {
+        layout_1["duration"].lazyBuster ^= 1;
+        if (state_1) {
+            var i = state_1.currentRepIndex();
+            if (i !== lastRepIndex_1) {
+                buzzNewRep_1();
+                lastRepIndex_1 = i;
+                var repIdx = layout_1["repIdx"];
+                repIdx.label = i !== null ? "Rep ".concat(i + 1) : "Done";
+                layout_1.forgetLazyState();
+                layout_1.clear();
+            }
+            layout_1["play"].label = state_1.paused ? "Play" : "Pause";
+            if (i !== null) {
+                repToLabel_1(i, "cur");
+                repToLabel_1(i + 1, "next");
+            }
+            else {
+                emptyLabel_1("cur");
+                emptyLabel_1("next");
+            }
+        }
+        layout_1.render();
+    };
+    var buzzInteraction_1 = function () { return Bangle.buzz(250); };
+    var buzzNewRep_1 = function () {
+        var n = firstTime_1 ? 1 : 3;
+        firstTime_1 = false;
+        var buzz = function () {
+            Bangle.buzz(1000).then(function () {
+                if (--n <= 0)
+                    return;
+                setTimeout(buzz, 250);
+            });
+        };
+        buzz();
+    };
+    var init = function () {
+        g.clear();
+        layout_1.setUI();
+        drawRep_1();
+        Bangle.drawWidgets();
+    };
+    Bangle.loadWidgets();
+    if (settings.record && WIDGETS["recorder"]) {
+        WIDGETS["recorder"]
+            .setRecording(true)
+            .then(init);
+        if (settings.recordStopOnExit)
+            E.on('kill', function () { return WIDGETS["recorder"].setRecording(false); });
+    }
+    else {
+        init();
+    }
+}
diff --git a/apps/rep/app.png b/apps/rep/app.png
new file mode 100644
index 000000000..795cd94b4
Binary files /dev/null and b/apps/rep/app.png differ
diff --git a/apps/rep/app.ts b/apps/rep/app.ts
new file mode 100644
index 000000000..d1dd67179
--- /dev/null
+++ b/apps/rep/app.ts
@@ -0,0 +1,337 @@
+type RepSettings = {
+	record: boolean,
+	recordStopOnExit: boolean,
+	stepMs: number,
+};
+
+{
+const L = require("Layout");
+
+type StoreRep = {
+	/// duration in ms
+	dur: number,
+	/// label of this rep
+	label: string,
+};
+
+type Rep = StoreRep & {
+	/// cumulative duration (ms)
+	accDur: number,
+};
+
+const storeReps = require("Storage")
+	.readJSON("rep.json") as Rep[] | undefined;
+
+if(storeReps == null){
+	E.showAlert("No reps in storage\nLoad them on with the app loader")
+		.then(() => load());
+
+	throw new Error("no storage");
+}
+
+const reps = storeReps.map((r: StoreRep, i: number, a: Rep[]): Rep => {
+	const r2 = r as Rep;
+	r2.accDur = i > 0
+		? a[i-1]!.accDur + r.dur
+		: r.dur;
+	return r2;
+});
+
+const settings = (require("Storage").readJSON("rep.setting.json", true) || {}) as RepSettings;
+settings.record ??= false;
+settings.recordStopOnExit ??= false;
+settings.stepMs ??= 5 * 1000;
+
+const fontSzMain = 54;
+const fontScaleRep = 2;
+const fontSzRep = 20;
+const fontSzRepDesc = 12;
+const blue = "#205af7";
+const ffStep = settings.stepMs;
+
+let state: State | undefined;
+let drawInterval: IntervalId | undefined;
+let lastRepIndex: number | null = null;
+let firstTime = true;
+
+const renderDuration = (l: Layout.RenderedHierarchy) => {
+	let lbl;
+
+	g.clearRect(l.x, l.y, l.x+l.w, l.y+l.h);
+
+	if(state){
+		const [i, repElapsed] = state.currentRepPair();
+
+		if(i !== null){
+			let thisDur = reps[i]!.dur;
+
+			const remaining = thisDur - repElapsed;
+			lbl = msToMinSec(remaining);
+
+			const fract = repElapsed / thisDur;
+			g.setColor(blue)
+				.fillRect(
+					l.x,
+					l.y,
+					l.x + fract * l.w,
+					l.y + l.h
+				);
+		}else{
+			lbl = msToMinSec(repElapsed);
+		}
+	}else{
+		lbl = "RDY";
+	}
+
+	if(l.font)
+		g.setFont(l.font); // don't chain - might be undefined
+
+	g.setColor(l.col || g.theme.fg)
+		.setFontAlign(0, 0)
+		.drawString(
+			lbl,
+			l.x+(l.w>>1),
+			l.y+(l.h>>1)
+		);
+};
+
+const layout = new L({
+	type: "v",
+	c: [
+		{
+			type: "h",
+			c: [
+				{
+					id: "duration",
+					lazyBuster: 1,
+					type: "custom",
+					font: `Vector:${fontSzMain}` as FontNameWithScaleFactor,
+					fillx: 1,
+					filly: 1,
+					render: renderDuration,
+				},
+				{
+					id: "repIdx",
+					type: "txt",
+					font: `6x8:${fontScaleRep}`,
+					label: "---",
+					r: Layout.Rotation.Deg90,
+				},
+			]
+		},
+		{
+			type: "txt",
+			font: `Vector:${fontSzRepDesc}`,
+			label: "Activity / Duration",
+		},
+		{
+			id: "cur_name",
+			type: "txt",
+			font: `Vector:${fontSzRep}`,
+			label: "",
+			col: blue,
+			//pad: 4,
+			fillx: 1,
+		},
+		{
+			type: "txt",
+			font: `Vector:${fontSzRepDesc}`,
+			label: "Next / Duration",
+		},
+		{
+			id: "next_name",
+			type: "txt",
+			font: `Vector:${fontSzRep}`,
+			label: "",
+			//pad: 4,
+			fillx: 1,
+		},
+		{
+			type: "h",
+			c: [
+				{
+					id: "prev",
+					type: "btn",
+					label: "<<",
+					fillx: 1,
+					cb: () => {
+						buzzInteraction();
+						state?.rewind();
+						drawRep();
+					},
+				},
+				{
+					id: "play",
+					type: "btn",
+					label: "Play",
+					fillx: 1,
+					cb: () => {
+						buzzInteraction();
+						if(!state)
+							state = new State();
+
+						state.toggle();
+
+						if(state.paused){
+							clearInterval(drawInterval!);
+							drawInterval = undefined;
+						}else{
+							drawInterval = setInterval(drawRep, 1000);
+						}
+
+						drawRep();
+					},
+				},
+				{
+					id: "next",
+					type: "btn",
+					label: ">>",
+					fillx: 1,
+					cb: () => {
+						buzzInteraction();
+						state?.forward();
+						drawRep();
+					},
+				}
+			]
+		}
+	]
+}, {lazy: true});
+
+class State {
+	paused: boolean = true;
+	begin: number = Date.now(); // only valid if !paused
+	accumulated: number = 0;
+
+	toggle() {
+		if(this.paused){
+			this.begin = Date.now();
+		}else{
+			const diff = Date.now() - this.begin;
+			this.accumulated += diff;
+		}
+
+		this.paused = !this.paused;
+	}
+
+	getElapsedTotal() {
+		return (this.paused ? 0 : Date.now() - this.begin) + this.accumulated;
+	}
+
+	getElapsedForRep() {
+		return this.currentRepPair()[1];
+	}
+
+	currentRepPair(): [number | null, number] {
+		const elapsed = this.getElapsedTotal();
+		const i = this.currentRepIndex();
+		const repElapsed = elapsed - (i! > 0 ? reps[i!-1]!.accDur : 0);
+
+		return [i, repElapsed];
+	}
+
+	currentRepIndex() {
+		const elapsed = this.getElapsedTotal();
+		let ent;
+		for(let i = 0; (ent = reps[i]); i++)
+			if(elapsed < ent.accDur)
+				return i;
+		return null;
+	}
+
+	forward() {
+		this.accumulated += ffStep;
+	}
+
+	rewind() {
+		this.accumulated -= ffStep;
+	}
+}
+
+const repToLabel = (i: number, id: string) => {
+	const rep = reps[i];
+	if(rep)
+		layout[`${id}_name`]!.label = `${rep.label} / ${msToMinSec(rep.dur)}`;
+	else
+		emptyLabel(id);
+};
+
+const emptyLabel = (id: string) => {
+	layout[`${id}_name`]!.label = "<none> / 0m";
+};
+
+const pad2 = (s: number) => ('0' + s.toFixed(0)).slice(-2);
+
+const msToMinSec = (ms: number) => {
+	const sec = Math.floor(ms / 1000);
+	const min = Math.floor(sec / 60);
+	return min.toFixed(0) + ":" + pad2(sec % 60);
+};
+
+const drawRep = () => {
+	(layout["duration"] as any).lazyBuster ^= 1;
+
+	if(state){
+		const i = state.currentRepIndex();
+
+		if(i !== lastRepIndex){
+			buzzNewRep();
+			lastRepIndex = i;
+
+			const repIdx = layout["repIdx"]!;
+			repIdx.label = i !== null ? `Rep ${i+1}` : "Done";
+
+			// work around a bug in clearing a rotated txt(?)
+			layout.forgetLazyState();
+			layout.clear();
+		}
+
+		layout["play"]!.label = state.paused ? "Play" : "Pause";
+
+		if(i !== null){
+			repToLabel(i, "cur");
+			repToLabel(i+1, "next");
+		}else{
+			emptyLabel("cur");
+			emptyLabel("next");
+		}
+	}
+
+	layout.render();
+};
+
+const buzzInteraction = () => Bangle.buzz(250);
+const buzzNewRep = () => {
+	let n = firstTime ? 1 : 3;
+	firstTime = false;
+	const buzz = () => {
+		Bangle.buzz(1000).then(() => {
+			if (--n <= 0)
+				return;
+			setTimeout(buzz, 250);
+		});
+	};
+	buzz();
+};
+
+const init = () => {
+	g.clear();
+	layout.setUI();
+	drawRep();
+
+	Bangle.drawWidgets();
+};
+
+Bangle.loadWidgets();
+if (settings.record && WIDGETS["recorder"]) {
+  (WIDGETS["recorder"] as RecorderWidget)
+    .setRecording(true)
+    .then(init);
+
+  if (settings.recordStopOnExit)
+    E.on('kill', () => (WIDGETS["recorder"] as RecorderWidget).setRecording(false));
+} else {
+	init();
+}
+
+}
diff --git a/apps/rep/interface.html b/apps/rep/interface.html
new file mode 100644
index 000000000..99ec1c890
--- /dev/null
+++ b/apps/rep/interface.html
@@ -0,0 +1,154 @@
+<!-- TODO -->
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <script src="../../core/lib/interface.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ical.js/0.0.3/ical.min.js"></script>
+    <script>
+const repJson = "rep.json";
+let reps;
+
+function renderRep(rep) {
+  const tr = document.createElement("tr");
+
+  const tdLabel = document.createElement("td");
+  {
+    const inputLabel = document.createElement("input");
+    inputLabel.type = "text";
+    inputLabel.classList.add("form-input");
+    inputLabel.maxLength = 30;
+    inputLabel.value = rep.label;
+    inputLabel.onchange = e => {
+      rep.label = inputLabel.value;
+    };
+    tdLabel.appendChild(inputLabel);
+  }
+  tr.appendChild(tdLabel);
+
+  const tdDuration = document.createElement("td");
+  {
+    const [hours, mins, secs] = msToHMS(rep.dur);
+
+    const inputDuration = document.createElement('input');
+    inputDuration.type = "time";
+    inputDuration.step = 1; // display seconds
+    inputDuration.value = `${hours}:${mins}:${secs}`;
+
+    inputDuration.onchange = e => {
+      rep.dur = hmsToMs(inputDuration.value);
+    };
+
+    inputDuration.classList.add('form-input'); // ?
+
+    tdDuration.appendChild(inputDuration);
+  }
+  tr.appendChild(tdDuration);
+
+  const tdInfo = document.createElement("td");
+  {
+    const buttonDelete = document.createElement("button");
+    {
+      buttonDelete.classList.add("btn");
+      buttonDelete.classList.add("btn-action");
+
+      const iconDelete = document.createElement("i");
+      {
+        iconDelete.classList.add("icon");
+        iconDelete.classList.add("icon-delete");
+      }
+      buttonDelete.appendChild(iconDelete);
+      buttonDelete.onclick = (e => {
+        reps = reps.filter(a => a !== rep);
+        document.getElementById("repsTable").removeChild(tr);
+      });
+    }
+    tdInfo.appendChild(buttonDelete);
+  }
+  tr.appendChild(tdInfo);
+
+  document.querySelector("#repsTable").appendChild(tr);
+}
+
+function msToHMS(ms) {
+  let secs = Math.floor(ms / 1000) % 60;
+  let mins = Math.floor(ms / 1000 / 60) % 60;
+  let hours = Math.floor(ms / 1000 / 60 / 60);
+  if (secs < 10) secs = "0" + secs;
+  if (mins < 10) mins = "0" + mins;
+  if (hours < 10) hours = "0" + hours;
+  return [hours, mins, secs];
+}
+
+function hmsToMs(hms) {
+  let [hours, mins, secs] = hms.split(":");
+  hours = Number(hours);
+  mins = Number(mins);
+  secs = Number(secs);
+  return ((hours * 60 + mins) * 60 + secs) * 1000;
+}
+
+function addRep() {
+  const r = {
+    label: "Run",
+    dur: 60 * 1000,
+  };
+  reps.push(r);
+  renderRep(r);
+}
+
+function getData() {
+  uploadBtn.disabled = true;
+
+  Util.showModal("Loading...");
+  Util.readStorage(repJson, data => {
+    Util.hideModal();
+
+    reps = JSON.parse(data);
+    for(const rep of reps){
+      renderRep(rep);
+    }
+
+    uploadBtn.disabled = false;
+  });
+}
+
+function upload() {
+  Util.showModal("Saving...");
+  Util.writeStorage(repJson, JSON.stringify(reps), () => {
+    location.reload(); // view current data
+  });
+}
+
+function onInit() {
+  getData();
+}
+    </script>
+  </head>
+  <body>
+    <h4>Reps</h4>
+
+    <div class="float-right">
+      <button class="btn" onclick="addRep()">
+        <i class="icon icon-plus"></i>
+      </button>
+    </div>
+
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Description</th>
+          <th>Duration</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody id="repsTable">
+      </tbody>
+    </table>
+
+    <div class="divider"></div>
+
+    <button id="uploadBtn" class="btn btn-primary" onClick="upload()">Upload</button>
+    <button id="reloadBtn" class="btn" onClick="location.reload()">Reload</button>
+  </body>
+</html>
diff --git a/apps/rep/metadata.json b/apps/rep/metadata.json
new file mode 100644
index 000000000..f3c00da10
--- /dev/null
+++ b/apps/rep/metadata.json
@@ -0,0 +1,17 @@
+{
+	"id": "rep",
+	"name": "Rep",
+	"version":"0.02",
+	"description": "Time running reps, using a rep schedule/program uploaded via the app loader",
+	"icon": "app.png",
+	"tags": "run,running,fitness,outdoors",
+	"supports" : ["BANGLEJS2"],
+	"readme": "README.md",
+	"interface": "interface.html",
+	"storage": [
+		{"name":"rep.app.js","url":"app.js"},
+		{"name":"rep.settings.js","url":"settings.js"},
+		{"name":"rep.img","url":"app-icon.js","evaluate":true}
+	],
+	"data": [{"name":"rep.json"}]
+}
diff --git a/apps/rep/settings.js b/apps/rep/settings.js
new file mode 100644
index 000000000..bfadacda1
--- /dev/null
+++ b/apps/rep/settings.js
@@ -0,0 +1,44 @@
+(function (back) {
+    var _a, _b, _c;
+    var SETTINGS_FILE = "rep.setting.json";
+    var storage = require("Storage");
+    var settings = (storage.readJSON(SETTINGS_FILE, true) || {});
+    (_a = settings.record) !== null && _a !== void 0 ? _a : (settings.record = false);
+    (_b = settings.recordStopOnExit) !== null && _b !== void 0 ? _b : (settings.recordStopOnExit = false);
+    (_c = settings.stepMs) !== null && _c !== void 0 ? _c : (settings.stepMs = 5 * 1000);
+    var save = function () {
+        storage.writeJSON(SETTINGS_FILE, settings);
+    };
+    var menu = {
+        "": { "title": "Rep" },
+        "< Back": back,
+        "Fwd/back seconds": {
+            value: settings.stepMs / 1000,
+            min: 1,
+            max: 60,
+            step: 1,
+            format: function (v) { return "".concat(v, "s"); },
+            onchange: function (v) {
+                settings.stepMs = v * 1000;
+                save();
+            },
+        },
+    };
+    if (global["WIDGETS"] && WIDGETS["recorder"]) {
+        menu["Record activity"] = {
+            value: !!settings.record,
+            onchange: function (v) {
+                settings.record = v;
+                save();
+            }
+        };
+        menu["Stop record on exit"] = {
+            value: !!settings.recordStopOnExit,
+            onchange: function (v) {
+                settings.recordStopOnExit = v;
+                save();
+            }
+        };
+    }
+    E.showMenu(menu);
+});
diff --git a/apps/rep/settings.ts b/apps/rep/settings.ts
new file mode 100644
index 000000000..0041b95f9
--- /dev/null
+++ b/apps/rep/settings.ts
@@ -0,0 +1,48 @@
+(back => {
+	const SETTINGS_FILE = "rep.setting.json";
+
+	const storage = require("Storage")
+	const settings = (storage.readJSON(SETTINGS_FILE, true) || {}) as RepSettings;
+	settings.record ??= false;
+	settings.recordStopOnExit ??= false;
+	settings.stepMs ??= 5 * 1000;
+
+	const save = () => {
+		storage.writeJSON(SETTINGS_FILE, settings);
+	};
+
+	const menu: Menu = {
+		"": { "title": "Rep" },
+		"< Back": back,
+		/*LANG*/"Fwd/back seconds": {
+			value: settings.stepMs / 1000,
+			min: 1,
+			max: 60,
+			step: 1,
+			format: (v: number) => `${v}s`,
+			onchange: (v: number) => {
+				settings.stepMs = v * 1000;
+				save();
+			},
+		},
+	};
+
+	if (global["WIDGETS"] && WIDGETS["recorder"]) {
+		menu[/*LANG*/"Record activity"] = {
+			value: !!settings.record,
+			onchange: (v: boolean) => {
+				settings.record = v;
+				save();
+			}
+		};
+		menu[/*LANG*/"Stop record on exit"] = {
+			value: !!settings.recordStopOnExit,
+			onchange: (v: boolean) => {
+				settings.recordStopOnExit = v;
+				save();
+			}
+		};
+	}
+
+	E.showMenu(menu);
+}) satisfies SettingsFunc
diff --git a/apps/rescalc/ChangeLog b/apps/rescalc/ChangeLog
new file mode 100644
index 000000000..7b1d6baca
--- /dev/null
+++ b/apps/rescalc/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App!
+0.02: Fixes colors not matching user input from color menu in some cases, 3 bands are now shown larger, various code improvements.
+0.03: Use transparent icon with better visibility on dark backgrounds, new resistor img with darker outlines
diff --git a/apps/rescalc/README.md b/apps/rescalc/README.md
new file mode 100644
index 000000000..43893f866
--- /dev/null
+++ b/apps/rescalc/README.md
@@ -0,0 +1,25 @@
+# Resistor Calculator
+
+Resistor Calculator is a Bangle.js application designed to assist with resistor color code interpretation and vice versa. It provides a convenient way to calculate the resistance value based on color bands and to find the color bands based on the resistance value.
+
+## Usage
+
+There are two main functions of the Resistor Calculator:
+
+1. **Calculate resistance from color bands:** You can select the colors of the 4 bands on the resistor, and the app will calculate the resistance and tolerance accordingly.
+
+2. **Find color bands from resistance:** You can specify a resistance value, multiplier, and tolerance percentage, and the app will display the corresponding color bands.
+
+The Resistor Calculator presents these functions in an intuitive menu system. Navigate through the menus using the touchscreen on your Bangle.js 2 watch.
+
+## Configuration
+
+The Resistor Calculator does not require any specific configurations. All settings are managed within the app itself. After installing the app, you can start it from your Bangle.js watch's app launcher.
+
+## Compatibility
+
+The Resistor Calculator is only compatible with Bangle.js 2 watches.
+
+## Creator
+
+The Resistor Calculator was created by [stweedo](https://github.com/stweedo). Please feel free to reach out if you have any questions or suggestions, or if you encounter any issues with the app.
diff --git a/apps/rescalc/app-icon.js b/apps/rescalc/app-icon.js
new file mode 100644
index 000000000..94a0dcd10
--- /dev/null
+++ b/apps/rescalc/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+ACXXABIeTFiWs1mBwIDBGMYhCwMrp9VvAACqsrleBGD4tDvOj5oAC5wAB5ujvIxeRAItBFgYwF5/PGQIxBSwQuaLYgAIGQPO0ZiDFy2BqupFA2jv1+HIoxB1NVGCxdCFo2ilUqeQIDB0QwF5qSVCYKMHvDlEfIV4GAqSBF6QSBq1/Fw5PBTIKFC1mAfA1/qwwRDoNPXQ0kFwMrlS/BlRVCqoRESINPCQIvQq1+F4tUJgNWqgIG6z/EMAN+MCC9Cdg0A1mslQJFlRVBgBgGYKCOBPYvN0QaBLwpgEleiMAtVSB7hBvAkFPQQkFBQQ6CUgvOvD9BXx4kGvAvJNQZFF5+iCoIvP0YvUL4vP0YvYKhI6KF6YZF1N+gGs1kqF4sqBIMAv2pIoovQwJ5E1MqqtW1hVBMAl4NIOsq1VlQwD59+d6GsvKNGAAWBpwLDpwjBAASRE515IgIuNAANWQYsrAAUkNYl+kgLDTYqOBAAIvOlej44ABMIV+AAKzF5ujBQRdCCwWjOwYuMVIJMDldPvAyCABfHvFPDAjVCGBXXgAPB1kAikUgGBGwIxL47PBleBgFer0ADoNWgAwJRgRvCgFqtQTCwJkCABAtCC4Wz2YXCEQJhJRoQvDjUaC4YxCnMyE4IFBp9zlQtCC4VlsoXDSJK9DF5dW2YCBD4WB6ACBF5wwEAwQvNmWJrovDvXJp4vTFoUAdwIvMsszF4dz4IvNEoKRDB4QACF8oABBwYECR5wvVLoQrDAQRkBTYYvhE4IvEYYOsDAYvIlc5mUrwIFBp9zlQvNdYQvGCwYvGTQNWFYIAHq0rQgYvSDIIYBF4YtCTQYAIB4YvEQIKiBL5Z+BlcAAQMrFogPBAA4xECwQACTQQvJSAoAFFpIXNEwgvHAEwv/F/4v/F/4v/F/4vDAAIvqAAIA=="))
diff --git a/apps/rescalc/app.js b/apps/rescalc/app.js
new file mode 100644
index 000000000..566809837
--- /dev/null
+++ b/apps/rescalc/app.js
@@ -0,0 +1,459 @@
+// Capital Omega symbol and Resistor icon from icons8
+// https://icons8.com/icon/szAc6YFQmlym/capital-omega
+// https://icons8.com/icon/ISAVBnskZod0/resistor
+
+let colorData = {
+  black: { value: 0, multiplier: 1, hex: '#000' },
+  brown: { value: 1, multiplier: 10, tolerance: 1, hex: '#8B4513' },
+  red: { value: 2, multiplier: 100, tolerance: 2, hex: '#f00' },
+  orange: { value: 3, multiplier: 1000, hex: '#FF9900' },
+  yellow: { value: 4, multiplier: 10000, hex: '#ff0' },
+  green: { value: 5, multiplier: 100000, tolerance: 0.5, hex: '#0f0' },
+  blue: { value: 6, multiplier: 1000000, tolerance: 0.25, hex: '#00f' },
+  violet: { value: 7, multiplier: 10000000, tolerance: 0.1, hex: '#f0f' },
+  grey: { value: 8, multiplier: 100000000, tolerance: 0.05, hex: '#808080' },
+  white: { value: 9, multiplier: 1000000000, hex: '#fff' },
+  gold: { multiplier: 0.1, tolerance: 5, hex: '#FFD700' },
+  silver: { multiplier: 0.01, tolerance: 10, hex: '#C0C0C0' },
+  none: { tolerance: 20 },
+};
+
+function clearScreen() { // Except Back Button
+  g.clearRect(24, 0, 176, 24);
+  g.clearRect(0, 24, 176, 176);
+}
+
+function colorBandsToResistance(colorBands) {
+  let firstBand = colorBands[0];
+  let secondBand = colorBands[1];
+  let multiplierBand = colorBands[2];
+  let toleranceBand = colorBands[3] || 'none'; // Add a default value for toleranceBand
+  let significantDigits = colorData[firstBand].value * 10 + colorData[secondBand].value;
+  let multiplier = colorData[multiplierBand].multiplier;
+  let resistance = significantDigits * multiplier;
+  let tolerance = colorData[toleranceBand].tolerance;
+  return [resistance, tolerance];
+}
+
+function resistanceToColorBands(resistance, tolerance) {
+  let firstDigit, secondDigit, multiplier;
+  if (resistance < 1) {
+    // The resistance is less than 1, so we need to handle this case specially
+    let count = 0;
+    while (resistance < 1) {
+      resistance *= 10;
+      count++;
+    }
+    // Now, resistance is a whole number and count is how many times we had to multiply by 10
+    let resistanceStr = resistance.toString();
+    firstDigit = 0; // Set the first band color to be black
+    secondDigit = Number(resistanceStr.charAt(0)); // Set the second band color to be the significant digit
+    // Use count to determine the multiplier
+    multiplier = count === 1 ? 0.1 : 0.01;
+  } else {
+    // Convert the resistance to a string so we can manipulate it easily
+    let resistanceStr = resistance.toString();
+    if (resistanceStr.length === 1) { // Check if resistance is a single digit
+      firstDigit = 0;
+      secondDigit = Number(resistanceStr.charAt(0));
+      multiplier = 1; // Set multiplier to 1 for single digit resistance values
+    } else {
+      // Extract the first two digits from the resistance value
+      firstDigit = Number(resistanceStr.charAt(0));
+      secondDigit = Number(resistanceStr.charAt(1));
+      // Calculate the multiplier by matching it directly with the length of digits
+      multiplier = resistanceStr.length - 2 >= 0 ? Math.pow(10, resistanceStr.length - 2) : Math.pow(10, resistanceStr.length - 1);
+    }
+  }
+  let firstBandEntry = Object.entries(colorData).find(function (entry) {
+    return entry[1].value === firstDigit;
+  });
+  let firstBand = firstBandEntry ? firstBandEntry[1].hex : undefined;
+  let secondBandEntry = Object.entries(colorData).find(function (entry) {
+    return entry[1].value === secondDigit;
+  });
+  let secondBand = secondBandEntry ? secondBandEntry[1].hex : undefined;
+  let multiplierBandEntry = Object.entries(colorData).find(function (entry) {
+    return entry[1].multiplier === multiplier;
+  });
+  let multiplierBand = multiplierBandEntry ? multiplierBandEntry[1].hex : undefined;
+  let toleranceBandEntry = Object.entries(colorData).find(function (entry) {
+    return entry[1].tolerance === tolerance;
+  });
+  let toleranceBand = toleranceBandEntry ? toleranceBandEntry[1].hex : undefined;
+  let bands = [firstBand, secondBand, multiplierBand];
+  if (toleranceBand) bands.push(toleranceBand);
+  return bands;
+}
+
+function drawResistor(colorBands, tolerance) {
+  let img = require("Storage").read("rescalc-resistor.img");
+  let resistorBodyWidth = 51;
+  let resistorBodyHeight = 43;
+  let resistorStartX = 52;
+  let bandColors = colorBands;
+  let numColorBands = bandColors.length;
+  let resistorStartY = ((g.getHeight() - resistorBodyHeight) / 2) + 48;
+  clearScreen();
+  g.drawImage(img, 0, 112);
+  let bandWidth = (resistorBodyWidth - (numColorBands * 2 - 1)) / numColorBands; // width of each band, accounting for the spacing
+  let bandHeight = resistorBodyHeight; // height of each band
+  let currentX = resistorStartX; // starting point for the first band
+  // Define the tolerance values that will trigger the fourth band
+  let validTolerances = [1, 2, 0.5, 0.25, 0.1, 0.05, 5, 10];
+  for (let i = 0; i < numColorBands; i++) {
+    // Skip the fourth band and its outlines if the tolerance is not in the valid list
+    if (i === 3 && !validTolerances.includes(tolerance)) continue;
+    let bandX = currentX; // calculate the x-coordinate of the band
+    let bandY = resistorStartY; // y-coordinate of the band
+    g.setColor(bandColors[i]); // set the color for the band
+    g.fillRect(bandX, bandY, bandX + bandWidth, bandY + bandHeight);
+    // Draw band outlines
+    g.setColor('#000'); // set the color for the outline
+    g.drawLine(bandX, bandY, bandX, bandY + bandHeight); // left outline
+    g.drawLine(bandX + bandWidth, bandY, bandX + bandWidth, bandY + bandHeight); // right outline
+    // if it's the fourth band, shift it over by an additional 12 pixels
+    if (i === 2) {
+      currentX = bandX + bandWidth + 5 + 12; // update the current X position for the next band, accounting for the spacing
+    } else {
+      currentX = bandX + bandWidth + 5; // update the current X position for the next band, accounting for the spacing
+    }
+  }
+}
+
+function omega() {
+  return require("heatshrink").decompress(atob("mUywISP//AAgUB//+Aon/8AFEBgYFBDId/AoP4AoM//EH/4FBj/wBAIfBh4PBg/8gEDAQIbBFQIoCj4SBBAIPBCoM/wASDh5BCj/AgYqBCQPwgIkCgAiBDwQcCj4eCg/gAIJgC/ABBCQV+AIQrCDDMPP4QDBJQsAJQYDBMYorDDwJdDNoQSCg4eBh4CBSQSPCSQc/HAKuCg5LBv4uCBIIOCUoSnCCQQUCdYTuDbIOAAQUfeIICCboLgCPgIYLNwQAPA="));
+}
+
+function formatResistance(resistance) {
+  let units = ["", "k", "M", "G"];
+  let unitIndex = 0;
+  while (resistance >= 1000 && unitIndex < units.length - 1) {
+    resistance /= 1000;
+    unitIndex++;
+  }
+  // Convert to string and truncate unnecessary zeroes
+  let resistanceStr = String(resistance);
+  if (resistanceStr.length > 5) { // if length is more than 5 including decimal point
+    resistanceStr = resistance.toFixed(2);
+  }
+  return {
+    value: resistanceStr,
+    unit: units[unitIndex]
+  };
+}
+
+function drawResistance(resistance, tolerance) {
+  let x = g.getWidth() / 2;
+  let y = 40;
+  let formattedResistance = formatResistance(resistance);
+  let resistanceStr = formattedResistance.value;
+  let unit = formattedResistance.unit;
+  g.reset();
+  // draw resistance value
+  g.setFontAlign(0, 0).setFont("Vector", 54);
+  g.clearRect(0, y - 15, g.getWidth(), y + 25); // clear the background
+  g.drawString(resistanceStr, x + 4, y);
+  // draw unit, symbol, and tolerance
+  y += 46;
+  g.setFontAlign(-1, 0).setFont("Vector", 27);
+  let toleranceShift = tolerance.toString().replace('.', '').length > 2 ? 8 : 0;
+  let unitX = ((unit === "M" || unit === "G") ? 0 : 8) - toleranceShift;
+  let omegaX = (unit ? 46 : 36) - toleranceShift; // Shift the Omega symbol to the left if there is no unit
+  g.drawString(unit.padStart(3), unitX, y);
+  // Draw the Ohm symbol to the right of the unit
+  g.drawImage(omega(), omegaX, y - 13, { scale: 0.45 });
+  g.setFontAlign(1, 0).setFont("Vector", 27);
+  // Define the tolerance values that will trigger the fourth band
+  let validTolerances = [1, 2, 0.5, 0.25, 0.1, 0.05, 5, 10];
+  // Check if the tolerance is not in the valid list, and if it's not, set it to 20
+  if (!validTolerances.includes(tolerance)) {
+    tolerance = 20;
+  }
+  let toleranceStr = "±" + tolerance + "%";
+  let toleranceX = tolerance.toString().replace('.', '').length > 2 ? 10 : 14;
+  g.drawString(toleranceStr.padEnd(4), 176 - toleranceX, y);
+}
+
+(function () {
+  let colorBands;
+  let inputColorBands;
+  let settings = {
+    resistance: 0,
+    tolerance: 0,
+    colorBands: ["", "", "", ""]
+  };
+
+  function resetSettings() {
+    let emptySettings = {
+      resistance: 0,
+      tolerance: 0,
+      colorBands: ["", "", "", ""]
+    };
+    settings = emptySettings;
+    colorBands = null;
+    inputColorBands = null;
+  }
+
+  function showColorBandMenu(bandNumber) {
+    let colorBandMenu = {
+      '': {
+        'title': `Band ${bandNumber}`
+      },
+      '< Back': function () {
+        E.showMenu(colorEntryMenu);
+      },
+    };
+
+    // Populate colorBandMenu with colors from colorData
+    for (let color in colorData) {
+      if (bandNumber === 1 || bandNumber === 2) {
+        if (color !== 'none' && color !== 'gold' && color !== 'silver') {
+          (function (color) {
+            colorBandMenu[color.charAt(0).toUpperCase() + color.slice(1)] = function () {
+              setBandColor(bandNumber, color);
+            };
+          })(color);
+        }
+      } else if (bandNumber === 3) {
+        if (color !== 'none') {
+          (function (color) {
+            colorBandMenu[color.charAt(0).toUpperCase() + color.slice(1)] = function () {
+              setBandColor(bandNumber, color);
+            };
+          })(color);
+        }
+      } else if (bandNumber === 4) {
+        if (colorData[color].hasOwnProperty('tolerance')) {
+          (function (color) {
+            colorBandMenu[color.charAt(0).toUpperCase() + color.slice(1)] = function () {
+              setBandColor(bandNumber, color);
+            };
+          })(color);
+        }
+      }
+    }
+    return E.showMenu(colorBandMenu);
+  }
+
+  function setBandColor(bandNumber, color) {
+    settings.colorBands[bandNumber - 1] = color; // arrays are 0-indexed
+    // Update the color band in the colorEntryMenu
+    colorEntryMenu[`${bandNumber}:`].value = color;
+    showColorEntryMenu();
+  }
+
+  function showColorEntryMenu() {
+    colorEntryMenu = {
+      '': {
+        'title': 'Band Color'
+      },
+      '< Back': function () {
+        clearScreen();
+        E.showMenu(mainMenu);
+      },
+      '1:': {
+        value: settings.colorBands[0] || "",
+        format: (v) => `${v}`,
+        onchange: () => {
+          clearScreen();
+          setTimeout(() => showColorBandMenu(1), 5);
+        }
+      },
+      '2:': {
+        value: settings.colorBands[1] || "",
+        format: (v) => `${v}`,
+        onchange: () => {
+          clearScreen();
+          setTimeout(() => showColorBandMenu(2), 5);
+        }
+      },
+      '3:': {
+        value: settings.colorBands[2] || "",
+        format: (v) => `${v}`,
+        onchange: () => {
+          clearScreen();
+          setTimeout(() => showColorBandMenu(3), 5);
+        }
+      },
+      '4:': {
+        value: settings.colorBands[3] || "",
+        format: (v) => `${v}`,
+        onchange: () => {
+          clearScreen();
+          setTimeout(() => showColorBandMenu(4), 5);
+        }
+      },
+      'Draw Resistor': function () {
+        inputColorBands = settings.colorBands;
+        let values = colorBandsToResistance(inputColorBands);
+        settings.resistance = values[0];
+        settings.tolerance = values[1];
+        showDrawingMenu();
+      }
+    };
+
+    E.showMenu(colorEntryMenu);
+  }
+
+  function showMultiplierMenu() {
+    let multiplierMenu = {
+      '': {
+        'title': 'Multiplier'
+      },
+      '< Back': function () {
+        showResistanceEntryMenu();
+      }
+    };
+
+    // Generate menu items for each Multiplier value in colorData
+    for (let color in colorData) {
+      if (colorData[color].hasOwnProperty('multiplier')) {
+        let multiplierValue = parseFloat(colorData[color].multiplier); // Parse the multiplier as a float
+        let formattedMultiplier = formatMultiplier(multiplierValue);
+        multiplierMenu[`${formattedMultiplier}`] = () => {
+          settings.multiplier = multiplierValue;
+          // Update the value of 'Multiplier' in resistanceEntryMenu
+          resistanceEntryMenu["Multiplier"] = function () {
+            showMultiplierMenu();
+          };
+          showResistanceEntryMenu();
+        };
+      }
+    }
+
+    E.showMenu(multiplierMenu);
+  }
+
+  // Helper function to format multiplier as exponential notation for values >= 1000
+  function formatMultiplier(multiplier) {
+    if (multiplier >= 1000) {
+      let exponent = Math.log(multiplier) / Math.log(10);
+      return `10^${exponent}`;
+    } else {
+      return multiplier.toString();
+    }
+  }
+
+  function showToleranceMenu() {
+    let toleranceMenu = {
+      '': {
+        'title': 'Tolerance'
+      },
+      '< Back': function () {
+        showResistanceEntryMenu();
+      }
+    };
+
+    // Generate menu items for each tolerance value in colorData
+    for (let color in colorData) {
+      if (colorData[color].hasOwnProperty('tolerance')) {
+        let tolerance = parseFloat(colorData[color].tolerance); // Parse the tolerance as a float
+        toleranceMenu[`${tolerance}%`] = () => {
+          settings.tolerance = tolerance;
+          // Update the value of 'Tolerance (%)' in resistanceEntryMenu
+          resistanceEntryMenu["Tolerance (%)"] = function () {
+            showToleranceMenu();
+          };
+          showResistanceEntryMenu();
+        };
+      }
+    }
+    E.showMenu(toleranceMenu);
+  }
+
+  function drawResistorAndResistance(resistance, tolerance) {
+    if (inputColorBands) {
+      colorBands = inputColorBands.map(color => {
+        if (colorData.hasOwnProperty(color)) {
+          return colorData[color].hex;
+        } else {
+          return;
+        }
+      });
+    } else {
+      colorBands = resistanceToColorBands(resistance, tolerance);
+    }
+    drawResistor(colorBands, tolerance);
+    drawResistance(resistance, tolerance);
+    resetSettings();
+  }
+
+  let resistanceEntryMenu = {
+    '': {
+      'title': 'Resistance'
+    },
+    '< Back': function () {
+      clearScreen();
+      E.showMenu(mainMenu);
+    },
+    'Ohms': {
+      value: 0,
+      min: 0,
+      max: 99,
+      wrap: true,
+      format: v => '',
+      onchange: v => { }
+    },
+    'Multiplier': function () {
+      showMultiplierMenu();
+    },
+    'Tolerance (%)': function () {
+      showToleranceMenu();
+    },
+    'Draw Resistor': function () {
+      showDrawingMenu();
+    }
+  };
+
+  function showResistanceEntryMenu() {
+    // Update the 'Ohms' field
+    resistanceEntryMenu['Ohms'].value = settings.resistance;
+    resistanceEntryMenu['Ohms'].format = v => {
+      let multipliedValue = v * (settings.multiplier || 1);
+      let formattedResistance = formatResistance(multipliedValue);
+      let resistanceString = `${formattedResistance.value}${formattedResistance.unit}`;
+      if (settings.tolerance) {
+        return `${resistanceString}, ± ${settings.tolerance}%`;
+      } else {
+        return v ? `${resistanceString}` : '';
+      }
+    };
+    resistanceEntryMenu['Ohms'].onchange = v => {
+      settings.resistance = v || 0;
+    };
+    E.showMenu(resistanceEntryMenu);
+  }
+
+  function showDrawingMenu() {
+    let drawingMenu = {
+      '': {
+        'title': ''
+      },
+      '< Back': function () {
+        clearScreen();
+        E.showMenu(mainMenu);
+      },
+    };
+    E.showMenu(drawingMenu);
+    let resistance = settings.resistance * (settings.multiplier || 1);
+    let tolerance = settings.tolerance;
+    drawResistorAndResistance(resistance, tolerance);
+  }
+
+  let mainMenu = {
+    '': {
+      'title': 'Resistor Calc'
+    },
+    '< Back': () => Bangle.showClock(), // return to the clock app
+    'Resistance': function () {
+      resetSettings();
+      showResistanceEntryMenu();
+    },
+    'Colors': function () {
+      resetSettings();
+      showColorEntryMenu();
+    },
+  };
+  E.showMenu(mainMenu);
+})();
\ No newline at end of file
diff --git a/apps/rescalc/metadata.json b/apps/rescalc/metadata.json
new file mode 100644
index 000000000..473f334d7
--- /dev/null
+++ b/apps/rescalc/metadata.json
@@ -0,0 +1,22 @@
+{
+  "id": "rescalc",
+  "name": "Resistor Calculator",
+  "shortName": "Resistor Calc",
+  "icon": "rescalc.png",
+  "version":"0.03",
+  "screenshots": [
+    {"url": "screenshot.png"},
+    {"url": "screenshot-1.png"},
+    {"url": "screenshot-2.png"}
+  ],
+  "description": "An intuitive, easy-to-use app that aids in the interpretation of resistor color codes and calculation of resistance values.",
+  "tags": "app, tool, electricity, ohms, converter",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "allow_emulator": true,
+  "storage": [
+    {"name": "rescalc.app.js", "url": "app.js"},
+    {"name": "rescalc.img", "url": "app-icon.js", "evaluate": true},
+    {"name": "rescalc-resistor.img", "url": "resistor.js", "evaluate": true}
+  ]
+}
diff --git a/apps/rescalc/rescalc.png b/apps/rescalc/rescalc.png
new file mode 100644
index 000000000..e986e8a8b
Binary files /dev/null and b/apps/rescalc/rescalc.png differ
diff --git a/apps/rescalc/resistor.js b/apps/rescalc/resistor.js
new file mode 100644
index 000000000..eeb01af7b
--- /dev/null
+++ b/apps/rescalc/resistor.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("2EwxH+AE41JGVBV/Kv3PAAr/aAGRUGKoqn/VpBVHAH4AdWP6t/WP6t/AH6x/V0Z//WOau/AH6xwV254/WHCx0V36w7V34A/WH6uiV/6w/V34A/V9ywuV34A/WAKutV/4A/WFyu/AH6vugCv/AH6wuV34A/V/4A/V+qwoFIJr/AH6wFV9Bp/AH6vagAATNP4A/V4wAoNP4A/V7WBACSv/AH6vHTaav/AH6vbWE6v/AH6v/AH6v3TagATNP4A/V4wAoNP4A/V7X+ACSv/AH6vHTaavUWH4A/V9ywBNX4A/Vwiv/AH6vvV1CvBWH4A/V9ywBNn4A/V1qvBWH4A/V9ywBN34A/V1qvBWH6u/V9yw/AH6uvWARy/V36w/AH6u/WH4A/VzSv1WAKx/V2yt1WH6t3V3KwDWP6twV3ax/Vv6x/AH6t/WNK0JBgoA/AA6rKVv6zTKv5V/AAI="))
diff --git a/apps/rescalc/screenshot-1.png b/apps/rescalc/screenshot-1.png
new file mode 100644
index 000000000..217c72ec9
Binary files /dev/null and b/apps/rescalc/screenshot-1.png differ
diff --git a/apps/rescalc/screenshot-2.png b/apps/rescalc/screenshot-2.png
new file mode 100644
index 000000000..0f3488672
Binary files /dev/null and b/apps/rescalc/screenshot-2.png differ
diff --git a/apps/rescalc/screenshot.png b/apps/rescalc/screenshot.png
new file mode 100644
index 000000000..23a233ca0
Binary files /dev/null and b/apps/rescalc/screenshot.png differ
diff --git a/apps/rings/ChangeLog b/apps/rings/ChangeLog
new file mode 100644
index 000000000..ecdd6b011
--- /dev/null
+++ b/apps/rings/ChangeLog
@@ -0,0 +1,2 @@
+0.01: First rev. Could use a little optimization love.
+0.02: Added battery ring, bubble background for numbers, settings and little optimaztion love.
\ No newline at end of file
diff --git a/apps/rings/README.md b/apps/rings/README.md
new file mode 100644
index 000000000..8136cb542
--- /dev/null
+++ b/apps/rings/README.md
@@ -0,0 +1,16 @@
+# Rings watchface
+
+Ring based watchface, read from the outside in. When the watch is unlocked the circles shrink to show the date ring.
+Contributors: Amos Blanton, pinq-. Inspired by Rinkulainen by Julio Kallio.
+
+![](screenshot1.png) 
+View when watch is locked. 
+
+![](screenshot5.png) 
+View when watch is locked with numbers and bubble settings on
+
+![](screenshot3.png) 
+Watch unlocked, showing the date.
+
+
+
diff --git a/apps/rings/app-icon.js b/apps/rings/app-icon.js
new file mode 100644
index 000000000..3e70c5e3a
--- /dev/null
+++ b/apps/rings/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+CR0GAokMiUMAQQLFAooAYg0SjEYjwAHjA0BGLQXChgrEGIIGCG4wyBLbItFFQYnDFgYREGIRiRCISHIFQgEDMYgCCSoYuPhi1IXg4vFMYI5CSh4uBJwYAEj5bDAAjGCjIzDTwguWFoMShkOgIVFgMOLQMYHwYCDGBZdKiUHisckcOwNWgGBxEkikjkcWhCmBj4sBMJ67GDIMAiojBAANd1lWq2BAAMOo4LCjkBiQWBLwQ0CK4RfGFw0SgJbBAAc51mBles1lPhwMENoMMGAJgDj0MGAoEBBgYuDhAgFkeIFgOBAQN6F40jisGYgQADRpguJL4LtEgE4B48VMIRiDSIxeFjEBDo1HWQMAqgACGIKdFAAUPYYUSSIjsJgAdHh1O1HSAAmovEICY8Id4RTDMAK9GRoMVDIscgGo6YuFAAPT1FOitHCosGFoYpBdwZeFg4uRGIYwHh4sBYIsAS4ZeJFwItKGAiSFjjyBL4aQBdo0MCwlHhxdMYgkAYJApDF48OIotOFw2ov1+NA3TvyRFisYMAJXDgCOEjCOEo8VLwuoqjXCAAIxF1EIJQsSF4RbBhkMXxcO5giEFwMqAAQwBqhkB6ZABqkdYArsBdQUSF4q+FkdUWQwrCAAQFFvzxGg5eCeARfGCYkdF4t+FI0Aq1VleBwNWgAvFFAgvHL4ovOq2swIvB1msgFAF7yPHlesLYNWwIHBR5AvJiUWd4ovE6S6EAQJfB1gyDF4rvCAAcSgwvEjEVCYdHh+o6ZgFAAksq1WlcrGwMHJQkciUfF4kAGwsOCgt4F4jCCqgABv1+SwcBgBKEkcVjAvEhkAjA0DAAIUEkcI1AvFAA+oHAIZGh0YAAQqBFAMSFodWkhFFjlOMAwAH6d+DA0MjESGIYrD1kAwOswMyIwsVGBouBhAXGXwRfCLYYsBAQIDBvUcC4lHGALzFFojHBFw0jcwq+CL4eBgGs1lWgwYFo8cgF+5gpBAAQvB0SlBo4VFh5bBRwIuBRwMGL4QABleBrgHBhxKGPYMIql+AAVUg8VjouGi0Mj7uELwYAGhkZhjZFMQTeCAAYIDdgqNCFoMMLwoABlYFBmJsCj8GGA4yCAAQMIFwJaCdoZeIBwQACj8Mh4jIABUWFwS8Dj0SLwovIGAMShCEBAB8PQ4JbCLoSNBABIwHjEGh4xMjkVDQMZRggEBFxQwIDIUMhEVdQQrDFgMOg0SCIQYFRY4wPj4gBiUMg8MAQS0BCgINBLYguDGBxJCGI4kCA5S7GFxwABa4QAXiQrPAAQ/CSZAANjBaQGA8MGKUYhiLSGJEGcgIsMfQItYGIxlChg0BAAUSFYYtQ"))
\ No newline at end of file
diff --git a/apps/rings/app.js b/apps/rings/app.js
new file mode 100644
index 000000000..72485a763
--- /dev/null
+++ b/apps/rings/app.js
@@ -0,0 +1,270 @@
+// Rings watch face
+// for Bangle.js 2 
+// by Amos Blanton
+// Remixed from / inspired by Rinkulainen watch face by Jukio Kallio
+// 2023: pinq- added new futures
+
+// To Do:
+// Make Month / year text buffer 1/2 size
+// Optimize text positioning transforms 
+
+const watch = {
+  color:"#000000", 
+  dateRing : { size:109, weight:20, color:"#00FF00", numbers: false, range: 30 },
+  hourRing : { size:82, weight:20, color:"#00FFFF", numbers: false, range: 12},
+  minuteRing : { size:55, weight:18, color:"#FFFF00", numbers: false, range: 60},
+  batteryRing: { size :30, weight:10, color:"#ff3300", numbers: false, range: 100},
+  screen : { width:g.getWidth(), height:g.getHeight(), centerX: g.getWidth() *0.5, centerY: g.getHeight() * 0.5, cursor: 14, font:"Vector:18", bubble:false },
+};
+
+var settings = require('Storage').readJSON("rings.settings.json", true) || {};
+
+if(settings.minute){
+  watch.minuteRing.numbers = settings.minute.numbers;
+  watch.hourRing.numbers = settings.hour.numbers;
+  watch.dateRing.numbers = settings.date.numbers;
+  watch.screen.bubble = settings.bubble;
+}
+delete settings;
+const month= ["JANUARY","FEBRUARY","MARCH","APRIL","MAY","JUNE","JULY",
+            "AUGUST","SEPTEMBER","OCTOBER","NOVEMBER","DECEMBER"];
+
+var wait = 60000; // wait time, normally a minute
+// timeout used to update every minute
+var drawTimeout;
+// Global for use in shrink / unshrink animations
+var counter = 1;
+
+// Buffer for month circle text, 1/2 screen size (will be scaled up)
+var monthCircleTextBuffer= Graphics.createArrayBuffer(watch.screen.width,watch.screen.height,1,{msb:true});
+var monthCircleTextImg = monthCircleTextBuffer.asImage();
+monthCircleTextImg.transparent = 1;
+var lastMonthCircleImageText = "";
+
+// Calculate number of days in this month / year for date ring
+const getDays = (year, thisMonth) => {
+    return new Date(year, thisMonth, 0).getDate(); // getMonth() Jan = 0.
+};
+
+// Schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, wait - (Date.now() % wait));
+}
+
+// Draws a circles (date, hours, minutes)
+function drawCircle(ringValues, offset, value ) {  
+  // variables for vertex transformations and positioning time
+  let tver, tobj, tran;
+  let ttime = (value / ringValues.range) * (Math.PI * 2);
+
+  // draw circle
+  g.setColor(ringValues.color).fillCircle(watch.screen.centerX, watch.screen.centerY, ringValues.size + offset);
+  g.setColor("#000000").fillCircle(watch.screen.centerX, watch.screen.centerY, ringValues.size - ringValues.weight + offset);
+
+  tobj = { x:watch.screen.centerX, y:watch.screen.centerY, scale:1, rotate:ttime };
+  if(watch.screen.bubble){
+    tver = [-1, 0, 1, 0, 1, -ringValues.size-offset, -1, -(ringValues.size + offset -21)];
+    tran = g.transformVertices(tver, tobj);
+    if(ringValues.numbers){
+      g.setColor("#000000").fillCircle((tran[4]+tran[6]) / 2 , (tran[5]+tran[7]) / 2, 17 + offset/10);
+    }else{
+      g.setColor("#000000").fillCircle((tran[4]+tran[6]) / 2 , (tran[5]+tran[7]) / 2, 10 + offset/10);
+    }
+  }else{
+    if(ringValues.numbers){
+      tver = [-watch.screen.cursor, 0, watch.screen.cursor, 0, watch.screen.cursor, -ringValues.size*1.01 - offset, -watch.screen.cursor, -ringValues.size*1.05 - offset];
+    }else{
+      tver = [-watch.screen.cursor * 0.4, 0, watch.screen.cursor * 0.4, 0, watch.screen.cursor *0.4, -ringValues.size*1.01 - offset, -watch.screen.cursor*0.4, -ringValues.size*1.05 - offset];
+    }
+    tran = g.transformVertices(tver, tobj);
+    g.fillPoly(tran);
+  
+  }
+
+  // Draw numbers
+  if(ringValues.numbers){
+  // size - 21 is the right offset to get the numbers aligned in the circle.
+    tver = [-1, 0, 1, 0, 1, -ringValues.size-offset, -1, -(ringValues.size + offset -21)];
+    tran = g.transformVertices(tver, tobj);
+    //g.setColor(1,1,1);
+    g.setFontAlign(0,0).setFont(watch.screen.font, 2).setColor(1,1,1);
+    g.drawString(value, (tran[4]+tran[6]) / 2 , (tran[5]+tran[7]) / 2 );
+  
+  }
+  
+  
+}
+
+// For battery disable 
+function drawArc(percent, color, ArchR) {
+  let offset = 0;
+  let end = 360;
+  let radius = ArchR + 2;
+
+  if (percent <= 0) return; // no gauge needed
+  if (percent > 1) percent = 1;
+
+  let startRotation = -offset;
+  let endRotation = startRotation - (end * percent);
+
+  g.setColor(color);
+  // convert to radians
+  startRotation *= Math.PI / 180;
+  let amt = Math.PI / 10;
+  endRotation = (endRotation * Math.PI / 180) - amt;
+  // all we need to draw is an arc, because we'll fill the center
+  let poly = [watch.screen.centerX, watch.screen.centerY];
+  for (let r = startRotation; r > endRotation; r -= amt)
+    poly.push(
+      watch.screen.centerX - radius * Math.sin(r),
+      watch.screen.centerY - radius * Math.cos(r)
+    );
+  g.fillPoly(poly);
+  g.setColor("#000000").fillCircle(watch.screen.centerX, watch.screen.centerY, ArchR - 10);
+  g.setColor(color).fillCircle(watch.screen.centerX - (radius -5) * Math.sin(endRotation + amt),  watch.screen.centerY - (radius -5) * Math.cos(endRotation + amt), 4);
+}
+
+// Draws text for month and year in date circle
+function drawMonthCircleText( text, circleSize, range, value){
+
+  // If the text isn't the same as last time, write it into a graphic object.
+  if(text != lastMonthCircleImageText){
+
+    monthCircleTextBuffer.clear();
+    monthCircleTextBuffer.fillRect(0,0,watch.screen.width,watch.screen.height);
+    var tver, tobj, tran;
+    
+
+    // From here: https://forum.espruino.com/comments/16781795/
+    var gr = Graphics.createArrayBuffer(24,16,1,{msb:true});
+    var grimg = gr.asImage();
+    grimg.transparent = 1;  
+    monthCircleTextBuffer.setColor(1,1,1);
+
+    for(z=0; z < text.length; z++){
+      tobj = { x:watch.screen.centerX, y:watch.screen.centerY, scale:1, rotate: ((z + 1) / range) * (Math.PI * 2) };
+      tver = [-1, 0, 1, 0, 1, -circleSize, -1, -(circleSize -21)];
+      tran = monthCircleTextBuffer.transformVertices(tver, tobj);
+      gr.clear().setColor(1,1,1).fillRect(0,0,24,16).setColor(0,0,0).setFont(watch.screen.font).setFontAlign(0,0).drawString(text[z],12,8);
+
+      monthCircleTextBuffer.drawImage(grimg,
+      (tran[4]+tran[6]) / 2,
+      (tran[5]+tran[7]) / 2,
+                  {rotate:((z+1) / range) * (Math.PI * 2) });
+      }
+
+    lastMonthCircleImageText = text;
+    }
+  
+  // Determine correct rotation for text in ring ( opposite the date position )
+  var offset = value + (range / 2) - (text.length / 2);
+  if(offset > range)
+    offset = offset - range;  
+  var rotation = (offset / range) * (Math.PI * 2);     
+  
+  // Draw the image of text to the screen at that rotation
+  g.drawImage(monthCircleTextImg, watch.screen.centerX, watch.screen.centerY, {scale:1, rotate:rotation });
+
+}
+
+// Animate by shrinking or expanding circles 
+function shrinkCircles(toggle){   
+  // If there's a queued draw operation,removeit so animation isn't interrupted.
+  if (drawTimeout) clearTimeout(drawTimeout);
+  var date = new Date();
+  var delta = 1;
+  
+  if(counter > 12)    
+  {
+    counter = 1;
+    // We're finished, so queue next draw.
+    queueDraw();
+    if(!toggle) drawArc(E.getBattery() / 100, watch.batteryRing.color, watch.batteryRing.size);
+    return;
+  } 
+  
+  if(toggle) // We are shrinking
+     delta = counter * 2 * -1;
+  else // We are expanding
+    delta = counter *2 - 24;
+  
+  // Clear space on screen.
+  g.setColor(watch.color);
+  g.fillRect(0, 0, watch.screen.width, watch.screen.height);
+  
+  // Draw the date ring (unless it's the last run of an expansion).
+  if(counter < 11 || toggle){
+
+     drawCircle(watch.dateRing, delta, date.getDate()); 
+    // Draw month and year in date ring
+    drawMonthCircleText( date.getDate() + " " + month[date.getMonth()] + " " +date.getFullYear(), watch.dateRing.size - 24, getDays(date.getFullYear(), date.getMonth()+1), date.getDate()) ;
+  }
+  
+  drawCircle(watch.hourRing, delta, date.getHours()); 
+  drawCircle(watch.minuteRing, delta, date.getMinutes()); 
+  
+  counter += 1;
+  setTimeout(shrinkCircles, 10, toggle);
+}
+
+
+// main draw function
+function draw() {
+  // make date object
+  var date = new Date();
+  var unLockedOffset = 0;
+
+  // 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.screen.width, watch.screen.height);
+    
+  // If unlocked, draw date ring and text and make hour and minute rings smaller
+  var days_month = getDays(date.getFullYear(), date.getMonth()+1);
+  if(!Bangle.isLocked()){
+    unLockedOffset = 24;
+    // if the day has changed
+    if(watch.dateRing.range != days_month) watch.dateRing.range = days_month;
+    drawCircle(watch.dateRing, -unLockedOffset, date.getDate());
+    drawMonthCircleText( date.getDate() + " " + month[date.getMonth()] + " " + date.getFullYear(), watch.dateRing.size - 24, getDays(date.getFullYear(), date.getMonth()+1), date.getDate());
+  }
+  drawCircle(watch.hourRing, -unLockedOffset, date.getHours());
+  drawCircle(watch.minuteRing, -unLockedOffset, date.getMinutes());
+  if(Bangle.isLocked()){
+    drawArc(E.getBattery() / 100, watch.batteryRing.color, watch.batteryRing.size);
+  }
+  queueDraw();
+}
+
+//drawArc(E.getBattery() / 100, watch.batteryRing.color, watch.batteryRing.size); Trigger shrink / expand animation on unlock / lock events 
+Bangle.on('lock', on=>{
+  if (on) { // locked, expand circles
+      counter = 1;
+      shrinkCircles(false);
+    } else 
+    { // unlocked, shrink circles and show date ring
+      counter = 1;
+      shrinkCircles(true);
+    }
+});
+
+
+// End function definitions / start of initial execution.
+
+// Clear the screen once, at startup
+g.clear();
+
+// draw immediately at first
+draw();
+
+
+// .log("Whatevs");
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
\ No newline at end of file
diff --git a/apps/rings/app.png b/apps/rings/app.png
new file mode 100644
index 000000000..e4bfd6bac
Binary files /dev/null and b/apps/rings/app.png differ
diff --git a/apps/rings/metadata.json b/apps/rings/metadata.json
new file mode 100644
index 000000000..706ccbcda
--- /dev/null
+++ b/apps/rings/metadata.json
@@ -0,0 +1,36 @@
+{
+  "id": "rings",
+  "name": "Rings - an animated watchface",
+  "shortName": "Rings",
+  "version": "0.02",
+  "description": "Ring based watchface that animates to show the date when unlocked. Inspired by / remixed from Rinkulainen.",
+  "icon": "app.png",
+  "screenshots": [{
+    "url": "screenshot1.png"
+  }, {
+    "url": "screenshot2.png"
+  }, {
+    "url": "screenshot3.png"  
+  }],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [{
+      "name": "rings.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "rings.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    },
+    {
+      "name": "rings.settings.js",
+      "url": "settings.js"
+    }
+  ],
+  "data": [{
+    "name": "rings.settings.json"
+  }]
+}
diff --git a/apps/rings/screenshot1.png b/apps/rings/screenshot1.png
new file mode 100644
index 000000000..520a48363
Binary files /dev/null and b/apps/rings/screenshot1.png differ
diff --git a/apps/rings/screenshot2.png b/apps/rings/screenshot2.png
new file mode 100644
index 000000000..57973b76a
Binary files /dev/null and b/apps/rings/screenshot2.png differ
diff --git a/apps/rings/screenshot3.png b/apps/rings/screenshot3.png
new file mode 100644
index 000000000..09ecbeddf
Binary files /dev/null and b/apps/rings/screenshot3.png differ
diff --git a/apps/rings/settings.js b/apps/rings/settings.js
new file mode 100644
index 000000000..2b1abb476
--- /dev/null
+++ b/apps/rings/settings.js
@@ -0,0 +1,68 @@
+(function(back) {
+  var FILE = "rings.settings.json";
+  // Load settings
+  var settings = Object.assign({
+    minute: {
+      numbers: false,
+    },
+    hour: {
+      numbers: false
+    },
+    date: {
+      numbers: false,
+    },  
+    bubble: false,   
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings(key, value) {
+    settings[key] = value;
+    require("Storage").write("rings.settings.json",settings);
+  }
+  var mainmenu = {
+    "" : { "title" : "Rings" },
+    "< Back" : () => back(),
+    /*LANG*/"Minute" : () => E.showMenu({
+        "" : { "title" : /*LANG*/"Minute" },
+        "< Back" : ()=>E.showMenu(mainmenu),
+        /*LANG*/"Number" : {
+                  value: settings.minute.numbers,
+                  onchange: (m) => { 
+                    settings.minute.numbers = m,
+                    writeSettings(); 
+                    },
+                  }
+      }),    
+      /*LANG*/"Hour" : () => E.showMenu({
+        "" : { "title" : /*LANG*/"Hour" },
+        "< Back" : ()=>E.showMenu(mainmenu),
+        /*LANG*/"Number" : {
+                  value: settings.hour.numbers,
+                  onchange: (m) => { 
+                    settings.hour.numbers = m,
+                    writeSettings(); 
+                    },
+                  }
+      }),    
+      /*LANG*/"Date" : () => E.showMenu({
+        "" : { "title" : /*LANG*/"Date" },
+        "< Back" : ()=>E.showMenu(mainmenu),
+        /*LANG*/"Number" : {
+                  value: settings.date.numbers,
+                  onchange: (m) => { 
+                    settings.date.numbers = m,
+                    writeSettings(); 
+                    },
+                  }
+      }),
+      /*LANG*/"BG Bubble?" : {
+      value : settings.bubble,
+      onchange: (m) => {
+        settings.bubble = m;
+        writeSettings();
+      }
+    },      
+  }
+
+  // Show the menu
+  E.showMenu(mainmenu);
+})
\ No newline at end of file
diff --git a/apps/run/ChangeLog b/apps/run/ChangeLog
index 95945be78..ab2803ec6 100644
--- a/apps/run/ChangeLog
+++ b/apps/run/ChangeLog
@@ -13,3 +13,5 @@
 0.12: Fix for recorder not stopping at end of run. Bug introduced in 0.11
 0.13: Revert #1578 (stop duplicate entries) as with 2v12 menus it causes other boxes to be wiped (fix #1643)
 0.14: Fix Bangle.js 1 issue where after the 'overwrite track' menu, the start/stop button stopped working
+0.15: Keep run state between runs (allowing you to exit and restart the app)
+0.16: Added ability to resume a run that was stopped previously (fix #1907)
diff --git a/apps/run/app.js b/apps/run/app.js
index 4038b8c1a..507e8581a 100644
--- a/apps/run/app.js
+++ b/apps/run/app.js
@@ -41,10 +41,28 @@ var statIDs = [settings.B1,settings.B2,settings.B3,settings.B4,settings.B5,setti
 var exs = ExStats.getStats(statIDs, settings);
 // ---------------------------
 
+function setStatus(running) {
+  layout.button.label = running ? "STOP" : "START";
+  layout.status.label = running ? "RUN" : "STOP";
+  layout.status.bgCol = running ? "#0f0" : "#f00";
+  layout.render();
+}
+
 // Called to start/stop running
 function onStartStop() {
   var running = !exs.state.active;
-  var prepPromises = [];
+  var shouldResume = false;
+  var promise = Promise.resolve();
+
+  if (running && exs.state.duration > 10000) { // if more than 10 seconds of duration, ask if we should resume?
+    promise = promise.
+      then(() => {
+        isMenuDisplayed = true;
+        return E.showPrompt("Resume run?",{title:"Run"});
+      }).then(r => {
+        isMenuDisplayed=false;shouldResume=r;
+      });
+  }
 
   // start/stop recording
   // Do this first in case recorder needs to prompt for
@@ -52,38 +70,34 @@ function onStartStop() {
   if (settings.record && WIDGETS["recorder"]) {
     if (running) {
       isMenuDisplayed = true;
-      prepPromises.push(
-        WIDGETS["recorder"].setRecording(true).then(() => {
+      promise = promise.
+        then(() => WIDGETS["recorder"].setRecording(true, { force : shouldResume?"append":undefined })).
+        then(() => {
           isMenuDisplayed = false;
           layout.setUI(); // grab our input handling again
           layout.forgetLazyState();
           layout.render();
-        })
-      );
+        });
     } else {
-      prepPromises.push(
-        WIDGETS["recorder"].setRecording(false)
+      promise = promise.then(
+        () => WIDGETS["recorder"].setRecording(false)
       );
     }
   }
 
-  if (!prepPromises.length) // fix for Promise.all bug in 2v12
-    prepPromises.push(Promise.resolve());
-
-  Promise.all(prepPromises)
-    .then(() => {
-      if (running) {
+  promise = promise.then(() => {
+    if (running) {
+      if (shouldResume)
+        exs.resume()
+      else
         exs.start();
-      } else {
-        exs.stop();
-      }
-      layout.button.label = running ? "STOP" : "START";
-      layout.status.label = running ? "RUN" : "STOP";
-      layout.status.bgCol = running ? "#0f0" : "#f00";
-      // if stopping running, don't clear state
-      // so we can at least refer to what we've done
-      layout.render();
-    });
+    } else {
+      exs.stop();
+    }
+    // if stopping running, don't clear state
+    // so we can at least refer to what we've done
+    setStatus(running);
+  });
 }
 
 var lc = [];
@@ -105,13 +119,14 @@ for (var i=0;i<statIDs.length;i+=2) {
 lc.push({ type:"h", filly:1, c:[
   {type:"txt", font:fontHeading, label:"GPS", id:"gps", fillx:1, bgCol:"#f00" },
   {type:"txt", font:fontHeading, label:"00:00", id:"clock", fillx:1, bgCol:g.theme.fg, col:g.theme.bg },
-  {type:"txt", font:fontHeading, label:"STOP", id:"status", fillx:1 }
+  {type:"txt", font:fontHeading, label:"---", id:"status", fillx:1 }
 ]});
 // Now calculate the layout
 var layout = new Layout( {
   type:"v", c: lc
-},{lazy:true, btns:[{ label:"START", cb: onStartStop, id:"button"}]});
+},{lazy:true, btns:[{ label:"---", cb: onStartStop, id:"button"}]});
 delete lc;
+setStatus(exs.state.active);
 layout.render();
 
 function configureNotification(stat) {
diff --git a/apps/run/metadata.json b/apps/run/metadata.json
index 933576a5d..ed253a319 100644
--- a/apps/run/metadata.json
+++ b/apps/run/metadata.json
@@ -1,6 +1,6 @@
 { "id": "run",
   "name": "Run",
-  "version":"0.14",
+  "version":"0.16",
   "description": "Displays distance, time, steps, cadence, pace and more for runners.",
   "icon": "app.png",
   "tags": "run,running,fitness,outdoors,gps",
diff --git a/apps/runplus/ChangeLog b/apps/runplus/ChangeLog
new file mode 100644
index 000000000..05d24b96d
--- /dev/null
+++ b/apps/runplus/ChangeLog
@@ -0,0 +1,24 @@
+0.01: New App!
+0.02: Set pace format to mm:ss, time format to h:mm:ss,
+      added settings to opt out of GPS and HRM
+0.03: Fixed distance calculation, tested against Garmin Etrex, Amazfit GTS 2
+0.04: Use the exstats module, and make what is displayed configurable
+0.05: exstats updated so update 'distance' label is updated, option for 'speed'
+0.06: Add option to record a run using the recorder app automatically
+0.07: Fix crash if an odd number of active boxes are configured (fix #1473)
+0.08: Added support for notifications from exstats. Support all stats from exstats
+0.09: Fix broken start/stop if recording not enabled (fix #1561)
+0.10: Don't allow the same setting to be chosen for 2 boxes (fix #1578)
+0.11: Notifications fixes
+0.12: Fix for recorder not stopping at end of run. Bug introduced in 0.11
+0.13: Revert #1578 (stop duplicate entries) as with 2v12 menus it causes other boxes to be wiped (fix #1643)
+0.14: Fix Bangle.js 1 issue where after the 'overwrite track' menu, the start/stop button stopped working
+0.15: Keep run state between runs (allowing you to exit and restart the app)
+0.16: Added ability to resume a run that was stopped previously (fix #1907)
+0.17: Diverge from the standard "Run" app. Swipe to intensity interface a la Karvonen (curtesy of FTeacher at https://github.com/f-teacher)
+0.18: Don't clear zone 2b indicator segment when updating HRM reading.
+Write to correct settings file, fixing settings not working.
+0.19: Fix typo in variable name preventing starting a run
+0.20: Tweak HRM min/max defaults. Extend min/max intervals in settings. Fix
+	another typo.
+0.21: Rebase on "Run" app ver. 0.16.
diff --git a/apps/runplus/README.md b/apps/runplus/README.md
new file mode 100644
index 000000000..1776e1186
--- /dev/null
+++ b/apps/runplus/README.md
@@ -0,0 +1,81 @@
+# Run App
+
+Displays distance, time, steps, cadence, pace and heart rate for runners. Based on the Run app, but extended with additional screen for heart rate based training, based on the Karvonnen calculation method.
+It requires the input of your minimum and maximum heart rate in the settings for the app to work. You can come back back to the initial run screen anytime by swimping left.
+To use it, start the app and press the middle button so that the red STOP in the bottom right turns to a green `RUN`.
+
+## Display 1st screen
+
+* `DIST` - the distance travelled based on the GPS (if you have a GPS lock).
+  * NOTE: this is based on the GPS coordinates which are not 100% accurate, especially initially. As
+  the GPS updates your position as it gets more satellites your position changes and the distance
+  shown will increase, even if you are standing still.
+* `TIME` - the elapsed time for your run
+* `PACE` - the number of minutes it takes you to run a given distance, configured in settings (default 1km) **based on your run so far**
+* `HEART (BPM)` - Your current heart rate
+* `Max BPM` - Your maximum heart rate reached during the run
+* `STEPS` - Steps since you started exercising
+* `CADENCE` - Steps per second based on your step rate *over the last minute*
+* `GPS` - this is green if you have a GPS lock. GPS is turned on automatically
+so if you have no GPS lock you just need to wait.
+* The current time is displayed right at the bottom of the screen
+* `RUN/STOP` - whether the distance for your run is being displayed or not
+
+## Display 2nd screen
+
+Unlock the screen and navigate between displays by swiping left or right.
+The upper number is the limit before next heart rate zone. The lower number is the limit before previous heart rate zone. The number in the middle is the heart rate. The Z1 to Z5 number indicates the heart rate zone where you are. The circle provides a quick visualisation of the hr zone in which you are.
+
+## Recording Tracks
+
+When the `Recorder` app is installed, `Run` will automatically start and stop tracks
+as needed, prompting you to overwrite or begin a new track if necessary.
+
+## Settings
+
+Under `Settings` -> `App` -> `Run` you can change settings for this app.
+
+* `Record Run` (only displayed if `Recorder` app installed) should the Run app automatically
+record GPS/HRM/etc data every time you start a run?
+* `Pace` is the distance that pace should be shown over - 1km, 1 mile, 1/2 Marathon or 1 Marathon
+* `Boxes` leads to a submenu where you can configure what is shown in each of the 6 boxes on the display.
+ Available stats are "Time", "Distance", "Steps", "Heart (BPM)", "Max BPM", "Pace (avg)", "Pace (curr)", "Speed", and "Cadence".
+ Any box set to "-" will display no information.
+    * Box 1 is the top left (defaults to "Distance")
+    * Box 2 is the top right (defaults to "Time")
+    * Box 3 is the middle left (defaults to "Pace (avg)")
+    * Box 4 is the middle right (defaults to "Heart (BPM)")
+    * Box 5 is the bottom left (defaults to "Steps")
+    * Box 6 is the bottom right (defaults to "Cadence")
+* `Notifications` leads to a submenu where you can configure if the app will notify you after
+your distance, steps, or time repeatedly pass your configured thresholds
+    * `Ntfy Dist`: The distance that you must pass before you are notified. Follows the `Pace` options
+        * "Off" (default), "1km", "1 mile", "1/2 Marathon", "1 Marathon"
+    * `Ntfy Steps`: The number of steps that must pass before you are notified.
+        * "Off" (default), 100, 500, 1000, 5000, 10000
+    * `Ntfy Time`: The amount of time that must pass before you are notified.
+        * "Off" (default), "30 sec", "1 min", "2 min", "5 min", "10 min", "30 min", "1 hour"
+    * `Dist Pattern`: The vibration pattern to use to notify you about meeting your distance threshold
+    * `Step Pattern`: The vibration pattern to use to notify you about meeting your step threshold
+    * `Time Pattern`: The vibration pattern to use to notify you about meeting your time threshold
+    * `min hr`: Input your minimum heart rate (measure it as you wake up, prior to any movement)
+    * `max hr`: Input your maximum heart rate
+
+## TODO
+
+* Keep a log of each run's stats (distance/steps/time in each hr zone/etc)
+
+## Development
+
+This app uses the [`exstats` module](https://github.com/espruino/BangleApps/blob/master/modules/exstats.js). When uploaded via the
+app loader, the module is automatically included in the app's source. However
+when developing via the IDE the module won't get pulled in by default.
+
+There are some options to fix this easily - please check out the [modules README.md file](https://github.com/espruino/BangleApps/blob/master/modules/README.md)
+## Contributors (Run and Run+)
+gfwilliams
+hughbarney
+GrandVizierOlaf
+BartS23
+f-teacher
+thyttan
diff --git a/apps/runplus/app-icon.js b/apps/runplus/app-icon.js
new file mode 100644
index 000000000..a97d1b8ce
--- /dev/null
+++ b/apps/runplus/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4UA///pH9vEFt9TIW0FqALJitUBZNVqoLqgo4BHZAUBtBTHgILB1XAEREV1WsEQ9AgWq1ALHgEO1WtBYxCBhWq0pdInWq2tABY8q1WVBZGq1XFBZS/IKQRvCDIsP9WsBZP60CTCBYs//+wLxALBTQ4AB///+AKHgYLB/gLK/4LHh//AIIwFitVr/8DIIwFLANXBAILIqogBn7DBEYrXBeQRgIBYKmHDgYLLZRBACBZYKJZIILKKRZeWgJGKAFQA=="))
diff --git a/apps/runplus/app.js b/apps/runplus/app.js
new file mode 100644
index 000000000..41fab7ae2
--- /dev/null
+++ b/apps/runplus/app.js
@@ -0,0 +1,209 @@
+// Use widget utils to show/hide widgets
+let wu = require("widget_utils");
+
+let runInterval;
+let karvonenActive = false;
+// Run interface wrapped in a function
+let ExStats = require("exstats");
+let B2 = process.env.HWVERSION===2;
+let Layout = require("Layout");
+let locale = require("locale");
+let fontHeading = "6x8:2";
+let fontValue = B2 ? "6x15:2" : "6x8:3";
+let headingCol = "#888";
+let fixCount = 0;
+let isMenuDisplayed = false;
+
+g.reset().clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+wu.show();
+
+// ---------------------------
+let settings = Object.assign({
+  record: true,
+  B1: "dist",
+  B2: "time",
+  B3: "pacea",
+  B4: "bpm",
+  B5: "step",
+  B6: "caden",
+  paceLength: 1000,
+  notify: {
+    dist: {
+      value: 0,
+      notifications: [],
+    },
+    step: {
+      value: 0,
+      notifications: [],
+    },
+    time: {
+      value: 0,
+      notifications: [],
+    },
+  },
+  HRM: {
+    min: 55,
+    max: 185,
+  },
+}, require("Storage").readJSON("runplus.json", 1) || {});
+let statIDs = [settings.B1,settings.B2,settings.B3,settings.B4,settings.B5,settings.B6].filter(s=>s!=="");
+let exs = ExStats.getStats(statIDs, settings);
+// ---------------------------
+
+function setStatus(running) {
+  layout.button.label = running ? "STOP" : "START";
+  layout.status.label = running ? "RUN" : "STOP";
+  layout.status.bgCol = running ? "#0f0" : "#f00";
+  layout.render();
+}
+
+// Called to start/stop running
+function onStartStop() {
+  var running = !exs.state.active;
+  var shouldResume = false;
+  var promise = Promise.resolve();
+
+  if (running && exs.state.duration > 10000) { // if more than 10 seconds of duration, ask if we should resume?
+    promise = promise.
+      then(() => {
+        isMenuDisplayed = true;
+        return E.showPrompt("Resume run?",{title:"Run"});
+      }).then(r => {
+        isMenuDisplayed=false;shouldResume=r;
+      });
+  }
+
+  // start/stop recording
+  // Do this first in case recorder needs to prompt for
+  // an overwrite before we start tracking exstats
+  if (settings.record && WIDGETS["recorder"]) {
+    if (running) {
+      isMenuDisplayed = true;
+      promise = promise.
+        then(() => WIDGETS["recorder"].setRecording(true, { force : shouldResume?"append":undefined })).
+        then(() => {
+          isMenuDisplayed = false;
+          layout.setUI(); // grab our input handling again
+          layout.forgetLazyState();
+          layout.render();
+        });
+    } else {
+      promise = promise.then(
+        () => WIDGETS["recorder"].setRecording(false)
+      );
+    }
+  }
+
+  promise = promise.then(() => {
+    if (running) {
+      if (shouldResume)
+        exs.resume()
+      else
+        exs.start();
+    } else {
+      exs.stop();
+    }
+    // if stopping running, don't clear state
+    // so we can at least refer to what we've done
+    setStatus(running);
+  });
+}
+
+let lc = [];
+// Load stats in pair by pair
+for (let i=0;i<statIDs.length;i+=2) {
+  let sa = exs.stats[statIDs[i+0]];
+  let sb = exs.stats[statIDs[i+1]];
+  lc.push({ type:"h", filly:1, c:[
+    sa?{type:"txt", font:fontHeading, label:sa.title.toUpperCase(), fillx:1, col:headingCol }:{},
+    sb?{type:"txt", font:fontHeading, label:sb.title.toUpperCase(), fillx:1, col:headingCol }:{}
+  ]}, { type:"h", filly:1, c:[
+    sa?{type:"txt", font:fontValue, label:sa.getString(), id:sa.id, fillx:1 }:{},
+    sb?{type:"txt", font:fontValue, label:sb.getString(), id:sb.id, fillx:1 }:{}
+  ]});
+  if (sa) sa.on('changed', e=>layout[e.id].label = e.getString());
+  if (sb) sb.on('changed', e=>layout[e.id].label = e.getString());
+}
+// At the bottom put time/GPS state/etc
+lc.push({ type:"h", filly:1, c:[
+  {type:"txt", font:fontHeading, label:"GPS", id:"gps", fillx:1, bgCol:"#f00" },
+  {type:"txt", font:fontHeading, label:"00:00", id:"clock", fillx:1, bgCol:g.theme.fg, col:g.theme.bg },
+  {type:"txt", font:fontHeading, label:"---", id:"status", fillx:1 }
+]});
+// Now calculate the layout
+let layout = new Layout( {
+  type:"v", c: lc
+},{lazy:true, btns:[{ label:"---", cb: (()=>{if (karvonenActive) {stopKarvonenUI();run();} onStartStop();}), id:"button"}]});
+delete lc;
+setStatus(exs.state.active);
+layout.render();
+
+function configureNotification(stat) {
+  stat.on('notify', (e)=>{
+    settings.notify[e.id].notifications.reduce(function (promise, buzzPattern) {
+      return promise.then(function () {
+        return Bangle.buzz(buzzPattern[0], buzzPattern[1]);
+      });
+    }, Promise.resolve());
+  });
+}
+
+Object.keys(settings.notify).forEach((statType) => {
+  if (settings.notify[statType].increment > 0 && exs.stats[statType]) {
+    configureNotification(exs.stats[statType]);
+  }
+});
+
+// Handle GPS state change for icon
+Bangle.on("GPS", function(fix) {
+  layout.gps.bgCol = fix.fix ? "#0f0" : "#f00";
+  if (!fix.fix) return; // only process actual fixes
+  if (fixCount++ === 0) {
+    Bangle.buzz(); // first fix, does not need to respect quiet mode
+  }
+});
+
+// run() function used to switch between traditional run UI and karvonen UI
+function run() {
+  wu.show();
+  layout.lazy = false;
+  layout.render();
+  layout.lazy = true;
+  // We always call ourselves once a second to update
+  if (!runInterval){
+    runInterval = setInterval(function() {
+      layout.clock.label = locale.time(new Date(),1);
+      if (!isMenuDisplayed && !karvonenActive) layout.render();
+    }, 1000);
+  }
+}
+run();
+
+///////////////////////////////////////////////
+//                Karvonen
+///////////////////////////////////////////////
+
+function stopRunUI() {
+  // stop updating and drawing the traditional run app UI
+  clearInterval(runInterval);
+  runInterval = undefined;
+  karvonenActive = true;
+}
+
+function stopKarvonenUI() {
+  g.reset().clear();
+  clearInterval(karvonenInterval);
+  karvonenInterval = undefined;
+  karvonenActive = false;
+}
+
+let karvonenInterval;
+// Define the function to go back and forth between the different UI's
+function swipeHandler(LR,_) {
+  if (LR==-1 && karvonenActive && !isMenuDisplayed) {stopKarvonenUI(); run();}
+  if (LR==1 && !karvonenActive && !isMenuDisplayed) {stopRunUI(); karvonenInterval = eval(require("Storage").read("runplus_karvonen"))(settings.HRM, exs.stats.bpm);}
+}
+// Listen for swipes with the swipeHandler
+Bangle.on("swipe", swipeHandler);
diff --git a/apps/runplus/app.png b/apps/runplus/app.png
new file mode 100644
index 000000000..7059b8b01
Binary files /dev/null and b/apps/runplus/app.png differ
diff --git a/apps/runplus/karvonen.js b/apps/runplus/karvonen.js
new file mode 100644
index 000000000..de81494bb
--- /dev/null
+++ b/apps/runplus/karvonen.js
@@ -0,0 +1,215 @@
+(function karvonen(hrmSettings, exsHrmStats) {
+  //This app is an extra feature implementation for the Run.app of the bangle.js. It's called run+
+  //The calculation of the Heart Rate Zones is based on the Karvonen method. It requires to know maximum and minimum heart rates. More precise calculation methods require a lab.
+  //Other methods are even more approximative.
+  let wu = require("widget_utils");
+  wu.hide();
+  let R = Bangle.appRect;
+
+  
+  g.reset().clearRect(R).setFontAlign(0,0,0);
+    
+  const x = "x"; const y = "y";
+  function Rdiv(axis, divisor) { // Used when placing things on the screen
+    return axis=="x" ? (R.x + (R.w-1)/divisor):(R.y + (R.h-1)/divisor);
+  }
+  let linePoints = { //Not lists of points, but used to update points in the drawArrows function.
+    x: [
+  175/40,
+  2,
+  175/135,
+    ],
+    y: [
+  175/64,
+  175/52,
+  175/110,
+  175/122,
+    ],
+  
+  };
+  
+  function drawArrows() {
+    g.setColor(g.theme.fg);
+    // Upper
+    g.drawLine(Rdiv(x,linePoints.x[0]), Rdiv(y,linePoints.y[0]), Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[1]));
+    g.drawLine(Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[1]), Rdiv(x,linePoints.x[2]), Rdiv(y,linePoints.y[0]));
+    // Lower
+    g.drawLine(Rdiv(x,linePoints.x[0]), Rdiv(y,linePoints.y[2]), Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[3]));
+    g.drawLine(Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[3]), Rdiv(x,linePoints.x[2]), Rdiv(y,linePoints.y[2]));
+  }
+  
+  //To calculate Heart rate zones, we need to know the heart rate reserve (HRR)
+  // HRR = maximum HR - Minimum HR. minhr is minimum hr, maxhr is maximum hr.
+  //get the hrr (heart rate reserve).
+  // I put random data here, but this has to come as a menu in the settings section so that users can change it.
+  let minhr = hrmSettings.min;
+  let maxhr = hrmSettings.max;
+  
+  function calculatehrr(minhr, maxhr) {
+    return maxhr - minhr;}
+  
+  //test input for hrr (it works).
+  let hrr = calculatehrr(minhr, maxhr);
+  console.log(hrr);
+  
+  //Test input to verify the zones work. The following value for "hr" has to be deleted and replaced with the Heart Rate Monitor input.
+  let hr = exsHrmStats.getValue();
+  let hr1 = hr;
+  // These letiables display next and previous HR zone.
+  //get the hrzones right. The calculation of the Heart rate zones here is based on the Karvonen method
+  //60-70% of HRR+minHR = zone2. //70-80% of HRR+minHR = zone3. //80-90% of HRR+minHR = zone4. //90-99% of HRR+minHR = zone5. //=>99% of HRR+minHR = serious risk of heart attack
+  let minzone2 = hrr * 0.6 + minhr;
+  let maxzone2 = hrr * 0.7 + minhr;
+  let maxzone3 = hrr * 0.8 + minhr;
+  let maxzone4 = hrr * 0.9 + minhr;
+  let maxzone5 = hrr * 0.99 + minhr;
+
+  // HR data: large, readable, in the middle of the screen
+  function drawHR() {
+    g.setFontAlign(-1,0,0);
+    g.clearRect(Rdiv(x,11/4),Rdiv(y,2)-25,Rdiv(x,11/4)+50*2-14,Rdiv(y,2)+25);
+    g.setColor(g.theme.fg);
+    g.setFont("Vector",50);
+    g.drawString(hr, Rdiv(x,11/4), Rdiv(y,2)+4);
+  }
+
+  function drawWaitHR() {
+    g.setColor(g.theme.fg);
+    // Waiting for HRM
+    g.setFontAlign(0,0,0);
+    g.setFont("Vector",50);
+    g.drawString("--", Rdiv(x,2)+4, Rdiv(y,2)+4);
+
+    // Waiting for current Zone
+    g.setFont("Vector",24);
+    g.drawString("Z-", Rdiv(x,4.3)-3, Rdiv(y,2)+2);
+
+    // waiting for upper and lower limit of current zone
+    g.setFont("Vector",20);
+    g.drawString("--", Rdiv(x,2)+2, Rdiv(y,9/2));
+    g.drawString("--", Rdiv(x,2)+2, Rdiv(y,9/7));
+  }
+  
+  //These functions call arcs to show different HR zones.
+  
+  //To shorten the code, I'll reference some letiables and reuse them.
+  let centreX = R.x + 0.5 * R.w;
+  let centreY = R.y + 0.5 * R.h;
+  let minRadius = 0.38 * R.h;
+  let maxRadius = 0.50 * R.h;
+  
+  //draw background image (dithered green zones)(I should draw different zones in different dithered colors)
+  const HRzones= require("graphics_utils");
+  let minRadiusz = 0.44 * R.h;
+  let startAngle = HRzones.degreesToRadians(-88.5);
+  let endAngle = HRzones.degreesToRadians(268.5);
+
+  function drawBgArc() {
+    g.setColor(g.theme.dark==false?0xC618:"#002200");
+    HRzones.fillArc(g, centreX, centreY, minRadiusz, maxRadius, startAngle, endAngle);
+  }
+  
+  const zones = require("graphics_utils");
+  //####### A function to simplify a bit the code ######
+  function simplify (sA, eA, Z, currentZone, lastZone) {
+    let startAngle = zones.degreesToRadians(sA);
+    let endAngle = zones.degreesToRadians(eA);
+    if (currentZone == lastZone) zones.fillArc(g, centreX, centreY, minRadius, maxRadius, startAngle, endAngle);
+    else zones.fillArc(g, centreX, centreY, minRadiusz, maxRadius, startAngle, endAngle);
+    g.setFont("Vector",24);
+    g.clearRect(Rdiv(x,4.3)-12, Rdiv(y,2)+2-12,Rdiv(x,4.3)+12, Rdiv(y,2)+2+12);
+    g.setFontAlign(0,0,0);
+    g.drawString(Z, Rdiv(x,4.3), Rdiv(y,2)+2);
+  }
+
+  function zoning (max, min) { // draw values of upper and lower limit of current zone
+    g.setFont("Vector",20);
+    g.setColor(g.theme.fg);
+    g.clearRect(Rdiv(x,2)-20*2, Rdiv(y,9/2)-10,Rdiv(x,2)+20*2, Rdiv(y,9/2)+10);
+    g.clearRect(Rdiv(x,2)-20*2, Rdiv(y,9/7)-10,Rdiv(x,2)+20*2, Rdiv(y,9/7)+10);
+    g.setFontAlign(0,0,0);
+    g.drawString(max, Rdiv(x,2), Rdiv(y,9/2));
+    g.drawString(min, Rdiv(x,2), Rdiv(y,9/7));
+  }
+
+  function clearCurrentZone() { // Clears the extension of the current zone by painting the extension area in background color
+    g.setColor(g.theme.bg);
+    HRzones.fillArc(g, centreX, centreY, minRadius-1, minRadiusz, startAngle, endAngle);
+  }
+  
+  function getZone(zone) {
+    drawBgArc();
+    clearCurrentZone();
+    if (zone >= 0)  {zoning(minzone2, minhr);g.setColor("#00ffff");simplify(-88.5, -45, "Z1", 0, zone);}
+    if (zone >= 1)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(-43.5, -21.5, "Z2", 1, zone);}
+    if (zone >= 2)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(-20, 1.5, "Z2", 2, zone);}
+    if (zone >= 3)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(3, 24, "Z2", 3, zone);}
+    if (zone >= 4)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(25.5, 46.5, "Z3", 4, zone);}
+    if (zone >= 5)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(48, 69, "Z3", 5, zone);}
+    if (zone >= 6)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(70.5, 91.5, "Z3", 6, zone);}
+    if (zone >= 7)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(93, 114.5, "Z4", 7, zone);}
+    if (zone >= 8)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(116, 137.5, "Z4", 8, zone);}
+    if (zone >= 9)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(139, 160, "Z4", 9, zone);}
+    if (zone >= 10) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(161.5, 182.5, "Z5", 10, zone);}
+    if (zone >= 11) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(184, 205, "Z5", 11, zone);}
+    if (zone == 12) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(206.5, 227.5, "Z5", 12, zone);}
+   }
+
+  function getZoneAlert() {
+   const HRzonemax = require("graphics_utils");
+   let centreX1,centreY1,maxRadius1 = 1;
+   let minRadius = 0.40 * R.h;
+   let startAngle1 = HRzonemax.degreesToRadians(-90);
+   let endAngle1 = HRzonemax.degreesToRadians(270);
+   g.setFont("Vector",38);g.setColor("#ff0000");
+   HRzonemax.fillArc(g, centreX, centreY, minRadius, maxRadius, startAngle1, endAngle1);
+   g.drawString("ALERT", 26,66);
+  }
+  
+  //Subdivided zones for better readability of zones when calling the images. //Changing HR zones will trigger the function with the image and previous&next HR zones.
+  let subZoneLast;
+  function drawZones() {
+    if ((hr < maxhr - 2) && subZoneLast==13) {g.clear(); drawArrows(); drawHR();} // Reset UI when coming down from zone alert.
+    if (hr <= hrr * 0.6 + minhr) {if (subZoneLast!=0) {subZoneLast=0; getZone(subZoneLast);}} // Z1
+    else if (hr <= hrr * 0.64 + minhr) {if (subZoneLast!=1) {subZoneLast=1; getZone(subZoneLast);}} // Z2a
+    else if (hr <= hrr * 0.67 + minhr) {if (subZoneLast!=2) {subZoneLast=2; getZone(subZoneLast);}} // Z2b
+    else if (hr <= hrr * 0.70 + minhr) {if (subZoneLast!=3) {subZoneLast=3; getZone(subZoneLast);}} // Z2c
+    else if (hr <= hrr * 0.74 + minhr) {if (subZoneLast!=4) {subZoneLast=4; getZone(subZoneLast);}} // Z3a
+    else if (hr <= hrr * 0.77 + minhr) {if (subZoneLast!=5) {subZoneLast=5; getZone(subZoneLast);}} // Z3b
+    else if (hr <= hrr * 0.80 + minhr) {if (subZoneLast!=6) {subZoneLast=6; getZone(subZoneLast);}} // Z3c
+    else if (hr <= hrr * 0.84 + minhr) {if (subZoneLast!=7) {subZoneLast=7; getZone(subZoneLast);}} // Z4a
+    else if (hr <= hrr * 0.87 + minhr) {if (subZoneLast!=8) {subZoneLast=8; getZone(subZoneLast);}} // Z4b
+    else if (hr <= hrr * 0.90 + minhr) {if (subZoneLast!=9) {subZoneLast=9; getZone(subZoneLast);}} // Z4c
+    else if (hr <= hrr * 0.94 + minhr) {if (subZoneLast!=10) {subZoneLast=10; getZone(subZoneLast);}} // Z5a
+    else if (hr <= hrr * 0.96 + minhr) {if (subZoneLast!=11) {subZoneLast=11; getZone(subZoneLast);}} // Z5b
+    else if (hr <= hrr * 0.98 + minhr) {if (subZoneLast!=12) {subZoneLast=12; getZone(subZoneLast);}} // Z5c
+    else if (hr >= maxhr - 2) {subZoneLast=13; g.clear();getZoneAlert();} // Alert
+  }
+  
+  function initDraw() {
+    drawArrows();
+    if (hr!=0) updateUI(true); else {drawWaitHR(); drawBgArc();}
+    //drawZones();
+  }
+
+  let hrLast;
+  //h = 0; // Used to force hr update via web ui console field to trigger draws, together with `if (h!=0) hr = h;` below.
+  function updateUI(resetHrLast) { // Update UI, only draw if warranted by change in HR.
+    hrLast = resetHrLast?0:hr; // Handles correct updating on init depending on if we've got HRM readings yet or not.
+    hr = exsHrmStats.getValue();
+    //if (h!=0) hr = h;
+    if (hr!=hrLast) {
+      drawHR();
+      drawZones();
+    } //g.setColor(g.theme.fg).drawLine(175/2,0,175/2,175).drawLine(0,175/2,175,175/2); // Used to align UI elements.
+  }
+  
+  initDraw();
+
+  // check for updates every second.
+  karvonenInterval = setInterval(function() {
+    if (!isMenuDisplayed && karvonenActive) updateUI();
+  }, 1000);
+
+  return karvonenInterval;
+})
diff --git a/apps/runplus/metadata.json b/apps/runplus/metadata.json
new file mode 100644
index 000000000..40256e595
--- /dev/null
+++ b/apps/runplus/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "runplus",
+  "name": "Run+",
+  "version": "0.21",
+  "description": "Displays distance, time, steps, cadence, pace and more for runners. Based on the Run app, but extended with additional screen for heart rate interval training.",
+  "icon": "app.png",
+  "tags": "run,running,fitness,outdoors,gps,karvonen,karvonnen",
+  "supports": ["BANGLEJS2"],
+  "screenshots": [{"url": "screenshot.png"}],
+  "readme": "README.md",
+  "storage": [
+    {"name": "runplus.app.js", "url": "app.js"},
+    {"name": "runplus.img", "url": "app-icon.js", "evaluate": true},
+    {"name": "runplus.settings.js", "url": "settings.js"},
+    {"name": "runplus_karvonen", "url": "karvonen.js"}
+  ],
+  "data": [
+    {"name": "runplus.json"}
+  ]
+}
diff --git a/apps/runplus/screenshot.png b/apps/runplus/screenshot.png
new file mode 100644
index 000000000..1a813f19d
Binary files /dev/null and b/apps/runplus/screenshot.png differ
diff --git a/apps/runplus/settings.js b/apps/runplus/settings.js
new file mode 100644
index 000000000..539391a27
--- /dev/null
+++ b/apps/runplus/settings.js
@@ -0,0 +1,157 @@
+(function(back) {
+  const SETTINGS_FILE = "runplus.json";
+  var ExStats = require("exstats");
+  var statsList = ExStats.getList();
+  statsList.unshift({name:"-",id:""}); // add blank menu item
+  var statsIDs = statsList.map(s=>s.id);
+
+  // ...and overwrite them with any saved values
+  // This way saved values are preserved if a new version adds more settings
+  const storage = require('Storage')
+  let settings = Object.assign({
+    record: true,
+    B1: "dist",
+    B2: "time",
+    B3: "pacea",
+    B4: "bpm",
+    B5: "step",
+    B6: "caden",
+    paceLength: 1000, // TODO: Default to either 1km or 1mi based on locale
+    notify: {
+      dist: {
+        increment: 0,
+        notifications: [],
+      },
+      step: {
+        increment: 0,
+        notifications: [],
+      },
+      time: {
+        increment: 0,
+        notifications: [],
+      },
+    },
+    HRM: {
+      min: 55,
+      max: 185,
+    },
+  }, storage.readJSON(SETTINGS_FILE, 1) || {});
+  function saveSettings() {
+    storage.write(SETTINGS_FILE, settings)
+  }
+
+  function getBoxChooser(boxID) {
+    return {
+      min: 0, max: statsIDs.length-1,
+      value: Math.max(statsIDs.indexOf(settings[boxID]),0),
+      format: v => statsList[v].name,
+      onchange: v => {
+        settings[boxID] = statsIDs[v];
+        saveSettings();
+      },
+    }
+  }
+
+  function sampleBuzz(buzzPatterns) {
+    return buzzPatterns.reduce(function (promise, buzzPattern) {
+        return promise.then(function () {
+            return Bangle.buzz(buzzPattern[0], buzzPattern[1]);
+        });
+    }, Promise.resolve());
+  }
+
+  var menu = {
+    '': { 'title': 'Run' },
+    '< Back': back,
+  };
+  if (global.WIDGETS&&WIDGETS["recorder"])
+    menu[/*LANG*/"Record Run"] = {
+      value : !!settings.record,
+      onchange : v => {
+        settings.record = v;
+        saveSettings();
+      }
+    };
+  var notificationsMenu = {
+    '< Back': function() { E.showMenu(menu) },
+  }
+  menu[/*LANG*/"Notifications"] = function() { E.showMenu(notificationsMenu)};
+  ExStats.appendMenuItems(menu, settings, saveSettings);
+  ExStats.appendNotifyMenuItems(notificationsMenu, settings, saveSettings);
+  var vibPatterns = [/*LANG*/"Off", ".", "-", "--", "-.-", "---"];
+  var vibTimes = [
+    [],
+    [[100, 1]],
+    [[300, 1]],
+    [[300, 1], [300, 0], [300, 1]],
+    [[300, 1],[300, 0], [100, 1], [300, 0], [300, 1]],
+    [[300, 1],[300, 0],[300, 1],[300, 0],[300, 1]],
+  ];
+  notificationsMenu[/*LANG*/"Dist Pattern"] = {
+    value: Math.max(0,vibTimes.findIndex((p) => JSON.stringify(p) === JSON.stringify(settings.notify.dist.notifications))),
+      min: 0, max: vibTimes.length - 1,
+      format: v => vibPatterns[v]||/*LANG*/"Off",
+      onchange: v => {
+        settings.notify.dist.notifications = vibTimes[v];
+        sampleBuzz(vibTimes[v]);
+        saveSettings();
+      }
+  }
+  notificationsMenu[/*LANG*/"Step Pattern"] = {
+    value: Math.max(0,vibTimes.findIndex((p) => JSON.stringify(p) === JSON.stringify(settings.notify.step.notifications))),
+      min: 0, max: vibTimes.length - 1,
+      format: v => vibPatterns[v]||/*LANG*/"Off",
+      onchange: v => {
+        settings.notify.step.notifications = vibTimes[v];
+        sampleBuzz(vibTimes[v]);
+        saveSettings();
+      }
+  }
+  notificationsMenu[/*LANG*/"Time Pattern"] = {
+    value: Math.max(0,vibTimes.findIndex((p) => JSON.stringify(p) === JSON.stringify(settings.notify.time.notifications))),
+      min: 0, max: vibTimes.length - 1,
+      format: v => vibPatterns[v]||/*LANG*/"Off",
+      onchange: v => {
+        settings.notify.time.notifications = vibTimes[v];
+        sampleBuzz(vibTimes[v]);
+        saveSettings();
+      }
+  }
+  var boxMenu = {
+    '< Back': function() { E.showMenu(menu) },
+  }
+  Object.assign(boxMenu,{
+    'Box 1': getBoxChooser("B1"),
+    'Box 2': getBoxChooser("B2"),
+    'Box 3': getBoxChooser("B3"),
+    'Box 4': getBoxChooser("B4"),
+    'Box 5': getBoxChooser("B5"),
+    'Box 6': getBoxChooser("B6"),
+  });
+  menu[/*LANG*/"Boxes"] = function() { E.showMenu(boxMenu)};
+
+  var hrmMenu = {
+    '< Back': function() { E.showMenu(menu) },
+  }
+
+  menu[/*LANG*/"HRM min/max"] = function() { E.showMenu(hrmMenu)};
+  hrmMenu[/*LANG*/"min"] = {
+    min: 1, max: 100,
+    value: settings.HRM.min,
+    format: w => w,
+    onchange: w => {
+      settings.HRM.min = w;
+      saveSettings();
+    },
+  }
+  hrmMenu[/*LANG*/"max"] = {
+    min: 101, max: 220,
+    value: settings.HRM.max,
+    format: v => v,
+    onchange: v => {
+      settings.HRM.max = v;
+      saveSettings();
+    },
+  }
+  E.showMenu(menu);
+})
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
index 634250d48..92b04fb32 100644
--- a/apps/sched/ChangeLog
+++ b/apps/sched/ChangeLog
@@ -22,3 +22,4 @@
 0.19: Update clock_info to refresh periodically on active alarms/timers
 0.20: Alarm dismiss and snooze events
 0.21: Fix crash in clock_info
+0.22: Dated event repeat option
diff --git a/apps/sched/README.md b/apps/sched/README.md
index c874b5577..2fb201cee 100644
--- a/apps/sched/README.md
+++ b/apps/sched/README.md
@@ -45,7 +45,9 @@ Alarms are stored in an array in `sched.json`, and take the form:
                        // eg (new Date()).toISOString().substr(0,10)
   msg : "Eat food",    // message to display.
   last : 0,            // last day of the month we alarmed on - so we don't alarm twice in one day! (No change from 0 on timers)
-  rp : true,           // repeat the alarm every day?
+  rp : true,           // repeat the alarm every day? If date is given, pass an object instead of a boolean,
+                       // e.g. repeat every 2 months: { interval: "month", num: 2 }.
+                       // Supported intervals: day, week, month, year
   vibrate : "...",     // OPTIONAL pattern of '.', '-' and ' ' to use for when buzzing out this alarm (defaults to '..' if not set)
   hidden : false,      // OPTIONAL if false, the widget should not show an icon for this alarm
   as : false,          // auto snooze
diff --git a/apps/sched/interface.html b/apps/sched/interface.html
new file mode 100644
index 000000000..b67029fa2
--- /dev/null
+++ b/apps/sched/interface.html
@@ -0,0 +1,349 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <script src="../../core/lib/interface.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ical.js/1.5.0/ical.min.js"></script>
+    <script>
+let dataElement = document.getElementById("data");
+let alarms;
+let schedSettings;
+
+function readFile(input) {
+  document.getElementById('upload').disabled = true;
+  const offsetMinutes = document.getElementById("offsetMinutes").value;
+
+  for(let i=0; i<input.files.length; i++) {
+    const reader = new FileReader();
+    reader.addEventListener("load", () => {
+      const jCalData = ICAL.parse(reader.result);
+      const comp = new ICAL.Component(jCalData);
+      // Fetch the VEVENT part
+      comp.getAllSubcomponents('vevent').forEach(vevent => {
+        event = new ICAL.Event(vevent);
+        const exists = alarms.some(alarm => alarm.id === event.uid);
+
+        const alarm = eventToAlarm(event, offsetMinutes*60*1000);
+        renderAlarm(alarm, exists);
+
+        if (exists) {
+          alarms = alarms.filter(alarm => alarm.id !== event.uid); // remove if already exists
+          const tr = document.querySelector(`.event-row[data-uid='${event.uid}']`);
+          document.getElementById('events').removeChild(tr);
+        }
+        alarms.push(alarm);
+      });
+    }, false);
+
+    reader.readAsText(input.files[i], "UTF-8");
+  }
+}
+
+function dateToMsSinceMidnight(date) {
+  const dateMidnight = new Date(date);
+  dateMidnight.setHours(0,0,0,0);
+  return date - dateMidnight;
+}
+
+function dateFromAlarm(alarm) {
+  const date = new Date(alarm.date);
+  return new Date(date.getTime() + alarm.t);
+}
+
+function formatDate(d) {
+  return d.getFullYear() + "-" + (d.getMonth() + 1).toString().padStart(2, '0') + "-" + d.getDate().toString().padStart(2, '0');
+}
+
+function getAlarmDefaults() {
+  const date = new Date();
+  return {
+    on: true,
+    t: dateToMsSinceMidnight(date),
+    dow: 127,
+    date: formatDate(date),
+    last: 0,
+    rp: "defaultRepeat" in schedSettings ? schedSettings.defaultRepeat : false,
+    vibrate: "defaultAlarmPattern" in schedSettings ? schedSettings.defaultAlarmPattern : "::",
+    as: false,
+  };
+}
+
+function eventToAlarm(event, offsetMs) {
+  const dateOrig = event.startDate.toJSDate();
+  const date = offsetMs ? new Date(dateOrig - offsetMs) : dateOrig;
+
+  const alarm = {...getAlarmDefaults(), ...{
+    id: event.uid,
+    msg: event.summary,
+    t: dateToMsSinceMidnight(date),
+    date: formatDate(date),
+    data: {end: event.endDate.toJSDate().toISOString()}
+  }};
+  if (offsetMs) { // Alarm time is not real event time, so do a backup
+    alarm.data.time = dateOrig.toISOString();
+  }
+  return alarm;
+}
+
+function upload() {
+  // kick off all the (active) timers
+  const now = new Date();
+  const currentTime = now.getHours()*3600000
+    + now.getMinutes()*60000
+    + now.getSeconds()*1000;
+
+  for (const alarm of alarms)
+    if (alarm.timer != undefined && alarm.on)
+      alarm.t = currentTime + alarm.timer;
+
+  Util.showModal("Saving...");
+  Util.writeStorage("sched.json", JSON.stringify(alarms), () => {
+    Puck.write(`\x10require("sched").reload();\n`, () => {
+      location.reload(); // reload so we see current data
+    });
+  });
+}
+
+function renderAlarm(alarm, exists) {
+  const localDate = alarm.date ? dateFromAlarm(alarm) : null;
+
+  const tr = document.createElement('tr');
+  tr.classList.add('event-row');
+  tr.dataset.uid = alarm.id;
+  const tdType = document.createElement('td');
+  tdType.type = "text";
+  tdType.classList.add('event-summary');
+  tr.appendChild(tdType);
+  const inputTime = document.createElement('input');
+  if (localDate) {
+    tdType.textContent = "Event";
+    inputTime.type = "datetime-local";
+    inputTime.value = localDate.toISOString().slice(0,16);
+    inputTime.onchange = (e => {
+      const date = new Date(inputTime.value);
+      alarm.t = dateToMsSinceMidnight(date);
+      alarm.date = formatDate(date);
+    });
+  } else {
+    const [hours, mins, secs] = msToHMS(alarm.timer || alarm.t);
+
+    inputTime.type = "time";
+    inputTime.step = 1; // display seconds
+    inputTime.value = `${hours}:${mins}:${secs}`;
+
+    if (alarm.timer) {
+      tdType.textContent = "Timer";
+      inputTime.onchange = e => {
+        alarm.timer = hmsToMs(inputTime.value);
+        // alarm.t is set on upload
+      };
+    } else {
+      tdType.textContent = "Alarm";
+      inputTime.onchange = e => {
+        alarm.t = hmsToMs(inputTime.value);
+      };
+    }
+  }
+  if (!exists) {
+    const asterisk = document.createElement('sup');
+    asterisk.textContent = '*';
+    tdType.appendChild(asterisk);
+  }
+  inputTime.classList.add('event-date');
+  inputTime.classList.add('form-input');
+  inputTime.dataset.uid = alarm.id;
+  const tdTime = document.createElement('td');
+  tr.appendChild(tdTime);
+  tdTime.appendChild(inputTime);
+
+  const tdSummary = document.createElement('td');
+  tr.appendChild(tdSummary);
+  const inputSummary = document.createElement('input');
+  inputSummary.type = "text";
+  inputSummary.classList.add('event-summary');
+  inputSummary.classList.add('form-input');
+  inputSummary.dataset.uid = alarm.id;
+  inputSummary.maxLength=40;
+  const realHumanStartTime = alarm.data?.time ? ' ' + (new Date(alarm.data.time)).toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'}) : '';
+  const summary = (alarm.msg?.substring(0, inputSummary.maxLength) || "");
+  inputSummary.value = summary.endsWith(realHumanStartTime) ? summary : summary + realHumanStartTime;
+  inputSummary.onchange = (e => {
+    alarm.msg = inputSummary.value;
+  });
+  tdSummary.appendChild(inputSummary);
+  inputSummary.onchange();
+
+  const tdOptions = document.createElement('td');
+  tr.appendChild(tdOptions);
+
+  const onOffCheck = document.createElement('input');
+  onOffCheck.type = 'checkbox';
+  onOffCheck.checked = alarm.on;
+  onOffCheck.onchange = e => {
+    alarm.on = !alarm.on;
+    if (alarm.on) delete alarm.last;
+  };
+  const onOffIcon = document.createElement('i');
+  onOffIcon.classList.add('form-icon');
+  const onOff = document.createElement('label');
+  onOff.classList.add('form-switch');
+  onOff.appendChild(onOffCheck);
+  onOff.appendChild(onOffIcon);
+  tdOptions.appendChild(onOff);
+
+  const tdInfo = document.createElement('td');
+  tr.appendChild(tdInfo);
+
+  const buttonDelete = document.createElement('button');
+  buttonDelete.classList.add('btn');
+  buttonDelete.classList.add('btn-action');
+  tdInfo.appendChild(buttonDelete);
+  const iconDelete = document.createElement('i');
+  iconDelete.classList.add('icon');
+  iconDelete.classList.add('icon-delete');
+  buttonDelete.appendChild(iconDelete);
+  buttonDelete.onclick = (e => {
+    alarms = alarms.filter(a => a !== alarm);
+    document.getElementById('events').removeChild(tr);
+  });
+
+  document.getElementById('events').appendChild(tr);
+  document.getElementById('upload').disabled = false;
+}
+
+function msToHMS(ms) {
+  let secs = Math.floor(ms / 1000) % 60;
+  let mins = Math.floor(ms / 1000 / 60) % 60;
+  let hours = Math.floor(ms / 1000 / 60 / 60);
+  if (secs < 10) secs = "0" + secs;
+  if (mins < 10) mins = "0" + mins;
+  if (hours < 10) hours = "0" + hours;
+  return [hours, mins, secs];
+}
+
+function hmsToMs(hms) {
+  let [hours, mins, secs] = hms.split(":");
+  hours = Number(hours);
+  mins = Number(mins);
+  secs = Number(secs);
+  return ((hours * 60 + mins) * 60 + secs) * 1000;
+}
+
+function addEvent() {
+  const event = getAlarmDefaults();
+  renderAlarm(event);
+  alarms.push(event);
+}
+
+function addAlarm() {
+  const alarm = getAlarmDefaults();
+  delete alarm.date;
+  renderAlarm(alarm);
+  alarms.push(alarm);
+}
+
+function addTimer() {
+  const alarmDefaults = getAlarmDefaults();
+  const timer = {
+    timer: hmsToMs("00:00:30"),
+    t: 0,
+    on: alarmDefaults.on,
+    dow: alarmDefaults.dow,
+    last: alarmDefaults.last,
+    rp: alarmDefaults.rp,
+    vibrate: alarmDefaults.vibrate,
+    as: alarmDefaults.as,
+  };;
+  renderAlarm(timer);
+  alarms.push(timer);
+}
+
+function getData() {
+  Util.showModal("Loading...");
+  Util.readStorage('sched.json',data=>{
+    alarms = JSON.parse(data || "[]") || [];
+
+    Util.readStorage('sched.settings.json',data=>{
+      schedSettings = JSON.parse(data || "{}") || {};
+      Util.hideModal();
+      alarms.sort((a, b) => {
+        let x;
+
+        x = !!b.date - !!a.date;
+        if(x) return x;
+
+        x = !!a.timer - !!b.timer;
+        if(x) return x;
+
+        return a.t - b.t;
+      });
+      alarms.forEach(alarm => {
+        renderAlarm(alarm, true);
+      });
+    });
+  });
+}
+
+// Called when app starts
+function onInit() {
+  getData();
+}
+    </script>
+  </head>
+  <body>
+    <h4>Manage dated events</h4>
+
+    <div class="float-right">
+      <button class="btn" onclick="addEvent()">
+        <i class="icon icon-plus"></i>
+        Event
+      </button>
+      <button class="btn" onclick="addAlarm()">
+        <i class="icon icon-plus"></i>
+        Alarm
+      </button>
+      <button class="btn" onclick="addTimer()">
+        <i class="icon icon-plus"></i>
+        Timer
+      </button>
+    </div>
+
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Type</th>
+          <th>Date/Time</th>
+          <th>Summary</th>
+          <th>On?</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody id="events">
+      </tbody>
+    </table>
+
+    <div class="divider"></div>
+    <div class="form-horizontal">
+      <div class="form-group">
+        <div class="col-5 col-xs-12">
+          <label class="form-label" for="fileinput">Add from iCalendar file</label>
+        </div>
+        <div class="col-7 col-xs-12">
+          <input id="fileinput" class="form-input" type="file" onchange="readFile(this)" accept=".ics,.ifb,.ical,.ifbf" multiple/>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="col-5 col-xs-12">
+          <label class="form-label" for="fileinput">Minutes to alarm in advance</label>
+        </div>
+        <div class="col-7 col-xs-12">
+          <input id="offsetMinutes" class="form-input" type="number" value="0" min="0" step="5"/>
+        </div>
+      </div>
+    </div>
+    <div class="divider"></div>
+
+    <button id="upload" class="btn btn-primary" onClick="upload()" disabled>Upload</button>
+    <button id="reload" class="btn" onClick="location.reload()">Reload</button>
+  </body>
+</html>
diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
index 2a1b0f8ca..aa286ce6a 100644
--- a/apps/sched/metadata.json
+++ b/apps/sched/metadata.json
@@ -1,15 +1,16 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.21",
+  "version": "0.22",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",
-  "tags": "tool,system,alarm",
+  "tags": "tool,system,alarm,clkinfo",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "provides_modules" : ["sched"],
   "default" : true,
   "readme": "README.md",
+  "interface": "interface.html",
   "storage": [
     {"name":"sched.boot.js","url":"boot.js"},
     {"name":"sched.js","url":"sched.js"},
diff --git a/apps/sched/sched.js b/apps/sched/sched.js
index f2f2644f9..bd84c3e47 100644
--- a/apps/sched/sched.js
+++ b/apps/sched/sched.js
@@ -42,7 +42,9 @@ function showAlarm(alarm) {
       if (del) {
         alarms.splice(alarmIndex, 1);
       } else {
-        if (!alarm.timer) {
+        if (alarm.date && alarm.rp) {
+          setNextRepeatDate(alarm);
+        } else if (!alarm.timer) {
           alarm.last = new Date().getDate();
         }
         if (alarm.ot !== undefined) {
@@ -78,6 +80,35 @@ function showAlarm(alarm) {
     });
   }
 
+  function setNextRepeatDate(alarm) {
+    let date = new Date(alarm.date);
+    let rp = alarm.rp;
+    if (rp===true) { // fallback in case rp is set wrong
+      date.setDate(date.getDate() + 1);
+    } else switch(rp.interval) { // rp is an object
+      case "day":
+        date.setDate(date.getDate() + rp.num);
+        break;
+      case "week":
+        date.setDate(date.getDate() + (rp.num * 7));
+        break;
+      case "month":
+        if (!alarm.od) alarm.od = date.getDate();
+        date = new Date(date.getFullYear(), date.getMonth() + rp.num, alarm.od);
+        if (date.getDate() != alarm.od) date.setDate(0);
+        break;
+      case "year":
+        if (!alarm.od) alarm.od = date.getDate();
+        date = new Date(date.getFullYear() + rp.num, date.getMonth(), alarm.od);
+        if (date.getDate() != alarm.od) date.setDate(0);
+        break;
+      default:
+        console.log(`sched: unknown repeat '${JSON.stringify(rp)}'`);
+        break;
+    }
+    alarm.date = date.toLocalISOString().slice(0,10);
+  }
+
   if ((require("Storage").readJSON("setting.json", 1) || {}).quiet > 1)
     return;
 
diff --git a/apps/sensortools/ChangeLog b/apps/sensortools/ChangeLog
index 518e5dab4..6d2f5d2b4 100644
--- a/apps/sensortools/ChangeLog
+++ b/apps/sensortools/ChangeLog
@@ -1,3 +1,6 @@
 0.01: New App!
 0.02: Less time used during boot if disabled
 0.03: Fixed some test data
+0.04: Correct type of time attribute in gps to Date
+0.05: Fix gps emulation interpolation
+      Add setting for log output
diff --git a/apps/sensortools/README.md b/apps/sensortools/README.md
index 8b89add7c..f44a89090 100644
--- a/apps/sensortools/README.md
+++ b/apps/sensortools/README.md
@@ -5,40 +5,56 @@ 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
+Enabled:
+* **true**
+* **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
+Modes:
+* **modify**: Modify the original events from this sensor
+* **emulate**: Create events simulating sensor activity
+
 Modification:
-  bpmtrippled: Multiply the bpm value of the original HRM values with 3
+* **bpmtrippled**: Multiply the bpm value of the original HRM values with 3
+
 Emulation:
-  sin: Calculate bpm changes by using sin
+* **sin**: Calculate bpm changes by using sin
 
 ### GPS
 
-Modes: emulate
+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
+* **staticfix**: static complete fix with all values
+* **route**: A square route starting in the SW corner and moving SW->NW->NO->SW... [Download as gpx](square.gpx)
+* **routeFuzzy**: Roughly the same square as route, but with 100m seqments with some variaton in course [Download as gpx](squareFuzzy.gpx)
+* **nofix**: All values NaN but time,sattelites,fix and fix == 0
+* **changingfix**: A fix with randomly changing values
 
 ### Compass
 
-Modes: emulate
+Modes:
+* **emulate**
+
 Emulation:
-  static: All values but heading are 1, heading == 0
-  rotate: All values but heading are 1, heading rotates 360°
+* **static**: All values but heading are 1, heading == 0
+* **rotate**: All values but heading are 1, heading rotates 360°
+
+# Creator
+
+[halemmerich](https://github.com/halemmerich)
\ No newline at end of file
diff --git a/apps/sensortools/default.json b/apps/sensortools/default.json
index a85e1ddeb..0e0d0a9af 100644
--- a/apps/sensortools/default.json
+++ b/apps/sensortools/default.json
@@ -1,5 +1,6 @@
 {
   "enabled": false,
+  "log": false,
   "mag": {
     "enabled": false,
     "mode": "emulate",
diff --git a/apps/sensortools/lib.js b/apps/sensortools/lib.js
index 595492251..5e1c199c2 100644
--- a/apps/sensortools/lib.js
+++ b/apps/sensortools/lib.js
@@ -5,6 +5,7 @@ exports.enable = () => {
   );
 
   let log = function(text, param) {
+    if (!settings.log) return;
     let logline = new Date().toISOString() + " - " + "Sensortools - " + text;
     if (param) logline += ": " + JSON.stringify(param);
     print(logline);
@@ -138,63 +139,63 @@ exports.enable = () => {
       
           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)
+              lat: b.lat * progress + a.lat * (1-progress),
+              lon: b.lon * progress + a.lon * (1-progress),
+              alt: b.alt * progress + a.alt * (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}
+              {lat:47.2577411,lon:11.9927442,alt:2273},
+              {lat:47.266761,lon:11.9926673,alt:2166},
+              {lat:47.2667605,lon:12.0059511,alt:2245},
+              {lat:47.2577516,lon:12.0059925,alt: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}
+              {lat:47.2578455,lon:11.9929891,alt:2265},
+              {lat:47.258592,lon:11.9923341,alt:2256},
+              {lat:47.2594506,lon:11.9927412,alt:2230},
+              {lat:47.2603323,lon:11.9924949,alt:2219},
+              {lat:47.2612056,lon:11.9928175,alt:2199},
+              {lat:47.2621002,lon:11.9929817,alt:2182},
+              {lat:47.2629025,lon:11.9923915,alt:2189},
+              {lat:47.2637828,lon:11.9926486,alt:2180},
+              {lat:47.2646733,lon:11.9928167,alt:2191},
+              {lat:47.2655617,lon:11.9930357,alt:2185},
+              {lat:47.2662862,lon:11.992252,alt:2186},
+              {lat:47.2669305,lon:11.993173,alt:2166},
+              {lat:47.266666,lon:11.9944419,alt:2171},
+              {lat:47.2667579,lon:11.99576,alt:2194},
+              {lat:47.2669409,lon:11.9970579,alt:2207},
+              {lat:47.2666562,lon:11.9983128,alt:2212},
+              {lat:47.2666027,lon:11.9996335,alt:2262},
+              {lat:47.2667245,lon:12.0009395,alt:2278},
+              {lat:47.2668457,lon:12.002256,alt:2297},
+              {lat:47.2666126,lon:12.0035373,alt:2303},
+              {lat:47.2664554,lon:12.004841,alt:2251},
+              {lat:47.2669461,lon:12.005948,alt:2245},
+              {lat:47.2660877,lon:12.006323,alt:2195},
+              {lat:47.2652729,lon:12.0057552,alt:2163},
+              {lat:47.2643926,lon:12.0060123,alt:2131},
+              {lat:47.2634978,lon:12.0058302,alt:2095},
+              {lat:47.2626129,lon:12.0060759,alt:2066},
+              {lat:47.2617325,lon:12.0058188,alt:2037},
+              {lat:47.2608668,lon:12.0061784,alt:1993},
+              {lat:47.2600155,lon:12.0057392,alt:1967},
+              {lat:47.2591203,lon:12.0058233,alt:1949},
+              {lat:47.2582307,lon:12.0059718,alt:1972},
+              {lat:47.2578014,lon:12.004804,alt:2011},
+              {lat:47.2577232,lon:12.0034834,alt:2044},
+              {lat:47.257745,lon:12.0021656,alt:2061},
+              {lat:47.2578682,lon:12.0008597,alt:2065},
+              {lat:47.2577082,lon:11.9995526,alt:2071},
+              {lat:47.2575917,lon:11.9982348,alt:2102},
+              {lat:47.2577401,lon:11.996924,alt:2147},
+              {lat:47.257715,lon:11.9956061,alt:2197},
+              {lat:47.2578996,lon:11.9943081,alt:2228}
             ];
           }
       
@@ -205,7 +206,7 @@ exports.enable = () => {
           "alt": 100,
           "speed": 10,
           "course": 12,
-          "time": Date.now(),
+          "time": new Date(),
           "satellites": 7,
           "fix": 1,
           "hdop": 1
@@ -215,51 +216,43 @@ exports.enable = () => {
         let interpSteps;
         if (settings.gps.name == "routeFuzzy"){
           route = getSquareRouteFuzzy();
-          interpSteps = 5;
+          interpSteps = 74;
         } else {
           route = getSquareRoute();
-          interpSteps = 50;
+          interpSteps = 740;
         }
 
         let step = 0;
         let routeIndex = 0;
         modGps(() => {
           let newIndex = (routeIndex + 1)%route.length;
-          
+          let followingIndex = (routeIndex + 2)%route.length;
+
           let result = {
-            "speed": Math.random() * 3 + 2,
-            "time": Date.now(),
+            "speed": Math.random()*1 + 4.5,
+            "time": new Date(),
             "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));
+          let followingPos = route[followingIndex];
+          let interpPos = interpolate(oldPos, newPos, E.clip(0,1,step/interpSteps));
+
+          if (step > 0.5* interpSteps) {
+          result.course = bearing(interpPos, interpolate(newPos, followingPos, E.clip(0,1,(step-0.5*interpSteps)/interpSteps)));
+          } else {
+            result.course = bearing(oldPos, newPos);
           }
 
-          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;
+          return Object.assign(result, interpPos);
         });
       } else if (settings.gps.name == "nofix") {
         modGps(() => { return {
@@ -268,7 +261,7 @@ exports.enable = () => {
           "alt": NaN,
           "speed": NaN,
           "course": NaN,
-          "time": Date.now(),
+          "time": new Date(),
           "satellites": 2,
           "fix": 0,
           "hdop": NaN
@@ -281,6 +274,7 @@ exports.enable = () => {
         let currentDir=1000;
         let currentAlt=500;
         let currentSats=5;
+        
         modGps(() => {
           currentLat += 0.01;
           if (currentLat > 50) currentLat = 20;
@@ -301,7 +295,7 @@ exports.enable = () => {
           "alt": currentAlt,
           "speed": currentSpeed,
           "course": currentCourse,
-          "time": Date.now(),
+          "time": new Date(),
           "satellites": currentSats,
           "fix": 1,
           "hdop": 1
diff --git a/apps/sensortools/metadata.json b/apps/sensortools/metadata.json
index 9f7a36c5c..bffffd090 100644
--- a/apps/sensortools/metadata.json
+++ b/apps/sensortools/metadata.json
@@ -2,7 +2,7 @@
   "id": "sensortools",
   "name": "Sensor tools",
   "shortName": "Sensor tools",
-  "version": "0.03",
+  "version": "0.05",
   "description": "Tools for testing and debugging apps that use sensor input",
   "icon": "icon.png",
   "type": "bootloader",
@@ -14,5 +14,8 @@
     {"name":"sensortools.settings.js","url":"settings.js"},
     {"name":"sensortools","url":"lib.js"},
     {"name":"sensortools.default.json","url":"default.json"}
+  ],
+  "data": [
+    {"name":"sensortools.settings.json"}
   ]
 }
diff --git a/apps/sensortools/settings.js b/apps/sensortools/settings.js
index 231ab8467..ae631e60c 100644
--- a/apps/sensortools/settings.js
+++ b/apps/sensortools/settings.js
@@ -88,6 +88,12 @@
           writeSettings("enabled",v);
         },
       },
+      'Log': {
+        value: !!settings.log,
+        onchange: v => {
+          writeSettings("log",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"]);}
diff --git a/apps/sensortools/square.gpx b/apps/sensortools/square.gpx
new file mode 100644
index 000000000..0220b4261
--- /dev/null
+++ b/apps/sensortools/square.gpx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx version="1.1" creator="OsmAndRouterV2" xmlns="http://www.topografix.com/GPX/1/1" xmlns:osmand="https://osmand.net" 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">
+	<metadata>
+		<name>1kmsquare</name>
+		<desc>Export from GpsPrune</desc>
+	</metadata>
+	<trk>
+		<name>1kmsquare</name>
+		<number>1</number>
+		<trkseg>
+			<trkpt lat="47.2577411" lon="11.9927442">
+				<ele>2273</ele>
+				<name>Lower left</name>
+			</trkpt>
+			<trkpt lat="47.266761" lon="11.9926673">
+				<ele>2166</ele>
+				<name>Top left</name>
+			</trkpt>
+			<trkpt lat="47.2667605" lon="12.0059511">
+				<ele>2245</ele>
+				<name>Top right</name>
+			</trkpt>
+			<trkpt lat="47.2577516" lon="12.0059925">
+				<ele>1994</ele>
+				<name>Lower right</name>
+			</trkpt>
+			<trkpt lat="47.2577412" lon="11.9927442">
+				<ele>2273</ele>
+				<name>Destination</name>
+			</trkpt>
+		</trkseg>
+	</trk>
+</gpx>
diff --git a/apps/sensortools/squareFuzzy.gpx b/apps/sensortools/squareFuzzy.gpx
new file mode 100644
index 000000000..8f73cc72b
--- /dev/null
+++ b/apps/sensortools/squareFuzzy.gpx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx version="1.1" creator="OsmAndRouterV2" xmlns="http://www.topografix.com/GPX/1/1" xmlns:osmand="https://osmand.net" 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">
+	<metadata>
+		<name>1kmsquare100</name>
+		<desc>Export from GpsPrune</desc>
+	</metadata>
+	<trk>
+		<name>1kmsquare100</name>
+		<number>1</number>
+		<trkseg>
+			<trkpt lat="47.2578455" lon="11.9929891">
+				<ele>2265</ele>
+				<name>Lower left</name>
+			</trkpt>
+			<trkpt lat="47.258592" lon="11.9923341">
+				<ele>2256</ele>
+			</trkpt>
+			<trkpt lat="47.2594506" lon="11.9927412">
+				<ele>2230</ele>
+			</trkpt>
+			<trkpt lat="47.2603323" lon="11.9924949">
+				<ele>2219</ele>
+			</trkpt>
+			<trkpt lat="47.2612056" lon="11.9928175">
+				<ele>2199</ele>
+			</trkpt>
+			<trkpt lat="47.2621002" lon="11.9929817">
+				<ele>2182</ele>
+			</trkpt>
+			<trkpt lat="47.2629025" lon="11.9923915">
+				<ele>2189</ele>
+			</trkpt>
+			<trkpt lat="47.2637828" lon="11.9926486">
+				<ele>2180</ele>
+			</trkpt>
+			<trkpt lat="47.2646733" lon="11.9928167">
+				<ele>2191</ele>
+			</trkpt>
+			<trkpt lat="47.2655617" lon="11.9930357">
+				<ele>2185</ele>
+			</trkpt>
+			<trkpt lat="47.2662862" lon="11.992252">
+				<ele>2186</ele>
+			</trkpt>
+			<trkpt lat="47.2669305" lon="11.993173">
+				<ele>2166</ele>
+				<name>Top left</name>
+			</trkpt>
+			<trkpt lat="47.266666" lon="11.9944419">
+				<ele>2171</ele>
+			</trkpt>
+			<trkpt lat="47.2667579" lon="11.99576">
+				<ele>2194</ele>
+			</trkpt>
+			<trkpt lat="47.2669409" lon="11.9970579">
+				<ele>2207</ele>
+			</trkpt>
+			<trkpt lat="47.2666562" lon="11.9983128">
+				<ele>2212</ele>
+			</trkpt>
+			<trkpt lat="47.2666027" lon="11.9996335">
+				<ele>2262</ele>
+			</trkpt>
+			<trkpt lat="47.2667245" lon="12.0009395">
+				<ele>2278</ele>
+			</trkpt>
+			<trkpt lat="47.2668457" lon="12.002256">
+				<ele>2297</ele>
+			</trkpt>
+			<trkpt lat="47.2666126" lon="12.0035373">
+				<ele>2303</ele>
+			</trkpt>
+			<trkpt lat="47.2664554" lon="12.004841">
+				<ele>2251</ele>
+			</trkpt>
+			<trkpt lat="47.2669461" lon="12.005948">
+				<ele>2245</ele>
+				<name>Top right</name>
+			</trkpt>
+			<trkpt lat="47.2660877" lon="12.006323">
+				<ele>2195</ele>
+			</trkpt>
+			<trkpt lat="47.2652729" lon="12.0057552">
+				<ele>2163</ele>
+			</trkpt>
+			<trkpt lat="47.2643926" lon="12.0060123">
+				<ele>2131</ele>
+			</trkpt>
+			<trkpt lat="47.2634978" lon="12.0058302">
+				<ele>2095</ele>
+			</trkpt>
+			<trkpt lat="47.2626129" lon="12.0060759">
+				<ele>2066</ele>
+			</trkpt>
+			<trkpt lat="47.2617325" lon="12.0058188">
+				<ele>2037</ele>
+			</trkpt>
+			<trkpt lat="47.2608668" lon="12.0061784">
+				<ele>1993</ele>
+			</trkpt>
+			<trkpt lat="47.2600155" lon="12.0057392">
+				<ele>1967</ele>
+			</trkpt>
+			<trkpt lat="47.2591203" lon="12.0058233">
+				<ele>1949</ele>
+			</trkpt>
+			<trkpt lat="47.2582307" lon="12.0059718">
+				<ele>1972</ele>
+			</trkpt>
+			<trkpt lat="47.2578014" lon="12.004804">
+				<ele>2011</ele>
+				<name>Lower right</name>
+			</trkpt>
+			<trkpt lat="47.2577232" lon="12.0034834">
+				<ele>2044</ele>
+			</trkpt>
+			<trkpt lat="47.257745" lon="12.0021656">
+				<ele>2061</ele>
+			</trkpt>
+			<trkpt lat="47.2578682" lon="12.0008597">
+				<ele>2065</ele>
+			</trkpt>
+			<trkpt lat="47.2577082" lon="11.9995526">
+				<ele>2071</ele>
+			</trkpt>
+			<trkpt lat="47.2575917" lon="11.9982348">
+				<ele>2102</ele>
+			</trkpt>
+			<trkpt lat="47.2577401" lon="11.996924">
+				<ele>2147</ele>
+			</trkpt>
+			<trkpt lat="47.257715" lon="11.9956061">
+				<ele>2197</ele>
+			</trkpt>
+			<trkpt lat="47.2578996" lon="11.9943081">
+				<ele>2228</ele>
+			</trkpt>
+			<trkpt lat="47.2578436" lon="11.992992">
+				<ele>2265</ele>
+				<name>Destination</name>
+			</trkpt>
+		</trkseg>
+	</trk>
+</gpx>
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 85ccfa1a7..d090add58 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -62,3 +62,9 @@
 0.55: More strings tagged for automatic translation.
 0.56: make System menu items shorter and more consistant, Eg 'Clock', intead
 of 'Select Clock'
+0.57: Settings.log = 0,1,2,3 for off,display,log,both
+0.58: On/Off settings items now use checkboxes
+0.59: Preserve BLE whitelist even when disabled
+0.60: Moved LCD calibration to top of menu, and use 12 taps (not 8)
+      LCD calibration will now error if the calibration is obviously wrong
+0.61: Permit temporary bypass of the BLE whitelist
diff --git a/apps/setting/README.md b/apps/setting/README.md
index e5ea2b43d..2a7f7ee9c 100644
--- a/apps/setting/README.md
+++ b/apps/setting/README.md
@@ -56,9 +56,10 @@ The exact effects depend on the app.  In general the watch will not wake up by i
 
 
 * **Debug Info** should debug info be shown on the watch's screen or not?
-  * `Hide` (default) do not show debug information
-  * `Show` Show on the Bangle's screen (when not connected to Bluetooth or `Programmable:off`)
+  * `Off` (default) do not show debug information
+  * `Display` Show on the Bangle's screen (when not connected to Bluetooth or `Programmable:off`)
   * `Log` Show on the Bangle's screen **and** write to a file called `log.txt` on Storage (when not connected to Bluetooth or `Programmable:off`). Warning - this file is appended to so may grow to be large if this is left enabled.
+  * `Both` Log and display on Bangle's screen
 * **Compact Storage** Removes deleted/old files from Storage - this will speed up your Bangle.js
 * **Rewrite Settings** Should not normally be required, but if `.boot0` has been deleted/corrupted (and so no settings are being loaded) this will fix it.
 * **Flatten Battery** Turns on all devices and draws as much power as possible, attempting to flatten the Bangle.js battery. This can still take 5+ hours.  
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 92fc75915..b2b19dd6b 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.56",
+  "version": "0.61",
   "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 a877ec79c..d22f28412 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -64,8 +64,6 @@ if (("object" != typeof settings) ||
     ("object" != typeof settings.options))
   resetSettings();
 
-const boolFormat = v => v ? /*LANG*/"On" : /*LANG*/"Off";
-
 function showMainMenu() {
 
   const mainmenu = {
@@ -102,7 +100,6 @@ function showAlertsMenu() {
   if (BANGLEJS2) {
     beepMenuItem = {
       value: settings.beep!=false,
-      format: boolFormat,
       onchange: v => {
         settings.beep = v;
         updateSettings();
@@ -134,7 +131,6 @@ function showAlertsMenu() {
     /*LANG*/'Beep': beepMenuItem,
     /*LANG*/'Vibration': {
       value: settings.vibrate,
-      format: boolFormat,
       onchange: () => {
         settings.vibrate = !settings.vibrate;
         updateSettings();
@@ -169,7 +165,6 @@ function showBLEMenu() {
     /*LANG*/'Make Connectable': ()=>makeConnectable(),
     /*LANG*/'BLE': {
       value: settings.ble,
-      format: boolFormat,
       onchange: () => {
         settings.ble = !settings.ble;
         updateSettings();
@@ -177,7 +172,6 @@ function showBLEMenu() {
     },
     /*LANG*/'Programmable': {
       value: settings.blerepl,
-      format: boolFormat,
       onchange: () => {
         settings.blerepl = !settings.blerepl;
         updateSettings();
@@ -197,7 +191,14 @@ function showBLEMenu() {
       onchange: () => setTimeout(showPasskeyMenu) // graphical_menu redraws after the call
     },
     /*LANG*/'Whitelist': {
-      value: settings.whitelist?(settings.whitelist.length+/*LANG*/" devs"):/*LANG*/"off",
+      value:
+        (
+          settings.whitelist_disabled ? /*LANG*/"off" : /*LANG*/"on"
+        ) + (
+          settings.whitelist
+          ? " (" + settings.whitelist.length + ")"
+          : ""
+        ),
       onchange: () => setTimeout(showWhitelistMenu) // graphical_menu redraws after the call
     }
   });
@@ -347,12 +348,21 @@ function showPasskeyMenu() {
 function showWhitelistMenu() {
   var menu = {
     "< Back" : ()=>showBLEMenu(),
-    /*LANG*/"Disable" : () => {
-      settings.whitelist = undefined;
+  };
+  if (settings.whitelist_disabled) {
+    menu[/*LANG*/"Enable"] = () => {
+      delete settings.whitelist_disabled;
       updateSettings();
       showBLEMenu();
-    }
-  };
+    };
+  } else {
+    menu[/*LANG*/"Disable"] = () => {
+      settings.whitelist_disabled = true;
+      updateSettings();
+      showBLEMenu();
+    };
+  }
+
   if (settings.whitelist) settings.whitelist.forEach(function(d){
     menu[d.substr(0,17)] = function() {
       E.showPrompt(/*LANG*/'Remove\n'+d).then((v) => {
@@ -372,6 +382,7 @@ function showWhitelistMenu() {
     NRF.removeAllListeners('connect');
     NRF.on('connect', function(addr) {
       if (!settings.whitelist) settings.whitelist=[];
+      delete settings.whitelist_disabled;
       settings.whitelist.push(addr);
       updateSettings();
       NRF.removeAllListeners('connect');
@@ -392,6 +403,12 @@ function showLCDMenu() {
   const lcdMenu = {
     '': { 'title': 'LCD' },
     '< Back': ()=>showSystemMenu(),
+  };
+  if (BANGLEJS2)
+    Object.assign(lcdMenu, {
+    /*LANG*/'Calibrate': () => showTouchscreenCalibration()
+    });
+  Object.assign(lcdMenu, {
     /*LANG*/'LCD Brightness': {
       value: settings.brightness,
       min: 0.1,
@@ -428,18 +445,16 @@ function showLCDMenu() {
     },
     /*LANG*/'Wake on BTN1': {
       value: settings.options.wakeOnBTN1,
-      format: boolFormat,
       onchange: () => {
         settings.options.wakeOnBTN1 = !settings.options.wakeOnBTN1;
         updateOptions();
       }
     }
-  };
+  });
   if (!BANGLEJS2)
     Object.assign(lcdMenu, {
     /*LANG*/'Wake on BTN2': {
       value: settings.options.wakeOnBTN2,
-      format: boolFormat,
       onchange: () => {
         settings.options.wakeOnBTN2 = !settings.options.wakeOnBTN2;
         updateOptions();
@@ -447,7 +462,6 @@ function showLCDMenu() {
     },
     /*LANG*/'Wake on BTN3': {
       value: settings.options.wakeOnBTN3,
-      format: boolFormat,
       onchange: () => {
         settings.options.wakeOnBTN3 = !settings.options.wakeOnBTN3;
         updateOptions();
@@ -456,7 +470,6 @@ function showLCDMenu() {
   Object.assign(lcdMenu, {
     /*LANG*/'Wake on FaceUp': {
       value: settings.options.wakeOnFaceUp,
-      format: boolFormat,
       onchange: () => {
         settings.options.wakeOnFaceUp = !settings.options.wakeOnFaceUp;
         updateOptions();
@@ -464,7 +477,6 @@ function showLCDMenu() {
     },
     /*LANG*/'Wake on Touch': {
       value: settings.options.wakeOnTouch,
-      format: boolFormat,
       onchange: () => {
         settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
         updateOptions();
@@ -472,7 +484,6 @@ function showLCDMenu() {
     },
     /*LANG*/'Wake on Twist': {
       value: settings.options.wakeOnTwist,
-      format: boolFormat,
       onchange: () => {
         settings.options.wakeOnTwist = !settings.options.wakeOnTwist;
         updateOptions();
@@ -509,10 +520,7 @@ function showLCDMenu() {
       }
     }
   });
-  if (BANGLEJS2)
-    Object.assign(lcdMenu, {
-    /*LANG*/'Calibrate': () => showTouchscreenCalibration()
-    });
+
   return E.showMenu(lcdMenu)
 }
 
@@ -557,11 +565,11 @@ function showUtilMenu() {
   var menu = {
     '': { 'title': /*LANG*/'Utilities' },
     '< Back': ()=>showMainMenu(),
-    /*LANG*/'Debug Info': {
-      value: E.clip(0|settings.log,0,2),
+    /*LANG*/'Debug': {
+      value: E.clip(0|settings.log,0,3),
       min: 0,
-      max: 2,
-      format: v => [/*LANG*/"Hide",/*LANG*/"Show",/*LANG*/"Log"][E.clip(0|v,0,2)],
+      max: 3,
+      format: v => [/*LANG*/"Off",/*LANG*/"Display",/*LANG*/"Log", /*LANG*/"Both"][E.clip(0|v,0,3)],
       onchange: v => {
         settings.log = v;
         updateSettings();
@@ -650,6 +658,7 @@ function showUtilMenu() {
 function makeConnectable() {
   try { NRF.wake(); } catch (e) { }
   Bluetooth.setConsole(1);
+  NRF.ignoreWhitelist = 1;
   var name = "Bangle.js " + NRF.getAddress().substr(-5).replace(":", "");
   E.showPrompt(name + /*LANG*/"\nStay Connectable?", { title: /*LANG*/"Connectable" }).then(r => {
     if (settings.ble != r) {
@@ -657,6 +666,7 @@ function makeConnectable() {
       updateSettings();
     }
     if (!r) try { NRF.sleep(); } catch (e) { }
+    delete NRF.ignoreWhitelist;
     showMainMenu();
   });
 }
@@ -847,17 +857,17 @@ function showTouchscreenCalibration() {
     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);
+    var tapsLeft = (2-currentTry)*4+(4-currentCorner);
     g.setFont("6x8:2").setFontAlign(0,0).drawString(tapsLeft+/*LANG*/" 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;
+    // we should now have 6 of each tap in 'pt'
+    pt.x1 /= 6;
+    pt.y1 /= 6;
+    pt.x2 /= 6;
+    pt.y2 /= 6;
     // work out final values
     var calib = {
       x1 : Math.round(pt.x1 - (pt.x2-pt.x1)*P/(g.getWidth()-P*2)),
@@ -865,13 +875,19 @@ function showTouchscreenCalibration() {
       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(/*LANG*/"Calibrated!", g.getWidth()/2, g.getHeight()/2);
+    var dx = calib.x2-calib.x1;
+    var dy = calib.y2-calib.y1;
+    if(dx<100 || dx>280 || dy<100 || dy>280) {
+      g.setFont("6x8:2").setFontAlign(0,0).drawString(/*LANG*/"Out of Range.\nPlease\ntry again", g.getWidth()/2, g.getHeight()/2);
+    } else {
+      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(/*LANG*/"Calibrated!", g.getWidth()/2, g.getHeight()/2);
+    }
     // now load the main menu again
     setTimeout(showLCDMenu, 500);
   }
@@ -892,7 +908,7 @@ function showTouchscreenCalibration() {
     if (currentCorner>=corners.length) {
       currentCorner = 0;
       currentTry++;
-      if (currentTry==2) {
+      if (currentTry==3) {
         Bangle.removeListener('touch', touchHandler);
         return calcCalibration();
       }
diff --git a/apps/shadowclk/ChangeLog b/apps/shadowclk/ChangeLog
new file mode 100644
index 000000000..ce2933f0c
--- /dev/null
+++ b/apps/shadowclk/ChangeLog
@@ -0,0 +1,4 @@
+0.01: New App!
+0.02: New 'Settings Menu' to choose your favorite color and switch between light or dark themes
+0.03: New 'Leading Zero' and 'Date Suffix' options in 'Settings Menu'
+0.04: Updated settings menu to better maintain app settings and system settings
diff --git a/apps/shadowclk/README.md b/apps/shadowclk/README.md
new file mode 100644
index 000000000..9e78d8e03
--- /dev/null
+++ b/apps/shadowclk/README.md
@@ -0,0 +1,32 @@
+# Shadow Clock
+
+Shadow Clock uses the "Londrina" font in a user selectable color and surrounds it in the "Londrina Shadow" font to create a visually appealing way 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.
+
+## Usage
+
+* Install Shadow Clock through the Bangle.js app loader.
+* Configure it through the default Bangle.js configuration mechanism
+(Settings app, "Apps" menu, "Shadow Clock" submenu).
+* If you like it, make it your default watch face
+(Settings app, "System" menu, "Clock" submenu, select "Shadow Clock").
+
+## Configuration
+
+Shadow 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 `Shadow Clock` menu.
+You can configure Shadow Clock by selecting a `Light` or `Dark` system wide theme, selecting the `Color` of the clock numbers, enabling or disabling the suffix, and enabling or disabling the leading zero.
+
+### Configuration Options
+
+* Theme: Choose between `Light` and `Dark` themes.
+* Color: Choose the color of the clock numbers from the available options.
+* Date Suffix: `Yes` will show "10th" and `No` will show "10".
+* Lead Zero: `Yes` to show the leading zero in 24hr mode, `No` to hide.
+
+## Compatibility
+
+Shadow Clock should be fully compatible with with Bangle.js 1 and Bangle.js 2. However, it was built and tested with Bangle.js 2.
+
+## Creator
+
+[stweedo](https://github.com/stweedo)
\ No newline at end of file
diff --git a/apps/shadowclk/app-icon.js b/apps/shadowclk/app-icon.js
new file mode 100644
index 000000000..b11a518c0
--- /dev/null
+++ b/apps/shadowclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+64Ae1mBAA+sBgOt1oPBqwJBF7lcsQAEw+HEwWtwetwIvBqwvcsUeAAlDLAOs1tZwfXlcrq0ANIQviFAOtl4viw9DAAlo1l7L4ODR4OIZISPcb4QAGBgOJL4IAg1gAHFUIA/AH4A/AH4A51lkAA+ICI2IBYWB1msxAAH1gvNjkjAA0VDAuICAcVwIGCjgADAoMyF7msoALEF4IWHkYvOioACGYgvFro7FF5JfO6+BqwACioYChwvDNwwvFhwAEqz0RWYcclbjBGIOzWwYvHBIJ6BrruNAAs5JgeBXQMcnOIwM5hxsCR5McwJeZAwMVPgWlL5CaFMCJeFXYR/BJodAF4iKBAARgDrouPcYZeCBANdmVWAoSWBF4fXwIADJIcyF59dLwo+IX4gLFwJKChyQOLwcVlYPOfgNkAAOIJQIvSLxwvGd4c5LwYvPDwlWBQmIAAIvMaoIEDF51kCQUHCQgoCW4aPGFYgzDVRReOF4QJCF4q6EFwcHVRQvDmUOh0rOIusisVY4YRBA4IkDrsVnNAisylYuNDwQACBQ+BQwIREAwgOCq160otOAH4A/ACdWldWVYK/GqwBBAoIKCBAQLDAIIOBFx+sF4QCDcgIJBAgMrlYCBHwIUDGAQPDF6QADGAQvDEQZiCOYQtCHYQDBF6AwBAARcBJIQHEBQaTCAoQACAgTDVFYYGDB5LycXIbdELQQJCAAKJCLoQ0YXIatBYYQGCgDPGAIKMXF4YdCAIZlCGohrEMgKUcACCQBF9oA/AH4Ad"))
diff --git a/apps/shadowclk/app.js b/apps/shadowclk/app.js
new file mode 100644
index 000000000..dd47caf7b
--- /dev/null
+++ b/apps/shadowclk/app.js
@@ -0,0 +1,99 @@
+// Clock with large colored digits using the "Londrina" font and a slightly larger "Londrina Shadow" font on top
+
+Graphics.prototype.setFontLondrinaSolid = function () {
+  // Actual height 59 (64 - 6)
+  return this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADX/4AJHv/gBI8/+AJHj/4BI8P/gJHg/+BI8D/4JHgP/wBQbAFEBBJEHKBEfKCJuBUI6CBUI8P/6hHn//UI//AAImHAAJQFg4JCKAsfBJF/Do5XBAAI7FEwZPFEwZtFEwaBEEwYwFEwYwFEwaKFPwImGCYh1FTgKTHGISxGSYTPGJ4TjHWA5tCZw5QBew5QBJooACgwIHAELmIOAReGRwR8GBIhpEVgYeFBIozDBIr9DBIooDBIooDHYjhEBIxRCBIwyCdAXgbAQyCO4LxCBwP+dAb7Dv48CBIpLBHgRVEG4JvCv4iCFARGCn5fDG4JGCEQgtEEQgtEKAgTBKAgeCa4TmFS4w8BS46rGBISNCagwtCbw4JJGQoJDYAoJDFAoJDFApFCKIwJEDwavDaAjDECgq9CAEMBEpEDcYQAFg5DGQYRXGNwYJJRIirEHg4JBHg6BB/AJIIw4dBIw47BCY7dBE4LrCBwUHfgoiCc4oABSoQJGb4QJGOYTcCAAZzCHAQADOYRQBAAhzCKAIAEKF7+IAHUHNQR0BKASOCMAJVBKYaiBB4KhEB4ihEBIQPBUIgJCB4KhEBIQPBUIgJCB4KhFbwSbDKAQJCwAJCKAToC4AJCKAToC8AXCKAToC+AJCeQuABITyEBwIrB57yEBIeHeQgJBGoODeQgiBBIOBKAYuBBIWAKAa0CH4JmBKAQQB4DHCn5QE+AJCj5QE/wWB8ACBKAYAC8AqCKAQAC+AZBUIoJBDIKhFaoahFBIRQDEQKeDKAY8DR4TyFR4gJCGQQJBKAjACBIJQELYQJBKAgeCHAV/KAQPCJgQAjj5LCAAt/IIRPESQiMDBIQFCe4QJDLIReBNwiSCRgJkDPAIJDFAahBIwKRBVYojBYgQJCG4JQBYgRfCBIItCBII8CIIPwgfAEQLyE+DlBHgg3B+DlBGQJfCBITlCIwYOB/DlCPIbICcoQ3BIwQiBBIPgEAJGCv/+CwPwEAKwCEQQgDKAQiCv/8ewgYB4AWBBIJQCIwRsB8JQDRAQAEWogAEKAQbBBI48BAAhaCL4IAELQTFCBIw8GBIQyGfgZiBCY4yFBIYyFIoQoGLIQUEDYYAjh4oIeAgAEM4JPEBIgeHLgKBDAAZbBeAQADUYTwCBIzwCPIzwDAAUHRg6sEKAoJB/hQGNgP8v5QFBIP4n5QFNgPwj5QFNgPgh5QFBIRIBOw3ALgJQEBIRwCKQYdBCAIJCKQQ7Bf4hSCJ4IAEKQR3DAARSCRYYACKQSfDAAazEAAhSCBIxQEAAhQEAAhQSWwoNDBAxeCdApeDdApeDdAqvDGI4AkHAJCHS4fwBwJbDS4R/BI4iXCaAN/aYSXDaAL3DS4gOCG4ToDwAOBPQToD4AOBWoToD8AOBfgRQGGQZQFLYZQFGQZQGMoRBBBYJLCHgQEBx4kBGQJvCIIPHMIV/IwQOB8YuCPIn/+IkCFYJGCv/4EgQ3BQYU//gkCG4JQD/wkBwAJBKA3gKBH8BwJQE4aPCBIZQB8IJDUInwBIahE/CZCBIhQBTISrEKALgDMgZBBawbyFwDMCBIZQB4AoDPAQbBNgQJEKAT1DBIZQBcIYnCKAIhDJ4YAEgIcDAFhOEAASEBAALcCKIaqGBIwUEBIjTDBIpvEBIo+DBIqSBagQJEFAYJFFAZZDdA4AEKIT6EGQgJG/jyD/4MDHgTQBDAIKDHgQJGHgTyCEIRvDv4sBEIPPIwc/FgIJB4JGDNwIrC4AJDMgI2Bv/An5QCHAIsBn/gj5QCHAIOBj/wEYYkBEoMP/AjDEgIeBg/8EYJaCX4PwEIIJEDAP4KAJkEBwIyBBIoQBIIIrBNwYQCa4YJDGQOAZoTyDAwPAS4QJDFAItBBIovBEYIhBBIkHBIIhBGIYAEJ4YAgsAEDgL8DG4kDfgpLDHoTYDOgQZCbAYFCeQhzEeQg2CG4LyEGwTLCSwoOCDIZQDEQIZDKAbACKAzUFKAa1BWwZQDeQpQDBAJBF4BOCKovgIgRpF+BECPov4IgQJEKAJECTYv+IgSvFDYRYDPwhYESQgJGK4ZiDKAZiFKAZiGSYhYEU4hYEKAgJGKARiEKAhiEKAhYEKAhYFIwZYFIwYIGAEcBMwxQBn5xFI4KbCJQgGB8ByGQYSQGYAa4FBIp9DBIooDBIqvDbwbXFBIwyCdAb/FdAQADYgQJGHgTyCAAOHHgbyB/A0BwJvDeQP4CwOABgLyD/gWB4BBBIwQYBCwPgG4JGCDAIWB+AgBQYQYCEAZQEWgP+IIRQG45QFAAhQEBI6rGUKgJCHgirEHgwJCNgLyLz4JFGQS0BBIgoCQgInDFAaRDBISOBNQJzBBAYAzv48BgKqDN4ZXBLQgJCbQN/boQJDDYM/DwiyDe4JvDTwa6BFAYJC/CRB+DeF/yDB/joGTYIyDdAfAeRHgDAIyCIIIAB+AOBZQT8D/gOBMoT8DHgoEB/AlBKoI8CBIRsCBgTnCMQXAPIgiBCwJ5FWgRGBCwJGCJYIJBEARGCF4YJFEQU/LQRQCTgR7DKAgAFKAYAFKAYAFKAQlDBIqhDVwahFBIo8GdAQ8GeQwJGGQoJDZQYxELYxPCCgwIDAAcBEwYA/QoK8Bn5IFMQUfeQQJDOwMPeQSZDDQMHeQQACn4aBXYIJEj4aBGoYACh4aCTA4rCVggkBKCQAkA='))),
+    46,
+    atob("DyEqHigoJikpJygqEQ=="),
+    81 | 65536
+  );
+};
+
+Graphics.prototype.setFontLondrinaShadow = function () {
+  // Actual height 63 (67 - 5)
+  return this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ADX/8AJH4EQBI9AhwJHkEHBI8QgeABI0IgPABI0EgA8HgUAuAJGgMAnAyHwEcKBH+BI8f/4JHg//KA49CDxATInFgBI/wKA8D4BQHh8AUI88I4IJG/AfBHgsBSgKhGg4QCUIseAYShFGAJbCK4oDC/hXFGgQJEK4I0CBIgmDh5SBEw0/IoYmDgF/AgYmDgLIEvgwDbggmDj4wEXAd/OwkwAYX/RQkYHwT5FhgmCMIkAgwmHDQJNCXYxNBEwoABwAmGKAV/LgYADiJNFQQYmHV4wAa/4ABMwwGCv49FWI8AjgEDhyiGP4SGDWwbGFBIsIAYUQBIkCBJAoDBIooDHYgABnArFcooCCg/4AYToDbwP/BQIyCH4MDRoQHBYoLoDwE/SANwCwSXDvA8D4EDbwUESYdggITCFoKYCQQIJCFoRkDRwYtBHwJaBWweAgItBEQMHAgIRCEYIiBbYJaBAgJQBDAIKCJARSBYYiXFVYw3CS4QJGgYJFjxLDBJAyFBIbUFBIZ8CAAU+ewZXCBIpUDAAP+AgcPDAf8BIcBeAUPAYQACn/wdQPwBIjyDGwgUC/4wEKISPGAAMOR4yRCgwJHjEBR4r9DHIyXCZgwHCPQgACDYI8HBII8HHIMDHg1ABII8GkBvB8EPQgKYCOwMHA4YsChAaFFgUEBIraCgRhIgJ/IKASdFKAaxFKAbFFKAZGHKAxGCKA0A8BQI+BQIuACB//9QQIACRoU/BAn//gJBToQJGAFIzBAYMf/5kBAAM8f4V8gEYLwixBBYKhCPgUYgKUBUIQPDBIShCBIUHBIShCBIUDwIQCHgQJBB4IJCS4T1BB4IaCnAJEuAJCeQT/CuD2CKAToCnAXCKAToCjgJCKAUMAoN+kDyGgf/FYIVBeQYJB2EAbgJQBeQMD/A1BaQJQCwEB8CdB/xQDoAJBH4P5KAY4BBIV4wBQCEgMwJIN4oBQCCAMcBIUgKAkHFoM8DIJQDJoU8DIJQCU4UAjwZBKASdCBIIZBKAR/CgEPNQKhFBIJqBKAQiBVAWAKAY8CBIRQDDAKyC4BQDbwYJBKAcASgIJCKAkGBIXgKAgrCBIJQEbgI7BFwP//5XDAoIJBn//IYUBBIIgBg4JDABV/CQIXBBIngmADBz/wBASsBdoZFDBILtDXgYDBdoiyCBIKcCPoJ/CS4JwCegJ/CUIRjBRgIYCG4KcCXQS1CBIKcBRgKrDGoJQCDYKrCMQMOv/4DAI0BJYUPsEGIgI8CZwMP0EBww8DIIMPyEB8ZVDCwMPxBSBFAJVBgaxBwhDBG4JGBPAWCIYItBIwXAgfBIYItBKoVgFgOAgxvBUwQiB8AWBwYtBBIJVBmA5BEAJQFfYRQDEQIECDYQOBSQQAES4SuCAAd4UIYAELQSXBAAhaCUgQADjwCBZ4QJGQYIJEh4DCMQIJHGQsfAYTNCBIwoFv4EE/4ADDAgID/wJDgYJD+CJGABIgBBI6JBL4qnDSoQAEXYKVCAAbKCeAQJGagRREOAICCAAYQCCwQADEgY0BBI7wCbAkBKA0YGARQFmAzB4BQFEYMH8BQFsDaB6BQFIIMfxBQFAgMfghQEBwU/gUAu//CoQiBvxQBj/AIQKwCvgNCUYcgeYQaCKQUQTgpSChCmIIQK6HIQLYHIQLsHIQYADUYRQBWIxQCYo5QGj5QDgf/+EA///F4MHAgP//AJCKAMBBIX8PgP+EIQRCLwLoFNYREDAAuAvwJHUYIJHj5ECACpiBAAPwL4JCEAAMMKIL9DFgUHBwMMBIShCaAOAgYJCUITQBBwL1CUIfgBwMweQtwBwIoCeQc4WAQFBeQccBwMBIYJQDhwOCKIRQFGQZQFeQxQDeQjmB8E8EIJQDvBQBh48DIIIQBnAfBN4RBBFgIBBFoNwKAQsBAIItBegWAFgIBBFoJGCoBOBAIKBBIwUgFwYJBIwRQDmAJCIwJQDg/8OQRQECwQjCKAMefQiXBKAMPTIQWDKASZCZoRQD2AJDG4JQC5AJDG4RQB8wJGKANxGQZBCKAM4sAJFUISICgEfaASHBOgQJDKALGB/AFBn4JCv//CAJ1BAgIXC/6rB////wJCg//CIM/BIgADgP/FQQAWFIIABBIs/WAMDZQKlGBQJABAAS0ESwQJGgYJIgAeDBIsYAYSpDAAMGAYUgOIqlCmBWFFATeBAAgQCFYYACZwToBGQ7oBAAhbCBgKpBFwUBAYLyBS4KLDSQLyBh4JESYTyB8BhDnBTCg+AEIIHBIwVggeAEIN+gEOLoQ2BOoM/wEHMgY2B4E8oAZBgEMOYVAj0gKAQ4Bh6aBhyIBcYRSB8EQg4jBKAZBBhEDxEAvDJDhyGBMwJaCGAMHLQyhBgeBYwUeS4nAS4RkCNYJBBcIRLBGQdwZoRuCGQU4YYSSBEIccEIQJDgfABYIyBBIcAvhBBJ4MPH4UAj//CIUfCYbnBWwP/AYL3DL4U/C4IAITwICB/6lBAAQ8CJgJiCKwSrDPoTaCUIVAOYZ0BUIUgcQSQCDIUQcQSkCDIS1BHgQXBDISTBGwQRBDITQDXoYZBKAI2CAQRQGCwRQGCARQGHwRQFYQKxCKAhwDn5QEQgd/AQJQCFoUAWwRQCIIUB/wNCwEGIgUD/gJCoEDQYf4BIUggKhCg/wBIUQWgcPbAZQBAAUfLgRQCLAYJDKAJiFKAZiFKAYDCLAZQCC4RYDKARiGKAkHMQZQEh5iDKAkfMQZQELAhQEv5JDKAixCKAqxEOgn/JwpNC/5OFBw40Fj5ZBn4rFv0/gHwgJTEMQPgA4MYLYYjBjoCBgwJFgYCBdocDXItgBIoACFATUEAAIoCBIwoCFYYADKIQJGuDoEGQw/CAAcOAQMwA4YEBg4WDh6GCNAcMBIKEBawQ8BKYMHWwM8G4IvBNwMDwgJBkEAnBaCgPCgEciACBLofhEQMIIwYgBuIgBghGDJYMfAgPMIwbDDGQIJBEoJQBS4oJBgT/GL4KrGS4ahGvCXIMgMAL4IAEHwI8HjwCBHgYhCBITeDFwQJCH4a0BOYaQDvphBn4JCg4eB/geBv42D/EH/kf9/+BIc///4gf/BIgGB+AcBa4IADh57GABYaCGgKvE8BIBgTICGIQEBuCwBbQIJCSAeASYYJCQwNAAoQJDS4MggB7BagkYXQIoCUIcGhC8DBIcDggkEEIUA4QQEoAJCuICB8DyFjARBGQRBBAAMODALGCfgcHCIMOAoJBBIAWcOosPHwPHHgcGBIK/BuAMBHgIWBh+8gE4G4NwCwUHwQ5BG4M4MgUDwI5BG4JGCsEB4GAh43BIwRLB8HAg4RBg5qCBYIgBcALQCDAMcR4YjBKATkEKAS/DAAZQBcYIJFvCrFAAU8UIoACUIwACjwCBbIIAEh4CBgQJIHg0PAwQyFBIZvBAAcfBIRtFv4FD/6CCgP/DAn/AAX+BIcDBIf8JgoJCSoIAig5DCv/wBIbMBK4NgfwIACR4LGBkDyCMIUAnCxBOouAXgMIeQQACoEOXYRcEEgQrDAAQkCFYYACEgYrCAAQkDFYRQEMIMgbwaXC/DTB/5QEn6pBWAJQEh4FCWwwAFA'))),
+    46,
+    atob("DyEqHigoJikpJygqEQ=="),
+    81 | 65536
+  );
+};
+
+Graphics.prototype.setFontRighteous = function () {
+  // Actual height 16 (15 - 0)
+  return this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('ABN//ABBv0QA4N4AIVwAogACoEC+EH+EP4EOAovACIcPsEfsF7vABBjfghPAjEAv0As0Yv14n/gg+Aj34vP4sPYgH4gFgEgMP8Ef+F7nABBjcwjEwIwZNFEYM//H//3wn3AgwLBwEC8EO/3+v/8E4IfDmMAn+A/8A/0AAYIHBncAGQMDAIUHgEf4ABBBIYAEjwBChgGBB4YBJAAU4AIS1BhAFBgP4h/wHoKPBXYIlDj/gn/wuF4uE4sEYAYLXBBYK9BSwLhDAIKODuP4uYBB3ABDv84n84jgSCEoNzAIIRFFoUc8DFBv/gAIN+A4IBCWoIBBj7XEFoIBDu4BCH4XwsPggPAdIItBf4N+nFOnEOnB/Bg4tBwAmBQINwOoP4u5rB4CNEsEdS4ILBLIMYAIIFBBIINBgFAhznCn/AuPIuHYRIN7N4TnBZQcHnABBgTLBXoOeAIMBdYUHgEPwAZBnvgnHgiFAD4cNwABLCIcwsAbBdILbBg+AeIJoCPIfYTIR7BgABBv8AnwTCgIZB8EHuEP7ABE4EOoEH4CzBCoLNBQ4N48FwAIjvCboYACBIIBDuapBAIQJDnypBQYKBBcIU4vFwnABHmEwFI4PFXoSBCHpoVBsEYCJGAAISZDJY14JZD7BmJhCE48DVIIBEBYYVJgE4AIYJC+F/MYQVHJIXAJISBCoEIFJoBEgDRBToRxCU4wJECYI/Jn8AWIMD8EBG4rjQUILTNuHgAId/EYPAj+AFZ0+vF+n/2FaBhD7ArBjiHBXIM4ue4AI34uLtBoCLDS5YBBHIRbBDIN4dJXgCYNggF+C4JvB/CjBgZLBCIOADwNAFIYJBc4jxJF4YXBoEIRYN8E4SHBToa/BBoIRBvgtBAIOAgfAIIJDCwAJBBoIRBsAnCToKJBGoW4vzEBnFgIIMA//+AIfgh3AgxhBRoJ1BcoMH+AxBLYUACIIVBAIIdDBYMYCAQdBAYMQQoUAgYBMAAUwDY0BHYUP/EOnEOjADBA4ILDWYR5BWoPwCYQBECYMDboQnIAIUPnEGmA3NcogjH/ADBh+4EYcMTIK3C//49kA5gbHnYBCn8P/8H/0P/iFDaoQTBgABDPYRBB/EgCIgFBkEPv/+v/8A4IhFgPggY9Ch14hiwBhARFHYZlCHYgHFNYJBDgYZCB45THXJjhCZoaBC/7fHCYYjBEp3/EIJjLJoIBBgcYh/YAIMMAIf4AIVwCIN/8D3DSoMMjABBh+Ah4/CgChBAIQ1DHYKRCCYUBQISFBh/Ah66CAoQjGEIgHFCIPAhEIOYV4TIaBDJZE7gE/AIMP/0P/hLChBlCGYQBCNYUAjEDRoOAv/8//+/n+8EOAIIfBBIIBBv/+4EGBoYJC/kHwAfBCoMHAIgrBAYMGgA='))),
+    32,
+    atob("BAQHCQcLCAQGBgkIBAgECAoFCQkKCQoICgoEBAgJCAoKCwsKCgkJCwsEBwoJDQsMCgwKCgkLCg0KCgkGCAYFCgQKCggKCAYKCQQECQQMCQkKCgcIBwkJDAgJCAcEBwcA"),
+    16 | 65536
+  );
+};
+
+let appSettings = require("Storage").readJSON("shadowclk.json", 1) || {};
+let settings = require("Storage").readJSON("setting.json", 1) || {};
+let is12Hour = settings["12hour"] !== undefined ? settings["12hour"] : false;
+let color = appSettings.color !== undefined ? appSettings.color : "#0ff";
+let enableLeadingZero = appSettings.enableLeadingZero !== undefined ? appSettings.enableLeadingZero : false;
+let enableSuffix = appSettings.enableSuffix !== undefined ? appSettings.enableSuffix : true;
+
+(function () {
+  let drawTimeout;
+
+  function draw() {
+    var x = g.getWidth() / 2;
+    var y = g.getHeight() / 2;
+    g.reset().clearRect(Bangle.appRect);
+    var date = new Date();
+    var locale = require("locale");
+    var timeStr = locale.time(date, 1);
+
+    // If 24-hour format and leading zero should be removed
+    if (!is12Hour && !enableLeadingZero && timeStr.charAt(0) === '0') {
+      timeStr = timeStr.substr(1);
+    }
+
+    g.setFontAlign(0, 0).setFont("LondrinaSolid").setColor(color).drawString(timeStr, x - 1, y);
+    g.reset().setFontAlign(0, 0).setFont("LondrinaShadow").drawString(timeStr, x - 1, y);
+
+    var dayOfMonth = date.getDate();
+    var month = locale.month(date, 1).slice(0, 1).toUpperCase() + locale.month(date, 1).slice(1).toLowerCase();
+    var year = date.getFullYear();
+    var dayOfMonthStr = dayOfMonth.toString();
+    if (enableSuffix) {
+      var suffix = "";
+      if (dayOfMonth === 1 || dayOfMonth === 21 || dayOfMonth === 31) {
+        suffix = "st";
+      } else if (dayOfMonth === 2 || dayOfMonth === 22) {
+        suffix = "nd";
+      } else if (dayOfMonth === 3 || dayOfMonth === 23) {
+        suffix = "rd";
+      } else {
+        suffix = "th";
+      }
+      dayOfMonthStr += suffix;
+    }
+    var dayOfWeek = locale.dow(date, 0).slice(0, 1).toUpperCase() + locale.dow(date, 0).slice(1).toLowerCase();
+    var dateStr = month + " " + dayOfMonthStr + ", " + year + "\n" + dayOfWeek;
+    g.setFontAlign(0, 0).setFont("Righteous").drawString(dateStr, x, y + 56);
+
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(() => {
+      drawTimeout = undefined;
+      draw();
+    }, 60000 - (Date.now() % 60000));
+  }
+  Bangle.setUI({
+    mode: "clock",
+    remove: function () {
+      if (drawTimeout) clearTimeout(drawTimeout);
+      drawTimeout = undefined;
+      delete Graphics.prototype.setFontLondrinaSolid;
+      delete Graphics.prototype.setFontLondrinaShadow;
+      delete Graphics.prototype.setFontRighteous;
+    }
+  });
+  Bangle.loadWidgets();
+  draw();
+  setTimeout(Bangle.drawWidgets, 0);
+})();
diff --git a/apps/shadowclk/app.png b/apps/shadowclk/app.png
new file mode 100644
index 000000000..a8f7d05ac
Binary files /dev/null and b/apps/shadowclk/app.png differ
diff --git a/apps/shadowclk/interface.html b/apps/shadowclk/interface.html
new file mode 100644
index 000000000..53d206ecd
--- /dev/null
+++ b/apps/shadowclk/interface.html
@@ -0,0 +1,494 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="UTF-8">
+  <link rel="stylesheet" href="../../css/spectre.min.css">
+  <link href="https://fonts.googleapis.com/css2?family=Londrina+Solid&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Londrina+Shadow&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Righteous&display=swap" rel="stylesheet">
+  <title>Shadow Clock Customizer</title>
+  <style>
+    .underlined-heading {
+      position: relative;
+      padding-bottom: 5px;
+    }
+
+    .underlined-heading::after {
+      content: '';
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 100%;
+      border-bottom: 5px solid;
+    }
+
+    .main-container {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      min-height: 100vh;
+      padding-bottom: 100px;
+    }
+
+    .color-button {
+      width: 30px;
+      height: 30px;
+      border: 1px solid black;
+      margin: 5px;
+      cursor: pointer;
+    }
+
+    .color-0 {
+      background: #000
+    }
+
+    .color-1 {
+      background: #f00
+    }
+
+    .color-2 {
+      background: #0f0
+    }
+
+    .color-3 {
+      background: #ff0
+    }
+
+    .color-4 {
+      background: #00f
+    }
+
+    .color-5 {
+      background: #f0f
+    }
+
+    .color-6 {
+      background: #0ff
+    }
+
+    .color-7 {
+      background: #fff
+    }
+
+    #preview-box {
+      width: 176px;
+      height: 176px;
+      border: 1px solid black;
+      margin-top: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: white;
+    }
+
+    #preview-canvas {
+      display: block;
+    }
+
+    .button-container {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      width: 360px;
+      margin-top: 10px;
+    }
+
+    .button-row {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+      margin-top: 5px;
+    }
+
+    .btn {
+      flex-grow: 1;
+      flex-shrink: 1;
+      flex-basis: 0;
+      margin: 5px;
+      width: 160px;
+    }
+
+    #upload {
+      width: 150px;
+    }
+
+    #upload-container {
+      margin-top: 20px;
+      display: flex;
+      justify-content: center;
+      width: 160px;
+    }
+
+    #message-container {
+      height: 40px;
+      margin-top: 20px;
+      text-align: center;
+    }
+  </style>
+</head>
+
+<body>
+  <script src="../../core/lib/interface.js"></script>
+  <div class="main-container">
+    <h1 class="underlined-heading">Clock Customizer</h1>
+    <div id="color-buttons-container"></div>
+    <div class="button-container">
+      <div class="button-row">
+        <button id="toggle-hour-format" class="btn btn-primary" onclick="toggleHourFormat()">Time Mode: 24 Hour</button>
+        <button id="toggle-bg" class="btn btn-primary" onclick="toggleBackground()">Theme: Light</button>
+      </div>
+      <div class="button-row">
+        <button id="toggle-leading-zero" class="btn btn-primary" onclick="toggleLeadingZero()">Leading Zero:
+          OFF</button>
+        <button id="toggle-suffix" class="btn btn-primary" onclick="toggleSuffix()">Suffix: ON</button>
+      </div>
+    </div>
+    <div id="preview-box">
+      <canvas id="preview-canvas" width="176" height="176"></canvas>
+    </div>
+    <div id="upload-container">
+      <button id="upload" class="btn btn-primary">Upload</button>
+    </div>
+    <div id="message-container">
+      <div id="message"></div>
+    </div>
+  </div>
+  <script>
+    const messageDiv = document.getElementById('message');
+
+    // Initialize app and system settings
+    let selectedColor = "#0ff";
+    let isDarkBg = false;
+    let leadingZero = false;
+    let prevLeadingZeroState = false;
+    let suffix = true;
+    let is12Hour = false;
+
+    // Create and add color buttons to the UI
+    let colors = ['#000', '#f00', '#0f0', '#ff0', '#00f', '#f0f', '#0ff', '#fff'];
+    let colorButtonsContainer = document.getElementById('color-buttons-container');
+    colors.forEach((color, i) => {
+      let button = document.createElement('button');
+      button.className = `color-button color-${i}`;
+      button.dataset.color = color;
+      colorButtonsContainer.appendChild(button);
+    });
+    document.querySelectorAll(".color-button").forEach(button => {
+      button.addEventListener("click", () => {
+        selectedColor = button.dataset.color;
+        drawText(selectedColor);
+      });
+    });
+
+    let leadingZeroButton = document.getElementById('toggle-leading-zero');
+    let hourFormatButton = document.getElementById('toggle-hour-format');
+    let suffixButton = document.getElementById('toggle-suffix');
+    let bgButton = document.getElementById('toggle-bg');
+
+    // Function to update the button text based on the current state
+    function updateButtonState() {
+      if (leadingZeroButton.disabled) {
+        leadingZeroButton.textContent = prevLeadingZeroState ? 'Leading Zero: ON' : 'Leading Zero: OFF';
+      } else {
+        leadingZeroButton.textContent = leadingZero ? 'Leading Zero: ON' : 'Leading Zero: OFF';
+      }
+      hourFormatButton.textContent = is12Hour ? 'Time Mode: 12 Hour' : 'Time Mode: 24 Hour';
+      suffixButton.textContent = suffix ? 'Suffix: ON' : 'Suffix: OFF';
+      bgButton.textContent = isDarkBg ? 'Theme: Dark' : 'Theme: Light';
+
+      if (is12Hour) {
+        prevLeadingZeroState = leadingZero; // Store the state before disabling
+        leadingZeroButton.disabled = true;
+        leadingZeroButton.textContent = prevLeadingZeroState ? 'Leading Zero: ON' : 'Leading Zero: OFF';
+      } else {
+        leadingZero = prevLeadingZeroState; // Retrieve the stored state
+        leadingZeroButton.disabled = false;
+        leadingZeroButton.textContent = leadingZero ? 'Leading Zero: ON' : 'Leading Zero: OFF';
+      }
+    }
+
+    function toggleLeadingZero() {
+      if (!is12Hour) { // Only allow toggle if in 24-hour mode
+        leadingZero = !leadingZero;
+        prevLeadingZeroState = leadingZero; // Update previous state on each toggle
+        updateButtonState();
+        drawText(selectedColor);
+      }
+    }
+
+    function toggleHourFormat() {
+      is12Hour = !is12Hour;
+      updateButtonState();  // This will also correctly update leadingZero
+      drawText(selectedColor);
+    }
+
+
+    // Toggle the background color between dark and light
+    function toggleBackground() {
+      isDarkBg = !isDarkBg; // Toggle the background state
+      let previewBox = document.getElementById("preview-box");
+      previewBox.style.backgroundColor = isDarkBg ? "black" : "white";
+      updateButtonState();
+      drawText(selectedColor); // Redraw the text with updated color
+    }
+
+    function toggleSuffix() {
+      suffix = !suffix;
+      document.getElementById("toggle-suffix").textContent = `Suffix: ${suffix ? 'On' : 'Off'}`;
+      updateButtonState();
+      drawText(selectedColor);
+    }
+
+    function formatTime(date) {
+      let hours = date.getHours();
+      let minutes = date.getMinutes();
+      // If 12 hour format is selected, adjust hours
+      if (is12Hour) {
+        hours = hours % 12;
+        hours = hours ? hours : 12; // the hour '0' should be '12' in 12h format
+      }
+      let formattedHours = (!is12Hour && leadingZero && hours < 10) ? `0${hours}` : `${hours}`;
+      let formattedMinutes = minutes < 10 ? `0${minutes}` : `${minutes}`;
+      return `${formattedHours}:${formattedMinutes}`;
+    }
+
+    // Get the current date as a formatted string
+    function getCurrentDate(suffix) {
+      let months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+      let suffixes = ["st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "st"];
+      let date = new Date();
+      let month = months[date.getMonth()];
+      let day = date.getDate();
+      let suffixString = suffix ? suffixes[day - 1] : '';
+      let year = date.getFullYear();
+      return `${month} ${day}${suffixString}, ${year}`;
+    }
+
+    // Get the current day of the week as a string
+    function getCurrentDay() {
+      let days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+      let date = new Date();
+      return days[date.getDay()];
+    }
+
+    // Draw the time, date, and day of the week on the canvas
+    function drawText(color) {
+      let canvas = document.getElementById("preview-canvas");
+      let ctx = canvas.getContext("2d");
+      let previewBox = document.getElementById("preview-box");
+      previewBox.style.backgroundColor = isDarkBg ? "black" : "white";
+
+      // Clear the canvas
+      ctx.clearRect(0, 0, canvas.width, canvas.height);
+
+      // Set the base font and selected color
+      ctx.font = "81px Londrina Solid";
+      ctx.fillStyle = color;
+
+      // Get the current local system time
+      let currentTime = formatTime(new Date());
+
+      // Measure the text width and calculate the horizontal position
+      let timeWidth = ctx.measureText(currentTime).width;
+      let xPos = (canvas.width - timeWidth) / 2;
+
+      // Measure the text height based on the font size and calculate the vertical position
+      let timeHeight = ctx.measureText('M').actualBoundingBoxAscent + ctx.measureText('M').actualBoundingBoxDescent;
+      let yPos = (canvas.height + timeHeight) / 2;
+
+      // Draw the time
+      ctx.fillText(currentTime, xPos, yPos);
+
+      // Set the outline font and color
+      ctx.font = "81px Londrina Shadow";
+
+      // Set the text color based on the background state
+      if (isDarkBg) {
+        ctx.fillStyle = "#fff";
+      } else {
+        ctx.fillStyle = "#000";
+      }
+
+      // Draw the time again
+      ctx.fillText(currentTime, xPos, yPos);
+
+      // Set the font for the date
+      ctx.font = "13px Righteous";
+
+      // Get the current date
+      let currentDate = getCurrentDate(suffix);
+
+      // Measure the date width and calculate the horizontal position
+      let dateWidth = ctx.measureText(currentDate).width;
+      xPos = (canvas.width - dateWidth) / 2;
+
+      // Draw the date
+      yPos += 28;
+      ctx.fillText(currentDate, xPos, yPos);
+
+      // Get the current day of the week
+      let currentDay = getCurrentDay();
+
+      // Measure the day width and calculate the horizontal position
+      let dayWidth = ctx.measureText(currentDay).width;
+      xPos = (canvas.width - dayWidth) / 2;
+
+      // Draw the day of the week
+      ctx.fillText(currentDay, xPos, yPos + 12);
+    }
+
+    // Converts a hexadecimal color code to a 16-bit integer value.
+    // If the input hex string is in short format (#rgb), it's converted to long format (#rrggbb) first.
+    // Returns the 16-bit integer value representing the color.
+    function hexToDec(hex) {
+      if (hex.length === 4) {
+        hex = `#${hex[1]}${hex[1]}${hex[2]}${hex[2]}${hex[3]}${hex[3]}`;
+      }
+      let r = parseInt(hex.slice(1, 3), 16) >> 3;
+      let g = parseInt(hex.slice(3, 5), 16) >> 2;
+      let b = parseInt(hex.slice(5, 7), 16) >> 3;
+      return (r << 11) | (g << 5) | b;
+    }
+
+    // Colors from 'Light BW' and 'Dark BW' themes
+    function createThemeColors(isDarkBg) {
+      return isDarkBg ? {
+        fg: hexToDec("#fff"),
+        bg: hexToDec("#000"),
+        fg2: hexToDec("#fff"),
+        bg2: hexToDec("#004"),
+        fgH: hexToDec("#fff"),
+        bgH: hexToDec("#00f"),
+        dark: true
+      } : {
+        fg: hexToDec("#000"),
+        bg: hexToDec("#fff"),
+        fg2: hexToDec("#000"),
+        bg2: hexToDec("#cff"),
+        fgH: hexToDec("#000"),
+        bgH: hexToDec("#0ff"),
+        dark: false
+      };
+    }
+
+    // Save the provided theme to Bangle.js storage and set Shadow Clock as the default clock
+    function saveThemeToSettings(themeColors) {
+      Puck.eval('[require("Storage").readJSON("setting.json", true)]', (dataArray) => {
+        let data = dataArray ? dataArray[0] : null;
+        if (data) {
+          // Ensure that data.theme exists
+          if (!data.theme) {
+            data.theme = {};
+          }
+          // Save all theme values
+          for (let key in themeColors) {
+            data.theme[key] = themeColors[key];
+          }
+          // Save settings for 12 or 24 hour mode
+          data["12hour"] = is12Hour;
+          // Set Shadow Clock as default
+          data.clock = "shadowclk.app.js";
+          Puck.write(`require("Storage").write("setting.json", ${JSON.stringify(data)});\n`, (result) => {
+            console.log('Theme saved:', result);
+          });
+        }
+      });
+    }
+
+    function loadSettings(callback) {
+      Puck.eval('[require("Storage").readJSON("shadowclk.json", true)]', (dataArray) => {
+        let data = dataArray ? dataArray[0] : null;
+        if (data) {
+          // Apply color, theme, enableLeadingZero, enableSuffix and timeMode from JSON
+          let { color, theme, enableLeadingZero, enableSuffix, enable12Hour } = data;
+          selectedColor = color !== undefined ? color : selectedColor;
+          isDarkBg = theme !== undefined ? (theme === "dark") : isDarkBg;
+          // Use the JSON values if they exist, otherwise use the current values
+          leadingZero = enableLeadingZero !== undefined ? enableLeadingZero : leadingZero;
+          prevLeadingZeroState = leadingZero; // Store the current state
+          suffix = enableSuffix !== undefined ? enableSuffix : suffix;
+          is12Hour = enable12Hour !== undefined ? enable12Hour : is12Hour; // Update the time mode from the settings
+          displayMessage("Previous settings loaded.", 3000);
+        } else {
+          // If no JSON data, load defaults
+          selectedColor = selectedColor;
+          isDarkBg = isDarkBg;
+          leadingZero = leadingZero;
+          prevLeadingZeroState = leadingZero;
+          suffix = suffix;
+          is12Hour = is12Hour;
+          displayMessage("Defaults loaded.", 3000);
+        }
+        updateButtonState(); // Update button state regardless
+        callback();
+      });
+    }
+
+    // Update the time display every second
+    function updateTime() {
+      setInterval(() => {
+        drawText(selectedColor);
+      }, 1000);
+    }
+
+    // Display a message for a given duration and then remove it
+    function displayMessage(text, timeout) {
+      // Remove any existing message
+      while (messageDiv.firstChild) {
+        messageDiv.removeChild(messageDiv.firstChild);
+      }
+      // Create a new message element
+      const message = document.createElement('p');
+      message.innerHTML = text; // Use innerHTML instead of textContent
+      message.style.fontSize = '24px';
+      messageDiv.appendChild(message);
+      // Remove the message element after the timeout
+      setTimeout(() => {
+        messageDiv.removeChild(message);
+      }, timeout);
+    }
+
+    // Attach an event listener to the 'upload' button to save color and theme settings to Bangle.js storage
+    document.getElementById("upload").addEventListener("click", function () {
+      // Save theme settings to Bangle.js
+      let themeColors = createThemeColors(isDarkBg);
+      saveThemeToSettings(themeColors);
+      // Save Shadow Clock app setting
+      let data = {
+        color: selectedColor,
+        theme: isDarkBg ? "dark" : "light",
+        enableLeadingZero: leadingZero,
+        enableSuffix: suffix,
+        enable12Hour: is12Hour
+      };
+
+      // Write the updated settings back to shadowclk.json
+      Puck.write(`require("Storage").write("shadowclk.json", ${JSON.stringify(data)});\n`, (result) => {
+        console.log('App settings saved:', result);
+      });
+
+      // Display the message using displayMessage function
+      displayMessage('Configuration sent...<br>Hold button on Bangle.js', 5000);
+    });
+
+    // Load required fonts for the application
+    function loadFonts() {
+      return Promise.all([
+        document.fonts.load('81px Londrina Solid'),
+        document.fonts.load('81px Londrina Shadow'),
+        document.fonts.load('13px Righteous')
+      ]);
+    }
+
+    async function init() {
+      await loadFonts(); // Load fonts before drawing for the first time
+      loadSettings(updateTime); // Pass updateTime as the callback function to loadSettings
+    }
+    init();
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/apps/shadowclk/metadata.json b/apps/shadowclk/metadata.json
new file mode 100644
index 000000000..432558b95
--- /dev/null
+++ b/apps/shadowclk/metadata.json
@@ -0,0 +1,35 @@
+{
+  "id": "shadowclk",
+  "name": "Shadow Clock",
+  "version": "0.04",
+  "description": "A simple clock using the Londrina font in color with a shadowed outline. Based on the Anton Clock.",
+  "icon": "app.png",
+  "screenshots": [{
+    "url": "screenshot.png"
+  }, {
+    "url": "screenshot-1.png"
+  }],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "readme": "README.md",
+  "interface": "interface.html",
+  "allow_emulator": true,
+  "storage": [{
+      "name": "shadowclk.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "shadowclk.settings.js",
+      "url": "settings.js"
+    },
+    {
+      "name": "shadowclk.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    }
+  ],
+  "data": [{
+    "name": "shadowclk.json"
+  }]
+}
diff --git a/apps/shadowclk/screenshot-1.png b/apps/shadowclk/screenshot-1.png
new file mode 100644
index 000000000..2ebc7a65c
Binary files /dev/null and b/apps/shadowclk/screenshot-1.png differ
diff --git a/apps/shadowclk/screenshot.png b/apps/shadowclk/screenshot.png
new file mode 100644
index 000000000..996be6384
Binary files /dev/null and b/apps/shadowclk/screenshot.png differ
diff --git a/apps/shadowclk/settings.js b/apps/shadowclk/settings.js
new file mode 100644
index 000000000..3fb774892
--- /dev/null
+++ b/apps/shadowclk/settings.js
@@ -0,0 +1,160 @@
+(function (back) {
+  let teletextColors = ["#000", "#f00", "#0f0", "#ff0", "#00f", "#f0f", "#0ff", "#fff"];
+  let teletextColorNames = ["Black", "Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "White"];
+  let sysSettings = require('Storage').readJSON("setting.json", 1) || {};
+
+  // Load and set default settings
+  let appSettings = Object.assign({
+    color: teletextColors[6],
+    theme: 'light',
+    enableSuffix: true,
+    enableLeadingZero: false,
+    enable12Hour: false
+  }, require('Storage').readJSON("shadowclk.json", true) || {});
+
+  // Check if shadowclk is the selected clock
+  if (sysSettings.clock === "shadowclk.app.js") {
+      // Sync app settings with system settings
+      appSettings.theme = sysSettings.theme.dark ? 'dark' : 'light';
+      if (sysSettings['12hour'] !== undefined) {
+          appSettings.enable12Hour = sysSettings['12hour'];
+      }
+  }
+
+  // Colors from 'Light BW' and 'Dark BW' themes
+  function createThemeColors(mode) {
+    let cl = x => g.setColor(x).getColor();
+    return mode ? {
+      fg: cl("#fff"),
+      bg: cl("#000"),
+      fg2: cl("#fff"),
+      bg2: cl("#004"),
+      fgH: cl("#fff"),
+      bgH: cl("#00f"),
+      dark: true
+    } : {
+      fg: cl("#000"),
+      bg: cl("#fff"),
+      fg2: cl("#000"),
+      bg2: cl("#cff"),
+      fgH: cl("#000"),
+      bgH: cl("#0ff"),
+      dark: false
+    };
+  }
+
+  // Switch theme and save to storage
+  function switchTheme(mode) {
+    if (mode === g.theme.dark) return;
+    sysSettings.theme = createThemeColors(mode);
+    if (sysSettings.clock === "shadowclk.app.js") {
+      require('Storage').writeJSON("setting.json", sysSettings);
+    }
+    updateTheme(mode);
+  }
+
+  // Update the current menu with the new theme
+  function updateTheme(mode) {
+    let newTheme = createThemeColors(mode);
+    g.theme = newTheme;
+    appSettings.theme = mode ? 'dark' : 'light';
+    writeSettings();
+    delete g.reset;
+    g._reset = g.reset;
+    g.reset = function (n) {
+      return g._reset().setColor(newTheme.fg).setBgColor(newTheme.bg);
+    };
+    g.clear = function (n) {
+      if (n) g.reset();
+      return g.clearRect(0, 0, g.getWidth(), g.getHeight());
+    };
+    g.clear(1);
+    Bangle.drawWidgets();
+    showMenu();
+  }
+
+  // Read current system theme setting
+  function getCurrentTheme() {
+    if (appSettings && appSettings.theme) {
+      return appSettings.theme;
+    }
+    return sysSettings && sysSettings.theme && sysSettings.theme.dark ? 'dark' : 'light';
+  }
+
+  // Read the current time mode
+  function getCurrentTimeMode() {
+    if (appSettings && appSettings.enable12Hour !== undefined) {
+      return appSettings.enable12Hour;
+    }
+    return sysSettings && sysSettings['12hour'] !== undefined ? sysSettings['12hour'] : undefined;
+  }
+
+  // Save settings to storage
+  function writeSettings() {
+    require('Storage').writeJSON("shadowclk.json", appSettings);
+  }
+
+  function writeTimeModeSetting() {
+    if (sysSettings.clock === "shadowclk.app.js") {
+        sysSettings['12hour'] = appSettings.enable12Hour;
+        require('Storage').writeJSON("setting.json", sysSettings);
+    }
+  }
+
+  function showMenu() {
+    appSettings.theme = getCurrentTheme();
+    appSettings.enable12Hour = getCurrentTimeMode();
+
+    E.showMenu({
+      "": {
+        "title": "Shadow Clock"
+      },
+      "< Back": () => back(),
+      'Theme:': {
+        value: (appSettings.theme === 'dark'),
+        format: v => v ? "Dark" : "Light",
+        onchange: v => {
+          writeSettings();
+          switchTheme(v);
+        }
+      },
+      'Color:': {
+        value: teletextColors.indexOf(appSettings.color),
+        min: 0,
+        max: 7,
+        onchange: v => {
+          appSettings.color = teletextColors[v];
+          writeSettings();
+        },
+        format: v => teletextColorNames[v]
+      },
+      'Date Suffix:': {
+        value: appSettings.enableSuffix,
+        format: v => v ? 'Yes' : 'No',
+        onchange: v => {
+          appSettings.enableSuffix = v;
+          writeSettings();
+        }
+      },
+      'Lead Zero:': {
+        value: appSettings.enableLeadingZero,
+        format: v => v ? 'Yes' : 'No',
+        onchange: v => {
+          appSettings.enableLeadingZero = v;
+          writeSettings();
+        }
+      },
+      'Time Mode:': {
+        value: appSettings.enable12Hour,
+        format: v => v ? '12 Hr' : '24 Hr',
+        onchange: v => {
+          appSettings.enable12Hour = v;
+          writeSettings();
+          writeTimeModeSetting();
+        }
+      }
+    });
+  }
+  // Initially show the menu
+  showMenu();
+});
diff --git a/apps/simplest/simplest.app.js b/apps/simplest/simplest.app.js
index 4038212d0..b1e22743d 100644
--- a/apps/simplest/simplest.app.js
+++ b/apps/simplest/simplest.app.js
@@ -13,6 +13,7 @@ function draw() {
   g.setFontAlign(0, 0);
   g.setColor(g.theme.fg);
   g.drawString(timeStr, w/2, h/2);
+  console.log(timeStr + ", simplest");
   queueDraw();
 }
 
diff --git a/apps/simplestpp/ChangeLog b/apps/simplestpp/ChangeLog
index 4db8559c8..53ccf75db 100644
--- a/apps/simplestpp/ChangeLog
+++ b/apps/simplestpp/ChangeLog
@@ -1,2 +1,4 @@
 0.01: first release
 0.02: removed fast load, minimalism is useful for narrowing down on issues
+0.03: Use clock_info module as an app
+0.04: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/simplestpp/app.js b/apps/simplestpp/app.js
index 0dcb883d3..66caadfe2 100644
--- a/apps/simplestpp/app.js
+++ b/apps/simplestpp/app.js
@@ -5,7 +5,7 @@ function draw() {
   var timeStr = require("locale").time(date,1);
   var h = g.getHeight();
   var w = g.getWidth();
-  
+
   g.reset();
   g.setColor(g.theme.bg);
   g.fillRect(Bangle.appRect);
@@ -34,7 +34,7 @@ function queueDraw() {
 /**
  * clock_info_support
  * this is the callback function that get invoked by clockInfoMenu.redraw();
- * 
+ *
  * We will display the image and text on the same line and centre the combined
  * length of the image+text
  *
@@ -42,7 +42,7 @@ function queueDraw() {
 function clockInfoDraw(itm, info, options) {
 
   g.reset().setFont('Vector',24).setBgColor(options.bg).setColor(options.fg);
-  
+
   //use info.text.toString(), steps does not have length defined
   var text_w = g.stringWidth(info.text.toString());
   // gap between image and text
@@ -54,7 +54,7 @@ function clockInfoDraw(itm, info, options) {
 
   // clear the whole info line
   g.clearRect(0, options.y -1, g.getWidth(), options.y+24);
-  
+
   // draw the image if we have one
   if (info.img) {
     // image start
@@ -82,7 +82,7 @@ let clockInfoItems = require("clock_info").load();
  * selected after tapping on it
  *
  */
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app:"simplestpp", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
 
 // Clear the screen once, at startup
 g.clear();
diff --git a/apps/simplestpp/metadata.json b/apps/simplestpp/metadata.json
index 145bf7309..c81846539 100644
--- a/apps/simplestpp/metadata.json
+++ b/apps/simplestpp/metadata.json
@@ -2,14 +2,15 @@
   "id": "simplestpp",
   "name": "Simplest++ Clock",
   "shortName": "Simplest++",
-  "version": "0.02",
+  "version": "0.04",
   "description": "The simplest working clock, with clock_info, acts as a tutorial piece",
   "readme": "README.md",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot3.png"}],
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "supports": ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
   "storage": [
     {"name":"simplestpp.app.js","url":"app.js"},
     {"name":"simplestpp.img","url":"icon.js","evaluate":true}
diff --git a/apps/sleeplog/ChangeLog b/apps/sleeplog/ChangeLog
index aa700f931..93202b291 100644
--- a/apps/sleeplog/ChangeLog
+++ b/apps/sleeplog/ChangeLog
@@ -7,4 +7,7 @@
 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
-0.12: Improve README, option to add functions triggered by status changes or time periods, remove old log (<0.10) conversion
\ No newline at end of file
+0.12: Improve README, option to add functions triggered by status changes or time periods, remove old log (<0.10) conversion
+0.13: Prevent to stay in consecutive sleep if not worn, correct trigger calling, add trigger object itself as argument to the fn function
+0.14: Add "Delete all logfiles before" to interface.html, display all logfiles in the interface
+0.15: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/sleeplog/README.md b/apps/sleeplog/README.md
index 71a7ddde2..10468200e 100644
--- a/apps/sleeplog/README.md
+++ b/apps/sleeplog/README.md
@@ -7,11 +7,11 @@ This app logs and displays the following states:
 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.
 
 #### Explanations
-* __Detection of Sleep__  
+* __Detection of Sleep__
   The movement value of bangle's build in health event that is triggered every 10 minutes is checked against the thresholds for light and deep sleep. If the measured movement is lower or equal to the __Deep Sleep__-threshold a deep sleep phase is detected for the last 10 minutes. If the threshold is exceeded but not the __Light Sleep__-threshold than the last timeperiod is detected as light sleep phase. On exceeding even this threshold it is assumed that you were awake.
-* __True Sleep__  
+* __True Sleep__
   The true sleep value is a simple addition of all registered sleeping periods.
-* __Consecutive Sleep__  
+* __Consecutive Sleep__
   In addition the consecutive sleep value tries to predict the complete time you were asleep, even the very light sleeping periods when an awake period is detected based on the registered movements. All periods after a sleeping period will be summarized until 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 Consecutive__) it is not considered, otherwise it will be added to the consecutive sleep value.
 
 Logfiles are not removed on un-/reinstall to prevent data loss.
@@ -19,7 +19,7 @@ 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_1234.log`*         | past logfiles   | App Web Interface |
 | `sleeplog_123456.csv`*       | debugging files | Web IDE           |
 
 
@@ -100,13 +100,20 @@ Logfiles are not removed on un-/reinstall to prevent data loss.
 
 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!__
+- A list of all found logfiles with following options for each file:
+  - __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!__
+- __csv time format__
+    __JavaScript (milliseconds since 1970)__ /
+    _UNIX (seconds since 1970)_ /
+    _Office (days since 1900)_
+- __delete all logfiles before__
+  Deletes all logfile before the given date from the watch. __Please backup your data first!__
 
 ---
 ### Timestamps and Files
@@ -184,11 +191,12 @@ if (typeof (global.sleeplog || {}).trigger === "object") {
     from: 0,           // 0 as default, in ms, first time fn will be called
     to: 24*60*60*1000, // 24h as default, in ms, last time fn will be called
       // reference time to from & to is rounded to full minutes
-    fn: function(data) { print(data); } // function to be executed
+    fn: function(data, thisTriggerEntry) { print(data); } // function to be executed
   };
 }
 ```
-The passed data object has the following properties:
+
+The passed __data__ object has the following properties:
 - timestamp: of the status change as date object,
     (should be around 10min. before "now", the actual call of the function)
 - status: value of the new status (0-4),
@@ -199,10 +207,16 @@ The passed data object has the following properties:
 - prevConsecutive: if changed the value of the previous status (0-2) else undefined
 
 
+If you want to use other variables or functions from the trigger object inside the trigger fn function, you will find them inside the __thisTriggerEntry__ object, as the this keyword is not working in this scenario. The function itself (the fn property) is not passed inside the thisTriggerEntry object.
+
+
 ---
 ### Worth Mentioning
 ---
 #### To do list
+- Optimize interface.html:
+  - Open logfile through require("Storage") instead of require("sleeplog").
+  - Give feedback how much files have been deleted on "delete all logfiles before".
 - Check translations.
 - Add more functionallities to interface.html.
 - Enable receiving data on the Gadgetbridge side + testing.
diff --git a/apps/sleeplog/boot.js b/apps/sleeplog/boot.js
index 78fd23450..53873ab29 100644
--- a/apps/sleeplog/boot.js
+++ b/apps/sleeplog/boot.js
@@ -235,6 +235,8 @@ if (sleeplog.conf.enabled) {
         // reset consecutive status
         data.consecutive = 0;
       }
+      // reset consecutive sleep if not worn
+      if (data.status === 1) this.consecutive = 1;
       // check if consecutive unknown
       if (!this.consecutive) {
         // check if long enough asleep or too long awake
@@ -265,10 +267,13 @@ if (sleeplog.conf.enabled) {
         // go through all triggers
         triggers.forEach(key => {
           // read entry to key
-          var entry = this.trigger[key];
+          let entry = this.trigger[key];
+          // set from and to values to default if unset
+          let from = entry.from || 0;
+          let to = entry.to || 24 * 60 * 60 * 1000;
           // check if the event matches the entries requirements
           if (typeof entry.fn === "function" && (changed || !entry.onChange) &&
-            (entry.from || 0) <= time && (entry.to || 24 * 60 * 60 * 1000) >= time)
+            (from <= to ? from <= time && time <= to : time <= to || from <= time))
             // and call afterwards with status data
             setTimeout(entry.fn, 100, {
               timestamp: new Date(data.timestamp),
@@ -276,7 +281,7 @@ if (sleeplog.conf.enabled) {
               consecutive: data.consecutive,
               prevStatus: data.status === this.status ? undefined : this.status,
               prevConsecutive: data.consecutive === this.consecutive ? undefined : this.consecutive
-            });
+            }, (e => {delete e.fn; return e;})(entry.clone()));
         });
       }
 
@@ -298,6 +303,7 @@ if (sleeplog.conf.enabled) {
 
       // send status to gadgetbridge
       var gb_kinds = "unknown,not_worn,activity,light_sleep,deep_sleep";
+      Bluetooth.println("");
       Bluetooth.println(JSON.stringify({
         t: "act",
         act: gb_kinds.split(",")[data.status],
diff --git a/apps/sleeplog/interface.html b/apps/sleeplog/interface.html
index d59515275..09baefb11 100644
--- a/apps/sleeplog/interface.html
+++ b/apps/sleeplog/interface.html
@@ -38,7 +38,7 @@ function viewLog(logData, filename) {
           <td>` +
             new Date(entry[0] * 6E5).toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'}) + `
           </td>
-          <td style="text-align: right"><div class="container"` + 
+          <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) +
               `%)">` : `>`) +
@@ -84,7 +84,7 @@ function readLog(date, callback) {
 
 function deleteFile(filename, callback) {
   if (window.confirm("Do you really want to remove " + filename)) {
-    Util.showModal("Deleting...");
+    Util.showModal("Deleting " + filename + " ...");
     if (filename.endsWith(" (StorageFile)")) {
       Util.eraseStorageFile(filename, () => {
         Util.hideModal();
@@ -99,15 +99,29 @@ function deleteFile(filename, callback) {
   }
 }
 
+function deleteBefore(dateString, callback) {
+  date = new Date(dateString);
+  if (window.confirm("Do you really want to remove all data before " + date.toLocaleDateString(undefined))) {
+    Util.showModal("Deleting all data before" + date.toLocaleDateString(undefined) + " ...");
+    Puck.eval(`require("Storage").list(/^sleeplog_\\d+.log$/)` +
+      `.filter(file => (parseInt(file.match(/\\d+/)[0]) + 0.25) * 12096E5 < ` + date.valueOf() + ` - 12096E5)` +
+      `.map(file => require("Storage").erase(file)).length`, count => {
+      Util.hideModal();
+      window.alert(count + " files deleted");
+      callback();
+    })
+  }
+}
+
 function viewFiles() {
   Util.showModal("Loading...");
   domTable.innerHTML = "";
-  Puck.eval(`require("Storage").list(/^sleeplog_\\d\\d\\d\\d\\.log$/)`, files => {
+  Puck.eval(`require("Storage").list(/^sleeplog_\\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
+      date: (parseInt(file.match(/\d+/)[0]) + 0.25) * 12096E5
     }});
     files = files.sort((a, b) => a.date - b.date);
     var html = `
@@ -146,10 +160,10 @@ function viewFiles() {
     <div class="container">
       <form class="form-horizontal">
         <div class="form-group">
-          <div class="col-3 col-sm-12">
+          <div class="col-sm-12">
             <label class="form-label"><b>csv time format</b></label>
           </div>
-          <div class="col-9 col-sm-12">
+          <div class="col-sm-12">
             <select class="form-select" id="csvTime">
               <option>JavaScript (milliseconds since 1970)</option>
               <option>UNIX (seconds since 1970)</option>
@@ -158,6 +172,23 @@ function viewFiles() {
           </div>
         </div>
       </form>
+    </div>
+    <div class="container">
+      <form class="form-horizontal">
+        <div class="form-group">
+          <div class="col-sm-12">
+            <label class="form-label"><b>Delete all logfiles before</b></label>
+          </div>
+          <div class="col-sm-10">
+            <input class="form-input" id="delBeforeDate" type="date" value="2022-01-01">
+          </div>
+          <div class="col-mx-auto">
+            <button class="btn tooltip btn-error" data-tooltip="delete old files" task="delBefore">
+              <i class="icon icon-delete"></i>
+            </button>
+          </div>
+        </div>
+      </form>
     </div>`;
     domTable.innerHTML = html;
     Util.hideModal();
@@ -166,12 +197,16 @@ function viewFiles() {
       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());
+        if (task === "delBefore") {
+          deleteBefore(document.getElementById("delBeforeDate").value, () => viewFiles());
+        } else {
+          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());
+        }
       });
     }
   });
diff --git a/apps/sleeplog/lib.js b/apps/sleeplog/lib.js
index 83c45de66..8aa1748b1 100644
--- a/apps/sleeplog/lib.js
+++ b/apps/sleeplog/lib.js
@@ -123,7 +123,7 @@ exports = {
         // free ram
         files = undefined;
 
-        // check if log from files is available 
+        // check if log from files is available
         if (filesLog.length) {
           // remove unwanted entries
           filesLog = filesLog.filter((entry, index, filesLog) => (
diff --git a/apps/sleeplog/metadata.json b/apps/sleeplog/metadata.json
index 353476446..911e0cfa1 100644
--- a/apps/sleeplog/metadata.json
+++ b/apps/sleeplog/metadata.json
@@ -2,7 +2,7 @@
   "id":"sleeplog",
   "name":"Sleep Log",
   "shortName": "SleepLog",
-  "version": "0.12",
+  "version": "0.15",
   "description": "Log and view your sleeping habits. This app is using the built in movement calculation.",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/sleeplogalarm/ChangeLog b/apps/sleeplogalarm/ChangeLog
index 80f8bd7e4..286221777 100644
--- a/apps/sleeplogalarm/ChangeLog
+++ b/apps/sleeplogalarm/ChangeLog
@@ -1,4 +1,5 @@
 0.01: New App!
 0.02: Add "from Consec."-setting
 0.03: Correct how to ignore last triggered alarm
-0.04: Make "disable alarm" possible on next day; correct alarm filtering; improve settings
\ No newline at end of file
+0.04: Make "disable alarm" possible on next day; correct alarm filtering; improve settings
+0.05: Correct hide function + replace all `var` with `let`.
diff --git a/apps/sleeplogalarm/README.md b/apps/sleeplogalarm/README.md
index 005377fb1..8da369eb3 100644
--- a/apps/sleeplogalarm/README.md
+++ b/apps/sleeplogalarm/README.md
@@ -1,6 +1,6 @@
 # Sleep Log Alarm
 
-This widget searches for active alarms and raises an own alarm event up to the defined time earlier, if in light sleep or awake phase. Optional the earlier alarm will only be triggered if comming from or in consecutive sleep. The settings of the earlier alarm can be adjusted and it is possible to filter the targeting alarms by time and message. By default the time of the targeting alarm is displayed inside the widget which can be adjusted, too.
+This widget searches for active alarms and raises an own alarm event up to the defined time earlier, if in light sleep or awake phase. Optional the earlier alarm will only be triggered if comming from or in consecutive sleep. The settings of the earlier alarm can be adjusted and it is possible to filter the targeting alarms by time and message. The widget is only displayed if an active alarm is detected. The time of the targeting alarm is displayed inside the widget, too. The time or the complete widget can be hidden in the options.
 
 _This widget does not detect sleep on its own and can not create alarms. It requires the [sleeplog](/apps/?id=sleeplog) app and any alarm app that uses [sched](/apps/?id=sched) to be installed._
 
@@ -30,7 +30,7 @@ _This widget does not detect sleep on its own and can not create alarms. It requ
     - __msg includes__ | include only alarms including this string in msg  
       __""__ / ...
   - __Widget__ submenu
-    - __hide__ | completely hide the widget  
+    - __hide always__ | completely hide the widget  
       _on_ / __off__
     - __show time__ | show the time of the targeting alarm  
       __on__ / _off_
diff --git a/apps/sleeplogalarm/lib.js b/apps/sleeplogalarm/lib.js
index 343e811af..609a45fde 100644
--- a/apps/sleeplogalarm/lib.js
+++ b/apps/sleeplogalarm/lib.js
@@ -1,5 +1,5 @@
 // load library
-var sched = require("sched");
+let sched = require("sched");
 
 // find next active alarm in range
 function getNextAlarm(allAlarms, fo, withId) {
@@ -10,7 +10,7 @@ function getNextAlarm(allAlarms, fo, withId) {
   // return next active alarms in range, filter for
   //  active && not timer && not own alarm &&
   //  after from && before to && includes msg
-  var ret = allAlarms.filter(
+  let ret = allAlarms.filter(
       a => a.on && !a.timer && a.id !== "sleeplog" &&
       a.t >= fo.from && a.t < fo.to && (!fo.msg || a.msg.includes(fo.msg))
     ).map(a => { // add time to alarm
@@ -21,7 +21,7 @@ function getNextAlarm(allAlarms, fo, withId) {
     ).sort((a, b) => a.tTo - b.tTo);
   // prevent triggering for an already triggered alarm again if available
   if (fo.lastDate) {
-    var toLast = fo.lastDate - new Date().valueOf() + 1000;
+    let toLast = fo.lastDate - new Date().valueOf() + 1000;
     if (toLast > 0) ret = ret.filter(a => a.tTo > toLast);
   }
   // return first entry
@@ -59,7 +59,7 @@ exports = {
     if (typeof (global.sleeplog || {}).trigger !== "object") return;
 
     // read settings to calculate alarm range
-    var settings = exports.getSettings();
+    let settings = exports.getSettings();
 
     // set the alarm time
     this.time = getNextAlarm(sched.getAlarms(), settings.filter).t;
@@ -68,7 +68,7 @@ exports = {
     if (!this.time) return;
 
     // set widget width if not hidden
-    if (!this.hidden) this.width = 8;
+    if (!settings.wid.hide) this.width = 8;
 
     // insert sleeplogalarm conditions and function
     sleeplog.trigger.sleeplogalarm = {
@@ -87,22 +87,22 @@ exports = {
   // trigger function
   trigger: function() {
     // read settings
-    var settings = exports.getSettings();
+    let settings = exports.getSettings();
 
     // read all alarms
-    var allAlarms = sched.getAlarms();
+    let allAlarms = sched.getAlarms();
 
     // find first active alarm
-    var alarm = getNextAlarm(sched.getAlarms(), settings.filter, settings.disableOnAlarm);
+    let alarm = getNextAlarm(sched.getAlarms(), settings.filter, settings.disableOnAlarm);
 
     // return if no alarm is found
     if (!alarm) return;
 
     // get now
-    var now = new Date();
+    let now = new Date();
 
     // get date of the alarm
-    var aDate = new Date(now + alarm.tTo);
+    let aDate = new Date(now + alarm.tTo);
 
     // disable earlier triggered alarm if set
     if (settings.disableOnAlarm) {
diff --git a/apps/sleeplogalarm/metadata.json b/apps/sleeplogalarm/metadata.json
index fd85507e6..fd68ce376 100644
--- a/apps/sleeplogalarm/metadata.json
+++ b/apps/sleeplogalarm/metadata.json
@@ -2,7 +2,7 @@
   "id":"sleeplogalarm",
   "name":"Sleep Log Alarm",
   "shortName": "SleepLogAlarm",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Enhance your morning and let your alarms wake you up when you are in light sleep.",
   "icon": "app.png",
   "type": "widget",
@@ -17,5 +17,6 @@
     {"name": "sleeplogalarm", "url": "lib.js"},
     {"name": "sleeplogalarm.settings.js", "url": "settings.js"},
     {"name": "sleeplogalarm.wid.js", "url": "widget.js"}
-  ]
+  ],
+  "data":[{"name":"sleeplogalarm.settings.json"}]
 }
diff --git a/apps/sleeplogalarm/settings.js b/apps/sleeplogalarm/settings.js
index 1f3a13272..d797ae6bc 100644
--- a/apps/sleeplogalarm/settings.js
+++ b/apps/sleeplogalarm/settings.js
@@ -1,6 +1,6 @@
 (function(back) {
   // read settings
-  var settings = require("sleeplogalarm").getSettings();
+  let settings = require("sleeplogalarm").getSettings();
 
   // write change to storage
   function writeSetting() {
@@ -23,7 +23,7 @@
   // show widget menu
   function showFilterMenu() {
     // set menu
-    var filterMenu = {
+    let filterMenu = {
       "": {
         title: "Filter Alarm"
       },
@@ -64,22 +64,22 @@
         })
       }
     };
-    var menu = E.showMenu(filterMenu);
+    let menu = E.showMenu(filterMenu);
   }
 
   // show widget menu
   function showWidMenu() {
     // define color values and names
-    var colName = ["red", "yellow", "green", "cyan", "blue", "magenta", "black", "white"];
-    var colVal = [63488, 65504, 2016, 2047, 31, 63519, 0, 65535];
+    let colName = ["red", "yellow", "green", "cyan", "blue", "magenta", "black", "white"];
+    let colVal = [63488, 65504, 2016, 2047, 31, 63519, 0, 65535];
 
     // set menu
-    var widgetMenu = {
+    let widgetMenu = {
       "": {
         title: "Widget Settings"
       },
       /*LANG*/"< Back": () => showMain(9),
-      /*LANG*/"hide": {
+      /*LANG*/"hide always": {
         value: settings.wid.hide,
         onchange: v => {
           settings.wid.hide = v;
@@ -105,13 +105,13 @@
         }
       }
     };
-    var menu = E.showMenu(widgetMenu);
+    let menu = E.showMenu(widgetMenu);
   }
 
   // show main menu
   function showMain(selected) {
     // set menu
-    var mainMenu = {
+    let mainMenu = {
       "": {
         title: "Sleep Log Alarm",
         selected: selected
@@ -184,7 +184,7 @@
         }
       }
     };
-    var menu = E.showMenu(mainMenu);
+    let menu = E.showMenu(mainMenu);
   }
 
   // draw main menu
diff --git a/apps/sleeplogalarm/widget.js b/apps/sleeplogalarm/widget.js
index e3171751f..a62782604 100644
--- a/apps/sleeplogalarm/widget.js
+++ b/apps/sleeplogalarm/widget.js
@@ -1,7 +1,7 @@
 // check if enabled in settings
 if ((require("Storage").readJSON("sleeplogalarm.settings.json", true) || {enabled: true}).enabled) {
   // read settings
-  settings = require("sleeplogalarm").getSettings(); // is undefined if used with var
+  let settings = require("sleeplogalarm").getSettings();
 
   // insert neccessary settings into widget
   WIDGETS.sleeplogalarm = {
@@ -10,10 +10,13 @@ if ((require("Storage").readJSON("sleeplogalarm.settings.json", true) || {enable
     time: 0,
     earlier: settings.earlier,
     draw: function () {
-      // draw zzz
-      g.reset().setColor(settings.wid.color).drawImage(atob("BwoBD8SSSP4EEEDg"), this.x + 1, this.y);
-      // call function to draw the time of alarm if a alarm is found
-      if (this.time) this.drawTime(this.time + 1);
+      // draw if width is set
+      if (this.width) {
+        // draw zzz
+        g.reset().setColor(settings.wid.color).drawImage(atob("BwoBD8SSSP4EEEDg"), this.x + 1, this.y);
+        // call function to draw the time of alarm if a alarm is found
+        if (this.time) this.drawTime(this.time + 1);
+      }
     },
     drawTime: () => {},
     reload: require("sleeplogalarm").widReload
diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog
index 795c62fa2..d6e3cb30b 100644
--- a/apps/sleepphasealarm/ChangeLog
+++ b/apps/sleepphasealarm/ChangeLog
@@ -13,3 +13,9 @@
 0.10: Fix: Do not wake when falling asleep
 0.11: Minor tweaks
 0.12: Support javascript command to execute as defined in scheduler 'js' configuration
+0.13: Fix dated events alarm on wrong date
+0.14: Reduce update interval of current time when seconds are not shown
+      Limit logging on Bangle.js 1 to one day due to low memory
+      Add plot logged data to settings
+0.15: Convert Yes/No On/Off in settings to checkboxes
+0.16: Fix Keep alarm enabled inverted settings
diff --git a/apps/sleepphasealarm/README.md b/apps/sleepphasealarm/README.md
index 574e84e1e..5aded316e 100644
--- a/apps/sleepphasealarm/README.md
+++ b/apps/sleepphasealarm/README.md
@@ -23,6 +23,11 @@ Replacing the watch strap with a more comfortable one (e.g. made of nylon) is re
 ## Logging
 
 For each day of month (1..31) the ESS states are logged. An entry will be overwritten in the next month, e.g. an entry on the 4th May will overwrite an entry on the 4th April.
-The logs can be viewed with the download button:
+On Bangle.js 1 only one day is logged due to low memory.
+The logs can be plotted from the settings menu:
 
-![](screenshot.jpg)
+![](screenshot_log.png)
+
+The logs can also be viewed with the download button in the App Loader:
+
+![](interface.jpg)
diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index ba8bff9b2..25ca7e781 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -10,10 +10,11 @@ const config = Object.assign({
         disableAlarm: false,
     }
 }, require("Storage").readJSON(CONFIGFILE,1) || {});
-const active = alarms.filter(a=>a.on);
+const active = alarms.filter(alarm => require("sched").getTimeToAlarm(alarm));
 const schedSettings = require("sched").getSettings();
 let buzzCount = schedSettings.buzzCount;
 let logs = [];
+let drawTimeTimeout;
 
 // 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.
@@ -26,7 +27,7 @@ const nomothresh=0.023; // Original implementation: 6, resolution 11 bit, scale
 const sleepthresh=600;
 var ess_values = [];
 var slsnds = 0;
-function calc_ess(acc_magn) {
+function calc_ess(acc_magn) {"ram"
   ess_values.push(acc_magn);
 
   if (ess_values.length == winwidth) {
@@ -90,10 +91,12 @@ function drawApp() {
   layout.alarm_date.label = `${LABEL_WAKEUP_TIME}: ${alarmHour}:${alarmMinute}`;
   layout.render();
 
-  function drawTime() {
+  function drawTime() {"ram"
+    const drawSeconds = !Bangle.isLocked();
+
     if (Bangle.isLCDOn()) {
       const now = new Date();
-      layout.date.label = locale.time(now, BANGLEJS2 && Bangle.isLocked() ? 1 : 0); // hide seconds on bangle 2
+      layout.date.label = locale.time(now, !drawSeconds); // hide seconds on bangle 2
       const diff = nextAlarmDate - now;
       const diffHour = Math.floor((diff % 86400000) / 3600000).toString();
       const diffMinutes = Math.floor(((diff % 86400000) % 3600000) / 60000).toString();
@@ -101,11 +104,22 @@ function drawApp() {
       layout.render();
     }
 
-    setTimeout(()=>{
+    const period = drawSeconds ? 1000 : 60000;
+    if (this.drawTimeTimeout !== undefined) {
+      clearTimeout(this.drawTimeTimeout);
+    }
+    drawTimeTimeout = setTimeout(()=>{
+      drawTimeTimeout = undefined;
       drawTime();
-    }, 1000 - (Date.now() % 1000));
+    }, period - (Date.now() % period));
   }
 
+  Bangle.on('lock', function(on) {
+    if (on === false) {
+      drawTime();
+    }
+  });
+
   drawTime();
 }
 
@@ -132,8 +146,9 @@ function addLog(time, type) {
 var minAlarm = new Date();
 var measure = true;
 if (nextAlarmDate !== undefined) {
-  config.logs[nextAlarmDate.getDate()] = []; // overwrite log on each day of month
-  logs = config.logs[nextAlarmDate.getDate()];
+  const logday = BANGLEJS2 ? nextAlarmDate.getDate() : 0;
+  config.logs[logday] = []; // overwrite log on each day of month
+  logs = config.logs[logday];
   g.clear();
   Bangle.loadWidgets();
   Bangle.drawWidgets();
@@ -146,7 +161,7 @@ if (nextAlarmDate !== undefined) {
     layout.render();
     Bangle.setOptions({powerSave: false}); // do not dynamically change accelerometer poll interval
     Bangle.setPollInterval(80); // 12.5Hz
-    Bangle.on('accel', (accelData) => {
+    Bangle.on('accel', (accelData) => {"ram"
       const now = new Date();
       const acc = accelData.mag;
       const swest = calc_ess(acc);
diff --git a/apps/sleepphasealarm/screenshot.jpg b/apps/sleepphasealarm/interface.jpg
similarity index 100%
rename from apps/sleepphasealarm/screenshot.jpg
rename to apps/sleepphasealarm/interface.jpg
diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json
index ced99062f..aa69694ab 100644
--- a/apps/sleepphasealarm/metadata.json
+++ b/apps/sleepphasealarm/metadata.json
@@ -2,10 +2,10 @@
   "id": "sleepphasealarm",
   "name": "SleepPhaseAlarm",
   "shortName": "SleepPhaseAlarm",
-  "version": "0.12",
+  "version": "0.16",
   "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",
+  "tags": "tool,alarm",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "dependencies": {"scheduler":"type"},
@@ -14,6 +14,7 @@
     {"name":"sleepphasealarm.settings.js","url":"settings.js"},
     {"name":"sleepphasealarm.img","url":"app-icon.js","evaluate":true}
   ],
-  "data": [{"name":"sleepphasealarm.json","storageFile":true}],
-  "interface": "interface.html"
+  "data": [{"name":"sleepphasealarm.json"}],
+  "interface": "interface.html",
+  "screenshots": [ {"url":"screenshot.png"}, {"url":"screenshot_log.png"} ]
 }
diff --git a/apps/sleepphasealarm/screenshot.png b/apps/sleepphasealarm/screenshot.png
new file mode 100644
index 000000000..769ebbbbc
Binary files /dev/null and b/apps/sleepphasealarm/screenshot.png differ
diff --git a/apps/sleepphasealarm/screenshot_log.png b/apps/sleepphasealarm/screenshot_log.png
new file mode 100644
index 000000000..3442e36ca
Binary files /dev/null and b/apps/sleepphasealarm/screenshot_log.png differ
diff --git a/apps/sleepphasealarm/settings.js b/apps/sleepphasealarm/settings.js
index a79abb598..e72d95e7f 100644
--- a/apps/sleepphasealarm/settings.js
+++ b/apps/sleepphasealarm/settings.js
@@ -13,25 +13,101 @@
     require('Storage').writeJSON(CONFIGFILE, config);
   }
 
-  // Show the menu
-  E.showMenu({
-    "" : { "title" : "SleepPhaseAlarm" },
-    'Keep alarm enabled': {
-      value: !!config.settings.disableAlarm,
-      format: v => v?"No":"Yes",
-      onchange: v => {
-        config.settings.disableAlarm = v;
-        writeSettings();
+  function draw(log) {
+    const step = 10*60*1000; // resolution 10min
+    const yTicks = ["sleep", "awake", "alarm"];
+    const starttime = new Date(log[0].time);
+    const endtime = new Date(log[log.length-1].time);
+
+    let logidx = 0;
+    let curtime = starttime;
+    const data = new Uint8Array(Math.ceil((endtime-curtime)/step) + 1);
+    let curval;
+    let logtime;
+    let i=0;
+    while(curtime < endtime) {
+      if (logtime === undefined || curtime > logtime) {
+        curval = yTicks.indexOf(log[logidx].type);
+        logidx++;
+        logtime = new Date(log[logidx].time);
       }
-    },   "< Back" : () => back(),
-    'Run before alarm': {
-      format: v => v === 0 ? 'disabled' : v+'h',
-      value: config.settings.startBeforeAlarm,
-      min: 0, max: 23,
-      onchange: v => {
-        config.settings.startBeforeAlarm = v;
-        writeSettings();
-      }
-    },
-  });
+
+      data[i++] = curval;
+      curtime = new Date(curtime + step);
+    }
+    data[i] = 1; // always end with awake
+
+    Bangle.setUI({
+      mode: "custom",
+      back: () => selectday(),
+    });
+    g.reset().setFont("6x8",1);
+
+    require("graph").drawLine(g, data, {
+      axes: true,
+      x: 4,
+      y: Bangle.appRect.y+8,
+      height: Bangle.appRect.h-20,
+      gridx: 1,
+      gridy: 1,
+      miny: -1,
+      maxy: 2,
+      title: /*LANG*/"Wakeup " + require("locale").date(endtime, 1),
+      ylabel: y => y >= 0 && y <= 1 ? yTicks[y] : "",
+      xlabel: x => {
+        if (x === Math.round(data.length/10)) {
+          return require("locale").time(starttime, 1);
+        } else if (x === (data.length-2)-Math.round(data.length/10)) {
+          return require("locale").time(endtime, 1);
+        }
+        return "";
+      },
+    });
+  }
+
+  function selectday() {
+    E.showMessage(/*LANG*/"Loading...");
+
+    const logs = config.logs.filter(log => log != null && log.filter(entry => entry.type === "alarm").length > 0);
+    logs.sort(function(a, b) { // sort by alarm date desc
+      const adate = new Date(a.filter(entry => entry.type === "alarm")[0].time);
+      const bdate = new Date(b.filter(entry => entry.type === "alarm")[0].time);
+      return bdate - adate;
+    });
+
+    const menu = {};
+    menu[""] = { title: /*LANG*/"Select day" };
+    menu["< Back"] = () => settingsmenu();
+    logs.forEach((log, i) => {
+      const date = new Date(log.filter(entry => entry.type === "alarm")[0].time);
+      menu[require("locale").date(date, 1)] = () => { E.showMenu(); draw(log); };
+    });
+    E.showMenu(menu);
+  }
+
+  function settingsmenu() {
+    // Show the menu
+    E.showMenu({
+      "" : { "title" : "SleepPhaseAlarm" },
+      'Keep alarm enabled': {
+        value: !config.settings.disableAlarm,
+        onchange: v => {
+          config.settings.disableAlarm = !v;
+          writeSettings();
+        }
+      },   "< Back" : () => back(),
+      'Run before alarm': {
+        format: v => v === 0 ? 'disabled' : v+'h',
+        value: config.settings.startBeforeAlarm,
+        min: 0, max: 23,
+        onchange: v => {
+          config.settings.startBeforeAlarm = v;
+          writeSettings();
+        }
+      },
+      /*LANG*/'Select day': () => selectday(),
+    });
+  }
+
+  settingsmenu();
 })
diff --git a/apps/slidingtext/ChangeLog b/apps/slidingtext/ChangeLog
index 5c4a9fa75..42d1b061c 100644
--- a/apps/slidingtext/ChangeLog
+++ b/apps/slidingtext/ChangeLog
@@ -9,3 +9,4 @@
 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
+0.12: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/slidingtext/metadata.json b/apps/slidingtext/metadata.json
index 098fdb747..4dc6f1f0c 100644
--- a/apps/slidingtext/metadata.json
+++ b/apps/slidingtext/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "slidingtext",
   "name": "Sliding Clock",
-  "version": "0.11",
+  "version": "0.12",
   "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"}],
diff --git a/apps/slidingtext/slidingtext.settings.js b/apps/slidingtext/slidingtext.settings.js
index e13c857fd..1eee39bf0 100644
--- a/apps/slidingtext/slidingtext.settings.js
+++ b/apps/slidingtext/slidingtext.settings.js
@@ -173,12 +173,11 @@
         "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",
+            value: (settings.enable_live_controls !== undefined ? !!settings.enable_live_controls : true),
             onchange: v => {
                 settings.enable_live_controls = v;
                 writeSettings();
             }
         },
     });
-})
\ No newline at end of file
+})
diff --git a/apps/slomoclock/settings.js b/apps/slomoclock/settings.js
index af67069dc..dcaf0aff6 100644
--- a/apps/slomoclock/settings.js
+++ b/apps/slomoclock/settings.js
@@ -1,24 +1,24 @@
 (function(back) {
 
   let settings = require('Storage').readJSON('slomoclock.json',1)||{};
-  
+
   function writeSettings() {
     require('Storage').write('slomoclock.json',settings);
   }
-  
+
   function setColour(c) {
     settings.colour = c;
     writeSettings();
   }
-  
+
   const appMenu = {
     '': {'title': 'SloMo Clock'},
     '< Back': back,
     'Colours' : function() { E.showMenu(colMenu); }
-    //,'Widget Space Top' : {value : settings.widTop, format : v => v?"On":"Off",onchange : () => { settings.widTop = !settings.widTop; writeSettings(); }
-    //,'Widget Space Bottom' : {value : settings.widBot, format : v => v?"On":"Off",onchange : () => { settings.widBot = !settings.widBot; writeSettings(); }
+    //,'Widget Space Top' : {value : settings.widTop, onchange : () => { settings.widTop = !settings.widTop; writeSettings(); }
+    //,'Widget Space Bottom' : {value : settings.widBot, onchange : () => { settings.widBot = !settings.widBot; writeSettings(); }
   };
-  
+
   const colMenu = {
     '': {'title': 'Colours'},
     '< Back': function() { E.showMenu(appMenu); },
@@ -32,7 +32,7 @@
     'Violet' : function() { setColour(7); },
     'White' : function() { setColour(8); }
   };
-  
+
   E.showMenu(appMenu);
 
 });
diff --git a/apps/slopeclockpp/ChangeLog b/apps/slopeclockpp/ChangeLog
index 58299b236..39f837386 100644
--- a/apps/slopeclockpp/ChangeLog
+++ b/apps/slopeclockpp/ChangeLog
@@ -9,3 +9,5 @@
 0.07: README file update as UI interaction was not easy to understand
 0.08: Stability improvements - ensure we continue even if a flat string can't be allocated
       Stop ClockInfo text drawing outside the allocated area
+0.09: Use clock_info module as an app
+0.10: Option to hide widgets, tweak top widget width to avoid overlap with hour text at 9am
\ No newline at end of file
diff --git a/apps/slopeclockpp/app.js b/apps/slopeclockpp/app.js
index dca4a84e4..5b1d898d1 100644
--- a/apps/slopeclockpp/app.js
+++ b/apps/slopeclockpp/app.js
@@ -58,7 +58,8 @@ let draw = function() {
   // Now draw this one
   R = Bangle.appRect;
   x = R.w / 2;
-  y = R.y + R.h / 2 - 12; // 12 = room for date
+  y = R.y + R.h / 2 - 6;
+  if (!settings.hideWidgets) y-= 6; // extra room for date
   var date = new Date();
   var local_time = require("locale").time(date, 1);
   var hourStr = local_time.split(":")[0].trim().padStart(2,'0');
@@ -77,6 +78,8 @@ let draw = function() {
   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).setFont("4x6"); // draw and unload custom font
   g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
+  // redraw the top widget
+  clockInfoMenu.redraw();
   // start the animation *in*
   animate(true);
 };
@@ -141,8 +144,14 @@ let clockInfoDraw = (itm, info, options) => {
   g.setClipRect(0,0,g.getWidth()-1, g.getHeight()-1);
 };
 let clockInfoItems = require("clock_info").load();
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:126, y:24, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#f00"/*red*/ });
-let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { x:0, y:115, w:50, h:40, draw : clockInfoDraw, bg : bgColor, fg : g.theme.bg, hl : (bgColor=="#000")?"#f00"/*red*/:g.theme.fg });
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, {  // top right
+  app:"slopeclockpp",x:132, y:settings.hideWidgets ? 12 : 24, w:44, h:40,
+  draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#f00"/*red*/
+});
+let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { // bottom left
+  app:"slopeclockpp",x:0, y:115, w:50, h:40,
+  draw : clockInfoDraw, bg : bgColor, fg : g.theme.bg, hl : (bgColor=="#000")?"#f00"/*red*/:g.theme.fg
+});
 
 // Show launcher when middle button pressed
 Bangle.setUI({
@@ -163,6 +172,7 @@ Bangle.setUI({
 });
 // Load widgets
 Bangle.loadWidgets();
+if (settings.hideWidgets) require("widget_utils").swipeOn();
+else setTimeout(Bangle.drawWidgets,0);
 draw();
-setTimeout(Bangle.drawWidgets,0);
-}
+}
\ No newline at end of file
diff --git a/apps/slopeclockpp/metadata.json b/apps/slopeclockpp/metadata.json
index fbab02fca..086b8148f 100644
--- a/apps/slopeclockpp/metadata.json
+++ b/apps/slopeclockpp/metadata.json
@@ -1,12 +1,13 @@
 { "id": "slopeclockpp",
   "name": "Slope Clock ++",
-  "version":"0.08",
+  "version":"0.10",
   "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 extra information and allows the colors to be selected.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "supports" : ["BANGLEJS2"],
+  "dependencies" : { "clock_info":"module" },
   "readme": "README.md",
   "storage": [
     {"name":"slopeclockpp.app.js","url":"app.js"},
diff --git a/apps/slopeclockpp/screenshot.png b/apps/slopeclockpp/screenshot.png
index dfa76fed7..1d9cec8e4 100644
Binary files a/apps/slopeclockpp/screenshot.png and b/apps/slopeclockpp/screenshot.png differ
diff --git a/apps/slopeclockpp/settings.js b/apps/slopeclockpp/settings.js
index 1d285767a..3c0e0a6e9 100644
--- a/apps/slopeclockpp/settings.js
+++ b/apps/slopeclockpp/settings.js
@@ -15,6 +15,10 @@
     let menu ={
       '': { 'title': 'Slope Clock ++' },
       /*LANG*/'< Back': back,
+      /*LANG*/'Hide Widgets': {
+        value: !!settings.hideWidgets,
+        onchange: x => save('hideWidgets', x),
+      },
       /*LANG*/'Red': {
         value: !!settings.colorRed,
         format: () => (settings.colorRed ? 'Yes' : 'No'),
diff --git a/apps/smpltmr/ChangeLog b/apps/smpltmr/ChangeLog
index 61111482e..dcc5021b5 100644
--- a/apps/smpltmr/ChangeLog
+++ b/apps/smpltmr/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Updated clkinfo icon.
 0.06: Ensure Timer supplies an image for clkinfo items
 0.07: Update clock_info to avoid a redraw
+0.08: Timer ClockInfo now updates once a minute
\ No newline at end of file
diff --git a/apps/smpltmr/clkinfo.js b/apps/smpltmr/clkinfo.js
index ac01cfb59..d68372f15 100644
--- a/apps/smpltmr/clkinfo.js
+++ b/apps/smpltmr/clkinfo.js
@@ -1,9 +1,10 @@
 (function() {
   const TIMER_IDX = "smpltmr";
+  var alarm = require('sched');
 
   function isAlarmEnabled(){
     try{
-      var alarm = require('sched');
+
       var alarmObj = alarm.getAlarm(TIMER_IDX);
       if(alarmObj===undefined || !alarmObj.on){
         return false;
@@ -19,25 +20,20 @@
     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){
+    if(min < 0)
       return "OFF";
-    }
-
-    return "T-" + String(min);
+    return "T-" + String(min)+ " min";
   }
 
   function increaseAlarm(t){
     try{
         var minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
-        var alarm = require('sched')
         alarm.setAlarm(TIMER_IDX, {
           timer : (minutes+t)*60*1000,
         });
@@ -50,9 +46,7 @@
         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,
@@ -69,10 +63,10 @@
     items: [
       {
         name: null,
-        get: () => ({ text: getAlarmMinutesText() + (isAlarmEnabled() ? " min" : ""), img: smpltmrItems.img }),
-        show: function() {},
-        hide: function () {},
-        run: function() { }
+        get: () => ({ text: getAlarmMinutesText(), img: smpltmrItems.img } ),
+        show: function() { this.interval = setInterval(()=>this.emit('redraw'), 60000); },
+        hide: function () { clearInterval(this.interval); delete this.interval; },
+        //run: function() { } // should tapping do something?
       },
     ]
   };
@@ -82,8 +76,8 @@
     smpltmrItems.items = smpltmrItems.items.concat({
       name: null,
       get: () => ({ text: (o > 0 ? "+" : "") + o + " min.", img: smpltmrItems.img }),
-      show: function() {},
-      hide: function () {},
+      show: function() { },
+      hide: function () { },
       run: function() {
         if(o > 0) increaseAlarm(o);
         else decreaseAlarm(Math.abs(o));
diff --git a/apps/smpltmr/metadata.json b/apps/smpltmr/metadata.json
index b0d1a34da..db492b0c1 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.07",
+  "version": "0.08",
   "description": "A very simple app to start a timer.",
   "icon": "app.png",
   "tags": "tool,alarm,timer,clkinfo",
diff --git a/apps/speedalt/metadata.json b/apps/speedalt/metadata.json
index 89bfd4a57..1ecb2b562 100644
--- a/apps/speedalt/metadata.json
+++ b/apps/speedalt/metadata.json
@@ -15,5 +15,8 @@
     {"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.settings.json"}
   ]
 }
diff --git a/apps/spotrem/ChangeLog b/apps/spotrem/ChangeLog
index a92ed3de2..56ded4e5c 100644
--- a/apps/spotrem/ChangeLog
+++ b/apps/spotrem/ChangeLog
@@ -6,3 +6,6 @@
 0.06: Make compatible with Fastload Utils app.
 0.07: Remove just the specific listeners to not interfere with Quick Launch
 when fastloading.
+0.08: Issue newline before GB commands (solves issue with console.log and ignored commands)
+0.09: Don't send the gadgetbridge wake command twice. Once should do since we
+	issue newline before GB commands.
diff --git a/apps/spotrem/app.js b/apps/spotrem/app.js
index f9046c4a6..48274df44 100644
--- a/apps/spotrem/app.js
+++ b/apps/spotrem/app.js
@@ -62,8 +62,7 @@ let touchHandler = function(_, xy) {
     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();
+    //Wake
     gadgetbridgeWake();
   } else if ((R.x2-len<x && x<R.x2+1) && (R.y-1<y && y<R.y+len)) {
     //Srch
@@ -76,7 +75,7 @@ let touchHandler = function(_, xy) {
     Bangle.removeListener("swipe", swipeHandler);
     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 
+    //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
@@ -156,75 +155,93 @@ let albumSearchTerm = function() { // input album to search for
 
 let searchPlayWOTags = function() {//make a spotify search and play using entered terms
   searchString = simpleSearch;
+  Bluetooth.println("");
   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"]}));
 };
 
 let searchPlayWTags = function() {//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("");
   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"]}));
 };
 
 let playVreden = function() {//Play the track "Vreden" by Sara Parkman via spotify uri-link
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let playVredenAlternate = function() {//Play the track "Vreden" by Sara Parkman via spotify uri-link
+  Bluetooth.println("");
   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"]}));
 };
 
 let searchPlayVreden = function() {//Play the track "Vreden" by Sara Parkman via search and play
+  Bluetooth.println("");
   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"]}));
 };
 
 let openAlbum = function() {//Play EP "The Blue Room" by Coldplay
+  Bluetooth.println("");
   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"]}));
 };
 
 let searchPlayAlbum = function() {//Play EP "The Blue Room" by Coldplay via search and play
+  Bluetooth.println("");
   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"]}));
 };
 
 let spotifyWidget = function(action) {
+  Bluetooth.println("");
   Bluetooth.println(JSON.stringify({t:"intent", action:("com.spotify.mobile.android.ui.widget."+action), package:"com.spotify.music", target:"broadcastreceiver"}));
 };
 
 let gadgetbridgeWake = function() {
+  Bluetooth.println("");
   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"}));
 };
 
 let spotifyPlaylistDW = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDM1 = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDM2 = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDM3 = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDM4 = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDM5 = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDM6 = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistDD = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
 let spotifyPlaylistRR = function() {
+  Bluetooth.println("");
   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"*/]}));
 };
 
diff --git a/apps/spotrem/metadata.json b/apps/spotrem/metadata.json
index 5818d9aee..4e6463083 100644
--- a/apps/spotrem/metadata.json
+++ b/apps/spotrem/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "spotrem",
   "name": "Remote for Spotify",
-  "version": "0.07",
+  "version": "0.09",
   "description": "Control spotify on your android device.",
   "readme": "README.md",
   "type": "app",
diff --git a/apps/stlap/ChangeLog b/apps/stlap/ChangeLog
index 35ba8b130..0c21e6efd 100644
--- a/apps/stlap/ChangeLog
+++ b/apps/stlap/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New app!
 0.02: Bug fixes
-0.03: Submitted to the app loader
\ No newline at end of file
+0.03: Submitted to the app loader
+0.04: Reduce battery consumption when the user's not looking
\ No newline at end of file
diff --git a/apps/stlap/app.js b/apps/stlap/app.js
index 0bd18311f..ad5463180 100644
--- a/apps/stlap/app.js
+++ b/apps/stlap/app.js
@@ -8,7 +8,7 @@ const BUTTON_ICONS = {
   reset: heatshrink.decompress(atob("jEYwMA/4BB/+BAQPDAQPnAQIAKv///0///8j///EP//wAQQICBwQUCEhgyCHAQ+CIgI="))
 };
 
-let state = storage.readJSON(STATE_PATH);
+let state = storage.readJSON(STATE_PATH, 1);
 const STATE_DEFAULT = {
   wasRunning: false,              //If the stopwatch was ever running since being reset
   sessionStart: 0,                //When the stopwatch was first started
@@ -157,7 +157,7 @@ function firstTimeStart(now, time) {
     elapsedTime: 0,
   };
   lapFile = 'stlap-' + state.sessionStart + '.json';
-  setupTimerInterval();
+  setupTimerIntervalFast();
   Bangle.buzz(200);
   drawButtons();
 }
@@ -201,13 +201,15 @@ function start(now, time) {
   state.elapsedTime += (state.pausedTime - state.startTime);
   state.startTime = now;
   state.running = true;
-  setupTimerInterval();
+  setupTimerIntervalFast();
   Bangle.buzz(200);
   drawTime();
   drawButtons();
 }
 
 Bangle.on("touch", (button, xy) => {
+  setupTimerIntervalFast();
+
   //In gesture mode, just turn on the light and then return
   if (gestureMode) {
     Bangle.setLCDPower(true);
@@ -242,6 +244,8 @@ Bangle.on("touch", (button, xy) => {
 });
 
 Bangle.on('swipe', direction => {
+  setupTimerIntervalFast();
+
   let now = (new Date()).getTime();
   let time = getTime();
 
@@ -272,12 +276,23 @@ setWatch(() => {
 }, BTN1, { repeat: true });
 
 let timerInterval;
+let userWatching = false;
+
+function setupTimerIntervalFast() {
+  userWatching = true;
+  setupTimerInterval();
+
+  setTimeout(() => {
+    userWatching = false;
+    setupTimerInterval();
+  }, 5000);
+}
 
 function setupTimerInterval() {
   if (timerInterval !== undefined) {
     clearInterval(timerInterval);
   }
-  timerInterval = setInterval(drawTime, 10);
+  timerInterval = setInterval(drawTime, userWatching ? 10 : 1000);
 }
 
 function stopTimerInterval() {
@@ -289,7 +304,7 @@ function stopTimerInterval() {
 
 drawTime();
 if (state.running) {
-  setupTimerInterval();
+  setupTimerIntervalFast();
 }
 
 //Save our state when the app is closed
@@ -300,5 +315,8 @@ E.on('kill', () => {
   }
 });
 
+// change interval depending of whether the user's looking
+Bangle.on("twist", setupTimerIntervalFast);
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
\ No newline at end of file
diff --git a/apps/stlap/metadata.json b/apps/stlap/metadata.json
index 1ecdc5b6e..ac846dfd7 100644
--- a/apps/stlap/metadata.json
+++ b/apps/stlap/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "stlap",
   "name": "Stopwatch",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A stopwatch that remembers its state, with a lap timer and a gesture mode (enable by swiping)",
   "icon": "icon.png",
   "type": "app",
@@ -20,5 +20,9 @@
       "url": "icon.js",
       "evaluate": true
     }
+  ],
+  "data": [
+    {"name":"stlap.state.json"},
+    {"wildcard":"stlap-*.json"}
   ]
 }
\ No newline at end of file
diff --git a/apps/stlapview/ChangeLog b/apps/stlapview/ChangeLog
index c819919ed..dd7cb5728 100644
--- a/apps/stlapview/ChangeLog
+++ b/apps/stlapview/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New app!
-0.02: Submitted to the app loader
\ No newline at end of file
+0.02: Submitted to the app loader
+0.03: Fix going back from a lap view, and add a main-menu back button
diff --git a/apps/stlapview/app.js b/apps/stlapview/app.js
index 7a58b5782..c11739af7 100644
--- a/apps/stlapview/app.js
+++ b/apps/stlapview/app.js
@@ -53,7 +53,7 @@ function view(fileName) {
   let lapMenu = {
     '': {
       'title': fileNameToDateString(fileName),
-      'back': () => { E.showMenu(mainMenu); }
+      'back': () => showMainMenu()
     },
   };
   lapMenu[`Total time: ${msToHumanReadable(fileData[fileData.length - 1])}`] = () => { };
@@ -89,15 +89,16 @@ function showMainMenu() {
 
   let mainMenu = {
     '': {
-      'title': 'Sessions'
+      'title': 'Sessions',
+      'back': () => load()
     }
   };
 
-  //I know eval is evil, but I can't think of any other way to do this.
   for (let lapFile of LAP_FILES) {
-    mainMenu[fileNameToDateString(lapFile)] = eval(`(function() {
-      view('${lapFile}');
-    })`);
+    // `let` variables in JS have special behaviour in loops,
+    // where capturing them captures that instance of the variable,
+    // but for espruino we need to do a slightly older trick:
+    mainMenu[fileNameToDateString(lapFile)] = ((lapFile) => () => view(lapFile))(lapFile);
   }
 
   if (LAP_FILES.length == 0) {
diff --git a/apps/stlapview/metadata.json b/apps/stlapview/metadata.json
index aa54a7b67..fb3818fc0 100644
--- a/apps/stlapview/metadata.json
+++ b/apps/stlapview/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "stlapview",
   "name": "Stopwatch laps",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Optional lap viewer for my stopwatch app",
   "icon": "icon.png",
   "type": "app",
diff --git a/apps/sunrise/ChangeLog b/apps/sunrise/ChangeLog
new file mode 100644
index 000000000..490992812
--- /dev/null
+++ b/apps/sunrise/ChangeLog
@@ -0,0 +1,4 @@
+0.01: First release
+0.02: Faster sinus line and fix button to open menu
+0.03: Show day/month, add animations, fix !mylocation and text glitch
+0.04: Always show the widgets, swifter animations and lighter sea line
diff --git a/apps/sunrise/README.md b/apps/sunrise/README.md
new file mode 100644
index 000000000..bafe9f76c
--- /dev/null
+++ b/apps/sunrise/README.md
@@ -0,0 +1,25 @@
+# sunrise watchface
+
+This app mimics the Apple Watch watchface that shows the sunrise and sunset time.
+
+This is a work-in-progress app, so you may expect missfeatures, bugs and heavy
+battery draining. There's still a lot of things to optimize and improve, so take
+this into account before complaining :-)
+
+* Requires to configure the location in Settings -> Apps -> My Location
+* Shows sea level and make the sun/moon glow depending on the x position
+* The sinus is fixed, so the sea level is curved to match the sunrise/sunset positions)
+
+## TODO
+
+* Improved gradients and add support for banglejs1
+* Faster rendering, by reducing sinus stepsize, only refreshing whats needed, etc
+* Show red vertical lines or dots inside the sinus if there are alarms
+
+## Author
+
+Written by pancake in 2023
+
+## Screenshots
+
+![sunrise](screenshot.png)
diff --git a/apps/sunrise/app-icon.js b/apps/sunrise/app-icon.js
new file mode 100644
index 000000000..79e0fded7
--- /dev/null
+++ b/apps/sunrise/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEIf4A/AH4A/AH4ADgMiAAMgCyoABiAXQiUjkQBCkIXQFYMzAAIEBIyMjn8z+cyMKECFwM+93uGAJIPgUzn4WBC4IwBIx0jC4njmQvOkUSkQXTicQL4JHSgSFBgUyO6QkCU4YWBF4KnLFwTXGIwMQRZQ7EC4IxBAYRHKgQjEVIIXCkcgiQwJQQxhBAAJQCGBBdEABIwIfJwmHFxwnFAYQuOFAuIcAMwC54pE1WpWgURMKUxhUKzWqDYLOKVQh1FGoOTnQaKdAR1HhWqzWKkUykK7GkKkM1WZyRsCGAikPhWZ1EzGoKHBaZ5rEGoQWRNgoXVAH4A5"))
diff --git a/apps/sunrise/app.js b/apps/sunrise/app.js
new file mode 100644
index 000000000..3feb4dfd4
--- /dev/null
+++ b/apps/sunrise/app.js
@@ -0,0 +1,401 @@
+// banglejs app made by pancake
+// sunrise/sunset script by Matt Kane from https://github.com/Triggertrap/sun-js
+
+const LOCATION_FILE = 'mylocation.json';
+let location;
+
+Bangle.setUI('clock');
+Bangle.loadWidgets();
+// requires the myLocation app
+function loadLocation () {
+  try {
+    return require('Storage').readJSON(LOCATION_FILE, 1);
+  } catch (e) {
+    return { lat: 41.38, lon: 2.168 };
+  }
+}
+let frames = 0; // amount of pending frames to render (0 if none)
+let curPos = 0; // x position of the sun
+let realPos = 0; // x position of the sun depending on currentime
+const latlon = loadLocation() || {};
+const lat = latlon.lat || 41.38;
+const lon = latlon.lon || 2.168;
+
+/**
+ *	Sunrise/sunset script. By Matt Kane.
+ *
+ *  Based loosely and indirectly on Kevin Boone's SunTimes Java implementation
+ *  of the US Naval Observatory's algorithm.
+ *
+ *  Copyright © 2012 Triggertrap Ltd. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
+ * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+ * details.
+ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA,
+ * or connect to: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ */
+
+Date.prototype.sunrise = function (latitude, longitude, zenith) {
+  return this.sunriseSet(latitude, longitude, true, zenith);
+};
+
+Date.prototype.sunset = function (latitude, longitude, zenith) {
+  return this.sunriseSet(latitude, longitude, false, zenith);
+};
+
+Date.prototype.sunriseSet = function (latitude, longitude, sunrise, zenith) {
+  if (!zenith) {
+    zenith = 90.8333;
+  }
+
+  const hoursFromMeridian = longitude / Date.DEGREES_PER_HOUR;
+  const dayOfYear = this.getDayOfYear();
+  let approxTimeOfEventInDays;
+  let sunMeanAnomaly;
+  let sunTrueLongitude;
+  let ascension;
+  let rightAscension;
+  let lQuadrant;
+  let raQuadrant;
+  let sinDec;
+  let cosDec;
+  let localHourAngle;
+  let localHour;
+  let localMeanTime;
+  let time;
+
+  if (sunrise) {
+    approxTimeOfEventInDays = dayOfYear + ((6 - hoursFromMeridian) / 24);
+  } else {
+    approxTimeOfEventInDays = dayOfYear + ((18.0 - hoursFromMeridian) / 24);
+  }
+
+  sunMeanAnomaly = (0.9856 * approxTimeOfEventInDays) - 3.289;
+
+  sunTrueLongitude = sunMeanAnomaly + (1.916 * Math.sinDeg(sunMeanAnomaly)) + (0.020 * Math.sinDeg(2 * sunMeanAnomaly)) + 282.634;
+  sunTrueLongitude = Math.mod(sunTrueLongitude, 360);
+
+  ascension = 0.91764 * Math.tanDeg(sunTrueLongitude);
+  rightAscension = 360 / (2 * Math.PI) * Math.atan(ascension);
+  rightAscension = Math.mod(rightAscension, 360);
+
+  lQuadrant = Math.floor(sunTrueLongitude / 90) * 90;
+  raQuadrant = Math.floor(rightAscension / 90) * 90;
+  rightAscension = rightAscension + (lQuadrant - raQuadrant);
+  rightAscension /= Date.DEGREES_PER_HOUR;
+
+  sinDec = 0.39782 * Math.sinDeg(sunTrueLongitude);
+  cosDec = Math.cosDeg(Math.asinDeg(sinDec));
+  cosLocalHourAngle = ((Math.cosDeg(zenith)) - (sinDec * (Math.sinDeg(latitude)))) / (cosDec * (Math.cosDeg(latitude)));
+
+  localHourAngle = Math.acosDeg(cosLocalHourAngle);
+
+  if (sunrise) {
+    localHourAngle = 360 - localHourAngle;
+  }
+
+  localHour = localHourAngle / Date.DEGREES_PER_HOUR;
+
+  localMeanTime = localHour + rightAscension - (0.06571 * approxTimeOfEventInDays) - 6.622;
+
+  time = localMeanTime - (longitude / Date.DEGREES_PER_HOUR);
+  time = Math.mod(time, 24);
+
+  const midnight = new Date(0);
+  // midnight.setUTCFullYear(this.getUTCFullYear());
+  // midnight.setUTCMonth(this.getUTCMonth());
+  // midnight.setUTCDate(this.getUTCDate());
+
+  const milli = midnight.getTime() + (time * 60 * 60 * 1000);
+
+  return new Date(milli);
+};
+
+Date.DEGREES_PER_HOUR = 360 / 24;
+
+// Utility functions
+
+Date.prototype.getDayOfYear = function () {
+  const onejan = new Date(this.getFullYear(), 0, 1);
+  return Math.ceil((this - onejan) / 86400000);
+};
+
+Math.degToRad = function (num) {
+  return num * Math.PI / 180;
+};
+
+Math.radToDeg = function (radians) {
+  return radians * 180.0 / Math.PI;
+};
+
+Math.sinDeg = function (deg) {
+  return Math.sin(deg * 2.0 * Math.PI / 360.0);
+};
+
+Math.acosDeg = function (x) {
+  return Math.acos(x) * 360.0 / (2 * Math.PI);
+};
+
+Math.asinDeg = function (x) {
+  return Math.asin(x) * 360.0 / (2 * Math.PI);
+};
+
+Math.tanDeg = function (deg) {
+  return Math.tan(deg * 2.0 * Math.PI / 360.0);
+};
+
+Math.cosDeg = function (deg) {
+  return Math.cos(deg * 2.0 * Math.PI / 360.0);
+};
+
+Math.mod = function (a, b) {
+  let result = a % b;
+  if (result < 0) {
+    result += b;
+  }
+  return result;
+};
+
+const delta = 2;
+const sunrise = new Date().sunrise(lat, lon);
+const sr = sunrise.getHours() + ':' + sunrise.getMinutes();
+console.log('sunrise', sunrise);
+const sunset = new Date().sunset(lat, lon);
+const ss = sunset.getHours() + ':' + sunset.getMinutes();
+console.log('sunset', sunset);
+
+const w = g.getWidth();
+const h = g.getHeight();
+const oy = h / 1.7;
+
+let sunRiseX = 0;
+let sunSetX = 0;
+const sinStep = 12;
+
+function drawSinuses () {
+  let x = 0;
+
+  g.setColor(0, 0, 0);
+  // g.fillRect(0,oy,w, h);
+  g.setColor(1, 1, 1);
+  let y = oy;
+  for (i = 0; i < w; i++) {
+    x = i;
+    x2 = x + sinStep + 1;
+    y2 = ypos(i);
+    if (x == 0) {
+      y = y2;
+    }
+    g.drawLine(x, y, x2, y2);
+    y = y2;
+    i += sinStep; // no need to draw all steps
+  }
+
+  // sea level line
+  const hh0 = sunrise.getHours();
+  const hh1 = sunset.getHours();
+  const sl0 = seaLevel(hh0);
+  const sl1 = seaLevel(hh1);
+  sunRiseX = xfromTime(hh0) + (r / 2);
+  sunSetX = xfromTime(hh1) + (r / 2);
+  g.setColor(0, 0.5, 1);
+  g.drawLine(0, sl0, w, sl1);
+  g.setColor(0, 0.5, 1);
+  g.drawLine(0, sl0 + 1, w, sl1 + 1);
+  /*
+  g.setColor(0, 0, 1);
+  g.drawLine(0, sl0 + 1, w, sl1 + 1);
+  g.setColor(0, 0, 0.5);
+  g.drawLine(0, sl0 + 2, w, sl1 + 2);
+  */
+}
+
+function drawTimes () {
+  g.setColor(1, 1, 1);
+  g.setFont('6x8', 2);
+  g.drawString(sr, 10, h - 20);
+  g.drawString(ss, w - 60, h - 20);
+}
+
+let pos = 0;
+let realTime = true;
+const r = 10;
+
+function drawGlow () {
+  const now = new Date();
+  if (frames < 1 && realTime) {
+    pos = xfromTime(now.getHours());
+  }
+  const rh = r / 2;
+  const x = pos;
+  const y = ypos(x - r);
+  const r2 = 0;
+  if (x > sunRiseX && x < sunSetX) {
+    g.setColor(0.2, 0.2, 0);
+    g.fillCircle(x, y, r + 20);
+    g.setColor(0.5, 0.5, 0);
+    // wide glow
+  } else {
+    g.setColor(0.2, 0.2, 0);
+  }
+  // smol glow
+  g.fillCircle(x, y, r + 8);
+}
+
+function seaLevel (hour) {
+  // hour goes from 0 to 24
+  // to get the X we divide the screen in 24
+  return ypos(xfromTime(hour));
+}
+
+function ypos (x) {
+  const pc = (x * 100 / w);
+  return oy + (32 * Math.sin(1.7 + (pc / 16)));
+}
+
+function xfromTime (t) {
+  return (w / 24) * t;
+}
+
+function drawBall () {
+  let x = pos;
+  const now = new Date();
+  if (frames < 1 && realTime) {
+    x = xfromTime(now.getHours());
+  }
+  const y = ypos(x - r);
+
+  // glow
+  if (x < sunRiseX || x > sunSetX) {
+    g.setColor(0.5, 0.5, 0);
+  } else {
+    g.setColor(1, 1, 1);
+  }
+  const rh = r / 2;
+  g.fillCircle(x, y, r);
+  g.setColor(1, 1, 0);
+  g.drawCircle(x, y, r);
+}
+function drawClock () {
+  const now = new Date();
+
+  let curTime = '';
+  let fhours = 0.0;
+  let fmins = 0.0;
+  let ypos = 32;
+  if (realTime) {
+    fhours = now.getHours();
+    fmins = now.getMinutes();
+  } else {
+    ypos = 32;
+    fhours = 24 * (pos / w);
+    if (fhours > 23) {
+      fhours = 0;
+    }
+    const nexth = 24 * 60 * (pos / w);
+    fmins = 59 - ((24 * 60) - nexth) % 60;
+    if (fmins < 0) {
+      fmins = 0;
+    }
+  }
+  if (fmins > 59) {
+    fmins = 59;
+  }
+  const hours = ((fhours < 10) ? '0' : '') + (0 | fhours);
+  const mins = ((fmins < 10) ? '0' : '') + (0 | fmins);
+  curTime = hours + ':' + mins;
+  g.setFont('Vector', 30);
+  if (realTime) {
+    g.setColor(1, 1, 1);
+  } else {
+    g.setColor(0, 1, 1);
+  }
+  g.drawString(curTime, w / 1.9, ypos);
+  // day-month
+  if (realTime) {
+    const mo = now.getMonth() + 1;
+    const da = now.getDate();
+    const daymonth = '' + da + '/' + mo;
+    g.setFont('6x8', 2);
+    g.drawString(daymonth, 5, 30);
+  }
+}
+
+function renderScreen () {
+  g.setColor(0, 0, 0);
+  g.fillRect(0, 30, w, h);
+  realPos = xfromTime((new Date()).getHours());
+  g.setFontAlign(-1, -1, 0);
+
+  Bangle.drawWidgets();
+
+  drawGlow();
+  drawSinuses();
+  drawTimes();
+  drawClock();
+  drawBall();
+}
+
+Bangle.on('drag', function (tap, top) {
+  if (tap.y < h / 3) {
+    curPos = pos;
+    initialAnimation();
+  } else {
+    pos = tap.x - 5;
+    realTime = false;
+  }
+  renderScreen();
+});
+
+Bangle.on('lock', () => {
+  // TODO: render animation here
+  realTime = Bangle.isLocked();
+  renderScreen();
+});
+
+renderScreen();
+
+realPos = xfromTime((new Date()).getHours());
+
+function initialAnimationFrame () {
+  let distance = (realPos - curPos) / 4;
+  if (distance > 20) {
+    distance = 20;
+  }
+  curPos += distance;
+  pos = curPos;
+  renderScreen();
+  if (curPos >= realPos) {
+    frame = 0;
+  }
+  frames--;
+  if (frames-- > 0) {
+    setTimeout(initialAnimationFrame, 50);
+  } else {
+    realTime = true;
+    renderScreen();
+  }
+}
+
+function initialAnimation () {
+  const distance = Math.abs(realPos - pos);
+  frames = distance / 4;
+  realTime = false;
+  initialAnimationFrame();
+}
+
+function main () {
+  g.setBgColor(0, 0, 0);
+  g.clear();
+  setInterval(renderScreen, 60 * 1000);
+  pos = 0;
+  initialAnimation();
+}
+
+main();
diff --git a/apps/sunrise/app.png b/apps/sunrise/app.png
new file mode 100644
index 000000000..a170dfa35
Binary files /dev/null and b/apps/sunrise/app.png differ
diff --git a/apps/sunrise/metadata.json b/apps/sunrise/metadata.json
new file mode 100644
index 000000000..051ff99bd
--- /dev/null
+++ b/apps/sunrise/metadata.json
@@ -0,0 +1,31 @@
+{
+  "id": "sunrise",
+  "name": "Sunrise",
+  "shortName": "Sunrise",
+  "version": "0.04",
+  "type": "clock",
+  "description": "Show sunrise and sunset times",
+  "icon": "app.png",
+  "allow_emulator": true,
+  "tags": "clock",
+  "supports": [
+    "BANGLEJS2"
+  ],
+  "readme": "README.md",
+  "storage": [
+    {
+      "name": "sunrise.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "sunrise.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    }
+  ],
+  "screenshots": [
+    {
+      "url": "screenshot.png"
+    }
+  ]
+}
diff --git a/apps/sunrise/screenshot.png b/apps/sunrise/screenshot.png
new file mode 100644
index 000000000..c85cdfbe9
Binary files /dev/null and b/apps/sunrise/screenshot.png differ
diff --git a/apps/swiperclocklaunch/ChangeLog b/apps/swiperclocklaunch/ChangeLog
index e7ad4555c..a341ee512 100644
--- a/apps/swiperclocklaunch/ChangeLog
+++ b/apps/swiperclocklaunch/ChangeLog
@@ -2,3 +2,5 @@
 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
+0.05: Keep track of event listeners we "overwrite", and remove them at the start of setUI
+0.06: Handle apps that call setUI({}) to reset
diff --git a/apps/swiperclocklaunch/boot.js b/apps/swiperclocklaunch/boot.js
index ea00a6735..bb033891e 100644
--- a/apps/swiperclocklaunch/boot.js
+++ b/apps/swiperclocklaunch/boot.js
@@ -1,9 +1,16 @@
 (function() {
   var sui = Bangle.setUI;
+  var oldSwipe;
+
   Bangle.setUI = function(mode, cb) {
+    if (oldSwipe && oldSwipe !== Bangle.swipeHandler)
+      Bangle.removeListener("swipe", oldSwipe);
     sui(mode,cb);
-    if(!mode) return;
+    oldSwipe = Bangle.swipeHandler;
+
     if ("object"==typeof mode) mode = mode.mode;
+    if (!mode) return;
+
     if (mode.startsWith("clock")) {
       // clock -> launcher
       Bangle.swipeHandler = dir => { if (dir<0) Bangle.showLauncher(); };
diff --git a/apps/swiperclocklaunch/metadata.json b/apps/swiperclocklaunch/metadata.json
index 4f27da528..436d36868 100644
--- a/apps/swiperclocklaunch/metadata.json
+++ b/apps/swiperclocklaunch/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "swiperclocklaunch",
   "name": "Swiper Clock Launch",
-  "version": "0.04",
+  "version": "0.06",
   "description": "Navigate between clock and launcher with Swipe action",
   "icon": "swiperclocklaunch.png",
   "type": "bootloader",
diff --git a/apps/swscroll/ChangeLog b/apps/swscroll/ChangeLog
index c5fc9dcb4..9283a85da 100644
--- a/apps/swscroll/ChangeLog
+++ b/apps/swscroll/ChangeLog
@@ -1,2 +1,5 @@
 0.01: Inital release.
 0.02: Rebasing on latest changes to showScroller_Q3 (https://github.com/espruino/Espruino/commit/2d3c34ef7c2b9fe2118e816aacd2e096adb99596).
+0.03: Rebasing on latest changes to showScroller_Q3 (https://github.com/espruino/Espruino/commit/b6f8105b6348bb6f7cd03ac11efc1f3585c6ad79). Ensure that changing a menu item when half-scrolled off screen doesn't overwrite widgets.
+0.04: Rebasing on latest changes to showScroller_Q3 (https://github.com/espruino/Espruino/commit/a0e2d9231df709849f81abf572a742b0fceab85b). Fixes missing `isActive` function that caused an error.
+0.05: Fix for the rebase in ver 0.04. Check boxes didn't behave but now they do.
diff --git a/apps/swscroll/boot.js b/apps/swscroll/boot.js
index 2b1b00de3..1c5a84140 100644
--- a/apps/swscroll/boot.js
+++ b/apps/swscroll/boot.js
@@ -1,4 +1,4 @@
-E.showScroller = (function(options) {    
+E.showScroller = (function(options) {
   /* options = {
     h = height
     c = # of items
@@ -10,16 +10,29 @@ E.showScroller = (function(options) {
   }
 
   returns {
-    draw  = draw all
-    drawItem(idx) = draw specific item
+    scroll: int                // current scroll amount
+    draw: function()           // draw all
+    drawItem : function(idx)   // draw specific item
+    isActive : function()      // is this scroller still active?
   }
+
   */
 if (!options) return Bangle.setUI(); // remove existing handlers
 
+var draw = () => {
+  g.reset().clearRect(R).setClipRect(R.x,R.y,R.x2,R.y2);
+  var a = YtoIdx(R.y);
+  var b = Math.min(YtoIdx(R.y2),options.c-1);
+  for (var i=a;i<=b;i++)
+    options.draw(i, {x:R.x,y:idxToY(i),w:R.w,h:options.h});
+  g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+};
+
 Bangle.setUI({
   mode : "custom",
   back : options.back,
   remove : options.remove,
+  redraw : draw,
   swipe : (_,UD)=>{
     pixels = 120;
     var dy = UD*pixels;
@@ -32,13 +45,13 @@ Bangle.setUI({
     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);
+    g.reset().setClipRect(R.x,R.y,R.x2,R.y2).scroll(0,dy);
     var d = UD*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);
+      let y = Math.max(R.y2-(1-d), R.y);
+      g.setClipRect(R.x,y,R.x2,R.y2);
+      let i = YtoIdx(y);
+      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});
@@ -46,10 +59,10 @@ Bangle.setUI({
         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
+      let y = Math.min(R.y+d, R.y2);
+      g.setClipRect(R.x,R.y,R.x2,y);
+      let i = YtoIdx(y);
+      y = idxToY(i);
       while (y > R.y-options.h) {
         options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
         y -= options.h;
@@ -66,8 +79,8 @@ Bangle.setUI({
       options.select(i, {x:e.x, y:yInElement});
     }
   }
-});  
-  
+});
+
 var menuShowing = false;
 var R = Bangle.appRect;
 var Y = R.y;
@@ -82,23 +95,16 @@ function idxToY(i) {
 function YtoIdx(y) {
   return Math.floor((y + rScroll - R.y)/options.h);
 }
-  
-var s = {  
+
+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);
-}};
+  draw : draw, drawItem : i => {
+    var y = idxToY(i);
+    g.reset().setClipRect(R.x,Math.max(y,R.y),R.x2,Math.min(y+options.h,R.y2));
+    options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
+    g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+  }, isActive : () => Bangle.uiRedraw == draw
+};
 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
diff --git a/apps/swscroll/metadata.json b/apps/swscroll/metadata.json
index 4edbfa2ba..3c0717d14 100644
--- a/apps/swscroll/metadata.json
+++ b/apps/swscroll/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "swscroll",
   "name": "Swipe menus",
-  "version": "0.02",
+  "version": "0.05",
   "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",
diff --git a/apps/taglaunch/ChangeLog b/apps/taglaunch/ChangeLog
index 981f50386..55315bf6e 100644
--- a/apps/taglaunch/ChangeLog
+++ b/apps/taglaunch/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New App!
 0.02: Use Bangle.showClock for changing to clock (Backport from launch)
+0.03: Remove app from 'tool' when it has at least one other known tag
+      Add tag 'health' for apps like Heart Rate Monitor
diff --git a/apps/taglaunch/README.md b/apps/taglaunch/README.md
index 71eebae9f..57674c7a7 100644
--- a/apps/taglaunch/README.md
+++ b/apps/taglaunch/README.md
@@ -4,7 +4,7 @@ Launcher
 Based on the default launcher but puts all applications in a submenu by their tag.
 With many applications installed this can result in a faster applications selection than the linear access of the default launcher.
 
-Currently the following tags are supported: clock, game, tool, bluetooth, outdoors, misc.
+Currently the following tags are supported: clock, game, tool, bluetooth, outdoors, health and misc.
 
 Settings
 --------
diff --git a/apps/taglaunch/app.js b/apps/taglaunch/app.js
index c940284c2..aad61e298 100644
--- a/apps/taglaunch/app.js
+++ b/apps/taglaunch/app.js
@@ -8,7 +8,8 @@ let tags = {"clock": {name: /*LANG*/"Clocks", icon: atob("MDCEBERERERERERERERERE
             "tool": {name: /*LANG*/"Tools", sortorder: -1, icon: atob("MDCEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAAAAAAAAAIiIgAAAAAAAAAAADMzMAAAAAAAAAAAAiIiIgAAAAAAAAAAADMzMwAAAAAAAAAAIiIiIAAAAAAAAAAAAAMzMzAAAAAAAAACIiIiAAAAAAAAAAAAAAMzMzMAAAAAAAACIiIgAAAAAAAAAAAAAAAzMzMAAAAAAAAiIiIAAAAAAAAAAAAAAAADMzMwAAAAAAAiIiIAAAAAIgAAAAAAAAAAMzMzAAAAAAAiIiIgAAACIgAAAAAAAAAAADMzMAAAAAAiIiIiAAAiIgAAAAAAAAAAAAMzMwAAAAAiIiIiIAIiIgAAAAAAAAAAAAAzMzAAAAACIiIiIiIiIgAAAAAAAAAAAAADMzMAAAAiIiIiIiIiIAAAAAAAAAAAAAAAMzMwDdQiIiIiIiIiIAAAAAAAAAAAAAAAAzMz3d0iIiIiIiIiAAAAAAAAAAAAAAAAADM93d1CIiIiIiIgAAAAAAAAAAAAAAAAAAPd3d3iIiACIiAAAAAAAAAAAAAAAAAAAA3d3d7kIgAAAAAAAAAAAAAAAAAAAAAAAN3d3e7uQAAAAAAAAAAAAAAAAAAAAAAAAN3d3u7u4AAAAAAAAAAAAAAAAAAAAAAAAC3d7u7u7gAAAAAAAAAAAAAAAAAAAAAAAiJO7u7u7uAAAAAAAAAAAAAAAAAAAAAAIiIiTu7u7u7gAAAAAAAAAAAAAAAAAAACIiIiIu7u7u7uAAAAAAAAAAAAAAAAAAAiIiIiIA7u7u7u4AAAAAAAAAAAAAAAAAIiIiIiAADu7u7u7uAAAAAAAAAAAAAAACIiIiIgAAAO7u7u7u4AAAAAAAAAAAAAAiIiIiIAAAAO7u7u7u7gAAAAAAAAAAAAIiIiIiAAAAAA7u7u7u7uAAAAAAAAAAAiIiIiIgAAAAAADu7u7u7u4AAAAAAAAAIiIiIiIAAAAAAAAO7u7u7u7gAAAAAAAAIiIiIiAAAAAAAAAO7u7u7u7gAAAAAAACIgAiIgAAAAAAAAAA7u7u7u7gAAAAAAACIgAiIAAAAAAAAAAADu7u7u7gAAAAAAACIiIiIAAAAAAAAAAAAO7u7u4AAAAAAAAAIiIiAAAAAAAAAAAAAO7u7uAAAAAAAAAAAiIAAAAAAAAAAAAAAADu7gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==")},
             "bluetooth": {name: /*LANG*/"Bluetooth", icon: atob("MDCEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqoAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqqgAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqqqoAAAAAAAAAAAAAAAAAAAAAAAAAAKqqqqqgAAAAAAAAAAAAAAAAAAAAAAAAAKqqqqqqAAAAAAAAAAAAAAAAAAAAAAAAAKqqCqqqoAAAAAAAAAAAAAAAAAAAAAAAAKqqAKqqqgAAAAAAAAAAAAAAAAAAAAAAAKqqAAqqqqAAAAAAAAAAAAAAAAAKqgAAAKqqAACqqqqgAAAAAAAAAAAAAAAKqqAAAKqqAAAKqqoAAAAAAAAAAAAAAAAKqqoAAKqqAACqqqAAAAAAAAAAAAAAAAAAqqqgAKqqAAqqqgAAAAAAAAAAAAAAAAAACqqqAKqqAKqqoAAAAAAAAAAAAAAAAAAAAKqqoKqqCqqqAAAAAAAAAAAAAAAAAAAAAAqqqqqqqqqgAAAAAAAAAAAAAAAAAAAAAACqqqqqqqoAAAAAAAAAAAAAAAAAAAAAAAAKqqqqqqAAAAAAAAAAAAAAAAAAAAAAAAAAqqqqqgAAAAAAAAAAAAAAAAAAAAAAAAAACqqqoAAAAAAAAAAAAAAAAAAAAAAAAAAACqqqoAAAAAAAAAAAAAAAAAAAAAAAAAAAqqqqqgAAAAAAAAAAAAAAAAAAAAAAAAAKqqqqqqAAAAAAAAAAAAAAAAAAAAAAAACqqqqqqqoAAAAAAAAAAAAAAAAAAAAAAAqqqqqqqqqgAAAAAAAAAAAAAAAAAAAAAKqqoKqqCqqqAAAAAAAAAAAAAAAAAAAACqqqAKqqAKqqoAAAAAAAAAAAAAAAAAAAqqqgAKqqAAqqqgAAAAAAAAAAAAAAAAAKqqoAAKqqAACqqqAAAAAAAAAAAAAAAACqqqAAAKqqAAAKqqoAAAAAAAAAAAAAAAAKqgAAAKqqAACqqqoAAAAAAAAAAAAAAAAAoAAAAKqqAAqqqqAAAAAAAAAAAAAAAAAAAAAAAKqqAKqqqgAAAAAAAAAAAAAAAAAAAAAAAKqqCqqqoAAAAAAAAAAAAAAAAAAAAAAAAKqqqqqqAAAAAAAAAAAAAAAAAAAAAAAAAKqqqqqgAAAAAAAAAAAAAAAAAAAAAAAAAKqqqqoAAAAAAAAAAAAAAAAAAAAAAAAAAKqqqgAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqoAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==")},
             "outdoors": {name: /*LANG*/"Outdoor", icon: atob("MDCEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN3d0AAAAAAAAAAAAAAAAAAAAAAAAADd3d3d3d3QAAAAAAAAAAAAAAAAAAAAAADd3d3d3d3QAAAAAAAAAAAAAAAAAAAAAADd3e7u7d3QAAAAAAAAAAAAAAAAAAAAAADd3u7u7t3QAAAAAAAAAAAAAAAAAAAAAA3d7u7u7u3dAAAAAAAAAAAAAAAAAAAAAN3d7u7u7u3d0AAAAAAAAAAAAAAAAAAADd3d7u7u7u3d3QAAAAAAAAAAAAAAAAAAAN3d7u7u7u3d0AAAAAAAAAAAAAAAAAAAAA3d3u7u7u3dAAAAAAAAAAAAAAAAAAAAAADd3u7u7t3QAAAAAAAAAAAAAAAAAAAAAADd3d7u7d3QAMzMwAAAAAAAAO4AAAAAAADd3d3d3d3QAMzMwAAAAAAA7u7gAAAAAADd3d3d3d3QAAzMwAAAAAAO7u7gAAAAAAAAAN3d0AAAAAzMAAAAAAAO7u7gAAAAAAAAAA3dAAAAAAzMAAAAAADu7u4AAAAAAAAAAADQAAAAAAzMAAAAAADu7u4AAAAAAAAAAAAAAAAAAAERAAAAAA7u7uAAAAAAAAAAAAAAAAAAAAERAAAAQO7u7uAAAAAAAAAAAAAAAAAAAAEREAAEAO7u7gAAAAAAAAAAAAAAAAAAABEREN3U3e7u7gAAAAAAAAAAAAAAAAAAARERFN3d3d7u4AAAAAAAAAAAAAAAAAAAARERFEREREREQAAAAAAAAAAAAAAAAAEREREREREREREREREAAAAAAAAAAAAAAAEREREREREREREREREAAAAAAAAAAAAAAAARERERERERERERERAAAAAAAAAAAAAAAAAEREREREREREREREAAAAAAAAAAAAAAAAAERERERERERERERAAAAAAAAAADMzMzMzMxFEERRBEUQRFEETMzMzAAAAADMzMzMzMyFEERRBEUQRFEETMzMzAAAAADMzMzMzMzREREREREREREQzMzMzAAAAADMzMzMzMzJEREREREREREIzMzMzAAAAADMzMzMzMzMkRERERERERCMzMzMzAAAAADMzMzMzMzMzJEREREREIzMzMzMzAAAAADMzMzMzMzMzMzMzMzMzMzMzMzMzAAAAADMzMzMzMzMzMzMzMzMzMzMzMzMzAAAAADMzMzMzMzMzMzMzMzMzMzMzMzMzAAAAADMzMzMzMzMzMzMzMzMzMzMzMzMzAAAAADMzMzMzMzMzMzMzMzMzMzMzMzMzAAAAADMzMzMzMzMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==")},
-            "misc": {name: /*LANG*/"Misc", icon: atob("MDCEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==")}
+            "misc": {name: /*LANG*/"Misc", icon: atob("MDCEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAACIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==")},
+            "health": {name: /*LANG*/"Health"},
            };
 
 // handle customised launcher
@@ -54,6 +55,9 @@ if (launchCache.hash!=launchHash) {
         .filter(tag => Object.keys(tags).includes(tag));
       if (appTags.length === 0) {
         appTags.push("misc");
+      } else if (appTags.length > 1 && appTags.indexOf("tool") >= 0) {
+        // everything has tag 'tool', unregister when at least one other known tag
+        appTags.splice(appTags.indexOf("tool"), 1);
       }
       appTags.forEach(tag => appsByTag[tag].push(app));
     });
@@ -103,8 +107,10 @@ let showMainMenu = () => {
       let tag = tagKeys[i];
       g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
       g.setFont(font).setFontAlign(-1,0).drawString(tags[tag].name,64*scaleval,r.y+(32*scaleval));
-      if (tags[tag].icon) {
-        try {g.drawImage(tags[tag].icon,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
+
+      const img = tags[tag].icon ? tags[tag].icon : s.read("taglaunch." + tag + ".img");
+      if (img) {
+        try {g.drawImage(img,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
       }
     },
     select : i => {
diff --git a/apps/taglaunch/health-icon.js b/apps/taglaunch/health-icon.js
new file mode 100644
index 000000000..11b513b72
--- /dev/null
+++ b/apps/taglaunch/health-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AEnM5ndABgWGhgXP6AuHC5wwGC/4X/C98z///mYXSn4WBAAPzC6HTCwYABnoXPFwgwGC5QuDAoIwGC5XfC4/9C5pGDC4hIDC8QVDAAYHEC/4XSR97XX6YXHnoXNJAhGGC5gwDFwwXMGAouEC5vdmYWBmbEFC5oAJC/4X/C9sMC5/QC4owCFyYA/ADoA=="))
diff --git a/apps/taglaunch/metadata.json b/apps/taglaunch/metadata.json
index d7f1954b1..4f7c295e9 100644
--- a/apps/taglaunch/metadata.json
+++ b/apps/taglaunch/metadata.json
@@ -2,16 +2,18 @@
   "id": "taglaunch",
   "name": "Tag Launcher",
   "shortName": "Taglauncher",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Launcher that puts all applications into submenus based on their tag. With many applications installed this can result in a faster application selection than the linear access of the default launcher.",
   "readme": "README.md",
   "icon": "app.png",
   "type": "launch",
   "tags": "tool,system,launcher",
   "supports": ["BANGLEJS2"],
+  "screenshots": [ {"url":"screenshot.png"} ],
   "storage": [
     {"name":"taglaunch.app.js","url":"app.js"},
-    {"name":"taglaunch.settings.js","url":"settings.js"}
+    {"name":"taglaunch.settings.js","url":"settings.js"},
+    {"name":"taglaunch.health.img","url":"health-icon.js","evaluate":true}
   ],
   "data": [{"name":"taglaunch.json"},{"name":"taglaunch.cache.json"}]
 }
diff --git a/apps/taglaunch/screenshot.png b/apps/taglaunch/screenshot.png
new file mode 100644
index 000000000..cc3e9b8cf
Binary files /dev/null and b/apps/taglaunch/screenshot.png differ
diff --git a/apps/taglaunch/settings.js b/apps/taglaunch/settings.js
index 52fa07a7f..94ec34a36 100644
--- a/apps/taglaunch/settings.js
+++ b/apps/taglaunch/settings.js
@@ -12,7 +12,7 @@
   }
   const appMenu = {
     "": { "title": /*LANG*/"Tag Launcher" },
-    /*LANG*/"< Back": back,
+    "< Back": back,
     /*LANG*/"Font": {
       value: fonts.includes(settings.font)? fonts.indexOf(settings.font) : fonts.indexOf("12x20"),
       min:0, max:fonts.length-1, step:1,wrap:true,
diff --git a/apps/tempgraph/ChangeLog b/apps/tempgraph/ChangeLog
new file mode 100644
index 000000000..74f2d7255
--- /dev/null
+++ b/apps/tempgraph/ChangeLog
@@ -0,0 +1,3 @@
+0.01: 3/Feb/2023 Added 'Temperature Graph' app to depository.
+0.02: 4/Feb/2023 Rewrote the widget handling after discovering there's a 'widget_utils' module to properly hide and show them.
+0.03: 4/Feb/2023 Fixed number error in timesData array.
diff --git a/apps/tempgraph/README.md b/apps/tempgraph/README.md
new file mode 100644
index 000000000..919c20267
--- /dev/null
+++ b/apps/tempgraph/README.md
@@ -0,0 +1,36 @@
+# Temperature Graph
+
+**Temperature Graph** (tempgraph) is a Bangle.js 2 app for recording graphs of the temperature for various time periods from 10 minutes to 7 days long. It samples the watch's temperature sensor 150 times while creating a graph, regardless of the time period selected.
+
+### Menu Options
+* **Widgets** Toggles the watch's widgets on and off. With them off gives you a bigger graph when viewing it.
+
+* **Duration** Select the time period for drawing the graph, from 10 minutes to 7 days long.
+
+* **Draw Graph** Draws the graph.
+  * Tapping the screen toggles the graph between Celsius (red) and Fahrenheit (blue).
+  * Pressing the watch button takes you back to the menu. **Note:** While the graph can still be viewed after returning to the menu, you can't continue recording it if you had returned to the menu before the time period was up. The graph is saved in the watch though so it's still there the next time you start the app.
+
+* **Show Graph** Shows the last drawn graph.
+  * Tapping the screen toggles the graph between Celsius (red) and Fahrenheit (blue).
+  * Pressing the watch button takes you back to the menu.
+
+* **Save Graph** Sends a screengrab of the graph to the Espruino Web IDE from where you can save it as you would any image on a webpage.
+
+* **Save Data** Sends a CSV file of the graph's temperature data to the Espruino Web IDE where you can save it for further use. I suggest you use the Espruino Web IDE's Terminal Logger (selected in the IDE's Settings/General) to record the data as it's sent. This is the easiest way to save it as a text file.
+
+* **Show Temp** Shows the current temperature.
+
+### Note
+Using the watch in a normal fashion can raise the temperature it's sensing to quite a few degrees above the surrounding temperature and it may take half an hour or so to drop to close to the surrounding temperature. After that it seems to give quite accurate readings, assuming the thermometer I've been comparing it to is itself reasonably accurate. So best to load the app then not touch the watch for half an hour before starting a recording. This is assuming you're not wearing the app and are just using it to record the temperature where you've put the watch. You could of course wear it and it'll still draw a graph, which might also be useful.
+
+### Screenshots
+![](screenshot_1.png)
+![](screenshot_2.png)
+![](screenshot_3.png)
+
+### Creator
+Carl Read ([mail](mailto:cread98@orcon.net.nz), [github](https://github.com/CarlR9))
+
+#### License
+[MIT License](LICENSE)
diff --git a/apps/tempgraph/app-icon.js b/apps/tempgraph/app-icon.js
new file mode 100644
index 000000000..50aae4c01
--- /dev/null
+++ b/apps/tempgraph/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+goA/AH4AgrHXABFYF0XXkYAK64utGENYFxoABSTxeHXYJglF+UAAIQvEBApfhE4UAF4IDBFwZf/X7hfsR4K/tL96/vRwpf/X/5fJGYK/tL9u02i/tF4KOFL/6/XF4ZftR4K/tL96/vRwpf/X/5fJGYK/tL96/vRwpf/X7gADF8ouBGA4v/F/6/urAmGABFYF7pgIL0owPF0KSC64AIRj4A/AH4ACA="))
\ No newline at end of file
diff --git a/apps/tempgraph/app.js b/apps/tempgraph/app.js
new file mode 100644
index 000000000..b8dd231ae
--- /dev/null
+++ b/apps/tempgraph/app.js
@@ -0,0 +1,394 @@
+// Temperature Graph
+// BangleJS Script
+
+Bangle.setBarometerPower(true,"tempgraph");
+Bangle.loadWidgets();
+var widsOn=true;
+var rm=null;
+var gt=null;
+var dg=null;
+var Layout=require("Layout");
+var C=true;
+var temp,tempMode,readErrCnt,watchButton2;
+
+var graph=require("Storage").readJSON("tempgraph.json",true);
+if(graph==undefined) {
+	graph=[];
+}
+
+var timesData=[
+	// dur=duration, u=time units, d=divisions on graph, s=seconds per unit.
+	{dur:10,u:"Mins",d:5,s:60},
+	{dur:20,u:"Mins",d:4,s:60},
+	{dur:30,u:"Mins",d:3,s:60},
+	{dur:40,u:"Mins",d:4,s:60},
+	{dur:1,u:"Hr",d:4,s:3600},
+	{dur:2,u:"Hrs",d:4,s:3600},
+	{dur:3,u:"Hrs",d:3,s:3600},
+	{dur:4,u:"Hrs",d:4,s:3600},
+	{dur:6,u:"Hrs",d:6,s:3600},
+	{dur:8,u:"Hrs",d:4,s:3600},
+	{dur:12,u:"Hrs",d:6,s:3600},
+	{dur:16,u:"Hrs",d:4,s:3600},
+	{dur:20,u:"Hrs",d:5,s:3600},
+	{dur:1,u:"Day",d:4,s:86400},
+	{dur:2,u:"Days",d:4,s:86400},
+	{dur:3,u:"Days",d:3,s:86400},
+	{dur:4,u:"Days",d:4,s:86400},
+	{dur:5,u:"Days",d:5,s:86400},
+	{dur:6,u:"Days",d:6,s:86400},
+	{dur:7,u:"Days",d:7,s:86400}
+];
+var times=[];
+for(n=0;n<timesData.length;n++){
+	times.push(timesData[n].dur+" "+timesData[n].u);
+}
+var durInd=0;
+var duration=times[durInd];
+
+function drawWids(){
+	g.clear();
+	if(widsOn){
+		Bangle.drawWidgets();
+		require("widget_utils").show();
+	} else {
+		require("widget_utils").hide();
+	}
+}
+
+function openMenu(){
+	drawWids();
+	E.showMenu(menu);
+}
+
+function redoMenu(){
+	clearInterval(rm);
+	E.showMenu();
+	openMenu();
+}
+
+function refreshMenu(){
+	rm = setInterval(redoMenu,100);
+}
+function getF(c){
+	// Get Fahrenheit temperature from Celsius.
+	return c*1.8+32;
+}
+
+function getT(){
+	Bangle.getPressure().then(p=>{
+		temp=p.temperature;
+		if(tempMode=="drawGraph"&&graph.length>0&&Math.abs(graph[graph.length-1].temp-temp)>10&&readErrCnt<2){
+			// A large change in temperature may be a reading error. ie. A 0C or less reading after
+			// a 20C reading. So if this happens, the reading is repeated up to 2 times to hopefully
+			// skip such errors.
+			readErrCnt++;
+			print("readErrCnt "+readErrCnt);
+			return;
+		}
+		clearInterval(gt);
+		readErrCnt=0;
+		switch (tempMode){
+			case "showTemp":
+				showT();
+				break;
+			case "drawGraph":
+				var date=new Date();
+				var dateStr=require("locale").date(date).trim();
+				var hrs=date.getHours();
+				var mins=date.getMinutes();
+				var secs=date.getSeconds();
+				graph.push({
+					temp:temp,
+					date:dateStr,
+					hrs:hrs,
+					mins:mins,
+					secs:secs
+				});
+				if(graph.length==1){
+					graph[0].dur=durInd;	
+				}
+				require("Storage").writeJSON("tempgraph.json", graph);
+				if(graph.length==150){
+					clearInterval(dg);
+				}
+				drawG();
+		}
+	});
+}
+
+function getTemp(){
+	readErrCnt=0;
+	gt = setInterval(getT,800);
+}
+
+function setButton(){
+	var watchButton=setWatch(function(){
+		clearInterval(gt);
+		clearInterval(dg);
+		clearWatch(watchButton);
+		Bangle.removeListener("touch",screenTouch);
+		openMenu();
+	},BTN);
+	Bangle.on('touch',screenTouch);
+}
+
+function setButton2(){
+	watchButton2=setWatch(function(){
+		clearWatch(watchButton2);
+		openMenu();
+	},BTN);
+}
+
+function zPad(n){
+	return n.toString().padStart(2,0);	
+}
+
+function screenTouch(n,ev){
+	if(ev.y>23&&ev.y<152){
+		C=C==false;
+		drawG(false);
+	}
+}
+
+function drawG(){
+	function cf(t){
+		if(C){
+			return t;
+		}
+		return getF(t);
+	}
+	drawWids();
+	var top=1;
+	var bar=21;
+	var barBot=175-22;
+	if(widsOn){
+		top=25;
+		bar=bar+24;
+		barBot=barBot-24;
+	}
+	var low=graph[0].temp;
+	var hi=low;
+	for(n=0;n<graph.length;n++){
+		var t=graph[n].temp;
+		if(low>t){
+			low=t;
+		}
+		if(hi<t){
+			hi=t;
+		}
+	}
+	var tempHi=Math.ceil((cf(hi)+2)/10)*10;
+	var tempLow=Math.floor((cf(low)-2)/10)*10;
+	var div=2;
+	if(tempHi-tempLow>10){
+		div=5;
+	}
+	if(C){
+		g.setColor(1,0,0);
+	}else{
+		g.setColor(0,0,1);
+	}
+	var step=(barBot-bar)/((tempHi-tempLow)/div);
+	for(n=0;n<graph.length;n++){
+		var pos=tempLow-cf(graph[n].temp);
+		g.drawLine(n+3,pos*(step/div)+barBot,n+3,barBot+3);
+	}
+	g.fillRect(161,barBot+5,174,barBot+20);
+	g.setColor(1,1,1);
+	g.setFont("6x8:2");
+	if(C){
+		g.drawString("C",163,barBot+5);
+	}else{
+		g.drawString("F",163,barBot+5);
+	}
+	g.setColor(0,0,0);
+	g.setFont6x15();
+	g.drawString("Temperature Graph - "+times[graph[0].dur],1,top);
+	g.drawRect(2,bar-4,153,barBot+4);
+	g.setFont("6x8:1");
+	var num=tempHi;
+	for(n=bar;n<=barBot;n=n+step){
+		g.drawLine(3,n,152,n);
+		g.drawString(num.toString().padStart(3," "),155,n-4);
+		num=num-div;
+	}
+	step=151/timesData[graph[0].dur].d;
+	for(n=step+2;n<152;n=n+step){
+		g.drawLine(n,bar-4,n,barBot+4);
+	}
+	grSt=graph[0];
+	g.drawString("Start: "+grSt.date+" "+grSt.hrs+":"+zPad(grSt.mins),1,barBot+6);
+	var lastT=graph[graph.length-1].temp;
+	g.drawString("Last Reading:",1,barBot+14);
+	g.setColor(1,0,0);
+	g.drawString(lastT.toFixed(1)+"C",85,barBot+14);
+	g.setColor(0,0,1);
+	g.drawString(getF(lastT).toFixed(1)+"F",121,barBot+14);
+	process.memory(true);
+}
+
+function drawGraph(){
+	setButton();
+	tempMode="drawGraph";
+	durInd=times.indexOf(duration);
+	graph=[];
+	getTemp();
+	dg=setInterval(getTemp,1000*timesData[durInd].dur*timesData[durInd].s/150);
+}
+
+function showGraph(){
+	setButton();
+	drawG();
+}
+
+function noBluetooth(){
+	if(NRF.getSecurityStatus().connected){
+		return false;
+	}else{
+		message("Error! Your\nBangle Watch\ncurrently has\nno Bluetooth\nconnection.");
+		return true;
+	}
+}
+
+function saveGraph(){
+	if(noBluetooth()){
+		return;
+	}
+	drawG();
+	g.flip();
+	g.dump();
+	message("Graph has\nbeen sent\nto Web IDE\nfor saving.\n");
+}
+
+function saveData(){
+	if(noBluetooth()){
+		return;
+	}
+	drawG();
+	g.flip();
+	print("Temperature Graph - "+times[graph[0].dur]+"\n");
+	print("\"Date\",\"Time\",\"Celsius\",\"Fahrenheit\"");
+	for(n=0;n<graph.length;n++){
+		var gr=graph[n];
+		print("\""+gr.date+"\",\""+gr.hrs+":"+zPad(gr.mins)+":"+zPad(gr.secs)+"\","+gr.temp+","+getF(gr.temp));	
+	}
+	message("Data has\nbeen sent\nto Web IDE\nfor saving.\n");
+}
+
+function message(mes){
+	setButton2();
+	var messageLO=new Layout({
+		type:"v",c:[
+			{type:"txt",font:"6x8:2",width:171,label:mes,id:"label"},
+			{type:"btn",font:"6x8:2",pad:3,label:"OK",cb:l=>exit()},
+		],lazy:true
+	});
+	drawWids();
+	messageLO.render();
+}
+
+function showT(){
+	tempLO.lab1.label=tempLO.lab3.label;
+	tempLO.lab2.label=tempLO.lab4.label;
+	tempLO.lab3.label=tempLO.lab5.label;
+	tempLO.lab4.label=tempLO.lab6.label;
+	tempLO.lab5.label=temp.toFixed(2)+"C";
+	tempLO.lab6.label=getF(temp).toFixed(2)+"F";
+	tempLO.render();
+}
+
+function exit(){
+	clearWatch(watchButton2);
+	openMenu();
+}
+
+function showTemp(){
+	tempMode="showTemp";
+	setButton2();
+	tempLO=new Layout({
+		type:"v",c:[
+			{type:"h",c:[
+				{type:"txt",pad:5,col:"#f77",font:"6x8:2",label:"      ",id:"lab1"},
+				{type:"txt",pad:5,col:"#77f",font:"6x8:2",label:"      ",id:"lab2"}
+			]},
+			{type:"h",c:[
+				{type:"txt",pad:5,col:"#f77",font:"6x8:2",label:"      ",id:"lab3"},
+				{type:"txt",pad:5,col:"#77f",font:"6x8:2",label:"      ",id:"lab4"}
+			]},
+			{type:"h",c:[
+				{type:"txt",pad:5,col:"#f00",font:"6x8:2",label:"      ",id:"lab5"},
+				{type:"txt",pad:5,col:"#00f",font:"6x8:2",label:"      ",id:"lab6"}
+			]},
+			{type:"h",c:[
+				{type:"btn",pad:2,font:"6x8:2",label:"Temp",cb:l=>getTemp()},
+				{type:"btn",pad:2,font:"6x8:2",label:"Exit",cb:l=>exit()}
+			]}
+		]
+	},{lazy:true});
+	tempLO.render();
+	getTemp();
+}
+
+var menu={
+	"":{
+		"title":" Temp. Graph"
+	},
+
+	"Widgets":{
+		value:widsOn,
+		format:vis=>vis?"Hide":"Show",
+		onchange:vis=>{
+			widsOn=vis;
+			refreshMenu();
+		}
+	},
+
+	"Duration":{
+		value:times.indexOf(duration),
+		min:0,max:times.length-1,step:1,wrap:true,
+		format:tim=>times[tim],
+		onchange:(dur)=>{
+			duration=times[dur];
+		}
+	},
+
+	"Draw Graph":function(){
+		E.showMenu();
+		drawGraph();
+	},
+
+	"Show Graph" : function(){
+		E.showMenu();
+		if(graph.length>0){
+			showGraph();
+		}else{
+			message("No graph to\nshow as no\ngraph has been\ndrawn yet.");
+		}
+	},
+
+	"Save Graph" : function(){
+		E.showMenu();
+		if(graph.length>0){
+			saveGraph();
+		}else{
+			message("No graph to\nsave as no\ngraph has been\ndrawn yet.");
+		}
+	},
+
+	"Save Data" : function(){
+		E.showMenu();
+		if(graph.length>0){
+			saveData();
+		}else{
+			message("No data to\nsave as no\ngraph has been\ndrawn yet.");
+		}
+	},
+
+	"Show Temp":function(){
+		E.showMenu();
+		showTemp();
+	}
+};
+
+openMenu();
diff --git a/apps/tempgraph/app.png b/apps/tempgraph/app.png
new file mode 100644
index 000000000..1ae347ac8
Binary files /dev/null and b/apps/tempgraph/app.png differ
diff --git a/apps/tempgraph/metadata.json b/apps/tempgraph/metadata.json
new file mode 100644
index 000000000..63d4feddd
--- /dev/null
+++ b/apps/tempgraph/metadata.json
@@ -0,0 +1,19 @@
+{ "id": "tempgraph",
+  "name": "Temperature Graph",
+  "shortName":"Temp Graph",
+  "version":"0.03",
+  "description": "An app for recording the temperature for time periods ranging from 10 minutes to 7 days.",
+  "icon": "app.png",  
+  "type": "app",
+  "tags": "temperature,tempgraph,graph",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"tempgraph.app.js","url":"app.js"},
+    {"name":"tempgraph.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"tempgraph.json"}
+  ],
+  "screenshots": [{"url":"screenshot_1.png"},{"url":"screenshot_2.png"},{"url":"screenshot_3.png"}]
+}
diff --git a/apps/tempgraph/screenshot_1.png b/apps/tempgraph/screenshot_1.png
new file mode 100644
index 000000000..7395f2896
Binary files /dev/null and b/apps/tempgraph/screenshot_1.png differ
diff --git a/apps/tempgraph/screenshot_2.png b/apps/tempgraph/screenshot_2.png
new file mode 100644
index 000000000..68d0ea236
Binary files /dev/null and b/apps/tempgraph/screenshot_2.png differ
diff --git a/apps/tempgraph/screenshot_3.png b/apps/tempgraph/screenshot_3.png
new file mode 100644
index 000000000..33f3d612e
Binary files /dev/null and b/apps/tempgraph/screenshot_3.png differ
diff --git a/apps/tempmonitor/ChangeLog b/apps/tempmonitor/ChangeLog
index 99fe6a77d..b113480eb 100644
--- a/apps/tempmonitor/ChangeLog
+++ b/apps/tempmonitor/ChangeLog
@@ -1,2 +1,5 @@
 0.01: 1st version: saves values to csv
 0.02: added HTML interface
+0.03: Added Stop/start recording, change BG color, filesize info
+0.04: Support for negative degree, Min/Max, random for emulator, clean of code 
+0.05: Fix issue on BJS2 caused by Bangle.getPressure promise
diff --git a/apps/tempmonitor/README.md b/apps/tempmonitor/README.md
index a956f0e0f..59a0af58e 100644
--- a/apps/tempmonitor/README.md
+++ b/apps/tempmonitor/README.md
@@ -1,5 +1,5 @@
 # Temperature Monitor (with logging)
-Temperature monitor that shows temperature on real time but also allows to store in a file for a later process.
+Temperature / Thermometer monitor that not only shows degrees on real time but also allows to store this info in a file for a later process.
 
 Compatible with BangleJS1,BangleJS2,and EMSCRIPTENx emulators
 
@@ -9,6 +9,12 @@ Bangle JS1
 
 ![](photo_banglejs1.jpg)
 
+UI for bangleJS1
+![](bangle.js_UI.png)
+
+UI for bangleJS2
+![](bangle.js2_UI.png)
+
 Screenshot BJS2
 
 ![](ss_emul_bjs2.png)
@@ -30,18 +36,35 @@ Screenshot data file content
 
 Open and see a temperature in the screen 
 Download the CSV file and process in your favourite spreadsheet software
+if you have any problem enable the modedebug in code; v_mode_debug=1 or 2
 
 ## Features
 
-Colours, all inputs , graph, widgets loaded 
-Counter for Times Display
+- Cross compatibility (JS1,JS2) and widgets compatibility 
+- BG/FG Colour, Export to file and counter of saved records per session
+- File operations: Info, delete (no yet)
 
+## Pending/future Features
+- Buttons layout: btn txt(BJS1) , on screen button (BJS2)
+- Long press touch to delete file (BJS1,BJS2)
+- File operations: Delete 
 
-## Controls
-
-exit: left side
+## Controls/UI
+ - Left area: Back/Exit/launcher 
+ - BTN3 (long press)(BJS1): default Exit/kill app 
 
+ - BTN1 (BJS2): "Launcher" / open "Messages"
+ - BTN2 (BJS1): "Launcher" / open "Messages"
+ - BTN1 (BJS1): Change FG Color
+ - BTN3 (BJS1): Change BG Color 
+ - Right area: Change FG Color 
+ - Swipe left: Change BG Color 
+ - Swipe right: Increase/Decrease Hour circle/Points 
+ 
+ 
 
 ## Creator
 
-Daniel Perez
\ No newline at end of file
+Daniel Perez
+For suggestions or feedback
+https://github.com/dapgo/my_espruino_smartwatch_things
\ No newline at end of file
diff --git a/apps/tempmonitor/bangle.js2_UI.png b/apps/tempmonitor/bangle.js2_UI.png
new file mode 100644
index 000000000..ecfc31da8
Binary files /dev/null and b/apps/tempmonitor/bangle.js2_UI.png differ
diff --git a/apps/tempmonitor/bangle.js_UI.png b/apps/tempmonitor/bangle.js_UI.png
new file mode 100644
index 000000000..4b114b72c
Binary files /dev/null and b/apps/tempmonitor/bangle.js_UI.png differ
diff --git a/apps/tempmonitor/metadata.json b/apps/tempmonitor/metadata.json
index dafb70f27..5e0d8deb2 100644
--- a/apps/tempmonitor/metadata.json
+++ b/apps/tempmonitor/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "tempmonitor",
   "name": "Temperature monitor",
-  "version": "0.02",
-  "description": "Displays the current temperature and stores in a CSV file",
+  "version": "0.05",
+  "description": "Another thermometer, besides displaying current temperature, stores it in a CSV file",
   "icon": "app.png",
   "tags": "tool",
   "interface": "interface.html",
diff --git a/apps/tempmonitor/old_ss_emul_bjs1.png b/apps/tempmonitor/old_ss_emul_bjs1.png
new file mode 100644
index 000000000..da7a53bd1
Binary files /dev/null and b/apps/tempmonitor/old_ss_emul_bjs1.png differ
diff --git a/apps/tempmonitor/old_ss_emul_bjs2.png b/apps/tempmonitor/old_ss_emul_bjs2.png
new file mode 100644
index 000000000..1cc2140f9
Binary files /dev/null and b/apps/tempmonitor/old_ss_emul_bjs2.png differ
diff --git a/apps/tempmonitor/ss_emul_bjs1.png b/apps/tempmonitor/ss_emul_bjs1.png
index da7a53bd1..cd8deddca 100644
Binary files a/apps/tempmonitor/ss_emul_bjs1.png and b/apps/tempmonitor/ss_emul_bjs1.png differ
diff --git a/apps/tempmonitor/ss_emul_bjs1_help.png b/apps/tempmonitor/ss_emul_bjs1_help.png
new file mode 100644
index 000000000..4d85847b9
Binary files /dev/null and b/apps/tempmonitor/ss_emul_bjs1_help.png differ
diff --git a/apps/tempmonitor/ss_emul_bjs2.png b/apps/tempmonitor/ss_emul_bjs2.png
index 1cc2140f9..2cdc192f8 100644
Binary files a/apps/tempmonitor/ss_emul_bjs2.png and b/apps/tempmonitor/ss_emul_bjs2.png differ
diff --git a/apps/tempmonitor/tempmonitor.app.js b/apps/tempmonitor/tempmonitor.app.js
index 62a4fee67..c8ea0131e 100644
--- a/apps/tempmonitor/tempmonitor.app.js
+++ b/apps/tempmonitor/tempmonitor.app.js
@@ -1,138 +1,347 @@
 // Temperature monitor that saves a log of measures
 // standalone ver for  developer, to remove testing lines
 // delimiter ; (excel) or , (oldscool)
+/* REFACTOR and remove commented code related to
+SetUI, Layout, and setWatch( function(b) { }, BTN1, { repeat: true, edge:'falling' })
+*/
 {
 var v_mode_debug=0; //, 0=no, 1 min, 2 prone detail
 //var required for drawing with dynamic screen
 var rect = Bangle.appRect;
 var history = [];
-var readFreq=5000; //ms //PEND add to settings
-var saveFreq=60000; //ms 1min
-var v_saveToFile= new Boolean(true); //true save //false 
+var readFreq=4000; //ms //PEND add to settings
+if (v_mode_debug>0) var saveFreq=6000; //ms for testin 6sec
+else var saveFreq=60000; //ms  1min
+var v_saveToFile= new Boolean(true); //true save //false
 //with upload file º is not displayed properly
 //with upload RAM º is  displayed
 var v_t_symbol="";//ºC
 var v_saved_entries=0;
-var filename ="temphistory.csv";
+var v_filename ="temphistory.csv";
 var lastMeasure = new String();
 var v_model=process.env.BOARD;
+var v_color_erase=g.getBgColor(); //original BG color overwritten on SetVariables
+var v_color=g.getColor();//original FG color
+var id_rec_intv; //var for the recording interval
+var v_t_max=-50; //preset with an opposite and impossible record measure
+var v_t_min=70;
 
+if (readFreq>saveFreq) console.log("Read refresh freq should be higher than saving");
+if (v_mode_debug>0) console.log("original BG/FG color="+v_color_erase+" / "+v_color);
+
+
+
+function SetVariables(){
 //EMSCRIPTEN,EMSCRIPTEN2
 if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') {
-     v_font_size1=16;
-     v_font_size2=60;
-     //g.setColor("#0ff"); //light color
-  }else{
-    v_font_size1=11;
-    v_font_size2=40;
-    //g.setColor("#000"); //black or dark
-  }
+v_font_size1=16;
+v_font_size2=50;
+}else{
+//Banglejs2 or others
+v_font_size1=11; //too small?
+v_font_size2=40;
+}
+//overwriting default BG, is better detect?
+if (g.theme.dark==1)  v_color_erase=0x0000; //dynamic; //bg black
+else if (g.theme.dark==0)  v_color_erase=0xFFFF; //dynamic; //bg white
+}
 
-function onTemperature(v_temp) {
-  if (v_mode_debug>1) console.log("v_temp in "+v_temp);
-  ClearBox();
-  //g.setFont("6x8",2).setFontAlign(0,0);
-  g.setFontVector(v_font_size1).setFontAlign(0,0);
-  var x = (rect.x+rect.x2)/2;
-  var y = (rect.y+rect.y2)/2 + 20;
-  g.drawString("Records: "+v_saved_entries, x, rect.y+35);
-  g.drawString("Temperature:", x, rect.y+37+v_font_size1);
-  //dynamic font (g.getWidth() > 200 ? 60 : 40)
-  g.setFontVector(v_font_size2).setFontAlign(0,0);
-  // Avg of temperature readings
-  while (history.length>4) history.shift();
-  history.push(v_temp);
-  var avrTemp = E.sum(history) / history.length;
-  //var t = require('locale').temp(avrTemp);
-  //.replace("'","°");
-  lastMeasure=avrTemp.toString();
-  if (lastMeasure.length>4) lastMeasure=lastMeasure.substr(0,4);
-  //DRAW temperature in the center
-  g.drawString("     ", x-20, y);
-  g.drawString(v_temp+v_t_symbol, x-20, y);
-  g.flip();
+//print result
+function printTemperature(v_temp) {
+if (v_mode_debug>1) console.log("v_temp in "+v_temp+" entries "+v_saved_entries);
+
+// Avg of temperature readings
+while (history.length>4) history.shift();
+history.push(v_temp);
+var avrTemp = E.sum(history) / history.length;
+//var t = require('locale').temp(avrTemp);
+//.replace("'","°");
+lastMeasure=avrTemp.toString();
+if (lastMeasure.length>4) lastMeasure=lastMeasure.substr(0,4);
+
+
+ClearBox();
+//g.setFont("6x8",2).setFontAlign(0,0);
+g.setFontVector(v_font_size1).setFontAlign(0,0);
+var x = (rect.x+(rect.x2-60))/2;//-60 space for graph and layout buttons
+var y = (rect.y+rect.y2)/2 + 20;
+
+if (v_saveToFile==true) {
+// if (v_mode_debug>0) console.log("prev color="+v_color);
+printInfo("Recording : "+v_saved_entries, '#CC3333',x,rect.y+30);
+//g.setColor('#CC3333');    //red
+// g.drawString("Recording : "+v_saved_entries, x, rect.y+35);
+//g.setColor(v_color);//restore default color
+}
+else printInfo("Rec paused : "+v_saved_entries, v_color,x,rect.y+30);
+//else g.drawString("Rec paused : "+v_saved_entries, x, rect.y+35);
+//space for printing info
+g.drawString("Temperature:", x, rect.y+45+(v_font_size1*2));
+
+if (v_temp>v_t_max) {
+g.setColor(v_color_erase);
+g.drawString(v_t_max.toString().substr(0,5), rect.x2-40,(rect.y2/2)-30);
+v_t_max=v_temp;
+g.setColor(v_color);
+}
+g.drawString(v_t_max.toString().substr(0,5), rect.x2-40,(rect.y2/2)-30);
+if (v_temp<v_t_min) {
+g.setColor(v_color_erase);
+g.drawString(v_t_min.toString().substr(0,5), rect.x2-40,(rect.y2/2)+50);
+v_t_min=v_temp;
+g.setColor(v_color);
+}
+g.drawString(v_t_min.toString().substr(0,5), rect.x2-40,(rect.y2/2)+50);
+
+
+
+//dynamic font (g.getWidth() > 200 ? 60 : 40)
+g.setFontVector(v_font_size2).setFontAlign(0,0);
+
+//DRAW temperature in the center
+//5 char required for negative degrees
+g.drawString((v_temp.toString().substr(0,5))+v_t_symbol, x, y);
+g.flip();
 }
 // from: BJS2 pressure sensor,  BJS1 inbuilt thermistor
-function drawTemperature() {
-  if(v_model.substr(0,10)!='EMSCRIPTEN'){
+function getTemperature() {
+if(v_model.substr(0,10)!='EMSCRIPTEN'){
+  /*//supposed more aqcurate and it works but sometimes promise fails
+  //Uncaught Error: Unhandled promise rejection: undefined    
     if (Bangle.getPressure) {
-      Bangle.getPressure().then(p =>{if (p) onTemperature(p);});
-    } else onTemperature(E.getTemperature());
-  }
-  else  onTemperature(11);//fake temp for emulators
+   if (v_mode_debug>1) console.log("getpressure supported but..");
+    //v_pressure=Bangle.getPressure().then(print);
+    //wait for premise
+    Bangle.getPressure().then(p =>{if (p)  v_pressureTemp=p.temperature; v_pressurePress=p.pressure;
+     if (v_mode_debug>1) console.log("getpressure t, p: "+v_pressureTemp+" , "+v_pressurePress);
+     if ((v_pressureTemp) && (v_pressureTemp!="")) printTemperature(v_pressureTemp)
+      else  printTemperature(E.getTemperature());
+    });  
+  } else printTemperature(E.getTemperature());
+}*/
+ printTemperature(E.getTemperature());
+}
+else  printTemperature(-11.2+Math.random());//fake temperature medition for emulators
 }
 
-function saveToFile() {
-  //input global vars: lastMeasure
-  var a=new Date();
-  var strlastSaveTime=new String();
-  strlastSaveTime=a.toISOString();
-  //strlastSaveTime=strlastSaveTime.concat(a.getFullYear(),a.getMonth()+1,a.getDate(),a.getHours(),a.getMinutes());;
-  if (v_mode_debug==1) console.log("saving="+strlastSaveTime+";"+a.getHours()+":"+a.getMinutes()+";"+lastMeasure);
-  if (v_saveToFile==true){
-    //write(strlastSaveTime+";"+
-    require("Storage").open(filename,"a").write((a.getMonth()+1)+";"+a.getDate()+";"+a.getHours()+":"+a.getMinutes()+";"+lastMeasure+"\n");
-    //(getTime()+",");
-    v_saved_entries=v_saved_entries+1;
-  }
+/* Note that it changes BG and also FG to an opposite*/
+function changeBGcolor(){
+//pend to refactor
+if (v_mode_debug>1) console.log("before BG/FG  "+v_color_erase+" /"+v_color);
+v_color_erase=0xFFFF-v_color_erase;
+v_color=0xFFFF-v_color;
+if (v_mode_debug>1) console.log("after result BG/FG "+v_color_erase+" /"+v_color);
+//g.setColor(color_result);
+g.setBgColor(v_color_erase);// 0 white, 1 black
+g.setColor(v_color);
+//move to event?
+ClearScreen();
+ClearBox();//?
+getTemperature();
+drawGraph();
+//setDrawLayout(); //uncomment if layout can work with setUI
+//g.clear();//impact on widgets
+}
+
+function saveToFile(){
+//input global vars: lastMeasure
+var a=new Date();
+var strlastSaveTime=new String();
+strlastSaveTime=a.toISOString();
+//strlastSaveTime=strlastSaveTime.concat(a.getFullYear(),a.getMonth()+1,a.getDate(),a.getHours(),a.getMinutes());;
+if (v_mode_debug>1) console.log("saving="+strlastSaveTime+";"+a.getHours()+":"+a.getMinutes()+";"+lastMeasure);
+if (v_saveToFile==true){
+//write(strlastSaveTime+";"+
+//var f = require("Storage").open(v_filename,"r");
+// f=require("Storage").read(v_filename+"\1");//suffix required  load completely!!
+//note that .read uses Storage Class  .open uses StorageFile Class , difference in file chunks
+// if (v_mode_debug>0)  console.log("f  "+f);
+var f = require("Storage").open(v_filename,"r");
+if ((v_mode_debug>0) && (v_saved_entries==0)) console.log("file info:"+f);
+if (f.len>0) {
+if (!f) {
+require("Storage").open(v_filename,"w").write("Month;Day;Time;Temp"+"\n");
+if (v_mode_debug>0)  console.log("not exist but created "+f);
+}
+else{
+require("Storage").open(v_filename,"a").write((a.getMonth()+1)+";"+a.getDate()+";"+a.getHours()+":"+a.getMinutes()+";"+lastMeasure+"\n");
+//(getTime()+",");
+v_saved_entries=v_saved_entries+1;
+if (v_mode_debug>1) console.log("append to already exist "+f.name+" , "+v_saved_entries);
+}
+}
+}
+else if (v_mode_debug>0) console.log("recording mode stopped");
 }
 
 function drawGraph(){
-    var img_obj_thermo =   {
-      width : 36, height : 36, bpp : 3,
-      transparent : 0,
-      buffer : require("heatshrink").decompress(atob("AEFt2AMKm3bsAMJjdt23ABhEB+/7tgaJ///DRUP//7tuADRP923YDRXbDRfymwaJhu/koaK7eyiwaK3cLDRlWDRY1NKBY1Ztu5kjmJg3cyVI7YMHgdu5Mkyu2fxHkyVJjdgDRFJkmRDRPsDQNbDQ5QBGoONKBJrBoxQIQwO2eRcbtu24AMIFIQLJAH4AMA=="))
-    };
-    g.drawImage(img_obj_thermo,rect.x2-50,rect.y2/2);
-    g.flip();
+if (v_mode_debug>1) console.log("drawGraph");
+var img_obj_thermo =   {
+width : 36, height : 36, bpp : 3,
+transparent : 0,
+buffer : require("heatshrink").decompress(atob("AEFt2AMKm3bsAMJjdt23ABhEB+/7tgaJ///DRUP//7tuADRP923YDRXbDRfymwaJhu/koaK7eyiwaK3cLDRlWDRY1NKBY1Ztu5kjmJg3cyVI7YMHgdu5Mkyu2fxHkyVJjdgDRFJkmRDRPsDQNbDQ5QBGoONKBJrBoxQIQwO2eRcbtu24AMIFIQLJAH4AMA=="))
+};
+g.drawImage(img_obj_thermo,rect.x2-60,rect.y2/2);
+g.flip();
 }
 function ClearScreen(){
-  //avoid widget areas
-  g.reset(1).clearRect(rect.x, rect.y+24, rect.x2, rect.y2-24);
-  g.flip();
+//avoid widget areas
+g.setBgColor(v_color_erase);
+g.clearRect(rect.x, rect.y+24, rect.x2, rect.y2-24);
+g.flip();
 }
 function ClearBox(){
-  //custom boxarea , left space for static graph at right
-  g.reset(1).clearRect(rect.x, rect.y+24, rect.x2-50, rect.y2-24);
-  g.flip();
+//custom boxarea , left space for static graph at right
+g.setBgColor(v_color_erase);
+g.clearRect(rect.x, rect.y+24, rect.x2-60, rect.y2-24);
+g.flip();
 }
 function introPage(){
-  //g.setFont("6x8",2).setFontAlign(0,0);
-  g.setFontVector(v_font_size1).setFontAlign(-1,0);
-  //x alignment. -1=left (default), 0=center, 1=right
-    var x=3;
-    //dynamic positions as height for BJS1 is double than BJS2
-    var y = (rect.y+rect.y2)/2 + 10;
-    g.drawString("   Default values  ", x, y - ((v_font_size1*3)+2));
-    g.drawString("--------------------", x, y - ((v_font_size1*2)+2));
-    g.drawString("Mode debug: "+v_mode_debug, x, y - ((v_font_size1*1)+2));
-    g.drawString("Read freq(ms): "+readFreq, x, y );
-    g.drawString("Save to file: "+v_saveToFile, x, y+ ((v_font_size1*1)+2) );
-    g.drawString("Save freq(ms):"+saveFreq, x, y+((v_font_size1*2)+2) );
-    fr=require("Storage").read(filename+"\1");//suffix required
-    if (fr)  g.drawString("Current filesize:"+fr.length.toString()+"kb", x, y+((v_font_size1*3)+2) );
-     else g.drawString("File not exist", x, y+((v_font_size1*3)+2));
+//g.setFont("6x8",2).setFontAlign(0,0);
+g.setFontVector(v_font_size1).setFontAlign(-1,0);
+//x alignment. -1=left (default), 0=center, 1=right
+var x=3;
+//dynamic positions as height for BJS1 is double than BJS2
+var y = (rect.y+rect.y2)/2 + 10;
+g.drawString("   Default values  ", x, y - ((v_font_size1*3)+2));
+g.drawString("--------------------", x, y - ((v_font_size1*2)+2));
+g.drawString("Mode debug: "+v_mode_debug, x, y - ((v_font_size1*1)+2));
+g.drawString("Read frq(ms): "+readFreq, x, y );
+g.drawString("Save file: "+v_saveToFile, x, y+ ((v_font_size1*1)+2) );
+g.drawString("Save frq(ms):"+saveFreq, x, y+((v_font_size1*2)+2) );
+fr=require("Storage").read(v_filename+"\1");//suffix required
+if (fr)  g.drawString("Filesize:"+fr.length.toString()+"kb", x, y+((v_font_size1*3)+2) );
+else g.drawString("File not exist", x, y+((v_font_size1*3)+2));
 }
-//MAIN
-Bangle.loadWidgets();
-Bangle.setUI({
-  mode : "custom",
-  back : function() {load();}
-});
+function printInfo(pmsg, pcolor,px,py){
+g.setColor(pcolor);
+g.setFontVector(v_font_size1).setFontAlign(0,0);
+g.drawString(pmsg, px,py+v_font_size1);
+g.setColor(v_color);//restore default color
+}
+function toggleRecMode(duration, exectime){
+//bydefault float, standard epoch requires *1000
+if (v_mode_debug>0)  console.log("duration"+duration);
+if (duration>2) {      //delete file
+var x = (rect.x+(rect.x2-60))/2;
+printInfo("Deleting file",'#CC3333',x, rect.y+32+v_font_size1);
+//  g.setColor('#CC3333');    //red
 
+//too long "Deleting file: "+v_filename,
+// for  StorageFiles created with require("Storage").open(filename, ...)
+//require("Storage").erase(v_filename);
+//TODO refactor in a new function
+//var mifile = require("Storage").open(v_filename,"w");
+var mifile = require("Storage").open("temphistory.csv","w");
+var v_output=mifile.erase();
+//mifile.StorageFile.erase();
+if (v_mode_debug>0) console.log("output"+v_output);
+setTimeout(function() { if (v_mode_debug>0) console.log("pause for 1 sec");},1000);
+return; //leave this function
+}
+if (v_saveToFile) v_saveToFile=false;
+else v_saveToFile=true;
+if (v_mode_debug>0)  console.log("recording? "+v_saveToFile);
+setRecordingFreq();
+}
+
+function setRecordingFreq(){
+if (v_saveToFile==true) { //TODO now start on false btn will no enable
+id_rec_intv=setInterval(function() {
+saveToFile();
+}, saveFreq); //ms
+if (v_mode_debug>0) console.log("interval id / frq"+id_rec_intv+" / "+saveFreq);
+}
+else if (id_rec_intv){
+clearInterval(id_rec_intv);
+if (v_mode_debug>0)  console.log("rec interval removed, id "+id_rec_intv);
+id_rec_intv=0; // to reset var
+}
+}
+
+function UserInput(){
+//theoretically incompatible with Layout
+Bangle.setUI({
+mode : "custom",
+//adds a back icon on top widget area
+back : function() {load();},
+//touch : function(n,e) {}, // optional - handler for 'touch' events
+// righ/Left 1/-1 , updown
+swipe : function(dir_rl,dir_ud) {
+if(dir_rl == 1) {
+if (v_mode_debug>0)  console.log("swipe right: ");
+getFileInfo(v_filename);
+}
+else if (dir_rl == -1){
+if (v_mode_debug>0)  console.log("swipe left: ");
+changeBGcolor();
+}
+},
+touch : function(tzone,tobj){
+if ((process.env.HWVERSION == 2)&&(v_mode_debug>0)){
+console.log("tobj x,y,type : "+tobj.x+" "+tobj.y+" "+tobj.type);
+}
+switch(tzone){
+//case 1: //left , back managed by setUI
+case 2: // right disable/enable recording
+toggleRecMode(0);  //toggleRecMode(duration, exectime)
+break;
+// case 3: console.log("Touch 3 aka 1+2 not for BJS1 emul");//center 1+2
+//   break;
+}
+},
+//inferior to
+btn : function(btn) {
+if(btn == 1) {
+if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') toggleRecMode(1); //console.log("btn1 BJS1");
+else mainBtnShortcut(); //console.log("btn1 BJS2");
+}
+else if (btn == 2) mainBtnShortcut(); //console.log("btn2 BJS1");
+else if (btn == 3) changeBGcolor(); //console.log("btn3 BJS1");
+}
+});  //endof setUI
+
+}
+
+function mainBtnShortcut() {
+//if messages app installed shortcut otherwise default access to launcher
+if  (require("Storage").read("messagegui.app.js")===undefined)
+{
+if (require("Storage").read("messagelist.app.js")===undefined)  Bangle.showLauncher(); // implies btn2(js1)  btn(js2)- launcher
+else if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') load("messagelist.app.js");
+else load("messagelist.app.js");
+}
+else if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') load("messagegui.app.js");
+else load("messagegui.app.js");
+}
+
+
+// Show file size
+function getFileInfo(v_filename) {
+var f = require("Storage").open(v_filename,"r");
+//todo refactor and reuse common code
+g.setFontVector(v_font_size1).setFontAlign(0,0);
+var x = (rect.x+(rect.x2-60))/2;
+printInfo("file size:"+f.len,v_color,x, rect.y+32+v_font_size1);
+// g.drawString("file size:"+f.len, x, rect.y+37+v_font_size1);
+if (v_mode_debug>0)  console.log("file "+v_filename+" size: "+f.len);
+}// not used
+
+
+//MAIN
+SetVariables();
+Bangle.loadWidgets();
 ClearScreen();
 introPage();
+//setDrawLayout(); //uncomment if layout can work with setUI
+
+UserInput(); //inc SetUI and back icon
 
 setInterval(function() {
-  drawTemperature();
+getTemperature();
 }, readFreq); //ms
+//??need
+drawGraph();
+setRecordingFreq();
 
-if (v_saveToFile==true) {
-    setInterval(function() {
-      saveToFile();
-    }, saveFreq); //ms
-}
-setTimeout(ClearScreen, 3500);
-setTimeout(drawGraph,4000);
-setTimeout(drawTemperature,4500);
 }
\ No newline at end of file
diff --git a/apps/tempmonitor/tempmonitor.info b/apps/tempmonitor/tempmonitor.info
index 1824c5c86..085bd57bd 100644
--- a/apps/tempmonitor/tempmonitor.info
+++ b/apps/tempmonitor/tempmonitor.info
@@ -1 +1 @@
-{"id":"tempmonitor","name":"tempmonitor","src":"tempmonitor.app.js","icon":"tempmonitor.img","version":"0.01","files":"tempmonitor.info,tempmonitor.app.js,tempmonitor.img"}
\ No newline at end of file
+{"id":"tempmonitor","name":"tempmonitor","src":"tempmonitor.app.js","icon":"tempmonitor.img","version":"0.05","files":"tempmonitor.info,tempmonitor.app.js,tempmonitor.img"}
\ No newline at end of file
diff --git a/apps/terminalclock/ChangeLog b/apps/terminalclock/ChangeLog
index 268e0427c..acdbf0f1e 100644
--- a/apps/terminalclock/ChangeLog
+++ b/apps/terminalclock/ChangeLog
@@ -7,3 +7,5 @@
 0.07: Use ClockFace module and rework the settings to be able to personnalize the order of the lines
 0.08: Hide widgets instead of not loading them at all
       Use Clockface_menu for widgets and power saving settings
+0.09: Add default HRM value, default altitude value 
+0.10: Add fastloading
diff --git a/apps/terminalclock/app.js b/apps/terminalclock/app.js
index 515ad8f66..b6cea9d42 100644
--- a/apps/terminalclock/app.js
+++ b/apps/terminalclock/app.js
@@ -1,211 +1,238 @@
-const locale = require("locale");
-var heartRate = 0;
-var altitude = -9001;
+{
+  const locale = require("locale");
+  let heartRate = 0;
+  let altitude = -9001;
 
-const fontColor = g.theme.dark ? "#0f0" : "#000";
-// handling the differents versions of the Banglejs smartwatch screen sizes
-if (process.env.HWVERSION == 1){
-  var paddingY = 3;
-  var font6x8At4Size = 48;
-  var font6x8At2Size = 27;
-  var font6x8FirstTextSize = 6;
-  var font6x8DefaultTextSize = 3;
-} else{
-  var paddingY = 2;
-  var font6x8At4Size = 32;
-  var font6x8At2Size = 18;
-  var font6x8FirstTextSize = 4;
-  var font6x8DefaultTextSize = 2;
-}
+  const fontColor = g.theme.dark ? "#0f0" : "#000";
+  // handling the differents versions of the Banglejs smartwatch screen sizes
+  // default BJS2
+  let paddingY = 2;
+  let font6x8At4Size = 32;
+  let font6x8At2Size = 18;
+  let font6x8FirstTextSize = 4;
+  let font6x8DefaultTextSize = 2;
+  if (process.env.HWVERSION == 1){
+    paddingY = 3;
+    font6x8At4Size = 48;
+    font6x8At2Size = 27;
+    font6x8FirstTextSize = 6;
+    font6x8DefaultTextSize = 3;
+  }
+  // initialising the clockface
+  const ClockFace = require("ClockFace");
+  const clock = new ClockFace({
+    precision: 60,
+    settingsFile: "terminalclock.json",
 
-// initialising the clockface
-const ClockFace = require("ClockFace");
-const clock = new ClockFace({
-  precision: 60,
-  settingsFile: "terminalclock.json",
+    init: function () {
+      // check settings and set default if needed
+      this.showHRM = false;
+      this.showAltitude = false;
+      this.lock_precision = this.precision;
+      this.unlock_precision = 1;
+      if (this.HRMinConfidence === undefined) this.HRMinConfidence = 50;
+      if (this.PowerOnInterval === undefined) this.PowerOnInterval = 15;
+      if (this.powerSave===undefined) this.powerSave = this.powerSaving; // migrate old setting
+      if (this.powerSave===undefined) this.powerSave = true;
 
-  init: function () {
-    // check settings and set default if needed
-    this.showHRM = false;
-    this.showAltitude = false;
-    this.lock_precision = this.precision;
-    this.unlock_precision = 1;
-    if (this.HRMinConfidence === undefined) this.HRMinConfidence = 50;
-    if (this.PowerOnInterval === undefined) this.PowerOnInterval = 15;
-    if (this.powerSave===undefined) this.powerSave = this.powerSaving; // migrate old setting
-    if (this.powerSave===undefined) this.powerSave = true;
-    ["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(k => {
-      if (this[k]===undefined){
-        if(k == "L2") this[k] = "Date";
-        else if(k == "L3") {
-          this[k] = "HR";
-          this.showHRM = true;
-        }else if(k == "L4") this[k] = "Motion";
-        else if(k == "L5") this[k] = "Steps";
-        else if(k == "L6") this[k] = ">";
-        else this[k] = "Empty"; 
-      } 
-      else if (this[k]==="HR") this.showHRM = true;
-      else if (this[k]==="Alt") this.showAltitude = true && process.env.HWVERSION == 2;
-    });
+      ["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(k => {
+        if (this[k]===undefined){
+          if(k == "L2") this[k] = "Date";
+          else if(k == "L3") {
+            this[k] = "HR";
+            this.showHRM = true;
+          }else if(k == "L4") this[k] = "Motion";
+          else if(k == "L5") this[k] = "Steps";
+          else if(k == "L6") this[k] = ">";
+          else this[k] = "Empty"; 
+        } 
+        else if (this[k]==="HR") this.showHRM = true;
+        else if (this[k]==="Alt") this.showAltitude = true && process.env.HWVERSION == 2;
+      });
 
-    // set the lock and unlock actions
-    Bangle.on("lock", on => {
-      if (on) lock();
-      else unlock();
-    });
+      // set the services (HRM, pressure sensor, etc....)
+      if(!this.powerSave){
+        turnOnServices();
+      } else{
+        this.turnOnInterval = setInterval(turnOnServices, this.PowerOnInterval*60000); // every PowerOnInterval min
+      }
+      // start the clock unlocked
+      unlock();
+    },
 
-    // set the services (HRM, pressure sensor, etc....)
-    if(!this.powerSave){
-      turnOnServices();
-    } else{
-      setInterval(turnOnServices, this.PowerOnInterval*60000); // every PowerOnInterval min
-    }
-    // start the clock unlocked
-    unlock();
-  },
-
-  draw: function (date) {
-    var curPos = 1;
-    g.setFontAlign(-1, -1);
-    g.setColor(fontColor);
-    drawTime(date, curPos);
-    curPos++;
-
-    ["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(line => {
-      if (this[line]==='Date') drawDate(date, curPos);
-      else if (this[line]==='HR') drawHRM(curPos);
-      else if (this[line]==='Motion') drawMotion(curPos);
-      else if (this[line]==='Alt') drawAltitude(curPos);
-      else if (this[line]==='Steps') drawStepCount(curPos);
-      else if (this[line]==='>') drawInput(curPos);
+    draw: function (date) {
+      let curPos = 1;
+      g.setFontAlign(-1, -1);
+      g.setColor(fontColor);
+      drawTime(date, curPos);
       curPos++;
-    });
-  },
-});
 
+      ["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(line => {
+        if (this[line]==='Date') drawDate(date, curPos);
+        else if (this[line]==='HR') drawHRM(curPos);
+        else if (this[line]==='Motion') drawMotion(curPos);
+        else if (this[line]==='Alt') drawAltitude(curPos);
+        else if (this[line]==='Steps') drawStepCount(curPos);
+        else if (this[line]==='>') drawInput(curPos);
+        curPos++;
+      });
+    },
 
-/* ---------------------------- 
-Draw related of specific lines
--------------------------------- */
-
-function drawLine(line, pos){
-  if(pos == 1)
-    g.setFont("6x8", font6x8FirstTextSize);
-  else
-    g.setFont("6x8", font6x8DefaultTextSize);
-
-  var yPos = Bangle.appRect.y +
-      paddingY * (pos - 1) +
-      font6x8At4Size * Math.min(1, pos-1) +
-      font6x8At2Size * Math.max(0, pos-2);
-  g.drawString(line, 5, yPos, true);
-}
-
-function drawTime(now, pos){
-  var h = now.getHours();
-  var m = now.getMinutes();
-  var time = ">" + (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
-  drawLine(time, pos);
-}
-
-function drawDate(now, pos){
-  var dow = locale.dow(now, 1);
-  var date = locale.date(now, 1).substr(0,6) + locale.date(now, 1).substr(-2);
-  var locale_date = ">" + dow + " " + date;
-  drawLine(locale_date, pos);
-}
-
-function drawInput(pos){
-  drawLine(">", pos);
-}
-
-function drawStepCount(pos){
-  var health = Bangle.getHealthStatus("day");
-  var steps_formated = ">Steps: " + health.steps;
-  drawLine(steps_formated, pos);
-}
-
-function drawHRM(pos){
-  if(heartRate != 0)
-    drawLine(">HR: " + parseInt(heartRate), pos);
-  else
-    drawLine(">HR: unknown", pos);
-}
-
-function drawAltitude(pos){
-  if(altitude > 0)
-    drawLine(">Alt: " + altitude.toFixed(1) + "m", pos);
-  else
-    drawLine(">Alt: unknown", pos);
-}
- 
-function drawMotion(pos){
-  var health = Bangle.getHealthStatus('last');
-  var steps_formated = ">Motion: " + parseInt(health.movement);
-  drawLine(steps_formated, pos);
-}
-
-/* -----------------------------------------------
-Services functions (HRM, pressure, etc...)
--------------------------------------------------- */
-
-function turnOnServices(){
-  if(clock.showHRM){
-    Bangle.setHRMPower(true, "terminalclock");
-  }
-  if(clock.showAltitude){
-    Bangle.setBarometerPower(true, "terminalclock");
-  }
-  if(clock.powerSave){
-    setTimeout(function () {
+    remove: function() {
+      if (this.turnOnInterval){
+        clearInterval(this.turnOnInterval);
+        delete this.turnOnInterval;
+      }
+      if (this.turnOffServiceTimeout){
+        clearTimeout(this.turnOffServiceTimeout)
+        delete this.turnOffServiceTimeout
+      }
       turnOffServices();
-    }, 45000);
-  }
-}
+      if (this.onLock) Bangle.removeListener('lock', this.onLock);
+      if (this.onHRM) Bangle.removeListener('HRM', this.onHRM);
+      if (this.onPressure) Bangle.removeListener('pressure', this.onPressure);
+    }
 
-function turnOffServices(){
-  if(clock.showHRM){
-    Bangle.setHRMPower(false, "terminalclock");
-  }
-  if(clock.showAltitude){
-    Bangle.setBarometerPower(false, "terminalclock");
-  }
-}
+  });
 
-Bangle.on('HRM',function(hrmInfo) {
-  if(hrmInfo.confidence >= clock.HRMinConfidence)
-    heartRate = hrmInfo.bpm;
-});
 
-const MEDIANLENGTH = 20; // technical
-var avr = [], median; // technical
-Bangle.on('pressure', function(e) {
-  while (avr.length>MEDIANLENGTH) avr.pop();
-  avr.unshift(e.altitude);
-  median = avr.slice().sort();
-  if (median.length>10) {
-    var mid = median.length>>1;
-    altitude = E.sum(median.slice(mid-4,mid+5)) / 9;
-  }
-});
+  /* ---------------------------- 
+  Draw related of specific lines
+  -------------------------------- */
 
-/* -------------------------------------------------
-Clock related functions but not in the ClockFace module
----------------------------------------------------- */
+  let drawLine = function(line, pos){
+    if(pos == 1)
+      g.setFont("6x8", font6x8FirstTextSize);
+    else
+      g.setFont("6x8", font6x8DefaultTextSize);
 
-function unlock(){
-  if(clock.powerSave){
-    turnOnServices();
-  }
-  clock.precision = clock.unlock_precision;
-  clock.tick();
-}
+    let yPos = Bangle.appRect.y +
+        paddingY * (pos - 1) +
+        font6x8At4Size * Math.min(1, pos-1) +
+        font6x8At2Size * Math.max(0, pos-2);
+    g.drawString(line, 5, yPos, true);
+  };
 
-function lock(){
-  clock.precision = clock.lock_precision;
-  clock.tick();
-}
+  let drawTime = function(now, pos){
+    let h = now.getHours();
+    let m = now.getMinutes();
+    let time = ">" + (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
+    drawLine(time, pos);
+  };
 
-// starting the clock
-clock.start();
+  let drawDate = function(now, pos){
+    let dow = locale.dow(now, 1);
+    let date = locale.date(now, 1).substr(0,6) + locale.date(now, 1).substr(-2);
+    let locale_date = ">" + dow + " " + date;
+    drawLine(locale_date, pos);
+  };
+
+  let drawInput = function(pos){
+    drawLine(">", pos);
+  };
+
+  let drawStepCount = function(pos){
+    let health = Bangle.getHealthStatus("day");
+    let steps_formated = ">Steps: " + health.steps;
+    drawLine(steps_formated, pos);
+  };
+
+  let drawHRM = function(pos){
+    if(heartRate != 0)
+      drawLine(">HR: " + parseInt(heartRate), pos);
+    else
+      drawLine(
+        ">HR: " + parseInt(Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm)), 
+        pos);
+  };
+
+  let drawAltitude = function(pos){
+    if(altitude > 0)
+      drawLine(">Alt: " + altitude.toFixed(1) + "m", pos);
+    else
+      drawLine(">Alt: unknown", pos);
+  };
+  
+  let drawMotion = function(pos){
+    let health = Bangle.getHealthStatus('last');
+    let steps_formated = ">Motion: " + parseInt(health.movement);
+    drawLine(steps_formated, pos);
+  };
+
+  /* -----------------------------------------------
+  Services functions (HRM, pressure, etc...)
+  -------------------------------------------------- */
+
+  let turnOnServices = function(){
+    if(clock.showHRM){
+      Bangle.setHRMPower(true, "terminalclock");
+    }
+    if(clock.showAltitude){
+      Bangle.setBarometerPower(true, "terminalclock");
+    }
+    if(clock.powerSave){
+      if(clock.turnOffServiceTimeout) clearTimeout(clock.turnOffServiceTimeout);
+      clock.turnOffServiceTimeout = setTimeout(function () {
+        turnOffServices();
+      }, 45000);
+    }
+  };
+
+  let turnOffServices = function(){
+    if(clock.showHRM){
+      Bangle.setHRMPower(false, "terminalclock");
+    }
+    if(clock.showAltitude){
+      Bangle.setBarometerPower(false, "terminalclock");
+    }
+  };
+
+  // set the lock and unlock actions
+  clock.onLock = lock_event => {
+    if (lock_event) lock();
+    else unlock();
+  };
+  Bangle.on("lock", clock.onLock);
+
+  clock.onHRM = hrmInfo => {
+    if(hrmInfo.confidence >= clock.HRMinConfidence)
+      heartRate = hrmInfo.bpm;
+  };
+  Bangle.on('HRM', clock.onHRM);
+
+  const MEDIANLENGTH = 20; // technical
+  let avr = [], median; // technical
+  clock.onPressure = pressureInfo => {
+    while (avr.length>MEDIANLENGTH) avr.pop();
+    avr.unshift(pressureInfo.altitude);
+    median = avr.slice().sort();
+    if (median.length>10) {
+      let mid = median.length>>1;
+      altitude = E.sum(median.slice(mid-4,mid+5)) / 9;
+    }
+    else
+      altitude = pressureInfo.altitude; 
+  };
+  Bangle.on('pressure', clock.onPressure);
+
+
+  /* -------------------------------------------------
+  Clock related functions but not in the ClockFace module
+  ---------------------------------------------------- */
+
+  let unlock = function(){
+    if(clock.powerSave){
+      turnOnServices();
+    }
+    clock.precision = clock.unlock_precision;
+    clock.tick();
+  };
+
+  let lock = function(){
+    clock.precision = clock.lock_precision;
+    clock.tick();
+  };
+
+  // starting the clock
+  clock.start();
+}
\ No newline at end of file
diff --git a/apps/terminalclock/metadata.json b/apps/terminalclock/metadata.json
index 8403a3b4d..12ca5ef03 100644
--- a/apps/terminalclock/metadata.json
+++ b/apps/terminalclock/metadata.json
@@ -3,12 +3,12 @@
   "name": "Terminal Clock",
   "shortName":"Terminal Clock",
   "description": "A terminal cli like clock displaying multiple sensor data",
-  "version":"0.08",
+  "version":"0.10",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",
   "supports": ["BANGLEJS", "BANGLEJS2"],
-  "allow_emulator": true,
+  "allow_emulator": false,
   "readme": "README.md",
   "storage": [
     {"name": "terminalclock.app.js","url": "app.js"},
diff --git a/apps/timecal/metadata.json b/apps/timecal/metadata.json
index 287dce0ae..9175d92a3 100644
--- a/apps/timecal/metadata.json
+++ b/apps/timecal/metadata.json
@@ -12,5 +12,6 @@
   "storage": [
     {"name":"timecal.app.js","url":"timecal.app.js"},
     {"name":"timecal.settings.js","url":"timecal.settings.js"}
-  ]
+  ],
+  "data":[{"name":"timecal.settings.json"}]
 }
diff --git a/apps/tinycmc/ChangeLog b/apps/tinycmc/ChangeLog
new file mode 100644
index 000000000..46fdd1b1e
--- /dev/null
+++ b/apps/tinycmc/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App
+0.02: Set API Key through Apploader
\ No newline at end of file
diff --git a/apps/tinycmc/README.md b/apps/tinycmc/README.md
new file mode 100644
index 000000000..42cbdf203
--- /dev/null
+++ b/apps/tinycmc/README.md
@@ -0,0 +1,7 @@
+# Tiny Coinmarketcap
+A simple app using Gadgedtbridge internet access to fetch current crypto prices from Coinmarketcap.
+I'm providing a "free-tier" API Key.
+
+TO-DOs:
+- [X] Add own API Key option
+- [ ] Add settings for Currency conversion
\ No newline at end of file
diff --git a/apps/tinycmc/app-icon.js b/apps/tinycmc/app-icon.js
new file mode 100644
index 000000000..0c8a0226b
--- /dev/null
+++ b/apps/tinycmc/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4kA/4ACBIP/o8242462/k8/gtytlz1s+r2/gv/q9Zpv/m+02pj/AH4AqgMRBhURAAQWGqPxqPwA4UoloABkoLCAIQhIiMQgUo29mtfr6WIBogxDFwNBAIeKwd8x2Mud8lUhBolQLoYABrERjurs/S7F329rs+i+I+EC4JRFxl+lUmvmGAIWKkJhGJ4lI01y2+3s4BB1s7s+o+MVMAhPEll7kd+uYBCvgBB7khyIRCL4cZiMS7YuCAAxnBSAsBJoWKl0sLYYBFluBL4iPCiuNsRdEAIlr3GBR4iQBJoMs7pdEAIjDBkK/ESAUY665BABNn7AvFkWBlEsXYoBFMAMlkPwC4UYRwOru5ZDMY+iitBF4MoPAOBxsjXoktAYMoYYcowOBwEokAXBiq+BL4eywWH2WHA4VrYAMViECgEgYAOIxhXDlF8k0oM4eDxrABkReBkEIj/y1ZVCsRjB2UnL4tYimCO4UBoOdlhdCveDAYMuYId8kq/DGIOI/Hyw6MDAA9t7FI/HwJAUBqOBll7X5WK+PxqK/DgMRimNsS7HAINm3DuBd4hfB+ONxhZEAIl8lVBL4YXCjLwB7eyLxFn7AvHJ4PxlS7BLo2OvmBqJfHAANC02yLotrs+iiMYB4IWCL4QgByMsvlzXYlz7UhLoIBBC4cADwMViNS7drFQNnAYXSFwZeDAAJPCyPxlEsFgIuClouBBoPxRwZgEGAMYwWI81n9sikA9CFwwwCKIWRyOFlEtlANEoAWGMIYyDisVCBAAHKYRjBqOAC6AyECqQA/AH4AJA=="))
\ No newline at end of file
diff --git a/apps/tinycmc/app.js b/apps/tinycmc/app.js
new file mode 100644
index 000000000..07a56e494
--- /dev/null
+++ b/apps/tinycmc/app.js
@@ -0,0 +1,118 @@
+let settings = require("Storage").readJSON("tinycmc.json", 1);
+const apiKey = settings.apikey || null;
+const cmcBase = 'https://pro-api.coinmarketcap.com/';
+const version = ['v1', 'v2'];
+const path = {
+  latest: '/cryptocurrency/listings/latest',
+  quote: '/cryptocurrency/quotes/latest'
+};
+let page = 0;
+function displayLatest(offset) {
+  g.clear();
+  if (page === 0) {
+    E.showMessage('Getting Top 10');
+  } else {
+    E.showMessage(`Getting Top ${offset} to ${offset + 9}`);
+  }
+
+  const uri = offset ? `${cmcBase}${version[0]}${path.latest}?convert=EUR&limit=10&start=${offset}` : `${cmcBase}${version[0]}${path.latest}?convert=EUR&limit=10`;
+  Bangle.http(uri,
+    {
+      method: 'GET',
+      headers: {
+        "X-CMC_PRO_API_KEY": apiKey,
+      }
+    }).then(data=>{
+      const result = JSON.parse(data.resp).data;
+    let menu = {
+    "" : { title : "-- Select --" },
+  };
+    //FIXME: Menu can also take an array of items, this would be easier to compose using map
+    result.forEach(listing => {
+      menu[listing.name] = {
+        title: `${listing.cmc_rank}: ${listing.symbol} ${Number(listing.quote.EUR.percent_change_24h).toFixed(3)}`,
+        onchange: function() { E.showMenu(); displayQuote(listing.symbol);} };
+    });
+    menu.Next = function() {
+      E.showMenu();
+      g.clear();
+      page = page + 1;
+      displayLatest((page * 10) + 1);
+    }; // remove the menu
+    menu.Exit = function() {
+      E.showMenu();
+      g.clear();
+      Bangle.showClock();
+    }; // remove the menu
+  g.clear();
+    E.showMenu(menu);
+  setWatch(() => {
+    g.clear();
+    displayMenu();
+  }, BTN, {edge:"rising", debounce:50, repeat:true});
+}).catch(error=>{
+  console.log('Error');
+  console.log(error);
+  E.showMessage(`${error}\nTo go back press BTN`);
+  setWatch(() => {
+    g.clear();
+    displayMenu();
+    }, BTN, {edge:"rising", debounce:50, repeat:true});
+  });
+}
+
+function displayQuote(symb) {
+  g.clear();
+  E.showMessage(`Getting latest for ${symb}`);
+  Bangle.http(`${cmcBase}${version[1]}${path.quote}?symbol=${symb}&convert=EUR`,
+    {
+      method: 'GET',
+      headers: {
+        "X-CMC_PRO_API_KEY": apiKey,
+      }
+    }).then(data=>{
+    g.clear();
+      const result = JSON.parse(data.resp).data[symb][0];
+  E.showMessage(`#${result.cmc_rank}: ${result.symbol}\n${Number(result.quote.EUR.price).toFixed(2)}\n%24h:
+${result.quote.EUR.percent_change_24h}`);
+  setWatch(() => {
+    g.clear();
+    displayMenu();
+  }, BTN, {edge:"rising", debounce:50, repeat:true});
+}).catch(error=>{
+  E.showMessage(`${error}\nTo go back press BTN`);
+  setWatch(() => {
+    g.clear();
+    displayMenu();
+    }, BTN, {edge:"rising", debounce:50, repeat:true});
+  });
+}
+
+function displayMenu() {
+  if (!apiKey) {
+    E.showMessage("Please provide a Coinmarketcap API Key");
+  } else {
+    // Actually display the menu
+    E.showMenu({
+      "" : { title : "-- Select --" }, // options
+      "Latest": function() { E.showMenu(); displayLatest(); },
+      "BTC" : function() { E.showMenu(); displayQuote('BTC'); },
+      "ETH" : function() { E.showMenu(); displayQuote('ETH'); },
+      "XMR" : function() { E.showMenu(); displayQuote('XMR'); },
+      "ADA" : function() { E.showMenu(); displayQuote('ADA'); },
+      "DOGE" : function() { E.showMenu(); displayQuote('DOGE'); },
+      "LTC" : function() { E.showMenu(); displayQuote('LTC'); },
+      "Exit" : function() {
+        E.showMenu();
+        g.clear();
+        Bangle.showClock();
+      }, // remove the menu
+    });
+  }
+}
+
+function main () {
+  displayMenu();
+}
+
+main ();
diff --git a/apps/tinycmc/icon.png b/apps/tinycmc/icon.png
new file mode 100644
index 000000000..2038315e0
Binary files /dev/null and b/apps/tinycmc/icon.png differ
diff --git a/apps/tinycmc/interface.html b/apps/tinycmc/interface.html
new file mode 100644
index 000000000..2a9e7824b
--- /dev/null
+++ b/apps/tinycmc/interface.html
@@ -0,0 +1,63 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+  </head>
+  <body>   
+    <h3>Set Coinmarketcap API key</h3>
+    <p><input id="apikey" onkeyup="checkInput()"  style="width:90%; margin: 3px"></input><button id="upload" class="btn btn-primary">Save key</button></p>
+    
+    <h4>Where to get your personal API key?</h4>
+    <p>Go to <a href="https://coinmarketcap.com/api/">https://coinmarketcap.com/api/</a> and sign up for a free account.<br>
+    After registration you can login and obtain your personal API key.</p>
+    
+
+    <script src="../../core/lib/interface.js"></script>
+
+    <script>
+    
+       function checkInput() {
+        if(document.getElementById("apikey").value==="") { 
+                document.getElementById('upload').disabled = true; 
+            } else { 
+                document.getElementById('upload').disabled = false;
+            }
+        }
+        checkInput();
+    
+        var settings = {};
+        function onInit(){
+          console.log("Loading settings from BangleJs...");
+          try {
+            Util.readStorage("tinycmc.json", data=>{
+              if(data.length > 0){
+                settings = JSON.parse(data);
+                console.log("Got settings", settings);
+                document.getElementById("apikey").value = settings.apikey;
+                console.log("Loaded apikey from BangleJs.");
+                checkInput();
+              }
+            });
+          } catch(ex) {
+              console.log("(Warning) Could not load apikey from BangleJs.");
+              console.log(ex);
+          }
+        
+        }
+        
+        document.getElementById("upload").addEventListener("click", function() {
+            try {
+              settings.apikey = document.getElementById("apikey").value;
+              Util.showModal("Saving...");
+              Util.writeStorage("tinycmc.json", JSON.stringify(settings), ()=>{
+                Util.hideModal();
+              });
+              console.log("Sent settings!");
+            } catch(ex) {
+                console.log("(Warning) Could not write settings to BangleJs.");
+                console.log(ex);
+            }
+        });
+
+    </script>
+  </body>
+</html>
diff --git a/apps/tinycmc/metadata.json b/apps/tinycmc/metadata.json
new file mode 100644
index 000000000..14963e610
--- /dev/null
+++ b/apps/tinycmc/metadata.json
@@ -0,0 +1,30 @@
+{
+  "id": "tinycmc",
+  "name": "Tiny CMC",
+  "shortName":"tinycmc",
+  "icon": "icon.png",
+  "version": "0.02",
+  "description": "TinyCMC is a bangle.js Coinmarketcap API client",
+  "type": "app",
+  "tags": "tools",
+  "supports": [
+    "BANGLEJS2"
+  ],
+  "allow_emulator": false,
+  "interface": "interface.html",
+  "readme": "README.md",
+  "data": [
+    {"name":"tinycmc.json"}
+  ],
+  "storage": [
+    {
+      "name": "tinycmc.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "tinycmc.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/apps/torch/metadata.json b/apps/torch/metadata.json
index 4e8794663..414222587 100644
--- a/apps/torch/metadata.json
+++ b/apps/torch/metadata.json
@@ -7,10 +7,14 @@
   "icon": "app.png",
   "tags": "tool,torch",
   "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme":"README.md",
   "storage": [
     {"name":"torch.app.js","url":"app.js"},
     {"name":"torch.wid.js","url":"widget.js","supports": ["BANGLEJS"]},
     {"name":"torch.img","url":"app-icon.js","evaluate":true},
     {"name":"torch.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"torch.settings.json"}
   ]
 }
diff --git a/apps/waypoint_editor/ChangeLog b/apps/waypoint_editor/ChangeLog
new file mode 100644
index 000000000..0ec5d2df8
--- /dev/null
+++ b/apps/waypoint_editor/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Display waypoint name instead of its index in remove menu and fix icon
diff --git a/apps/waypoint_editor/README.md b/apps/waypoint_editor/README.md
new file mode 100644
index 000000000..f9c603a84
--- /dev/null
+++ b/apps/waypoint_editor/README.md
@@ -0,0 +1,3 @@
+# Waypoints
+
+Simple waypoint editor.
diff --git a/apps/waypoint_editor/app-icon.js b/apps/waypoint_editor/app-icon.js
new file mode 100644
index 000000000..6ab351afa
--- /dev/null
+++ b/apps/waypoint_editor/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AA0QF1wABF94xrFwgvV63W5/PF1AsBAAQvBAAQviFggvHGRXWFwvWFigvKGQgPCFwwvMFxQvL54PDF9wuHF8wuIF7/OAYguFF7mBrtdFQWAvWA5+qvV6FxIvXrwfCGAQqBvXP0guLF6XV1awCmggCmgvB1Wk1QEBRpQvTJ4OAAgM6F4oAEFwulF66zBvXV62sMAM0M4IuKOYOlwGrF6nP0oXD54tGRpDLCO4TvXDwIAHXhB3BSQYvfdZPVSQIvsUILWBF8xeEX4OkF8wQFd7mlDgPP52q5wvDAYISF1elBAYvWwBNB54DBGYIAEO5YvSFAInB1asBQAQzBF5HQxGsF64rBvWlX4fO0nOSQgvD6E0TANeL65XCd4ySFCYWCe4ZhDF6GIxHQ6vVGgQAESQfOTwQvZnQWBmgXDF4qSC5+kGYOr62sR4U0R6WsI4eCF5AzETwYYBwWC6AvlX4gAIR553DR5Ivhd4OCFwYvpAAwv/F7wMBF6ouLF5APHF54sMF44SNF5IsPF4gUSGQQXVAH4A/AH4A/ADY"))
diff --git a/apps/waypoint_editor/app.js b/apps/waypoint_editor/app.js
new file mode 100644
index 000000000..48a956d82
--- /dev/null
+++ b/apps/waypoint_editor/app.js
@@ -0,0 +1,275 @@
+/* Thanks to pinsafe from BangleApps repository */
+
+var Layout = require("Layout");
+
+const W = g.getWidth();
+const H = g.getHeight();
+
+var wp = require('Storage').readJSON("waypoints.json", true) || [];
+// Use this with corrupted waypoints
+//var wp = [];
+/* 0 .. DD.ddddd
+   1 .. DD MM.mmm'
+   2 .. DD MM'ss"
+*/
+var mode = 1;
+
+function writeWP() {
+  require('Storage').writeJSON("waypoints.json", wp);
+}
+
+function mainMenu() {
+  var menu = {
+    "< Back" : Bangle.load
+  };
+  if (Object.keys(wp).length==0) Object.assign(menu, {"NO WPs":""});
+  else for (let id in wp) {
+    let i = id;
+    menu[wp[id]["name"]]=()=>{ decode(i); };
+  }
+  menu["Add"]=addCard;
+  menu["Remove"]=removeCard;
+  menu["Format"]=setFormat;
+  g.clear();
+  E.showMenu(menu);
+}
+
+function setFormat() {
+  var confirmRemove = new Layout (
+        {type:"v", c: [
+          {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Format"},
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD.dddd", cb:l=>{  mode = 0; mainMenu(); }},
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD MM.mmm'", cb:l=>{  mode = 1; mainMenu(); }},
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD MM'ss"+'"', cb:l=>{  mode = 2; mainMenu(); }},
+        ], lazy:true});
+  g.clear();
+  confirmRemove.render();
+}
+
+function format(x) {
+  switch (mode) {
+    case 0:
+      return "" + x;
+    case 1:
+      d = Math.floor(x);
+      m = x - d;
+      m = m*60;
+      return "" + d + " " + m + "'";
+    case 2:
+      d = Math.floor(x);
+      m = x - d;
+      m = m*60;
+      mf = Math.floor(m);
+      s = m - mf;
+      s = s*60;
+      return "" + d + " " + mf + "'" + s + '"';
+  }
+}
+
+function lat(x) {
+  c = "N";
+  if (x<0) {
+    c = "S";
+    x = -x;
+  }
+  return c+format(x);
+}
+
+function lon(x) {
+  c = "E";
+  if (x<0) {
+    c = "W";
+    x = -x;
+  }
+  return c+format(x);
+}
+
+function decode(pin) {
+      print(pin);
+      var i = wp[pin];
+      var pinDecrypted=i["name"] + "\n" + lat(i["lat"]) + "\n" + lon(i["lon"]);
+      var showPin = new Layout ({
+        type:"v", c: [
+          {type:"txt", font:"10%", pad:1, fillx:1, filly:1, label: pinDecrypted},
+          {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label:"OK", cb:l=>{mainMenu();}}
+        ], lazy:true});
+      g.clear();
+      showPin.render();
+}
+
+function showNumpad(text, key_, callback) {
+  key = key_;
+  E.showMenu();
+  function addDigit(digit) {
+    key+=digit;
+    if (1) {
+      l = text[key.length];
+      switch (l) {
+        case '.': case ' ': case "'":
+          key+=l;
+          break;
+        case 'd': case 'D': default:
+          break;
+      }
+    }
+    Bangle.buzz(20);
+    update();
+  }
+  function update() {
+    g.reset();
+    g.clearRect(0,0,g.getWidth(),23);
+    s = key + text.substr(key.length, 999);
+    g.setFont("Vector:24").setFontAlign(1,0).drawString(s,g.getWidth(),12);
+  }
+  ds="12%";
+  var numPad = new Layout ({
+      type:"v", c: [{
+        type:"v", c: [
+          {type:"", height:24},
+          {type:"h",filly:1, c: [
+            {type:"btn", font:ds, width:58, label:"7", cb:l=>{addDigit("7");}},
+            {type:"btn", font:ds, width:58, label:"8", cb:l=>{addDigit("8");}},
+            {type:"btn", font:ds, width:58, label:"9", cb:l=>{addDigit("9");}}
+          ]},
+          {type:"h",filly:1, c: [
+            {type:"btn", font:ds, width:58, label:"4", cb:l=>{addDigit("4");}},
+            {type:"btn", font:ds, width:58, label:"5", cb:l=>{addDigit("5");}},
+            {type:"btn", font:ds, width:58, label:"6", cb:l=>{addDigit("6");}}
+          ]},
+          {type:"h",filly:1, c: [
+            {type:"btn", font:ds, width:58, label:"1", cb:l=>{addDigit("1");}},
+            {type:"btn", font:ds, width:58, label:"2", cb:l=>{addDigit("2");}},
+            {type:"btn", font:ds, width:58, label:"3", cb:l=>{addDigit("3");}}
+          ]},
+          {type:"h",filly:1, c: [
+            {type:"btn", font:ds, width:58, label:"0", cb:l=>{addDigit("0");}},
+            {type:"btn", font:ds, width:58, label:"C", cb:l=>{key=key.slice(0,-1); update();}},
+            {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb:callback}
+          ]}
+        ]}
+      ], lazy:true});
+  g.clear();
+  numPad.render();  
+  update();
+}
+
+function removeCard() {
+  var menu = {
+    "" : {title : "select card"},
+    "< Back" : mainMenu
+  };
+  if (Object.keys(wp).length==0) Object.assign(menu, {"NO CARDS":""});
+  else {
+    wp.forEach((val, card) => {
+      const name = wp[card].name;
+      menu[name]=()=>{
+        E.showMenu();
+        var confirmRemove = new Layout (
+          {type:"v", c: [
+            {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Delete"},
+            {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:name},
+            {type:"h", c: [
+              {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
+                wp.splice(card, 1);
+                writeWP();
+                mainMenu();
+              }},
+              {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
+            ]}
+          ], lazy:true});
+        g.clear();
+        confirmRemove.render();
+      };
+    });
+  }
+  E.showMenu(menu);
+}
+
+function ask01(t, cb) {
+  var confirmRemove = new Layout (
+        {type:"v", c: [
+          {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Format"},
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: t[0], cb:l=>{ cb(1); }},
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: t[1], cb:l=>{ cb(-1); }},
+        ], lazy:true});
+  g.clear();
+  confirmRemove.render();
+}
+
+
+function askCoordinate(t1, t2, callback) {
+  let sign = 1;
+  ask01(t1, function(sign) {
+      switch (mode) {
+        case 0: s = "DDD.dddd"; break;
+        case 1: s = "DDD MM.mmm"; break;
+        case 2: s = "DDD MM'ss"+'"'; break;
+      }
+      showNumpad(s, t2, function() {
+      switch (mode) {
+        case 0:
+          res = parseFloat(key);
+          break;
+        case 1:
+          d = parseInt(key.substr(0, 3));
+          m = parseFloat(key.substr(3,99));
+          res = d + m/60.0;
+          break;
+        case 2:
+          d = parseInt(key.substr(0, 3));
+          m = parseInt(key.substr(4, 2));
+          s = parseInt(key.substr(7, 2));
+          res = d + m/60.0 + s/3600.0;
+      }
+      res = sign * res;
+      print("Coordinate", res);
+      callback(res);
+    });
+  });
+}
+
+function askPosition(callback) {
+  let full = "";
+  askCoordinate("NS", "0", function(lat) {
+    askCoordinate("EW", "", function(lon) {
+        callback(lat, lon);
+    });
+  });
+}
+
+function addCard() {
+  showNumpad("wpXX", "wp", function() {
+    result = key;
+    if (wp[result]!=undefined) {
+            E.showMenu();
+            var alreadyExists = new Layout (
+              {type:"v", c: [
+                {type:"txt", font:Math.min(15,100/result.length)+"%", pad:1, fillx:1, filly:1, label:result},
+                {type:"txt", font:"12%", pad:1, fillx:1, filly:1, label:"already exists."},
+                {type:"h", c: [
+                  {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "REPLACE", cb:l=>{encodeCard(result);}},
+                  {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "CANCEL", cb:l=>{mainMenu();}}
+                ]}
+              ], lazy:true});
+            g.clear();
+            alreadyExists.render();
+          }
+    g.clear();
+    askPosition(function(lat, lon) {
+      print("position -- ", lat, lon);
+      let n = {};
+      n["name"] = result;
+      n["lat"] = lat;
+      n["lon"] = lon;
+      wp.push(n);
+      print("add -- waypoints", wp);
+      writeWP();
+      mainMenu();
+    });
+  });
+}
+
+
+g.reset();
+Bangle.setUI();
+mainMenu();
diff --git a/apps/waypoint_editor/app.png b/apps/waypoint_editor/app.png
new file mode 100644
index 000000000..e97f1bb7b
Binary files /dev/null and b/apps/waypoint_editor/app.png differ
diff --git a/apps/waypoint_editor/metadata.json b/apps/waypoint_editor/metadata.json
new file mode 100644
index 000000000..12ff6e095
--- /dev/null
+++ b/apps/waypoint_editor/metadata.json
@@ -0,0 +1,13 @@
+{ "id": "waypoint_editor",
+  "name": "Waypoint editor",
+  "version":"0.02",
+  "description": "Allows editing waypoints on device",
+  "icon": "app.png",
+  "readme": "README.md",
+  "supports" : ["BANGLEJS2"],
+  "tags": "tool,outdoors,gps",
+  "storage": [
+      {"name":"waypoint_editor.app.js","url":"app.js"},
+      {"name":"waypoint_editor.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/waypointer/ChangeLog b/apps/waypointer/ChangeLog
index 60e8bfab0..8c8a323de 100644
--- a/apps/waypointer/ChangeLog
+++ b/apps/waypointer/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Added adjustment for Bangle.js magnetometer heading fix
 0.07: Add settings file with the option to disable the slow direction updates
 0.08: Use tilt compensation from new magnav library
+0.09: Convert Yes/No On/Off in settings to checkboxes
diff --git a/apps/waypointer/metadata.json b/apps/waypointer/metadata.json
index e21c5f10f..b8f28fbb9 100644
--- a/apps/waypointer/metadata.json
+++ b/apps/waypointer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "waypointer",
   "name": "Way Pointer",
-  "version": "0.08",
+  "version": "0.09",
   "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",
diff --git a/apps/waypointer/settings.js b/apps/waypointer/settings.js
index c8b06b9f9..cc521c637 100644
--- a/apps/waypointer/settings.js
+++ b/apps/waypointer/settings.js
@@ -15,7 +15,6 @@
     "< Back" : () => back(),
     'Smooth arrow rot': {
       value: !!settings.smoothDirection,
-      format: v => v?"Yes":"No",
       onchange: v => {
         settings.smoothDirection = v;
         writeSettings();
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index 0010a58fd..50c033600 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -21,3 +21,4 @@
 0.22: Automatic translation of strings, some left untranslated.
 0.23: Update clock_info to avoid a redraw
 0.24: Redraw clock_info on update and provide color field for condition
+0.25: Added monochrome parameter to drawIcon in lib
diff --git a/apps/weather/clkinfo.js b/apps/weather/clkinfo.js
index ef3b7d139..4e526b977 100644
--- a/apps/weather/clkinfo.js
+++ b/apps/weather/clkinfo.js
@@ -22,7 +22,7 @@
 
     function weatherIcon(code) {
       var ovr = Graphics.createArrayBuffer(24,24,1,{msb:true});
-      weatherLib.drawIcon({code:code},12,12,12,ovr);
+      weatherLib.drawIcon({code:code},12,12,12,ovr,true);
       var img = ovr.asImage();
       img.transparent = 0;
       return img;
diff --git a/apps/weather/lib.js b/apps/weather/lib.js
index 14ca77ec6..af6aa4d7e 100644
--- a/apps/weather/lib.js
+++ b/apps/weather/lib.js
@@ -155,14 +155,11 @@ exports.getColor = function(code) {
  * @param y Top
  * @param r Icon Size
  * @param ovr Graphics instance (or undefined for g)
+ * @param monochrome If true, produce a monochromatic icon
  */
-exports.drawIcon = function(cond, x, y, r, ovr) {
+exports.drawIcon = function(cond, x, y, r, ovr, monochrome) {
   var palette;
-  var monochrome=1;
-  if(!ovr) {
-    ovr = g;
-    monochrome=0;
-  }
+  if(!ovr) ovr = g;
 
   palette = getPalette(monochrome, ovr);
 
diff --git a/apps/weather/metadata.json b/apps/weather/metadata.json
index bcb2fe109..55c2973b0 100644
--- a/apps/weather/metadata.json
+++ b/apps/weather/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "weather",
   "name": "Weather",
-  "version": "0.24",
+  "version": "0.25",
   "description": "Show Gadgetbridge weather report",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/weatherClock/ChangeLog b/apps/weatherClock/ChangeLog
index a6a12c297..f31e15729 100644
--- a/apps/weatherClock/ChangeLog
+++ b/apps/weatherClock/ChangeLog
@@ -1,5 +1,6 @@
 0.01: New App!
 0.02: Minor layout format tweak so it uses less memory and draws ok on Bangle.js 1 (#1012)
 0.03: Minor layout extra spaces.
-0.04: Layout now compatible with Bangle.js 2
-0.05: Use weather condition code for icon selection
+0.04: Layout now compatible with Bangle.js 2.
+0.05: Use weather condition code for icon selection.
+0.06: WeatherClock icons now reflect weather conditions better. Add settings menu to hide elements and to use weather icons of Weather app. Images placed into functions for performance.
\ No newline at end of file
diff --git a/apps/weatherClock/README.md b/apps/weatherClock/README.md
index f1f146440..a7f44f7f7 100644
--- a/apps/weatherClock/README.md
+++ b/apps/weatherClock/README.md
@@ -1,12 +1,14 @@
 # Weather Clock
 
-A clock which displays the current weather conditions. Temperature, wind speed, and an icon indicating the weather conditions are displayed.
+A clock which displays the current weather conditions. Time, day of week, date, temperature, wind speed, and an icon indicating the weather condition are displayed.
+
+As of Weather Clock v0.06 the date, day of week, temperature, weather icon and/or wind speed can be hidden in Settings. The icons can be changed to those of the Weather app.
 
 Standard widgets are displayed.
 
 ## Requirements
 
-**This clock requires Gadgetbridge and the weather app in order to get weather data!**
+**This clock requires Gadgetbridge and the Weather app in order to get weather data!**
 
 See the [Bangle.js Gadgetbridge documentation](https://www.espruino.com/Gadgetbridge) for instructions on setting up Gadgetbridge and weather.
 
diff --git a/apps/weatherClock/app.js b/apps/weatherClock/app.js
index 91d0ab36f..4896a9f49 100644
--- a/apps/weatherClock/app.js
+++ b/apps/weatherClock/app.js
@@ -1,22 +1,36 @@
 const Layout = require("Layout");
-const storage = require('Storage');
+const storage = require("Storage");
 const locale = require("locale");
+const SETTINGS_FILE = "weatherClock.json";
+let s;
+const w = require("weather");
 
-// weather icons from https://icons8.com/icon/set/weather/color
-var sunIcon = require("heatshrink").decompress(atob("mEwwhC/AH4AbhvQC6vd7ouVC4IwUCwIwUFwQwQCYgAHDZQXc9wACC6QWDDAgXN7wXF9oXPCwowDC5guGGAYXMCw4wCC5RGJJAZGTJBiNISIylQVJrLCC5owGF65fXR7AwBC5jvhC7JIILxapDFxAXOGAy9KC4owGBAQXODAgHDC54AHC8T0FAAQSOGg4qPGA4WUGAIuVC7AA/AH4AEA="));
-
-var partSunIcon = require("heatshrink").decompress(atob("mEwwhC/AH4AY6AWVhvdC6vd7owUFwIABFiYAFGR4Xa93u9oXTCwIYDC6HeC4fuC56MBC4ySOIwpIQXYQXHmYABRpwXECwQYKF5HjC4kwL5gQCAYYwO7wqFAAowK7wWKJBgXLJBPd6YX/AAoVMAAM/Cw0DC5yRHCx5JGFyAwGCyIwFC/4XyR4inXa64wRFwowQCw4A/AH4AkA"));
-
-var cloudIcon = require("heatshrink").decompress(atob("mEwwhC/AH4A/AH4AtgczmYWWDCgWDmcwIKAuEGBoSGGCAWKC7BIKIxYX6CpgABn4tUSJIWPJIwuQGAwWRGAoX/C+SPEU67XXGCIuFGCAWHAH4A/AH4A/ADg="));
-
-var snowIcon = require("heatshrink").decompress(atob("mEwwhC/AH4AhxGAC9YUBC4QZRhAVBAIWIC6QAEI6IYEI5cIBgwWOC64NCKohHPNox3RBgqnQEo7XPHpKONR5AXYAH4ASLa4XWXILiBC6r5LDBgWWDBRrKC5hsCEacIHawvMCIwvQC5QvQFAROEfZ5ADLJ4YGCywvVI7CPGC9IA/AH4AF"));
-
-var rainIcon = require("heatshrink").decompress(atob("mEwwhC/AH4AFgczmYWWDCgWDmcwIKAuEGBoSGGCAWKC7BIKIxYX6CpgABn4tUSJIWPJIwuQGAwWRGAoX/C+SPEU67XXGCIuFGCAWHAGeIBJEIwAVJhGIC5AJBC5QMJEJQMEC44JBC6QSCC54FHLxgNBBgYSEDgKpPMhQXneSwuUAH4A/AA4="));
-
-var stormIcon = require("heatshrink").decompress(atob("mEwwhC/AFEzmcwCyoYUgYXDmYuVGAY0OFwocHC6pNLCxYXYJBQXuCxhhJRpgYKCyBKFFyIXFCyJIFC/4XaO66nU3eza6k7C4IWFGBwXBCwwwO3ewC5AZMC6RaCIxZiI3e7AYYwRCQIIBC4QwPIQIpDC5owDhYREIxgAEFIouNC4orDFyBGBGAcLC6BaFhYWRLSRIFISQXcCyqhRAH4Az"));
-
+// Weather icons from https://icons8.com/icon/set/weather/color
+function getSun() {
+  return require("heatshrink").decompress(atob("mEwwhC/AH4AbhvQC6vd7ouVC4IwUCwIwUFwQwQCYgAHDZQXc9wACC6QWDDAgXN7wXF9oXPCwowDC5guGGAYXMCw4wCC5RGJJAZGTJBiNISIylQVJrLCC5owGF65fXR7AwBC5jvhC7JIILxapDFxAXOGAy9KC4owGBAQXODAgHDC54AHC8T0FAAQSOGg4qPGA4WUGAIuVC7AA/AH4AEA="));
+}
+function getPartSun() { 
+  return require("heatshrink").decompress(atob("mEwwhC/AH4AY6AWVhvdC6vd7owUFwIABFiYAFGR4Xa93u9oXTCwIYDC6HeC4fuC56MBC4ySOIwpIQXYQXHmYABRpwXECwQYKF5HjC4kwL5gQCAYYwO7wqFAAowK7wWKJBgXLJBPd6YX/AAoVMAAM/Cw0DC5yRHCx5JGFyAwGCyIwFC/4XyR4inXa64wRFwowQCw4A/AH4AkA"));
+}
+function getCloud() {
+  return require("heatshrink").decompress(atob("mEwwhC/AH4A/AH4AtgczmYWWDCgWDmcwIKAuEGBoSGGCAWKC7BIKIxYX6CpgABn4tUSJIWPJIwuQGAwWRGAoX/C+SPEU67XXGCIuFGCAWHAH4A/AH4A/ADg="));
+}
+function getSnow() {
+  return require("heatshrink").decompress(atob("mEwwhC/AH4AhxGAC9YUBC4QZRhAVBAIWIC6QAEI6IYEI5cIBgwWOC64NCKohHPNox3RBgqnQEo7XPHpKONR5AXYAH4ASLa4XWXILiBC6r5LDBgWWDBRrKC5hsCEacIHawvMCIwvQC5QvQFAROEfZ5ADLJ4YGCywvVI7CPGC9IA/AH4AF"));
+}
+function getRain() {
+  return require("heatshrink").decompress(atob("mEwwhC/AH4AFgczmYWWDCgWDmcwIKAuEGBoSGGCAWKC7BIKIxYX6CpgABn4tUSJIWPJIwuQGAwWRGAoX/C+SPEU67XXGCIuFGCAWHAGeIBJEIwAVJhGIC5AJBC5QMJEJQMEC44JBC6QSCC54FHLxgNBBgYSEDgKpPMhQXneSwuUAH4A/AA4="));
+}
+function getStorm() {
+  return require("heatshrink").decompress(atob("mEwwhC/AFEzmcwCyoYUgYXDmYuVGAY0OFwocHC6pNLCxYXYJBQXuCxhhJRpgYKCyBKFFyIXFCyJIFC/4XaO66nU3eza6k7C4IWFGBwXBCwwwO3ewC5AZMC6RaCIxZiI3e7AYYwRCQIIBC4QwPIQIpDC5owDhYREIxgAEFIouNC4orDFyBGBGAcLC6BaFhYWRLSRIFISQXcCyqhRAH4Az"));
+}
 // err icon - https://icons8.com/icons/set/error
-var errIcon = require("heatshrink").decompress(atob("mEwwkBiIA/AH4AZUAIWUiAXBWqgXXdIYuVGCgXBgICCIyYXCJCQTDC6QrEMCQSEJCQRFC6ApGJCCiDDQSpQFAYXEJBqNGJCA/EC4ZIOEwgXFJBgNEAhKlNAgxIKBgoXEJBjsLC5TsIeRycMBhRrMMBKzQEozjOBxAgHGww+IA6wfSH4hnIC47OMSJqlRIJAXCACIXaGoQARPwwuTAH4A/ABw"));
+function getErr() {
+  return require("heatshrink").decompress(atob("mEwwkBiIA/AH4AZUAIWUiAXBWqgXXdIYuVGCgXBgICCIyYXCJCQTDC6QrEMCQSEJCQRFC6ApGJCCiDDQSpQFAYXEJBqNGJCA/EC4ZIOEwgXFJBgNEAhKlNAgxIKBgoXEJBjsLC5TsIeRycMBhRrMMBKzQEozjOBxAgHGww+IA6wfSH4hnIC47OMSJqlRIJAXCACIXaGoQARPwwuTAH4A/ABw"));
+}
+function getDummy() {
+  return require("heatshrink").decompress(atob("gMBwMAwA"));
+}
 
 /**
 Choose weather icon to display based on condition.
@@ -25,32 +39,30 @@ sent from gadget bridge.
 */
 function chooseIcon(condition) {
   condition = condition.toLowerCase();
-  if (condition.includes("thunderstorm")) return stormIcon;
+  if (condition.includes("thunderstorm")||
+    condition.includes("squalls")||
+    condition.includes("tornado")) return getStorm;
   if (condition.includes("freezing")||condition.includes("snow")||
     condition.includes("sleet")) {
-    return snowIcon;
+    return getSnow;
   }
   if (condition.includes("drizzle")||
-    condition.includes("shower")) {
-    return rainIcon;
+    condition.includes("shower")||
+    condition.includes("rain")) return getRain;
+  if (condition.includes("clear")) return getSun;
+  if (condition.includes("clouds")) return getCloud;
+  if (condition.includes("few clouds")||
+    condition.includes("scattered clouds")||
+    condition.includes("mist")||
+    condition.includes("smoke")||
+    condition.includes("haze")||
+    condition.includes("sand")||
+    condition.includes("dust")||
+    condition.includes("fog")||
+    condition.includes("ash")) {
+    return getPartSun;
   }
-  if (condition.includes("rain")) return rainIcon;
-  if (condition.includes("clear")) return sunIcon;
-  if (condition.includes("few clouds")) return partSunIcon;
-  if (condition.includes("scattered clouds")) return cloudIcon;
-  if (condition.includes("clouds")) return cloudIcon;
-  if (condition.includes("mist") ||
-    condition.includes("smoke") ||
-    condition.includes("haze") ||
-    condition.includes("sand") ||
-    condition.includes("dust") ||
-    condition.includes("fog") ||
-    condition.includes("ash") ||
-    condition.includes("squalls") ||
-    condition.includes("tornado")) {
-    return cloudIcon;
-  }
-  return cloudIcon;
+  return getCloud;
 }
 
 /*
@@ -60,55 +72,29 @@ function chooseIcon(condition) {
 function chooseIconByCode(code) {
   const codeGroup = Math.round(code / 100);
   switch (codeGroup) {
-    case 2: return stormIcon;
-    case 3: return rainIcon;
-    case 5: return rainIcon;
-    case 6: return snowIcon;
-    case 7: return cloudIcon;
+    case 2: return getStorm;
+    case 3: return getRain;
+    case 5: 
+      switch (code) {
+          case 511: return getSnow;
+          default: return getRain;
+      }
+    case 6: return getSnow;
+    case 7: return getPartSun;
     case 8:
       switch (code) {
-        case 800: return sunIcon;
-        case 801: return partSunIcon;
-        default: return cloudIcon;
+        case 800: return getSun;
+        case 804: return getCloud;
+        default: return getPartSun;
       }
-    default: return cloudIcon;
+    default: return getCloud;
   }
 }
 
-/**
-Get weather stored in json file by weather app.
-*/
-function getWeather() {
-  let jsonWeather = storage.readJSON('weather.json');
-  return jsonWeather;
-}
-
-var clockLayout = new Layout( {
-  type:"v", c: [
-    {type:"txt", font:"35%", halign: 0, fillx:1, pad: 8, label:"00:00", id:"time" },
-    {type: "h", fillx: 1, c: [
-        {type:"txt", font:"10%", label:"THU", id:"dow" },
-        {type:"txt", font:"10%", label:"01/01/1970", id:"date" }
-      ]
-    },
-    {type: "h", valign : 1, fillx:1, c: [
-      {type: "img", filly: 1, id: "weatherIcon", src: sunIcon},
-      {type: "v", fillx:1, c: [
-          {type: "h", c: [
-            {type: "txt", font: "10%", id: "temp", label: "000 °C"},
-          ]},
-          {type: "h", c: [
-            {type: "txt", font: "10%", id: "wind", label: "00 km/h"},
-          ]}
-        ]
-      },
-    ]}]
-});
-
-// timeout used to update every minute
+// Timeout used to update every minute
 var drawTimeout;
 
-// schedule a draw for the next minute
+// Schedule a draw for the next minute
 function queueDraw() {
   if (drawTimeout) clearTimeout(drawTimeout);
   drawTimeout = setTimeout(function() {
@@ -119,37 +105,85 @@ function queueDraw() {
 
 function draw() {
   var date = new Date();
-  clockLayout.time.label = locale.time(date, 1);
-  clockLayout.date.label = locale.date(date, 1).toUpperCase();
-  clockLayout.dow.label = locale.dow(date, 1).toUpperCase() + " ";
-  var weatherJson = getWeather();
-  if(weatherJson && weatherJson.weather){
-      var currentWeather = weatherJson.weather;
-      const temp = locale.temp(currentWeather.temp-273.15).match(/^(\D*\d*)(.*)$/);
-      clockLayout.temp.label = temp[1] + " " + temp[2];
-      const code = currentWeather.code || -1;
+  cLayout.time.label = locale.time(date, 1);
+  cLayout.dow.label = s.day ? locale.dow(date, 1).toUpperCase() + " " : "";
+  cLayout.date.label = s.date ? locale.date(date, 1).toUpperCase() : "";
+  let curr = w.get(); // Get weather from weather app.
+  if(curr){
+      const temp = locale.temp(curr.temp-273.15).match(/^(\D*\d*)(.*)$/);
+      cLayout.temp.label = temp[1] + " " + temp[2];
+      const code = curr.code || -1;
       if (code > 0) {
-        clockLayout.weatherIcon.src = chooseIconByCode(code);
+        let showIconC = s.src ? wDrawIcon(curr.code) : chooseIconByCode(curr.code);
+        cLayout.wIcon.src = s.icon ? showIconC : getDummy;
       } else {
-        clockLayout.weatherIcon.src = chooseIcon(currentWeather.txt);
+        let showIconT = s.src ? wDrawIcon(curr.txt) : chooseIcon(curr.txt);
+        cLayout.wIcon.src = s.icon ? showIconT : getDummy;
       }
-      const wind = locale.speed(currentWeather.wind).match(/^(\D*\d*)(.*)$/);
-      clockLayout.wind.label = wind[1] + " " + wind[2] + " " + (currentWeather.wrose||'').toUpperCase();
+      const wind = locale.speed(curr.wind).match(/^(\D*\d*)(.*)$/);
+      cLayout.wind.label = wind[1] + " " + wind[2] + " " + (curr.wrose||"").toUpperCase();
   }
   else{
-      clockLayout.temp.label = "Err";
-      clockLayout.wind.label = "No Data";
-      clockLayout.weatherIcon.src = errIcon;
+      cLayout.temp.label = "Err";
+      cLayout.wind.label = "No Data";
+      cLayout.wIcon.src = s.icon ? getErr : getDummy;
   }
-  clockLayout.clear();
-  clockLayout.render();
-  // queue draw in one minute
+  cLayout.clear();
+  cLayout.render();
+  // Queue draw in one minute
   queueDraw();
 }
 
+// Load settings from file
+s = storage.readJSON(SETTINGS_FILE,1)||{};
+s.src = s.src === undefined ? false : s.src;
+s.icon = s.icon === undefined ? true : s.icon;
+s.day = s.day === undefined ? true : s.day;
+s.date = s.date === undefined ? true : s.date;
+s.wind = s.wind === undefined ? true : s.wind;
+
+function wDrawIcon(code) {
+  var ovr = Graphics.createArrayBuffer(50,50,8,{msb:true});
+  if (typeof code == "number") w.drawIcon({code:code},24,24,24,ovr);
+  if (typeof code == "string") w.drawIcon({txt:code},24,24,24,ovr);
+  var img = ovr.asImage();
+  img.transparent = 0;
+  return img;
+}
+
+let srcIcons = s.src ? wDrawIcon(800) : getSun;
+let srcWeather = s.icon ? srcIcons : getDummy;
+let fontTemp = s.wind ? "10%" : "20%";
+let fontWind = s.wind ? "10%" : "0%";
+let labelDay = s.day ? "THU" : "";
+let labelDate = s.date ? "01/01/1970" : "";
+var cLayout = new Layout( {
+  type:"v", c: [
+    {type:"txt", font:"35%", halign: 0, fillx:1, pad: 8, label:"00:00", id:"time" },
+    {type: "h", fillx: 1, c: [
+      {type: "h", c: [
+        {type:"txt", font:"10%", label:labelDay, id:"dow" },
+        {type:"txt", font:"10%", label:labelDate, id:"date" }
+        ]},
+      ]
+    },
+    {type: "h", valign : 1, fillx:1, c: [
+      {type: "img", filly: 1, pad: 8, id: "wIcon", src: srcWeather},
+      {type: "v", fillx:1, c: [
+          {type: "h", c: [
+            {type: "txt", font: fontTemp, id: "temp", label: "000 °C"},
+          ]},
+          {type: "h", c: [
+            {type: "txt", font: fontWind, id: "wind", label: "00 km/h"},
+          ]}
+        ]
+      },
+    ]}]
+});
+
 g.clear();
 Bangle.setUI("clock");  // Show launcher when middle button pressed
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-clockLayout.render();
+cLayout.render();
 draw();
diff --git a/apps/weatherClock/metadata.json b/apps/weatherClock/metadata.json
index cf8bd899e..270591c74 100644
--- a/apps/weatherClock/metadata.json
+++ b/apps/weatherClock/metadata.json
@@ -1,9 +1,11 @@
 {
   "id": "weatherClock",
   "name": "Weather Clock",
-  "version": "0.05",
+  "shortName": "Weather Clock",
+  "version": "0.06",
   "description": "A clock which displays current weather conditions (requires Gadgetbridge and Weather apps).",
   "icon": "app.png",
+  "dependencies": {"weather":"app"},
   "screenshots": [{"url":"screens/screen1.png"}],
   "type": "clock",
   "tags": "clock, weather",
@@ -12,6 +14,8 @@
   "readme": "README.md",
   "storage": [
     {"name":"weatherClock.app.js","url":"app.js"},
-    {"name":"weatherClock.img","url":"app-icon.js","evaluate":true}
-   ]
+    {"name":"weatherClock.img","url":"app-icon.js","evaluate":true},
+    {"name":"weatherClock.settings.js","url":"settings.js"}
+   ],
+  "data": [{"name":"weatherClock.json"}]
 }
diff --git a/apps/weatherClock/settings.js b/apps/weatherClock/settings.js
new file mode 100644
index 000000000..0aa7330c1
--- /dev/null
+++ b/apps/weatherClock/settings.js
@@ -0,0 +1,58 @@
+(function(back) {
+  const SETTINGS_FILE = "weatherClock.json";
+
+  // Load settings file
+  const storage = require('Storage');
+  let settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+  let s = {};
+  s.date = (settings.date === undefined ? true : settings.date);
+  s.day = (settings.day === undefined ? true : settings.day);
+  s.icon = (settings.icon === undefined ? true : settings.icon);
+  s.wind = (settings.wind === undefined ? true : settings.wind);
+  s.src = (settings.src === undefined ? false : settings.src);
+
+  function save() {
+    settings = s
+    storage.write(SETTINGS_FILE, settings)
+  }
+
+  E.showMenu({
+    '': { 'title': 'Weather Clock' },
+    '< Back': back,
+	'Show date': {
+      value: !!s.date,
+      onchange: v => {
+        s.date = v;
+        save();
+      },
+    },
+	'Show day Of Week': {
+      value: !!s.day,
+      onchange: v => {
+        s.day = v;
+        save();
+      },
+    },
+    'Show weather Icon': {
+      value: !!s.icon,
+      onchange: v => {
+        s.icon = v;
+        save();
+      },
+    },
+    'Show wind Speed': {
+      value: !!s.wind,
+      onchange: v => {
+        s.wind = v;
+        save();
+      },
+    },
+    'Use weather app icons': {
+      value: !!s.src,
+      onchange: v => {
+        s.src = v;
+        save();
+      },
+    }
+  });
+});
diff --git a/apps/widChargingStatus/README.md b/apps/widChargingStatus/README.md
new file mode 100644
index 000000000..a5ac62811
--- /dev/null
+++ b/apps/widChargingStatus/README.md
@@ -0,0 +1,8 @@
+# Charging Status
+
+This widget shows a yellow lightning icon to indicate that the watch is charging. A short buzz is also emitted on initial charging connection.
+Nothing is shown when not charging.
+
+# TypeScript
+
+This app is written in TypeScript, see [typescript/README.md](/typescript/README.md) for more info
diff --git a/apps/widChargingStatus/metadata.json b/apps/widChargingStatus/metadata.json
index 573c594e7..63a59fe41 100644
--- a/apps/widChargingStatus/metadata.json
+++ b/apps/widChargingStatus/metadata.json
@@ -6,7 +6,8 @@
   "type": "widget",
   "description": "A simple widget that shows a yellow lightning icon to indicate whenever the watch is charging. This way one can see the charging status at a glance, no matter which battery widget is being used.",
   "tags": "widget",
-      "supports": ["BANGLEJS","BANGLEJS2"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme":"README.md",
   "storage": [
     {"name":"widChargingStatus.wid.js","url":"widget.js"}
    ]
diff --git a/apps/widChargingStatus/widget.js b/apps/widChargingStatus/widget.js
index 5d9ea3837..628fac043 100644
--- a/apps/widChargingStatus/widget.js
+++ b/apps/widChargingStatus/widget.js
@@ -1,33 +1,32 @@
-"use strict";
-(() => {
-    const icon = require('heatshrink').decompress(atob('ikggMAiEAgYIBmEAg4EB+EAh0AgPggEeCAIEBnwQBAgP+gEP//x///j//8f//k///H//4BYOP/4lBv4bDvwEB4EAvAEBwEAuA7DCAI7BgAQBhEAA'));
-    const iconWidth = 18;
-    function draw() {
-        g.reset();
-        if (Bangle.isCharging()) {
-            g.setColor('#FD0');
-            g.drawImage(icon, this.x + 1, this.y + 1, {
-                scale: 0.6875,
-            });
-        }
-    }
-    WIDGETS.chargingStatus = {
-        area: 'tr',
-        width: Bangle.isCharging() ? iconWidth : 0,
-        draw: draw,
-    };
-    Bangle.on('charging', (charging) => {
-        const widget = WIDGETS.chargingStatus;
-        if (widget) {
-            if (charging) {
-                Bangle.buzz();
-                widget.width = iconWidth;
-            }
-            else {
-                widget.width = 0;
-            }
-            Bangle.drawWidgets(); // re-layout widgets
-            g.flip();
-        }
-    });
-})();
+(function () {
+    var icon = require('heatshrink').decompress(atob('ikggMAiEAgYIBmEAg4EB+EAh0AgPggEeCAIEBnwQBAgP+gEP//x///j//8f//k///H//4BYOP/4lBv4bDvwEB4EAvAEBwEAuA7DCAI7BgAQBhEAA'));
+    var iconWidth = 18;
+    function draw() {
+        g.reset();
+        if (Bangle.isCharging()) {
+            g.setColor('#FD0');
+            g.drawImage(icon, this.x + 1, this.y + 1, {
+                scale: 0.6875,
+            });
+        }
+    }
+    WIDGETS.chargingStatus = {
+        area: 'tr',
+        width: Bangle.isCharging() ? iconWidth : 0,
+        draw: draw,
+    };
+    Bangle.on('charging', function (charging) {
+        var widget = WIDGETS.chargingStatus;
+        if (widget) {
+            if (charging) {
+                Bangle.buzz();
+                widget.width = iconWidth;
+            }
+            else {
+                widget.width = 0;
+            }
+            Bangle.drawWidgets();
+            g.flip();
+        }
+    });
+})();
diff --git a/apps/widChargingStatus/widget.ts b/apps/widChargingStatus/widget.ts
index 14b4df4a4..a161d5408 100644
--- a/apps/widChargingStatus/widget.ts
+++ b/apps/widChargingStatus/widget.ts
@@ -6,16 +6,17 @@
   );
   const iconWidth = 18;
 
-  function draw(this: { x: number; y: number }) {
+  function draw(this: { x?: number; y?: number }) {
     g.reset();
     if (Bangle.isCharging()) {
       g.setColor('#FD0');
-      g.drawImage(icon, this.x + 1, this.y + 1, {
+      g.drawImage(icon, this.x! + 1, this.y! + 1, {
         scale: 0.6875,
       });
     }
   }
 
+  // @ts-ignore
   WIDGETS.chargingStatus = {
     area: 'tr',
     width: Bangle.isCharging() ? iconWidth : 0,
@@ -23,6 +24,7 @@
   };
 
   Bangle.on('charging', (charging) => {
+    // @ts-ignore
     const widget = WIDGETS.chargingStatus;
     if (widget) {
       if (charging) {
diff --git a/apps/wid_a_battery_widget/metadata.json b/apps/wid_a_battery_widget/metadata.json
index 6c507b7b3..017550b1e 100644
--- a/apps/wid_a_battery_widget/metadata.json
+++ b/apps/wid_a_battery_widget/metadata.json
@@ -9,6 +9,7 @@
   "readme": "README.md",
   "description": "Simple and slim battery widget with charge status and percentage",
   "tags": "widget,battery",
+  "provides_widgets" : ["battery"],
   "storage": [
     {"name":"wid_a_battery_widget.wid.js","url":"widget.js"}
   ]
diff --git a/apps/wid_edit/ChangeLog b/apps/wid_edit/ChangeLog
index d8e165029..279fa2438 100644
--- a/apps/wid_edit/ChangeLog
+++ b/apps/wid_edit/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Wrap loadWidgets instead of replacing to keep original functionality intact
       Change back entry to menu option
       Allow changing widgets into all areas, including bottom widget bar
+0.03: Fix editing widgets whose draw method takes the widget
diff --git a/apps/wid_edit/metadata.json b/apps/wid_edit/metadata.json
index d963a53d0..e80e45d45 100644
--- a/apps/wid_edit/metadata.json
+++ b/apps/wid_edit/metadata.json
@@ -1,6 +1,6 @@
 {
   "id": "wid_edit",
-  "version": "0.02",
+  "version": "0.03",
   "name": "Widget Editor",
   "icon": "icon.png",
   "description": "Customize widget locations",
diff --git a/apps/wid_edit/settings.js b/apps/wid_edit/settings.js
index 1d34ae0ca..be09923f2 100644
--- a/apps/wid_edit/settings.js
+++ b/apps/wid_edit/settings.js
@@ -67,7 +67,7 @@
     function highlight() {
       if (WIDGET.width > 0) {
         // draw widget, then draw a highlighted border on top
-        WIDGET.draw();
+        WIDGET.draw(WIDGET);
         g.setColor(g.theme.fgH)
           .drawRect(WIDGET.x, WIDGET.y, WIDGET.x+WIDGET.width-1, WIDGET.y+23);
       } else {
diff --git a/apps/widagps/ChangeLog b/apps/widagps/ChangeLog
index 6728683c8..50c052b1d 100644
--- a/apps/widagps/ChangeLog
+++ b/apps/widagps/ChangeLog
@@ -1 +1,2 @@
 0.01: first version
+0.02: Issue newline before GB commands (solves issue with console.log and ignored commands)
\ No newline at end of file
diff --git a/apps/widagps/metadata.json b/apps/widagps/metadata.json
index ee1eb9f08..08ea8bd0e 100644
--- a/apps/widagps/metadata.json
+++ b/apps/widagps/metadata.json
@@ -3,7 +3,7 @@
   "shortName":"AGPS Widget",
   "icon": "widget.png",
   "type": "widget",
-  "version":"0.01",
+  "version":"0.02",
   "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",
diff --git a/apps/widagps/widget.js b/apps/widagps/widget.js
index 57ed801e1..a5eb22aa2 100644
--- a/apps/widagps/widget.js
+++ b/apps/widagps/widget.js
@@ -6,15 +6,15 @@ if (!global.WIDGETS) {
 
 (function(){
   var warnTime = 24*60*60000; //warn missing data
-  var nextTime = 12*60*60000; //time between requests 
-  var retryTime = 10*60000; //time between retries 
+  var nextTime = 12*60*60000; //time between requests
+  var retryTime = 10*60000; //time between retries
 
   const JSON_FILE = "agpsdata.json";
   var isRequesting = false;
   var lastAGPS = 0;
   var nextGet = null;
-  
-  const WIDGET_ID = "widagps";  
+
+  const WIDGET_ID = "widagps";
   WIDGETS[WIDGET_ID]={
     area:"tl",
     width:24,
@@ -28,7 +28,7 @@ if (!global.WIDGETS) {
       }
       else {
         if (Date.now() - lastAGPS > warnTime) {
-          g.setColor("#f00"); 
+          g.setColor("#f00");
           w = 24;
         }
       }
@@ -127,6 +127,7 @@ g.drawImage(atob("FBQBAAAABgAAYAAPAACwABOAATgAI8ACPABD4AQ+AEPgD8EAg/AQP4AD+CD/wj
     isRequesting = true;
     if (Bluetooth.println) {
       console.log("On device");
+      Bluetooth.println("");
       Bluetooth.println(JSON.stringify({t:"http", url:"https://www.espruino.com/agps/casic.base64"}));
     }
     else {
@@ -143,19 +144,19 @@ g.drawImage(atob("FBQBAAAABgAAYAAPAACwABOAATgAI8ACPABD4AQ+AEPgD8EAg/AQP4AD+CD/wj
     }, 10000);
     Bangle.drawWidgets();
   }
-  
+
   var data = require("Storage").readJSON(JSON_FILE);
   if (data && data.lastAGPS) {
     //lastAGPS = data.lastAGPS;
-  }  
-  
+  }
+
   nextAGPS(Math.max(0, nextTime - (Date.now() - lastAGPS)));
   NRF.on('connect', () => {
     if (Date.now() - lastAGPS > warnTime) {
       nextAGPS(0);
     }
   });
-  
+
   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==";
 
 })()
diff --git a/apps/widalarmeta/ChangeLog b/apps/widalarmeta/ChangeLog
index 37b619f7f..1ef003586 100644
--- a/apps/widalarmeta/ChangeLog
+++ b/apps/widalarmeta/ChangeLog
@@ -2,3 +2,13 @@
 0.02: Change font to 5x9 7 segment-style
       Add settings page
       Add option to show seconds
+0.03: Fix Bell not appearing on alarms > 24h and redrawing interval
+      Update to match the default alarm widget, and not show itself when an alarm is hidden.
+0.04: Fix check for active alarm
+0.05: Convert Yes/No On/Off in settings to checkboxes
+0.06: Remember next alarm to reduce calculation amount
+      Redraw only every hour when no alarm in next 24h
+0.07: Fix when no alarms are present
+0.08: Selectable font. Allow to disable hour padding.
+0.09: Match draw() API e.g. to allow wid_edit to alter this widget
+0.10: Change 4x5 font to 6x8, teletext is now default font
diff --git a/apps/widalarmeta/metadata.json b/apps/widalarmeta/metadata.json
index 79387c1c5..b23c2039c 100644
--- a/apps/widalarmeta/metadata.json
+++ b/apps/widalarmeta/metadata.json
@@ -2,7 +2,7 @@
   "id": "widalarmeta",
   "name": "Alarm & Timer ETA",
   "shortName": "Alarm ETA",
-  "version": "0.02",
+  "version": "0.10",
   "description": "A widget that displays the time to the next Alarm or Timer in hours and minutes, maximum 24h (configurable).",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widalarmeta/settings.js b/apps/widalarmeta/settings.js
index 5922d159d..8dd0d81fa 100644
--- a/apps/widalarmeta/settings.js
+++ b/apps/widalarmeta/settings.js
@@ -4,11 +4,14 @@
   const settings = Object.assign({
     maxhours: 24,
     drawBell: false,
+    padHours: true,
     showSeconds: 0, // 0=never, 1=only when display is unlocked, 2=for less than a minute
+    font: 1, // 0=segment style font, 1=teletext font, 2=6x8:1x2
   }, require("Storage").readJSON(CONFIGFILE,1) || {});
 
   function writeSettings() {
     require('Storage').writeJSON(CONFIGFILE, settings);
+    WIDGETS["widalarmeta"].reload();
   }
 
   // Show the menu
@@ -26,7 +29,6 @@
     },
     /*LANG*/'Draw bell': {
       value: !!settings.drawBell,
-      format: v => v?/*LANG*/"Yes":/*LANG*/"No",
       onchange: v => {
         settings.drawBell = v;
         writeSettings();
@@ -41,5 +43,21 @@
         writeSettings();
       }
     },
+    /*LANG*/'Pad hours': {
+      value: !!settings.padHours,
+      onchange: v => {
+        settings.padHours = v;
+        writeSettings();
+      }
+    },
+    /*LANG*/'Font': {
+      value: settings.font,
+      min: 0, max: 2,
+      format: v => [/*LANG*/"Segment", /*LANG*/"Teletext", /*LANG*/"6x8"][v === undefined ? 1 : v],
+      onchange: v => {
+        settings.font = v;
+        writeSettings();
+      }
+    },
   });
 });
diff --git a/apps/widalarmeta/widget.js b/apps/widalarmeta/widget.js
index ff3390d89..c7542ada5 100644
--- a/apps/widalarmeta/widget.js
+++ b/apps/widalarmeta/widget.js
@@ -1,43 +1,95 @@
 (() => {
-  require("Font5x9Numeric7Seg").add(Graphics);
-  const alarms = require("Storage").readJSON("sched.json",1) || [];
-  const config = Object.assign({
-    maxhours: 24,
-    drawBell: false,
-    showSeconds: 0, // 0=never, 1=only when display is unlocked, 2=for less than a minute
-  }, require("Storage").readJSON("widalarmeta.json",1) || {});
+  let config;
+
+  function loadSettings() {
+    config = Object.assign({
+      maxhours: 24,
+      drawBell: false,
+      padHours: true,
+      showSeconds: 0, // 0=never, 1=only when display is unlocked, 2=for less than a minute
+      font: 1, // 0=segment style font, 1=teletext font, 2=6x8:1x2
+    }, require("Storage").readJSON("widalarmeta.json",1) || {});
+
+      if (config.font == 0) {
+        require("Font5x9Numeric7Seg").add(Graphics);
+      } else if (config.font == 1) {
+        require("FontTeletext5x9Ascii").add(Graphics);
+      }
+  }
+  loadSettings();
+
+  function getNextAlarm(date) {
+    const alarms = (require("Storage").readJSON("sched.json",1) || []).filter(alarm => alarm.on && alarm.hidden !== true);
+    WIDGETS["widalarmeta"].numActiveAlarms = alarms.length;
+    if (alarms.length > 0) {
+      const times = alarms.map(alarm => require("sched").getTimeToAlarm(alarm, date) || Number.POSITIVE_INFINITY);
+      const eta = Math.min.apply(null, times);
+      if (eta !== Number.POSITIVE_INFINITY) {
+        const idx = times.indexOf(eta);
+        const alarm = alarms[idx];
+        delete alarm.msg; delete alarm.id; delete alarm.data; // free some memory
+        return alarm;
+      }
+    }
+  } // getNextAlarm
+
+  function draw(_w, fromInterval) {
+    if (this.nextAlarm === undefined) {
+      let alarm = getNextAlarm();
+      if (alarm === undefined) {
+        // try again with next hour
+        const nextHour = new Date();
+        nextHour.setHours(nextHour.getHours()+1);
+        alarm = getNextAlarm(nextHour);
+      }
+      if (alarm !== undefined) {
+        this.nextAlarm = alarm;
+      }
+    }
+    const next = this.nextAlarm !== undefined ? require("sched").getTimeToAlarm(this.nextAlarm) : 0;
 
-  function draw() {
-    const times = alarms.map(alarm => require("sched").getTimeToAlarm(alarm)).filter(a => a !== undefined);
-    const next = Math.min.apply(null, times);
     let calcWidth = 0;
     let drawSeconds = false;
 
-    if (next > 0 && next < config.maxhours*60*60*1000) {
+    if (next > 0 && next <= config.maxhours*60*60*1000) {
       const hours = Math.floor((next-1) / 3600000).toString();
       const minutes = Math.floor(((next-1) % 3600000) / 60000).toString();
       const seconds = Math.floor(((next-1) % 60000) / 1000).toString();
       drawSeconds = (config.showSeconds & 0b01 && !Bangle.isLocked()) || (config.showSeconds & 0b10 && next <= 1000*60);
 
       g.reset(); // reset the graphics context to defaults (color/font/etc)
-      g.setFontAlign(0,0); // center fonts
+      g.setFontAlign(-1,0); // center font in y direction
       g.clearRect(this.x, this.y, this.x+this.width-1, this.y+23);
 
-      var text = hours.padStart(2, '0') + ":" + minutes.padStart(2, '0');
+      var text = "";
+      if (config.padHours) {
+        text += hours.padStart(2, '0');
+      } else {
+        text += hours;
+      }
+      text += ":" + minutes.padStart(2, '0');
       if (drawSeconds) {
         text += ":" + seconds.padStart(2, '0');
       }
-      g.setFont("5x9Numeric7Seg:1x2");
-      g.drawString(text, this.x+this.width/2, this.y+12);
-
-      calcWidth = 5*5+2;
-      if (drawSeconds) {
-        calcWidth += 3*5;
+      if (config.font == 0) {
+        g.setFont("5x9Numeric7Seg:1x2");
+      } else if (config.font == 1) {
+        g.setFont("Teletext5x9Ascii:1x2");
+      } else {
+        // Default to this if no other font is set.
+        g.setFont("6x8:1x2");
       }
-    } else if (times.length > 0 && config.drawBell) {
-      // next alarm too far in future, draw only widalarm bell
-      g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
+      g.drawString(text, this.x+1, this.y+12);
+
+      calcWidth = g.stringWidth(text) + 2; // One pixel on each side
+      this.bellVisible = false;
+    } else if (config.drawBell && this.numActiveAlarms > 0) {
       calcWidth = 24;
+      // next alarm too far in future, draw only widalarm bell
+      if (this.bellVisible !== true || fromInterval !== true) {
+        g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
+        this.bellVisible = true;
+      }
     }
 
     if (this.width !== calcWidth) {
@@ -46,14 +98,20 @@
       Bangle.drawWidgets();
     }
 
-    // redraw next full minute or second
-    const period = drawSeconds ? 1000 : 60000;
+    // redraw next hour when no alarm else full minute or second
+    const period = next === 0 ? 3600000 : (drawSeconds ? 1000 : 60000);
     let timeout = next > 0 ? next % period : period - (Date.now() % period);
     if (timeout === 0) {
       timeout += period;
     }
-    setTimeout(()=>{
-      WIDGETS["widalarmeta"].draw(WIDGETS["widalarmeta"]);
+
+    if (this.timeoutId !== undefined) {
+      clearTimeout(this.timeoutId);
+    }
+    this.timeoutId = setTimeout(()=>{
+      var w = WIDGETS["widalarmeta"];
+      w.timeoutId = undefined;
+      w.draw(w, true);
     }, timeout);
   } /* draw */
 
@@ -62,7 +120,12 @@
     WIDGETS["widalarmeta"]={
       area:"tl",
       width: 0, // hide by default = assume no timer
-      draw:draw
+      draw:draw,
+      reload: () => {
+        loadSettings();
+        g.clear();
+        Bangle.drawWidgets();
+      },
     };
   }
 })();
diff --git a/apps/widbaroalarm/ChangeLog b/apps/widbaroalarm/ChangeLog
index 2dfe8336d..3b2ae75c4 100644
--- a/apps/widbaroalarm/ChangeLog
+++ b/apps/widbaroalarm/ChangeLog
@@ -7,3 +7,4 @@
       Show difference of last measurement to pressure average of the the last three hours in the widget
       Only use valid pressure values
 0.06: Fix exception
+0.07: Ensure barometer gets turned off after a few readings (isBarometerOn broken in 2v16)
diff --git a/apps/widbaroalarm/metadata.json b/apps/widbaroalarm/metadata.json
index ba6c47b37..0a6ddd71e 100644
--- a/apps/widbaroalarm/metadata.json
+++ b/apps/widbaroalarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "widbaroalarm",
   "name": "Barometer Alarm Widget",
   "shortName": "Barometer Alarm",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A widget that can alarm on when the pressure reaches defined thresholds.",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widbaroalarm/widget.js b/apps/widbaroalarm/widget.js
index d877c4384..d65a1c09c 100644
--- a/apps/widbaroalarm/widget.js
+++ b/apps/widbaroalarm/widget.js
@@ -211,6 +211,28 @@ function calculcate3hAveragePressure() {
   }
 }
 
+function barometerPressureHandler(e) {
+  const MEDIANLENGTH = 20;
+  while (currentPressures.length > MEDIANLENGTH)
+    currentPressures.pop();
+
+  const pressure = e.pressure;
+  if (isValidPressureValue(pressure)) {
+    currentPressures.unshift(pressure);
+    median = currentPressures.slice().sort();
+
+    if (median.length > 10) {
+      var mid = median.length >> 1;
+      medianPressure = Math.round(E.sum(median.slice(mid - 4, mid + 5)) / 9);
+      if (medianPressure > 0) {
+        turnOff();
+        draw();
+        handlePressureValue(medianPressure);
+      }
+    }
+  }
+}
+
 /*
  turn on barometer power
  take multiple measurements
@@ -219,37 +241,15 @@ function calculcate3hAveragePressure() {
  turn off barometer power
 */
 function getPressureValue() {
-  if (stop)
-    return;
-  const MEDIANLENGTH = 20;
+  if (stop) return;
   Bangle.setBarometerPower(true, "widbaroalarm");
-  Bangle.on('pressure', function(e) {
-    while (currentPressures.length > MEDIANLENGTH)
-      currentPressures.pop();
-
-    const pressure = e.pressure;
-    if (isValidPressureValue(pressure)) {
-      currentPressures.unshift(pressure);
-      median = currentPressures.slice().sort();
-
-      if (median.length > 10) {
-        var mid = median.length >> 1;
-        medianPressure = Math.round(E.sum(median.slice(mid - 4, mid + 5)) / 9);
-        if (medianPressure > 0) {
-          turnOff();
-          draw();
-          handlePressureValue(medianPressure);
-        }
-      }
-    }
-  });
-
-  setTimeout(function() { turnOff(); }, 30000);
+  Bangle.on('pressure', barometerPressureHandler);
+  setTimeout(turnOff, 30000);
 }
 
 function turnOff() {
-  if (Bangle.isBarometerOn())
-    Bangle.setBarometerPower(false, "widbaroalarm");
+  Bangle.removeListener('pressure', barometerPressureHandler);
+  Bangle.setBarometerPower(false, "widbaroalarm");
 }
 
 function draw() {
diff --git a/apps/widbat/ChangeLog b/apps/widbat/ChangeLog
index 5986ecf3f..cb11b1be9 100644
--- a/apps/widbat/ChangeLog
+++ b/apps/widbat/ChangeLog
@@ -6,3 +6,5 @@
 0.07: Move CHARGING variable to more readable string
 0.08: Ensure battery updates every 60s even if LCD was on at boot and stays on
 0.09: Misc speed/memory tweaks
+0.10: Color changes due to the battery level
+0.11: Change level for medium charge (50% -> 40%), and darken color on light themes as yellow was almost invisible
diff --git a/apps/widbat/metadata.json b/apps/widbat/metadata.json
index 993310eb2..0151fcbd7 100644
--- a/apps/widbat/metadata.json
+++ b/apps/widbat/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widbat",
   "name": "Battery Level Widget",
-  "version": "0.09",
+  "version": "0.11",
   "description": "Show the current battery level and charging status in the top right of the clock",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widbat/widget.js b/apps/widbat/widget.js
index a8a0c5382..98eb09227 100644
--- a/apps/widbat/widget.js
+++ b/apps/widbat/widget.js
@@ -31,7 +31,11 @@
       x+=16;
     }
     g.setColor(g.theme.fg).fillRect(x,y+2,x+s-4,y+21).clearRect(x+2,y+4,x+s-6,y+19).fillRect(x+s-3,y+10,x+s,y+14);
-    g.setColor("#0f0").fillRect(x+4,y+6,x+4+E.getBattery()*(s-12)/100,y+17);
+    var battery = E.getBattery();
+    if(battery < 20) {g.setColor("#f00");}
+    else if (battery < 40) {g.setColor(g.theme.dark ? "#ff0" : "#f80");}
+    else {g.setColor("#0f0");}
+    g.fillRect(x+4,y+6,x+4+battery*(s-12)/100,y+17);
   }};
   setWidth();
 })()
diff --git a/apps/widbatc/ChangeLog b/apps/widbatc/ChangeLog
new file mode 100644
index 000000000..51575d3b4
--- /dev/null
+++ b/apps/widbatc/ChangeLog
@@ -0,0 +1 @@
+0.01: Created
diff --git a/apps/widbatc/README.md b/apps/widbatc/README.md
new file mode 100644
index 000000000..9b8bb992f
--- /dev/null
+++ b/apps/widbatc/README.md
@@ -0,0 +1,11 @@
+# Yet Another Battery Widget
+
+Shows the current battery level status in the top right in digits using the Lato font
+
+* Works with Bangle 2
+* Simple design, no settings
+* Uses current colour theme to match clock
+
+![](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/widbatc/icon.png b/apps/widbatc/icon.png
new file mode 100644
index 000000000..92710fb4b
Binary files /dev/null and b/apps/widbatc/icon.png differ
diff --git a/apps/widbatc/metadata.json b/apps/widbatc/metadata.json
new file mode 100644
index 000000000..b4e45d521
--- /dev/null
+++ b/apps/widbatc/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "widbatc",
+  "name": "Yet Another Battery Widget",
+  "shortName":"Battery Level",
+  "icon": "icon.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "version":"0.01",
+  "type": "widget",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "readme": "README.md",
+  "description": "Shows the current battery level status in the top right using the Lato Font in digits",
+  "tags": "widget,battery",
+  "provides_widgets" : ["battery"],
+  "storage": [
+    {"name":"widbatc.wid.js","url":"widget.js"}
+   ]
+}
diff --git a/apps/widbatc/screenshot.png b/apps/widbatc/screenshot.png
new file mode 100644
index 000000000..dcc7edaee
Binary files /dev/null and b/apps/widbatc/screenshot.png differ
diff --git a/apps/widbatc/widget.js b/apps/widbatc/widget.js
new file mode 100644
index 000000000..2bb9040d8
--- /dev/null
+++ b/apps/widbatc/widget.js
@@ -0,0 +1,25 @@
+setInterval(()=>WIDGETS["batc"].draw(), 60000);
+Bangle.on('lcdPower', function(on) {
+  if (on) WIDGETS["batc"].draw();
+});
+WIDGETS["batc"]={area:"tr",sortorder:10,width:48,draw:function() {
+  g.reset();
+  // Lato from fonts.google.com, Actual height 17 (17 - 1), Numeric only
+  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));
+  var bp = "" + E.getBattery().toString();
+  var text_w = g.stringWidth(bp);
+  var bw = 7; // battery width
+  var w = text_w + 3 + bw + 2;
+  // we need this to be able to shrink or grow on the 3,2,1 digit battery levels
+  if (w != this.width) {this.width = w; setTimeout(() => Bangle.drawWidgets(),10); return;}
+  var h = 12; // height
+  var x = this.x, y = this.y + 4;
+  g.setColor(g.theme.bg);
+  g.fillRect(this.x, this.y, this.x + this.width, this.y + 23); // erase background
+  g.setColor(g.theme.fg);
+  g.setFontAlign(-1, 0);
+  g.drawString(bp, this.x, this.y + 12);
+  x = x + text_w + 3;
+  g.fillRect(x+2,y,x+5,y+1); // contact
+  g.fillRect(x,y+2,x+bw,y+2+h); // outer
+}};
diff --git a/apps/widbatpc/ChangeLog b/apps/widbatpc/ChangeLog
index e70093659..e9326fd2c 100644
--- a/apps/widbatpc/ChangeLog
+++ b/apps/widbatpc/ChangeLog
@@ -13,3 +13,7 @@
 0.14: Fix drawing the bar when charging
 0.15: Added option to always display the icon when charging (useful if 'hide if charge greater than' is enabled)
 0.16: Increase screen update rate when charging
+0.17: Add option 'Remove Jitter'='Drop only' to prevent percentage from getting up again when not charging
+      Add option to disable vibration when charger connects
+0.18: Only redraw when values change
+0.19: Match draw() API e.g. to allow wid_edit to alter this widget
diff --git a/apps/widbatpc/metadata.json b/apps/widbatpc/metadata.json
index 953f8d345..4c364a864 100644
--- a/apps/widbatpc/metadata.json
+++ b/apps/widbatpc/metadata.json
@@ -2,7 +2,7 @@
   "id": "widbatpc",
   "name": "Battery Level Widget (with percentage)",
   "shortName": "Battery Widget",
-  "version": "0.16",
+  "version": "0.19",
   "description": "Show the current battery level and charging status in the top right of the clock, with charge percentage",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widbatpc/settings.js b/apps/widbatpc/settings.js
index b45fc6749..c988d23bf 100644
--- a/apps/widbatpc/settings.js
+++ b/apps/widbatpc/settings.js
@@ -5,6 +5,7 @@
 (function(back) {
   const SETTINGS_FILE = 'widbatpc.json'
   const COLORS = ['By Level', 'Green', 'Monochrome']
+  const RM_JITTER_OPTIONS = [/*LANG*/'Off', /*LANG*/'Drop only'];
 
   // initialize with default settings...
   let s = {
@@ -14,6 +15,8 @@
     'charger': true,
     'hideifmorethan': 100,
     'alwaysoncharge': false,
+    'removejitter': 0,
+    'buzzoncharge': true,
   }
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
@@ -28,7 +31,9 @@
     return function (value) {
       s[key] = value;
       storage.write(SETTINGS_FILE, s);
-      WIDGETS["batpc"].reload();
+      if ("WIDGETS" in global && WIDGETS["batpc"] !== undefined) {
+        WIDGETS["batpc"].reload();
+      }
     }
   }
 
@@ -36,17 +41,17 @@
   const menu = {
     '': { 'title': 'Battery Widget' },
     '< Back': back,
-    'Percentage': {
+    /*LANG*/'Percentage': {
       value: s.percentage,
       format: onOffFormat,
       onchange: save('percentage'),
     },
-    'Charging Icon': {
+    /*LANG*/'Charging Icon': {
       value: s.charger,
       format: onOffFormat,
       onchange: save('charger'),
     },
-    'Color': {
+    /*LANG*/'Color': {
       format: () => s.color,
       onchange: function () {
         // cycles through options
@@ -56,12 +61,12 @@
         save('color')(s.color)
       }
     },
-    'Fill Bar': {
+    /*LANG*/'Fill Bar': {
       value: s.fillbar,
       format: onOffFormat,
       onchange: save('fillbar'),
     },
-    'Hide if >': {
+    /*LANG*/'Hide if >': {
       value: s.hideifmorethan||100,
       min: 10,
       max : 100,
@@ -69,11 +74,22 @@
       format: x => x+"%",
       onchange: save('hideifmorethan'),
     },
-    'Show on charge': { // Not sure if this is readable enough in the 'big' menu
+    /*LANG*/'Show on charge': { // Not sure if this is readable enough in the 'big' menu
       value: s.alwaysoncharge,
       format: onOffFormat,
       onchange: save('alwaysoncharge'),
     },
+    /*LANG*/'Buzz on charge': {
+      value: s.buzzoncharge,
+      format: onOffFormat,
+      onchange: save('buzzoncharge'),
+    },
+    /*LANG*/'Remove Jitter': {
+      value: s.removejitter,
+      min: 0, max: 1,
+      format: v => RM_JITTER_OPTIONS[v],
+      onchange: save('removejitter'),
+    },
   }
   E.showMenu(menu)
 })
diff --git a/apps/widbatpc/widget.js b/apps/widbatpc/widget.js
index 529923386..7ba060d6d 100644
--- a/apps/widbatpc/widget.js
+++ b/apps/widbatpc/widget.js
@@ -2,6 +2,8 @@
   const intervalLow = 60000; // update time when not charging
   const intervalHigh = 2000; // update time when charging
 
+  let prevMin = 100;
+
   let COLORS = {};
 
   if (process.env.HWVERSION == 1) {
@@ -33,6 +35,8 @@
       'charger': true,
       'hideifmorethan': 100,
       'alwaysoncharge': false,
+      'removejitter': 0, // 0 == off, 1 == downwards only
+      'buzzoncharge': true,
     };
     Object.keys(DEFAULTS).forEach(k=>{
       if (settings[k]===undefined) settings[k]=DEFAULTS[k];
@@ -82,14 +86,32 @@
     return changed;
   }
 
-  function draw() {
+  function draw(fromInterval) {
   // if hidden, don't draw
     if (!WIDGETS["batpc"].width) return;
     // else...
     var s = 39;
     var x = this.x, y = this.y;
-    const l = E.getBattery(),
-          c = levelColor(l);
+    let l = E.getBattery();
+    if (setting('removejitter') === 1) {
+      // if we have seen a battery percentage that was lower than current, use lower
+      if (Bangle.isCharging()) {
+        prevMin = l; // charging is the only way to increase percentage
+      } else if (prevMin >= l) {
+        prevMin = l;
+      } else {
+        l = prevMin;
+      }
+    }
+
+    if (fromInterval === true && this.prevLevel === l && this.prevCharging === Bangle.isCharging()) {
+      return; // unchanged, do nothing
+    }
+
+    this.prevLevel = l;
+    this.prevCharging = Bangle.isCharging();
+
+    const c = levelColor(l);
 
     if (Bangle.isCharging() && setting('charger')) {
       g.setColor(chargerColor()).drawImage(atob(
@@ -148,7 +170,9 @@
   }
 
   Bangle.on('charging',function(charging) {
-    if(charging) Bangle.buzz();
+    if (setting('buzzoncharge')) {
+      if(charging) Bangle.buzz();
+    }
     update();
     g.flip();
   });
@@ -157,7 +181,7 @@
     if (on) update();
   });
 
-  var id = setInterval(()=>WIDGETS["batpc"].draw(), intervalLow);
+  var id = setInterval(()=>WIDGETS["batpc"].draw(WIDGETS["batpc"], true), intervalLow);
 
   WIDGETS["batpc"]={area:"tr",width:40,draw:draw,reload:reload};
   setWidth();
diff --git a/apps/widbatv/ChangeLog b/apps/widbatv/ChangeLog
index 55cda0f21..1282b846f 100644
--- a/apps/widbatv/ChangeLog
+++ b/apps/widbatv/ChangeLog
@@ -1 +1,3 @@
 0.01: New widget
+0.02: Make color depend on level
+0.03: Stop battery widget clearing too far down
\ No newline at end of file
diff --git a/apps/widbatv/metadata.json b/apps/widbatv/metadata.json
index d4ef28315..d4cbf46ac 100644
--- a/apps/widbatv/metadata.json
+++ b/apps/widbatv/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widbatv",
   "name": "Battery Level Widget (Vertical)",
-  "version": "0.01",
+  "version": "0.03",
   "description": "Slim, vertical battery widget that only takes up 14px",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widbatv/widget.js b/apps/widbatv/widget.js
index cc52a0f8e..f26733648 100644
--- a/apps/widbatv/widget.js
+++ b/apps/widbatv/widget.js
@@ -12,8 +12,12 @@ WIDGETS["batv"]={area:"tr",width:14,draw:function() {
   if (Bangle.isCharging()) {
     g.setColor("#0f0").drawImage(atob("DhgBHOBzgc4HOP////////////////////3/4HgB4AeAHgB4AeAHgB4AeAHg"),x,y);
   } else {
-    g.clearRect(x,y,x+14,y+24);
+    g.clearRect(x,y,x+14,y+23);
     g.setColor(g.theme.fg).fillRect(x+2,y+2,x+12,y+22).clearRect(x+4,y+4,x+10,y+20).fillRect(x+5,y+1,x+9,y+2);
-    g.setColor("#0f0").fillRect(x+4,y+20-(E.getBattery()*16/100),x+10,y+20);
+    var battery = E.getBattery();
+    if (battery < 20) {g.setColor("#f00");}
+    else if (battery < 40) {g.setColor(g.theme.dark ? "#ff0" : "#f80");}
+    else {g.setColor("#0f0");}
+    g.fillRect(x+4,y+20-(E.getBattery()*16/100),x+10,y+20);
   }
 }};
diff --git a/apps/widbgjs/ChangeLog b/apps/widbgjs/ChangeLog
index 7b83706bf..a88c5f063 100644
--- a/apps/widbgjs/ChangeLog
+++ b/apps/widbgjs/ChangeLog
@@ -1 +1,2 @@
 0.01: First release
+0.02: Fixed settings changes are actually reflected now and old values are strikethrough
diff --git a/apps/widbgjs/README.md b/apps/widbgjs/README.md
index dbb8cd9e4..23a37fa33 100644
--- a/apps/widbgjs/README.md
+++ b/apps/widbgjs/README.md
@@ -11,7 +11,7 @@ For this widget to work and to get data from the phone, you need:
 ## How to use it
 Make sure you have all the prerequisites from above.
 
-The watch should automatically start displaying values, if there is an arrow visible behind the value, the value is within the not-expired-yet time range changeable in the settings standard is 15 minutes. (I will probably change this in the future, to strike through the text to make expired values clearer).
+The watch should automatically start displaying values. Old values are now written with strikethrough.
 
 ## Settings
 In the settings, you can:
@@ -26,4 +26,3 @@ Developed by Phil Roggenbuck (<a href="https://github.com/phrogg" target="_BLANK
 
 # Disclaimer
 As well as xdrip you should not use this app to make medical decisions!
-
diff --git a/apps/widbgjs/metadata.json b/apps/widbgjs/metadata.json
index 0639b5a51..fce68514c 100644
--- a/apps/widbgjs/metadata.json
+++ b/apps/widbgjs/metadata.json
@@ -4,7 +4,7 @@
   "shortName":"BG Widget",
   "icon": "screenshot.png",
   "screenshots": [{"url":"screenshot.png"}],
-  "version":"0.01",
+  "version":"0.02",
   "type": "widget",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
diff --git a/apps/widbgjs/settings.js b/apps/widbgjs/settings.js
index f2eb190bc..e480c8cf9 100644
--- a/apps/widbgjs/settings.js
+++ b/apps/widbgjs/settings.js
@@ -1,5 +1,5 @@
 (function (back) {
-    const SAVEFILE = "wpbgjs.settings.json";
+    const SAVEFILE = "widbgjs.settings.json";
 
     // initialize with default settings...
     let s = {
@@ -10,14 +10,14 @@
     // ...and overwrite them with any saved values
     // This way saved values are preserved if a new version adds more settings
     const storage = require('Storage');
-    const d = storage.readJSON(SAVEFILE, 1) || {};
-    const saved = d.settings || {};
+    var d = storage.readJSON(SAVEFILE, 1) || {};
+    const saved = d || {};
     for (const key in saved) {
         s[key] = saved[key];
     }
 
     function save() {
-        d.settings = s;
+        d = s;
         storage.write(SAVEFILE, d);
         WIDGETS['widbgjs'].draw();
     }
@@ -51,4 +51,4 @@
         },
         '< Back': back,
     });
-});
\ No newline at end of file
+});
diff --git a/apps/widbgjs/widget.js b/apps/widbgjs/widget.js
index 1a1df002d..4b81c4885 100644
--- a/apps/widbgjs/widget.js
+++ b/apps/widbgjs/widget.js
@@ -6,14 +6,19 @@
     let settings;
 
     function loadSettings() { // stolen from https://github.com/espruino/BangleApps/blob/master/apps/widpedom/widget.js
-        const d = require('Storage').readJSON("widbgjs.settings.json", 1) || {};
-        settings = Object.assign({
-            'unitIsMmol': true,
-            'expireThreshold': 600000,
-            'reloadInterval': 5 * 60000,
-            'hide': false
-        }, d || {});
-        return d;
+      try {
+          const d = require('Storage').readJSON("widbgjs.settings.json", 1) || {};
+          settings = Object.assign({
+              'unitIsMmol': true,
+              'expireThreshold': 600000,
+              //'reloadInterval': 300000, // 2add in the future
+              'hide': false
+          }, d || {});
+          return d;
+      } catch(e){
+        //console.log(e.toString());
+        return;
+      }
     }
 
     function loadVals() {
@@ -28,7 +33,7 @@
       } catch(e) {
         Bangle.removeFile("widbgjs.json");
       }
-      return null;
+      return;
     }
 
     function calculateRotation(bgDirection) {
@@ -103,9 +108,10 @@
 
     function draw() {
         loadSettings();
-        try {
-            if (settings.hide) return;
-        } catch (e) { }
+        if(settings.hide) {
+          return;
+        }
+        console.log(settings.unitIsMmol.toString());
         loadVals();
 
         outpt = getBG(storedData.bg);
@@ -120,16 +126,19 @@
         g.setFont('Vector', 22);
         g.setColor(g.theme.fg);
 
-        // check if the value is too old
-        if (!isBgTooOld(storedData.bgTimeStamp)) {
-            g.drawImage(atob("FBQBAGAADwAB+AA/wAduAGZgAGAABgAAYAAGAABgAAYAAGAABgAAYAAGAABgAAYAAGAABgA="), this.x + 60, this.y + 9, { rotate: calculateRotation(storedData.bgDirection) });
+        // if the value is too old strikethrough it
+        if (isBgTooOld(storedData.bgTimeStamp)) {
+          g.fillRect(this.x + 5, this.y + 9, g.stringWidth(outpt),this.y + 10);
         }
+
+       g.drawImage(atob("FBQBAGAADwAB+AA/wAduAGZgAGAABgAAYAAGAABgAAYAAGAABgAAYAAGAABgAAYAAGAABgA="), this.x + 60, this.y + 9, { rotate: calculateRotation(storedData.bgDirection)});
         g.setColor(g.theme.fg).drawString(outpt, this.x + 5, this.y);
+
     }
 
     setInterval(function () {
         WIDGETS["widbgjs"].draw(WIDGETS["widbgjs"]);
-    }, 5 * 60000); //  update every 5 minutes (%* 60000
+    }, 5 * 60000); //  update every 5 minutes (5 * 60000)
 
 
     // add your widget
diff --git a/apps/widbt/ChangeLog b/apps/widbt/ChangeLog
index 4c2132122..74d31ada6 100644
--- a/apps/widbt/ChangeLog
+++ b/apps/widbt/ChangeLog
@@ -5,3 +5,4 @@
 0.06: Tweaking colors for dark/light themes and low bpp screens
 0.07: Memory usage improvements
 0.08: Disable LCD on, on bluetooth status change
+0.09: Fix widget not showing on blue background
diff --git a/apps/widbt/metadata.json b/apps/widbt/metadata.json
index 1623db7a1..ec03fb353 100644
--- a/apps/widbt/metadata.json
+++ b/apps/widbt/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widbt",
   "name": "Bluetooth Widget",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Show the current Bluetooth connection status in the top right of the clock",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widbt/widget.js b/apps/widbt/widget.js
index c7ef8c0ad..31b8e12d8 100644
--- a/apps/widbt/widget.js
+++ b/apps/widbt/widget.js
@@ -1,9 +1,14 @@
 WIDGETS["bluetooth"]={area:"tr",width:15,draw:function() {
   g.reset();
-  if (NRF.getSecurityStatus().connected)
-    g.setColor((g.getBPP()>8) ? "#07f" : (g.theme.dark ? "#0ff" : "#00f"));
-  else
+  if (NRF.getSecurityStatus().connected) {
+    if (g.getBgColor() === 31) { // If background color is blue use cyan instead
+      g.setColor("#0ff");
+    } else {
+      g.setColor((g.getBPP()>8) ? "#07f" : (g.theme.dark ? "#0ff" : "#00f"));
+    }
+  } else {
     g.setColor(g.theme.dark ? "#666" : "#999");
+  }
   g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),2+this.x,2+this.y);
 },changed:function() {
   WIDGETS["bluetooth"].draw();
diff --git a/apps/widbtstates/ChangeLog b/apps/widbtstates/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/widbtstates/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/widbtstates/metadata.json b/apps/widbtstates/metadata.json
new file mode 100644
index 000000000..ada530e1b
--- /dev/null
+++ b/apps/widbtstates/metadata.json
@@ -0,0 +1,14 @@
+{
+  "id": "widbtstates",
+  "name": "Bluetooth States",
+  "version": "0.01",
+  "description": "If active, shows a white bluetooth icon, if connected, a blue one (nothing if sleeping)",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget,bluetooth,clkinfo",
+  "provides_widgets" : ["bluetooth"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"widbtstates.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widbtstates/widget.js b/apps/widbtstates/widget.js
new file mode 100644
index 000000000..e80da4082
--- /dev/null
+++ b/apps/widbtstates/widget.js
@@ -0,0 +1,52 @@
+(function () {
+    "ram";
+    var _a;
+    var state = (function () {
+        var status = NRF.getSecurityStatus();
+        if (status.connected)
+            return 2;
+        if (status.advertising)
+            return 1;
+        return 0;
+    })();
+    var width = function () { return state > 0 ? 15 : 0; };
+    var update = function (newState) {
+        state = newState;
+        WIDGETS["bluetooth"].width = width();
+        setTimeout(Bangle.drawWidgets, 50);
+    };
+    var colours = (_a = {},
+        _a[1] = {
+            false: "#fff",
+            true: "#fff",
+        },
+        _a[2] = {
+            false: "#0ff",
+            true: "#00f",
+        },
+        _a);
+    WIDGETS["bluetooth"] = {
+        area: "tl",
+        sortorder: -1,
+        draw: function () {
+            if (state == 0)
+                return;
+            g.reset();
+            g.setColor(colours[state]["".concat(g.theme.dark)]);
+            g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="), this.x + 2, this.y + 2);
+        },
+        width: width(),
+    };
+    NRF.on("connect", update.bind(null, 2));
+    NRF.on("disconnect", update.bind(null, 1));
+    var origWake = NRF.wake;
+    var origSleep = NRF.sleep;
+    NRF.wake = function () {
+        update(1);
+        return origWake.apply(this, arguments);
+    };
+    NRF.sleep = function () {
+        update(0);
+        return origSleep.apply(this, arguments);
+    };
+})();
diff --git a/apps/widbtstates/widget.png b/apps/widbtstates/widget.png
new file mode 100644
index 000000000..1a884a62c
Binary files /dev/null and b/apps/widbtstates/widget.png differ
diff --git a/apps/widbtstates/widget.ts b/apps/widbtstates/widget.ts
new file mode 100644
index 000000000..8f02c1b8c
--- /dev/null
+++ b/apps/widbtstates/widget.ts
@@ -0,0 +1,77 @@
+(() => {
+	"ram";
+
+	const enum State {
+		Asleep,
+		Active,
+		Connected
+	}
+
+	let state: State = (() => {
+		const status = NRF.getSecurityStatus();
+
+		if (status.connected) return State.Connected;
+		if (status.advertising) return State.Active;
+		return State.Asleep;
+	})();
+
+	const width = () => state > State.Asleep ? 15 : 0;
+
+	const update = (newState: State) => {
+		state = newState;
+		WIDGETS["bluetooth"]!.width = width();
+		setTimeout(Bangle.drawWidgets, 50); // no need for .bind()
+	};
+
+	type DarkTheme = `${boolean}`;
+	const colours: {
+		[key in State.Active | State.Connected]: {
+			[key in DarkTheme]: ColorResolvable
+		}
+	} = {
+		[State.Active]: {
+			false: "#fff",
+			true: "#fff",
+		},
+		[State.Connected]: {
+			false: "#0ff",
+			true: "#00f",
+		},
+	};
+
+	WIDGETS["bluetooth"] = {
+		area: "tl",
+		sortorder: -1,
+		draw: function() {
+			if (state == State.Asleep)
+				return;
+
+			g.reset();
+
+			g.setColor(colours[state][`${g.theme.dark}`]);
+
+			g.drawImage(
+				atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),
+				this.x! + 2,
+				this.y! + 2
+			);
+		},
+		width: width(),
+	};
+
+	NRF.on("connect", update.bind(null, State.Connected));
+	NRF.on("disconnect", update.bind(null, State.Active));
+
+	const origWake = NRF.wake;
+	const origSleep = NRF.sleep;
+
+	NRF.wake = function() {
+		update(State.Active);
+		return origWake.apply(this, arguments);
+	};
+
+	NRF.sleep = function() {
+		update(State.Asleep);
+		return origSleep.apply(this, arguments);
+	};
+})();
diff --git a/apps/widclkinfo/ChangeLog b/apps/widclkinfo/ChangeLog
new file mode 100644
index 000000000..6c3b85b00
--- /dev/null
+++ b/apps/widclkinfo/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New Widget!
+0.02: Now use an app ID (to avoid conflicts with clocks that also use ClockInfo)
+0.03: Fix widget clearing too far down
\ No newline at end of file
diff --git a/apps/widclkinfo/metadata.json b/apps/widclkinfo/metadata.json
new file mode 100644
index 000000000..4ba9b2444
--- /dev/null
+++ b/apps/widclkinfo/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "widclkinfo",
+  "name": "Clock Info Widget",
+  "version":"0.03",
+  "description": "Use 'Clock Info' in the Widget bar. Tap on the widget to select, then drag up/down/left/right to choose what information is displayed.",
+  "icon": "widget.png",
+  "screenshots" : [ { "url":"screenshot.png" }],
+  "type": "widget",
+  "tags": "widget,clkinfo",
+  "dependencies" : { "clock_info":"module" },
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"widclkinfo.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widclkinfo/screenshot.png b/apps/widclkinfo/screenshot.png
new file mode 100644
index 000000000..d36f6bf05
Binary files /dev/null and b/apps/widclkinfo/screenshot.png differ
diff --git a/apps/widclkinfo/widget.js b/apps/widclkinfo/widget.js
new file mode 100644
index 000000000..a802ba872
--- /dev/null
+++ b/apps/widclkinfo/widget.js
@@ -0,0 +1,50 @@
+if (!require("clock_info").loadCount) { // don't load if a clock_info was already loaded
+  // Load the clock infos
+  let clockInfoItems = require("clock_info").load();
+  // Add the
+  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, {
+    app : "widclkinfo",
+    // Add the dimensions we're rendering to here - these are used to detect taps on the clock info area
+    x : 0, y: 0, w: 72, h:24,
+    // You can add other information here you want to be passed into 'options' in 'draw'
+    // This function draws the info
+    draw : (itm, info, options) => {
+      // itm: the item containing name/hasRange/etc
+      // info: data returned from itm.get() containing text/img/etc
+      // options: options passed into addInteractive
+      clockInfoInfo = info;
+      if (WIDGETS["clkinfo"])
+        WIDGETS["clkinfo"].draw(WIDGETS["clkinfo"]);
+    }
+  });
+  let clockInfoInfo; // when clockInfoMenu.draw is called we set this up
+
+  // The actual widget we're displaying
+  WIDGETS["clkinfo"] = {
+    area:"tl",
+    width: clockInfoMenu.w,
+    draw:function(e) {
+      clockInfoMenu.x = e.x;
+      clockInfoMenu.y = e.y;
+      var o = clockInfoMenu;
+      // Clear the background
+      g.reset();
+      // indicate focus - make background reddish
+      //if (clockInfoMenu.focus) g.setBgColor(g.blendColor(g.theme.bg, "#f00", 0.25));
+      if (clockInfoMenu.focus) g.setColor("#f00");
+      g.clearRect(o.x, o.y, o.x+o.w-1, o.y+o.h-1);
+      if (clockInfoInfo) {
+        var x = o.x;
+        if (clockInfoInfo.img) {
+          g.drawImage(clockInfoInfo.img, x,o.y); // draw the image
+          x+=24;
+        }
+        var availableWidth = o.x+clockInfoMenu.w - (x+2);
+        g.setFont("6x8:2").setFontAlign(-1,0);
+        if (g.stringWidth(clockInfoInfo.text) > availableWidth)
+          g.setFont("6x8");
+        g.drawString(clockInfoInfo.text, x+2,o.y+12); // draw the text
+      }
+    }
+  };
+}
\ No newline at end of file
diff --git a/apps/widclkinfo/widget.png b/apps/widclkinfo/widget.png
new file mode 100644
index 000000000..16ecea9f8
Binary files /dev/null and b/apps/widclkinfo/widget.png differ
diff --git a/apps/widdevst/ChangeLog b/apps/widdevst/ChangeLog
new file mode 100644
index 000000000..cee46ac6a
--- /dev/null
+++ b/apps/widdevst/ChangeLog
@@ -0,0 +1,3 @@
+0.01: First version
+0.02: Support for Bangle.js 2
+0.03: Update storage usage and perform GC every minute
diff --git a/apps/widdevst/README.md b/apps/widdevst/README.md
new file mode 100644
index 000000000..49affc78d
--- /dev/null
+++ b/apps/widdevst/README.md
@@ -0,0 +1,15 @@
+# Device Status Widget
+
+This widget shows a rectangle containing
+
+- `B` if Bluetooth is on
+- `C` if the compass is on
+- `G` if GPS is on
+- `H` if the heart rate monitor is on
+
+at fixed positions, and two bars
+
+- left to right: usage of Flash storage
+- bottom to top: usage of RAM
+
+in green if below 50%, orange if between 50% and 80%, and red if above 80%.
diff --git a/apps/widdevst/icon.png b/apps/widdevst/icon.png
new file mode 100644
index 000000000..be242e1e1
Binary files /dev/null and b/apps/widdevst/icon.png differ
diff --git a/apps/widdevst/metadata.json b/apps/widdevst/metadata.json
new file mode 100644
index 000000000..f2be2bec8
--- /dev/null
+++ b/apps/widdevst/metadata.json
@@ -0,0 +1,13 @@
+{ "id": "widdevst",
+  "name": "Device Status Widget",
+  "version": "0.03",
+  "description": "Shows power status of Bluetooth, Compass, GPS and Heart Rate Monitor as well as storage and memory usage.",
+  "icon": "icon.png",
+  "type": "widget",
+  "tags": "widget,bluetooth,compass,gps,hrm",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name": "widdevst.wid.js", "url": "wid.js"}
+  ]
+}
diff --git a/apps/widdevst/wid.js b/apps/widdevst/wid.js
new file mode 100644
index 000000000..3cd5758ab
--- /dev/null
+++ b/apps/widdevst/wid.js
@@ -0,0 +1,50 @@
+(() => {
+  var stat = {date: 0};
+
+  WIDGETS.devst = {area: "tr", width: 22, draw: function() {
+    if (WIDGETS.devst._draw) return;
+    var d = new Date();
+    var t;
+    if ((d - stat.date) < 6e4) {
+      t = process.memory(false);
+    } else {
+      stat.date = d;
+      t = require('Storage').getStats();
+      stat.sto = t.fileBytes / t.totalBytes;
+      t = process.memory();
+    }
+    t = t.usage / t.total;
+    var x = this.x;
+    var y = this.y;
+    g.reset();
+    g.clearRect(x, y, x + 21, y + 23);
+    g.drawRect(x + 2, y + 1, x + 20, y + 21);
+    g.setFont('6x8', 1);
+    if (NRF.getSecurityStatus().connected) g.drawString('B', x + 5, y + 3);
+    if (Bangle.isCompassOn()) g.drawString('C', x + 13, y + 3);
+    if (Bangle.isGPSOn()) g.drawString('G', x + 5, y + 12);
+    if (Bangle.isHRMOn()) g.drawString('H', x + 13, y + 12);
+    g.setColor(col(stat.sto)); g.drawRect(x + 2, y + 21, x + 2 + stat.sto * 18, y + 22);
+    g.setColor(col(t)); g.drawRect(x + 1, y + 21 - t * 20, x + 2, y + 21);
+  }};
+
+  function col(p) {
+    return p < 0.5 ? '#0f0' : (p < 0.8 ? '#f80' : '#f00');
+  }
+
+  var draw = WIDGETS.devst.draw.bind(WIDGETS.devst);
+  var iid = setInterval(draw, Bangle.isLocked() ? 6e4 : 2e3);
+
+  Bangle.on('lcdPower', (on) => {
+    if (on) {
+      draw();
+      if (!iid) iid = setInterval(draw, Bangle.isLocked() ? 6e4 : 2e3);
+    } else if (iid) iid = clearInterval(iid);
+  });
+  Bangle.on('lock', (on) => {
+    if (iid) {
+      clearInterval(iid);
+      iid = setInterval(draw, on ? 6e4 : 2e3);
+    }
+  });
+})();
diff --git a/apps/widdst/ChangeLog b/apps/widdst/ChangeLog
index e350137ee..c0b9aafc6 100644
--- a/apps/widdst/ChangeLog
+++ b/apps/widdst/ChangeLog
@@ -1,2 +1,4 @@
 0.01: Initial version
 0.02: Checks for correct firmware; E.setDST(...) moved to boot.js
+0.03: Convert Yes/No On/Off in settings to checkboxes
+0.04: Give the boot file the highest priority to ensure it runs before sched (fix #2663)
\ No newline at end of file
diff --git a/apps/widdst/metadata.json b/apps/widdst/metadata.json
index 144c02998..913bc0658 100644
--- a/apps/widdst/metadata.json
+++ b/apps/widdst/metadata.json
@@ -1,7 +1,7 @@
 { "id": "widdst",
   "name": "Daylight Saving",
-  "version":"0.02",
-  "description": "Widget to set daylight saving rules. Requires Espruino 2v14.49 or later - see the instructions below for more information.",
+  "version":"0.04",
+  "description": "Widget to set daylight saving rules. Requires Espruino 2v15 or later - see the instructions below for more information.",
   "icon": "icon.png",
   "type": "widget",
   "tags": "widget,tool",
@@ -9,7 +9,7 @@
   "readme": "README.md",
   "storage": [
     {"name":"widdst.wid.js","url":"widget.js"},
-    {"name":"widdst.boot.js","url":"boot.js"},
+    {"name":"widdst.0.boot.js","url":"boot.js"},
     {"name":"widdst.settings.js","url":"settings.js"}
   ],
   "data": [{"name":"widdst.json"}]
diff --git a/apps/widdst/settings.js b/apps/widdst/settings.js
index 9a7e579b7..7363aa6bf 100644
--- a/apps/widdst/settings.js
+++ b/apps/widdst/settings.js
@@ -23,7 +23,7 @@
       at: 2
     }
   }, require("Storage").readJSON("widdst.json", true) || {});
-  
+
   var dst_start_end = {
     is_start: true,
     day_offset: 0,
@@ -32,11 +32,11 @@
     month: 0,
     at: 0
   };
-  
+
   function writeSettings() {
     require('Storage').writeJSON("widdst.json", settings);
   }
-  
+
   function writeSubMenuSettings() {
     if (dst_start_end.is_start) {
       settings.dst_start.day_offset = dst_start_end.day_offset;
@@ -53,11 +53,11 @@
     }
     writeSettings();
   }
-  
+
   function hoursToString(h) {
     return (h|0) + ':' + (((6*h)%6)|0) + (((60*h)%10)|0);
   }
-  
+
   function getDSTStartEndMenu(start) {
     dst_start_end.is_start = start;
     if (start) {
@@ -131,23 +131,21 @@
       }
     }
   }
-      
+
   var dstMenu = {
     "": {
       "Title": /*LANG*/"Daylight Saving"
     },
     "< Back": () => back(),
     /*LANG*/"Enabled": {
-      value: settings.has_dst,
-      format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+      value: !!settings.has_dst,
       onchange: v => {
         settings.has_dst = v;
         writeSettings();
       }
     },
     /*LANG*/"Icon": {
-      value: settings.show_icon,
-      format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+      value: !!settings.show_icon,
       onchange: v => {
         settings.show_icon = v;
         writeSettings();
@@ -178,7 +176,7 @@
     /*LANG*/"DST Start": () => E.showMenu(getDSTStartEndMenu(true)),
     /*LANG*/"DST End": () => E.showMenu(getDSTStartEndMenu(false))
   };
-  
+
   E.showMenu(dstMenu);
 
 });
diff --git a/apps/widhid/ChangeLog b/apps/widhid/ChangeLog
new file mode 100644
index 000000000..b0e479108
--- /dev/null
+++ b/apps/widhid/ChangeLog
@@ -0,0 +1,5 @@
+0.01: New widget - music control via a swipe
+0.02: Improve interactivity - avoid responding to swipes when a menu or
+      launcher is active.
+0.03: Handle errors when sending input over BLE and the special-case of
+      replacing a single handler
diff --git a/apps/widhid/README.md b/apps/widhid/README.md
new file mode 100644
index 000000000..652a2ed49
--- /dev/null
+++ b/apps/widhid/README.md
@@ -0,0 +1,22 @@
+# Description
+
+A music control widget based on [Swipe Bluetooth Music Controls] (based on [Bluetooth Music Controls]).
+By operating as a widget, you can control music without leaving your current app (e.g. on a run, bike ride or just watching the clock).
+
+
+[Swipe Bluetooth Music Controls]: https://github.com/espruino/BangleApps/tree/master/apps/hidmsicswipe
+[Bluetooth Music Controls]: https://github.com/espruino/BangleApps/tree/master/apps/hidmsic
+
+# Usage
+
+Swipe down to enable - note the icon changes from blue to orange, indicating it's listening for your instruction. Then drag up/down for volume, left/right for previous and next and tap for play/pause.
+
+All other watch interaction is disabled for 3 seconds, to prevent clashing taps/drags - this period is extended as you continue to alter the volume, play/pause and jump between tracks.
+
+Requires espruino firmware > 2v17 to avoid event handler clashes.
+
+# Setup / Technical details
+
+Note that HID must be enabled in settings. Then provided you're paired with your phone/computer, the widget icon will appear and you can control music from your clock face!
+
+The app disables all other drag and tap handlers while this widget is "active" (in a similar manner to [`backswipe`](https://github.com/espruino/BangleApps/pull/2524#issuecomment-1406230564) and [`lightswitch`](https://github.com/espruino/Espruino/issues/2151#issuecomment-1042423211)).
diff --git a/apps/widhid/icon.js b/apps/widhid/icon.js
new file mode 100644
index 000000000..a8f9cbdb4
--- /dev/null
+++ b/apps/widhid/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkBiIA/AEhtDNSSHGCyIbFGJ0QFAowIA48QE4oGBBAomBHAxXHA4IJED5IXJCAcQIAxGGC4YKEI44HCBAxAGO4wXBB4JYGNRBfHC/6HFB4wXHUA6YIC4oOCGA6YGU4quHJ5LXGdJIXNF65fIC5AQFQorHJXxwXJK5xGJC65GsgJG/Iw4uUfgIuUC4QWTIwIusLq4WBFy50tC1YXBCyoA/ADw="))
diff --git a/apps/widhid/icon.png b/apps/widhid/icon.png
new file mode 100644
index 000000000..2ccc88883
Binary files /dev/null and b/apps/widhid/icon.png differ
diff --git a/apps/widhid/metadata.json b/apps/widhid/metadata.json
new file mode 100644
index 000000000..b819c9b64
--- /dev/null
+++ b/apps/widhid/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "widhid",
+  "name": "Bluetooth Music Swipe Control Widget",
+  "shortName": "BLE Swipe Widget",
+  "version": "0.03",
+  "description": "Based on Swipe Bluetooth Music Controls (based on Bluetooth Music Controls). Swipe down to enable, then swipe up/down for volume, left/right for previous and next and tap for play/pause. Enable HID in settings, pair with your phone/computer, then use this widget to control music from your watch!",
+  "icon": "icon.png",
+  "readme": "README.md",
+  "type": "widget",
+  "tags": "widget,bluetooth,music",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"widhid.wid.js","url":"wid.js"},
+    {"name":"widhid.img","url":"icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/widhid/wid.js b/apps/widhid/wid.js
new file mode 100644
index 000000000..06ef0cea4
--- /dev/null
+++ b/apps/widhid/wid.js
@@ -0,0 +1,138 @@
+(function () {
+    var settings = require("Storage").readJSON("setting.json", true) || { HID: false };
+    if (settings.HID !== "kbmedia") {
+        console.log("widhid: can't enable, HID setting isn't \"kbmedia\"");
+        return;
+    }
+    delete settings;
+    var anchor = { x: 0, y: 0 };
+    var start = { x: 0, y: 0 };
+    var dragging = false;
+    var activeTimeout;
+    var waitForRelease = true;
+    var onSwipe = (function (_lr, ud) {
+        if (ud > 0 && !activeTimeout && !Bangle.CLKINFO_FOCUS) {
+            listen();
+            Bangle.buzz(20);
+        }
+    });
+    var onDrag = (function (e) {
+        E.stopEventPropagation && E.stopEventPropagation();
+        if (e.b === 0) {
+            var wasDragging = dragging;
+            dragging = false;
+            if (waitForRelease) {
+                waitForRelease = false;
+                return;
+            }
+            if (!wasDragging
+                || (Math.abs(e.x - anchor.x) < 2 && Math.abs(e.y - anchor.y) < 2)) {
+                toggle();
+                onEvent();
+                return;
+            }
+        }
+        if (waitForRelease)
+            return;
+        if (e.b && !dragging) {
+            dragging = true;
+            setStart(e);
+            Object.assign(anchor, start);
+            return;
+        }
+        var dx = e.x - start.x;
+        var dy = e.y - start.y;
+        if (Math.abs(dy) > 25 && Math.abs(dx) > 25) {
+            setStart(e);
+            return;
+        }
+        if (dx > 40) {
+            next();
+            onEvent();
+            waitForRelease = true;
+        }
+        else if (dx < -40) {
+            prev();
+            onEvent();
+            waitForRelease = true;
+        }
+        else if (dy > 30) {
+            down();
+            onEvent();
+            setStart(e);
+        }
+        else if (dy < -30) {
+            up();
+            onEvent();
+            setStart(e);
+        }
+    });
+    var setStart = function (_a) {
+        var x = _a.x, y = _a.y;
+        start.x = x;
+        start.y = y;
+    };
+    var onEvent = function () {
+        Bangle.buzz(20);
+        listen();
+    };
+    var listen = function () {
+        var wasActive = !!activeTimeout;
+        if (!wasActive) {
+            waitForRelease = true;
+            Bangle.on("drag", onDrag);
+            var dragHandlers = Bangle["#ondrag"];
+            if (dragHandlers && typeof dragHandlers !== "function") {
+                Bangle["#ondrag"] = [onDrag].concat(dragHandlers.filter(function (f) { return f !== onDrag; }));
+            }
+            redraw();
+        }
+        if (activeTimeout)
+            clearTimeout(activeTimeout);
+        activeTimeout = setTimeout(function () {
+            activeTimeout = undefined;
+            Bangle.removeListener("drag", onDrag);
+            redraw();
+        }, 3000);
+    };
+    var redraw = function () { return setTimeout(Bangle.drawWidgets, 50); };
+    var connected = NRF.getSecurityStatus().connected;
+    WIDGETS["hid"] = {
+        area: "tr",
+        sortorder: -20,
+        draw: function () {
+            if (this.width === 0)
+                return;
+            g.drawImage(activeTimeout
+                ? require("heatshrink").decompress(atob("jEYxH+AEfH44XXAAYXXDKIXZDYp3pC/6KHUMwWHC/4XvUy4YGdqoA/AFoA=="))
+                : require("heatshrink").decompress(atob("jEYxH+AEcdjoXXAAYXXDKIXZDYp3pC/6KHUMwWHC/4XvUy4YGdqoA/AFoA==")), this.x + 2, this.y + 2);
+        },
+        width: connected ? 24 : 0,
+    };
+    if (connected)
+        Bangle.on("swipe", onSwipe);
+    delete connected;
+    NRF.on("connect", function () {
+        WIDGETS["hid"].width = 24;
+        Bangle.on("swipe", onSwipe);
+        redraw();
+    });
+    NRF.on("disconnect", function () {
+        WIDGETS["hid"].width = 0;
+        Bangle.removeListener("swipe", onSwipe);
+        redraw();
+    });
+    var sendHid = function (code) {
+        try {
+            NRF.sendHIDReport([1, code], function () { return NRF.sendHIDReport([1, 0]); });
+        }
+        catch (e) {
+            console.log("sendHIDReport:", e);
+        }
+    };
+    var next = function () { return sendHid(0x01); };
+    var prev = function () { return sendHid(0x02); };
+    var toggle = function () { return sendHid(0x10); };
+    var up = function () { return sendHid(0x40); };
+    var down = function () { return sendHid(0x80); };
+})();
diff --git a/apps/widhid/wid.ts b/apps/widhid/wid.ts
new file mode 100644
index 000000000..1de293b36
--- /dev/null
+++ b/apps/widhid/wid.ts
@@ -0,0 +1,163 @@
+(() => {
+	const settings = require("Storage").readJSON("setting.json", true) as Settings || ({ HID: false } as Settings);
+	if (settings.HID !== "kbmedia") {
+		console.log("widhid: can't enable, HID setting isn't \"kbmedia\"");
+		return;
+	}
+	// @ts-ignore
+	delete settings;
+
+	let anchor = {x:0,y:0};
+	let start = {x:0,y:0};
+	let dragging = false;
+	let activeTimeout: TimeoutId | undefined;
+	let waitForRelease = true;
+
+	const onSwipe = ((_lr, ud) => {
+		// do these checks in order of cheapness
+		if(ud! > 0 && !activeTimeout && !(Bangle as BangleExt).CLKINFO_FOCUS){
+			listen();
+			Bangle.buzz(20);
+		}
+	}) satisfies SwipeCallback;
+
+	const onDrag = (e => {
+		// Espruino/35c8cb9be11
+		E.stopEventPropagation && E.stopEventPropagation();
+
+		if(e.b === 0){
+			// released
+			const wasDragging = dragging;
+			dragging = false;
+
+			if(waitForRelease){
+				waitForRelease = false;
+				return;
+			}
+
+			if(!wasDragging // i.e. tap
+			|| (Math.abs(e.x - anchor.x) < 2 && Math.abs(e.y - anchor.y) < 2))
+			{
+				toggle();
+				onEvent();
+				return;
+			}
+		}
+		if(waitForRelease) return;
+
+		if(e.b && !dragging){
+			dragging = true;
+			setStart(e);
+			Object.assign(anchor, start);
+			return;
+		}
+
+		const dx = e.x - start.x;
+		const dy = e.y - start.y;
+
+		if(Math.abs(dy) > 25 && Math.abs(dx) > 25){
+			// diagonal, ignore
+			setStart(e);
+			return;
+		}
+
+		// had a drag in a single axis
+		if(dx > 40){       next(); onEvent(); waitForRelease = true; }
+		else if(dx < -40){ prev(); onEvent(); waitForRelease = true; }
+		else if(dy > 30){  down(); onEvent(); setStart(e); }
+		else if(dy < -30){ up();   onEvent(); setStart(e); }
+	}) satisfies DragCallback;
+
+	const setStart = ({ x, y }: { x: number, y: number }) => {
+		start.x = x;
+		start.y = y;
+	};
+
+	const onEvent = () => {
+		Bangle.buzz(20); // feedback event sent
+		listen(); // had an event, keep listening for more
+	};
+
+	const listen = () => {
+		const wasActive = !!activeTimeout;
+		if(!wasActive){
+			waitForRelease = true; // wait for first touch up before accepting gestures
+
+			Bangle.on("drag", onDrag);
+
+			// move our drag to the start of the event listener array
+			const dragHandlers = (Bangle as BangleEvents)["#ondrag"]
+
+			if(dragHandlers && typeof dragHandlers !== "function"){
+				(Bangle as BangleEvents)["#ondrag"] = [onDrag as undefined | typeof onDrag].concat(
+					dragHandlers.filter((f: unknown) => f !== onDrag)
+				);
+			}
+
+			redraw();
+		}
+
+		if(activeTimeout) clearTimeout(activeTimeout);
+		activeTimeout = setTimeout(() => {
+			activeTimeout = undefined;
+
+			Bangle.removeListener("drag", onDrag);
+
+			redraw();
+		}, 3000);
+	};
+
+	const redraw = () => setTimeout(Bangle.drawWidgets, 50);
+
+	const connected = NRF.getSecurityStatus().connected;
+	WIDGETS["hid"] = {
+		area: "tr",
+		sortorder: -20,
+		draw: function() {
+			if(this.width === 0) return;
+			g.drawImage(
+				activeTimeout
+				? require("heatshrink").decompress(atob("jEYxH+AEfH44XXAAYXXDKIXZDYp3pC/6KHUMwWHC/4XvUy4YGdqoA/AFoA=="))
+				: require("heatshrink").decompress(atob("jEYxH+AEcdjoXXAAYXXDKIXZDYp3pC/6KHUMwWHC/4XvUy4YGdqoA/AFoA==")),
+				this.x! + 2,
+				this.y! + 2
+			);
+		},
+		width: connected ? 24 : 0,
+	};
+
+	if(connected)
+		Bangle.on("swipe", onSwipe);
+	// @ts-ignore
+	delete connected;
+
+	NRF.on("connect", () => {
+		WIDGETS["hid"]!.width = 24;
+		Bangle.on("swipe", onSwipe);
+		redraw();
+	});
+	NRF.on("disconnect", () => {
+		WIDGETS["hid"]!.width = 0;
+		Bangle.removeListener("swipe", onSwipe);
+		redraw();
+	});
+
+	//const DEBUG = true;
+	const sendHid = (code: number) => {
+		//if(DEBUG) return;
+		try{
+			NRF.sendHIDReport(
+				[1, code],
+				() => NRF.sendHIDReport([1, 0]),
+			);
+		}catch(e){
+			console.log("sendHIDReport:", e);
+		}
+	};
+
+	const next = () => /*DEBUG ? console.log("next") : */ sendHid(0x01);
+	const prev = () => /*DEBUG ? console.log("prev") : */ sendHid(0x02);
+	const toggle = () => /*DEBUG ? console.log("toggle") : */ sendHid(0x10);
+	const up = () => /*DEBUG ? console.log("up") : */ sendHid(0x40);
+	const down = () => /*DEBUG ? console.log("down") : */ sendHid(0x80);
+})()
diff --git a/apps/widhid/widget-active.png b/apps/widhid/widget-active.png
new file mode 100644
index 000000000..74ce4b2a0
Binary files /dev/null and b/apps/widhid/widget-active.png differ
diff --git a/apps/widhid/widget.png b/apps/widhid/widget.png
new file mode 100644
index 000000000..dfb108060
Binary files /dev/null and b/apps/widhid/widget.png differ
diff --git a/apps/widlockunlock/ChangeLog b/apps/widlockunlock/ChangeLog
index b4d1ae593..b5efcaa86 100644
--- a/apps/widlockunlock/ChangeLog
+++ b/apps/widlockunlock/ChangeLog
@@ -1 +1,2 @@
 0.01: First commit
+0.02: Add tap-to-lock functionality
diff --git a/apps/widlockunlock/metadata.json b/apps/widlockunlock/metadata.json
index d701279b9..cc4fa76cd 100644
--- a/apps/widlockunlock/metadata.json
+++ b/apps/widlockunlock/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "widlockunlock",
   "name": "Lock/Unlock Widget",
-  "version": "0.01",
-  "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked, or an unlock icon otherwise",
+  "version": "0.02",
+  "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked, or an unlock icon otherwise. Tap to lock the lcd",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget,lock",
diff --git a/apps/widlockunlock/widget.js b/apps/widlockunlock/widget.js
index 0716a9edf..cfbbc87a3 100644
--- a/apps/widlockunlock/widget.js
+++ b/apps/widlockunlock/widget.js
@@ -1,5 +1,28 @@
-Bangle.on("lockunlock", function() {
-  Bangle.drawWidgets();
+Bangle.on("lock", () => Bangle.drawWidgets());
+
+Bangle.on('touch', (_btn, xy) => {
+  const oversize = 5;
+
+  const w = WIDGETS.lockunlock;
+
+  const x = xy.x;
+  const y = xy.y;
+
+  if(w.x - oversize <= x && x < w.x + 14 + oversize
+  && w.y - oversize <= y && y < w.y + 24 + oversize)
+  {
+    Bangle.setLocked(true);
+
+    const backlightTimeout = Bangle.getOptions().backlightTimeout; // ms
+
+    // seems to be a race/if we don't give the firmware enough time,
+    // it won't timeout the backlight and we'll restore it in our setTimeout below
+    Bangle.setOptions({ backlightTimeout: 100 });
+
+    setTimeout(() => {
+      Bangle.setOptions({ backlightTimeout });
+    }, 300);
+  }
 });
 WIDGETS["lockunlock"]={area:"tl",sortorder:10,width:14,draw:function(w) {
   g.reset().drawImage(atob(Bangle.isLocked() ? "DBGBAAAA8DnDDCBCBP////////n/n/n//////z/A" : "DBGBAAAA8BnDDCBABP///8A8A8Y8Y8Y8A8A//z/A"), w.x+1, w.y+3);
diff --git a/apps/widmessages/ChangeLog b/apps/widmessages/ChangeLog
index 348d49528..507d9c13b 100644
--- a/apps/widmessages/ChangeLog
+++ b/apps/widmessages/ChangeLog
@@ -3,3 +3,4 @@
       Remove library stub
 0.03: Fix messages not showing if UI auto-open is disabled
 0.04: Now shows message icons again (#2416)
+0.05: Match draw() API e.g. to allow wid_edit to alter this widget
diff --git a/apps/widmessages/metadata.json b/apps/widmessages/metadata.json
index 0e399f71f..f058beacc 100644
--- a/apps/widmessages/metadata.json
+++ b/apps/widmessages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widmessages",
   "name": "Message Widget",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Widget showing new messages",
   "icon": "app.png",
   "type": "widget",
diff --git a/apps/widmessages/widget.js b/apps/widmessages/widget.js
index 44f525ec8..357ca06e3 100644
--- a/apps/widmessages/widget.js
+++ b/apps/widmessages/widget.js
@@ -11,7 +11,7 @@
   // the name still needs to be "messages": the library calls WIDGETS["messages'].hide()/show()
   // see e.g. widmsggrid
   WIDGETS["messages"] = {
-    area: "tl", width: 0, srcs: [], draw: function(recall) {
+    area: "tl", width: 0, srcs: [], draw: function(_w, recall) {
       // If we had a setTimeout queued from the last time we were called, remove it
       if (WIDGETS["messages"].i) {
         clearTimeout(WIDGETS["messages"].i);
@@ -42,7 +42,7 @@
             this.x+12+i*24, this.y+12, {rotate: 0/*force centering*/});
         }
       }
-      WIDGETS["messages"].i = setTimeout(() => WIDGETS["messages"].draw(true), 1000);
+      WIDGETS["messages"].i = setTimeout(() => WIDGETS["messages"].draw(WIDGETS["messages"], true), 1000);
       if (process.env.HWVERSION>1) Bangle.on("touch", this.touch);
     }, onMsg: function(type, msg) {
       if (this.hidden) return;
diff --git a/apps/widminbat/ChangeLog b/apps/widminbat/ChangeLog
index 1d06820f6..d4143d802 100644
--- a/apps/widminbat/ChangeLog
+++ b/apps/widminbat/ChangeLog
@@ -1,3 +1,3 @@
 0.01: Initial Version: Display at under 30% battery
 0.02: Display while charging
-
+0.03: Do not clear outside of widget bar
diff --git a/apps/widminbat/metadata.json b/apps/widminbat/metadata.json
index 9c72fa38f..7aa200282 100644
--- a/apps/widminbat/metadata.json
+++ b/apps/widminbat/metadata.json
@@ -1,7 +1,7 @@
 { "id": "widminbat",
   "name": "Minimal Battery",
   "shortName":"MinBat",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A minimal version of the battery widget that only appears if the battery is running low (below 30%)",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widminbat/widget.js b/apps/widminbat/widget.js
index 8274b9f38..27453f7cd 100644
--- a/apps/widminbat/widget.js
+++ b/apps/widminbat/widget.js
@@ -8,7 +8,7 @@
     var bat = E.getBattery();
     var x = this.x, y = this.y;
     g.reset();
-    g.clearRect(x,y,x+s,y+24);
+    g.clearRect(x,y,x+s,y+23);
     g.setColor(g.theme.fg).fillRect(x,y+2,x+s-4,y+21).clearRect(x+2,y+4,x+s-6,y+19).fillRect(x+s-3,y+10,x+s,y+14);
     var barWidth = bat*(s-12)/100;
     var color = bat < 15 ? "#f00" : (bat <= 30 ? "#f80" : "#0f0");
diff --git a/apps/widmsggrid/ChangeLog b/apps/widmsggrid/ChangeLog
index 9be40817a..544b4ff4f 100644
--- a/apps/widmsggrid/ChangeLog
+++ b/apps/widmsggrid/ChangeLog
@@ -1,4 +1,5 @@
 0.01: New widget!
 0.02: Adjust to message icons moving to messageicons lib
 0.03: Use new message library
-0.04: Remove library stub
\ No newline at end of file
+0.04: Remove library stub
+0.05: Don't turn on LCD
diff --git a/apps/widmsggrid/metadata.json b/apps/widmsggrid/metadata.json
index 17d3573ad..015da533c 100644
--- a/apps/widmsggrid/metadata.json
+++ b/apps/widmsggrid/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widmsggrid",
   "name": "Messages Grid Widget",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Widget that displays notification icons in a grid",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widmsggrid/widget.js b/apps/widmsggrid/widget.js
index 6a5b175ac..c2f36a87d 100644
--- a/apps/widmsggrid/widget.js
+++ b/apps/widmsggrid/widget.js
@@ -70,7 +70,6 @@
       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.hidden = true;
       w.width = 0;
diff --git a/apps/widpedom/metadata.json b/apps/widpedom/metadata.json
index f49d3ba5b..480519a29 100644
--- a/apps/widpedom/metadata.json
+++ b/apps/widpedom/metadata.json
@@ -10,5 +10,6 @@
   "storage": [
     {"name":"widpedom.wid.js","url":"widget.js"},
     {"name":"widpedom.settings.js","url":"settings.js"}
-  ]
+  ],
+  "data":[{"name":"wpedom.json"}]
 }
diff --git a/apps/widswatchbeats/metadata.json b/apps/widswatchbeats/metadata.json
new file mode 100644
index 000000000..5c8229966
--- /dev/null
+++ b/apps/widswatchbeats/metadata.json
@@ -0,0 +1,13 @@
+{
+  "id": "widswatchbeats",
+  "name": "Swatch Internet Time Widget",
+  "icon": "widget-icon.png",
+  "type": "widget",
+  "version": "0.01",
+  "description": "Displays the current .beat (e.g. @500 for midday)",
+  "tags": "widget,time,swatch,internet,beat,.beat,clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name": "widswatchbeats.wid.js","url": "widget.js"}
+  ]
+}
diff --git a/apps/widswatchbeats/widget-icon.png b/apps/widswatchbeats/widget-icon.png
new file mode 100644
index 000000000..726a57825
Binary files /dev/null and b/apps/widswatchbeats/widget-icon.png differ
diff --git a/apps/widswatchbeats/widget.js b/apps/widswatchbeats/widget.js
new file mode 100644
index 000000000..7f2427c74
--- /dev/null
+++ b/apps/widswatchbeats/widget.js
@@ -0,0 +1,41 @@
+(function() {
+  const WIDTH = 50;
+  const SEC_PER_BEAT = 86.4;
+
+  let drawTimeout;
+
+  function getSecondsSinceMidnight() {
+    const now = new Date();
+    return now.getHours() * 3600 + now.getMinutes() * 60 + now.getSeconds();
+  }
+
+  function queueDraw() {
+    if (drawTimeout) clearTimeout(drawTimeout);
+    const nextSecond = SEC_PER_BEAT - (getSecondsSinceMidnight() % SEC_PER_BEAT);
+    drawTimeout = setTimeout(function() {
+      drawTimeout = undefined;
+      WIDGETS.widswatchbeats.draw();
+    }, nextSecond * 1000 + 1); // Add one ms to ensure we're past the beat
+  }
+
+  function draw() {
+    const now = new Date();
+    const seconds = now.getHours() * 3600 + now.getMinutes() * 60 + now.getSeconds();
+    const beats = Math.floor(seconds / SEC_PER_BEAT);
+    const beatsString = '@' + beats.toString().padStart(3, '0');
+
+    g.reset();
+    g.setFontAlign(0, 0);
+    g.clearRect(this.x, this.y, this.x + WIDTH, this.y+22);
+    g.setFont("6x8", 2);
+    g.drawString(beatsString, this.x+WIDTH/2, this.y+12);
+    queueDraw();
+  }
+
+  WIDGETS.widswatchbeats = {
+    area: "tl",
+    width: WIDTH,
+    draw
+  };
+
+})();
diff --git a/apps/widtemp/ChangeLog b/apps/widtemp/ChangeLog
new file mode 100644
index 000000000..8fd2f7ca1
--- /dev/null
+++ b/apps/widtemp/ChangeLog
@@ -0,0 +1,2 @@
+0.01: Initial release
+0.02: Disallow emulator
diff --git a/apps/widtemp/README.md b/apps/widtemp/README.md
new file mode 100644
index 000000000..54ff4eebd
--- /dev/null
+++ b/apps/widtemp/README.md
@@ -0,0 +1,7 @@
+# Temperature widget
+A simple temperature widget, showing the current microcontroller's internal temperature (E.getTemperature()).
+
+It updates every minute. If the current temperature is above the last 10 minutes average, the text is shown in red. If below, the text is shown in blue and black otherwise.
+
+![](screenshot.jpg)
+
diff --git a/apps/widtemp/metadata.json b/apps/widtemp/metadata.json
new file mode 100644
index 000000000..5ec0f2f0e
--- /dev/null
+++ b/apps/widtemp/metadata.json
@@ -0,0 +1,17 @@
+{
+    "id": "widtemp",
+    "name": "Temperature widget",
+    "version": "0.02",
+    "description": "A temperature widget, showing the current internal temperature",
+    "readme": "README.md",
+    "icon": "widtemp.png",
+    "screenshots": [{"url":"screenshot.jpg"}],
+    "type": "widget",
+    "tags": "widget,health",
+    "supports": ["BANGLEJS","BANGLEJS2"],
+    "dependencies" : {},
+    "allow_emulator":false,
+    "storage": [
+      {"name":"widtemp.wid.js","url":"widtemp.wid.js"}
+    ]
+  }
diff --git a/apps/widtemp/screenshot.jpg b/apps/widtemp/screenshot.jpg
new file mode 100644
index 000000000..4a1ab64e6
Binary files /dev/null and b/apps/widtemp/screenshot.jpg differ
diff --git a/apps/widtemp/widtemp.png b/apps/widtemp/widtemp.png
new file mode 100644
index 000000000..25b1e4c65
Binary files /dev/null and b/apps/widtemp/widtemp.png differ
diff --git a/apps/widtemp/widtemp.wid.js b/apps/widtemp/widtemp.wid.js
new file mode 100644
index 000000000..bd3197ade
--- /dev/null
+++ b/apps/widtemp/widtemp.wid.js
@@ -0,0 +1,34 @@
+(() => {
+  const width = 38;
+  const max_temps_len = 10;
+  let temps = [];
+
+  function push_temp(temp, length) {
+    temps.unshift(temp) > length ? temps.pop() : null;
+  }
+
+  function draw() {
+    const temp = Math.round(E.getTemperature());
+    const sum = temps.reduce((a, b) => a + b, 0);
+    const avg = (sum / temps.length) || 0;
+
+    g.reset();
+    g.setFont("6x8", 2);
+    g.clearRect(this.x, this.y, this.x + width, this.y + 18);
+
+    if (temp > avg) {
+      g.setColor("#ff0000");  // red
+    } else if (temp < avg) {
+      g.setColor("#0096ff");  // blue
+    }
+
+    push_temp(temp, max_temps_len);
+    g.drawString(temp + "°", this.x + 3, this.y + 4);
+  }
+
+  setInterval(function() {
+    WIDGETS["widtemp"].draw(WIDGETS["widtemp"]);
+  }, 60000); // update every minute
+
+  WIDGETS["widtemp"]={area:"tl", width: width, draw:draw};
+})()
diff --git a/apps/wohrm/ChangeLog b/apps/wohrm/ChangeLog
index 2ca405365..8cdb24153 100644
--- a/apps/wohrm/ChangeLog
+++ b/apps/wohrm/ChangeLog
@@ -9,3 +9,4 @@
 0.09: Ported to Bangle.js2
       Home returns to clock, instead of menu
       Add settings
+0.10: Increased(font sizes and bg height for current HR), BJS2 (added support for bottom widgets)
diff --git a/apps/wohrm/README.md b/apps/wohrm/README.md
index 87b1a65da..d35feb253 100644
--- a/apps/wohrm/README.md
+++ b/apps/wohrm/README.md
@@ -30,3 +30,9 @@ Pressing middle button will switch off the HRM of the watch and return you to th
 # HRM usage
 The HRM is switched on when the app is started. It stays switch on while the app is running, even
 when the watch screen goes to stand-by.
+
+
+Screenshot BJS2 emul
+
+![](bangle2-workout-HRM-screenshot.png)
+
diff --git a/apps/wohrm/app.js b/apps/wohrm/app.js
index ab579463c..e32ab36ba 100644
--- a/apps/wohrm/app.js
+++ b/apps/wohrm/app.js
@@ -18,7 +18,7 @@ let lowerLimitChanged = true;
 
 let limitSetter = Setter.NONE;
 
-let currentHeartRate = 0;
+let currentHeartRate = 0; //use for emuls
 let hrConfidence = -1;
 let hrChanged = true;
 let confidenceChanged = true;
@@ -31,7 +31,7 @@ const upperLshape = isB1 ? {
   left: 210,
   bottom: 40,
   top: 210,
-  rectWidth: 30,
+  rectWidth: 30, 
   cornerRoundness: 5,
   orientation: -1,
   color: '#f00'
@@ -39,7 +39,7 @@ const upperLshape = isB1 ? {
   right: Bangle.appRect.x2-100,
   left: Bangle.appRect.x2,
   bottom: 24,
-  top: Bangle.appRect.y2,
+  top: Bangle.appRect.y2-24, //for bottom widget
   rectWidth: 26,
   cornerRoundness: 4,
   orientation: -1,   // rotated 180°
@@ -58,19 +58,20 @@ const lowerLshape = {
 };
 
 const centerBar = {
-  minY: (upperLshape.bottom + upperLshape.top - upperLshape.rectWidth)/2,
-  maxY: (upperLshape.bottom + upperLshape.top + upperLshape.rectWidth)/2,
+    //1.5 =height*2
+  minY: (upperLshape.bottom + upperLshape.top - (upperLshape.rectWidth*1.5))/2,
+  maxY: (upperLshape.bottom + upperLshape.top + (upperLshape.rectWidth*1.5))/2,
   confidenceWidth: isB1 ? 10 : 8,
-  minX: isB1 ? 55 : upperLshape.rectWidth + 14,
+  minX: isB1 ? 55 : upperLshape.rectWidth + 14, 
   maxX: isB1 ? 165 : Bangle.appRect.x2 - upperLshape.rectWidth - 14
 };
 
 const fontSizes = isB1 ? {
-  limits: 13,
-  heartRate: 24
+  limits: 14,
+  heartRate: 44
 } : {
-  limits: 12,
-  heartRate: 20
+  limits: 16,
+  heartRate: 34
 };
 
 function fillEllipse(x, y, x2, y2) {
@@ -178,10 +179,11 @@ function renderCurrentHeartRate() {
 
   g.setColor(g.theme.bg);
   g.setFontVector(fontSizes.heartRate);
-  g.setFontAlign(1, 0, 0);
+  g.setFontAlign(0, 0, 0);//center
   g.drawString(currentHeartRate,
-               Math.max(upperLshape.right+upperLshape.cornerRoundness,
-                        lowerLshape.right-lowerLshape.cornerRoundness),
+              // Math.max(upperLshape.right+upperLshape.cornerRoundness, lowerLshape.right-lowerLshape.cornerRoundness),
+              // Math.max(upperLshape.right+upperLshape.cornerRoundness, lowerLshape.right-lowerLshape.cornerRoundness)-(g.stringWidth(currentHeartRate)/2),
+               centerBar.minX+((centerBar.maxX-centerBar.minX)/2),
                (centerBar.minY+centerBar.maxY)/2);
 
   //Reset alignment to defaults
diff --git a/apps/wohrm/bangle2-workout-HRM-screenshot.png b/apps/wohrm/bangle2-workout-HRM-screenshot.png
new file mode 100644
index 000000000..b75c1b12c
Binary files /dev/null and b/apps/wohrm/bangle2-workout-HRM-screenshot.png differ
diff --git a/apps/wohrm/metadata.json b/apps/wohrm/metadata.json
index b2b89336c..a5411c113 100644
--- a/apps/wohrm/metadata.json
+++ b/apps/wohrm/metadata.json
@@ -1,11 +1,11 @@
 {
   "id": "wohrm",
   "name": "Workout HRM",
-  "version": "0.09",
+  "version": "0.10",
   "description": "Workout heart rate monitor notifies you with a buzz if your heart rate goes above or below the set limits.",
   "icon": "app.png",
   "type": "app",
-  "tags": "hrm,workout",
+  "tags": "hrm,workout,health",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
@@ -14,5 +14,6 @@
     {"name":"wohrm.app.js","url":"app.js"},
     {"name":"wohrm.settings.js","url":"settings.js"},
     {"name":"wohrm.img","url":"app-icon.js","evaluate":true}
-  ]
+  ],
+  "data":[{"name":"wohrm.setting.json"}]
 }
diff --git a/apps/wrkmem/ChangeLog b/apps/wrkmem/ChangeLog
new file mode 100644
index 000000000..0684d10ee
--- /dev/null
+++ b/apps/wrkmem/ChangeLog
@@ -0,0 +1,2 @@
+1.00: Implement Working Memory Helper app
+1.01: Fix issue with rendering in 2v18
\ No newline at end of file
diff --git a/apps/wrkmem/README.md b/apps/wrkmem/README.md
new file mode 100644
index 000000000..bad3914c9
--- /dev/null
+++ b/apps/wrkmem/README.md
@@ -0,0 +1,60 @@
+# Working Memory Helper
+Human brains keep track of what they are doing in a conceptual space known as "working memory". Older adults and people
+of all ages with ADHD often struggle to maintain information in their working memories, causing them to forget what
+they were doing only moments after deciding to do it. One excellent way to combat this symptom is to externalize your
+working memory.
+
+This app doesn't completely externalize and replace working memory, but it does act as a prosthesis for the task
+management aspect of working memory. The workflow looks something like this:
+
+1. Decide to do something. (If you can't get this far on your own, this app is not gonna help.)
+2. Immediately enter a brief prompt in the app as a "task". For example, if you were going to take out the trash, 
+you might write "Trash". If you were going to take your car to the mechanic, you might write "car", or "mechanic". It 
+doesn't have to remind you what you were doing a week from now, only a minute or so, so it can be very simple / brief.
+3. Thirty seconds after you enter the task into the app, your device will vibrate and ask you if you are on task, or if 
+you got distracted.
+   1. If you are on task, hit "On task" and the app will wait a little longer before reminding you again.
+   2. If you got distracted, hit "distracted" and the app will remind you a little sooner next time.
+4. Continue getting reminders from your watch at various intervals until you complete the task, then tell the app the 
+task is complete. Repeat this process for every single thing you do until you die, basically.
+
+![screenshot](screenshot.png) ![screenshot](screenshot2.png) ![screenshot](screenshot3.png) ![screenshot](screenshot4.png)
+![screenshot](screenshot5.png) ![screenshot](screenshot6.png) 
+
+## Requirements
+You must have some kind of keyboard library available in order to enter task descriptions on your device. This app is 
+only supported on BangleJS2
+
+## Styling
+This app attempts to match whatever theme your Bangle watch is using. You can also modify whether individual
+words are wrapped and whether outlines are drawn on text.
+
+## Task settings
+You can edit the settings of any individual task. You can rename the task, restart (un-complete) the task, or change
+some of the reminder cadence settings. As far as cadence, there are a couple that warrant explanation:
+
+### Interval
+This is the base reminder interval for your task. If it is 30, your first reminder will be after 30 seconds.
+
+### Incremental Backoff
+Incremental backoff is a strategy for timing the reminder notifications you get based on how well you stay on task.
+Each time you affirm that you are "on task", incremental backoff means it will wait longer before reminding you again.
+Similarly each time you affirm that you are "distracted" the incremental backoff will wait less time before reminding 
+you again. The exact intervals are multiples of the base interval. For a task with a base interval of 30 seconds, the 
+second reminder would be after 60 seconds. The third after 120 seconds, etc.  Then if you got distracted it would go
+back to 60, then 30, then 15. Typically the interval will never go below 1/2 of your base interval.
+
+If you disable Incremental Backoff, you will be reminded once every base interval no matter what you do. This can be
+handy if you are having trouble staying on task when the intervals get too long with incremental backoff.
+
+## Controls
+A large focus of this app was making clear affordances for the user interface. Anything that can be pressed should look
+like a button, however you may notice some small arrows and text on the sides / top / bottom of the screen  in some
+cases. These hints are there to tell you that you can swipe across the screen to perform additional actions.
+Swipe your finger anywhere on the screen in the direction the arrow is pointing to use the listed function.
+
+## Known issues
+The clock is not super-duper accurate because it only updates when the screen refreshes (which can be 30 seconds or 5 
+minutes apart). I put it on there, though, because it is more useful to be there and lagging by 30+ seconds than to be 
+not there at all. I plan to fix this problem eventually but it's secondary to the main functions of the app at the 
+moment.
\ No newline at end of file
diff --git a/apps/wrkmem/app-icon.js b/apps/wrkmem/app-icon.js
new file mode 100644
index 000000000..edc5d96e7
--- /dev/null
+++ b/apps/wrkmem/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgYJGgVJkmQDZt/////wRfgVP8g1OiQRByQRNyQRCoAMHgP8wEAk5GBAAPJgET/IREh//yVJCAYABkmf/8gCIc///yNIQAD/gCB8ARFAAQmBkmTA4YREGoIvCJQIABHYY1EhIHB/DFDCgItB/IREgM//x3Byg2BiUAggRHLINAgsvFAOkC4JrGCIKtBmZCC/2IR4IRFLILRBCIf/6MAgf/8gREWYUz/J8CCIMAv4REAoIRBg1CpMmv/6GQNPDoQXGHAMA54RCF4Y7HAAOvCIZTCCIRfECIp3BCLpHDCJcJNYJ9CCJdSpaPDCJUDe4LFCCJ2odIIRN9USeogRK9C/DCLDFDCIzFEdIoRHfYwFDsmESodPCIgXFqVECId/CIpNEGohTFL4WSCI8T/8kCIvyVoIRFz7jFgE//1ICIsE//5CAkAg4IBDQJrCgLbB5ARFDQI+BwEJCgNJfwIsBAAsfCQOSpMkyYFB+QQGgECv4MBAAf8YQYAFhIRFXggAGk4QD5J6FAAxHCySVBAHQ="))
\ No newline at end of file
diff --git a/apps/wrkmem/app.js b/apps/wrkmem/app.js
new file mode 100644
index 000000000..3f283ca8a
--- /dev/null
+++ b/apps/wrkmem/app.js
@@ -0,0 +1,698 @@
+const textInput = require("textinput");
+
+g.reset();
+g.clearRect(Bangle.appRect);
+E.showMessage("Loading ... ");
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+const localTaskFile = "wrkmem.json";
+const savedData     = {
+  tasks: [], keyboardAlpha: undefined, settings: {textOutlines: true, noWordBreaks: true}
+};
+
+Object.assign(savedData, require("Storage")
+.readJSON(localTaskFile, true) || {});
+
+let currentMenu;
+
+const allTasks = savedData.tasks;
+const SWIPE    = {
+  LEFT: 2, RIGHT: 0, UP: 3, DOWN: 1,
+}
+
+/**
+ * A management object that helps us keep track of all our task timeouts.
+ * @type {{queueResponseTimeout: nudgeManager.queueResponseTimeout, taskTimeout: null, queueNudge:
+ *   nudgeManager.queueNudge, interrupt: nudgeManager.interrupt, responseTimeout: null, activeTask: null}}
+ */
+const nudgeManager = {
+  activeTask             : null, taskTimeout: null, responseTimeout: null, interrupt: () => {
+    if (this.taskTimeout) clearTimeout(this.taskTimeout);
+    if (this.responseTimeout) clearTimeout(this.responseTimeout);
+    this.activeTask = null;
+  }, queueNudge          : (task, nudgeFn) => {
+    if (this.responseTimeout) clearTimeout(this.responseTimeout);
+    if (this.taskTimeout) clearTimeout(this.taskTimeout);
+    this.activeTask    = task;
+    const backoffIndex = task.useBackoff ? task.backoffIndex : 1;
+    const time         = task.incrementalBackoffSet[backoffIndex] * task.interval * 1000;
+    this.taskTimeout   = setTimeout(nudgeFn, time);
+  }, queueResponseTimeout: (defaultFn) => {
+    // This timeout shouldn't be set if we've queued a response timeout, but we clear it anyway.
+    if (this.taskTimeout) clearTimeout(this.taskTimeout);
+    this.responseTimeout = setTimeout(defaultFn, 15000);
+  },
+}
+
+let keyboardAlpha, keyboardAlphaShift;
+
+if (textInput.generateKeyboard) {
+  //const charSet = textInput.createCharSet("ABCDEFGHIJKLMNOPQRSTUVWXYZ", ["spc", "ok", "del"]);
+  keyboardAlpha = textInput.generateKeyboard([
+    ["a", "b", "c", "j", "k", "l", "s", "t", "u"],
+    ["d", "e", "f", "m", "n", "o", "v", "w", "x"],
+    ["g", "h", "i", "p", "q", "r", "y", "z"],
+    "spc",
+    "ok",
+    "del"
+  ]);
+  keyboardAlphaShift = textInput.generateKeyboard([
+    ["A", "B", "C", "J", "K", "L", "S", "T", "U"],
+    ["D", "E", "F", "M", "N", "O", "V", "W", "X"],
+    ["G", "H", "I", "P", "Q", "R", "Y", "Z"],
+    "spc",
+    "cncl",
+    "del"
+  ])
+}
+
+/**
+ * Save the data in 'savedData' to flash memory.
+ */
+function save() {
+  require("Storage")
+  .writeJSON("wrkmem.json", savedData);
+}
+
+/**
+ * This function is a workaround wrapper for a menu navigation bug. After 'onchange' the menu re-renders itself
+ * so to avoid graphical glitches we postpone whatever funciton we actually want by 5ms.
+ * @param fn The function you actually want to call
+ * @returns {function(): any} The same function wrapped in a setTimeout with a 5ms delay.
+ */
+function st5(fn) {
+  return () => setTimeout(fn, 5);
+}
+
+/**
+ * Given a position and set of dimensions, create a button object that represents a rectangle in space containing text
+ * and some associated functionality.
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @param text
+ * @param callback
+ * @returns {{padding: number, r: number, getDrawable: (function(*, *, *, *, *): {r, x, y, y2, x2}), w, x, h, y, text:
+ *   string, onTouch: ((function(*, *): (*|undefined))|*)}}
+ */
+function createButton(x, y, w, h, text, callback) {
+  text              = text || "";
+  const x2          = x + w;
+  const y2          = y + h;
+  const r           = 8;
+  const padding     = 2;
+  const getDrawable = (xOff, yOff, wOff, hOff, rOff) => {
+    xOff = xOff || 0;
+    yOff = yOff || 0;
+    wOff = wOff || 0;
+    hOff = hOff || 0;
+    rOff = rOff || 0;
+    return {x: x + xOff, y: y + yOff, x2: x2 + wOff, y2: y2 + hOff, r: r + rOff};
+  };
+  let onTouch;
+  if (callback) {
+    onTouch = (button, xy) => {
+      const isTouched = x < xy.x && x2 > xy.x && y < xy.y && y2 > xy.y;
+      if (isTouched) {
+        Bangle.buzz(30, 1);
+        return callback();
+      }
+    };
+  }
+  return {
+    x, y, w, h, r, text, getDrawable, padding, onTouch
+  };
+}
+
+/**
+ * Given a button object, draw that button onto the screen. This includes the background, borders, effects, and text.
+ * @param button
+ */
+function drawButton(button) {
+  const textMaxWidth = button.w - 2 * button.padding;
+  let textOutlineCol = g.theme.bgH;
+  let textCol        = g.theme.fg;
+  if (button.onTouch) {
+    g.setColor(g.theme.fg)
+     .fillRect(button.getDrawable());
+    g.setColor(g.theme.bg)
+     .fillRect(button.getDrawable(2, 1, -1, -1));
+    g.setColor(g.theme.bg2)
+     .fillRect(button.getDrawable(3, 3, -3, -3));
+    textOutlineCol = g.theme.bg;
+    textCol        = g.theme.fg;
+  }
+  const font = getBestFontForButton(button);
+  // Wrap sometimes adds a line break at the beginning if your string is very small.
+  // So we filter out any elements that are empty.
+  const wrapText = g.setFont(font)
+                    .wrapString(button.text, textMaxWidth)
+                    .filter(t => !!t)
+                    .join("\n");
+  if (savedData.settings.textOutlines) {
+    g.setFontAlign(0, 0)
+     .setColor(textOutlineCol)
+     .drawString(wrapText, button.x + button.w / 2 + 1, button.y + button.h / 2 - 1, false);
+    g.setFontAlign(0, 0)
+     .setColor(textOutlineCol)
+     .drawString(wrapText, button.x + button.w / 2 - 1, button.y + button.h / 2 - 1, false);
+    g.setFontAlign(0, 0)
+     .setColor(textOutlineCol)
+     .drawString(wrapText, button.x + button.w / 2 - 1, button.y + button.h / 2 + 1, false);
+    g.setFontAlign(0, 0)
+     .setColor(textOutlineCol)
+     .drawString(wrapText, button.x + button.w / 2 + 1, button.y + button.h / 2 + 1, false);
+  }
+  g.setFontAlign(0, 0)
+   .setColor(textCol)
+   .drawString(wrapText, button.x + button.w / 2, button.y + button.h / 2, false);
+  g.reset();
+}
+
+/**
+ * Given a button object, determine what font would be best to display the button's text without breaching the
+ * dimensions of the button itself. Not perfectly at the moment, but serviceably.
+ * @param button
+ * @returns {string}
+ */
+function getBestFontForButton(button) {
+  const allowedFonts  = ["12x20", "6x15", "6x8", "4x6"];
+  let stringMet       = g.setFont("Vector:100")
+                         .stringMetrics(button.text);
+  let stringArea      = stringMet.width * stringMet.height;
+  const sampleMetric  = g.setFont("Vector:100")
+                         .stringMetrics("D");
+  const vectorRatio   = sampleMetric.height / sampleMetric.width;
+  // Effective height helps us handle tall skinny buttons, since text is usually horizontal.
+  let effectiveHeight = Math.min(button.h, button.w);
+  if (!button.text.includes(" ") && savedData.settings.noWordBreaks) {
+    effectiveHeight = effectiveHeight / vectorRatio
+  }
+  const buttonArea = button.w * effectiveHeight;
+  const ratio      = stringArea / buttonArea;
+  const vecSize    = Math.floor(100 / ratio);
+  if (vecSize > 20) {
+    return "Vector:" + vecSize;
+  }
+  let i;
+  for (i = 0; i < allowedFonts.length - 1; i++) {
+    stringMet  = g.setFont(allowedFonts[i])
+                  .stringMetrics(button.text);
+    stringArea = Math.max(stringMet.width, button.w) * stringMet.height;
+    if (stringArea < buttonArea * 0.8) {
+      break;
+    }
+  }
+  return allowedFonts[i];
+}
+
+/**
+ * Given a rotation (0-3) and a label, create an object representing a swipe hint, complete with draw instructions,
+ * a handler, and the specified rotation.
+ * @param rot A number, preferably from the SWIPE enum. 0 = 0 degrees. 1 = 90 degrees. 2 = 180 degrees, etc.
+ * @param text The text to display on the swipe hint
+ * @param callback The function to be called when the corresponding direction is swiped.
+ * @returns {{rot, onSwipe: ((function(*, *): (*|undefined))|*), draw: draw}}
+ */
+function createSwipeControl(rot, text, callback) {
+  let draw     = () => {};
+  let appRect  = Bangle.appRect;
+  let isSwiped = () => {};
+  switch (rot) {
+    case 0:
+      draw     = () => drawSwipeHint(appRect.x + appRect.w / 2, appRect.y + appRect.h - 6, 0, text);
+      isSwiped = (LR, UD) => LR === 1;
+      break;
+    case 1:
+    case -3:
+      draw     = () => drawSwipeHint(appRect.x + 6, appRect.y + appRect.h / 2, 1, text);
+      isSwiped = (LR, UD) => UD === 1;
+      break;
+    case 2:
+    case -2:
+      draw     = () => drawSwipeHint(appRect.x + appRect.w / 2, appRect.y + appRect.h - 16, 0, text, true);
+      isSwiped = (LR, UD) => LR === -1;
+      break;
+    case 3:
+    case -1:
+      draw     = () => drawSwipeHint(appRect.x + appRect.w - 6, appRect.y + appRect.h / 2, 3, text);
+      isSwiped = (LR, UD) => UD === -1;
+      break;
+  }
+  const onSwipe = (LR, UD) => {
+    if (isSwiped(LR, UD)) {
+      return callback();
+    }
+  }
+  return {draw, onSwipe, rot};
+}
+
+/**
+ * Given a position, rotation, text, and mirror option, draw a swipe hint on the screen.
+ * @param x The x position of the center of the swipe hint.
+ * @param y The y position of the center of the swipe hint.
+ * @param rot The SWIPE rotation enumerated value (0-3) indicating the direction.
+ * @param text The text to display in the hint.
+ * @param flip Whether or not to flip the direction of the swipe hint (left to right, up to down, etc).
+ */
+function drawSwipeHint(x, y, rot, text, flip) {
+  const tw   = g.setFont("6x8")
+                .stringWidth(text);
+  const w    = tw + 41;
+  const gRot = Graphics.createArrayBuffer(w, 8, 1, {msb: true});
+  gRot.setFont("6x8")
+      .setFontAlign(0, -1)
+      .drawString(text, w / 2, 1);
+  gRot.drawLine(0, 4, (w - tw) / 2 - 4, 4);
+  gRot.drawLine((w + tw + 4) / 2, 4, w, 4);
+  if (flip) {
+    gRot.drawLine(0, 4, 4, 1);
+    gRot.drawLine(0, 4, 4, 7);
+  } else {
+    gRot.drawLine(w, 4, w - 4, 1);
+    gRot.drawLine(w, 4, w - 4, 7);
+  }
+  g.setColor(g.theme.fg)
+   .drawImage(gRot, x, y, {rotate: Math.PI / 2 * rot});
+}
+
+/**
+ * Given a set of options, create a drawable / UI-able menu object that attempts to lay out buttons and swipe hints in
+ * a given space. Returns an object with both setUI and render functions.
+ * @param options
+ * @returns {{setUI: (function(): void), buttons: *[], render: render}}
+ */
+function createMenu(options) {
+  let width           = options.width || Bangle.appRect.w;
+  let height          = options.height || Bangle.appRect.h;
+  let offsetY         = Bangle.appRect.y;
+  const spaceBetween  = options.spaceBetween || 5;
+  const spaceAround   = options.spaceAround || 5;
+  const titleFont     = options.titleFont || "12x20";
+  let marginTop       = 0;
+  let marginBottom    = 0;
+  let marginLeft      = 0;
+  let marginRight     = 0;
+  const swipeControls = options.swipeControls || [];
+  // Add some margin space to fit swipe control hints if they exist.
+  swipeControls.forEach(control => {
+    if (control.rot === 0) marginBottom += 8;
+    if (control.rot === 1) marginLeft += 8;
+    if (control.rot === 2) marginBottom += 8;
+    if (control.rot === 3) marginRight += 8;
+  });
+  // Add top margin to fit the title.
+  if (options.title) {
+    const mets = g.setFont(titleFont)
+                  .stringMetrics(options.title);
+    marginTop += mets.height;
+  }
+  height              = height - marginTop - marginBottom;
+  width               = width - marginLeft - marginRight;
+  const isHorizontal  = !!options.isHorizontal;
+  const numGridSpaces = options.items.reduce((acc, item) => (acc + (item.size || 1)), 0);
+  const shortDim      = isHorizontal ? width : height;
+  const length        = ((shortDim - spaceBetween) / numGridSpaces) - spaceAround;
+  const buttons       = [];
+  // currentGrid tracks what grid square we are covering. Any item may cover multiple grid squares.
+  let currentGrid     = 0;
+  options.items.forEach((item) => {
+    let x, y, w, h;
+    const mySize   = item.size || 1;
+    // myLength represents the shorter of the two dimensions of the button (depending on menu orientation, w / h).
+    const myLength = length * mySize + spaceBetween * (mySize - 1);
+    if (isHorizontal) {
+      x = spaceAround + currentGrid * (length + spaceBetween) + marginLeft;
+      y = spaceAround + marginTop + offsetY;
+      w = myLength;
+      h = height - 2 * spaceAround;
+    } else {
+      x = spaceAround + marginLeft;
+      y = spaceAround + currentGrid * (length + spaceBetween) + marginTop + offsetY;
+      w = width - 2 * spaceAround;
+      h = myLength;
+    }
+    currentGrid += item.size || 1;
+    buttons.push(createButton(x, y, w, h, item.text, item.callback));
+  })
+
+  function render() {
+    buttons.forEach(drawButton);
+    if (options.title) {
+      g.setFont(titleFont)
+       .setFontAlign(0, -1)
+       .drawString(options.title, width / 2 + marginLeft, offsetY);
+    }
+    swipeControls.forEach(control => control.draw());
+  }
+
+  const touchFunc = (button, xy) => buttons.forEach(b => b.onTouch && b.onTouch(button, xy));
+  const swipeFunc = (LR, UD) => swipeControls.forEach(s => s.onSwipe(LR, UD));
+  const btnFunc   = options.backFn;
+  return {
+    buttons, render, setUI: () => Bangle.setUI({mode: "custom", touch: touchFunc, swipe: swipeFunc, btn: btnFunc})
+  };
+}
+
+/**
+ * Given a menu object (a custom menu object created in this app, not an Espruino menu object) draw the menu to the
+ * screen and set the UI framework to the one appropriate to that menu.
+ * @param menu
+ */
+function setMenu(menu) {
+  save();
+  g.reset();
+  g.clearRect(Bangle.appRect);
+  currentMenu = menu;
+  menu.render();
+  menu.setUI();
+  Bangle.drawWidgets();
+}
+
+/**
+ * Create a new task with a given set of initial text. The user will be prompted with a keyboard to title the task.
+ * Once the task is created, begin that task.
+ * @param initialText
+ */
+function newTask(initialText) {
+  nudgeManager.interrupt();
+  initialText = initialText || "";
+  textInput.input({text: initialText, keyboardMain: keyboardAlpha, keyboardShift: keyboardAlphaShift})
+           .then(text => {
+             if (!text) {
+               setMenu(mainMenu);
+             }
+             const task = createTask(text)
+             allTasks.unshift(task);
+             save();
+             startTask(task);
+           })
+}
+
+/**
+ * Begin the indicated task, taking the user to the corresponding menu / display screen and starting all relevant timers
+ * @param task
+ */
+function startTask(task) {
+  nudgeManager.queueNudge(task, () => nudge(task));
+  g.clear();
+  const onPressBack = () => {
+    nudgeManager.interrupt();
+    setMenu(mainMenu)
+  }
+  setMenu(getTaskMenu(task, onPressBack));
+}
+
+/**
+ * Remind the user of an ongoing task, prompting them to affirm that they are on task, distracted, or, after a set time
+ * period, unresponsive.
+ * @param task
+ */
+function nudge(task) {
+  Bangle.buzz(250, 1)
+        .then(() => {
+          Bangle.setLocked(false);
+          Bangle.setLCDPower(true);
+        });
+  const nudgeMenu = createMenu({
+    title          : "Are you on task?", titleFont: "6x8", items: [
+      {text: task.text, size: 1}, {text: "On Task", size: 1, callback: () => affirmOnTask(task)}, {
+        text: "Distracted", size: 1, callback: () => affirmDistracted(task)
+      }
+    ], isHorizontal: false
+  });
+  setMenu(nudgeMenu);
+  nudgeManager.queueResponseTimeout(() => concludeUnresponsive(task));
+}
+
+/**
+ * Invoked when the user affirms that they are on task, increasing the affirmation count on the given task and
+ * advancing the incremental backoff counter. Congratulates the user for the response.
+ * @param task
+ */
+function affirmOnTask(task) {
+  task.affirmCount++;
+  task.backoffIndex = Math.min(task.incrementalBackoffSet.length - 1, task.backoffIndex + 1);
+  showTempMessage("Great job!", "On Task!", () => startTask(task));
+}
+
+/**
+ * Invoked when the user affirms that they were distracted, increasing the distraction count and lowering the
+ * incremental backoff counter. Encourages the user to keep trying.
+ * @param task
+ */
+function affirmDistracted(task) {
+  task.distractCount++;
+  task.backoffIndex = Math.max(0, task.backoffIndex - 1);
+  showTempMessage("Don't worry! You've got this!", "Distracted!", () => startTask(task));
+}
+
+/**
+ * Invoked when the user has not responded to an "on task?" prompt. Increments the unresponsive count and decrements
+ * the incremental backoff counter.
+ * @param task
+ */
+function concludeUnresponsive(task) {
+  Bangle.buzz(250, 1)
+        .then(() => Bangle.setLCDPower(true));
+  task.unresponsiveCount++;
+  task.backoffIndex = Math.max(0, task.backoffIndex - 1);
+  nudgeManager.queueResponseTimeout(() => concludeUnresponsive(task))
+}
+
+/**
+ * Shows the user a message for a short period of time, then calls the "then function"
+ * @param text
+ * @param title
+ * @param thenFn
+ */
+function showTempMessage(text, title, thenFn) {
+  E.showMessage(text, {title});
+  setTimeout(() => {
+    thenFn();
+  }, 1500);
+}
+
+/**
+ * Mark the task as completed and then push it to the bottom of the list.
+ * @param task
+ */
+function completeTask(task) {
+  nudgeManager.interrupt();
+  task.complete = true;
+  removeTask(task, allTasks);
+  allTasks.push(task);
+  save();
+  setMenu(getTaskMenu(task));
+}
+
+/**
+ * Mark the task as not completed and then push it to the top of the list.
+ * @param task
+ */
+function restartTask(task) {
+  task.complete = false;
+  removeTask(task, allTasks);
+  allTasks.unshift(task);
+  save();
+  startTask(task);
+}
+
+/**
+ * Remove the task from the given list.
+ * @param task
+ * @param list
+ */
+function removeTask(task, list) {
+  const taskIndex = list.findIndex((item) => item === task);
+  if (taskIndex !== -1) {
+    list.splice(taskIndex, 1);
+  }
+}
+
+/**
+ * Creates a task object given a set of text.
+ * @param text
+ * @returns {{distractCount: number, backoffIndex: number, incrementalBackoffSet: number[], affirmCount: number,
+ *   unresponsiveCount: number, interval: number, text, complete: boolean, useBackoff: boolean}}
+ */
+function createTask(text) {
+  const incrementalBackoffSet = [0.5, 1, 2, 4, 8, 16, 32];
+  return {
+    text,
+    affirmCount      : 0,
+    distractCount    : 0,
+    unresponsiveCount: 0,
+    interval         : 30,
+    backoffIndex     : 1,
+    incrementalBackoffSet,
+    complete         : false,
+    useBackoff       : true
+  };
+}
+
+/**
+ * Shows a menu for editing the various properties of a given task. Also exposes the functions to start, restart, or
+ * delete the given task.
+ * @param task
+ * @param backFn
+ */
+function editTask(task, backFn) {
+  nudgeManager.interrupt();
+  let editMenu = [];
+  if (task.complete) {
+    editMenu.push({title: "Start Task", onchange: st5(() => restartTask(task))});
+    editMenu.push({title: "View Task", onchange: st5(() => startTask(task))});
+  } else {
+    editMenu.push({title: "Resume Task", onchange: st5(() => startTask(task))});
+  }
+  editMenu.push({title: "Rename", onchange: st5(() => renameTask(task, () => editTask(task, backFn)))});
+  editMenu.push({title: "Interval", value: task.interval, min: 10, step: 10, onchange: v => task.interval = v});
+  editMenu.push({title: "Incremental Backoff", value: !!task.useBackoff, onchange: v => task.useBackoff = v});
+  editMenu.push({title: "DELETE", onchange: st5(() => deleteTask(task, () => editTask(task, backFn), backFn))});
+  editMenu.push({title: "Statistics:"});
+  editMenu.push({title: "On Task: " + task.affirmCount});
+  editMenu.push({title: "Distracted: " + task.distractCount});
+  editMenu.push({title: "Unresponsive: " + task.unresponsiveCount});
+  editMenu[""] = {title: task.text, back: backFn};
+  E.showMenu(editMenu);
+}
+
+/**
+ * Remove the given task from the task list permanently if the user hits "yes" on the confirmation dialogue.
+ * @param task The task to delete.
+ * @param backFn The function to be called when the user cancels.
+ * @param deleteBackFn The function to be called when the user confirms.
+ */
+function deleteTask(task, backFn, deleteBackFn) {
+  E.showPrompt("Delete " + task.text + "?")
+   .then(shouldDelete => {
+     if (shouldDelete) {
+       removeTask(task, allTasks);
+       deleteBackFn();
+     } else {
+       backFn();
+     }
+   });
+}
+
+/**
+ * Change the text of the given task, and then execute the given function.
+ * @param task
+ * @param backFn The function to execute after the renaming. Typically to show some previous menu.
+ * @returns {*}
+ */
+function renameTask(task, backFn) {
+  return textInput.input({text: task.text, keyboardMain: keyboardAlpha, keyboardShift: keyboardAlphaShift})
+                  .then(text => {
+                    task.text = text
+                    save();
+                    backFn();
+                  })
+}
+
+/**
+ * Get the "menu" that displays a given active task. This may not seem like a menu to users, but it includes swipe
+ * controls and can sometimes include pressable buttons as well.
+ * @param task
+ * @param backFn
+ * @returns {{setUI: (function(): void), buttons: *[], render: render}}
+ */
+function getTaskMenu(task, backFn) {
+  const d                 = new Date();
+  const h                 = d.getHours(), m = d.getMinutes();
+  const time              = h + ":" + m.toString()
+                                       .padStart(2, 0);
+  const taskSwipeControls = [
+    createSwipeControl(SWIPE.LEFT, "Menu", () => {
+      setMenu(mainMenu);
+      nudgeManager.interrupt();
+    }), createSwipeControl(SWIPE.RIGHT, "New Task", newTask),
+  ];
+  const items             = [];
+  if (task.complete) {
+    taskSwipeControls.push(createSwipeControl(SWIPE.UP, "Restart", () => restartTask(task)));
+    taskSwipeControls.push(createSwipeControl(SWIPE.DOWN,
+      "Task List",
+      () => showTaskList(() => true, () => startTask(task))));
+    items.push({text: task.text + " completed!", size: 1});
+    const nextTask = getNextTask(task, allTasks);
+    if (nextTask) {
+      items.push({text: "next task: " + nextTask.text, size: 2, callback: () => startTask(nextTask)})
+    } else {
+      items.push({
+        text: "Affirmed: " + task.affirmCount + "\nDistracted: " + task.distractCount + "\nUnresponsive: " + task.unresponsiveCount,
+        size: 3
+      });
+    }
+  } else {
+    items.push({text: task.text, size: 2})
+    taskSwipeControls.push(createSwipeControl(SWIPE.UP, "Complete", () => completeTask(task)))
+    taskSwipeControls.push(createSwipeControl(SWIPE.DOWN, "Edit Task", () => editTask(task, () => startTask(task))))
+  }
+  return createMenu({
+    items, spaceAround: 0, spaceBetween: 0, swipeControls: taskSwipeControls, title: time, backFn
+  });
+}
+
+/**
+ * Given a task, determine the next incomplete task in the task list and return it. Return undefined if there are no
+ * other incomplete tasks.
+ * @param task
+ * @param list
+ * @returns {undefined|*}
+ */
+function getNextTask(task, list) {
+  const activeList       = list.filter(x => (!x.complete || x === task));
+  const thisTaskPosition = activeList.findIndex(t => t === task);
+  let nextTask           = activeList[0];
+  if (thisTaskPosition !== -1 && activeList[thisTaskPosition + 1]) {
+    nextTask = activeList[thisTaskPosition + 1];
+  }
+  return nextTask === task ? undefined : nextTask;
+}
+
+/**
+ * Show the list of tasks in a menu, filtered by the filterFn. Selecting a task in this menu will bring you to that
+ * task's edit menu.
+ * @param filterFn
+ * @param backFn
+ */
+function showTaskList(filterFn, backFn) {
+  let taskMenu = [];
+  const list   = allTasks.filter(filterFn);
+  taskMenu     = taskMenu.concat(list.map(task => {
+    return {
+      // Workaround - navigation has phantom buttons rendered with E.showMenu unless you delay slightly.
+      title: task.text, onchange: st5(() => editTask(task, () => showTaskList(filterFn, backFn)))
+    }
+  }))
+  taskMenu[""] = {title: "Tasks", back: backFn};
+  E.showMenu(taskMenu);
+}
+
+/**
+ * Show the menu for editing settings and tasks.
+ * @param backFn
+ */
+function showSettingsMenu(backFn) {
+  const settingsMenu = {
+    ""               : {title: "Manage", back: backFn},
+    "Pending Tasks"  : () => showTaskList(task => !task.complete, () => showSettingsMenu(backFn)),
+    "Completed Tasks": () => showTaskList(task => task.complete, () => showSettingsMenu(backFn)),
+    "Text Outlines"  : {value: savedData.settings.textOutlines, onchange: v => savedData.settings.textOutlines = v},
+    "No Word Breaks" : {value: savedData.settings.noWordBreaks, onchange: v => savedData.settings.noWordBreaks = v}
+  }
+  E.showMenu(settingsMenu);
+}
+const mainMenu = createMenu({
+  title          : "Working Memory", items: [
+    {text: "New Task", size: 2, callback: () => newTask("")}, {
+      text: "Manage", size: 1, callback: () => showSettingsMenu(() => setMenu(mainMenu))
+    }
+  ], isHorizontal: false
+});
+
+setMenu(mainMenu);
diff --git a/apps/wrkmem/icon.png b/apps/wrkmem/icon.png
new file mode 100644
index 000000000..23e1df523
Binary files /dev/null and b/apps/wrkmem/icon.png differ
diff --git a/apps/wrkmem/metadata.json b/apps/wrkmem/metadata.json
new file mode 100644
index 000000000..e8860f2c6
--- /dev/null
+++ b/apps/wrkmem/metadata.json
@@ -0,0 +1,27 @@
+{
+  "id"            : "wrkmem",
+  "name"          : "Working Memory Helper",
+  "shortName"     : "Work Mem",
+  "version"       : "1.01",
+  "description"   : "Externalize your working memory to help stay on task.",
+  "dependencies"  : {"textinput": "type"},
+  "icon"          : "icon.png",
+  "type"          : "app",
+  "tags"          : "tool",
+  "supports"      : ["BANGLEJS2"],
+  "screenshots"   : [
+    {"url": "screenshot.png"},
+    {"url": "screenshot2.png"},
+    {"url": "screenshot3.png"},
+    {"url": "screenshot4.png"},
+    {"url": "screenshot5.png"},
+    {"url": "screenshot6.png"}
+  ],
+  "readme"        : "README.md",
+  "allow_emulator": false,
+  "storage"       : [
+    {"name": "wrkmem.app.js", "url": "app.js"},
+    {"name": "wrkmem.img", "url": "app-icon.js", "evaluate": true}
+  ],
+  "data"          : [{"name": "wrkmem.json"}]
+}
\ No newline at end of file
diff --git a/apps/wrkmem/screenshot.png b/apps/wrkmem/screenshot.png
new file mode 100644
index 000000000..7145bc8a7
Binary files /dev/null and b/apps/wrkmem/screenshot.png differ
diff --git a/apps/wrkmem/screenshot2.png b/apps/wrkmem/screenshot2.png
new file mode 100644
index 000000000..3a61529e3
Binary files /dev/null and b/apps/wrkmem/screenshot2.png differ
diff --git a/apps/wrkmem/screenshot3.png b/apps/wrkmem/screenshot3.png
new file mode 100644
index 000000000..30776d332
Binary files /dev/null and b/apps/wrkmem/screenshot3.png differ
diff --git a/apps/wrkmem/screenshot4.png b/apps/wrkmem/screenshot4.png
new file mode 100644
index 000000000..582c2c92b
Binary files /dev/null and b/apps/wrkmem/screenshot4.png differ
diff --git a/apps/wrkmem/screenshot5.png b/apps/wrkmem/screenshot5.png
new file mode 100644
index 000000000..aa9165e38
Binary files /dev/null and b/apps/wrkmem/screenshot5.png differ
diff --git a/apps/wrkmem/screenshot6.png b/apps/wrkmem/screenshot6.png
new file mode 100644
index 000000000..fd3e1a36b
Binary files /dev/null and b/apps/wrkmem/screenshot6.png differ
diff --git a/apps/xxlmessage/ChangeLog b/apps/xxlmessage/ChangeLog
new file mode 100644
index 000000000..4c587db52
--- /dev/null
+++ b/apps/xxlmessage/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Display icon of the message origin's app
\ No newline at end of file
diff --git a/apps/xxlmessage/README.md b/apps/xxlmessage/README.md
new file mode 100644
index 000000000..40e62fdd2
--- /dev/null
+++ b/apps/xxlmessage/README.md
@@ -0,0 +1,13 @@
+# XXL Message app
+This app displays an incomming message with a very large
+font and scrolls the text. For people who can't read the
+menu font without glasses, this might be an alternative
+to the default messages UI app.
+
+When arrived, new messages are displayed instantly on the screen.
+When the message fully scrolled two times or
+if you touch the screen or press the button,
+the default clock is loaded.
+
+Nothing more, nothing less.
+
diff --git a/apps/xxlmessage/app-icon.js b/apps/xxlmessage/app-icon.js
new file mode 100644
index 000000000..ee6642f11
--- /dev/null
+++ b/apps/xxlmessage/app-icon.js
@@ -0,0 +1 @@
+﻿require("heatshrink").decompress(atob("mEwwcA/4A/AH4A/AH2SpMkAQ1/CI3+CI+fB4v5AQQRFk4JB84REBAXkCIgLFEAYsCIgo+BCIwLEC4oRHF4w7CCJAIRGQaDECLQIRLKB9QUKDFRdKB3GQYwAFBwpKFAAhEFAQokHAH4A/AH4A/ABA"))
\ No newline at end of file
diff --git a/apps/xxlmessage/app.js b/apps/xxlmessage/app.js
new file mode 100644
index 000000000..207221fc6
--- /dev/null
+++ b/apps/xxlmessage/app.js
@@ -0,0 +1,42 @@
+﻿
+
+if (require("Storage").read("messagegui")){ // "messagegui" module is installed
+    require("messages").openGUI();
+    console.log("Opened Messages UI");
+    Bangle.load("messagegui");
+}
+
+
+function stop() {
+    g.setBgColor(0, 1, 1);
+    g.clear();
+    g.reset();
+    load();
+}
+var txt = 'No Messages';
+try{
+    console.log("try delete messages");
+    var MESSAGES = require("messages").getMessages();
+    MESSAGES = [];
+    txt = 'Deleted all messages';
+    console.log("worked");
+}catch(e){}
+g.setBgColor('#ffff00');
+g.setColor('#000000');
+g.clear();
+
+g.setFont('6x8:3');
+g.setFontAlign(0, 0);
+g.setColor('#000000');
+g.drawString(g.wrapString(txt, g.getWidth()).join("\n"), g.getWidth()/2, g.getHeight()/2);
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+//E.showMessage(txt,{
+//    title:"XXL Messages",
+//    img:atob("FBQBAfgAf+Af/4P//D+fx/n+f5/v+f//n//5//+f//n////3//5/n+P//D//wf/4B/4AH4A=") // (i)
+//})
+
+setTimeout(stop, 4000);
+
diff --git a/apps/xxlmessage/app.png b/apps/xxlmessage/app.png
new file mode 100644
index 000000000..88dae4c66
Binary files /dev/null and b/apps/xxlmessage/app.png differ
diff --git a/apps/xxlmessage/boot.js b/apps/xxlmessage/boot.js
new file mode 100644
index 000000000..62053a0b9
--- /dev/null
+++ b/apps/xxlmessage/boot.js
@@ -0,0 +1 @@
+﻿Bangle.on("message", (type, msg) => require("xxlmessage.lib.js").listener(type, msg));
\ No newline at end of file
diff --git a/apps/xxlmessage/lib-unbuffered.js b/apps/xxlmessage/lib-unbuffered.js
new file mode 100644
index 000000000..68fb2a7a2
--- /dev/null
+++ b/apps/xxlmessage/lib-unbuffered.js
@@ -0,0 +1,133 @@
+// GB({"t":"notify","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"})
+var xxl = {
+// private:
+    msg: [],
+    drawTimeout: undefined,
+    xpos : 0,
+    loopCount : 0,
+    txt:'',
+    wtot:0,
+    img:undefined,
+    imgcol:'#ffffff',
+
+    setFont: function(){
+        g.setFont('6x8:5x9'); // TODO this is a bottleneck. How to prepare the font once?
+    },
+
+//public:
+    show: function(theMessage){
+        console.log("theMessage is:");
+        console.log(theMessage);
+        xxl.msg = theMessage;
+        // prepare string and metrics
+        xxl.txt = xxl.msg.src + ": " + xxl.msg.body;
+        xxl.setFont();
+        xxl.wtot = g.stringMetrics(xxl.txt).width;
+        xxl.xpos = 2 * g.getWidth();
+
+        // get icon
+        xxl.img = require("messageicons").getImage(xxl.msg);
+        xxl.imgcol = require("messageicons").getColor(xxl.msg, '#ffffff');
+
+        Bangle.loadWidgets();
+
+        Bangle.on('touch', function (b, xy) {
+            xxl.stop();
+        });
+        setWatch(xxl.stop, BTN1);
+        Bangle.buzz(500,1);
+
+        xxl.draw();
+    },
+
+//private:
+    // schedule a draw for 30 FPS
+    queueDraw: function() {
+        if (xxl.drawTimeout) { return; } // clearTimeout(xxl.drawTimeout); }
+            xxl.drawTimeout = setTimeout(function () {
+            xxl.drawTimeout = undefined;
+            xxl.draw();
+        }, 33 - (Date.now() % 33));
+    },
+
+
+    stop:function() {
+        console.log("stop");
+        if (xxl.drawTimeout) { clearTimeout(xxl.drawTimeout); }
+        xxl.drawTimeout = undefined;
+        g.reset();
+        g.setBgColor('#ffff00');
+        g.clear();
+
+        // Bangle.setLCDPower(0); // light off
+        // Bangle.setLocked(true); // disable touch
+
+        setTimeout(load, 100);
+    },
+
+    draw: function() {
+        wh = 24; // widgets height
+        var gw = g.getWidth();
+        var h = (g.getHeight() - wh)/2; // height of drawing area per stripe
+
+        Bangle.setLCDPower(1); // light on
+        Bangle.setLocked(false); // keep the touch input active
+        g.setBgColor('#000000');
+        g.clear();
+
+        if (xxl.img) { // 24x24
+            g.setColor(xxl.imgcol);
+            g.drawImage(xxl.img
+                        , gw/2, wh+h // center point
+                        ,{rotate:0,scale:2}
+                       );
+        }
+
+        xxl.setFont();
+        g.setFontAlign(-1, -1);
+
+        // draw both lines
+        g.setBgColor('#000000');
+        g.setColor('#ffffff');
+        g.drawString(xxl.txt, xxl.xpos, wh);
+        g.drawString(xxl.txt, xxl.xpos - gw - 32, h + wh);
+
+        g.reset();
+        // widget redraw
+        Bangle.drawWidgets();
+
+        // scroll
+        xxl.xpos -= 25;
+        if (xxl.xpos < -xxl.wtot - gw * 2) {
+            ++xxl.loopCount;
+            if (xxl.loopCount > 2) {
+                xxl.stop();
+                return;
+            }
+            xxl.xpos = 3 * gw;
+        }
+        // loop drawing
+        xxl.queueDraw();
+    }
+};
+
+
+// for IDE
+// var exports={};
+
+exports.listener = function (type, msg) {
+    // msg = {t:"add",id:int, src,title,subject,body,sender,tel, important:bool, new:bool}
+    if (!msg) return;
+    if (type === 'text' && msg.t !== 'remove') {
+        msg.handled = true; // don't do anything else with the message
+        xxl.show(msg);
+    }
+};
+
+// debug
+// Bangle.on("message", (type, msg) => exports.listener(type, msg));
+
+
+
+
+
diff --git a/apps/xxlmessage/lib.js b/apps/xxlmessage/lib.js
new file mode 100644
index 000000000..9aa85462d
--- /dev/null
+++ b/apps/xxlmessage/lib.js
@@ -0,0 +1,194 @@
+// GB({t:"notify",id:1680248072,src:"SMS Messenger",title:"Fabia",body:"Nein"})
+// msg = {"t":"add","id":1680248072,"src":"SMS Messenger","title":"Fabia","body":"Nein","new":true,"handled":true}
+var xxl = {
+// private:
+    msg: [],
+    drawTimeout: undefined,
+    xpos : 0,
+    loopCount : 0,
+    txt:'',
+    wtot:0,
+    img:undefined,
+    imgcol:'#ffffff',
+
+    // gfx buffer
+    bufimg:undefined,
+    bufpal4color:undefined,
+    buffnt:'6x15', // font to use. Built-in: 4x6, 6x8,12x20,6x15,Vector
+    bufw:0, // width of buffer for all lines
+    bufh:0, // height of buffer
+    buflin:0, // number of lines to print
+    bufscale:0, // scale factor for buffer to screen
+
+// public:
+    show: function(theMessage){
+        // console.log("theMessage is:");
+        // console.log(theMessage);
+        xxl.msg = theMessage;
+
+        // get icon
+        try{
+            xxl.img = require("messageicons").getImage(xxl.msg);
+            xxl.imgcol = (require("messageicons").getColor(xxl.msg, '#ffffff')||'#00ffff');
+        }catch(e){}
+
+        Bangle.loadWidgets();
+
+        Bangle.on('touch', function (b, xy) {
+            xxl.stop();
+        });
+        setWatch(xxl.stop, BTN1);
+        Bangle.buzz(500,1);
+
+
+        // offscreen gfx buffer
+        // screen is 176x176
+        // font should be scaled 5x9=30x72px
+        // built in fonts are 4x6, 6x8,12x20,6x15,Vector
+        xxl.bufpal4color = new Uint16Array([0x0000,0xFFFF,0x7BEF,0xAFE5],0,2);   // b,w,grey,greenyellow
+        g.setFont(xxl.buffnt);
+        var hfont = g.getFontHeight();
+        xxl.bufscale=parseInt((g.getHeight() - 24/*widgets*/)/2) / hfont;
+        xxl.buflin=2; // number of lines
+        xxl.bufw=(g.getWidth() * xxl.buflin) / xxl.bufscale; // 6x15 font scaled by 5 on 176 screen width
+        xxl.bufh=hfont;
+
+        xxl.bufimg = Graphics.createArrayBuffer(xxl.bufw,xxl.bufh,2,{msb:true});
+
+        // prepare string and metrics
+        xxl.txt = (xxl.msg.title||(xxl.msg.src||"MSG")) + ": " + (xxl.msg.body||"-x-");
+        g.setFont(xxl.buffnt);
+        xxl.wtot = g.stringMetrics(xxl.txt).width;
+        xxl.xpos = xxl.bufw; // g.getWidth();
+
+        xxl.draw();
+    },
+
+//private:
+    // schedule a draw for 60 FPS
+    queueDraw: function() {
+        if (xxl.drawTimeout) { return; } // clearTimeout(xxl.drawTimeout); }
+            xxl.drawTimeout = setTimeout(function () {
+            xxl.drawTimeout = undefined;
+            xxl.draw();
+        }, 16 - (Date.now() % 16));
+    },
+
+
+    stop:function() {
+        // console.log("stop");
+        if (xxl.drawTimeout) { clearTimeout(xxl.drawTimeout); }
+        xxl.drawTimeout = undefined;
+        g.reset();
+        g.setBgColor('#ffff00');
+        g.clear();
+
+        // Bangle.setLCDPower(0); // light off
+        // Bangle.setLocked(true); // disable touch
+
+        setTimeout(function(){Bangle.showClock();}, 100);
+    },
+
+    // this is even slower than the scaled printing :(
+    // megaPrintBufferd: function(txt, x, y){
+    //     xxl.bufimg.setFont(xxl.buffnt);
+    //     xxl.bufimg.setFontAlign(-1, -1);
+    //     xxl.bufimg.setColor(1); // index in palette
+    //     xxl.bufimg.clear();
+    //     xxl.bufimg.drawString(txt, x, 0);
+    //     for(var i = 0; i<xxl.buflin; ++i){
+    //         g.drawImage({
+    //                      width:xxl.bufw, height:xxl.bufh, bpp:2
+    //                      , buffer: xxl.bufimg.buffer
+    //                      , palette: xxl.bufpal4color
+    //                     }
+    //                     , -i*g.getWidth(), y
+    //                     ,{scale:xxl.bufscale}
+    //                 );
+    //         y+=xxl.bufscale*xxl.bufh;
+    //     }
+    // },
+
+    // x: pixels in buffer. Must scale this.
+    // y: screen position
+    megaPrint: function(txt, x, y){
+        g.setFont(xxl.buffnt+':'+xxl.bufscale);
+        g.setColor('#ffffff');
+        g.setFontAlign(-1, -1);
+        for(var i = 0; i<xxl.buflin; ++i){
+            g.drawString(txt
+                         , x*xxl.bufscale-i*g.getWidth()
+                         , y
+                    );
+            y+=xxl.bufscale*xxl.bufh;
+        }
+    },
+
+    draw: function() {
+        var wh = 24; // widgets height
+        var gw = g.getWidth();
+        var h = (g.getHeight() - wh)/2; // height of drawing area per stripe
+
+        Bangle.setLCDPower(1); // light on
+        Bangle.setLocked(false); // keep the touch input active
+        g.setBgColor('#000000');
+        g.clear();
+
+        // center line
+        g.setColor(xxl.imgcol);
+        g.fillRect(      0,wh+h-3,gw/2-26,wh+h-1);
+        g.fillRect(gw/2+26,wh+h-3,   gw-1,wh+h-1);
+
+        // image
+        if (xxl.img) { // 24x24
+            g.setColor(xxl.imgcol);
+            g.drawImage(xxl.img
+                        , gw/2, wh+h-2 // center point
+                        ,{rotate:0,scale:2}
+                       );
+        }
+        // scroll message
+        xxl.megaPrint(xxl.txt, xxl.xpos, wh);
+                                            
+        g.reset();
+        // widget redraw
+        Bangle.drawWidgets();
+
+        // scroll
+        xxl.xpos -= 3; // buffer pixels
+        if (xxl.xpos < -xxl.wtot - xxl.bufw/xxl.buflin - 4) {
+            ++xxl.loopCount;
+            if (xxl.loopCount > 2) {
+                xxl.stop();
+                return;
+            }
+            xxl.xpos = (3*xxl.bufw)/2;
+        }
+        // loop drawing
+        xxl.queueDraw();
+    }
+};
+
+
+// for IDE
+// var exports={};
+
+exports.listener = function (type, msg) {
+    // msg = {t:"add",id:int, src,title,subject,body,sender,tel, important:bool, new:bool}
+    if (!msg) return;
+    if (type === 'text' && msg.t !== 'remove') {
+        msg.handled = true; // don't do anything else with the message
+        xxl.show(msg);
+    }
+};
+
+// debug
+// var msg = {t:"add",id:12341, src:"SMS",title:undefined,subject:undefined,body:"yes",sender:"phoo",tel:undefined, important:false, new:true};
+// exports.listener('text', msg);
+
+
+
+
+
+
+
diff --git a/apps/xxlmessage/metadata.json b/apps/xxlmessage/metadata.json
new file mode 100644
index 000000000..f8150f0e7
--- /dev/null
+++ b/apps/xxlmessage/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "xxlmessage",
+  "name": "XXL Message",
+  "version": "0.02",
+  "shortName": "XXL Msg",
+  "description": "App to display large notifications from iOS and Gadgetbridge/Android",
+  "icon": "app.png",
+  "type": "app",
+  "tags": "tool,system",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "dependencies" : {"messages":"module", "messageicons":"module" },
+  "readme": "README.md",
+  "screenshots": [{"url":"screenshot.png"}],
+  "storage": [
+    {"name":"xxlmessage.app.js","url":"app.js"},
+    {"name":"xxlmessage.lib.js","url":"lib.js"},
+    {"name":"xxlmessage.boot.js","url":"boot.js"},
+    {"name":"xxlmessage.img","url":"app-icon.js","evaluate":true}
+  ]
+}
\ No newline at end of file
diff --git a/apps/xxlmessage/screenshot.png b/apps/xxlmessage/screenshot.png
new file mode 100644
index 000000000..5d9fbcf55
Binary files /dev/null and b/apps/xxlmessage/screenshot.png differ
diff --git a/backup.js b/backup.js
index 06d98a366..09f65af99 100644
--- a/backup.js
+++ b/backup.js
@@ -70,7 +70,7 @@ function bangleUpload() {
     var zip = new JSZip();
     var cmds = "";
     zip.loadAsync(data).then(function(zip) {
-      return showPrompt("Restore from ZIP","Are you sure? This will remove all existing apps");
+      return showPrompt("Restore from ZIP","Are you sure? This will overwrite existing apps");
     }).then(()=>{
       Progress.show({title:`Reading ZIP`});
       zip.forEach(function (path, file){
@@ -91,10 +91,15 @@ function bangleUpload() {
       });
       return promise;
     })
-    .then(() => {
-      Progress.hide({sticky:true});
-      Progress.show({title:`Erasing...`});
-      return Comms.removeAllApps(); })
+    .then(()=>new Promise(resolve => {
+      showPrompt("Erase Storage","Erase Storage? If restoring a complete backup you should erase storage, but in some cases you may want to upload files from a ZIP while keeping your Bangle's existing data.").then(()=>resolve(true), ()=>resolve(false));
+    }))
+    .then(eraseStorage => {
+      if (eraseStorage) {
+        Progress.hide({sticky:true});
+        Progress.show({title:`Erasing...`});
+        return Comms.removeAllApps();
+      }})
     .then(() => {
       Progress.hide({sticky:true});
       Progress.show({title:`Restoring...`, sticky:true});
diff --git a/bin/apploader.js b/bin/apploader.js
deleted file mode 100755
index d4a5f828e..000000000
--- a/bin/apploader.js
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/env node
-/* Simple Command-line app loader for Node.js
-===============================================
-
-NOTE: This needs the '@abandonware/noble' library to be installed.
-However we don't want this in package.json (at least
-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 noble;
-["@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);
-}
-function ERROR(msg) {
-  console.error(msg);
-  process.exit(1);
-}
-
-var deviceId = "BANGLEJS2";
-
-var apploader = require("./lib/apploader.js");
-var args = process.argv;
-
-var bangleParam = args.findIndex(arg => /-b\d/.test(arg));
-if (bangleParam!==-1) {
-  deviceId = "BANGLEJS"+args.splice(bangleParam, 1)[0][2];
-}
-apploader.init({
-  DEVICEID : deviceId
-});
-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]);
-else if (args.length==5 && args[2]=="install") cmdInstallApp(args[3], args[4]);
-else {
-  console.log(`apploader.js
--------------
-
-USAGE:
-
-apploader.js list
-  - list available apps
-apploader.js devices
-  - list available device addresses
-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);
-}
-
-function cmdListApps() {
-  console.log(apploader.apps.map(a=>a.id).join("\n"));
-}
-function cmdListDevices() {
-  var foundDevices = [];
-  noble.on('discover', function(dev) {
-    if (!dev.advertisement) return;
-    if (!dev.advertisement.localName) return;
-    var a = dev.address.toString();
-    if (foundDevices.indexOf(a)>=0) return;
-    foundDevices.push(a);
-    console.log(a,dev.advertisement.localName);
-  });
-  noble.startScanning([], true);
-  setTimeout(function() {
-    console.log("Stopping scan");
-    noble.stopScanning();
-    setTimeout(function() {
-      process.exit(0);
-    }, 500);
-  }, 4000);
-}
-
-function cmdInstallApp(appId, deviceAddress) {
-  var app = apploader.apps.find(a=>a.id==appId);
-  if (!app) ERROR(`App ${JSON.stringify(appId)} not found`);
-  if (app.custom) ERROR(`App ${JSON.stringify(appId)} requires HTML customisation`);
-  return apploader.getAppFilesString(app).then(command => {
-    bangleSend(command, deviceAddress).then(() => process.exit(0));
-  });
-}
-
-function bangleSend(command, deviceAddress) {
-  var log = function() {
-    var args = [].slice.call(arguments);
-    console.log("UART: "+args.join(" "));
-  }
-  //console.log("Sending",JSON.stringify(command));
-
-  var RESET = true;
-  var DEVICEADDRESS = "";
-  if (deviceAddress!==undefined)
-    DEVICEADDRESS = deviceAddress;
-
-  var complete = false;
-  var foundDevices = [];
-  var flowControlPaused = false;
-  var btDevice;
-  var txCharacteristic;
-  var rxCharacteristic;
-
-  return new Promise((resolve,reject) => {
-    function foundDevice(dev) {
-      if (btDevice!==undefined) return;
-      log("Connecting to "+dev.address);
-      noble.stopScanning();
-      connect(dev, function() {
-        // Connected!
-        function writeCode() {
-          log("Writing code...");
-          write(command, function() {
-            complete = true;
-            btDevice.disconnect();
-          });
-        }
-        if (RESET) {
-          setTimeout(function() {
-            log("Resetting...");
-            write("\x03\x10reset()\n", function() {
-              setTimeout(writeCode, 1000);
-            });
-          }, 500);
-        } else
-          setTimeout(writeCode, 1000);
-      });
-    }
-
-    function connect(dev, callback) {
-      btDevice = dev;
-      log("BT> Connecting");
-      btDevice.on('disconnect', function() {
-        log("Disconnected");
-        setTimeout(function() {
-          if (complete) resolve();
-          else reject("Disconnected but not complete");
-        }, 500);
-      });
-      btDevice.connect(function (error) {
-        if (error) {
-          log("BT> ERROR Connecting",error);
-          btDevice = undefined;
-          return;
-        }
-        log("BT> Connected");
-        btDevice.discoverAllServicesAndCharacteristics(function(error, services, characteristics) {
-          function findByUUID(list, uuid) {
-            for (var i=0;i<list.length;i++)
-              if (list[i].uuid==uuid) return list[i];
-            return undefined;
-          }
-
-          var btUARTService = findByUUID(services, "6e400001b5a3f393e0a9e50e24dcca9e");
-          txCharacteristic = findByUUID(characteristics, "6e400002b5a3f393e0a9e50e24dcca9e");
-          rxCharacteristic = findByUUID(characteristics, "6e400003b5a3f393e0a9e50e24dcca9e");
-          if (error || !btUARTService || !txCharacteristic || !rxCharacteristic) {
-            log("BT> ERROR getting services/characteristics");
-            log("Service "+btUARTService);
-            log("TX "+txCharacteristic);
-            log("RX "+rxCharacteristic);
-            btDevice.disconnect();
-            txCharacteristic = undefined;
-            rxCharacteristic = undefined;
-            btDevice = undefined;
-            return openCallback();
-          }
-
-          rxCharacteristic.on('data', function (data) {
-            var s = "";
-            for (var i=0;i<data.length;i++) {
-              var ch = data[i];
-              if (ch==19) {
-                log("XOFF");
-                flowControlPaused = 200;
-              } else if (ch==17) {
-                log("XON");
-                flowControlPaused = false;
-              } else
-                s+=String.fromCharCode(ch);
-            }
-            log("Received", JSON.stringify(s));
-          });
-          rxCharacteristic.subscribe(function() {
-            callback();
-          });
-        });
-      });
-    };
-
-    function write(data, callback) {
-      var amt = 0;
-      var total = data.length;
-      var progress=0;
-
-      function writeAgain() {
-        if (flowControlPaused) {
-          flowControlPaused--;
-          if (flowControlPaused==0)
-            log("TIMEOUT - sending");
-          setTimeout(writeAgain,50);
-          return;
-        }
-        if (!data.length) return callback();
-        var d = data.substr(0,20);
-        data = data.substr(20);
-        var buf = new Buffer.alloc(d.length);
-        progress++;
-        if (progress>=10) {
-          log("Writing "+amt+"/"+total);
-          progress=0;
-        }
-        //log("Writing ",JSON.stringify(d));
-        amt += d.length;
-        for (var i = 0; i < buf.length; i++)
-          buf.writeUInt8(d.charCodeAt(i), i);
-        txCharacteristic.write(buf, false, writeAgain);
-      }
-      writeAgain();
-    }
-
-    function disconnect() {
-      btDevice.disconnect();
-    }
-
-    log("Discovering...");
-    noble.on('discover', function(dev) {
-      if (!dev.advertisement) return;
-      if (!dev.advertisement.localName) return;
-      var a = dev.address.toString();
-      if (foundDevices.indexOf(a)>=0) return;
-      foundDevices.push(a);
-      log("Found device: ",a,dev.advertisement.localName);
-      if (a == DEVICEADDRESS)
-        return foundDevice(dev);
-      else if (DEVICEADDRESS=="" && dev.advertisement.localName.indexOf("Bangle.js")==0) {
-        return foundDevice(dev);
-      }
-    });
-    noble.startScanning([], true);
-  });
-}
diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
index 4535c4a5e..d5ebfca37 100755
--- a/bin/firmwaremaker.js
+++ b/bin/firmwaremaker.js
@@ -14,9 +14,10 @@ var APPS = [ // IDs of apps to install
 var MINIFY = true;
 
 var fs = require("fs");
-var apploader = require("./lib/apploader.js");
+var apploader = require("../core/lib/apploader.js");
 apploader.init({
-  DEVICEID : DEVICEID
+  DEVICEID : DEVICEID,
+  //language : "lang/de_DE.json"
 });
 
 var appfiles = [];
diff --git a/bin/firmwaremaker_c.js b/bin/firmwaremaker_c.js
index 54b63d5d9..4bd7fda2a 100755
--- a/bin/firmwaremaker_c.js
+++ b/bin/firmwaremaker_c.js
@@ -34,7 +34,7 @@ if (DEVICEID=="BANGLEJS") {
 }
 console.log("Device = ",DEVICEID);
 
-var apploader = require("./lib/apploader.js");
+var apploader = require("../core/lib/apploader.js");
 apploader.init({
   DEVICEID : DEVICEID
 });
diff --git a/bin/language_scan.js b/bin/language_scan.js
deleted file mode 100755
index 464d8f998..000000000
--- a/bin/language_scan.js
+++ /dev/null
@@ -1,324 +0,0 @@
-#!/usr/bin/env node
-/* Scans for strings that may be in English in each app, and
-outputs a list of strings that have been found.
-
-See https://github.com/espruino/BangleApps/issues/1311
-*/
-
-var childProcess = require('child_process');
-
-let refresh = false;
-
-function handleCliParameters ()
-{
-    let usage = "USAGE: language_scan.js [options]";
-    let die = function (message) {
-        console.log(usage);
-        console.log(message);
-        process.exit(3);
-    };
-    let hadTURL = false,
-        hadDEEPL = false;
-    for(let i = 2; i < process.argv.length; i++)
-    {
-        const param = process.argv[i];
-        switch(param)
-        {
-            case '-r':
-            case '--refresh':
-                refresh = true;
-                break;
-            case '--deepl':
-                i++;
-                let KEY = process.argv[i];
-                if(KEY === '' || KEY === null || KEY === undefined)
-                {
-                    die('--deepl requires a parameter: the API key to use');
-                }
-                process.env.DEEPL = KEY;
-                hadDEEPL = true;
-                break;
-            case '--turl':
-                i++;
-                let URL = process.argv[i];
-                if(URL === '' || URL === null || URL === undefined)
-                {
-                    die('--turl requires a parameter: the URL to use');
-                }
-                process.env.TURL = URL;
-                hadTURL = true;
-                break;
-            case '-h':
-            case '--help':
-                console.log(usage+"\n");
-                console.log("Parameters:");
-                console.log("  -h, --help       Output this help text and exit");
-                console.log("  -r, --refresh    Auto-add new strings into lang/*.json");
-                console.log('      --deepl KEY  Enable DEEPL as auto-translation engine and');
-                console.log('                   use KEY as its API key. You also need to provide --turl');
-                console.log('      --turl URL   In combination with --deepl, use URL as the API base URL');
-                process.exit(0);
-            default:
-                die("Unknown parameter: "+param);
-        }
-    }
-    if((hadTURL !== false || hadDEEPL !== false) && hadTURL !== hadDEEPL)
-    {
-        die("Use of deepl requires both a --deepl API key and --turl URL");
-    }
-}
-handleCliParameters();
-
-let translate = false;
-if (process.env.DEEPL) {
-  // Requires translate
-  // npm i translate
-  translate = require("translate");
-  translate.engine = "deepl"; // Or "yandex", "libre", "deepl"
-  translate.key = process.env.DEEPL; // Requires API key (which are free)
-  translate.url = process.env.TURL;
-}
-
-var IGNORE_STRINGS = [
-  "5x5","6x8","6x8:2","4x6","12x20","6x15","5x9Numeric7Seg", "Vector", // fonts
-  "---","...","*","##","00","GPS","ram",
-  "12hour","rising","falling","title",
-  "sortorder","tl","tr",
-  "function","object", // typeof===
-  "txt", // layout styles
-  "play","stop","pause", "volumeup", "volumedown", // music state
-  "${hours}:${minutes}:${seconds}", "${hours}:${minutes}",
-  "BANGLEJS",
-  "fgH", "bgH",  "m/s",
-  "undefined", "kbmedia", "NONE",
-];
-
-var IGNORE_FUNCTION_PARAMS = [
-  "read",
-  "readJSON",
-  "require",
-  "setFont","setUI","setLCDMode",
-  "on",
-  "RegExp","sendCommand",
-  "print","log"
-];
-var IGNORE_ARRAY_ACCESS = [
-  "WIDGETS"
-];
-
-var BASEDIR = __dirname+"/../";
-Espruino = require(BASEDIR+"core/lib/espruinotools.js");
-var fs = require("fs");
-var APPSDIR = BASEDIR+"apps/";
-
-function ERROR(s) {
-  console.error("ERROR: "+s);
-  process.exit(1);
-}
-function WARN(s) {
-  console.log("Warning: "+s);
-}
-function log(s) {
-  console.log(s);
-}
-
-var appsFile, apps;
-try {
-  appsFile = fs.readFileSync(BASEDIR+"apps.json").toString();
-} catch (e) {
-  ERROR("apps.json not found");
-}
-if (appsFile.indexOf("---") === 0 && fs.existsSync(BASEDIR+"bin/create_apps_json.sh"))
-{
-    console.log("apps.json has not been generated, running bin/create_apps_json.sh to build it...");
-    childProcess.execFileSync(BASEDIR+'bin/create_apps_json.sh',[],{
-        stdio: 'inherit'
-    });
-  appsFile = fs.readFileSync(BASEDIR+"apps.json").toString();
-}
-try{
-  apps = JSON.parse(appsFile);
-} catch (e) {
-  ERROR("apps.json not valid JSON");
-}
-
-// Given a string value, work out if it's obviously not a text string
-function isNotString(s, wasFnCall, wasArrayAccess) {
-  if (s=="") return true;
-  // wasFnCall is set to the function name if 's' is the first argument to a function
-  if (wasFnCall && IGNORE_FUNCTION_PARAMS.includes(wasFnCall)) return true;
-  if (wasArrayAccess && IGNORE_ARRAY_ACCESS.includes(wasArrayAccess)) return true;
-  if (s=="Storage") console.log("isNotString",s,wasFnCall);
-
-  if (s.length<3) return true; // too short
-  if (s.length>40) return true; // too long
-  if (s[0]=="#") return true; // a color
-  if (s.endsWith('.log') || s.endsWith('.js') || s.endsWith(".info") || s.endsWith(".csv") || s.endsWith(".json") || s.endsWith(".img") || s.endsWith(".txt")) return true; // a filename
-  if (s.endsWith("=")) return true; // probably base64
-  if (s.startsWith("BTN")) return true; // button name
-  if (IGNORE_STRINGS.includes(s)) return true; // one we know to ignore
-  if (!isNaN(parseFloat(s)) && isFinite(s)) return true; //is number
-  if (s.match(/^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$/)) return true; //roman number
-  if (!s.match(/.*[A-Z].*/i)) return true; // No letters
-  if (s.match(/.*[0-9].*/i)) return true; // No letters
-  if (s.match(/.*\(.*\).*/)) return true; // is function
-  if (s.match(/[A-Za-z]+[A-Z]([A-Z]|[a-z])*/)) return true; // is camel case
-  if (s.includes('_')) return true;
-  return false;
-}
-
-function getTextFromString(s) {
-  return s.replace(/^([.<>\-\n ]*)([^<>\!\?]*?)([.<>\!\?\-\n ]*)$/,"$2");
-}
-
-// A string that *could* be translated?
-var untranslatedStrings = [];
-// Strings that are marked with 'LANG'
-var translatedStrings = [];
-
-function addString(list, str, file) {
-  str = getTextFromString(str);
-  var entry = list.find(e => e.str==str);
-  if (!entry) {
-    entry = { str:str, uses:0, files : [] };
-    list.push(entry);
-  }
-  entry.uses++;
-  if (!entry.files.includes(file))
-    entry.files.push(file)
-}
-
-console.log("Scanning apps...");
-//apps = apps.filter(a=>a.id=="wid_edit");
-apps.forEach((app,appIdx) => {
-  var appDir = APPSDIR+app.id+"/";
-  app.storage.forEach((file) => {
-    if (!file.url || !file.name.endsWith(".js")) return;
-    var filePath = appDir+file.url;
-    var shortFilePath = "apps/"+app.id+"/"+file.url;
-    var fileContents = fs.readFileSync(filePath).toString();
-    var lex = Espruino.Core.Utils.getLexer(fileContents);
-    var lastIdx = 0;
-    var wasFnCall = undefined; // set to 'setFont' if we're at something like setFont(".."
-    var wasArrayAccess = undefined; // set to 'WIDGETS' if we're at something like WIDGETS[".."
-    var tok = lex.next();
-    while (tok!==undefined) {
-      var previousString = fileContents.substring(lastIdx, tok.startIdx);
-      if (tok.type=="STRING") {
-        if (previousString.includes("/*LANG*/")) { // translated!
-          addString(translatedStrings, tok.value, shortFilePath);
-        } else { // untranslated - potential to translate?
-          // filter out numbers
-          if (!isNotString(tok.value, wasFnCall, wasArrayAccess)) {
-            addString(untranslatedStrings, tok.value, shortFilePath);
-          }
-        }
-      } else {
-        if (tok.value!="(") wasFnCall=undefined;
-        if (tok.value!="[") wasArrayAccess=undefined;
-      }
-      //console.log(wasFnCall,tok.type,tok.value);
-      if (tok.type=="ID") {
-        wasFnCall = tok.value;
-        wasArrayAccess = tok.value;
-      }
-      lastIdx = tok.endIdx;
-      tok = lex.next();
-    }
-  });
-});
-untranslatedStrings.sort((a,b)=>a.uses - b.uses);
-translatedStrings.sort((a,b)=>a.uses - b.uses);
-
-
-/* 
- * @description Add lang to start of string
- * @param str string to add LANG to
- * @param file file that string is found
- * @returns void
- */
-//TODO fix settings bug
-function applyLANG(str, file) {
-  fs.readFile(file, 'utf8', function (err,data) {
-    if (err) {
-      return console.log(err);
-    }
-    const regex = new RegExp(`(.*)((?<!\/\*LANG\*\/)["|']${str}[^A-Z].*)`, 'gi');
-    const result = data.replace(regex, '$1/*LANG*/$2');
-    console.log(str, file);
-    fs.writeFile(file, result, 'utf8', function (err) {
-      if (err) return console.log(err);
-    });
-  });
-}
-
-var report = "";
-
-log("Translated Strings that are not tagged with LANG");
-log("=================================================================");
-log("");
-log("Maybe we should add /*LANG*/ to these automatically?");
-log("");
-const wordsToAdd = untranslatedStrings.filter(e => translatedStrings.find(t=>t.str==e.str));
-
-// Uncomment to add LANG to all strings
-// THIS IS EXPERIMENTAL
-//wordsToAdd.forEach(e => e.files.forEach(a => applyLANG(e.str, a)));
-
-log(wordsToAdd.map(e=>`${JSON.stringify(e.str)} (${e.uses} uses)`).join("\n"));
-log("");
-
-//process.exit(1);
-log("Possible English Strings that could be translated");
-log("=================================================================");
-log("");
-log("Add these to IGNORE_STRINGS if they don't make sense...");
-log("");
- // ignore ones only used once or twice
-log(untranslatedStrings.filter(e => e.uses>2).filter(e => !translatedStrings.find(t=>t.str==e.str)).map(e=>`${JSON.stringify(e.str)} (${e.uses} uses)`).join("\n"));
-log("");
-//process.exit(1);
-
-let languages = JSON.parse(fs.readFileSync(`${BASEDIR}/lang/index.json`).toString());
-for (let language of languages) {
-  if (language.code == "en_GB") {
-    console.log(`Ignoring ${language.code}`);
-    continue;
-  }
-  console.log(`Scanning ${language.code}`);
-  log(language.code);
-  log("==========");
-  let translations = JSON.parse(fs.readFileSync(`${BASEDIR}/lang/${language.url}`).toString());
-  let translationPromises = [];
-  translatedStrings.forEach(translationItem => {
-    if (!translations.GLOBAL[translationItem.str]) {
-      console.log(`Missing GLOBAL translation for ${JSON.stringify(translationItem)}`);
-      translationItem.files.forEach(file => {
-        let m = file.match(/\/([a-zA-Z0-9_-]*)\//g);
-        if (m && m[0]) {
-          let appName = m[0].replaceAll("/", "");
-          if (translations[appName] && translations[appName][translationItem.str]) {
-            console.log(`     but LOCAL translation found in \"${appName}\"`);
-          } else if (translate && language.code !== "tr_TR") { // Auto Translate
-            translationPromises.push(new Promise(async (resolve) => {
-                const translation = await translate(translationItem.str, language.code.split("_")[0]);
-                console.log("Translating:", translationItem.str, translation);
-                translations.GLOBAL[translationItem.str] = translation;
-                resolve()
-            }))
-          } else if(refresh && !translate) {
-            translationPromises.push(new Promise(async (resolve) => {
-                translations.GLOBAL[translationItem.str] = translationItem.str;
-                resolve()
-            }))
-          }
-        }
-      });
-    }
-  });
-  Promise.all(translationPromises).then(() => {
-    fs.writeFileSync(`${BASEDIR}/lang/${language.url}`, JSON.stringify(translations, null, 4))
-  });
-  log("");
-}
-console.log("Done.");
diff --git a/bin/lib/apploader.js b/bin/lib/apploader.js
deleted file mode 100644
index 329ece7b7..000000000
--- a/bin/lib/apploader.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Node.js library with utilities to handle using the app loader from node.js */
-
-var DEVICEID = "BANGLEJS2";
-var MINIFY = true; // minify JSON?
-var BASE_DIR = __dirname + "/../..";
-var APPSDIR = BASE_DIR+"/apps/";
-
-//eval(require("fs").readFileSync(__dirname+"../core/js/utils.js"));
-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());
-var AppInfo = require(__dirname+"/../../core/js/appinfo.js");
-
-var SETTINGS = {
-  pretokenise : true
-};
-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 apps = [];
-var device = { id : DEVICEID, appsInstalled : [] };
-
-// call with {DEVICEID:"BANGLEJS/BANGLEJS2"}
-exports.init = function(options) {
-  if (options.DEVICEID)
-    DEVICEID = options.DEVICEID;
-  // Load app metadata
-  var dirs = require("fs").readdirSync(APPSDIR, {withFileTypes: true});
-  dirs.forEach(dir => {
-    var appsFile;
-    if (dir.name.startsWith("_example") || !dir.isDirectory())
-      return;
-    try {
-      appsFile = require("fs").readFileSync(APPSDIR+dir.name+"/metadata.json").toString();
-    } catch (e) {
-      ERROR(dir.name+"/metadata.json does not exist");
-      return;
-    }
-    apps.push(JSON.parse(appsFile));
-  });
-};
-
-exports.AppInfo = AppInfo;
-exports.apps = apps;
-
-// used by getAppFiles
-function fileGetter(url) {
-  url = BASE_DIR+"/"+url;
-  console.log("Loading "+url)
-  var data;
-  if (MINIFY && url.endsWith(".json")) {
-    var f = url.slice(0,-5);
-    console.log("MINIFYING JSON "+f);
-    var j = eval("("+require("fs").readFileSync(url).toString("binary")+")");
-    data = JSON.stringify(j);
-  } else {
-    var blob = require("fs").readFileSync(url);
-    if (url.endsWith(".js") || url.endsWith(".json"))
-      data = blob.toString(); // allow JS/etc to be written in UTF-8
-    else
-      data = blob.toString("binary")
-  }
-  return Promise.resolve(data);
-}
-
-exports.getAppFiles = function(app) {
-  var allFiles = [];
-  var uploadOptions = {
-    apps : apps,
-    needsApp : app => {
-      if (app.provides_modules) {
-        if (!app.files) app.files="";
-        app.files = app.files.split(",").concat(app.provides_modules).join(",");
-      }
-      return AppInfo.getFiles(app, {
-        fileGetter:fileGetter,
-        settings : SETTINGS,
-        device : { id : DEVICEID }
-      }).then(files => { allFiles = allFiles.concat(files); return app; });
-    }
-  };
-  return AppInfo.checkDependencies(app, device, uploadOptions).then(() => AppInfo.getFiles(app, {
-    fileGetter:fileGetter,
-    settings : SETTINGS,
-    device : device
-  })).then(files => {
-    allFiles = allFiles.concat(files);
-    return allFiles;
-  });
-};
-
-// Get all the files for this app as a string of Storage.write commands
-exports.getAppFilesString = function(app) {
-  return exports.getAppFiles(app).then(files => {
-    return files.map(f=>f.cmd).join("\n")+"\n"
-  })
-};
diff --git a/bin/lib/emulator.js b/bin/lib/emulator.js
deleted file mode 100644
index f7c82ec3c..000000000
--- a/bin/lib/emulator.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Node.js library with utilities to handle using the emulator from node.js */
-
-var EMULATOR = "banglejs2";
-var DEVICEID = "BANGLEJS2";
-
-var BASE_DIR = __dirname + "/../..";
-var DIR_IDE =  BASE_DIR + "/../EspruinoWebIDE";
-
-/* we factory reset ONCE, get this, then we can use it to reset
-state quickly for each new app */
-var factoryFlashMemory;
-
-// Log of messages from app
-var appLog = "";
-var lastOutputLine = "";
-
-function onConsoleOutput(txt) {
-  appLog += txt + "\n";
-  lastOutputLine = txt;
-}
-
-exports.init = function(options) {
-  if (options.EMULATOR)
-    EMULATOR = options.EMULATOR;
-  if (options.DEVICEID)
-    DEVICEID = options.DEVICEID;
-
-  eval(require("fs").readFileSync(DIR_IDE + "/emu/emulator_"+EMULATOR+".js").toString());
-  eval(require("fs").readFileSync(DIR_IDE + "/emu/emu_"+EMULATOR+".js").toString());
-  eval(require("fs").readFileSync(DIR_IDE + "/emu/common.js").toString()/*.replace('console.log("EMSCRIPTEN:"', '//console.log("EMSCRIPTEN:"')*/);
-
-  jsRXCallback = function() {};
-  jsUpdateGfx = function() {};
-
-  factoryFlashMemory = new Uint8Array(FLASH_SIZE);
-  factoryFlashMemory.fill(255);
-
-  exports.flashMemory = flashMemory;
-  exports.GFX_WIDTH = GFX_WIDTH;
-  exports.GFX_HEIGHT = GFX_HEIGHT;
-  exports.tx = jsTransmitString;
-  exports.idle = jsIdle;
-  exports.stopIdle = jsStopIdle;
-  exports.getGfxContents = jsGetGfxContents;
-
-  return new Promise(resolve => {
-    setTimeout(function() {
-      console.log("Emulator Loaded...");
-      jsInit();
-      jsIdle();
-      console.log("Emulator Factory reset");
-      exports.tx("Bangle.factoryReset()\n");
-      factoryFlashMemory.set(flashMemory);
-      console.log("Emulator Ready!");
-
-      resolve();
-    },0);
-  });
-};
-
-// Factory reset
-exports.factoryReset = function() {
-  exports.flashMemory.set(factoryFlashMemory);
-  exports.tx("reset()\n");
-  appLog="";
-};
-
-// Transmit a string
-exports.tx = function() {}; // placeholder
-exports.idle = function() {}; // placeholder
-exports.stopIdle = function() {}; // placeholder
-exports.getGfxContents = function() {}; // placeholder
-
-exports.flashMemory = undefined; // placeholder
-exports.GFX_WIDTH = undefined; // placeholder
-exports.GFX_HEIGHT = undefined; // placeholder
-
-// Get last line sent to console
-exports.getLastLine = function() {
-  return lastOutputLine;
-};
-
-// Gets the screenshot as RGBA Uint32Array
-exports.getScreenshot = function() {
-  var rgba = new Uint8Array(exports.GFX_WIDTH*exports.GFX_HEIGHT*4);
-  exports.getGfxContents(rgba);
-  var rgba32 = new Uint32Array(rgba.buffer);
-  return rgba32;
-}
-
-// Write the screenshot to a file options={errorIfBlank}
-exports.writeScreenshot = function(imageFn, options) {
-  options = options||{};
-  return new Promise((resolve,reject) => {
-    var rgba32 = exports.getScreenshot();
-
-    if (options.errorIfBlank) {
-      var firstPixel = rgba32[0];
-      var blankImage = rgba32.every(col=>col==firstPixel);
-      if (blankImage) reject("Image is blank");
-    }
-
-    var Jimp = require("jimp");
-    let image = new Jimp(exports.GFX_WIDTH, exports.GFX_HEIGHT, function (err, image) {
-      if (err) throw err;
-      let buffer = image.bitmap.data;
-      buffer.set(new Uint8Array(rgba32.buffer));
-      image.write(imageFn, (err) => {
-        if (err) return reject(err);
-        console.log("Image written as "+imageFn);
-        resolve();
-      });
-    });
-  });
-}
diff --git a/bin/runapptests.js b/bin/runapptests.js
index b50a7e15c..40a898fa6 100755
--- a/bin/runapptests.js
+++ b/bin/runapptests.js
@@ -62,11 +62,11 @@ if (!require("fs").existsSync(DIR_IDE)) {
   process.exit(1);
 }
 
-var apploader = require(BASE_DIR+"/bin/lib/apploader.js");
+var apploader = require(BASE_DIR+"/core/lib/apploader.js");
 apploader.init({
   DEVICEID : DEVICEID
 });
-var emu = require(BASE_DIR+"/bin/lib/emulator.js");
+var emu = require(BASE_DIR+"/core/lib/emulator.js");
 
 // Last set of text received
 var lastTxt;
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index 82b2896b8..d5c755443 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -92,9 +92,12 @@ const INTERNAL_FILES_IN_APP_TYPE = { // list of app types and files they SHOULD
 };
 /* 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",
-"App owmweather data file weather.json is also listed as data file for app weather",
+  "App gpsrec data file wildcard .gpsrc? does not include app ID",
+  "App owmweather data file weather.json is also listed as data file for app weather",
   "App messagegui storage file messagegui is also listed as storage file for app messagelist",
+  "App carcrazy has a setting file but no corresponding data entry (add `\"data\":[{\"name\":\"carcrazy.settings.json\"}]`)",
+  "App loadingscreen has a setting file but no corresponding data entry (add `\"data\":[{\"name\":\"loadingscreen.settings.json\"}]`)",
+  "App trex has a setting file but no corresponding data entry (add `\"data\":[{\"name\":\"trex.settings.json\"}]`)",
 ];
 
 function globToRegex(pattern) {
@@ -124,6 +127,7 @@ apps.forEach((app,appIdx) => {
   if (!fs.existsSync(APPSDIR+app.id)) ERROR(`App ${app.id} has no directory`);
   if (!app.name) ERROR(`App ${app.id} has no name`, {file:metadataFile});
   var isApp = !app.type || app.type=="app";
+  var appTags = app.tags ? app.tags.split(",") : [];
   if (app.name.length>20 && !app.shortName && isApp) ERROR(`App ${app.id} has a long name, but no shortName`, {file:metadataFile});
   if (app.type && !METADATA_TYPES.includes(app.type))
     ERROR(`App ${app.id} 'type' is one one of `+METADATA_TYPES, {file:metadataFile});
@@ -162,11 +166,20 @@ apps.forEach((app,appIdx) => {
         ERROR(`App ${app.id} screenshot file ${screenshot.url} not found`, {file:metadataFile});
     });
   }
-  if (app.readme && !fs.existsSync(appDir+app.readme)) ERROR(`App ${app.id} README file doesn't exist`, {file:metadataFile});
+  if (app.readme) {
+    if (!fs.existsSync(appDir+app.readme))
+      ERROR(`App ${app.id} README file doesn't exist`, {file:metadataFile});
+  } else {
+    let readme = fs.readdirSync(appDir).find(f => f.toLowerCase().includes("readme"));
+    if (readme)
+      ERROR(`App ${app.id} has a README in the directory (${readme}) but it's not linked`, {file:metadataFile});
+  }
   if (app.custom && !fs.existsSync(appDir+app.custom)) ERROR(`App ${app.id} custom HTML doesn't exist`, {file:metadataFile});
   if (app.customConnect && !app.custom) ERROR(`App ${app.id} has customConnect but no customn HTML`, {file:metadataFile});
   if (app.interface && !fs.existsSync(appDir+app.interface)) ERROR(`App ${app.id} interface HTML doesn't exist`, {file:metadataFile});
   if (app.dependencies) {
+    if (app.dependencies.clock_info && !appTags.includes("clkinfo"))
+      WARN(`App ${app.id} uses clock_info but doesn't have clkinfo tag`, {file:metadataFile});
     if (("object"==typeof app.dependencies) && !Array.isArray(app.dependencies)) {
       Object.keys(app.dependencies).forEach(dependency => {
         if (!["type","app","module","widget"].includes(app.dependencies[dependency]))
@@ -178,6 +191,8 @@ apps.forEach((app,appIdx) => {
       ERROR(`App ${app.id} 'dependencies' must be an object`, {file:metadataFile});
   }
 
+  if (app.storage.find(f=>f.name.endsWith(".clkinfo.js")) && !appTags.includes("clkinfo"))
+    WARN(`App ${app.id} provides ...clkinfo.js but doesn't have clkinfo tag`, {file:metadataFile});
   var fileNames = [];
   app.storage.forEach((file) => {
     if (!file.name) ERROR(`App ${app.id} has a file with no name`, {file:metadataFile});
@@ -241,6 +256,10 @@ apps.forEach((app,appIdx) => {
         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});
       }
+      // if settings, suggest adding to datafiles
+      if (/\.settings?\.js$/.test(file.name) && (!app.data || app.data.every(d => !d.name || !d.name.endsWith(".json")))) {
+        WARN(`App ${app.id} has a setting file but no corresponding data entry (add \`"data":[{"name":"${app.id}.settings.json"}]\`)`, {file:appDirRelative+file.url});
+      }
     }
     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});
diff --git a/bin/thumbnailer.js b/bin/thumbnailer.js
index 22cdc27a5..b5cb359d2 100755
--- a/bin/thumbnailer.js
+++ b/bin/thumbnailer.js
@@ -8,8 +8,8 @@ var EMULATOR = "banglejs1";
 var DEVICEID = "BANGLEJS";
 var SCREENSHOT_DIR = __dirname+"/../screenshots/";
 
-var emu = require("./lib/emulator.js");
-var apploader = require("./lib/apploader.js");
+var emu = require("../core/lib/emulator.js");
+var apploader = require("../core/lib/apploader.js");
 
 var singleAppId;
 
diff --git a/core b/core
index 893c2dbbe..92769acd6 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 893c2dbbe5a93fbb80d035a695663b4f4cca8875
+Subproject commit 92769acd60bc31548ff7c635128d4e7ef02b7325
diff --git a/css/main.css b/css/main.css
index ceb9fcd17..2ea2ab40d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -125,3 +125,16 @@ a.btn.btn-link.dropdown-toggle {
   transform: translate(-50%,-50%);
   content: url("data:image/svg+xml,%3C%3Fxml version='1.0'%3F%3E%3Csvg fill='rgb(87, 85, 217)' xmlns='http://www.w3.org/2000/svg' viewBox='2 2 28 28' width='1.5em' height='1.5em'%3E%3Cpath d='M 6 4 C 4.895 4 4 4.895 4 6 L 4 24 C 4 25.105 4.895 26 6 26 L 24 26 C 25.105 26 26 25.105 26 24 L 26 8 L 22 4 L 20 4 L 20 10 C 20 10.552 19.552 11 19 11 L 10 11 C 9.448 11 9 10.552 9 10 L 9 4 L 6 4 z M 16 4 L 16 9 L 18 9 L 18 4 L 16 4 z M 10 16 L 20 16 C 21.105 16 22 16.895 22 18 L 22 24 L 8 24 L 8 18 C 8 16.895 8.895 16 10 16 z'/%3E%3C/svg%3E");
 }
+
+/* https://github.com/picturepan2/spectre/issues/595 */
+.chip.tooltip:hover {
+  overflow: visible;
+  overflow-y: unset;
+}
+
+/* Normally tooltips don't wrap, but if you enable it, then they wrap until they are really thin!
+Not sure how to get 'normal' wrap behaviour (eg fill up until max-width, then wrap) */
+/*.tooltip:hover::after {
+  white-space: normal;
+  min-width: 160px;
+}*/
\ No newline at end of file
diff --git a/index.html b/index.html
index cc69781ee..30f660717 100644
--- a/index.html
+++ b/index.html
@@ -73,25 +73,26 @@
           </ul>
         </div>
         <div class="filter-nav">
-          <label class="chip active" filterid="">Default</label>
-          <label class="chip" filterid="clock">Clocks</label>
-          <label class="chip" filterid="launch">Launchers</label>
-          <label class="chip" filterid="game">Games</label>
-          <label class="chip" filterid="tool">Tools</label>
-          <label class="chip" filterid="textinput">Keyboards</label>
-          <label class="chip" filterid="widget">Widgets</label>
-          <label class="chip" filterid="bluetooth">Bluetooth</label>
-          <label class="chip" filterid="outdoors">Outdoors</label>
-          <label class="chip" filterid="ram">Online</label>
-          <label class="chip" filterid="favourites">Favourites</label>
+          <label class="chip active" filterid="" data-tooltip="Show all apps">All</label>
+          <label class="chip tooltip" filterid="clock" data-tooltip="To tell the time!">Clocks</label>
+          <label class="chip tooltip" filterid="launch" data-tooltip="Choose which apps to launch">Launchers</label>
+          <label class="chip tooltip" filterid="game" data-tooltip="Have fun!">Games</label>
+          <label class="chip tooltip" filterid="tool" data-tooltip="Useful applications">Tools</label>
+          <label class="chip tooltip" filterid="textinput" data-tooltip="To allow you to enter text">Keyboards</label>
+          <label class="chip tooltip" filterid="widget" data-tooltip="Appear in the top bar of Bangle.js apps">Widgets</label>
+          <label class="chip tooltip" filterid="bluetooth" data-tooltip="Using Bluetooth Functionality">Bluetooth</label>
+          <label class="chip tooltip" filterid="outdoors" data-tooltip="For outdoor use">Outdoors</label>
+          <label class="chip tooltip" filterid="ram" data-tooltip="Apps that don't save anything to flash memory">Online</label>
+          <label class="chip tooltip" filterid="clkinfo" data-tooltip="Info displayed on clocks, or clocks with info">Clock Info</label>
+          <label class="chip tooltip" filterid="favourites" data-tooltip="Apps that you've liked ❤️">Favourites</label>
         </div>
         <div class="sort-nav hidden">
           <span>Sort by:</span>
           <label class="chip active" sortid="">None</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>
+          <label class="chip hidden tooltip" sortid="created"  data-tooltip="Most recent apps">New</label>
+          <label class="chip hidden tooltip" sortid="modified" data-tooltip="Most recently changed">Updated</label>
+          <label class="chip hidden tooltip" sortid="installs" data-tooltip="Most installed by users">Installed</label>
+          <label class="chip hidden tooltip" sortid="favourites" data-tooltip="Most liked by users">Favourited</label>
         </div>
       </div>
 
@@ -132,24 +133,24 @@
         <p>Using <a href="https://espruino.com/" target="_blank">Espruino</a>, Icons from <a href="https://icons8.com/" target="_blank">icons8.com</a></p>
 
         <h3>Utilities</h3>
-        <p><button class="btn" id="settime">Set Bangle.js Time</button>
-           <button class="btn" id="removeall" data-tooltip="Delete everything from your Bangle, leaving it blank">Remove all Apps</button>
-           <button class="btn" id="reinstallall" data-tooltip="Remove and re-install every app, leaving all other data intact">Reinstall apps</button>
-           <button class="btn" id="installdefault">Install default apps</button>
-           <button class="btn" id="installfavourite" data-tooltip="Delete everything, install apps you've marked as favourites">Install favourite apps</button>
-           <button class="btn" id="newGithubIssue" data-tooltip="Create a new issue on github">New issue on github</button></p>
-        <p><button class="btn tooltip tooltip-right" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
-           <button class="btn tooltip tooltip-right" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button></p>
+        <p>
+           <button class="btn tooltip" id="settime" data-tooltip="Set the Bangle's time to your Browser's time">Set Bangle.js Time</button>
+           <button class="btn tooltip" id="removeall" data-tooltip="Delete everything, leave it blank">Remove all Apps</button>
+           <button class="btn tooltip" id="reinstallall" data-tooltip="Re-install every app, leave all data">Reinstall apps</button>
+           <button class="btn tooltip" id="installdefault" data-tooltip="Delete everything, install default apps">Install default apps</button>
+           <button class="btn tooltip" id="installfavourite" data-tooltip="Delete everything, install your favourites">Install favourite apps</button>
+        </p><p>
+           <button class="btn tooltip" id="newGithubIssue" data-tooltip="Create a new issue on GitHub">New issue on GitHub</button>
+           <button class="btn tooltip" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
+           <button class="btn tooltip" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button>
+           <button class="btn tooltip" id="defaultbanglesettings" data-tooltip="Reset your Bangle's settings to the defaults">Reset Settings</button>
+        </p>
         <h3>Settings</h3>
         <div class="form-group">
           <label class="form-switch">
             <input type="checkbox" id="settings-pretokenise">
             <i class="form-icon"></i> Pretokenise apps before upload (smaller, faster apps)
           </label>
-          <label class="form-switch">
-            <input type="checkbox" id="settings-minify">
-            <i class="form-icon"></i> Minify apps before upload (smaller, faster apps - BETA)
-          </label>
           <label class="form-switch">
             <input type="checkbox" id="settings-settime">
             <i class="form-icon"></i> Always update time when we connect
@@ -168,7 +169,14 @@
               <option value="">None (English)</option>
             </select>&nbsp;&nbsp;<span>Translations (<a href="https://github.com/espruino/BangleApps/issues/1311" target="_blank">BETA - more info</a>). Any apps that are uploaded to Bangle.js after changing this will have any text automatically translated.</span>
           </div>
-          <button class="btn" id="defaultsettings">Default settings</button>
+          <details>
+            <summary>Advanced Options</summary>
+            <label class="form-switch">
+              <input type="checkbox" id="settings-minify">
+              <i class="form-icon"></i> Minify apps before upload (⚠️DANGER⚠️: Not recommended. Uploads smaller, faster apps but this <b>will</b> break many apps)
+            </label>
+            <button class="btn" id="defaultsettings">Reset to default App Loader settings</button>
+          </details>
         </div>
         <div id="more-deviceinfo" style="display:none">
         <h3>Device info</h3>
@@ -187,7 +195,7 @@
     </footer>
 
     <script src="webtools/puck.js"></script>
-    <script src="webtools/heatshrink.js"></script>    
+    <script src="webtools/heatshrink.js"></script>
     <script src="core/lib/marked.min.js"></script>
     <script src="core/lib/espruinotools.js"></script>
     <script src="core/js/utils.js"></script>
diff --git a/lang/de_DE.json b/lang/de_DE.json
index 5ae7e449f..9f9af6b18 100644
--- a/lang/de_DE.json
+++ b/lang/de_DE.json
@@ -53,6 +53,13 @@
         "Delete all messages": "Alle Nachrichten löschen",
         "Unread timer": "Ungelesener Timer",
         "Quiet Mode": "Stiller Modus",
+        "Silent": "Still",
+        "Current Mode": "Aktueller Modus",
+        "Add Schedule": "Neue Aktion",
+        "Switch Theme": "Theme ändern",
+        "Options": "Optionen",
+        "Normal Theme": "Normales Theme",
+        "Quiet Theme": "Stilles Theme",
         "Utils": "Werkzeuge",
         "Piezo": "Piezo",
         "LCD": "LCD",
@@ -222,4 +229,4 @@
         "ten to *$2": "zehn vor *$2",
         "five to *$2": "fünf vor *$2"
     }
-}
+}
\ No newline at end of file
diff --git a/lang/index.json b/lang/index.json
index 474a530ab..201697664 100644
--- a/lang/index.json
+++ b/lang/index.json
@@ -24,5 +24,6 @@
   {"code":"sk_SK","name":"Slovak","url":"sk_SK.json"},
   {"code":"sl_SL","name":"Slovenian","url":"sl_SL.json"},
   {"code":"nn_NO","name":"Norwegian (Nynorsk)","url":"nn_NO.json"},
-  {"code":"hr_HR","name":"Croatian","url":"hr_HR.json"}
+  {"code":"hr_HR","name":"Croatian","url":"hr_HR.json"},
+  {"code":"ja_JA","name":"Japanese (beta)","url":"ja_JA.json"}  
 ]
diff --git a/lang/it_IT.json b/lang/it_IT.json
index 310af8580..72d7dbb51 100644
--- a/lang/it_IT.json
+++ b/lang/it_IT.json
@@ -200,7 +200,15 @@
         "Green": "Verde",
         "Blue": "Blu",
         "Black": "Nero",
-        "Show Week Number": "Mostra numero settimana"
+        "Show Week Number": "Mostra numero settimana",
+        "Calendar": "Calendario",
+        "Start": "Inizio",
+        "End": "Fine",
+        "Location": "Posizione",
+        "No location": "Nessuna posizione",
+        "No events": "Nessun evento",
+        "Today": "Oggi",
+        "Tomorrow": "Domani"
     },
     "//2": "App-specific overrides",
     "alarm": {
diff --git a/lang/ja_JA.json b/lang/ja_JA.json
new file mode 100644
index 000000000..8caff782b
--- /dev/null
+++ b/lang/ja_JA.json
@@ -0,0 +1,166 @@
+{
+  "// created with bin/language_render.js": "",
+  "GLOBAL": {
+    "New Alarm": "\u0000l\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\b\u0010\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\b\u0000Oð@\b|\u0004p\u0000\u0000\u0000@\u0004°\u0004\u0004\u001fx@8\u0000\u0000\u0000\u0004\u0000<\u0000\b\u0013ù\u0010\b\u0000\u001c\u0000\u0000\u0000@\u0001\u0000\u0000ÿ\u0004\t\u0000@\u0000\u0000\b\u0000\u0010È\u0000I\u0010`\u0007\u0004\u0010>\u0000\u0003Î\u0004\u0004\u0004\u0000\u0000@ü\u0000\t\u0000c\u0000OøI\u0010@\u0000\b\u0000\u0000\u0001\b\b`\u0004\u0004\u0000\u0000\u0000\u0000\u0010À\n\u0000H\bI\u0010\u0000\u0010\u0000\u0000\nr\u0001 \u0004ÿ\b\u0000\u0002\u0000\u0000\u0000x  \u0000H\b\u0011\u0000\u0000À\u0000\u0000\u0000\u0000\u0002\u0000\n\u0000\b \u00000\u0000\u0000\u0000\u0000\u0000\u001f\u001fù)\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000!\u0000",
+    "New Timer": "\u0000l\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\b\u0010\u0004\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000Oð@\u0000@\u0000\b\u0000\u0000\u0000\u0000\u0004°\u0004\u0004\u001f\u0007À\u0001\u0000À\u0000\u0000<\u0000\b\u0013ù\u0010\u0000 \u0007Â\u0000\u0000\u0001\u0000\u0000ÿ\u0004\b\f\u0000\u0000@\u0000\u0000\u0010È\u0000I\u0011H\u0003@\u0000\b\u0010>\u0003Î\u0004\u0004#\u0000Â\u0000\u0001\u0000ü\u0000c\u0000OøI\u0014\u0010\u0000 \u0003 \u0000\u0000\b`\u0004\u0002\u0000\u0002\u0000\f\u0000\u0000\u0000\n\u0000H\bI\u0010@\u0000 \u0000 \u0000\u0000\u0001 \u0004ÿ\b\u0000\u0002\u0000\u0001\u0000\u0000\u0000 \u0000H\b\u0013\u0000\u0000 \u0000\u0000\u0000\u0000\u0002\u0000\n\u0000\bÀ\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u001f\u001fù)\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000!\u0000",
+    "Save": "\u0000\u001f\u0010\u0000\b\u0000\u0004\u0000\u0017ð\b\u0000(#ÿø@@\u0001 \u0006\u0002\f\u0010\u0004\u0004( \u0018\u0010üP@!Á/üE@A\u0000@\u0001DA\u0004\u0003\bB\b\u0004\u0010\u0004P\b \b@",
+    "Keep Msgs": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u000bø\u0010 \u0001\u0000\u0000\u0000\u0010\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0002\u0000\u0002\u0004\b\u0000 \u00020\u0002\u0000\u0000\u0000@\u0000\u0000\u0000ÂA,\u0001 \u001fÄ\u000ft\u0000\u0000\u0000\u0010\u0000\u0000\u0000\bP<\u0000H#ðþ\u0000\u0002\u0000 \u0000\u0000\u0004x\u0000\u0000\u0000\u0010\u0004\u00003ø\u0010 \u0000\u0001\u0001\u0000\u0000\u0001b\u0000\u0000\u0006\u0000\u0001\b\f\u0010\u0004ÿà\u0000\u001c\u0000D\u0002a\u0004\u000f@ó\u0004\u0001\u0000L\u0000|\u0001\u0000Hpü\u0000\u0000@c\u0002_ð` \u0011\u00000 \n \u0004@\u0000\u0000\u0000 !\u0010à3þ\u0003À\u0010\u0010$\u0002\u0010\u0001\u0000\u0000\u0000\u0000\u0010\u0000 \u0004T4\u0002\u0000\u0010\b\u0004\u0010\u0000\u0004\u0000@\u0000\u0000\u0000\b\u0000H\u0001$\b\b\u00009\b\u0000\u0002\u0000\b\u0000\u0000\u0000L\u0000 \u0000Q\u0010A \u0002\u0000\u0011\u0000\u0001\u0000\u0001ð\u0000\u0000\f\u0000\b\u0000\u0018B\u0010\b\u0001\u0000\u0004L\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001ø\u0004\u0010\u0014\n\u0000\u0000à\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0004\u0002\u0001\u0000\u0000\u0000\u0000",
+    "circle count": "\u0000]\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\t$\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000* B\u0000\u0000\u0000\u0013\b\u0000\u001e\u0000Añ\u0010\u0000\u0000\u0000ä\u0002 \u0003H?Ñ\b\u0000\u0000\u0004@\t\u0000\" TO\u0000\u0000B\u0000H\u0001\u0010O  |\u0002 \u0002D\u0011\u0004DR\u0011\u0000ü\u0000!\u0000\u0012  @ \u0000\u0000\u0002\u0010\u0000\u0004\u001fÅ\u0004@\u0000\u0000\u0000\b$\u0010\"\u0010\u0004\u0000\u0000\u0000\b\u0000E\u0001@\u0010 \u0000\u0000\u0000\u00040\u0004\u0018\u0019\n\u0002\u0000\u0000\u0000\b\u0000A\u0000\u0003\u00000P \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003D@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000aA",
+    "(repeat)": "\u0000J\r\u0000\u0000\u0002\u0000\u0001\u0000\u0000@\u0000\b\u0010@ \u0000\u0000\b\u0000D\u0002\u0010\u0004$\u0000\u0000\u0002\u0000\t\u0000\u0001\u0006\u0000\u0000\u0000\u0002!\u0000@\u0000\u0000\u0000 \u0000`\b@\u0011Àð\u000e\u0000\u0018\u0002\u0010\u0007\u001f\u0002`\u0006\u0000\u0001\u0000\u0000\u0000\u0000\u0001\u0002\u0000@\u0000\u0000\u0000 \u0000`\u0000\u0010\u0000\u0000\u0000\b\u0000\u0014\u0000@\u0002\u0000\u0000\u0000\u0002\u0000\t\u0000 \u0000~\u0000\u0000\u0000\u0002 \u0010\u0000\u0000\u0000\u0000\u0000 \u0001\u0000",
+    "music": "\u0000\u001f\u0010\u0000\u0002\u0000\u0001\u0000\u0002\u0000\bÿà \u0000\u0000¢\u0000D\u0000\u0002ú?ÿ\u0012\u0000\u0000b\"\u001fð\u0007À  \u0002\u0000@Cÿøÿ*\u0001\u0001\u0000\u0002\u0002\u0006#\u0007ü0A\b\u0000",
+    "Auto snooze": "\u0000l\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000  \u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000\u0010\u0000CCÀ\u0000\u0000P\u0010\u0000\u0000\u0001\u0000\u0003È\u0003Ä\u0000\u0000\u0007à\u0000\u0000\u0010\u0000\u0001\u0000\u0000\u0000\u0000\u0002\u0007ð\u0000\u0000\u0001\u0000\u0000\u0010\u0000\b\u0000\u0000\u0000 \u0003\u0001\u0003à\u001c\u0000\u0002\u00009\u0001\u0003à\u0004\u0000P\u000fÀ\u00010\u0000 \u0000p\u000fÀ\u0000@\t\u0000\u0000\u0000\u0010\u0005\u0000\u0003\u0000\u0000\u0000\n\u0001\u0010\u0000\u0000\u0001\u0000\u0000\u0000H\u0000\u0000\u0001\u0010!\u0000\u0000\u0000\u0010\u00000@\b@\u0000\u0000`\u0010\u0000\u0000\u0001\u0000\f\u0004\u0003\u0004\u0000\u0000\u0018\b\u0003\u0000\u0000\u0000\u0010\u0000\u0000\u0000À\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "week": "\u0000\u001d\u000f\u0000Gü|ù\"\"$I\u0011\u001f>\u000bè\u0010DGÏóþ \u0004\u0011?$¾\t%\u0014OÉ/¢BI\u0001\u0013òP\u0018\u0000\u0004\u0000Çÿ \u0014\u0000\u0001\u0000@",
+    "circle 1": "\u0000E\r\u0000\u0002\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0001\b\u0000\u0000\u0000N\u0000 \u0000\u0004@\u0000\u0000\u0003\b\b\"\u0000\u0000\u0000\u0011\u0000$\u0000É>\u0000\u0000\u0001\b\u0001 \n>ð\b\t\u0010\u0010D\u0003ð\u0000\u0000H \u0000\u0000\b@\u0002H\u0004\u0011\u0000\u0000\u0000\u0002\u0000\"@ \u0010\u0000\u0000\u0000 \u0001\u0014\u0001\u0000\u0000\u0000\u0002\u0000\u0010À\b\b\u0000\u0000\u0000 \u0001\u0004\u0001ð\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000",
+    "circle 3": "\u0000E\r\u0000\u0002\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0001\b\u0000\u0000\u0000N\u0000 \u0000\u0004@\u0000\u0000\u0003\b<\"\u0000\u0000\u0000\u0011\u0000$\u0002\u0019>\u0000\u0000\u0001\b\u0001 \u0010¾ð\b\t\u0010\u0004D\u0003ð\u0000\u0000HÂ \u0000\u0000\b@\u0002H\u0001\u0011\u0000\u0000\u0000\u0002\u0000\"@\b\u0010\u0000\u0000\u0000 \u0001\u0014\b@\u0000\u0000\u0002\u0000\u0010ÀB\b\u0000\u0000\u0000 \u0001\u0004\u0001à\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000",
+    "circle 2": "\u0000E\r\u0000\u0002\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0001\b\u0000\u0000\u0000N\u0000 \u0000\u0004@\u0000\u0000\u0003\b<\"\u0000\u0000\u0000\u0011\u0000$\u0002\u0019>\u0000\u0000\u0001\b\u0001 \u0010¾ð\b\t\u0010\u0004D\u0003ð\u0000\u0000HÂ \u0000\u0000\b@\u0002H\b\u0011\u0000\u0000\u0000\u0002\u0000\"@\u0010\u0000\u0000\u0000 \u0001\u0014\b\u0000\u0000\u0000\u0002\u0000\u0010À@\b\u0000\u0000\u0000 \u0001\u0004\u0003ð\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000",
+    "show widgets": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0007ÿ\u0002\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\b\u0000\u0002\u0000ü\u0000\u0000\b\u0000\u0000\u0000a \u0000\u0000\u0000\u0000 \u0000\u0000\b\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0003À\u0000@\u0000\u0000\u0003à\u0000@\u0000 \u0000\u0000\u0000\u0000\b\u0000\b\u0000ð\u0000\u0003á\u0000\u0004\u0001\u0000\u0000\u0000\u0000\u0000@\u0000B\u0000\u0010\u000fÿè\b\u0000@\u0002\u0004\u0000p\u0002 \u0003\u0007\u0000\u0000@\u000e\u0000\u0000@<\u0000H\u0013\u0000c\u0003ÿø\u0004\u0001\u0004\u0003\u0000\u0004\u0000 \u0001D\u0000\u00040\u0000 \u0002\"\b@\u0000\u0000@\u0001\u0000\b@\u0004\u0000\u0002\b\u0011\b\u0002\u0000\u0004\u0000\u0004\u0000\b\u0000\u0002\u0000 \u0000$\u0000Â\b  \u0000 \u0004À\u0000x\u0000 \u0001\u0000\u0002\u0000\n\b\u0010@\u0000\u0001\u0000\u0018\u0000< \u0002\u0000\b\u0000\u0010\u00011\u0002\u0004 \u0000\b\u0000\u0000\u0000\u0000\u0000 \u0000@\u0000~\u0000 `P\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0000\u0001\u0000",
+    "heartrate": "\u0000/\u0010\u0000\u0000\u0000\u0010 \b \u0004\u0000 @@\u0004\u0000A\u0000¨\u0004\u0000àAð\b\u000fÐOô@\u0002 H\u0002\u0004A\u0012Q\u0012\u0002\nDR$\u0004\u0019ü\u0010(H\u0004b\tüQ\u0010\u000bD\u0010B \"\u0010A\u0001\u0010FB\u0002 \u0005\u0000ü\u0014\r\u0011\u0000\u0000\u0010aA",
+    "circle 4": "\u0000E\r\u0000\u0002\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0001\b\u0000\u0000\u0000N\u0000 \u0000\u0004@\u0000\u0000\u0003\b\u0004\"\u0000\u0000\u0000\u0011\u0000$\u0000i>\u0000\u0000\u0001\b\u0001 \u0005>ð\b\t\u0010HD\u0003ð\u0000\u0000HB \u0000\u0000\b@\u0002H\"\u0011\u0000\u0000\u0000\u0002\u0000\"Aø\u0010\u0000\u0000\u0000 \u0001\u0014\u0000\u0000\u0000\u0002\u0000\u0010À\u0004\b\u0000\u0000\u0000 \u0001\u0004\u0000 \u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000",
+    "battery warn": "\u0000n\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000H@\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0007ù\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0004Â \u0000\u0012\u0000\u0000\bð\u0004\u0010\u0000\u0000?b\u000fü\u0000(\u0000\u0000\u001c\u0000\b@\u0000\u0001\u0004PB\u0000D\u0000\u0000\u0000\u0000!\u0000\u0000\u0003Ð\b\u0000\u0000\u0000\u0000\u000f\u0000\u0000\u0000\tE\u0000 \u0002\u0010\u0002 \u0011À\u0002\u0010 |=cÿ\u0010 $@9\u0000\b@~\u0000\n\u0000\u0000\u0000@Q\u0000\u0004\u0000!\u0000\u0000\u0007ÿð\u0000\u0002\u0001\u0001\b\u0000 \u0000\b\u0000\u0000\u0000\u0000\u0003þ\u0010\u0004\u0000 \u0000\u0000 \u0000\u0000\u001fü\b\b\u0010\u0001\u0000\u0004\u0000\u0001\u0000\u0000\u0000\u0000\u0000  \u0000\u0000\b\u0000 \u0000\b\u0000\u0000\u0001ÿÀ\u0000\u0000@\u0001\u0000\u0000@\u0000\u0000\u0004\u0001\u0003þ\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u001fü\b\b",
+    "valid period": "\u0000=\u0010\u0000\u0002\u0000\u0010 \"\u0000\u0000\u0000\u0010\u0000A\u0001\u0013ãçÿÿ\b\u001fÑ\u0011\"\b\u0001þ@Dùð@\u0000\u000fÂ$DHø\u0012\u0012\u001f>>| A\b\u0011\u0000#\u0002\u0010$Hù/ð$$>DHJ@¡!\u0013â~b\u0004\u0002\t\b\u0012\u0012\u001fà(þ\u0002$@HD\b!B\u0011B \u0004!B\u0004¡\u0004Q\u0000¡\u0004\u0000B\u0010A\b\u0002",
+    "maximum": "\u0000\u001f\u0010\u0000\u001fð\u0001\u0000  \u0002\u0000À\u0004\u0000\b\u0001ÿ\u0000\u0010\u0000\u0000\u001fÿÿÿ@\u0011\u0000\u0000>ø\u0002E\u0010\u0005\u0000ú@\u0011\u0001\u0012\"\u0002ò\u0000\u001eJ\u0002\u0002\u0010¢\b\u0002\u0001`\u0003",
+    "weather circle": "\u0000]\u0010\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001ÿÀ\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u000fÿ\u0000 \u0000\u0000\u0001\u0000\u0000\u0000\u0002\u0000@\u0000\u0010\u0000\u0000\u0004à\u0002\u0000\u0010\u0004ÿ\u0000D\u0000\u0000\u00009\u0000\u0000@\u0000\u0002 \u0000\u0000\u0001\u0010\u0002CÿøÿÀà\u0000\u0000\u0010\u0012\u0000 \u0000\u0002\u0003è\b\u001f\u0000\u0000\u0002\u0000\u0004@?\u0000\b@\u0004\u0014\u0001\"\u0000\u0000\u0000\u0000$\u0010\u0003D\u0001\u0010\u0000\u0000\u0000 \u0002$\b\u0004 \u0001\u0000\u0000\u0000\u0002\u0000\u0011@\u0000P \b\u0000\u0000\u0000 \u0001\f\b\b\fE\u0000\u0000\u0000\u0002\u0000\u0010@!\u0018\b\u0000\u0000\u0000 \u0000\u0000\u0018\u0000À\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "minimum": "\u0000\u001f\u0010\u0000\u001fð\u0001\u0000  \u0002\u0000À\u0004\u0000\b\u0001ÿ\u0000\u0010\u0000\u0000\u0002\"?ÿB\u0011\u0000\b>ø!\u0004E\u0010B\u0004úA\u0004\t\u0012\b\u0012ò\u0000\u0010\u001eJ\u0000 \u0010¢\u0001@\u0001\u0001\u0000",
+    "step length": "\u0000\u001f\u0010\u0000\u0001\u0000\b\u0000\u0002\u0000\u0013øGà@\u0000\u0001\u0000\u0001\u0010\u0004\u0002 \u0001\u0000?ÿÿ\u0018\u0010\u0001\u0010P \"\u0011 @DP@\t \u0004\f\u0001\u0002\u0000`\u0002\u0004\u0007\u0000\u0004(p\u0000\b ",
+    "distance goal": "\u0000?\u0010\u0000\u0000\u0000\u0010(\u0000\u0000\u0010\u0000ûü\u0010Hð'ý\u0014\u0001ý\u0000 AB(\u0000£ñ\u0000@äP\u0004\u0000ÕO¿©\u0007ÿ\u0002*A\u0010_\u0002\f\b?¤\u0010\u0004\u001c\u0000]\u0004\bH \bUü¢\bþüð¨\u0001GñE \"Oú\u0002ªA\u0000@\u0005Ð\u0005Ô\u0000\n \b/Ä\u0001\u0002$P\u000fþ\u0004¨\u0000! \u0010\u0004\b ",
+    "Circle": "\u0000;\r\u0000\u0002\u0000\u0000\u0000\u0010\u0000\u0000\u0004 \u0000\u0000\u00018\u0000D\u0000\u0000\u00009\u0000\b\u0000\u0000\u0004@\t\t>\u0000\u0000\u0001\b\u0001 ú\u0002\u0007À\"\u0000$D@?\u0000\b@\u0004\u0000\u0000\u0002\u0010\u0000\u0011\u0000\u0000\u0000\u0002\u0000\"@@\u0000\u0000\u0000\u0004P\b\u0000\u0000\u0000 \u0001\f\u0002\u0000\u0000\u0000\b\u0000A\u0000\u0000\u0000\u0002\u0000\u0000\u0000",
+    "min. confidence": "\u0000O\u0010\u0000\u001fð\u0001\u0000\u0000@\b@\u0001\u0000  \u0002\u0000\u0000\u0010@\u0001\u0000À\u0004\u0003ïø/øÿø\b\u0001\u0015\u0010\u0001\u0011\u0001ÿ\u0000\u0010\u0002\t\u0001\u0000\u0002\"\u0000\u0000\u0002\"\b?Æ?ÿ¿ÿB\u001eD\f\u0000\b\u0011\u0000\b%(\u0000\u0011\u0010>ø!\u0004Íþü#àE\u0010B\u0004  \u0000@\u0000úA\u0004\t$@@\u0000¿Á\u0012\b\u0012Oðá ò\u0000\u0010\u0007\u0001\u0010D\"\u001eJ\u0000 \t\"\u0002 8\u0010¢\u0001@\u0000!\u0001\u0001\u0000\u0000\b\u001c\u0007",
+    "colorize icon": "\u0000k\r\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\bà\u0000\u0000\u0010ø\u0000\u0010\u0000\u0000\u0000\u0000\u0010\u0000à\u0000\u0000\u0001á\u0000\u0004\u0002\u001f\u0001Cà\u0000à\u0000\u0000\u0000@\u0001\u0000< \b\u0017Ä\bä\u0000\u0000\u0000\u0000À\u0000\u0004\u0000\u0010à\u0007À\f\u0000h\u0000\u0000\u0000\u0010\u0000\u0010?\u0000\u0001\u00000\u0000\u0010\u0000\u0010\u0000\u0004\u0000\u0000\u0000 \u0000\u0010\u0000\u0004\u0000\u0004\u0010\u0000\u0000\u0000\u0004\u0000\u0002\u0000\u0000\u0001\u0004\u0010\u0000 \u0000\u0000\u0001\u0000\u0000@\u0001ð\u0000A\u0014\u0000\b\u0000\u0000\u0000 \u0000\b\u0001Â\u00010A\u0006\u0000\u0000\u0000\b\u0000\u0001\u0000\u0000\u0000\u0018\u0000 \u0003\u0000\u0000\u0000\u0002\u0000\u0000 \u0000\u0000\u0000\u0000",
+    "Heartrate": "\u0000/\u0010\u0000\u0000\u0000\u0010 \b \u0004\u0000 @@\u0004\u0000A\u0000¨\u0004\u0000àAð\b\u000fÐOô@\u0002 H\u0002\u0004A\u0012Q\u0012\u0002\nDR$\u0004\u0019ü\u0010(H\u0004b\tüQ\u0010\u000bD\u0010B \"\u0010A\u0001\u0010FB\u0002 \u0005\u0000ü\u0014\r\u0011\u0000\u0000\u0010aA",
+    "data": "\u0000*\u000e\u0000\u0000 \u0000\u0000\u0000\u0000$\u0000\u0000\u0002\u0004u\u0000\u0000\u0000@á\u0000\u0000\u0000\u001f\u0000\u0000\u0000\u0000\b`ð\u0000\u0000\u0002'À\u0010>\u0001H\b\u0003ð\u0000\u0002\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000@\u0000\u0000\u0000@ \u0000\u0000\u0000 \u0010\u0000\u0000\u00000\b\u0000\u0000\u00000\u0000",
+    "Yes\ndefinitely": "\u0000%\u0011\u0000\u0001\u0000\u0000\u0000\u0004\u0004\u0000\u0000\u0000\u0010 \u0000\u0000\u0000¡Â\u0000\u0000\u0004ø\b\u0018\u0000@@@ \u0002\u0002\u0002\u0000\u0010\u0010\u0011\u0004\u0006`M<\u0002\u0002R0\u0018\u0000\f@@\u0000\u0004p\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000",
+    "Launcher Settings": "\u0000m\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u001f\u0000 \u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0010þ\u0000\u0000\u0000\f\u0000\u0000\u0000\u0000\u0007ôB\u0000\u0013\u0006\u0000\u0007\u0000\u0000\u0000\u0000\u0000\" \u0001\u0000à\b\u0010\u0002\u0000\u0000\u0000\u0000\u0000ú\f\u0000\u00029\u0000 \u000f@\u0000\u0000\u0000 \u0003ÿ\b\u0000\b\u0011À\u00018 |>þ\u0000\u0000@\u0000@r\u0000\u000e@ü\u0000\u0002\u0010\u0004\u0000\u0004\u0000\u0004\u0000\u0010\u0003Ä\u0000\u0000\u000f \u0000 \u0000@\u0000\u0001@\u0000\u0000DH\u0011ø\u0002\u0000\u0004\u0000\b\u0000\b\u0000\u0000\u0002\"\u0000 \u0004À\u0000@\u0000 \u0000\u0000\u0011\b\u0004@\u0006\u0000\u0018\u0000\u0004\u0000\u0001\u0000\u0000\u0000ø R\u0000À\u0000\u0000\u0000@\u0000\b\u0000\u0000\u0004Hà\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001@\u0000",
+    "TAP right top/bottom": "\u0000u\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\b\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000@\u0000@\u0000\u0000@\u001fÿÂ\u0000\u0000\u0000\u0000$\u0002\u0000\u0002\u0000\u0000\u0002\u0000\u0002\u0000\b\u0000\u0000\u0001\u001f'ÿð\u0010\u0000\u0007ÿð\u0010\u0000|\u0000\u0000\u0007\u0016\u0001\u0000\u0000\u0000\u0000\u0000\u0004 \u0000\u0000\u0000\b\u0000\u0004\u0000\u0004\b\u0000\u0004\u0000\"\u0000\u0000\u0000\b\u0000\u0000?@@\u0000$\u0002\u0002 \u0000@\u0004\u0000\u0001\u0000\u0004\u0004\u0000\u0001\u0010#\u0000H\u0004\u0000à\b\u0000 ?à\bB\b\u0001D\u0000 \u0005\u0001\u0000@\u0002\u0002\u0010\u0000A\u0000\b@\u0002\u0000H\b\u0002\u0000\u0010\u0010\u0002\b\b\u0000\u0002\u0000 \u0004@@\u0010\u0001\u0001\u0004\u0000\u0010\u0000\u0000 \u0002\u0000\u0002\u0002\u0000\u0010\u0010 \u0000\u0018\u0000\u0002\u0000 \u0000\u0010\u0010\u0004\u0000\u0001\u0000\u0004\u0003\u0000\u0000 \u0000\u0000\u0000ÿÿà\u0003ÿà \u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0004\u0000\u0000\u0000\u0000\u0000\u0001\u0000",
+    "Font": "\u00008\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000 x\u0000\u0000À\u0000 \u0000\b\u0000 @ \u0001\u0000\u0004\u0000\u0010@ \u0001\u0000\u0000\u00008\u0002\u0000|\u0000\u0000&\u0002\u0000\f\u0000\u0001\u0000!\u0004\u0000\u0014\u0000\u0002\u0000 \b\u0000$\u0000\u0004\u0000 \u0010\u0000D\u0000\u0000  \u0000\u0000`\u0000 \u0000\u0000\u0004\u0000\u0000\u0000 ",
+    "Mark Unread": "\u0000L\u0010\u0000\u0001\u0000  \u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0001\u0002\u0000\u0000\u0000\u0010\u0000\u0000\u0001\u0000\u0003þ \u0000\u0000\bÃÿÂ\u0001\u0000\u0004\u000ft\u0001\u0000\u0001ü\u0010ð?\u0000\u0010\u0007\u00011\b\u0000\u0010\u0001\u0000\u0003þ  \u0003\u0002\u000fÿç \"\u0000\u0000L\u0000|\u0003\u0004\u0004 \u0000\u0004@\f T\u0007\u0002\u0000\u0000<\u0001\u0001\t H\"\u0000\u0000@ \u0011\u0011\u0004\u0002 \u0000\b\u00009!\bH\u0011ø\u0000\u0004l\u0010g!\u0000\u0000\u0010\u0000D\u0001\u0000I\u0012\u0010\u0000\u0002\u0000\u0003\u0010\u0000 à\u0000\u0000\u0000\u0000\u0000",
+    "start&lap/reset, BTN1: EXIT": "\u0000Æ\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002@\u0000\u0000\u0004\u0000\u0000\u0000\u00008\u0000@\u0000\u0000\u0001\u0000\u0000\u0000\u0004p\u0000\u0000\bù\u0000\u0000\u0002\b\u0001\u0000\u0000\u0000\u0001\u000f \u0001ð\u0000\u0000\u0004\u0000\u0007à\u000e\u0000\u0000\u0000\u001cX\u0007à\u0004 \u0004\u0000\u0000\u0000\u0004\u0001\u0000\b@\u0000\u0000\u0010\u0000``\u0001À\u0000\u0000\u0001\u0000``\u0010\u0011à\u0000\u0000\u0010\u0004\u0000\"\u0000\u0000\u0000@\u00019\u0000\u0000\u0000\b\u0001B\u0000X\u0000\u0000@ \u0001H\u0010>\u0001À\u0006\u0006\u0007\u0004\u0001\u0010\u0000 \u0006\u0006\u0001\b\t\u0001\u0010\u0001À\bÀ?\u0000\u0004À\u0007à\u0000\u0010\u0012 \u0001\u0000\u0007à\u0004 \u001c \u0012 \u0004\u0005\u0000A\u0000\u0000\u0000\u0010~\u0018\u0000(\u0004\u0000~\u0018\u0010\u0011\u0000(\u0010\"\u0000\b\u0000\u0000\u0000@\u0006\u0006`\u0002\u0000\u0000 \u0006\u0006`\u0004\u0000@\u0000\u0000C\u0004\u0000@\u0000\u0000\u0001\u0000\u0018\u0006\u0000\u0010\u0000\u0010\u0001\u0000\u0018\u0006\u0000\u0010\u0001\u0000\u0000\u0010\u00010\u0010\u0002\u0000\u0000\u0000\u0004\u0000`x\u0000\u0000\b\u0000`x\u0000\u0002\u0000\u0000\u0004\u0000\u00000\u0000\u0000\u0000\u0010\u0000~\u0018\f\u0000\u0004\u0000@\u0000~\u0018\u0004\u0000\u0007À\u0004\u0000\u0010\u0000\u0003\u0000\u0000\u0000\u0000@\u0000\u0000\u0000À\u0000 \u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000 \u0000@",
+    "App Source\nNot found": "\u0000Z\u0011\u0000\u0000\u0000\u0000`\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000$\u0000@\u0000 \u0000\u0000\u0000\b|\bù\u0002\b\u0004\u0004\u0000\u0000\u00049á\u0001ÅB\u0000\u0000\u0000\u0000ò\u0000\u0001\u0000\u0010\u0010@\u0000\u0000\u0001\u0002@\u0000\u0004 \u0004 \u0000\u0000\u0000@`\u0000 \u0001\b\u0001\b\u0010>\u0000 \u0010\u0000\u0010\u0000B\u0000\u0004\u0003ð\u0000\b\u0004\u0000\u0004\u0000\u0010\u0001\u0000\u0000\u0000\u0005\u0001\u0000\u0002\u0000\u0000@\u0000\u0000\u0000\u0002 \u0001\u0000\u0000\u0010\u0000 \u0000\u0000\u0003\u0004 \u0000\u0000\b\u0000\u0010\u0000\u0000\u0003\u0001\u0010\u0000@\u0000\u0004\u0000\b\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0002\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000À\u0000\u0000\u0000\u0000\b\u0000\u0010\u0000\u0000\u0000",
+    "Show clocks": "\u0000k\u0010\u0000\u0000@@@\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0004\b\u0001\u0000\u0000@\u000fþ\u0000@\u0000\u0003á\u0000\u0000\u0010\u0003ÿà\u0000\u0000\u0004\u0000FEüþ \u0012À\u0001\u0000\u0000\u0000@ø\u0007H\u0000\u0004\u0001à\u0000 \u0000\u0000\u0007ð\u0000\u0011\u0010ð\u0010\u0000ÿà\u0000\u0000\u0002\u0000\u0004#ÿ\u0001ÿ\u0002\u0010\u0000ÿ\u0001À\u0001\u0007ÀÂ\u0000ó\u0010\u0000\u0010\u0000L\u0000|\u0010\u0000@1ÿü\u0002\u0000\b\u0018Q\b\b`\u0001@\u0004D\u0000ð\u0004\u0006 B!\u0000\u0014\u0000D@@\u0002\u0001\u0000ÄD \u0004\u0018P!\u0004\u0000\u0003\b\u0001\u0000\u0005\u0004\b @\u0010\u0000\u0010!ð \u0003$b\u0004\b\u0004\u0000\u0011\u0000\u0014\"\u0010\u0003ð\u0005\u0003\u0002\u0001\u0000\u0001À\u0001\u0000\u0002\u0000\u0000\u0000À\u0000 \u0000\u0000\u0000\u0000",
+    "STEPS": "\u0000\u001f\u0010\u0000\u0001\u0000\b \u0002\u0000@Gà¨\u0000Añ\u0010\u000fôB \u0005H¿ÿQ\u0000DR\u0001\u0010\u0010(\"\u0011üPDPA\t\"\u0010\f\u0006B`\u0003\u0005\u0007\u0000\r\u0011p\u0000aA",
+    "Vector font size": "\u0000½\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0002\u0000@\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0002\u0000\u0002@H\u00018\u0000\u0000\u0000\u0001à\bx\u0000\u0000\u0000\u0000\u0002\u0000\u0004 \u0000\u0010\u0010ê\u0001@\u000e@\u0007À\u0000\u00004<@\u0000\u0000`\u0000\u0010\u0000\u0011\u0000\u0001\u0000y@H\u0000D\u0000B\u0000\u0000\u0002\"\u0000\u0002\u0000 \u0000\u0000\u0000\u0000\u0010\u0000\u0010\u0005\u0000\u0004 \u0002 \u0000\u0000\u0011\b\u0000 \u0000\u0002\b\u0004\u0000$ø\u0003\u0000\u0000D\u0000\"\u0000)\u0002\u0007Á\u0010@\u0001\u0000\u0000\u00008\u0000ú\u0000h\u0000\b\f\u0010\u0002\u0010\u00020\u000fÀ\b\u0000\u0010\u0003à\u0000\u0004\u00010\u0001\u0010\f \u0000@\u0000`!\u0000 \u0000\u0000H\u0010\u0000\u0003\u0000\u0000@\b@\b\u0001\u0000\u0005\u0000\u0000À\b\u0000\b\u0000\u0000\u0002A\u0000\b\u0000(\u0000\u0004\u0000@\u0000D\u0000\b\u0000D\u0000\u0000\u0000\u0000\u0000\u0000\u0014\b\u0000\u0002@\u0000@\u0002\u0000\u0000@\u0000@\f\u0010\u0000\u0000\b\u0000\b\u0000\u0000\u0000A\b\u0000\"\u0000L\u0000\u0010\u0000\u0002\u0000\u0002\u0001\u0000\u0000\u0001\u0000\u0000\u00000\u0000\u00020\u0001\u0000\u0000 \u0000\u0010\u0000\u0000\u0000\u0000\b\u00000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0002\u0000\u0000\u0000\u0000",
+    "View Message": "\u0000z\u000f\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000À\u0000\u0000@\u0000\u0000\b\u0000\u0000\u0000\u0000\b\u0002\u0000\u0010\u0010\bÀ\b\u0000\u0000\u0001\u0000\u0000\u0000\u0003\t\u0004°\u0004\u0004\u0001Ð\u0002\u0000\u0000\u0000@\u0000\u0000\u0000!@ð\u0001ÿ\u0000\b\u0000\u0000\u0000\u0011à\u0000\u0000\u0000@\u0010\u0000@@\u0004\u0006 \u0000\u0000\u0005\u0000\u0000\u0018\u0000\u0004 \u0010\u0010\u0002\u0000p\u0001\u0010\t\u0010>\u0001\u0002\u0003Î\u0007ü\u0001ð\u0004\u0001\"\u0001Â\u0003ð\u0000\u0001\u0001\u0001\u0001\u0000Â\u0002(\u0011\u0000\u0000\u0000\u0000\u0000@@@@\b@\u0004\u0000\u0000\u0000\u0000@\u0002\u001fð \u0010@\u0000\u0010\u0001\u0000\u0000\u0000\u0000 \u0001 \u0001\u0010\u0000ä \u0000\b\u0000 \u0000\u0000\u00010\u0000\u0000D\u0000F0\u0000\u0004\u0000\u0007À\u0000\u00000\u0000 \u0000!\b\u00110\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0007à0B\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00000\u000f\u0000",
+    "Are you sure": "\u0000n\u0010\u0000\u0001\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0001\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0002D\u0004\u0000\u0000\u0000\u0000\u0000\u0000ð\u0000\u0000ü\t \u0010ð@\u0000@\u0000\r \u000fð\u000e\u0000\u0004\u0000L`D@À0T\u0007ÿ\u0002\u0002\u0001\u0002\u0001\u0001\u0010\u0000ÁP\u0000\u0002\b\u0000\b\u0002\b\u0002\b\u0000\u0003\t \u0000\b \u0000\"\b\"\b\"\b\u00000D@\u0000 \u0000`` \u0003\u0002\u0010ÿ \u0001@@A\u0000\f\u0013ù\u0000\u0002\n\u0006\u0000\u0006\u0000\n\u0004\u0000\u0000\u0002\u0000\b\u0011ø\b\u0000\b\u0000\u0010`\u0000À\u0004\u0000\u0000 @\u0000\u0000\u0000\u0000\u0000\u0006\u0000\u0003\u0000\u0010\u0007ÿ\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Bluetooth": "\u0000F\u000b\u0000\u00000\u0000\u0000\u0000\u0000\u0000\u0000à@\u0000\u0000\u0000\u0000\bA\u0000\u0000\u0002\u0000\u0000\u0002\b!\u0004!\u001e\b\u001e\u001e\b.\u0010øøÇàB\u0012\u0010\u0012\u0010\u0018A\bOÂ\bHB\ba\u0004! \b!!\b!\u0010  \u0010B2\u0010\u0012\u0010\u001fÇG@",
+    "Unread timer": "\u0000m\u0010\u0000\u0001\u0000  \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000ÿ\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000ñø@\u0007\u0002\u0000\u0000@\u0000\u0000\u0000\u0000\u0010\u0000\u001fÀÒ\u0000\u001f\u0000\u0004\u0002\u000f\u0000\u0000\u0000<\u0000\b\u0001\b\u0000@\u000f\u0000\u0000\u0004\u0000\u000føD \b\f\u0000\u0000@\u0000\u001fÿÏ@DA\u0000¤\u0001 \u0000\u0004\b\u001f\u0003\u0004\u0004\"\b\bÀ0\u0000@?\u0000*\u0003Ä @\u0000\u0004\u0000d\u0000\u0000\u0002H\u0012$\t\u0004\u0000 \u0000 \u0000À\u0000\u0000\"  P \u0002\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0010\u0001\u0006\u0000 \u0000\b\u0000\u0004\u0000\u0000`<\u0000À\u0006\u0000\u0000@\u0000\u0000\u0000\u0000\u0004\u0001$H\u0000\u0000À\u0000\u0002\u0000\u0000\u0000\u0000\u0000 \u0000AÀ\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Delete all messages": "\u0000Ç\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\b\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0001$\u0011á\u0000\u0004\u0004\u0000\u0000\u0000\u0001À\u0000\u0000\u0002\u0000\u0000\u0000@\u0000\u0000\u0000\u0000@\u0010\u0001H\"B\u0000\u0004\u000f\u0001\u0004<\u0000<\u0000\u0002\u0000\u0000\u0000@\u0000\u0000\u0000ÂA,\u0002¢E\n\u0004\u0007ð\u0000\t\u0007\u0001¤\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000Bà\u0001\u0004\"\u0007à \u0001\u0000@\u0004D\u0000\b\u0000\u0000\u0001\u001e\u0000\u0000\u0000\u0004\u0001\u0000\u001fÉ\u0018\u0000\u0001À\u0004\u0000\b\u0003\u0010\u0000\u0000\u0002Ä\u0000\u0000\f\u0000\u0002\u0010 *û\u0001À\u0010\u0002\u0000\"\b\u0001À\u0004@&\u0010@ø\u0004\b\u000f8A$H@\u0004\b@\u0004\u0000D\u0010\u0000$@8@~\u0000\u0000 1þH\b\u000f\u0000\u0000À\b\u0000 \u0002(\u0011\u0000\u0000\u0000\u0000\u0001\u0004/ð\f\u0002\u0000\u0000`\u0010\u0001 \u0004B\u0000 \u0000\u0000\u0000\u0002\u0000\u0014\u0002\t#B\u0000\u0000\b\u0000\u0000\u0000 \u0002\u0000\u0010\u0000\u0004\u0000@\u0000\u0000\u0000\b\u0000H\u0007òE\u0015\u0000\u0000\u0010\u0000\u0000\u0000 \u0002\f\u0000@\u0000\u0010\u0000@\u0000\u0000\u0002`\u0001\u0000\b I\u0000\u0000@\u0000\u0000\u00008\u0000`\u0003\u0000\u0000@\u0000|\u0000\u0000\u0003\u0000\u0002\u0000\u0010A\u0011\u0011\u0000A\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0018\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003ð\" ¢\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000B\b@\u0000",
+    "No Messages": "\u0000k\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000 \u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0004\u0001\u0000\b\u0000\u0002\u0000\u0000\u0000@\u0000\u0000\u0000Â@(\u0000\u0000@\u0000\u0000\b\u0000\u0000\u0000\u0004(~\u0000\u0010\u0000\b\u0000\u0000\u0001\u001e\u0000\u0000\u0000\u0004\u0001\u001c\u0002\u00001\u0000\u0000\u0000,@\u0000\u0000À\u0000@À@\u0001À\u0004@&\u0010@ø\u0004\b\b \b\u0000\b\u0002D\u0003\u0007à\u0000\u0002\u0002\b\u0001\u0000\u0002(\u0011\u0000\u0000\u0000\u0000A\u0000 \u0000H\u0004 \u0002\u0000\u0000\u0000\u0000 \u0010 \u0004\u0004\u0010\u0000\u0004\u0000@\u0000\u0000\u0000\b\u0000<\u0000\u0004\u0000\u0001\u0000\u0004\u0000\u0000\u0000&\u0000\bÀ\bÃ\u0000\u0000@\u0000|\u0000\u0000\u0003\u0000\u0001\u0014\u0000á\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u001c\u0000\u0000\u0000",
+    "Record Run": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0004\u0000\u0010\u0000\u0011ø\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\t\u0000\u0004?\n\u0002\u0000 \u00021\u001c\u0000\u0000\u0000\u0000\u0000\u0000\u0000MA,\u000fàB@\u000ft8\u0000`\u0000\u0003`\u0000\u001d@<\u0000\u0000\u0011\u0007àþ\u0000\u0002\u0000p\u0004\b\u001f\u0000\u0004\b\u0004@\u0004\u0000|\u0004¸\b\u0000\u0001\bä\u0000\u0000\u0000\u0000\u0002\u0010\u0001\b\u0000\u0001\u0004\u0002\u0000à\u0000Á\u0000\u0001\u0000\u0000\u0000\u0001\u0000\u0000óÏÁ?àL\u0000|\u0000@\u0000@\u0000\u0000\u0000@B\u0000c\u0000\u0002\u0013ð\u0011\u00000 \u0000 \u0000\u0000\u0000 !\u0000!|\u0012\"\u0003À\u0010\u0010\b\u0000\u0010\u0000|\u0000\u0010\u0000@\u0000 \u0011 %]\u0000\u0010\b\u0004\u0004\u0000\b\u0003à\b\u0000 \u0000H\u0004H\u0005\b\u00009\u0002\u0000L\u0000\u0000\u0000L\u0000\u0010\u0000 \u0001\u0012\tD\u0002\u0000\u0011\u0000\f\u0000\u0000\u0000\f\u0000\b\u0000\b\u0000|\u001e\"\u0001\u0000\u0004C\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0001ø\u0011\u001f¸(\u0000\u0000à\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0004\u0000\u0000\u0000\u0000",
+    "Apps": "\u0000)\u000e\u0000\u0000\u0000\u0000`\u0000\u0000\u0000\u0000H\u0000¡ð#ä\b/\b\u000e,\u0002\u0010\b\u0000\u0010\u0001\bH\u0000\u0010\u0000\u0018\u0000\b\u0000B\b\u0000\b\u0000!\u0004\u0000\u0004\u0000\u0010\u0000\u0004\u0000\u0000\u0000\u0004\u0000\u0000A\u0000\u0004\u0000\u0000A\u0000\u0004\u0000\u0000A\u0000\u0000\u0000\u0000@",
+    "BTNs 1:startlap 2:exit 3:reset": "\u0000Æ\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u001c\u0000 \u0000\u0000\u0000\u0000\u0000\u00028\u0000\u0000\u0004|\u0000>?¡\u0000\u0000\u0004\u0000\u0007\u0000ø\u0000\u0000\u0002\u0000\u0003ð\u0007\u0000\u0000\u0000\u000e,\u0000\u001e\u0010Ä\u0000\u00000\u0000\u0000\u0004 \u0000\u0000\b\u000000\u0000à\u0000\u0000\u0000\u0000\u0010C\u0011à\u0001@À\u0002\u0000\u0011\u0000\u0000\u0000 \u0000ÀÁ\u001c\u0000\u0000\u0004\u0000\u0002\u0018A\nH@\u0001\u0003\u0000\u0010\u0000¤\b\u001f\u0000à\u0003\u0003\u0003\u0000\u0000\u0010\u0000\u0000~\u0004) \u0000\u0004\u0000\u0000@\u0004`\u001f\u0002`\u0003ð\u0000\b\t\u0010\u0000\u0000\u0006\u0010`\u0000\u0010\u0000\u0002 \u0000\u0000\b@?\f\u0000@\u0014@\u0002\u0000\u0000\"\u0010BP`\u0000@\u0000\u0011\u0000\u0004\u0000\u0000\u0000 \u0003\u00030\u0001\u0000B\u0000\u0010\u0000\u0001\bA\bÀ@\u0001\u0003\u0001\u0000 \u0000\u0000\u0000\f\u0003\u0000\b\u0000\b\u0000\u0000\b!\u0004#!\u0000\u0004\f\u0018\b\u0001\u0000\u0000\u0000\u0002\u00000<\u0000@\u0000@\u0004\u0000\u0000 ø\u0010x\u0000|\u0000\u0000\u0000\u0018\u0000\u0000\u0000\b\u0000?\f\u0006\u0000\u0002\u0000 \u0000\u0000ü\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0000\u0000 \u0000\u0000\u0000`\u0000\u0010\u0000\u0000\u0000\u0000\u0000",
+    "Delete All Messages": "\u0000Ç\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\b\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0001$\u0011á\u0000\u0004\u0004\u0000\u0000\u0000\u0001À\u0000\u0000\u0002\u0000\u0000\u0000@\u0000\u0000\u0000\u0000@\u0010\u0001H\"B\u0000\u0004\u000f\u0001\u0004<\u0000<\u0000\u0002\u0000\u0000\u0000@\u0000\u0000\u0000ÂA,\u0002¢E\n\u0004\u0007ð\u0000\t\u0007\u0001¤\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000Bà\u0001\u0004\"\u0007à \u0001\u0000@\u0004D\u0000\b\u0000\u0000\u0001\u001e\u0000\u0000\u0000\u0004\u0001\u0000\u001fÉ\u0018\u0000\u0001À\u0004\u0000\b\u0003\u0010\u0000\u0000\u0002Ä\u0000\u0000\f\u0000\u0002\u0010 *û\u0001À\u0010\u0002\u0000\"\b\u0001À\u0004@&\u0010@ø\u0004\b\u000f8A$H@\u0004\b@\u0004\u0000D\u0010\u0000$@8@~\u0000\u0000 1þH\b\u000f\u0000\u0000À\b\u0000 \u0002(\u0011\u0000\u0000\u0000\u0000\u0001\u0004/ð\f\u0002\u0000\u0000`\u0010\u0001 \u0004B\u0000 \u0000\u0000\u0000\u0002\u0000\u0014\u0002\t#B\u0000\u0000\b\u0000\u0000\u0000 \u0002\u0000\u0010\u0000\u0004\u0000@\u0000\u0000\u0000\b\u0000H\u0007òE\u0015\u0000\u0000\u0010\u0000\u0000\u0000 \u0002\f\u0000@\u0000\u0010\u0000@\u0000\u0000\u0002`\u0001\u0000\b I\u0000\u0000@\u0000\u0000\u00008\u0000`\u0003\u0000\u0000@\u0000|\u0000\u0000\u0003\u0000\u0002\u0000\u0010A\u0011\u0011\u0000A\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0018\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003ð\" ¢\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000B\b@\u0000",
+    "Vibration": "\u0000|\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0004\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000H\u0000@G¨\u0010\u0000\u0000\u0000\u0018\u0000\u0000\u0000\u0000\u0000\u0002\b\u0003\u0001\u0000\u0000\u0000\u0000@\u0000\u0000\u0003\u0000\u0011 \u0001\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0010\u0000`\u0000\u0010\u0001\u0000\u0000\u0000\u0003\u0000\u0000<\u0000A\b@\u001a\u0000\u0001\u0000\u0010\u0000ð\b\u0010\u001c@\u0000!\u0002\u0006\u0010\u0000 \u0001\u0002\u0007à\u0000\u0002\u0000\u0004\u0000\u0002\u0010 \u0001\u0000\u0002\u0000\u0010@\u0000\u0000\u0000@\u0003À\u0000B\u0001\u0000\u0010\u0000@\u0001\b\u0000\u0000\u0000\b\u0001È\u0000\b@\u0010\u0001\u0000\b\u0000\u0011\u0000\u0000\u0000\u0001\u0000\u0000\u0001\b\u0001\u0000\u0010\u0001\u0000\u0001`\u0000\u0000\u0002`\u00008\u0002`\u0000\u0000\u0001\u0000 \u0000\u0018\u0000\u0000\u0000\u0018\u0000\u001c@\u0018\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Utils": "\u0000{\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\bð\u0000\u0000\u0004\u0010\bð\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000à\u0000\u0000\u0000B\u0000à\u0000\u0000\u0000\u0000#\u0000\u0000\u0000\u0000\u0000@\b@\u0000\u0000\u0000@\u0000\u0003\u0000\u0000\u0000\u001e\u0000\u0010\u0001\b\u0000\u001e\u0000\u0010\u0000\u0000\u0002\u0002\u0007Á\u001c\u0000\u0004\u0000!\u0001\u001c\u0000\u0004\u0002\u0007À?\u0000\u001c\u0003\u0004 \u001c\u0003?\u0000\u0010\u0000\u0000\u0000\u0010\u0003\u0000\u0000\u0010\u0003\u0000\u0000\u0007À\u0000\u0000\u0004\u0000\u0002\u0000\u0001\u0000\u0004\u0000\u0002\u0000\u0000\u001f\u0004\u0000\u0000\u0000\u0000@\u0000 \u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\b\u0000\b\u0000 \u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0001\u0000\u0002\u0000\b\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000 \u0000\u0002\u0000\u0000 \u0000\u0000",
+    "Piezo": "\u0000+\u000e\u0000\u0000\u0000\u0000\u0000\u0000@0\u0000\u0000\u0000¦\t\u0000\u0000\u0004\n¡ \u0001ÀAD\u0018\u000fÀ\u0004 \u0000 \u0000\u0011À\u0002\u0000\u0010À\u0000@\u0000 @\u0000\b\u0000\u0004\b\u0000\u0001\u0000\u0001\u0001\u0000\u0000~\u0000 \u0010\u0000ð \b\u0001ø\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000",
+    "BLE": "\u0000\u0016\n\u0000øþ\u0012\u0002\bH\b!  øú\u0012\u0002\bH\b!  ãóð",
+    "Make Connectable": "\u0000l\u0010\u0000\u0010 \u0001\u0000\u0000\u0000\u0010@\u0000\u0000\u0000\u0000\u0000\u0001\u0002\u0000\u0010\u0007ÿâD@\u0000\u0000\u0010\u0000\u0000\u0010P!\b\u0000\u0010BH \u0000\u0000\bÁ\b\u0010\u0001\u000f÷\u0001\u0000\u0004\u000ftý\u0004!\b\u001f\u0010\u0001@\u0010ð?\u0000/¢\u0010\u0011\u0000\u0004!1\b\u0000\u00100 ?ø\u0011\u0010~B  \u0003\u0002\u0003\u0000\u0010\u0011\u0004#â\u0000\u0000L\u0000|Uü\u0001\u0000\u0011\u0010B\u0000 \u0000\u0004@\f%R@\u0010\u0001\u0011\u0007äB\u0000\u0000<\u0001\u0001$A\u0004\u001f\u0010BH\"\u0000\u0000@ \u0011\u001fÄ\u0010A\u0011\u0004'\u0002 \u0000\b\u00009\u0010PA\u0004\u0000\u0010~@\u0011ø\u0000\u0004a\b\u0010@\u0001\u0004$!\u0000\u0000\u0010\u0000D\u0011\u0004ü\u0000PJB\u0010\u0000\u0002\u0000\u0003  \u0000@\u0002\u0004Cà\u0000\u0000\u0000\u0000\u0000",
+    "HID": "\u0000\u0016\n\u0000|ò\u0010B(A\ba\u0004!ü\u0010\u0010B\u0018A\ba\u0004!\u0010\u0011óÀ",
+    "Light BW": "\u0000M\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0007ÿ\u0000\u0000\u0000 \b\u0000\u0004\u0000!\b\u0000\u0001\u0000 \u0001ÿÁÿÃ\u0000\u0010\u0001\u0000\b\u0002\bB\u0000à\u0001\u0000\b\u0000@\u0010ò9\u00000\u0000@\u0002\u0000\u0010\u000e\b\u0006\u0003\u0010\u0004\u001fü\u0000@Â\u0000\u0013\u0000ÿà\u0004\u0000\u0004\u0000\u0010\u0000\u0004\u0001\u0000 \u0000 \u0000\u0004\u0000 \bÿþ\u0002\u0000\u0004\u0000 \u0001\u0000@\u0000\u0000 \u0000 \u0001\u0000\b\u0002\t\"\u0006\u0000\u0001\u0000\b\u0000@\u0010DÀ\u0000\b\u0000@\u0003ÿ$@\u0000\u0000\u0000\u0000\u0000\u0010\u0004@\u0002",
+    "LCD": "\u0000\u0016\n\u0000xò\u0002\u0012(\bH` !\u0002\u0002\u0018\b\b`!!ñãÀ",
+    "Background": "\u0000\u001f\u0010\u0000\u0004\u001fð\t0 !óÀ$ ÈAÿ\u001c \u0010\u0000?ÿø\u0000\u0000\u0010\u0010\u001fð?à  @@@@ÿÿ\u0001\u0000\u0010\u0002\u0002\u0004!\u0004\u0014\u0011A\b\u0010\u0001\u0000",
+    "Foreground": "\u0000\u001f\u0010\u0000\u0010\u0010\u001fð\u0010    Çÿð\u0000\u0001ÿ\u0007Á\u0000 \b?ÿ$\u0000\u0000>H\u001fðD   @Aò@ÿ \u0010\u0004A\u0004!\n\u0011A\u0012\b\u0001\u0000",
+    "Programmable": "\u0000m\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000A\u0000\u0003\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u000fÿÄ$\u0000\u0000\b$\u0000\u0000\u0002\u0000\u0000\u0010BI\u001f \u0000\u0000& \u0000\b\u0000\u0000û\u0016\b|\u0001Ô\u0003\u0000@\u0007Ä\u0000P\u0000< \b\u0000à\u0002\u0000\" \u0000\b\u0001\u0001\u0000\u00029\u0000 \u0001\u0011\u0007ä @\b\b\u0004@\u000e\b\u0001\u0000\b!\u001f\u0004\u0000 B\u0000\u0000@\t\u0000DA\b\u0000 \u0001\u0004\u0004 \u0000\u0004\u0000\u0002\"\u000fÈ\u0000\tà\u0001\u0000\u0000 \u00040\u001f\u0010BH \u0000p\u0010\u0000\u0002\u0001N@\u0013\u0000\u0002\u0000\u0001\u0000\u0000 \u0007\u0000\u0004\u001f \u0000\u0000\u0000\u0010\u0000\u0006\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0001\u0000\u0000À\u0000\u0000\u0000\u0005\u0004¤ \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\"\u001f",
+    "Customize": "\u0000\\\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\t\u0004\u0000C\u0004\u0000\u0000\u0000\u0000P@\u0003È\u0000|\b<\u0000\u0010\u0007À\u0001\u0000\b@| \u0002\u0000\u0002\u0007Ä\u0000\u0010\u0000\u0000\u0004\u0000À\u0000 \b@\u0002\u0000\u0014\u00004\u0000\u0004\u0000\u0000 \u00020\u0000\u0010\f \u0000@\u0010\u0005\u0000A\u00002\u0000\u0002\u0000\n\u0001\b\u0000\u0000 \u0000À\u0000 \u0001\u0010 0@\u0004\u0000\u0002\u0000\u0002\u0000`P\f\u0004\u0000\u0000\u0010\u0000 \u0018\b\u0000\u0000\u00000\u0000\u0000\u0000\u0002\u0000\u0000\u0000 \u0000\u0000\f\u0000\u0000\u0000\u0000 \u0000\u0000",
+    "Dark BW": "\u0000N\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0010\u0001ÿÀ\u0000\u0000\u0000\u0004!\u0001\n\u0000\u0000\u00018\u001fü\u001fü\u0007à\u0000\u0000\u0007 @\u0010B\u0010!\u0000\u0000\u0000\u0011\u0001\u0000AÿÀ\u0000\u0000\u0000\u0004\u0001\u0000 \u0005  |\u0002 \u0010\u0004\u001fü\"~\u0000\u0010ð\u0002\u0001\u0004\u0000\u0000\u0000\u0001\u0000@\b\u0000 \u0000\u0000\u0000\u0010\u0004\u0001\u001fÿÁ\u0000\u0000\u0000\u0000\u0010\u0004\u0000\u0000\b\u0000\u0000\u0000\u0004\u0000@\u0010I\u0010À\u0000\u0000\u0000 \u0001\u0000A\u0012,\u0000\u0000\u0000\u0001\u0000\u0007ÿ\bH\u0000\u0000\u0000\u0000\u0000\u0010\u0004@\u0002",
+    "Background 2": "\u0000'\u0010\u0000\u0004\u001fð\u0000\t0  \u0001óÀ\u0000$ \u0001ÈAÿ\u0003Ü \bP\u0000?ÿø\u0000\u0000\u0001\u0010\u0010\u001fð\f?à   @@@@ÿÿ\u0001\u0001\u0000\u0010\u0004\u0002\u0002\u0004!\u000fÄ\u0014\u0011A\u0000\b\u0010\u0001\u0000\u0000",
+    "Quiet Mode": "\u0000z\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0010\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0010\u0010\u0000\b\u0002\u0000\u0000\u0000\u0001\u0000\u00048\u0000\u0000\u0002\u0014D\u0000\u0004\u0000\u0001\u0000@\u0000ð\u0000\u0000\u0000\u0011\u0000\u0002\u0000 \u0000\u0010 \u0010\u0000\b\u0000\u0000\u0000 $ø\u0003\u0000\b\u0000\u0002\b\u0004\u0000\u0002\u0000\u0000\u0000\b\u0007Ð\u0003@\u0002\u0000\u0000\u0004\u0001À\bþ\u0010>\u0003D\u0003\b\u0000\u0000\u0001\u0000L\u0001à\u0003ð\u0000\u0011\u0000\u0002\u0000 \u0000\u0010\b\u0000\u0000\u0000!\u0004@\u0000\b@\u0000@\u0004\u0000\u0002\u0000\u0000\u0000\b\u0000 \u0000 \u0002 \u0000 \u0001\u0000\u0000\u0000\u0000\u0002\u0000\b\u0000\b\u0000°\u00010\u0000@\u0000\u001f\u0000\u0000\u0000\u0004\u0000\u0002\u00000\u00000\u0000\u0010\u0000\u0000\u0000\u0000\u0000 \u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\b\u0000",
+    "Highlight FG": "\u0000n\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000  ?à\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0004\u0000\u0000\u0000\u0004\u0001\u0000\u0001\u0004\u0003þ\u0000\u0000\u0000\u0010\bà\u0000\u0010\u0002\u0000ÿ\b\b\u0000\u0000\u0000\u001c\u0000\u0000\b\u0000\u0000\u0000?àD\u0000\u0004\u0000\u0003\u0004\u0000 \u0001ð@\b\u0000\u0000`\u0004r\u0000`\u0000\u0004I\u001fÿÂ\u0010\u0006\u000e\b\u0006\u0003\u0011$\u0000\u0000\u0010 a\u0000\u0000 a\u0000\t|?à@\u0004\u0000\u0001\u0000\u0004\u0000!\u0001\u0012@\u0001\u0000\u0010\u0000\u0004\u0000\u0010\u0000\u0004I\u0002\u0002\u0010\u0004\u0000@\u0000 \u0000@\u0002\u0000\u001f$\u000fø\u0010\u0001\u0000\u0001\u0000\u0001\u0000\b\u0000D\u0010\u0002\u0000\u0000\u0000\u0004\u0000\u0018\u0000\u0004\u0000 \u0001\u0010A\b@\u0000\u0000\u0010\u0001\u0000\u0010\u0000\u0005E\b \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0012\b\u0001\u0000",
+    "Foreground 2": "\u0000'\u0010\u0000\u0010\u0010\u001fð\u0000\u0010   \u0000 À\u0007ÿð\u0000\u0000\u0001ÿ\u0003ÇÁ\u0000 \bH?ÿ$\u0000\u0000\u0001>H\u001fð\fD    @@ò@ÿ\u0002 \u0010\u0004\u0004A\u0004!\u000fÊ\u0011A\u0000\u0012\b\u0001\u0000\u0000",
+    "Remove": "\u0000\u001e\u0010\u0000\u0010\b\u0000\u0002H#Â\u0005 \b\u0015\u0012(P\u0010H¢#ù#\u0010H$¾à$ þH\t\"_è$\b?(¨\b\b\"\"(¢(¡\u0004 @",
+    "Passkey BETA": "\u0000^\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003à\u0000\u0000\u0002\u0000\u0000\u0000\u0003ãóøÈ@\u0000\u0000\b\u0000\u0000\u0000\bH\u0001\u0004¡\u001e\u001e\u001e\"\u001e!\u0000! \u0004\u0012\u0000\u0010à\u0012\u0002\u0002\u0012\u0010\u0003ãàB\u0018\u0007Æ\u0006\f\u000fÈ@\bH\u0001\u000fà!\u0006\u0006( !\u0000! \u0004!\u0004\u0004L\u0000\u0010\u00022\u0012\u0012\"\u0010Ð\u0002\u0012\u0000B\u0018\u0007GG@\u000fÁ\b@\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000x\u0000\u0000\u0000\u0000\u0000",
+    "Add Device": "\u0000l\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0010\u0004\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000Oð@\u0004u\u0000\t\u0000\b\u00048\u0000ð\u0004\u0004\u001f8@\u0000P\u0001\u0000<4\b\u0013ù\u0010\u0000\u0002$\u0000 \u0000\u0010\u0004D\u0000ÿ\u0004À\u0011\u0000\f\u0000\u0001\u0000D#È\u0000I\u0017À\u0001\b\u0003@\u0000 \b\u0004\u0004\u0002\u0000 @Â\u0000\u0002\u0000 OøI\u0010 \u0002\u0004\u0000 \u0000P\t\u0002\u0004\u0004\u0000@ \u0002\u0000\b@H\bI\u0010@\b\u0002\u0000 \u0003\u0004\n\u0004\u0004ÿ\b\u0001\u0000 \u0002\u0000À@AH\b\u0011\u0000\u0000\u0000\u0000 \u0000\u0000\u0000`\n\u0000\b \u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0001\u001fù)\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000!\u0000",
+    "LCD Timeout": "\u0000?\u0010\u0000\u0000\u0000\u0000\u0000\u0000@\u0010\u0001ÿýÿüD \u0000\u0000\u0000\b\u0000E Oø\u0000\u0000\u0010\u0000\u0004þ@@\b\u0004\u0005B\t$ÿ\b\u000b\u0004\u0012I\t\u0012\u0012\u0014\b'ò\u0012$\u0005\u0004H\u0010I$'È\u0013ø\u0010 HH$\u0010 A$# @!>A\u001fÁA\u0004\u0000BD B\b\u0000\u0004A\b\u001fÿ\u000fþ\b\u0010(\u0000\u0002\u0010\u0004\u0001\b@ ",
+    "Highlight BG": "\u0000n\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\t\u0000?à\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000$À\u0000\u0000\u0004\u0000\u0000\u0000\u0004\u0001\u0000\u000f\u0003þ\u0000\u0000\u0000\u0010\bà\u0000\u0010\u0002\u0000\u0002B\b\b\u0000\u0000\u0000\u001c\u0000\u0000\b\u00009\b?àD\u0000\u0004\u0000\u0003\u0004\u0000 \u0007#à\b\u0000\u0000`\u0004r\u0000`\u0000\b\u0000\u001fÿÂ\u0010\u0006\u000e\b\u0006\u0003\u000fø\u0000\u0000\u0010 a\u0000\u0000 a\u0000\t  ?à@\u0004\u0000\u0001\u0000\u0004\u0000!\u0000ÿ\u0001\u0000\u0010\u0000\u0004\u0000\u0010\u0000\u0002\u0002\u0002\u0002\u0010\u0004\u0000@\u0000 \u0000@\u0002\u0000\u000fø\u000fø\u0010\u0001\u0000\u0001\u0000\u0001\u0000\b\u0000  \u0002\u0000\u0000\u0000\u0004\u0000\u0018\u0000\u0004\u0000 \u0000\b@\u0000\u0000\u0010\u0001\u0000\u0010\u0000\u0002\n\b \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0010\u0001\u0000",
+    "LCD Brightness": "\u0000l\u000f\u0000\u0001ø\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u000f\u0018\u0000@\u0000\u0000\u0002\u0000\u0000\u0004\u0000\u0000\b\u000e\u0002`\u0007\u0010\u0000\u0001 \u0002\b\u0010\u00048\u0001¤\u0001\u0000\u0000\n\u0001\u0010ø\u0002\u0000=\u0000\" \u0010\u0000\u0004\t\u000f@\u0000\b\u0002!\u0001\u0000\u0000 \u0000\b\u000f\u0000D\u0010\u0010\u0000\u0000\t\u0018\u0000ü\u0004A\u0001\u0002\u0006\b\u0000ø  \u0010@H\u0010\u0010@\u0000`\t/\u0002\u0002\u0000\u0004\u0001\b\u0000\u0001\u0012\b\u0007  \u0000P \u0011\u0000\u0000\u0000\u0011@ \u0001\u0002\f\u0001`\u0000\u0000\u0002\u0018\u0002\b\b\u0007\u0003\u0000\u0018\u0000\u0000\u0000A\u0000Bp\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Connect device\nto add to\nwhitelist": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000B\u0000@\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\b \b\u0010\u0000\u0000\u0000\u0000\u0002@\u0000\u0002\u0000\u0000\u0000 \u0001?Â?á\u0000\u0000\u0003£¨\u0000H\u0000@!À% \u0000P@\u0010\u0000\u0000\u0005\u0000\u0010\u0003È\u0003À?B\u0012\u0002\u0000\u000f \u0000\u0000D\u0004\u0000\u0002\u0000 \u0000\u0000@\u0000\b ð\u0004@\u0003\u0000\u0000@\u0004 \u0017þ\u0013þ\b\u0000\u0001\u0003à\u0000\u0001 \u0000\u0010\u0001ç\u0002\b\u0004@A\u0000\u0000@\u0002\u0000 @Â\u0000\u0002\u0000c\u0000a\u00010\u0010 \u0000\b\u0000@\u0004\b\u0000@\u0000 \u0010À\u001bÿ|H\u0004\u0000\u0001\u0000\u0010\u0001\u0000\b\u0000\"\u0000(\r\b\u0000 \u0002\u0000@\u0010\u0001\u0000\u0018 \t\u0000\"\u0010\u0001 \u0010 \u0004\u0000\u0010\u0002\u0000 \f\u0004\u0002\u0000\u0004$*$\u0001\u0018\u0000@ \u0000\u0000\u0000\u0004\u0000\u0000\u0000@\u0000\u0005H\u001c\u0000\u0007\b\u0000\u0000\u0000\u0000\u0000\u0000\u0007àQ\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004ÀAÀ\u0000\u0000\u0000",
+    "Wake on BTN3": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000ÀãÂ\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0004\b\u0000\u0000\u0000\u0000\b\u0000\bp\u0004\u0010\u0000\u0000\u0011ò\u0012\u0012(Pøþx!à\u001e@\b@\u0000\u00008°¨¢\"\u0010C\u0012\u0010À\u0002\u0000!\u0000\u0000\u0000\u0002\u0005ôC\u0010HA\fHD\u0004\u0000\b\u0000\u0000\u0000\u0000\u0010\u0005B\n¾á\u0004)\u0001\u0010\u0000\u0000@\u0002\u0010 |\u0000@\u0015($ ø\u0010¤8@\u0000\u0001\u0000\b@~\u0000\u0002\u0000|ø\u0010BP\u0011\u0000\u0000\n\u0000!\u0000\u0000\u0000\b\u0001T_èA\t@D@\u0000D\u0000\b\u0000\u0000\u0000@\u0005B\r\b!\u0004#!\u0015\u0000\u0006\b\u0000 \u0000\u0000\u0002\u0000\u001f(¨\u0010#ð` \u0001\u0000\u0000\u0000\u0010\u0000T àB\u0011à\u0000\u0000\u0000\b\u0000\u0000\u0000\u0002P\" \u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\bB\b(\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000C\b @",
+    "Wake on BTN2": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000ÀãÂ\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0004\b\u0000\u0000\u0000\u0000\b\u0000\bp\u0004\u0010\u0000\u0000\u0011ò\u0012\u0012(Pøþx!à\u001e@\b@\u0000\u00008°¨¢\"\u0010C\u0012\u0010À\u0002\u0000!\u0000\u0000\u0000\u0002\u0005ôC\u0010HA\fHD\u0004\u0000\b\u0000\u0000\u0000\u0000\u0010\u0005B\n¾á\u0004)\u0001\u0010\u0000\u0000@\u0002\u0010 |\u0000@\u0015($ ø\u0010¤\u0018@\u0000\u0001\u0000\b@~\u0000\u0002\u0000|ø\u0010BP\u0000\u0000\n\u0000!\u0000\u0000\u0000\b\u0001T_èA\tD\u0004@\u0000D\u0000\b\u0000\u0000\u0000@\u0005B\r\b!\u0004# \u0015\u0000\u0006\b\u0000 \u0000\u0000\u0002\u0000\u001f(¨\u0010#ð` \u0001\u0000\u0000\u0000\u0010\u0000T àB\u0013ð\u0000\u0000\u0000\b\u0000\u0000\u0000\u0002P\" \u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\bB\b(\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000C\b @",
+    "Time Zone": "\u0000.\u0010\u0000\u0000@\u0000\u0000\u0012@\u0001\u0003çÀI\u000f\b\u000fÿ¢þ>|\u0004@\u0010\u001fÂ!\u0003çÀ\u0000\bÿÈ\u0001\u000fÿþ\u0004'ä \u0010\u0002\n/ò~@ÿ\t\t\u0002\"\"D'ä\bø\"¢ B\u0000@\u0000\u0005\b\u0005\u0000 \u0000\b \b\u0000",
+    "Wake on Touch": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0002\u001f\b\u0002\u0000\u0000\u0000\u0000@ \u0000\u0000\u0000\u0000@\u0000\u0000\u0000$<$H@\b\u0000\u0000\u0000\f\u0000\u0000\u0000A\u0000\u0000\u0001\u001f!!\"\u0000|\u0000\u0000\u0007\u0004<\u0003È\u0001\b\u0000\u0000\u0007\u0016\u0012\u0015\u0014D\u0004 \u0000\u0000\u0002\u0000&0\u0000\b@\u0000\u0000\u0000}\u0010Ä\u0010\"\u0000\u0000\u0000\u000f\u0002\u0000\u0004\u0000B\u0000\u0000\u0000\b\u0002¡\u0005_b\u0002 \u0011À\u0010\u0000\u0000@\u0002\u0010 |\u0000@\u0015($ #\u0000Hr\u0000\u0000\u0002\u0000\u0010ü\u0000\u0004\u0000ùñ!\u0002\b\u0001D\u0000\u0010\u0004\u0000\u0000(\u0000\u0000\u0000\u0000 \u0005R\t\b@\u0000\"\u0000\u0002 \u0000@\u0000\u0000\u0002\u0000*\u0010h@\b\u0000\u0002\u0000\b\u0001P\u0000`\u0002\u0000\u0000\u0000 \u0001÷ò\u0000 \u0000@\u0004~\f\u0004\u0000 \u0000\u0000\u0002\u0000\n\u0010\u0018\u0000\u0002\u0000\u0004\u0000 \u0000\u0000\u0000\u0002\u0000\u0000\u0000 \u0000 \u0000\u0000 \u0000@\u0001\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0004!\u0004\u0014@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000C\b @",
+    "Twist Timeout": "\u0000\r\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\b\u0000\u0000\b\u0000\u0000\u0000\b\u0000 \b \u0000@!À\b\u0000\u0002\u0000\u0000@\u0002\u0000Cà\u0002\u0000\b\"\b\u0000@\u000f \u0004\u0000\u0001ð\u0000@\u0001\u0000\u001e\u0010\u0001\u0000\u0004\b\u0000@\u0000 \u0002\u0000\u0001\b\u0000@\u0000\u0000\u0010\u0000ø\u0002\u0002D\u0000À\u0000\u0010\u0001\u0000\u0000\u0000À\u0000\u0000\u000f\u0001\u0001\u0002\u0001 \u0000\u0010\u0000à\u0000¤\u0001 \u0000@\u00000\u0002\u0002\u0000à\u0002\u0003\b\u0000\b\u0000L\u0000\u0003\b\u0000$\u0000\u0010\u0001\u0002\u0000L\u0001\u0000\u0004\u0000\n\u0000!\u0000\u0000\u0004\u0000!\u0000\b\u0000A\u0000!\u0001\u0000\u0002\u0000\b\u0010\u0000\u0002\u0000\u0002\u0000\u0010À\u0004\u0000!\u0000\u0010\u0001\u0000\u0001\u0000\u0018 \b\u0000\u0002\u0000\u0001\u0000S\u0004\u0000\u0000\b\u0001\u0000\u00000\u0010\u0004\u0000\u0002\u0000\u0000\u001e\b\u0002\u0000\u0000\u0004\u0001\u0000\u0000@\u0000\u0000\u0002\u0000\u0006\u0000\u0000@\u0000\u0000\u0002\u0000\u0000\u0002\u0000\u0000\u0000 \u0000\u0000\u0001\u0000\f\u0000\u0000 \u0000\u0000\u0002\u0000\u0000\u0001\u0000",
+    "Wake on Twist": "\u0000­\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0002\u001f\b\u0000\u0000\u0000 \u0000\u0000\b\u0000 \u0000\u0000\u0000\u0000@\u0000\u0000\u0000$<$H@ \u0001\u0000\u0000 \u0000\u0000\u0000A\u0000\u0000\u0001\u001f!!\"\b\u0000\u0010\u0003È\u0001\u0000\u0004<\u0003È\u0001\b\u0000\u0000\u0007\u0016\u0012\u0015\u0014D\"\u0010\u0001\u0000\u0000\b\u0000&0\u0000\b@\u0000\u0000\u0000}\u0010Ä\u0010\u00000\u0000\u0004\u0000@\u0002\u0002\u0000\u0004\u0000B\u0000\u0000\u0000\b\u0002¡\u0005_d\b\u0006\u0000@\u0003\u0010\u0000\u0000@\u0002\u0010 |\u0000@\u0015($ \u0000Â\u0000\u0002\u0000\u0013\u0000\u0000\u0002\u0000\u0010ü\u0000\u0004\u0000ùñ!\u0000\u0004\u0000\u0010\u0000(\u0000\u0004\u0000\u0000(\u0000\u0000\u0000\u0000 \u0005R\t@\u0000\u0002 \u0004\u0000\"\u0000\u0002 \u0000@\u0000\u0000\u0002\u0000*\u0010h@\u0004\u0000\u0004\u0000` \u0001P\u0000`\u0002\u0000\u0000\u0000 \u0001÷ò@\u0000 \f\u0004\u0001\u0000\u0004~\f\u0004\u0000 \u0000\u0000\u0002\u0000\n\u0010\u0004\u0000\u0001\u0000\u0000\u0000\b\u0000 \u0000\u0000\u0000\u0002\u0000\u0000\u0000 \u0000 \u0000\u0000\b\u0000\u0000\u0000@\u0001\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0004!\u0004\u0014@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000C\b @",
+    "Wake on BTN1": "\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000ÀãÂ\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0004\b\u0000\u0000\u0000\u0000\b\u0000\bp\u0004\u0010\u0000\u0000\u0011ò\u0012\u0012(Pøþ\u0010!à\u001e@\b@\u0000\u00008°¨¢\"\u0010C\u0010ÀÀ\u0002\u0000!\u0000\u0000\u0000\u0002\u0005ôC\u0010HA\fE\u0004\u0004\u0000\b\u0000\u0000\u0000\u0000\u0010\u0005B\n¾á\u0004)\u0004\u0010\u0000\u0000@\u0002\u0010 |\u0000@\u0015($ ø\u0010¤\u0010@\u0000\u0001\u0000\b@~\u0000\u0002\u0000|ø\u0010BPA\u0000\u0000\n\u0000!\u0000\u0000\u0000\b\u0001T_èA\tA\u0004@\u0000D\u0000\b\u0000\u0000\u0000@\u0005B\r\b!\u0004#\u0004\u0015\u0000\u0006\b\u0000 \u0000\u0000\u0002\u0000\u001f(¨\u0010\u0010#ð` \u0001\u0000\u0000\u0000\u0010\u0000T àB\u0011ð\u0000\u0000\u0000\b\u0000\u0000\u0000\u0002P\" \u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u0000\bB\b(\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000C\b @",
+    "Log": "\u0000\u001c\u000e\u0000\u0000\u0000\u0000 \u0000\u0002\t\u0000\u0000\u0013X|\u0001Ôx@\u0011\u0004\u0004\u0002\u0010@@\"\u0002\b\u0004  \u0002x\u0000@8@\b\u0002\u0000\u0001\u0000\u0000\u0000 \u0000\u0000\u0004\u0000",
+    "Wake on FaceUp": "\u0000¯\u0010\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0002\u0001ÿü\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00000!øðÿð\b\u0000\u0002\u0000#\u0000\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000ð!\u0000\b\u0000\u0010\u0002\u0007À:\u0000\u0000\u0000A\u0000\u0000\u0001\u001f!!\"\u0001ÿ\u0000@\u0003ø\u0000\b\u0001\u000f\u0000ò\u0000B\u0000\u0000\u0001ÅE\u0011\u0002\u0002\u0007ÿ\u0000\u0010\u0000 \u0002c\u0000\b\u0000\u0000\u0000\u0000\b\u0017Ñ\fA\u0004\u0004\t\u0012\u0000à\u0000\b\b\u0000\u0010\u0001\b\u0000\u0000\u0000 \n\u0015}ø\u0012$\u0002`\u0003à\u0010\u0000\u0000@\u0002\u0010 |\u0000@\u0015($ \u0010\u0010'È\u0004@\f  \u0000\u0000\u0004 ?\u0000\u0001\u0000>|H@?àH\u0007  @\u0000\u0002\b@\u0000\u0000\u0002\u0000U ø@@ \u0001\u0000@\u0000\b\u0001\u0000\u0000\u0000\b\u0000¨A¡\u0000ÿ>@\u0004\u0000\u001cP\u0000`\u0002\u0000\u0000\u0000 \u0001÷ò\u0001\u0002D\b\u0000F\u0001\u001f\u0001\u0000\b\u0000\u0000\u0000\u0002¡\u0004$\u0002\u0004\u0000 \u0000\u0002\u0000\u0000\u0000\u0000 \u0000\u0000\u0002\u0000\tB\b¿ÿþ\u0000\u0000à\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0010Q\u0000\u0000\u0010\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000C\b @",
+    "Twist Max Y": "\u0000W\u000f\u0000 \u0000\u0000\u0000\u0000\u0000÷ð?à\u0000 \u0000@@\u0001( D@\u0000@\u0000D@\u0002@\u0000\u0000\u0000\u0005?ÿ\u0004\u0019\u0001\u0000\u0001D\fA\u0002\"\b/Ä\u0002\u0000\u0007\b\u0014\u0004D\b\b\u0004\u00006\u0010%ü\u000fø\u0011\b\u0010\b\u0000\b JD\u0002\u00140 \u0010\u00000@\u0018À\u0010`@  `¨ÀÑ`!G@A\u0002\u0006\"0EF\u0004D!\u0000D\u0000\u001c\u0000p\u0003\u0003\bQ\u0001\b\u0001\u0000\u0000\u0000\u0000\u0002\u0000\u0010Á\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000!\u0000\b \u0000\u0000",
+    "Utilities": "\u0000{\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\bð\u0000\u0000\u0004\u0010\bð\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000à\u0000\u0000\u0000B\u0000à\u0000\u0000\u0000\u0000#\u0000\u0000\u0000\u0000\u0000@\b@\u0000\u0000\u0000@\u0000\u0003\u0000\u0000\u0000\u001e\u0000\u0010\u0001\b\u0000\u001e\u0000\u0010\u0000\u0000\u0002\u0002\u0007Á\u001c\u0000\u0004\u0000!\u0001\u001c\u0000\u0004\u0002\u0007À?\u0000\u001c\u0003\u0004 \u001c\u0003?\u0000\u0010\u0000\u0000\u0000\u0010\u0003\u0000\u0000\u0010\u0003\u0000\u0000\u0007À\u0000\u0000\u0004\u0000\u0002\u0000\u0001\u0000\u0004\u0000\u0002\u0000\u0000\u001f\u0004\u0000\u0000\u0000\u0000@\u0000 \u0000\u0000@\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\b\u0000\b\u0000 \u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0001\u0000\u0002\u0000\b\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000 \u0000\u0002\u0000\u0000 \u0000\u0000",
+    "Clock Style": "\u0000l\u0010\u0000\u0000@@@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0002\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000ø@ @\u0000\u0000\u0000\u0000\u0004\u0000\u0000@\u0000\b¿Ä\u0000x\u0002\u001c\u0000 \u0000\u0004\u0000 @\u0000@\u001a@\u001e@\u0003à\u0000\u0011\b\u000f\u0002\"\u0000\b\u0000B\u0000\u0010\u0000ü\u0007ü\"\u0010\u0000\u0004@\u0006\u0000\t\u000f\u000f\u0004A\u0000\u0010\u0000¤\u0001 \u0000\u0010\u0000@D\u0010\u0001\u0000\u0011a\u0000\t\u0018¿Ï\u0004\u0000(\u0002\b\u0000\u0010\u0000\u0010@H \u0004@\u0001\u0000\u0001\u0000\u0011(\b\u0005\u0002\u0001\u0000 \u0000\u0010\u0001\u0014ø@ À` \u0004\u0000\u0001\u0000!\u000f\u00000\u0000\u0000\u0001\u0000\u0010\u0004\u0010\u0000P@\u0000\u0000\u0000\u0000`\u0000\u0001\u0000\u0000\u0000\u0002\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Rewrite Settings": "\u0000[\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000!ð\u0002\u0000\u0010\u0000\u0000\u0000\b\u0002\u0000\u0004\"\u001fÿÁ\u0000\u0000\u0001\u0000 \u0007ôB\u0000\u0014 \u000e\u0000\u0000@\u0004\u0000\u0000\u0004\u0000\u000e\u0000\u0010\u0000\u000f À\u0000\u0010@\f\u0000\u0010\u0000\b\u0000ÿâ\u0010\u000e\b\u0006\u0003>þ\u0000B\u0000\u0001\u0003\b\u0000L\u0000\b@\u0010\b@\u0000@\u0001\u0000\b@ù\b\"\u0000\u0010\u0000\b\u0000 \u0001\u0000\u0011\u0012\u0004~\u0002\u0000\u0002\u0000\u0004\u0000 \u0002\"\u0000\u0000\u0000\u0004\u0000D \u0011\u0000 \u0000`\u0000\u0010\u0000\u000f\u0005 \b\u00000\u0000\u0002\u0000\u0010\u0001\u0012!\u001fø\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001@\u0000",
+    "Flatten Battery": "\u0000«\u000f\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000ÿø\u0004\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000@\u0000@\b\u0000\u0000 \u00020\u0001 \u0000\u0000\u0000A\u0000\u0000\u0000\u0000\b\u0000\u000e\u0000\u0002\u0007À:\u0000\u0014\u0000\u0000\u000e\u0000\u0004 \u0000\u0000\u000f\u0000\u0011\u0010\u0006\u0000\u0010ð?\u0000\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\"\u0001\u0000\u0002c\u0000\u0010\u0000 \u0011\u0000\u0000\u0000\u0001à\u0010\u0000\u0000\u0010$ \u0000\u000e\u0000\b\u0002\u0010\u0002 \u0011À\u0002\u0010 |\u0007\u0000\u0004\u0000\u0010\u0000\u0002`\u0003à\u0001\"\u0001È\u0000B\u0003ð\u0001\u000fÿà\u0002\u0000\u0000D\u0000Â\u0010 \u0014@\u0001\u0000\b@\u0000\u0000C\u0000\u0002\u0000\u001c @\u0000\u0007 $\u0002\u0002\u0010\u0000@\u0000\u0010\u0000\u0000\u0000 \u0000@\u0002\u0004\b\u0000\u0010\b\u0005\u0000@\u0002\u0000\b\u0000\u0002\u0000\u0000\u0000$\u0000\b\u0000@P\u0000\u0004\u0000\u001cÀ\b\u0000\u0002\u0000\u0000\u0000\u0000\b\u0000\u0001\u0000\u0000 \u0011ø\u0000\u0004`\u0000\u0000 \u0000\u0000 \u0000\u0000\u0001\u0000\u0000 \u0000\u0018\u0002\u0000\u0000 \u0000\u0000\u0000\b\u0000 \u0000\b\u0000\u0000\u0000\u001f\u0004\u0000\f\u0000@\u0000\b\u0000\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Debug Info": "\u0000]\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@@\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0001\u0002\u0004\u0002\u001f$\u0000\b\u0000\u0000\b$\u0013þ| \u0001 \u0000\u0000& \u0000#\u0000\u0005\u0000\u0000\u0001Ô\u0014\u0004%\u0000\u0000\u0011 \u0000\u0000\b°Aý\u0012\u000f\u0000D\u0000\u0000\u0000\u0005ôH\u000f\u0002\u0010\u0002 \u0004@J\u0000\u0014~\u0002\u0000 @HB\u0000Gñò\u0010\u0001\u0002\u0001D\u0004 \u0002 \u0014\u0000\u0010\b\b@\u0001\u0000\u0011ü\u0010¨\b\u0001\u0000@\u0002\u0000\u0010\u0000'õ@\u0010\u0002\u0000 \u0001\u0000\u0004\u0004$\b\u0000\u0000\u0000\u0002\u0000\u0010\u0000\"\b!P\u0000\u0000\u0000 \u0001\u0000\u0001\u0011A\f@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\bA",
+    "Storage": "\u0000L\r\u0000\u0000\u0000 \u0000@\u0000\u0000\u0000\u0000$8\u0001\u0000\u0002\u0000\u0000\u0000\u0003\t<\u0010\u0000 \u0000\u0000\u0000\bP\u0010\u0001\u0000\u0002\u0000\u0000\u0000\u0000\u0004\u0001\u0000\u0010\u0000 \u0000\u0000\u0000`\u0000 \u0001À\u0002\u0000\u0010>\u0001\u0002\u0002\u0000\u0013\u0000 @ü\u0000\u0000@P\u0001\b\u0002\b\u0000\u0000\u0000\b\b\u0010\u0000!\u0000\u0000\u0000\u0001\u0003\u0004\u0001\u0000\u0002 \u0000\u0000\u0000 À@\u0010\u0000,\u0000\u0000\u0000L\u0000\u0000\u0001\u0000\u0003\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Reset Settings": "\u0000k\u0010\u0000 \u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u001f\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000B!ÿø\b\u0000\u0001\u0000 \u0000\u0000\u0000 D \u0001\t`\u0004\u0010\u0002\u0000\u0000\u0000\u0002\u0000\b\u0000@ð\u0000B\u0000@\u0000\u0000\u0000@ú\f\u0000\u0000\b\u0000\b@\bð\u0000\u0000\b\u0000\u000fþ\u0001\b\u0001\b\u0001b\u0000\u0000\u0001\u0003ïà\b\u0000yÀ!\u00010\"\u00008\u0000\u0001\u0000\u0018À\u0004 \u001c \u0012 \u0004Ï \u00040\u0000\u0000\u0001D\u0000\u0011 Gà\n\u0000\u0001\u0000\u0010\u0000!\u0000\u0010\"(\b\u0002@\u0000 \u0002\u0000\u0000 \u0002\u0004B\u0001\u0010\u0000\u0000\b\u0000 \u0000\b\u0000@ø R\u0000\u0010\u0000\u0002\u0000\u0003à\u0002\u0000\b\u0011\"\u0011ÿø\u0000\u0000\u0000\u0000\u0001\u0000\u00184\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Twist Threshold": "\u0000N\u000f\u0000 \u0000\u0000\u0000\u0000\u0000÷ð?à@\u0000\u0000\u0002P@\u0000\u0001\u0012\u0001\u0000\nA\u0002\"\u0004\u0000\u0004 \u0004à)ü\u000føÀ\u0010\u0000\u0014@Ä\u0010\"!ø@\u0000á\u0002@\u0001\u0000\r\t\u0003þ\u0004\b\u0004\u0000\u0004\u0010%\"\u0001@0 \u0010\u00000@\u0018ÀÀ@@Á\u0003Q¢Å\u001e\u0001\u0002\u0005\u0004\nD\u0018ì\u00020$\u0012!\b\u0002 \u0011À\u0007\u000000\u0010\u0010\u0000\u0000\u0000\u0000@\u0002\u00180B\u0000\u0000\u0000\u0000\u0000\u0000\b@\u0002\b\u0000",
+    "Turn Off": "\u0000<\u0010\u0000?ø\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0002à\u0000\u0000\u0000þ\u0014 \u0000\u0000\u0004\u0010!D\u0000\u0004\u0001\u000ftü\u0000@\u000f\u0010\u0010\u0004PB\u0007\u0001\u001dpEü\u001fÀ\u0000 \u0000\u0001P@\f\u0000\u0002?ø\u0015ü\u0001@\u0000B\u0010R@$\u0000\u0004?øä \u0004@\u0000\u0010J\u0000\u0010?ø)$\u0010@\u0002\u0000\u0010\"¢ \f\u0000@\u0001\u00020 \u0000@\u0000\u0000\u000fà\u0004\u0000\u0000\u0000\u0000",
+    "Compact Storage": "\u0000¬\u000e\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\t\u0001\u0000\u0002\u0000\u0000\u0000\u0000\u0002\u0000\u0004\u0000\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\tÀ\u0010\u0000\n\u0000C\u0010\u0000 \u0000\u0000\u00000|\u0006\u0000\u0000\u0006\u0000ä\u0001\u0000\u000fÀ\u0003È\u0001\u0000\u0002\u0000\u0000\u0000\u0000x@\u0010 \"\u0000\b\u0010\u0000\u0011À\u0001\u0000\u0010\u0000 \u0000\u0000\u0000\u0000@\u0004\u0000\u0001\u0010\u0001\b\u0001\u0000\u0002\u0006\u0000\u0010\u0001\u0000\u0002\u0000\u0000\u0000\u0006\u0000\u0000@\u0000@\u0010\u0011\u0000\u001c\u0000 \u0002\u0000\u001c\u0000 \u0001\u0003à\u0010 \u0004\u0000\u0004\u0002\u0004\u0002\u0010\u00010\u0004\u0010\u0000 \u00010\u0002\u0004\u000fÀ\u0000\u0004\u0000\u0000 @B\u0000\u0010A\u0000\u0005\u0000\u0010 \u0000\u0000\u0000\b\u0000\u0010\u0004\u0002\u0000 \u0001\u0000\b\u0010\u0000\u0001\u0000\u0002\u0010\u0000\u0000\u0000\u0010\u000f\u0002\u0000 \u0004\u0000\u0010\u0000\u000f\u00000@\u0010\u0000\"\u0000\u0000\u0000\u0002\u0007\b\u0004À\u0010\u0002\u0000\u0001\u0000\u0001\u0018\f\u0004\u0001\u0000\u0002À\u0000\u0000\u0004À\u0000\u00000\u0000\u0000\u0000\u0010\u0000\u0010\u0000\u0011@\u0000\u0000\u0010\u00000\u0000\u0000\u00000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0001\u0000\u0000à\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Reset to Defaults": "\u0000\u0010\u0000 \u0000\"\u0000 \u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0004O\u001f\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0007ñý\u0010B!ÿø\u0000\u0001\u0000 \u0000\u0000\u0000 ~\"\u0011\"D \u0001\b\u0000\u0004\u0010\u0002\u0000\u0000\u0000\u0002\u0000B$@\b\u0000A\u000f\u0000B\u0000@\u0000\u0000\u0000@ |øú\f\u0000\u0000&0\b@\bð\u0000\u0000\b\u0004\u0011\b\u0000\u000fþ\b\b\u0001\b\u0001b\u0000\u0000\u0001\u0001¢!\u0012#ïà\b\u0001\u0000\u0000!\u00010\"\u00008XD>D\u0000\u0001\u0000 \u0000\u0004 \u001c \u0012 \u0004ÒO \u0004\u0000\u0000\u0000\u0001D\u0000Q\u0010\u0011\u0011 Gà\u0000\u0001\u0000\u0010\u0000!\u0000\u0010\bB¢\"(\b\u0015\u0000\u0000 \u0002\u0000\u0000 \u0002\u0001\b@HDB\u0001\u0010\u0001\u001f\b\u0000 \u0000\b\u0000@\"\bE\bø R\u0000 \u0000\u0002\u0000\u0003à\u0002\u0000\b\u0004\u0010E\u0011\"\u0011ÿ\u0000\u0000\u0000\u0000\u0000\u0001\u0000 \u0010@\u00184\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Second": "\u0000\u000f\u0010\u0000\b 8CÀA\n_DH:$¨IP¤A\u0001\u0002\u0004\u00040\t",
+    "Compacting...\nTakes approx\n1 minute": "\u0000\u0011\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0001\u0000\u0004\u0000\u0002\u0000\u0000\u0007\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000$\u0002p\u0004\u0000\u0010\u0000\b\u0000CÀ\u0000\u0000\u0000\u0001\u000fÀ\u0000\u0000À\u001c \u0000@\u0001ä\u0000\u0000\u0000\u0000\u0007\u0001\u0002\u0002 \u0000\u0001\u0000\u0004Æ\u0002\u0000\u0000@\u0000\u0000\u0000\u0000\u0000 \u0004\u0010\b\b@\b\u0000@@\u0010\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000B\u0000D\u0000p\u0002\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\b\u0000\b\u0004\b\u0004 \u0002`\u0010\u0000\u0004\u0000\u0001\u0000\u0000\u0000\u0000\u0006\u0000\u0000 @B\u0000\u0010\u0000 \u0000\b\u0000\u0000\u0000\u0000H\u0004\u0000\b\u0002\u0001\u0000\u0010\u0000\u0004@\u0001\u0001\u0000@\u0000\u0000\u0000\u0002Cà\u0000 \b\u0001\u0000\u0004\u0000*\u0000\b\u0010\u0002\u0000\u0000\u0000\u0000\fá\u0000\u0002\u0000@\u0010\u0000 \u0000À#\u0000\b\u0000ÀÀÀ\u0000\u0000\u0003\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0004\u0000\u0000à\u00008\u0006\u0006\u0006\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\b\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0004\u0000\u0000\u0000\u0010\u0000\u0000\b \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u001cqÿð\u0000óàA\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Date": "\u0000\u001c\u0010\u0000\u0000\u0000@ø\u0004\b@\b\b\b¿ø\b\u0018\bø(\b\b\bH\b\b\b\b\b\bÿ\b\b\u0010",
+    "Minute": "\u0000\u000f\u0010\u0000\u0000@\b\u0010A\u0001\u0001\u0004\u0001\u0010\u0001Oñ\u0004 \b@\u0010A\u0000\u0002\u0004\bP @",
+    "Connectable": "\u0000?\u0010\u0000\u0010 \u0001\u0000\u0000\u0000\u0010@ @\u0002\u0000ÿüHA@ \u0000A\t A\b@\u0000ûÐB\u0010ñ\u0000\u0014\u0002_D!\u0002\"\u0000\bL\b\u000fþ\u0004D\u001f\u0010\u0000\b!\u001fUü\u0001\u0000\u0011\u0010B\u0000ªH\u0002\u0000\" üD\u0004\u0010|A\t â\b \u0013\u0005\u0004\u0010@\u0001\u0007ä\u0002\u0011\b \u0002\bHDA\u001fÿ\u0000\u0014\u0012\u0001\u0000\u0002\u0000\u0010\"\u001f",
+    "Stay Connectable": "\u0000w\u0010\u0000\u0010 \u0001\u0000\u0000\u0000\u0010@\u0000\u0000\u0000\u0000\u0000\u0000\u0000 @\u0002\u0000ÿüH\u0000\u0000\u0002\u0000\u0002\u0000\u0000A@ \u0000A\t \u0000\u0000\u0002\u0000\u0002\u0000\u0000A\b@\u0000û\u001e\u0000\u000fÐB\u0010ñ\u0000\u0014\u0000Ò\u0000ø\u0000ø\u0003Â_D!\u0002\"\u0000\bB\"\u0000\u0010\u0000\u0010\bL\b\u000fþ\u0004D\u001fB\u00048\u00048\u0010\u0010\u0000\b!\u001f\u0011\u0004\u0007À\u0007À\u0001Uü\u0001\u0000\u0011\u0010B\u0000\"\b\u0000\u0000\u0004ªH\u0002\u0000\" üH\u0010\u0001\u0000\u0001\u0000\u0012D\u0004\u0010|A\t @>\u0000>\u0000 â\b \u0013@\u0000\u0000\u0001\u0005\u0004\u0010@\u0001\u0007ä\u0001\u0006\u0001\t\u0001\t\u0000\u0011\b \u0002\bH@0\u0001à\u0001à\u0001\u0004A\u001fÿ\u0000\u0014\u0012\u0000\u0000\u0000\u0000\u0000\u0000\t\u0001\u0000\u0002\u0000\u0010\"\u001f\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Hour": "\u0000\u001c\u0010\u0000\u0000@\u0000\u0000\u0004\u000fø@\u0018¿@\u0018\u000fü\u001f\tù\u0010¿Éù\u0010\tùø\b\u0001\u0000PP\u0002\b\u0002",
+    "No Clocks Found": "\u0000\u0010\u0000\u0000@@@\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0002\u0004\u0000\u0001\u0003þ\u0000\u0000\u0000\u0000\u0002\u0000\u0000 \u0000\u0000\u0000@ø@ @\u0010H  \u0000\u0000\u0010\u0000\u0013\u0000\u0001\u0000\u0001\u0000\u0002\b¿Ä\u0000\u0002\u0002\u0000\u0000\u0000\u0001H\u0002\u001e\u0002\b\u0000 @\u0000@\b?à\u0007À\bÀ\u0018@\u001f\u0000\u0010\u0004\b\u000f\bä\u0002\u0002\t\bâ\u0001\u0000\u0010\u0001\u000f\u0000@ü\u0007üy   `\u0010y\u0010\u0010@!À\b\u000f\u000f\u0001\u0011\u0003þ\u0000\u0001\u0001\u0013\u0001\u0004\u0001ð\u0007\u0000\u0010\u0000@\u00110  \u0000\u0010\u0011\u0000\u0010@\u0001\u0000\u0010\u001e\b¿Ï\u0001\u0010\u0002\u0002\u0000\u0001\u0001\u0010\u0001\u0004\u0000\u0010\u0001\b\u0001\u0010\u0010@!\u0000?à\u0000 !\u0000\u0000\u001f\u0000\u0011!\b\b\u0002 \u0000\u0000\f\u0002 \u0000\b\u0002\u001c\u0001\b\u0002\u0011ø@J\u0000\b\u0007\u0000J\u0000\u0001\u0000! \b\u0000A(\u000f\u0004@\u0001\b@\u0000\u0004@\u0000 \u0001à\u0000|\u0004\f\u0000P@\u0000\u0000`\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0004\u0000\u0000\u0018\u0007À\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "App Settings": "\u0000]\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0002\u001f\u0000 \u0000\u0000\u0000$\u0000@\u0000\u0000\u0010ÿ\u000f\u001f A\u0000\u001e\u0007ôB\u0000\u0017\u0007\u0016\u0001\b\u0003H\u0000\" \u0001\u0000@\u0000\b@\" ú\f\u0000\u0000$\u0000\b\u0000B\u0001\u0010 \u0003ÿÀ\u0000@\u0002\u0010\u0011\u0004>þ\u0000\u0004\u0000\u0004\u0000\u0010 \u0002\u0010\u0004\u0000 \u0000 \u0000\u0004\u000f \u0001\u0000\u0002\u0000\u0000@$\u0010DH\u0011ø\u0010\u0000 \u0000\u0002\u0001@\"\u0000\u0002\u0000\u0000 \u0004\u0018\u0011\b\u0004@\b\u0000 \u0000\u0002\u0000\u0003\u0000ø R\u0000\u0000\u0000\u0000 \u0000\u0000\u0004Hà\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001@\u0000",
+    "Flattening battery - this can take hours.\nLong-press button to cancel": "\u0000½\u0011\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000ÿø\u0004\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000 \u0000\u0010\u0000\u0010\u0002\u0000\u0000\b\u0000\u0000\u0000\u0000\u0012\u0000\u0000\bð\u0004\u0010\u0000\u0000\t`\u0000\u0000à\b\u0000 |\u0003 \u0000\u0000\u0000P\u0000\u00008\u0000\u0010\u0000\u0000<\u0000D@\u0018\u0000CÀþ\u0000\u0002\u0000\u0000\u0001\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\"\u0001\u0000\u0002c\u0000\u0010\u0000 \u0000\u0000\u0004@\u0000\u0000\u0000x\u0004 \u0000\u0000\u0004 \t \b\u0000  \u0003\u0002\u0000\u0000\u0000!\u0000\"\u0001\u001c\u0000!\u0002\u0007ÀyÀ\b\u0000@\u0001\u0000\u0000&\u0000>\u0000\u0000\u0002\u0004\u0004\u0007 \u0001\b\u000fÀ\u00060?ÿx\b\u0000\u0001\u0010\u0003\b\u0000\u0000\u0010 \u0014@\u0001\u0000\b@\u0000\u0000C\u0000\u0002\u0000\u001c @\u0000\u0007  \u0000y\u0000\u0000\u0010\u0000\u0004\u0000\u0000\u0000(\u0000\u0010\u0000\u0002 \u0000\u0004\u0002\u0001\u0000\u0000\u0010\u0004\u0000 \u0000\u0000 \u0000\u0000\u0002@\u0000\u0004\b\u0015\u0000\u0000@\u0001È\u0000\u0001\u0000 \u0002\u0000\b\u0000\u0002\u0000\u0000\u0000 \u0000\u0004\u0000\u0000Gà\u0002\u0000\u0011\u0000\u0000\u0000\u0000 \u0000\u0000 \u0000\u0000\u0001\u0000\u0000 \u0000\u0018\u0002\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0002\u0000\b\u0000\u0002\u0000\u0000\u0000\u0007à\u0001\u0000\u0003\u0000\u0010\u0000\u0002\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u001fð#ø\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Month": "\u0000\f\u0010\u0000\u001fñ\u0001\u0010\u0011\u0001\u0010\u0011ÿ\u0010\u0011\u0001\u0010\u0011ÿ\u0010\u0011\u0001 \u0012\u0001@X\u0002",
+    "OFF": "\u0000\u0016\n\u0000xüþ\u0012\u0002\bH\b!  øú\u0012\u0002\bH\b!  â\u0002\u0000",
+    "Right": "\u0000\u000f\u0010\u0000\u0002\u0000\u0004\u0000\b\u0007ÿð@\u0000\u0002\u0000\u0004\u0000\u001føP\u0011 $@@\u0001\u0003þ\u0004\u0004",
+    "Widgets": "\u0000Y\r\u0000\b\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000 \u0002\u0000\u0000\u0000\u0018H\u0000\u0000\u0000\u0000\b\u0001\u0000\u0000\u0000\u0002\u0014\u0000\u0000\u0000\u0000\u0004\u0000ø\u0000\u0010\u0000\b\u0000\u0000\u0000\u0000\u0002\u000f\u0000\u0010\u0006\u0000\u0000\u0000\u0000\u0000\u0001\u0002\u0002\u0000\u0010\u0000\u0000\u001c\u0000\u0000á\u0002\u00008\u0000\u0001\u0000ð\u0001\"\u0000LA\u0000ä\u0000\u0001\u0000\b\u0000Q\u0000!!\u0000\u0002\u0000\u0001\u0000\u0004\u0000!\u0000\u0010\u0000\u0001\u0000\u0001\u0000\u0002\u0000\u0000\b\u0000\u0000\u0013\u0000\u0001à\u0000\u0004\u0000\u0000@\u0006\u0000\u000f\b\u0000\u0002\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0001\u0000",
+    "Left": "\u0000\u000f\u000f\u0000\u0002\u0000\u0004\u0000\b\u0007ÿð@\u0000\u0001\u0000\u0004\u0000\u000fø!\u0000B\u0001\u0004\u0004\b\u0010\u0010\u000fÿ",
+    "Sort Order": "\u0000O\u0010\u0000\u0010\u0010\u0000\u0000\b \u0000\u0000\u0004\u0000\u0010@\u0000\u0000\u0010@\b\u0000ü\u0011\u0000\u0000\u0001ûð\u000e\u0001Pÿà\u0000A\u0000\u0000\u0002¢\u0000D\u0000\u0004ïà\u0000\u0005_À\u0000Ä\u0002\u00028\n \u0010\u0002@\b¢\u0003 \u0015A\"\"\b@ \u0000*þ$D @ð\u0002\u0000U\u0004(\u0000`  \b\u0000«øQ@\u00000@@8\u0001T\u0010\"\u0000\u0000\u0000ÿ\u0002¨ D\u0000\u0000\u0001\u0001\u0002\u0010\u0005_À\u0000\u0000\u0002\u0002\u0004\u001f\n?ÿ\u0000\u0007ü\u0000\u0000!A\u0000\u0000\u0000\u0000\b\b\u0000\u0000\u0003\u0001",
+    "Side": "\u0000*\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0010\u0010\u0000\b\u0002\u0014D\u0000\u0004\u0000\u0011\u0000\u0002\u0000 $ø\u0003\u0000\b\u0007Ð\u0003@\u0003D\u0003\b\u0000\u0011\u0000\u0002\u0000!\u0004@\u0000\b\u0000 \u0000 \u0002\u0000\b\u0000\b\u0000\u0004\u0000\u0002\u0000 \u0002\u0000\u0000\b\u0000",
+    "No app has settings": "\u0000{\u0010\u0000 \u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u001f\u0000 \u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000B!ÿø \b\u0000\u0000\u0000\u0000\u0000\u0000\u0001D \u0001\u0002\b\u0001@\u0000\u0000\u0010ø\u0011ò\u0004\u0010\b\u0000@D\u0003ð\u0004\u0000\u0001á\u0001ÅBú\f\u0000\u0000@\bà@À\u0000@\u0000\b@\u000fþ\u000f$\u0002\u0006\b\u0004\u0000\u0000 \u0001\u000bïà\b\u0000D@A\u0001\u0000@\f\u0000\u0004\u0000!\u0000\u0001\u0000\b\u0010@\"\b\u0001\u0000\u0001\u0000\u0004/ \u0001\u0010\u0002\b\u0004\u0000 \u0000 \u0000\u0011 GàB\u0000\u0000P \u0004\u0000\b\u0000\u0001\"(\b\b\u0001à\f\u0000\u0001\u0000\u0002\u0000\u0000$B\u0001\u0010\u0002P\u0000F\u0000\u0000 \u0000\u0000\bø R\u0000D\u0000\b \u0000\u0000\b\u0000 \u0000\u0002\u0011\"\u0011ÿ\u0000\u0000à\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u00184\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Sleep Phase Alarm": "\u0000»\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0012\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0001\u000e\u0000\u0000\u0000\u0002>A\u000f\u0000\u0000\u0000\u0002\u0002\u001dB\u001f\u0001\u001c\u0000\u0000\u0000\u0010\u001e@\b@\u0000\u00008°\u001e \u0000\u0000\u0000< < \u001c\u0000\u0000\u0000\u0002\u0000\u0010\u0001\b\u0000\u0000\u0000\u0010\u0000\u0004\u0000\u0000\u0000 \u0000 \u0000\b\u0000\u001c\u0000\u0000\u0000@\u0002\u0000!\u0000\u0000\u0000\u0004\u0000\u0001\u0000\u0000\u0000\u0018\u0000\u0004\u0000\u0012\u0001\u001c\u0000\u0000\u0010\u0000\u0004 @ø\u0000\u0000 \u0000à\r\u0000\u0001\u0000\u0001\u001c\u0010@ø\u0002\u0000\u0010\u0000\u0007à\u0000 \u0000\b\u0001à\u0006\u0010\u0000 \u0000 \u0000\u0002\u0007à\u0000H\u0005\u0000\u0010\u0000\u0000\u0004\u0000\u0001\u0000\u0004\u0000\u0002\u0000\n\u0000\u0004\u0000\u0000\u0000\u0000\u0010\u0010\u0000 \u0000\u0000\u0001\u0000\u0000@\u0000\u0000@\u0002 \u0000\u0000\u0010\u0000\u0000\u0002\u0018Á\u0000\u0004\u0000\u0000\u0000@\u0000\u0010\u0000\u0010\u0000\b\u0001\u0000 \u0000\u0004\u0000\u0000\u0002à \u0001\u0000\u0000\u0000\u0010\u0000\u0004\u0000\u0003À\u0001\u0000À@\u0004\u0000\u0001\u0000\u0000\u0000<\u0010\u0000\u0000@\u0000\u0000\u0004\u0000\u0001\u0000\u0007\u0000 \u0000\u0000\u0001\u0000\u0000À\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000@\u0000`\u0000\u0000\u0000\u0000\u0000",
+    "Invalid settings": "\u0000O\u0010\u0000\u0010\u0000\u0010 \u0000\u0000 \u0000\u0002\u0000 \u0000\u0010@\b\u0000!ð\u0002\u0000ð\u0000\b\u0000B!ÿùU\u0007ù\u0000\u0014\u0007ôB\u0000\u0014ª\u0000\u000fÃð\u0000\b\u0000AT\u0004\u000f À\u0000\u001fÿ\u0010\u0002\u0006\u0000\u000fþ\u0005P@\u0004\u0010>þ\u0000\n $$\u0010@\u0000\u0001\u0000\u0015@(H ù\b\"\u0001ÿð \u0001\u0011 Gà\u0000\u0000¢ \u001e\u0002\"\u0002H$@F\u0004B\u0001\u0010\u0004HP\u000f\u0005 \u0010 J\u0000à\u0011\"\u0011ÿÀ\u0002\u0001\b\u0000\u0000\u0001@\u0000",
+    "TIMER": "\u0000;\r\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u001f\u0000\u0004\u0002\u000f\u0000\u0000\u0004 \u0001\u0000>\u0010\u0000\u0000\u0000À\u0000\u0004\u0000\u0000)\u0000h\u0000\u0001\u0002\u0007ÈÀ0\u0000@?\u0002\b\u0000\u0010\u0001\u0000\u0000\u0002\u0000\u0002\u0000\f\u0000\u0000\u0000\u0000@\u0000@\u0000\u0000 \u0000\b\u0000\u0004\u0000\u0000\u0018\u0000\u0001\u0000\u0000\u0000\u0000\f\u0000\u0000 \u0000\u0000\u0000\u0000",
+    "Reset All": "\u0000z\u000e\u0000\u0002\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000\u001c\u0001\u0000\u0000 \u0004\u0000\u0000\u0000\u0004\b\u001f\u0000\u0002\bx\u0002X\u0001\u0004\u0000\u0000\u0000\u0000ü\u0000\u0002Aä\u0000x\u0000!\u0000 \u0000\u0000\u0000 \u0001\u0000\f@\u0002\u0000\b\u0000\b@\bð\u0000\u0000\b\u0001À\u0004\u0000\u0002\u0010\u0002\u0010\u0002Ä\u0000\u0000\u0002\u0000\u0002\u0010\u0000@\u0001ç\u0000\u0004Â\u0000\u0000à\"\u0001\u0002\u0000\u0010\u0000Æ\u0000!\u0000á\u0000\u0000&\u0007\u0000`\u0004\u0000C\u0000\b@\b\u0014@\b@ \u0000\u0006\u0001\u0000\u0001@\u0000 \u0002\u0000\u0004 \u0002\u0000\u0010\u0000\u0000\u0000@\u0000\u0000\b\u0000\u0000\b\u0000\u0004\u0000\u0000\u0000\b\u0000@\u0000\u0004\u0000\u0010\u0000\u0004\u0000 \u0002\u0000\u0000\u0000\u0001À\u0010\u0000\u0002\u0000\u0003à\u0002\u0000\b\u0001\u0000\u0000\u0000\u0000\u0000\u0003ð\u0001\u0000\u0000\u0000\u0001\u0000\u0002\u0000",
+    "This will remove everything": "\u0000Æ\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000@\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0001\u0000\u0002\u0000\u0000\u0010\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0003\u0000\u0000\u0010\u0000\u0000\u0000ø\u0002\u0000\u0004\u0000\u0000@\u0002\u0000\u0000\u0010>\u0000\u0004\u0010ð\u0000ð\u0004@\u0000ð\u0001\u0000\tÀ\u0010ð\u00010\f \u0000\u0000?\u0000H<\r \u000e\u0000\r \u0004\u0004\u0000(L`\u0007\u00000\u0000\u0000\u0002\u0000\u0018\u0004\u0000D@\u000e\u0000DA\u001c\u0000\u0001Â\u0002\u0002\u0000\u0010\u0000\u0000\u0000\u00008\u0000\u0000\u0010\u0001\u0010 \u0001\u0010À\u0000\u001b\b\b\u0000\u0000@\u0002\b\u0004\u0000\u00010\u0004 \u0000\b\t\b\b\u0002\u0000\u0000\b  \u0000\u0001\u0000\b \f\u0000\u0004@ @\u0002\u0000\"\b\u001c \"\b\b\u0000\u0000`\u0000\u0004\u0000 \u0018\u0000\u000f\u0000\u0000À\b\u0000 \u001c@ \"\u0000\u0001\u0002 \u0001ø\u0000\u0004\u0000 \u0000\u0004\u0000\u0000À \u0002A\u0000A\u0002A\u0001\b\u0000\n\b\n\bX\u0000\u0010\u0000\u0000\u0000 \u0000\u0000\u0000\n\u0004\u0001\u0004\n\u0004\u0004P\u0010H$\u0011ø!\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0010`\u0004\u0010\u0010`%?``@\u0000x\u0000\u0004\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0003\u0006\u0000\b\u0006\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000 \u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u001c\u0000\u0000\u0000\u0000",
+    "Alarm": "\u0000;\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0010ø\bà\u0000\u0000\u0000á\u0000à\u0000\u0000\u0000\u0010\u0000@\u0000à\u0000\u0000\u0002\u0000\bä\u0000\u0000\u0000\f\u0000à\u0007À\u0010\u0001\u0000\u0000\u0010?\u0000\u0002@ \u0000\u0004\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0010Á\u0000\u0000 \u0000\u0000\u0014ä \u0000\b\u0000\u0000\u0001à\u0000\u0006\u0000\u0000\u0000\u0000\u0002\u0000\u0003\u0000\u0000\u0000\u0000\u0000",
+    "on": "\u0000\u000e\b\u0000xº\u0013\u0018Ha!\u0012\u0018H^!",
+    "Minutes": "\u0000\u000f\u0010\u0000\u0000@\b\u0010A\u0001\u0001\u0004\u0001\u0010\u0001Oñ\u0004 \b@\u0010A\u0000\u0002\u0004\bP @",
+    "Reset all widgets": "\u0000»\u000f\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\n\u0000\b\u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0000 \u0000\u0000\u0000\u0001\u0000 \u0000\u0000\u0000 \u0002 \u0000\u0000\u0000\u0006\u0012\u0000\u0000\u0000\u0000\u0002\u0000\u0001à\u0004\u0010\u0002\u0000\u0000\u0000\u0002\u0000\u0000\u0010\u0000\u0000\u0000!@\u0000\u0000\u0000\u0000@\u0000Ò\u0000B\u0000@\u0000\u0000\u0000@  \u0003à\u0000@\u0000 \u0000\u0000\u0000\u0000\b\u0000\" \b@\bð\u0000\u0000\b\u000bú\u000f\u0000\u0010\u0006\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0004B\u0001\b\u0001b\u0000\u0000\u0001\u0006\b0\u0004\u0000 @\u0007\u0000\"\u00008\u0001\u0010@!\u00010\"\u00008\u0001\u0000\u0010 \u0003\u0000\u0010\u000f\u0000\u0012 \u0004À\"\b\u0004 \u001c \u0012 \u0004À \u0001\u0004\u0003\u0000\u0004\u0000 \u0001D\u0000\u0004\u0000\u0000\u0001D\u0000À!\u0000\u0002\u0000\u0001\u0000\u0004\u0000!\u0000\u0010\u0000@\u0001\u0000\u0010\u0000!\u0000\u0010\u0000\u0000 \u0000@\u0000@\u0000\u0000 \u0002\u0000\u0014\b\u0000 \u0002\u0000\u0000 \u0002\u0000\u0010\u0000\b\u0000\b\u00010\u0000\u001e\u0000\b\u0000@\u0001\u0006\u0000\b\u0000 \u0000\b\u0000@\u0002\u0000\u0002\u0000\u0001\u0000\u0018\u0000< \u0002\u0000\b\u0000\u0003\u0000\u0002\u0000\u0003à\u0002\u0000\b\u001fÿ\u0000\u0000 \u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000",
+    "Hours": "\u0000\u001c\u0010\u0000\u0000@\u0000\u0000\u0004\u000fø@\u0018¿@\u0018\u000fü\u001f\tù\u0010¿Éù\u0010\tùø\b\u0001\u0000PP\u0002\b\u0002",
+    "Enabled": "\u0000\u001e\u0010\u0000\u0002\u0000\u0010 \b\u0000 ÿà\u0002\u0001\u0000?È\u0004\u0000\u0000ü?À\u0004\"F\u0004 I/ð$% @P\u0000Cü\u0005\u0011\b\u0010\"D A\n\u0010\b\u0012\b\u0000",
+    "Repeat": "\u00007\r\u0000\u0004\u0000\u0003\u0000\u0000\u0000\u0004\u0002\t\u0000\u0000\u0000\b\u0002\u0012\u0000\u0000\u0001\u0002\u0010\u0004\u0018\u0000\u0000\u0002\u0004 \b\u0000\u0000\u0000\u0004\b@\u0011Àð\u000e\u0010<\u0000ü\u0000\u0013!\u0000@\u0000\u0000\u0000!\u0004\u0000\u0000\u0000\u0000@\b\u0001\u0000\u0000\u0000\u0000 \u0001\u0000\u0000\u0000\u0001\u0000\u0001ø\u0000\u0000\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0004\u0000",
+    "Delete": "\u0000\u001e\u0010\u0000\u0010\b\u0000\u0002H#Â\u0005 \b\u0015\u0012(P\u0010H¢#ù#\u0010H$¾à$ þH\t\"_è$\b?(¨\b\b\"\"(¢(¡\u0004 @",
+    "Reset": "\u00007\r\u0000\u0004\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\b\u0001\u0000\u0000\u0000\u0001\u0002\u0010\u0002<\u0000\u0000\u0002\u0004 \u0005\u0000\u0000\u0004\b@L \b\u000e\u0010pH\u0013!\u0000\"\u0000Q\u0000!\u0004\u0000@\u0000\u0000@\b\u0000\u0000\b\u0000 \u0000\u0000 \u0001\u0000\u0000ø\u0000\u0002\u0002\u0000\u0000\u0000\u0002\u0000\u0004\u0000",
+    "goal": "\u0000,\r\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000(\u0000\u0000\u0002\bz\u0000\u0000\u0001\u0010x\u0000\u0000\t\u0000\b\u0000\u0000\u0000\u0000ð\t\u0010\b\u0007à\u0000\u0001\u0000\u0000\u0000\t \u0010\u0000\u0000\u0001\u0012\u000f\u0000\u0000\u0000\u0011G\u0010\u0000\u0000\u0002\u0018\u0000\u0000\u0000\u0000A\u0000",
+    "Beep": "\u0000+\r\u0000\u0000\u0000\u0000\u0000\u0000À\u0010\u0000\u0000\u0000&\t\u0000\u0000\u0004|  \u0000\u0000qd\u0010\u0000\u0000\u0000 \u0000\u0000\u0000\b\u0011Àð\u0001\u0003À\u000fÀ\u0000@@\u0000\u0000\u0000\b\b\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000 \u0001ø\u0000\u0000\b\u0000",
+    "Message": "\u0000L\r\u0000\u0001\u0000\u0000\u0000 \u0000\u0000\u0000\u0000 \b\u0000\u0000\u0001\u0000\u0000\u0000\u0003\t\u0000\u0000\u0000\u0010\u0000\u0000\u0000\bP\b\u0000\u0000\u0001\u001e\u0000\u0000\u0000\u0004\u0018\u0000\u0000\u0016 \u0000\u0000`\u0000p\u0001\u0010\t\u0010>\u0001\u0002\u0001\u0000Hpü\u0000\u0000@(\u0002\u0001\u0010\u0000\u0000\u0000\b\u0002@!\u0000\u0010\u0000\u0000\u0000\u0001\u0000@\u0000\u0010\u0001\u0000\u0000\u0000\u0000 \b\u0000\u0002\u0000\b\u0000\u0000\u0000L\u0003\u0000\u0000@\u0000|\u0000\u0000\u0003\u0000À\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "System": "\u0000:\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0018\u0000!À#À\u0002\u0001\u0000\u0007\u0007\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000 À\u0000\u0002\u0000\u0003À\u0010\b\u0010\u0001\u0000G\u0000\u0004\u0000\b\u0000@\u000e@\u0001 \u0004\u0000(\u0000\u0010\u0000\u0002\u0000\u0011\u0000\b\u0000!\u0000\u0018 \u0002\u0000S\u0018\b\u0001\u0000\u000f\u0005\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000\u0000\u0000",
+    "Select Clock": "\u0000k\u0010\u0000\u0000@@@\u0000\u0000\u001ex \u0000\u0000\u0000\u0000\u0000\b\u0004\b\u0001\u0000\u0012I\u0004\u0000@\u0000\u0003á\u0000\u0000\u0010\u0001yà \u0004\u0000FEüþ \u0012À(¢\u0011\u0004@ø\u0007H\u0000\u0004\u0001à\u0000óß ð\u0000\u0011\u0010ð\u0010\u0000\u0004@D\u0010\u0002\u0000\u0004#ÿ\u0001ÿ\u0002\u0010sþ\bþ\u0001À\u0001\u0007ÀÂ\u0000ó\u0011\u0001R@L\u0000|\u0010\u0000@1B 2@\b\u0018Q\b\b`\u000bÿH\u0000ð\u0004\u0006 B!\u0000\u0014\u0001\b\u0002\u0001\u0000ÄD \u0004\"\b\u0011\u0010\u0000\u0003\b\u0001\u0000\u0004A\u0000\u0010\u0000\u0010!ð \u0001@\u0000H \u0004\u0000\u0011\u0000\u0014\"\u0010\u0003ðGÿ*\u0002\u0001\u0000\u0001À\u0001\u0000\u0002\u0000\u0000\u0000\u0000\u0002 \u0000\u0000\u0000",
+    "Locale": "\u0000\u001f\u0010\u0000\u0010  \u0014 @@$@@\u0001?ñ\u0012Â\u0001\u001f¦\u0002\u0004Y\bôÒ\u0011)\u0011$\"R\"hD¨D Pé\u0011ÀN\u0012.\u000e¨ Hã@?\u0000\u0000!",
+    "Vibrate": "\u0000|\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0004\u0000\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000H\u0000@G¨\u0010\u0000\u0000\u0000\u0018\u0000\u0000\u0000\u0000\u0000\u0002\b\u0003\u0001\u0000\u0000\u0000\u0000@\u0000\u0000\u0003\u0000\u0011 \u0001\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0010\u0000`\u0000\u0010\u0001\u0000\u0000\u0000\u0003\u0000\u0000<\u0000A\b@\u001a\u0000\u0001\u0000\u0010\u0000ð\b\u0010\u001c@\u0000!\u0002\u0006\u0010\u0000 \u0001\u0002\u0007à\u0000\u0002\u0000\u0004\u0000\u0002\u0010 \u0001\u0000\u0002\u0000\u0010@\u0000\u0000\u0000@\u0003À\u0000B\u0001\u0000\u0010\u0000@\u0001\b\u0000\u0000\u0000\b\u0001È\u0000\b@\u0010\u0001\u0000\b\u0000\u0011\u0000\u0000\u0000\u0001\u0000\u0000\u0001\b\u0001\u0000\u0010\u0001\u0000\u0001`\u0000\u0000\u0002`\u00008\u0002`\u0000\u0000\u0001\u0000 \u0000\u0018\u0000\u0000\u0000\u0018\u0000\u001c@\u0018\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Alerts": "\u00009\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000 Cà#\u0000\u0000\b\u001e\u0010\u000e\u0000\u0000\u0000\u0004\u0000\u0010\u00008\u0000\u0000\u0002\u0000\bä\u0000\u0000\u0001\u00000\u0003\b\u001f\u0000à\u0010\u0000\u0001\u0003ð\u0000L\b\u0000\u0001\u0000\u0000\u0000!\u0004\u0000\u0000\u0000\u0000\u0010\u0004\u0000\u0000\u0000\u0000\b\u0002\u0000\u0000\u0000\u0000\u0004\u0002\u0000\u0001\u0000\u0000\u0002\u0002\u0000\u0003\u0000\u0000\u0000\u0001\u0000",
+    "Whitelist": "\u0000i\r\u0000\b\u0000\u0000\u0000\u0000 \u0000\u0001\u0000\u0000\u0000 \u0002\u0000Cà\u0000@\b\u0000\u0010@!À\b\u0001\u0000\u001e\u0010\u0000@\u0004\u0000\u0004 \u000f \u0004\u0010ø\b\b\u0000@\u0002\u0000\u0002\u0010\u0000 \u0002\u0007À\u0002\u0004\u0000À\u0001\u0000\u0001\b\u0000\u0010\u0001\u0000 \u0001\u0004\u0001 \u0000à\u0000\u0000\u0010\u0000à\u0014\u0000\u0003\b\u0000L\u0000B\u0000\b\u0000LI\u0000\u0002\u0000\u0004\u0000!\u0000!\u0000\n\u0000!$@\u0001\u0000\u0002\u0000\u0010\u0000\u0001\u0000\b\u0010\" \u0001\u0000\u0001\u0000\b\u0000\u0000\u0018 \b!\u0000\u0001\u0000\u0000\u0004\u0000\u00000\u0010\u0004\u0001\u0001\u0000\u0000@\u0002\u0000\u0000\u0000\u0000\u0002\u0000@\u0001\u0000\u0000 \u0001\u0000\u0000\u0000\u0000\u0001\u0000",
+    "Set Time": "\u0000k\u0010\u0000\u0000@\u0000\u0000\u0000\u0000@\u0000\u0004\u0000\u0000\u0000\u0000\u0000\b\u001f>\u0001\u0000\u0004>\u0000@\u0000@\u0000\u0003á\u0002$@\u0010\u0000Cÿð\u0004\u0000FEü|ø\u0012Àþ@\u0002@ø\u0007H\b\u0001à\u0000\u0011\u0010\u0000ð\u0000\u0011\u0010óà\u0010\u0001ô\u0018\u0000\u0000\u0002\u0000\u0004#ÿ \u0004\u0002\u0010\u0001\u0000\u001fü\u0001À\u0001\u0007ÀüóßÀ\u0010\u0000L\u0000|\u00101\u0001\b\u0002\u0000\b\u0018Qò\b`\u001f!\u0004@\u0000ð\u0004\u0006 BB@\u0014\u0002\"@À\u0002\u0001\u0000ÄOÈ\u0004DP\u0011\u0000\u0000\u0003\t\t\u0001\u0000\b\u0002 \u0000\u0010\u0000\u0010!\u0000  \u0001ñ@¤\u0000\u0004\u0000\u0011\u0000\u0014 \u0014\u0003ð\"D#ÿ\u0001\u0000\u0001À\u0001\u0004\u0001\u0000\u0000\u00000h\u0000\u0000\u0000\u0000\u0000",
+    "Disable": "\u0000\u001e\u0010\u0000\u0010\u0000\u0010 @\u0000 ÿÀ\u0002\n¨?ÈJ \u0000ü*ÿÄ\"B¨ I\n $$*PÿÀ@\u0000\u0005\u0011$\"D\u0011\n\u0014$H\u0012 \u0001\u0000",
+    "BACK": "\u0000\u001e\n\u0000ø0x\u0011\"\u0012(DI!! (øÂ\u0013ò\u0003\bHH\n!!!$â\u0011â\u0010",
+    "ALARM": "\u0000&\n\u000000ø\"\u0001\"\u0012\u0014\u0004Lá !!3ø·ò\u0003òBØH\bHa !\"!\u0013ò\u0012\u0012\u0010",
+    "Timer": "\u0000;\r\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u001f\u0000\u0004\u0002\u000f\u0000\u0000\u0004 \u0001\u0000>\u0010\u0000\u0000\u0000À\u0000\u0004\u0000\u0000)\u0000h\u0000\u0001\u0002\u0007ÈÀ0\u0000@?\u0002\b\u0000\u0010\u0001\u0000\u0000\u0002\u0000\u0002\u0000\f\u0000\u0000\u0000\u0000@\u0000@\u0000\u0000 \u0000\b\u0000\u0004\u0000\u0000\u0018\u0000\u0001\u0000\u0000\u0000\u0000\f\u0000\u0000 \u0000\u0000\u0000\u0000",
+    "Error in settings": "\u0000]\u0010\u0000 \u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000À\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\"\u001fÿ\u0000\u0000\u0000\u0000\u0000\u0000\u0001ý\u0010\u0004\u0007\u0000\u0000#\u0000\u0000\b\u0000@Ò\u0000\u0007\u0000à\u0000\u0000>\u0000\u0000\b\u000fÀ\u00008\u0000\u0000\b\u0000ÿàD \b\u0000@\u0000\u000f¿ \u0004A\u0000 \u0003\b\u001f\u0000\u0001\u0000\"\b\u0001\u0000\u0000\u0010?\u0003ä \u0001 @\b\u0000\u0001\u0000\u0000\u0011\u0012\u0004~\t\u0004\u0000@\u0000\b\u0000\u0000 \"\u0000P \u0007à\u0000\u0000\u0004B\u0001\u0010\u0001\u0006\u0003À\b\u0000\u0000>(\u0014\u0000À\u0000\u0000\u0001\u0000\u0001\u0012!\u001fø\u0000\u0000\u0000\u00000\u0000\u0000\u0000`Ð\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Factory Reset": "\u0000\r\u0000\u0000\u0000\u0000\u0000 \u0000@\u0000\u0002\u0000\u0000\u0000\u0002\u0000@\u0000\u0000\u0000@\u0000\u0000\u0013 \u0000A\u0000\u0000\u0000A\u0000 \u0000\u0000\u0000 x\u0000\u0000\u001c \u0000!\u0000\u0000\u0000!\u0000 \u0000\u0000\u0000 \u0000\u0000\u0000\u0011\u0000 \u0000!\u0000\u0000\u0000!\u0000#À\u0000\u0000 \u0001\u0000\u0000\u0000!\u0000 \u0000!\u0000\u0000\u0000!\u0000,@\u0000\u0000 \u0001\u0001\u000f\u0000\"\u00008\u0000!\u0002\u0007À!\u00010\"\u00008\u0002\u0000ñ\u0000B\u0000&\u0000!\u0001ø\u0000!\u0000á\u0000\u0000&\u0002\u0000\u0012\u0000\u0000!\u0000!\u0000\u0000\u0000!\u0000\"\u0000Q\u0000!\u0004\u0000\f\u0000\u0004\u0000 \u0000\u0002\u0000\u0000\u0000\u0002\u0000 \u0000B\u0000 \b\u0000\b\u0000\b\u0000 \u0000\u0002\u0000\u0000\u0000\u0002\u0000 \u0000\u0002\u0000 \u0010\u0000\b\u0000\u0010\u0000 \u0000\u0004\u0000\u0000\u0000\u0004\u0000\u0010\u0000\u0004\u0000  \u0000\u0010\u0000 \u0000 \u0000\b\u0000\u0000\u0000\b\u0000\u000f\b\u0000 \u0000\u0000 \u0000@\u0000 \u0000\u0010\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0010\u0000 ",
+    "Sleep": "\u0000\u001f\u0010\u0000\u0000\u0010\u0000\u0000\u0000ð\u0003ûÏ\u0001ô\u0014\u0002()\u0004\u0004P^ÿ¿¤\u0011HI$\"÷þ}ÿ$BI!\u0014¿â(\u0004\u0007Ñ2\b\b©Aÿ\u0000a\u0000\u0000",
+    "Connected": "\u0000]\u0010\u0000\u0001\u0000\u0010\u0010\u0010 \u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u001fÿ\u0004ÿ\u0004ÿ\bÿ\u0000\u0002\u0000\u0002\u0000 \u0000 \u0000P@\u0010\u0000\t\u0001ÿ\u000fÐÐÀ\u0000p\b\b\bH\bHx\u0000\u0004\u0000\u001e\u0000@@_ø_øOø \u0000#Ãþ\u0002\b\u0002\b\u0004@A\u0000\u0001\u0003\u0010\u0010\u0018@\u0018@L\u0004\b\u0000\b ÿ¿ñ¿÷Ä@\u0000\u0004\u00044\"4\"\u0002$\u0002\u0002\u0004\u0000?à\"\u0010\"\u0010\u0001 \u0010 \"\u0001\u0001\u0001\t\u0001\t\n\u0000F\u0002\u0010\b\b\b0\b0T\u0001À\u0010ÿùFaFb\u0004H\u0000\u0000\u0000\u0000\u0000\u0004ÀÀAÀ\u0000\u0000\u0000",
+    "Messages": "\u0000L\r\u0000\u0001\u0000\u0000\u0000 \u0000\u0000\u0000\u0000 \b\u0000\u0000\u0001\u0000\u0000\u0000\u0003\t\u0000\u0000\u0000\u0010\u0000\u0000\u0000\bP\b\u0000\u0000\u0001\u001e\u0000\u0000\u0000\u0004\u0018\u0000\u0000\u0016 \u0000\u0000`\u0000p\u0001\u0010\t\u0010>\u0001\u0002\u0001\u0000Hpü\u0000\u0000@(\u0002\u0001\u0010\u0000\u0000\u0000\b\u0002@!\u0000\u0010\u0000\u0000\u0000\u0001\u0000@\u0000\u0010\u0001\u0000\u0000\u0000\u0000 \b\u0000\u0002\u0000\b\u0000\u0000\u0000L\u0003\u0000\u0000@\u0000|\u0000\u0000\u0003\u0000À\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
+    "Hide": "\u0000\u001c\u0010\u0000\u0000\u0010\u0000\u000f \u0001\t\b\u001fH\n\u0015\u0000\u0010ø\u0007\t\u0000ø\bxø\u0000\b\u0000\u0010¡H\u0001\bU@ \u0014\u0004\b\u0000\u0000",
+    "Show": "\u0000\u001d\u0010\u0000\u0001\u0000\u0000\u0000\b\u0000\b\u001fÿ\u0000 \u0002\u0000ð\u0010\u0003ø\u001fü\u0000@\u0004\u0000\u000e\u0000 \u0000ÿþ\u0004@(\u0000\u001e\u0002\"\u0000\u00100 \u0001\u0002\u0000\bd\u0000(\u0018\b\u0001\u0000\u0000",
+    "On": "\u0000\u001b\r\u0000\u0002\u0000\u0000\u0000 \u0000\u0000\u0004\u0001@ð\b\u0017ð\u0000\u0006\u0000\u0000@\u0000\u0010H\u0000\u0004\u0011\u0000\u0001\u0004 \u0000A\u0004\u00010\u0001\u0018\u0000\u0010\u0000\u0000",
+    "Ok": "\u0000\u000e\n\u0000x\u0012(I!(Â\u0013\bJ!$â\u0010",
+    "No": "\u0000,\r\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000p\u0000\u0000\u0000\u0000\u0000\b\u0000\b\u0000\u0000\u0000@À@À#\u0002\u0004\u0002\u0001Ð@\u0010@\u0010\u0002\u0004A\u0004A\u0000@H0H0\b\u0002\u0002\u0001À0\u00000\u0000\"\u0001\u0000\u0001\u0000\u0004 \u0000\u0000\u0000\u0000Að",
+    "Settings": "\u0000\u001f\u0010\u0000 \u0000\u0002\u0000!ð\u0002\u0000B!ÿÿôB\u0000\u0010\b\u0000O À\u0000\u0000\u000fþ>þ\u0000\u0000\u0001\u0000ù\b\"\u0001\u0011 Gâ\"\u0004B\u0001\u0010\u000f\u0005 \u0011\"\u0011ÿ@\u0000",
+    "steps": "\u0000\u001f\u0010\u0000\u0001\u0000\b \u0002\u0000@Gà¨\u0000Añ\u0010\u000fôB \u0005H¿ÿQ\u0000DR\u0001\u0010\u0010(\"\u0011üPDPA\t\"\u0010\f\u0006B`\u0003\u0005\u0007\u0000\r\u0011p\u0000aA",
+    "back": "\u0000+\r\u0000\u0000\u0010\u0000\u0000\b\u0000\t\u0000\u0000\u0000\u0000 \u0000\u0000\u001c\u0000\u0000\u0002 \u0000\u0000\u0000\u0010\u0011\u0000\u0011\u0004\b\t\u0010\u0004 \u0000¢\u0001\b \u0010\u0010\u0001\b\u0002\u0000\u0010\u0000B\u0000@\u0004\u0000\u0010\u0000\u0000\u0001\u0000\u0004\u0000\u0000\u0000@\u0001\u0000",
+    "Steps": "\u0000\u001f\u0010\u0000\u0001\u0000\b \u0002\u0000@Gà¨\u0000Añ\u0010\u000fôB \u0005H¿ÿQ\u0000DR\u0001\u0010\u0010(\"\u0011üPDPA\t\"\u0010\f\u0006B`\u0003\u0005\u0007\u0000\r\u0011p\u0000aA",
+    "Year": "\u0000\u000f\u0010\u0000\u0010\u0000 \u0000ñ\u0004\u0002\b\b\u0010\u0007þ\b@\u0010!\u0003ÿø\u0004\u0000\b\u0000\u0010\u0000 \u0000@",
+    "Yes": "\u0000\u001b\r\u0000\u0001\u0000\u0000\u0010\u0010\u0000\u0001\u0002\u0000\u0000(p\u0004ø\b\u0019\u0001\u0001\u0000   \f\u0004\u0004Atð\n\u0005#\u0001$P\u0010\u0004p\u0000\u0000",
+    "Loading": "\u0000M\u0010\u0000  \u0000\u0000\u0002\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0001\b\u0000\u0000\u0000\b\u0000ÿ \u0004 \u0002 \u0000Aø@\u000f\u0000 \u000f\u0000\u0002\u0000\u001fÀ\u0010\u0000\u0004\u0000\u0010\u0003ÿ¼\u0000\u0000\u0000P\u0000\u0010\u000fø\bÂ\b/@@B\u0002\"\u0000B\u0004!\u0004\u0004\u000fð\u0011\u0010\u000fð!\u000bÄ ÀA Á\bR$\u0011\t\u0005\u0001\u0011\t\u000fþ @0\u0004@B\u0014\u0003\u0004\u0001\u0000\u0003\u0004\u0000\u0010<\u0000@\u0014\u0000\u0000@\u0000$H\u0000\u0001\u001fø\u0000\u0000\u0004\u0000AÀ\u0000\u0000\u0000\u0000\u0000\u0000 ",
+    "Music": "\u0000\u001f\u0010\u0000\u0002\u0000\u0001\u0000\u0002\u0000\bÿà \u0000\u0000¢\u0000D\u0000\u0002ú?ÿ\u0012\u0000\u0000b\"\u001fð\u0007À  \u0002\u0000@Cÿøÿ*\u0001\u0001\u0000\u0002\u0002\u0006#\u0007ü0A\b\u0000",
+    "color": "\u0000+\r\u0000\b\u0000\u0000\u0000\u0000\u0000\bà\u0000\u0000\u0010\u0000à\u0000\u0000Cà\u0000à\u0000\u0007Ä\bä\u0000\u0000\u0010à\u0007Â\u0010\u0000\u0010?\u0000\u0000\u0004\u0000\u0000\u0010\u0000\u0000\u0004\u0010\u0000 \u0000\u0001\u0014\u0000\b\u0000\u0000A\u0006\u0000\u0000\u0000 \u0003\u0000\u0000\u0000",
+    "off": "\u0000\u001a\r\u0000\u0002\u0000\u0000\u0000@\u0010ð\u0010\u0003Æ\u0007\u0001\u0000\u0000À\u0000 P\u0000\u0010$\u0000\u0004\u0011\u0000\u0002\b@\u0001\u0004\u0010\u0000\f\u0000@\u0001\u0000\u0000\u0000",
+    "Off": "\u0000\u001a\r\u0000\u0002\u0000\u0000\u0000@\u0010ð\u0010\u0003Æ\u0007\u0001\u0000\u0000À\u0000 P\u0000\u0010$\u0000\u0004\u0011\u0000\u0002\b@\u0001\u0004\u0010\u0000\f\u0000@\u0001\u0000\u0000\u0000",
+    "Theme": "\u0000+\f\u0000G\u0000\u0000\u0000\u0007\u0000\u0000\u0000\u0010x\u0000\u0000\u0000\u0001ðð\u0000\u0000\u0000(à\u0010>\u0000\bä\u0001ø\u0000\u0002\u0000\u0000\u0000\f \u0000\u0000\u0000`\u0004\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000 @\u0000\u0000\u0000\u0000\u0010\u0000\u0000\u0000\u0000\u0000",
+    "Back": "\u0000+\r\u0000\u0000\u0010\u0000\u0000\b\u0000\t\u0000\u0000\u0000\u0000 \u0000\u0000\u001c\u0000\u0000\u0002 \u0000\u0000\u0000\u0010\u0011\u0000\u0011\u0004\b\t\u0010\u0004 \u0000¢\u0001\b \u0010\u0010\u0001\b\u0002\u0000\u0010\u0000B\u0000@\u0004\u0000\u0010\u0000\u0000\u0001\u0000\u0004\u0000\u0000\u0000@\u0001\u0000"
+  }
+}
\ No newline at end of file
diff --git a/lang/nn_NO.json b/lang/nn_NO.json
index c85855acc..540726687 100644
--- a/lang/nn_NO.json
+++ b/lang/nn_NO.json
@@ -268,4 +268,4 @@
         "ten to *$2": "ti på *$2",
         "five to *$2": "fem på *$2"
     }
-}
+}
\ No newline at end of file
diff --git a/lang/pt_BR.json b/lang/pt_BR.json
index 75849ddad..e05b27740 100644
--- a/lang/pt_BR.json
+++ b/lang/pt_BR.json
@@ -1,167 +1,167 @@
 {
-  "//": "Portuguese Brasil language translations",
-  "GLOBAL": {
-    "//": "Translations that apply for all apps",
-    "New Timer": "Novo Temporizador",
-    "New Alarm": "Novo Alarme",
-    "Auto snooze": "Soneca automática",
-    "week": "semana",
-    "circle 3": "círculo 3",
-    "(repeat)": "(repetir)",
-    "Save": "Salvar",
-    "Keep Msgs": "Manter Msgs",
-    "music": "música",
-    "circle 4": "círculo 4",
-    "circle 2": "círculo 2",
-    "circle count": "contagem em círculo",
-    "circle 1": "círculo 1",
-    "battery warn": "aviso de bateria",
-    "show widgets": "exibir widgets",
-    "data": "dados",
-    "heartrate": "frequência cardíaca",
-    "distance goal": "distancia de chegada",
-    "Circle": "Círculo",
-    "colorize icon": "colorir ícone",
-    "min. confidence": "min. confiança",
-    "minimum": "mínimo",
-    "maximum": "máximo",
-    "Heartrate": "Frequência Cardíaca",
-    "weather circle": "círculo meteorológico",
-    "step length": "comprimento do passo",
-    "valid period": "período válido",
-    "TAP right top/bottom": "TAP superior/inferior direita",
-    "Vector font size": "Tamanho de letra vectorial",
-    "Yes\ndefinitely": "Sim\ndefinitivamente",
-    "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:startlap 2:exit 3:reset",
-    "STEPS": "ETAPAS",
-    "Font": "Fonte",
-    "Show clocks": "Mostrar relógios",
-    "App Source\nNot found": "Fonte do aplicativo\nNão encontrado",
-    "Mark Unread": "Marcar como não lido",
-    "View Message": "Ver Mensagem",
-    "start&lap/reset, BTN1: EXIT": "start&lap/reset, BTN1: SAÍDA",
-    "Launcher Settings": "Configurações do Launcher",
-    "Delete All Messages": "Apagar todas as mensagens",
-    "Delete all messages": "Apagar todas as mensagens",
-    "Utils": "Utils",
-    "LCD": "LCD",
-    "Apps": "Apps",
-    "Record Run": "Gravar Corrida",
-    "No Messages": "Sem Mensagens",
-    "Unread timer": "Temporizador não visto",
-    "Are you sure": "Tem certeza",
-    "Make Connectable": "Habilitar Conexão",
-    "Piezo": "Piezo",
-    "Bluetooth": "Bluetooth",
-    "BLE": "BLE",
-    "Programmable": "Programável",
-    "Vibration": "Vibração",
-    "Quiet Mode": "Modo Silencioso",
-    "Foreground": "Primeiro plano",
-    "Passkey BETA": "Senha BETA",
-    "HID": "HID",
-    "Light BW": "BW Leve",
-    "Foreground 2": "Primeiro plano 2",
-    "Dark BW": "BW Escuro",
-    "Background": "Plano de Fundo",
-    "Highlight FG": "Destaque FG",
-    "Customize": "Personalizar",
-    "Background 2": "Plano de Fundo 2",
-    "Wake on BTN3": "Acordar no BTN3",
-    "Wake on BTN2": "Acordar no BTN2",
-    "Highlight BG": "Destaque BG",
-    "LCD Timeout": "Tempo limite do LCD",
-    "Wake on FaceUp": "Acordar no FaceUp",
-    "Wake on BTN1": "Acordar no BTN1",
-    "Wake on Twist": "Acordar ao Balançar",
-    "Wake on Touch": "Acordar ao Tocar",
-    "Connect device\nto add to\nwhitelist": "Ligar dispositivo\npara adicionar a\nWhitelist",
-    "Remove": "Remover",
-    "Add Device": "Adicionar dispositivo",
-    "LCD Brightness": "Luminosidade do LCD",
-    "Twist Max Y": "Max Y do Balanço",
-    "Utilities": "Utilidades",
-    "Twist Threshold": "Limiar do Balanço",
-    "Time Zone": "Fuso horário",
-    "Twist Timeout": "Timeout do Balanço",
-    "Clock Style": "Estilo do Relógio",
-    "Debug Info": "Debug Infos",
-    "Log": "Logs",
-    "Storage": "Armazenamento",
-    "Rewrite Settings": "Re-escrever Configurações",
-    "Compacting...\nTakes approx\n1 minute": "Compactando...\nLeva aproximadamente\n1 minuto",
-    "Flatten Battery": "Drenar Bateria",
-    "Reset Settings": "Resetar Configurações",
-    "Compact Storage": "Armazenamento compacto",
-    "Stay Connectable": "Manter Conectavel",
-    "Turn Off": "Desativar",
-    "Connectable": "Conectável",
-    "This will remove everything": "Esta ação irá apagar tudo",
-    "Date": "Data",
-    "Month": "Mês",
-    "Second": "Segundo",
-    "Minute": "Minuto",
-    "Flattening battery - this can take hours.\nLong-press button to cancel": "Drenando Bateria - isto pode demorar horas.\nSegure o Botão para Cancelar",
-    "Reset to Defaults": "Resetar Dispositivo",
-    "Hour": "Hora",
-    "No Clocks Found": "Não encontramos nenhum Relogio",
-    "Right": "Confirmar",
-    "No app has settings": "Nenhum aplicativo possui configurações",
-    "App Settings": "Configurações do aplicativo",
-    "OFF": "DESLIGADO",
-    "Side": "Lado",
-    "Left": "Esquerda",
-    "Sort Order": "Ordem de classificação",
-    "Widgets": "Widgets",
-    "Invalid settings": "Configurações inválidas",
-    "Sleep Phase Alarm": "Alarme da Fase do Sono",
-    "Alarm": "Alarme",
-    "Minutes": "Minutos",
-    "TIMER": "TIMER",
-    "Hours": "Horário",
-    "on": "em",
-    "Reset All": "Resetar tudo",
-    "Repeat": "Repetir",
-    "Delete": "Deletar",
-    "Enabled": "Habilitado",
-    "Reset all widgets": "Redefinir todos os widgets",
-    "Reset": "Resetar",
-    "goal": "meta",
-    "Message": "Mensagem",
-    "Beep": "Bip",
-    "Vibrate": "Vibrar",
-    "System": "Sistema",
-    "Alerts": "Alertas",
-    "Locale": "Localização",
-    "Set Time": "Tempo Definido",
-    "Whitelist": "Whitelist",
-    "Select Clock": "Selecionar Relógio",
-    "BACK": "VOLTAR",
-    "Timer": "Temporizador",
-    "Error in settings": "Erro nas Configurações",
-    "Disable": "Desativar",
-    "Factory Reset": "Reset de Fábrica",
-    "Connected": "Conectado",
-    "ALARM": "ALARME",
-    "Sleep": "Dormir",
-    "Messages": "Mensagens",
-    "Hide": "Esconder",
-    "Show": "Mostrar",
-    "On": "Ativo",
-    "Ok": "Ok",
-    "No": "Não",
-    "Settings": "Configurações",
-    "steps": "passos",
-    "back": "voltar",
-    "Steps": "Passos",
-    "Year": "Ano",
-    "Yes": "Sim",
-    "Loading": "Carregando",
-    "Music": "Música",
-    "color": "cor",
-    "off": "desativado",
-    "Off": "Desativado",
-    "Theme": "Tema",
-    "Back": "Voltar"
-  }
-}
+    "//": "Portuguese Brasil language translations",
+    "GLOBAL": {
+        "//": "Translations that apply for all apps",
+        "New Timer": "Novo Temporizador",
+        "New Alarm": "Novo Alarme",
+        "Auto snooze": "Soneca automática",
+        "week": "semana",
+        "circle 3": "círculo 3",
+        "(repeat)": "(repetir)",
+        "Save": "Salvar",
+        "Keep Msgs": "Manter Msgs",
+        "music": "música",
+        "circle 4": "círculo 4",
+        "circle 2": "círculo 2",
+        "circle count": "contagem em círculo",
+        "circle 1": "círculo 1",
+        "battery warn": "aviso de bateria",
+        "show widgets": "exibir widgets",
+        "data": "dados",
+        "heartrate": "frequência cardíaca",
+        "distance goal": "distancia de chegada",
+        "Circle": "Círculo",
+        "colorize icon": "colorir ícone",
+        "min. confidence": "min. confiança",
+        "minimum": "mínimo",
+        "maximum": "máximo",
+        "Heartrate": "Frequência Cardíaca",
+        "weather circle": "círculo meteorológico",
+        "step length": "comprimento do passo",
+        "valid period": "período válido",
+        "TAP right top/bottom": "TAP superior/inferior direita",
+        "Vector font size": "Tamanho de letra vectorial",
+        "Yes\ndefinitely": "Sim\ndefinitivamente",
+        "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:startlap 2:exit 3:reset",
+        "STEPS": "ETAPAS",
+        "Font": "Fonte",
+        "Show clocks": "Mostrar relógios",
+        "App Source\nNot found": "Fonte do aplicativo\nNão encontrado",
+        "Mark Unread": "Marcar como não lido",
+        "View Message": "Ver Mensagem",
+        "start&lap/reset, BTN1: EXIT": "start&lap/reset, BTN1: SAÍDA",
+        "Launcher Settings": "Configurações do Launcher",
+        "Delete All Messages": "Apagar todas as mensagens",
+        "Delete all messages": "Apagar todas as mensagens",
+        "Utils": "Utils",
+        "LCD": "LCD",
+        "Apps": "Apps",
+        "Record Run": "Gravar Corrida",
+        "No Messages": "Sem Mensagens",
+        "Unread timer": "Temporizador não visto",
+        "Are you sure": "Tem certeza",
+        "Make Connectable": "Habilitar Conexão",
+        "Piezo": "Piezo",
+        "Bluetooth": "Bluetooth",
+        "BLE": "BLE",
+        "Programmable": "Programável",
+        "Vibration": "Vibração",
+        "Quiet Mode": "Modo Silencioso",
+        "Foreground": "Primeiro plano",
+        "Passkey BETA": "Senha BETA",
+        "HID": "HID",
+        "Light BW": "BW Leve",
+        "Foreground 2": "Primeiro plano 2",
+        "Dark BW": "BW Escuro",
+        "Background": "Plano de Fundo",
+        "Highlight FG": "Destaque FG",
+        "Customize": "Personalizar",
+        "Background 2": "Plano de Fundo 2",
+        "Wake on BTN3": "Acordar no BTN3",
+        "Wake on BTN2": "Acordar no BTN2",
+        "Highlight BG": "Destaque BG",
+        "LCD Timeout": "Tempo limite do LCD",
+        "Wake on FaceUp": "Acordar no FaceUp",
+        "Wake on BTN1": "Acordar no BTN1",
+        "Wake on Twist": "Acordar ao Balançar",
+        "Wake on Touch": "Acordar ao Tocar",
+        "Connect device\nto add to\nwhitelist": "Ligar dispositivo\npara adicionar a\nWhitelist",
+        "Remove": "Remover",
+        "Add Device": "Adicionar dispositivo",
+        "LCD Brightness": "Luminosidade do LCD",
+        "Twist Max Y": "Max Y do Balanço",
+        "Utilities": "Utilidades",
+        "Twist Threshold": "Limiar do Balanço",
+        "Time Zone": "Fuso horário",
+        "Twist Timeout": "Timeout do Balanço",
+        "Clock Style": "Estilo do Relógio",
+        "Debug Info": "Debug Infos",
+        "Log": "Logs",
+        "Storage": "Armazenamento",
+        "Rewrite Settings": "Re-escrever Configurações",
+        "Compacting...\nTakes approx\n1 minute": "Compactando...\nLeva aproximadamente\n1 minuto",
+        "Flatten Battery": "Drenar Bateria",
+        "Reset Settings": "Resetar Configurações",
+        "Compact Storage": "Armazenamento compacto",
+        "Stay Connectable": "Manter Conectavel",
+        "Turn Off": "Desativar",
+        "Connectable": "Conectável",
+        "This will remove everything": "Esta ação irá apagar tudo",
+        "Date": "Data",
+        "Month": "Mês",
+        "Second": "Segundo",
+        "Minute": "Minuto",
+        "Flattening battery - this can take hours.\nLong-press button to cancel": "Drenando Bateria - isto pode demorar horas.\nSegure o Botão para Cancelar",
+        "Reset to Defaults": "Resetar Dispositivo",
+        "Hour": "Hora",
+        "No Clocks Found": "Não encontramos nenhum Relogio",
+        "Right": "Confirmar",
+        "No app has settings": "Nenhum aplicativo possui configurações",
+        "App Settings": "Configurações do aplicativo",
+        "OFF": "DESLIGADO",
+        "Side": "Lado",
+        "Left": "Esquerda",
+        "Sort Order": "Ordem de classificação",
+        "Widgets": "Widgets",
+        "Invalid settings": "Configurações inválidas",
+        "Sleep Phase Alarm": "Alarme da Fase do Sono",
+        "Alarm": "Alarme",
+        "Minutes": "Minutos",
+        "TIMER": "TIMER",
+        "Hours": "Horário",
+        "on": "em",
+        "Reset All": "Resetar tudo",
+        "Repeat": "Repetir",
+        "Delete": "Deletar",
+        "Enabled": "Habilitado",
+        "Reset all widgets": "Redefinir todos os widgets",
+        "Reset": "Resetar",
+        "goal": "meta",
+        "Message": "Mensagem",
+        "Beep": "Bip",
+        "Vibrate": "Vibrar",
+        "System": "Sistema",
+        "Alerts": "Alertas",
+        "Locale": "Localização",
+        "Set Time": "Tempo Definido",
+        "Whitelist": "Whitelist",
+        "Select Clock": "Selecionar Relógio",
+        "BACK": "VOLTAR",
+        "Timer": "Temporizador",
+        "Error in settings": "Erro nas Configurações",
+        "Disable": "Desativar",
+        "Factory Reset": "Reset de Fábrica",
+        "Connected": "Conectado",
+        "ALARM": "ALARME",
+        "Sleep": "Dormir",
+        "Messages": "Mensagens",
+        "Hide": "Esconder",
+        "Show": "Mostrar",
+        "On": "Ativo",
+        "Ok": "Ok",
+        "No": "Não",
+        "Settings": "Configurações",
+        "steps": "passos",
+        "back": "voltar",
+        "Steps": "Passos",
+        "Year": "Ano",
+        "Yes": "Sim",
+        "Loading": "Carregando",
+        "Music": "Música",
+        "color": "cor",
+        "off": "desativado",
+        "Off": "Desativado",
+        "Theme": "Tema",
+        "Back": "Voltar"
+    }
+}
\ No newline at end of file
diff --git a/lang/sv_SE.json b/lang/sv_SE.json
index 2c2ff5acf..d59491306 100644
--- a/lang/sv_SE.json
+++ b/lang/sv_SE.json
@@ -197,4 +197,4 @@
         "ten to *$2": "tio i *$2",
         "five to *$2": "fem i *$2"
     }
-}
+}
\ No newline at end of file
diff --git a/lang/unicode-based/ja_JA.json b/lang/unicode-based/ja_JA.json
index 2852fd9e3..f8c16c9ce 100644
--- a/lang/unicode-based/ja_JA.json
+++ b/lang/unicode-based/ja_JA.json
@@ -2,123 +2,123 @@
     "//": "Japanese language translations",
     "GLOBAL": {
         "//": "Translations that apply for all apps",
-        "New Alarm": "新型アラーム",
-        "New Timer": "新型タイマー",
+        "New Alarm": "アラームを追加",
+        "New Timer": "タイマーを追加",
         "Save": "保存",
-        "Keep Msgs": "Keep Msgs",
-        "circle count": "サークルカウント",
-        "(repeat)": "(繰り返し)",
+        "Keep Msgs": "メッセージを保持する",
+        "circle count": "サークルの数",
+        "(repeat)": "(リピート)",
         "music": "音楽",
         "Auto snooze": "オートスヌーズ",
-        "week": "ウィーク",
+        "week": "週間",
         "circle 1": "サークル1",
         "circle 3": "サークル3",
         "circle 2": "サークル2",
-        "show widgets": "show widgets",
+        "show widgets": "ウィジェットを表示",
         "heartrate": "心拍数",
         "circle 4": "サークル4",
         "battery warn": "バッテリー警告",
         "valid period": "有効期間",
         "maximum": "最大",
-        "weather circle": "ウェザーサークル",
-        "minimum": "ミニマム",
-        "step length": "ステップ長",
+        "weather circle": "天気サークル",
+        "minimum": "最小",
+        "step length": "歩行",
         "distance goal": "距離目標",
         "Circle": "サークル",
-        "min. confidence": "最低限の自信",
-        "colorize icon": "カラライズアイコン",
+        "min. confidence": "最小確信度",
+        "colorize icon": "カラーアイコン",
         "Heartrate": "心拍数",
         "data": "データ",
-        "Yes\ndefinitely": "はい。\n間違いなく",
+        "Yes\ndefinitely": "はい。\n確かに",
         "Launcher Settings": "ランチャー設定",
-        "TAP right top/bottom": "TAP右上/左下",
+        "TAP right top/bottom": "タップ右上/左下", 
         "Font": "フォント",
-        "Mark Unread": "マーク・アンリード",
-        "start&lap/reset, BTN1: EXIT": "スタート＆ラップ＆リセット、BTN1：EXIT",
+        "Mark Unread": "未読にする",
+        "start&lap/reset, BTN1: EXIT": "スタート＆ラップ＆リセット、BTN1：終了",
         "App Source\nNot found": "アプリソース\n見つからない",
-        "Show clocks": "時計の表示",
-        "STEPS": "ステップ",
+        "Show clocks": "時計を表示する",
+        "STEPS": "歩数",
         "Vector font size": "ベクターのフォントサイズ",
         "View Message": "メッセージを見る",
         "Are you sure": "本当にいいの？",
-        "Bluetooth": "ブルートゥース",
+        "Bluetooth": "Bluetooth",
         "Unread timer": "未読のタイマー",
-        "Delete all messages": "すべてのメッセージの削除",
+        "Delete all messages": "すべてのメッセージを削除する",
         "No Messages": "メッセージなし",
-        "Record Run": "レコード・ラン",
+        "Record Run": "ランニングを記録する",
         "Apps": "アプリ",
-        "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:startlap 2:exit 3:reset",
-        "Delete All Messages": "全メッセージの削除",
-        "Vibration": "振動",
-        "Utils": "ユーティライゼーション",
+        "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:スタート＆ラップ 2:終了 3:リセット",
+        "Delete All Messages": "すべてのメッセージを削除する",
+        "Vibration": "バイブレーション",
+        "Utils": "ユーティリティー",
         "Piezo": "ピエゾ",
         "BLE": "BLE",
-        "Make Connectable": "接続可能にする",
+        "Make Connectable": "検出可能にする",
         "HID": "HID",
-        "Light BW": "ライトBW",
+        "Light BW": "ライト白黒",
         "LCD": "LCD",
         "Background": "背景",
-        "Foreground": "フォアグラウンド",
+        "Foreground": "前景",
         "Programmable": "プログラム可能",
         "Customize": "カスタマイズ",
-        "Dark BW": "ダークBW",
+        "Dark BW": "ダーク白黒",
         "Background 2": "背景2",
-        "Quiet Mode": "クワイエットモード",
-        "Highlight FG": "ハイライトFG",
-        "Foreground 2": "フォアグラウンド2",
+        "Quiet Mode": "サイレントモード",
+        "Highlight FG": "ハイライト前景",
+        "Foreground 2": "前景2",
         "Remove": "削除",
         "Passkey BETA": "Passkey BETA",
         "Add Device": "デバイスの追加",
-        "LCD Timeout": "LCDタイムアウト",
-        "Highlight BG": "ハイライトBG",
-        "LCD Brightness": "液晶ディスプレイの明るさ",
-        "Connect device\nto add to\nwhitelist": "接続機器\nに追加します。\nホワイトリスト",
-        "Wake on BTN3": "Wake on BTN3",
-        "Wake on BTN2": "Wake on BTN2",
-        "Time Zone": "タイムゾーン",
-        "Wake on Touch": "ウェイクオンタッチ",
+        "LCD Timeout": "画面消灯", 
+        "Highlight BG": "ハイライト背景",
+        "LCD Brightness": "明るさのレベル",
+        "Connect device\nto add to\nwhitelist": "デバイスを接続して\nホワイトリストに\n追加する",
+        "Wake on BTN3": "BTN3にスリープ解除",
+        "Wake on BTN2": "BTN2にスリープ解除",
+        "Time Zone": "時間帯",
+        "Wake on Touch": "タッチにスリープ解除",
         "Twist Timeout": "ツイストタイムアウト",
-        "Wake on Twist": "ウェイクオンツイスト",
-        "Wake on BTN1": "Wake on BTN1",
+        "Wake on Twist": "ツイストにスリープ解除",
+        "Wake on BTN1": "BTN1にスリープ解除",
         "Log": "ログ",
-        "Wake on FaceUp": "Wake on FaceUp",
-        "Twist Max Y": "ツイストマックスY",
+        "Wake on FaceUp": "直面するにスリープ解除",
+        "Twist Max Y": "ねじれ限界Y",
         "Utilities": "ユーティリティー",
-        "Clock Style": "クロックスタイル",
+        "Clock Style": "時計のスタイル",
         "Rewrite Settings": "リライト設定",
         "Flatten Battery": "バッテリーを平らにする",
         "Debug Info": "デバッグ情報",
         "Storage": "ストレージ",
-        "Reset Settings": "設定のリセット",
-        "Twist Threshold": "ツイスト・スレッショルド",
+        "Reset Settings": "設定をリセット",
+        "Twist Threshold": "ねじれ限界",
         "Turn Off": "電源オフ",
         "Compact Storage": "コンパクトなストレージ",
-        "Reset to Defaults": "初期設定へのリセット",
-        "Second": "セカンド",
+        "Reset to Defaults": "初期設定にリセット",
+        "Second": "秒",
         "Compacting...\nTakes approx\n1 minute": "コンパクトにして...。\n所要時間約\n1分",
         "Date": "日付",
         "Minute": "分",
-        "Connectable": "接続可能",
-        "Stay Connectable": "Stay Connectable",
+        "Connectable": "検出可能",
+        "Stay Connectable": "検出可能のまま?",
         "Hour": "時間",
-        "No Clocks Found": "No Clock Found",
+        "No Clocks Found": "時計が見つかりません",
         "App Settings": "アプリの設定",
-        "Flattening battery - this can take hours.\nLong-press button to cancel": "バッテリーのフラット化 - これには数時間かかります。\nボタンの長押しでキャンセル",
+        "Flattening battery - this can take hours.\nLong-press button to cancel": "バッテリーを平らにする - これには数時間かかります。\nボタンの長押しでキャンセル",
         "Month": "月",
         "OFF": "OFF",
         "Right": "右",
         "Widgets": "ウィジェット",
         "Left": "左",
-        "Sort Order": "並び替え",
+        "Sort Order": "並べ替え順",
         "Side": "サイド",
-        "No app has settings": "設定のないアプリ",
-        "Sleep Phase Alarm": "スリープフェーズアラーム",
+        "No app has settings": "設定がないアプリ",
+        "Sleep Phase Alarm": "スリープフェイズアラーム",
         "Invalid settings": "無効な設定",
-        "TIMER": "TIMER",
+        "TIMER": "タイマー",
         "Reset All": "すべてをリセット",
         "This will remove everything": "これにより、すべてのものが削除されます。",
         "Alarm": "アラーム",
-        "on": "で",
+        "on": "on",
         "Minutes": "分",
         "Reset all widgets": "全ウィジェットのリセット",
         "Hours": "時間",
@@ -130,33 +130,33 @@
         "Beep": "ビープ",
         "Message": "メッセージ",
         "System": "システム",
-        "Select Clock": "セレクトクロック",
-        "Locale": "ロケール",
-        "Vibrate": "振動",
+        "Select Clock": "時計を選択する",
+        "Locale": "地域",
+        "Vibrate": "バイブレーション",
         "Alerts": "アラート",
         "Whitelist": "ホワイトリスト",
-        "Set Time": "セット時間",
-        "Disable": "Disable",
+        "Set Time": "時間を設定する",
+        "Disable": "無効",
         "BACK": "BACK",
         "ALARM": "ALARM",
         "Timer": "タイマー",
         "Error in settings": "設定のエラー",
         "Factory Reset": "ファクトリーリセット",
         "Sleep": "睡眠",
-        "Connected": "コネクテッド",
+        "Connected": "直接接続した",
         "Messages": "メッセージ",
         "Hide": "隠す",
-        "Show": "ショー",
+        "Show": "表す",
         "On": "オン",
         "Ok": "OK",
         "No": "いいえ",
         "Settings": "設定",
-        "steps": "ステップ",
+        "steps": "歩数",
         "back": "バック",
-        "Steps": "ステップ",
+        "Steps": "歩数",
         "Year": "年",
-        "Yes": "はい。",
-        "Loading": "ローディング",
+        "Yes": "はい",
+        "Loading": "読み込み中",
         "Music": "音楽",
         "color": "カラー",
         "off": "オフ",
diff --git a/loader.js b/loader.js
index 414aa99d1..77a186af7 100644
--- a/loader.js
+++ b/loader.js
@@ -16,7 +16,7 @@ if (window.location.host=="banglejs.com") {
     'This is not the official Bangle.js App Loader - you can try the <a href="https://banglejs.com/apps/">Official Version</a> here.';
 }
 
-var RECOMMENDED_VERSION = "2v16";
+var RECOMMENDED_VERSION = "2v18";
 // could check http://www.espruino.com/json/BANGLEJS.json for this
 
 // We're only interested in Bangles
@@ -107,22 +107,24 @@ function filterAppsForDevice(deviceId) {
   // set the device dropdown
   document.querySelector(".devicetype-nav span").innerText = device ? device.name : "All apps";
 
-  if (!device) {
-    if (deviceId!==undefined)
-      showToast(`Device ID ${deviceId} not recognised. Some apps may not work`, "warning");
-    appJSON = originalAppJSON;
-  } else {
-    // Now filter apps
-    appJSON = originalAppJSON.filter(app => {
-      var supported = ["BANGLEJS"];
-      if (!app.supports) {
-        console.log(`App ${app.id} doesn't include a 'supports' field - ignoring`);
+  if (originalAppJSON) { // JSON might not have loaded yet
+    if (!device) {
+      if (deviceId!==undefined)
+        showToast(`Device ID ${deviceId} not recognised. Some apps may not work`, "warning");
+      appJSON = originalAppJSON;
+    } else {
+      // Now filter apps
+      appJSON = originalAppJSON.filter(app => {
+        var supported = ["BANGLEJS"];
+        if (!app.supports) {
+          console.log(`App ${app.id} doesn't include a 'supports' field - ignoring`);
+          return false;
+        }
+        if (app.supports.includes(deviceId)) return true;
+        //console.log(`Dropping ${app.id} because ${deviceId} is not in supported list ${app.supports.join(",")}`);
         return false;
-      }
-      if (app.supports.includes(deviceId)) return true;
-      //console.log(`Dropping ${app.id} because ${deviceId} is not in supported list ${app.supports.join(",")}`);
-      return false;
-    });
+      });
+    }
   }
   refreshLibrary();
 }
@@ -204,8 +206,11 @@ window.addEventListener('load', (event) => {
     });
   });
 
+  var el;
+
   // Button to install all default apps in one go
-  document.getElementById("reinstallall").addEventListener("click",event=>{
+  el = document.getElementById("reinstallall");
+  if (el) el.addEventListener("click",event=>{
     var promise =  showPrompt("Reinstall","Really re-install all apps?").then(() => {
       Comms.reset().then(_ =>
         getInstalledApps()
@@ -231,8 +236,10 @@ window.addEventListener('load', (event) => {
     });
   });
 
+  
   // Button to install all default apps in one go
-  document.getElementById("installdefault").addEventListener("click",event=>{
+  el = document.getElementById("installdefault");
+  if (el) el.addEventListener("click", event=>{
     getInstalledApps().then(() => {
       if (device.id == "BANGLEJS")
         return httpGet("defaultapps_banglejs1.json");
@@ -247,6 +254,16 @@ window.addEventListener('load', (event) => {
     });
   });
 
+  // Button to reset the Bangle's settings
+  el = document.getElementById("defaultbanglesettings");
+  if (el) el.addEventListener("click", event=>{
+    showPrompt("Reset Settings","Really reset Bangle.js settings?").then(() => {
+      Comms.write("\x10require('Storage').erase('setting.json');load()\n");
+      showToast("Settings reset!", "success");
+    }, function() { /* cancelled */ });
+  });
+  
+
   // BLE Compatibility
   var selectBLECompat = document.getElementById("settings-ble-compat");
   if (selectBLECompat) {
diff --git a/modules/Layout.md b/modules/Layout.md
index 95bf116dc..96790a41a 100644
--- a/modules/Layout.md
+++ b/modules/Layout.md
@@ -30,7 +30,7 @@ g.clear();
 layout.render();
 ```
 
-`layoutObject` has:
+`layoutObject` (first argument) has:
 
 - A `type` field of:
   - `undefined` - blank, can be used for padding
@@ -53,7 +53,12 @@ layout.render();
 - A `pad` integer field to set pixels padding
 - A `fillx` int to choose if the object should fill available space in x. 0=no, 1=yes, 2=2x more space
 - A `filly` int to choose if the object should fill available space in y. 0=no, 1=yes, 2=2x more space
-- `width` and `height` fields to optionally specify minimum size options is an object containing:
+- `width` and `height` fields to optionally specify minimum size
+
+
+ `options` (second argument) is an object containing:
+
+
 - `lazy` - a boolean specifying whether to enable automatic lazy rendering
 - `btns` - array of objects containing:
   - `label` - the text on the button
diff --git a/modules/buzz.js b/modules/buzz.js
index aed0e2e7b..99364fc1a 100644
--- a/modules/buzz.js
+++ b/modules/buzz.js
@@ -16,7 +16,7 @@
  */
 exports.pattern = pattern => new Promise(resolve => {
   function doBuzz() {
-    if (pattern == "") resolve();
+    if (pattern == "") return resolve();
     var c = pattern[0];
     pattern = pattern.substr(1);
     const BUZZ_WEAK = 0.25, BUZZ_STRONG = 1;
diff --git a/modules/date_utils.js b/modules/date_utils.js
index 7239d4f1f..76ff0a393 100644
--- a/modules/date_utils.js
+++ b/modules/date_utils.js
@@ -8,7 +8,7 @@
 // - 0/undefined --> Sunday
 // - 1           --> Monday
 // but you can start the week from any day if you need it.
-// 
+//
 // Some functions have an "abbreviated" parameter.
 // It supports the following 3 values:
 // - 0/undefined --> get the full value, without abbreviation (eg.: "Monday", "January", etc.)
@@ -22,12 +22,12 @@
  * @returns The localized name of the i-th day of the week
  */
 exports.dow = (i, abbreviated) => {
-  var dow = require("locale").dow(new Date(((i || 0) + 3.5) * 86400000), abbreviated).slice(0, (abbreviated == 2) ? 1 : 100);
+  var dow = require("locale").dow({getDay:()=>(i|0)%7}, abbreviated).slice(0, (abbreviated == 2) ? 1 : 100);
   return abbreviated == 2 ? dow.toUpperCase() : dow;
 }
 
 /**
- * @param {int} firstDayOfWeek 0/undefined -> Sunday,  
+ * @param {int} firstDayOfWeek 0/undefined -> Sunday,
  *                             1           -> Monday
  * @param {int} abbreviated
  * @returns All 7 days of the week (localized) as an array
@@ -47,7 +47,7 @@ exports.dows = (firstDayOfWeek, abbreviated) => {
  * @returns The localized name of the i-th month
  */
 exports.month = (i, abbreviated) => {
-  var month = require("locale").month(new Date((i - 0.5) * 2628000000), abbreviated).slice(0, (abbreviated == 2) ? 1 : 100);
+  var month = require("locale").month({getMonth:()=>(11+(i|0))%12}, abbreviated).slice(0, (abbreviated == 2) ? 1 : 100);
   return abbreviated == 2 ? month.toUpperCase() : month;
 }
 
@@ -58,8 +58,7 @@ exports.month = (i, abbreviated) => {
 exports.months = (abbreviated) => {
   var months = [];
   var locale = require("locale");
-  for (var i = 1; i <= 12; i++) {
-    months.push(locale.month(new Date((i - 0.5) * 2628000000), abbreviated).slice(0, (abbreviated == 2) ? 1 : 100));
-  }
+  for (var i = 0; i < 12; i++)
+    months.push(locale.month({getMonth:()=>i}, abbreviated).slice(0, (abbreviated == 2) ? 1 : 100));
   return abbreviated == 2 ? months.map(month => month.toUpperCase()) : months;
 };
diff --git a/modules/exstats.js b/modules/exstats.js
index 461ae727f..403314ddf 100644
--- a/modules/exstats.js
+++ b/modules/exstats.js
@@ -61,7 +61,9 @@ E.showMenu(menu);
 */
 var state = {
   active : false, // are we working or not?
-  // startTime, // time exercise started
+  // startTime, // time exercise started (in ms from 1970)
+  // lastTime, // time we had our last reading (in ms from 1970)
+  duration : 0, // the length of this exercise (in ms)
   lastGPS:{}, thisGPS:{}, // This & previous GPS readings
   // distance : 0, ///< distance in meters
   // avrSpeed : 0, ///< speed over whole run in m/sec
@@ -93,6 +95,16 @@ var state = {
 // list of active stats (indexed by ID)
 var stats = {};
 
+const DATA_FILE = "exstats.json";
+// Load the state from a saved file if there was one
+state = Object.assign(state, require("Storage").readJSON(DATA_FILE,1)||{});
+// force step history to a uint8array
+state.stepHistory = new Uint8Array(state.stepHistory);
+// when we exit, write the current state
+E.on('kill', function() {
+  require("Storage").writeJSON(DATA_FILE, state);
+});
+
 // distance between 2 lat and lons, in meters, Mean Earth Radius = 6371km
 // https://www.movable-type.co.uk/scripts/latlong.html
 // (Equirectangular approximation)
@@ -136,8 +148,7 @@ Bangle.on("GPS", function(fix) {
   if (state.lastGPS.fix)
     state.distance += calcDistance(state.lastGPS, fix);
   if (stats["dist"]) stats["dist"].emit("changed",stats["dist"]);
-  var duration = Date.now() - state.startTime; // in ms
-  state.avrSpeed = state.distance * 1000 / duration; // meters/sec
+  state.avrSpeed = state.distance * 1000 / state.duration; // meters/sec
   if (!isNaN(fix.speed)) state.curSpeed = state.curSpeed*0.8 + fix.speed*0.2/3.6; // meters/sec
   if (stats["pacea"]) stats["pacea"].emit("changed",stats["pacea"]);
   if (stats["pacec"]) stats["pacec"].emit("changed",stats["pacec"]);
@@ -150,8 +161,8 @@ Bangle.on("GPS", function(fix) {
 Bangle.on("step", function(steps) {
   if (!state.active) return;
   if (stats["step"]) stats["step"].emit("changed",stats["step"]);
-  state.stepHistory[0] += steps-state.lastStepCount;
-  state.lastStepCount = steps;
+  state.stepHistory[0] += steps-state.lastSteps;
+  state.lastSteps = steps;
   if (state.notify.step.increment > 0 && state.notify.step.next <= steps) {
     stats["step"].emit("notify",stats["step"]);
     state.notify.step.next = state.notify.step.next + state.notify.step.increment;
@@ -315,9 +326,10 @@ exports.getStats = function(statIDs, options) {
     if (!state.active) return;
     // called once a second
     var now = Date.now();
-    var duration = now - state.startTime; // in ms
+    state.duration += now - state.lastTime; // in ms
+    state.lastTime = now;
     // set cadence -> steps over last minute
-    state.stepsPerMin = Math.round(60000 * E.sum(state.stepHistory) / Math.min(duration,60000));
+    state.stepsPerMin = Math.round(60000 * E.sum(state.stepHistory) / Math.min(state.duration,60000));
     if (stats["caden"]) stats["caden"].emit("changed",stats["caden"]);
     // move step history onwards
     state.stepHistory.set(state.stepHistory,1);
@@ -335,9 +347,9 @@ exports.getStats = function(statIDs, options) {
     }
   }, 1000);
   function reset() {
-    state.startTime = Date.now();
+    state.startTime = state.lastTime = Date.now();
+    state.duration = 0;
     state.startSteps = state.lastSteps = Bangle.getStepCount();
-    state.lastSteps = 0;
     state.stepHistory.fill(0);
     state.stepsPerMin = 0;
     state.distance = 0;
@@ -359,16 +371,22 @@ exports.getStats = function(statIDs, options) {
       state.notify.time.next = state.startTime + options.notify.time.increment;
     }
   }
-  reset();
+  if (!state.active) reset(); // we might already be active
   return {
-    stats : stats, state : state,
+    stats : stats,
+    state : state,
     start : function() {
-      state.active = true;
       reset();
+      state.active = true;
     },
     stop : function() {
       state.active = false;
-    }
+    },
+    resume : function() {
+      state.lastTime = Date.now();
+      state.lastSteps = Bangle.getStepCount()
+      state.active = true;
+    },
   };
 };
 
diff --git a/modules/widget_utils.js b/modules/widget_utils.js
index 2a6a407be..7124ac8c8 100644
--- a/modules/widget_utils.js
+++ b/modules/widget_utils.js
@@ -70,13 +70,13 @@ exports.swipeOn = function(autohide) {
   // force app rect to be fullscreen
   Bangle.appRect = { x: 0, y: 0, w: g.getWidth(), h: g.getHeight(), x2: g.getWidth()-1, y2: g.getHeight()-1 };
   // setup offscreen graphics for widgets
-  let og = Graphics.createArrayBuffer(g.getWidth(),24,16,{msb:true});
+  let og = Graphics.createArrayBuffer(g.getWidth(),26,16,{msb:true});
   og.theme = g.theme;
   og._reset = og.reset;
   og.reset = function() {
     return this._reset().setColor(g.theme.fg).setBgColor(g.theme.bg);
   };
-  og.reset().clearRect(0,0,og.getWidth(),og.getHeight());
+  og.reset().clearRect(0,0,og.getWidth(),23).fillRect(0,24,og.getWidth(),25);
   let _g = g;
   let offset = -24; // where on the screen are we? -24=hidden, 0=full visible
 
@@ -88,7 +88,7 @@ exports.swipeOn = function(autohide) {
   }
 
   for (var w of global.WIDGETS) {
-    if (w._draw) return; // already hidden
+    if (w._draw) continue; // already hidden
     w._draw = w.draw;
     w.draw = function() {
       g=og;
@@ -146,4 +146,4 @@ exports.swipeOn = function(autohide) {
   };
   Bangle.on("swipe", exports.swipeHandler);
   Bangle.drawWidgets();
-};
+};
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 5e531b4a6..c7cf318f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,2166 @@
 {
   "name": "BangleApps",
   "version": "0.0.1",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "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/@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-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/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/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/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/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/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/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/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/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/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-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-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/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/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/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/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/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-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-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-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-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-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-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/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-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.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "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/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.20",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
+      "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "debug": "^3.2.7",
+        "ignore-by-default": "^1.0.1",
+        "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"
+      },
+      "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/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-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/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/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/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/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/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/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/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/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,
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "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.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-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/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/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/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/word-wrap": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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
+    }
+  },
   "dependencies": {
     "@eslint/eslintrc": {
       "version": "1.3.0",
@@ -59,7 +2217,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv": {
       "version": "6.12.6",
@@ -1391,6 +3550,15 @@
         }
       }
     },
+    "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"
+      }
+    },
     "string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -1413,15 +3581,6 @@
         "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",
@@ -1580,9 +3739,9 @@
       }
     },
     "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==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true
     },
     "wrappy": {
diff --git a/tsconfig.json b/tsconfig.json
index 8da08b8e2..1158f887e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,23 +1,65 @@
 {
   "compilerOptions": {
+    // input/output
+    "target": "es5",
+    "noLib": true, // "lib": ["es5"],
+    "skipLibCheck": false,
+
     "module": "commonjs",
+
+    // toggle these to check everything (and optionally change the include below to "apps/myapp/*.js")
+    // "checkJs": true,
+    // "noEmit": true,
+
+    // code-gen
+    "declaration": false,
+    "emitDeclarationOnly": false,
+    "removeComments": true,
+    "noImplicitUseStrict": true, // disable "use strict"
+
+    "newLine": "lf",
+    "noEmitHelpers": true, // we link to specific banglejs implementations
+    "noEmitOnError": false,
+    "preserveConstEnums": false,
+    "importsNotUsedAsValues": "error",
+    "preserveValueImports": false,
+
+    // interop constraints
+    "isolatedModules": false, // we're global scripts
+
+    // type checking
     "noImplicitAny": true,
-    "target": "es6",
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "noImplicitOverride": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noLib": true,
     "noUncheckedIndexedAccess": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitThis": true,
+    "noImplicitReturns": true,
+    "noImplicitOverride": true,
+    "exactOptionalPropertyTypes": true,
+    "useUnknownInCatchVariables": true,
+    //"strict": true, // can't have this with noImplicitUseStrict, instead:
+    "strictNullChecks": true,
+    "strictBindCallApply": true,
+    "strictFunctionTypes": true,
+    "strictPropertyInitialization": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "useUnknownInCatchVariables": true,
+
+    // simple type checking
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "strict": true,
-    "typeRoots": ["./typescript/types"]
+    "allowUnusedLabels": false,
+    "allowUnreachableCode": false,
+
+    // paths
+    "rootDir": "./",
+    "typeRoots": ["./typescript/types/"]
   },
-  "include": ["./**/*"],
-  "exclude": [
-        "**/gpconv.d.ts",
-        "**/gpconv_bg.wasm.d.ts"
-    ]
+  "include": [
+    "*/*/*.ts",
+    "apps/*/*.js", // with checkJs: true
+    "*/*/*.d.ts",
+    "modules/*.d.ts",
+    "typescript/types/*.d.ts"
+  ]
 }
diff --git a/typescript/package-lock.json b/typescript/package-lock.json
index 15653acc2..ea04825a9 100644
--- a/typescript/package-lock.json
+++ b/typescript/package-lock.json
@@ -11,7 +11,7 @@
         "node-fetch": "^3.2.10"
       },
       "devDependencies": {
-        "typescript": "4.5.2"
+        "typescript": "4.9.4"
       }
     },
     "node_modules/data-uri-to-buffer": {
@@ -91,9 +91,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -151,9 +151,9 @@
       }
     },
     "typescript": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
       "dev": true
     },
     "web-streams-polyfill": {
diff --git a/typescript/package.json b/typescript/package.json
index 9533d77a7..f98aae1e3 100644
--- a/typescript/package.json
+++ b/typescript/package.json
@@ -1,10 +1,10 @@
 {
   "name": "Bangle.ts",
   "description": "Bangle.js Typescript Project Setup and Types",
-  "author": "Sebastian Di Luzio <sebastian@diluz.io> (https://diluz.io) and qucchia <qucchia0@gmail.com> (https://github.com/qucchia)",
+  "author": "Sebastian Di Luzio <sebastian@diluz.io> (https://diluz.io), qucchia <qucchia0@gmail.com> (https://github.com/qucchia) and Rob Pilling (https://github.com/bobrippling)",
   "version": "0.0.1",
   "devDependencies": {
-    "typescript": "4.5.2"
+    "typescript": "4.9.4"
   },
   "scripts": {
     "build": "tsc"
diff --git a/typescript/types/ClockFace.d.ts b/typescript/types/ClockFace.d.ts
new file mode 100644
index 000000000..7f906e0d6
--- /dev/null
+++ b/typescript/types/ClockFace.d.ts
@@ -0,0 +1,56 @@
+declare module ClockFace_ {
+  export class ClockFace {
+    constructor(options: Options | Draw);
+
+    is12Hour: boolean;
+    paused: boolean;
+    showDate: boolean; // default true
+    loadWidgets: boolean; // default true
+
+    start(): void;
+
+    tick(): void;
+    pause(): void;
+    resume(): void;
+    remove(): void;
+    redraw(): void;
+  }
+
+  type Options = {
+    precision?: number, // seconds
+
+    init?: () => void,
+
+    pause?: () => void,
+    resume?: () => void,
+    remove?: () => void,
+
+    settingsFile?: string,
+  } & (
+    {
+      draw: Draw
+    } | {
+      update: Update,
+    } | {
+      draw: Draw,
+      update: Update,
+    }
+  ) & (
+    {
+      up?: () => void,
+      down?: () => void,
+    } | {
+      upDown?: (dir: -1 | 1) => void,
+    }
+  );
+
+  type Draw = (d: Date, changed: Changed<true>) => void;
+  type Update = (d: Date, changed: Changed) => void;
+
+  type Changed<T extends boolean = boolean> = {
+    d: T,
+    h: T,
+    m: T,
+    s: T,
+  }
+}
diff --git a/typescript/types/bangle_extensions.d.ts b/typescript/types/bangle_extensions.d.ts
new file mode 100644
index 000000000..e5d94d079
--- /dev/null
+++ b/typescript/types/bangle_extensions.d.ts
@@ -0,0 +1,10 @@
+type BangleHandler<T extends (...args: any[]) => any> = T | (T | undefined)[];
+
+type BangleEvents = {
+  ["#ontap"]?: BangleHandler<(data: { dir: "left" | "right" | "top" | "bottom" | "front" | "back", double: boolean, x: TapAxis, y: TapAxis, z: TapAxis }) => void>,
+  ["#ongesture"]?: BangleHandler<(xyz: Int8Array) => void>,
+  ["#onswipe"]?: BangleHandler<SwipeCallback>,
+  ["#ontouch"]?: BangleHandler<TouchCallback>,
+  ["#ondrag"]?: BangleHandler<DragCallback>,
+  ["#onstroke"]?: BangleHandler<(event: { xy: Uint8Array, stroke?: string }) => void>,
+};
diff --git a/typescript/types/clock_info.d.ts b/typescript/types/clock_info.d.ts
new file mode 100644
index 000000000..b12732683
--- /dev/null
+++ b/typescript/types/clock_info.d.ts
@@ -0,0 +1,63 @@
+declare module ClockInfo {
+  function load(): Menu[];
+  function addInteractive(menu: Menu[], options: Options): InteractiveOptions;
+
+  type Menu = {
+    name: string,
+    img: string,
+    dynamic?: boolean,
+    items: MenuItem[],
+  };
+
+  type MenuItem = {
+    name: string,
+    show(): void,
+    hide(): void,
+    on(what: "redraw", cb: () => void): void, // extending from Object
+    run?(): void,
+  } & (
+    {
+      hasRange: true,
+      get(): RangeItem,
+    } | {
+      hasRange?: false,
+      get(): Item,
+    }
+  );
+
+  type Item = {
+    text: string,
+    short?: string,
+    img?: string,
+  };
+
+  type RangeItem =
+    Item & {
+      v: number,
+      min: number,
+      max: number,
+    };
+
+  type Options =  {
+    x: number,
+    y: number,
+    w: number,
+    h: number,
+    draw(itm: MenuItem, info: Item, options: InteractiveOptions): void,
+    app?: string, // used to remember clock_info locations, per app
+  };
+
+  type InteractiveOptions =
+    Options & {
+      index: number,
+      menuA: number,
+      menuB: number,
+      remove(): void,
+      redraw(): void,
+      focus: boolean,
+    };
+}
+
+interface BangleExt {
+  CLKINFO_FOCUS?: true;
+}
diff --git a/typescript/types/funcs.d.ts b/typescript/types/funcs.d.ts
new file mode 100644
index 000000000..81c4646ea
--- /dev/null
+++ b/typescript/types/funcs.d.ts
@@ -0,0 +1,2 @@
+type SettingsFunc = (back: () => void) => void;
+type ClockInfoFunc = () => ClockInfo.Menu;
diff --git a/typescript/types/info.d.ts b/typescript/types/info.d.ts
new file mode 100644
index 000000000..c305b0261
--- /dev/null
+++ b/typescript/types/info.d.ts
@@ -0,0 +1,17 @@
+type AppInfo = {
+  id: string,
+  src?: string,
+  img?: string,
+  icon?: string,
+  name: string,
+  type?: AppType,
+  version?: string,
+  tags?: string,
+  files: string,
+  data?: string,
+  sortorder?: number,
+};
+
+type AppType = "app" | "clock" | "widget" | "module" | "bootloader" |
+  "settings" | "clkinfo" | "RAM" | "launch" | "textinput" | "scheduler" |
+  "notify" | "locale";
diff --git a/typescript/types/layout.d.ts b/typescript/types/layout.d.ts
new file mode 100644
index 000000000..167ede29d
--- /dev/null
+++ b/typescript/types/layout.d.ts
@@ -0,0 +1,145 @@
+type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+
+type ExtractIds<T extends Layout.Hierarchy, Depth extends Prev[number] = 9> =
+  [Depth] extends [never]
+  ? never
+  : (T extends { id: infer Id extends string }
+    ? { [k in Id]: T }
+    : never)
+  |
+  (
+    T extends { c: Array<infer Sub extends Layout.Hierarchy> }
+    ? ExtractIds<Sub, Prev[Depth]>
+    : never
+  );
+
+declare module Layout {
+  type Layouter<T extends Hierarchy> =
+    ExtractIds<T>
+    &
+    {
+      // these actually change T
+      render(l?: Hierarchy): void;
+      layout(l: Hierarchy): void;
+
+      debug(l?: Hierarchy, c?: ColorResolvable): void;
+      update(): void; // changes layoutObject into a RenderedHierarchy
+      clear(obj?: Hierarchy): void;
+
+      forgetLazyState(): void;
+
+      setUI(): void;
+    };
+
+  var Layout: {
+    new <T extends Hierarchy>(
+      hier: T,
+      options?: {
+        lazy: boolean,
+        btns?: {
+          label: string,
+          cb: () => void,
+          cbl: () => void,
+        }[],
+        back?: () => void,
+        remove?: () => void,
+      },
+    ): Layouter<T>;
+  };
+
+  export type Layout = typeof Layout;
+
+  type Image = string;
+
+  type Fill = number; // fill a proportion of space, relative to sibling `filly`s
+
+  type RenderedHierarchy =
+    Hierarchy & {
+      // top left position
+      x: number,
+      y: number,
+      // width and height
+      w: number,
+      h: number,
+      // minimum width and height
+      _w: number,
+      _h: number,
+    };
+
+  type Hierarchy =
+    HierarchyParts & {
+      id?: string,
+      font?: FontNameWithScaleFactor,
+      scale?: number,
+      col?: ColorResolvable,
+      bgCol?: ColorResolvable,
+      pad?: number,
+      fillx?: Fill,
+      filly?: Fill,
+      width?: number,
+      height?: number,
+
+      // technically only on children of a h/v
+      halign?: Align, // children of a v
+      valign?: Align, // children of a h
+    } & (
+      {
+        r?: number, // 0: 0°, 1: 90°, 2: 180°, 3: 270°.
+      } | {
+        wrap?: boolean,
+      }
+    );
+
+  const enum Align {
+    Left = -1,
+    Top = -1,
+    Center = 0,
+    Right = 1,
+    Bottom = -1,
+  }
+
+  const enum Rotation {
+    None = 0,
+    Deg90 = 1,
+    Deg180 = 2,
+    Deg270 = 3,
+  }
+
+  type HierarchyParts =
+    {
+      type: "v",
+      c: Hierarchy[],
+    } | {
+      type: "h"
+      c: Hierarchy[],
+    } | {
+      type: "txt",
+      label: string,
+      font: FontNameWithScaleFactor,
+    } | {
+      type: undefined, // blank, for padding
+    } | (
+      {
+        type: "btn",
+        src: Image,
+        cb: () => void,
+        r?: Rotation,
+        btnBorder?: ColorResolvable,
+      } | {
+        type: "btn",
+        cb: () => void,
+        label: string,
+        font?: FontNameWithScaleFactor,
+        scale?: number,
+        r?: Rotation,
+        btnBorder?: ColorResolvable,
+      }
+    ) | {
+      type: "img",
+      src: Image | (() => Image),
+      r?: Rotation,
+    } | {
+      type: "custom",
+      render: (h: RenderedHierarchy) => void,
+    };
+}
diff --git a/typescript/types/locale.d.ts b/typescript/types/locale.d.ts
new file mode 100644
index 000000000..3fc914e10
--- /dev/null
+++ b/typescript/types/locale.d.ts
@@ -0,0 +1,19 @@
+declare module Locale {
+  type ShortBoolean = 0 | 1 | boolean;
+
+  type Locale = {
+    name: string,
+    currencySym: string,
+    dow(date: Date, short?: ShortBoolean): string,
+    month(date: Date, short?: ShortBoolean): string,
+    number(n: number): string,
+    currency(c: number): string,
+    distance(d: number): string,
+    speed(s: number): string,
+    temp(t: number): string,
+    translate(s: string): string,
+    date(date: Date, short?: ShortBoolean): string,
+    time(date: Date, short?: ShortBoolean): string,
+    meridian(date: Date): string,
+  }
+}
diff --git a/typescript/types/main.d.ts b/typescript/types/main.d.ts
index 89921972c..ecf509f70 100644
--- a/typescript/types/main.d.ts
+++ b/typescript/types/main.d.ts
@@ -1,4 +1,5 @@
-// NOTE: This file has been automatically generated.
+// Type definitions for Espruino latest
+// Project: http://www.espruino.com/, https://github.com/espruino/espruinotools// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="other.d.ts" />
 
@@ -34,6 +35,7 @@ type MenuOptions = {
   back?: () => void;
   selected?: number;
   fontHeight?: number;
+  scroll?: number;
   x?: number;
   y?: number;
   x2?: number;
@@ -69,67 +71,6 @@ type MenuInstance = {
   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;
@@ -142,10 +83,15 @@ type WidgetArea = "tl" | "tr" | "bl" | "br";
 type Widget = {
   area: WidgetArea;
   width: number;
-  draw: (this: { x: number; y: number }) => void;
+  sortorder?: number;
+  draw: (this: Widget, w: Widget) => void;
+  x?: number;
+  y?: number;
 };
 declare const WIDGETS: { [key: string]: Widget };
 
+type ShortBoolean = boolean | 0 | 1;
+
 type AccelData = {
   x: number;
   y: number;
@@ -209,13 +155,13 @@ type LCDMode =
   | "120x120"
   | "80x80"
 
-type BangleOptions = {
-  wakeOnBTN1: boolean;
-  wakeOnBTN2: boolean;
-  wakeOnBTN3: boolean;
-  wakeOnFaceUp: boolean;
-  wakeOnTouch: boolean;
-  wakeOnTwist: boolean;
+type BangleOptions<Boolean = boolean> = {
+  wakeOnBTN1: Boolean;
+  wakeOnBTN2: Boolean;
+  wakeOnBTN3: Boolean;
+  wakeOnFaceUp: Boolean;
+  wakeOnTouch: Boolean;
+  wakeOnTwist: Boolean;
   twistThreshold: number;
   twistMaxY: number;
   twistTimeout: number;
@@ -227,12 +173,95 @@ type BangleOptions = {
   lockTimeout: number;
   lcdPowerTimeout: number;
   backlightTimeout: number;
+  btnLoadTimeout: number;
 };
 
-interface ArrayLike<T> {
-  readonly length: number;
-  readonly [n: number]: T;
-}
+type SetUIArg<Mode> = Mode | {
+  mode: Mode,
+  back?: () => void,
+  remove?: () => void,
+};
+
+type NRFFilters = {
+  services?: string[];
+  name?: string;
+  namePrefix?: string;
+  id?: string;
+  serviceData?: object;
+  manufacturerData?: object;
+};
+
+type NRFSecurityStatus = {
+  advertising: boolean,
+} & (
+  {
+    connected: true,
+    encrypted: boolean,
+    mitm_protected: boolean,
+    bonded: boolean,
+    connected_addr?: string,
+  } | {
+    connected: false,
+    encrypted: false,
+    mitm_protected: false,
+    bonded: false,
+  }
+);
+
+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 IntervalId = number & { _brand: "interval" };
+type TimeoutId = number & { _brand: "timeout" };
 
 type PinMode =
   | "analog"
@@ -244,6 +273,11 @@ type PinMode =
   | "af_output"
   | "af_opendrain";
 
+interface ArrayLike<T> {
+  readonly length: number;
+  readonly [n: number]: T;
+}
+
 type ErrorFlag =
   | "FIFO_FULL"
   | "BUFFER_FULL"
@@ -273,9 +307,2588 @@ type VariableSizeInformation = {
   more?: VariableSizeInformation;
 };
 
+type PipeOptions = {
+  chunkSize?: number,
+  end?: boolean,
+  complete?: () => void,
+};
+
 
 // CLASSES
 
+/**
+ * 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;
+}
+
+/**
+ * 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;
+
+  /**
+   * Put device in deepsleep state until interrupted by pin "pin".
+   * Eligible pin numbers are restricted to those [GPIOs designated
+   * as RTC GPIOs](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/gpio.html#gpio-summary).
+   *
+   * @param {Pin} pin - Pin to trigger wakeup
+   * @param {number} level - Logic level to trigger
+   * @url http://www.espruino.com/Reference#l_ESP32_deepSleepExt0
+   */
+  static deepSleepExt0(pin: Pin, level: number): void;
+
+  /**
+   * Put device in deepsleep state until interrupted by pins in the "pinVar" array.
+   * The trigger "mode" determines the pin state which will wake up the device.
+   * Valid modes are:
+   * * `0: ESP_EXT1_WAKEUP_ALL_LOW` - all nominated pins must be set LOW to trigger wakeup
+   * * `1: ESP_EXT1_WAKEUP_ANY_HIGH` - any of nominated pins set HIGH will trigger wakeup
+   * Eligible pin numbers are restricted to those [GPIOs designated
+   * as RTC GPIOs](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/gpio.html#gpio-summary).
+   *
+   * @param {any} pinVar - Array of Pins to trigger wakeup
+   * @param {number} mode - Trigger mode
+   * @url http://www.espruino.com/Reference#l_ESP32_deepSleepExt1
+   */
+  static deepSleepExt1(pinVar: any, mode: number): void;
+
+  /**
+   * Returns a variable identifying the cause of wakeup from deep sleep.
+   * Possible causes include:
+   * * `0: ESP_SLEEP_WAKEUP_UNDEFINED` - reset was not caused by exit from deep sleep
+   * * `2: ESP_SLEEP_WAKEUP_EXT0` - Wakeup caused by external signal using RTC_IO
+   * * `3: ESP_SLEEP_WAKEUP_EXT1` - Wakeup caused by external signal using RTC_CNTL
+   * * `4: ESP_SLEEP_WAKEUP_TIMER` - Wakeup caused by timer
+   * * `5: ESP_SLEEP_WAKEUP_TOUCHPAD` - Wakeup caused by touchpad
+   * * `6: ESP_SLEEP_WAKEUP_ULP` - Wakeup caused by ULP program
+   * @returns {number} The cause of the ESP32's wakeup from sleep
+   * @url http://www.espruino.com/Reference#l_ESP32_getWakeupCause
+   */
+  static getWakeupCause(): number;
+
+  /**
+   * 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 (GAP=1, GATTS=2, GATTC=4). Use 255 for everything
+   * @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;
+
+  /**
+   * This function is useful for ESP32 [OTA Updates](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/ota.html)
+   * Normally Espruino is uploaded to the `factory` partition so this isn't so useful,
+   * but it is possible to upload Espruino to the `ota_0` partition (or ota_1 if a different table has been added).
+   * If this is the case, you can use this function to mark the currently running version of Espruino as good or bad.
+   *  * If set as valid, Espruino will continue running, and the fact that everything is ok is written to flash
+   *  * If set as invalid (false) Espruino will mark itself as not working properly and will reboot. The ESP32 bootloader
+   *  will then start and will load any other partition it can find that is marked as ok.
+   *
+   * @param {boolean} isValid - Set whether this app is valid or not. If `isValid==false` the device will reboot.
+   * @url http://www.espruino.com/Reference#l_ESP32_setOTAValid
+   */
+  static setOTAValid(isValid: boolean): void;
+
+
+}
+
+/**
+ * This is a built-in class to allow you to use the ESP8266 NodeMCU boards' 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;
+
+
+}
+
+/**
+ * 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;
+
+
+}
+
+/**
+ * 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(): NRFSecurityStatus;
+
+  /**
+   * @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] - [optional] An 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 when Bluetooth advertising starts or stops on Espruino
+   * @param {string} event - The event to listen to.
+   * @param {(isAdvertising: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `isAdvertising` Whether we are advertising or not
+   * @url http://www.espruino.com/Reference#l_NRF_advertising
+   */
+  static on(event: "advertising", callback: (isAdvertising: boolean) => void): void;
+
+  /**
+   * Called during the bonding process to update on status
+   * `status` is one of:
+   * * `"request"` - Bonding has been requested in code via `NRF.startBonding`
+   * * `"start"` - The bonding procedure has started
+   * * `"success"` - The bonding procedure has succeeded (`NRF.startBonding`'s promise resolves)
+   * * `"fail"` - The bonding procedure has failed (`NRF.startBonding`'s promise rejects)
+   * @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` One of `'request'/'start'/'success'/'fail'`
+   * @url http://www.espruino.com/Reference#l_NRF_bond
+   */
+  static on(event: "bond", 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] - [optional] A 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 (e.g. `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
+   *   whenConnected : true/false // keep advertising when connected (nRF52 only)
+   *                              // switches to advertising as non-connectable when it is connected
+   *   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 following 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] - [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] - [optional] An 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: { [key: number]: { [key: number]: { value?: string, maxLen?: number, broadcast?: boolean, readable?: boolean, writable?: boolean, notify?: boolean, indicate?: boolean, description?: string, security?: { read?: { encrypted?: boolean, mitm?: boolean, lesc?: boolean, signed?: boolean }, write?: { encrypted?: boolean, mitm?: boolean, lesc?: boolean, signed?: boolean } }, onWrite?: (evt: { data: ArrayBuffer }) => void } } }, 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 advertising 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] - [optional] An 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: number[], callback?: () => void): 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 event received via `E.ANCS`, e.g.:
+   * ```
+   * E.on('ANCS', event => {
+   *   NRF.ancsGetNotificationInfo( event.uid ).then(a=>print("Notify",E.toJS(a)));
+   * });
+   * ```
+   * Returns:
+   * ```
+   * {
+   *   "uid" : integer,
+   *   "appId": string,
+   *   "title": string,
+   *   "subtitle": string,
+   *   "message": string,
+   *   "messageSize": string,
+   *   "date": string,
+   *   "posAction": string,
+   *   "negAction": string
+   * }
+   * ```
+   *
+   * @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 (app id is available via `NRF.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. e.g. `NRF.requestDevice({ timeout:2000, filters: [ ... ] })`
+   * * `active` - whether to perform active scanning (requesting 'scan response'
+   * packets from any devices that are found). e.g. `NRF.requestDevice({ active:true,
+   * filters: [ ... ] })`
+   * * `phy` - (NRF52840 only) use the long-range coded phy (`"1mbps"` default, can
+   *   be `"1mbps/2mbps/both/coded"`)
+   * * `extended` - (NRF52840 only) support receiving extended-length advertising
+   *   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 (e.g. 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 (e.g. 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
+   *   advertising     // Are we currently advertising?
+   *   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(): NRFSecurityStatus;
+
+  /**
+   *
+   * @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;
+
+
+}
+
+/**
+ * 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;
+
+
+}
+
+/**
+ * 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] - [optional] An 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] - [optional] An 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;
+
+
+}
+
+/**
+ * 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;
+
+
+}
+
+/**
+ * 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]
+   * [optional] An 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?: PipeOptions): 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;
+}
+
+/**
+ * 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]
+   * [optional] An 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(dest: any, options?: PipeOptions): 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]
+   * [optional] An 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?: PipeOptions): 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] - [optional] An `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] - [optional] An `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 used during the DHCP request. Minimum 8 and maximum 12 characters,
+   * best set before calling `eth.setIP()`. Default is WIZnet010203, 010203 is the
+   * default nic as part of the mac.
+   *
+   * @param {any} hostname - hostname as string
+   * @param {any} [callback] - [optional] An `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] - [optional] An `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] - [optional] An `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;
+}
+
+/**
+ * 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 [micro:bit's](https://www.espruino.com/MicroBit) utility
  * functions.
@@ -375,295 +2988,82 @@ declare class Microbit {
 
 }
 
-interface MathConstructor {
-  /**
-   * @returns {number} The value of E - 2.718281828459045
-   * @url http://www.espruino.com/Reference#l_Math_E
-   */
-  E: number;
+interface FileConstructor {
 
-  /**
-   * @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 {
+interface 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]
+   * [optional] An 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?: PipeOptions): void
 }
 
 /**
- * This is a standard JavaScript class that contains useful Maths routines
- * @url http://www.espruino.com/Reference#Math
+ * 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 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;
-
-
-}
+declare const File: FileConstructor
 
 /**
  * Class containing [Puck.js's](http://www.puck-js.com) utility functions.
@@ -831,8 +3231,10 @@ declare class Puck {
    * Check out [the Puck.js page on the
    * accelerometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
    * information.
+   * **Note:** Puck.js cannot currently read every sample from the
+   * accelerometer at sample rates above 208Hz.
    *
-   * @param {number} samplerate - The sample rate in Hz, or undefined
+   * @param {number} samplerate - The sample rate in Hz, or `undefined` (default is 12.5 Hz)
    * @url http://www.espruino.com/Reference#l_Puck_accelOn
    */
   static accelOn(samplerate: number): void;
@@ -897,11 +3299,11 @@ declare class Puck {
    * `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
+   * @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;
+  static IR(data: any, cathode?: Pin, anode?: Pin): void;
 
   /**
    * Capacitive sense - the higher the capacitance, the higher the number returned.
@@ -957,163 +3359,1091 @@ declare class Puck {
 }
 
 /**
- * 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
+ * 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 File {
-
-
+declare class Bangle {
   /**
-   * Close an open file.
-   * @url http://www.espruino.com/Reference#l_File_close
+   * 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
    */
-  close(): void;
+  static on(event: "accel", callback: (xyz: AccelData) => void): 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
+   * 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
    */
-  write(buffer: any): number;
+  static on(event: "step", callback: (up: number) => void): void;
 
   /**
-   * 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
+   * 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
    */
-  read(length: number): any;
+  static on(event: "health", callback: (info: HealthStatus) => void): void;
 
   /**
-   * 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
+   * 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
    */
-  skip(nBytes: number): void;
+  static on(event: "faceUp", callback: (up: boolean) => void): 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
+   * 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
    */
-  seek(nBytes: number): void;
+  static on(event: "twist", callback: () => void): void;
 
   /**
-   * Pipe this file to a stream (an object with a 'write' method)
+   * 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).
+   * **Note:** In 2v15 firmware and earlier the heading is inverted (360-heading). There's
+   * a fix in the bootloader which will apply a fix for those headings, but old apps may
+   * still expect an inverted value.
+   * 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,type}` containing touch coordinates (if the device supports full touch). Clipped to 0..175 (LCD pixel coordinates) on firmware 2v13 and later.`type` is only available on Bangle.js 2 and is an integer, either 0 for swift touches or 2 for longer ones.
+   * @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;
+
+  /**
+   * Overlay an image or graphics instance on top of the contents of the graphics buffer.
+   * This only works on Bangle.js 2 because Bangle.js 1 doesn't have an offscreen buffer accessible from the CPU.
+   * ```
+   * // display an alarm clock icon on the screen
+   * var img = require("heatshrink").decompress(atob(`lss4UBvvv///ovBlMyqoADv/VAwlV//1qtfAQX/BINXDoPVq/9DAP
+   * /AYIKDrWq0oREAYPW1QAB1IWCBQXaBQWq04WCAQP6BQeqA4P1AQPq1WggEK1WrBAIkBBQJsCBYO///fBQOoPAcqCwP3BQnwgECCwP9
+   * GwIKCngWC14sB7QKCh4CBCwN/64KDgfACwWn6vWGwYsBCwOputWJgYsCgGqytVBQYsCLYOlqtqwAsFEINVrR4BFgghBBQosDEINWIQ
+   * YsDEIQ3DFgYhCG4msSYeVFgnrFhMvOAgsEkE/FhEggYWCFgIhDkEACwQKBEIYKBCwSGFBQJxCQwYhBBQTKDqohCBQhCCEIJlDXwrKE
+   * BQoWHBQdaCwuqJoI4CCwgKECwJ9CJgIKDq+qBYUq1WtBQf+BYIAC3/VBQX/tQKDz/9BQY5BAAVV/4WCBQJcBKwVf+oHBv4wCAAYhB`));
+   * Bangle.setLCDOverlay(img,66,66);
+   * ```
+   * Or use a `Graphics` instance:
+   * ```
+   * var ovr = Graphics.createArrayBuffer(100,100,1,{msb:true}); // 1bpp
+   * ovr.drawLine(0,0,100,100);
+   * ovr.drawRect(0,0,99,99);
+   * Bangle.setLCDOverlay(ovr,38,38);
+   * ```
+   * Although `Graphics` can be specified directly, it can often make more sense to
+   * create an Image from the `Graphics` instance, as this gives you access
+   * to color palettes and transparent colors. For instance this will draw a colored
+   * overlay with rounded corners:
+   * ```
+   * var ovr = Graphics.createArrayBuffer(100,100,2,{msb:true});
+   * ovr.setColor(1).fillRect({x:0,y:0,w:99,h:99,r:8});
+   * ovr.setColor(3).fillRect({x:2,y:2,w:95,h:95,r:7});
+   * ovr.setColor(2).setFont("Vector:30").setFontAlign(0,0).drawString("Hi",50,50);
+   * Bangle.setLCDOverlay({
+   *   width:ovr.getWidth(), height:ovr.getHeight(),
+   *   bpp:2, transparent:0,
+   *   palette:new Uint16Array([0,0,g.toColor("#F00"),g.toColor("#FFF")]),
+   *   buffer:ovr.buffer
+   * },38,38);
+   * ```
+   *
+   * @param {any} img - An image
+   * @param {number} x - The X offset the graphics instance should be overlaid on the screen with
+   * @param {number} y - The Y offset the graphics instance should be overlaid on the screen with
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDOverlay
+   */
+  static setLCDOverlay(img: any, x: number, 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
+   * * `btnLoadTimeout` how many milliseconds does the home button have to be pressed
+   * for before the clock is reloaded? 1500ms default, or 0 means never.
+   * * `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.
+   * * `hrmSportMode` - on the newest Bangle.js 2 builds with with the proprietary
+   *   heart rate algorithm, this is the sport mode passed to the algorithm. See `libs/misc/vc31_binary/algo.h`
+   *   for more info. -1 = auto, 0 = normal (default), 1 = running, 2 = ...
+   * * `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} 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
+   * @url http://www.espruino.com/Reference#l_Bangle_setOptions
    */
-  pipe(destination: any, options: any): void;
+  static setOptions(options: { [key in keyof BangleOptions]?: BangleOptions<ShortBoolean>[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: ShortBoolean, 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: ShortBoolean, 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: ShortBoolean, 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: ShortBoolean, 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).
+   * **Note:** In 2v15 firmware and earlier the heading is inverted (360-heading). There's
+   * a fix in the bootloader which will apply a fix for those headings, but old apps may
+   * still expect an inverted value.
+   * 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 `'10min'` - health data so far in this 10 minute block (eg. 9:00.00 - 9:09.59)
+   * * `'last'` - health data during the last 10 minute block
+   * * `'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. Exposes the current values of `accHistoryIdx`, `accGestureCount`, `accIdleCount`, `pollInterval` and others.
+   * Please see the declaration of this function for more information (click the `==>` link above [this description](http://www.espruino.com/Reference#l_Bangle_dbg))
+   * @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;
+
+  /**
+   * Load the Bangle.js clock - this has the same effect as calling `Bangle.load()`.
+   * @url http://www.espruino.com/Reference#l_Bangle_showClock
+   */
+  static showClock(): void;
+
+  /**
+   * Show a 'recovery' menu that allows you to perform certain tasks on your Bangle.
+   * You can also enter this menu by restarting while holding down the `BTN1`
+   * @url http://www.espruino.com/Reference#l_Bangle_showRecoveryMenu
+   */
+  static showRecoveryMenu(): void;
+
+  /**
+   * This behaves the same as the global `load()` function, but if fast
+   * loading is possible (`Bangle.setUI` was called with a `remove` handler)
+   * then instead of a complete reload, the `remove` handler will be
+   * called and the new app will be loaded straight after with `eval`.
+   * **This should only be used if the app being loaded also uses widgets**
+   * (eg it contains a `Bangle.loadWidgets()` call).
+   * `load()` is slower, but safer. As such, care should be taken
+   * when using `Bangle.load()` with `Bangle.setUI({..., remove:...})`
+   * as if your remove handler doesn't completely clean up after your app,
+   * memory leaks or other issues could occur - see `Bangle.setUI` for more
+   * information.
+   *
+   * @param {any} [file] - [optional] A string containing the file name for the app to be loaded
+   * @url http://www.espruino.com/Reference#l_Bangle_load
+   */
+  static load(file: string): void;
+  static load(): 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 , also call it when the hardware button is clicked (does not override btn if defined)
+   *   remove : function() {}, // optional - add a handler for when the UI should be removed (eg stop any intervals/timers here)
+   *   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)
+   * });
+   * ```
+   * If `remove` is specified, `Bangle.showLauncher`, `Bangle.showClock`, `Bangle.load` and some apps
+   * may choose to just call the `remove` function and then load a new app without resetting Bangle.js.
+   * As a result, **if you specify 'remove' you should make sure you test that after calling `Bangle.setUI()`
+   * without arguments your app is completely unloaded**, otherwise you may end up with memory leaks or
+   * other issues when switching apps.
+   *
+   * @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?: undefined): void;
+  static setUI(type: SetUIArg<"updown" | "leftright">, callback: (direction?: -1 | 1) => void): void;
+  static setUI(type: SetUIArg<"clock">): void;
+  static setUI(type: SetUIArg<"clockupdown">, callback?: (direction: -1 | 1) => void): void;
+  static setUI(type: SetUIArg<"custom"> & { touch?: TouchCallback; swipe?: SwipeCallback; drag?: DragCallback; btn?: (n: 1 | 2 | 3) => void; clock?: boolean | 0 | 1 }): 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: ShortBoolean;
+  static strokes: undefined | { [key: string]: Unistroke };
 }
 
 /**
- * Class containing utility functions for the Seeed WIO LTE board
- * @url http://www.espruino.com/Reference#WioLTE
+ * Class containing utility functions for accessing IO on the hexagonal badge
+ * @url http://www.espruino.com/Reference#Badge
  */
-declare class WioLTE {
+declare class Badge {
   /**
-   * Set the WIO's LED
+   * 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} 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
+   * @param {number} corner - The corner to use
+   * @returns {number} Capacitive sense counter
+   * @url http://www.espruino.com/Reference#l_Badge_capSense
    */
-  static LED(red: number, green: number, blue: number): void;
+  static capSense(corner: number): number;
 
   /**
-   * 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
+   * @url http://www.espruino.com/Reference#l_Badge_getBatteryPercentage
    */
   static getBatteryPercentage(): number;
 
@@ -1121,151 +4451,458 @@ declare class Pixl {
    * Set the LCD's contrast
    *
    * @param {number} c - Contrast between 0 and 1
-   * @url http://www.espruino.com/Reference#l_Pixl_setContrast
+   * @url http://www.espruino.com/Reference#l_Badge_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
+ * 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 Trig {
+declare class BluetoothDevice {
   /**
-   * Get the position of the trigger wheel at the given time (from getTime)
+   * 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 {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
+   * @param {any} passkey - A 6 character numeric String to be returned to the device
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_sendPasskey
    */
-  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;
-
-
+  sendPasskey(passkey: any): void;
 }
 
 /**
- * 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
+ * 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 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;
+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} 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
+   * @param {any} [options] - [optional] (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
    */
-  static decrypt(passphrase: any, key: any, options: any): ArrayBuffer;
+  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(): NRFSecurityStatus;
+
+  /**
+   * 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 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;
 }
 
 /**
@@ -1273,9 +4910,9 @@ declare class AES {
  * 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)```
+ * **Note:** On boards that contain an LCD, there is a built-in `g` object of
+ * type `Graphics`. For instance to draw a line you'd type:
+ * ```g.drawLine(0,0,100,100)```
  * @url http://www.espruino.com/Reference#Graphics
  */
 declare class Graphics<IsBuffer extends boolean = boolean> {
@@ -1345,11 +4982,19 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * XXXXXXXXX
    * `);
    * g.drawImage(img, x,y);
+   * var img = Graphics.createImage(`
+   * .....
+   * .XXX.
+   * .X.X.
+   * .XXX.
+   * .....
+   * `);
+   * 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
+   * @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
    */
@@ -1358,20 +5003,20 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
   /**
    * Set the current font
    *
-   * @param {number} scale - (optional) If >1 the font will be scaled up by that amount
+   * @param {number} [scale] - [optional] If >1 the font will be scaled up by that amount
    * @returns {any} The instance of Graphics this was called on, to allow call chaining
-   * @url http://www.espruino.com/Reference#l_Graphics_setFont6x15
+   * @url http://www.espruino.com/Reference#l_Graphics_setFont12x20
    */
-  setFont6x15(scale: number): Graphics;
+  setFont12x20(scale?: number): Graphics;
 
   /**
    * Set the current font
    *
-   * @param {number} scale - (optional) If >1 the font will be scaled up by that amount
+   * @param {number} [scale] - [optional] If >1 the font will be scaled up by that amount
    * @returns {any} The instance of Graphics this was called on, to allow call chaining
-   * @url http://www.espruino.com/Reference#l_Graphics_setFont12x20
+   * @url http://www.espruino.com/Reference#l_Graphics_setFont6x15
    */
-  setFont12x20(scale: number): Graphics;
+  setFont6x15(scale?: number): Graphics;
 
   /**
    * On instances of graphics that drive a display with an offscreen buffer, calling
@@ -1635,8 +5280,8 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * @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;
+  setColor(r: number, g: number, b: number): Graphics;
+  setColor(col: ColorResolvable): Graphics;
 
   /**
    * Set the background color to use for subsequent drawing operations.
@@ -1650,8 +5295,8 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * @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;
+  setBgColor(r: number, g: number, b: number): Graphics;
+  setBgColor(col: ColorResolvable): Graphics;
 
   /**
    * Get the color to use for subsequent drawing operations
@@ -1726,6 +5371,14 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   setFontCustom(bitmap: ArrayBuffer, firstChar: number, width: number | string, height: number): Graphics;
 
+  /**
+   *
+   * @param {any} file - The font as a PBF file
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFontPBF
+   */
+  setFontPBF(file: any): Graphics;
+
   /**
    * Set the alignment for subsequent calls to `drawString`
    *
@@ -1844,6 +5497,23 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   drawString(str: string, x: number, y: number, solid?: boolean): Graphics;
 
+  /**
+   * Return the current string as a series of polygons (using the current vector font). `options` is as follows:
+   * * `x` - X offset of font (default 0)
+   * * `y` - Y offset of font (default 0)
+   * * `w` - Width of font (default 256) - the actual width will likely be less than this as most characters are non-square
+   * * `h` - Height of font (default 256) - the actual height will likely be less than this as most characters don't fully fill the font box
+   * ```
+   * g.getVectorFontPolys("Hi", {x:-80,y:-128});
+   * ```
+   *
+   * @param {any} str - The string
+   * @param {any} [options] - [optional] `{x,y,w,h}` (see below)
+   * @returns {any} An array of Uint8Arrays for vector font polygons
+   * @url http://www.espruino.com/Reference#l_Graphics_getVectorFontPolys
+   */
+  getVectorFontPolys(str: any, options?: any): any[];
+
   /**
    * Draw a line between x1,y1 and x2,y2 in the current foreground color
    *
@@ -1994,7 +5664,9 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    *   `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
+   *   disabled on devices without much flash memory available. If a Graphics object
+   *   is supplied, it can also contain transparent/palette fields as if it were
+   *   an image.
    * Draw an image at the specified position.
    * * If the image is 1 bit, the graphics foreground/background colours will be
    *   used.
@@ -2075,6 +5747,9 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * * Is 8 bpp *OR* the `{msb:true}` option was given
    * * No other format options (zigzag/etc) were given
    * Otherwise data will be copied, which takes up more space and may be quite slow.
+   * If the `Graphics` object contains `transparent` or `pelette` fields,
+   * [as you might find in an image](http://www.espruino.com/Graphics#images-bitmaps),
+   * those will be included in the generated image too.
    *
    * @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`
@@ -2197,6 +5872,19 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   transformVertices(arr: number[], transformation: { x?: number, y?: number, scale?: number, rotate?: number } | [number, number, number, number, number, number]): number[];
 
+  /**
+   * Flood fills the given Graphics instance out from a particular point.
+   * **Note:** This only works on Graphics instances that support readback with `getPixel`. It
+   * is also not capable of filling over dithered patterns (eg non-solid colours on Bangle.js 2)
+   *
+   * @param {number} x - X coordinate to start from
+   * @param {number} y - Y coordinate to start from
+   * @param {any} col - The color to fill with (if undefined, foreground is used)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_floodFill
+   */
+  floodFill(x: number, y: number, col: any): Graphics;
+
   /**
    * Returns an object of the form:
    * ```
@@ -2239,3827 +5927,455 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
 }
 
 /**
- * This class helps to convert URLs into Objects of information ready for
- * http.request/get
- * @url http://www.espruino.com/Reference#url
+ * Class containing utility functions for the Seeed WIO LTE board
+ * @url http://www.espruino.com/Reference#WioLTE
  */
-declare class url {
+declare class WioLTE {
   /**
-   * 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"}}`
+   * Set the WIO's LED
    *
-   * @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
+   * @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 parse(urlStr: any, parseQuery: boolean): any;
-
-
-}
-
-/**
- * The socket server created by `require('net').createServer`
- * @url http://www.espruino.com/Reference#Server
- */
-declare class Server {
-
+  static LED(red: number, green: number, blue: number): void;
 
   /**
-   * Start listening for new connections on the given port
+   * Set the power of Grove connectors, except for `D38` and `D39` which are always
+   * on.
    *
-   * @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
+   * @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
    */
-  listen(port: number): any;
+  static setGrovePower(onoff: boolean): void;
 
   /**
-   * 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
+   * 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 {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
+   * @param {boolean} onoff - true = on, false = off
+   * @url http://www.espruino.com/Reference#l_WioLTE_setLEDPower
    */
-  read(chars: number): any;
+  static setLEDPower(onoff: boolean): void;
 
   /**
-   * 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
+   * @url http://www.espruino.com/Reference#l_WioLTE_D38
    */
-  getIP(): any;
+  static D38: 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
+   * @url http://www.espruino.com/Reference#l_WioLTE_D20
    */
-  getIP(options: any): any;
+  static D20: 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
+   * @url http://www.espruino.com/Reference#l_WioLTE_A6
    */
-  getHostname(callback: any): any;
+  static A6: 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
+   * @url http://www.espruino.com/Reference#l_WioLTE_I2C
    */
-  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;
+  static I2C: any;
 
   /**
-   * Reads debug info
    * @returns {any}
-   * @url http://www.espruino.com/Reference#l_Bangle_dbg
+   * @url http://www.espruino.com/Reference#l_WioLTE_UART
    */
-  static dbg(): any;
+  static UART: 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
+   * @url http://www.espruino.com/Reference#l_WioLTE_A4
    */
-  static accelRd(reg: number, cnt?: 0): number;
-  static accelRd(reg: number, cnt: number): number[];
+  static A4: any;
 
-  /**
-   * 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 {
+/**
+ * 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 {
   /**
-   * 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
+   * 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 {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
+   * @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
    */
-  new(): Date;
-  new(value: number | string): Date;
-  new(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
+  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;
 }
 
-interface Date {
+interface DataViewConstructor {
   /**
-   * 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
+   * 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 {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
+   * @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
    */
-  setTime(timeValue: number): number;
+  new(buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView;
+}
 
+interface DataView {
   /**
-   * 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
+   * @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
    */
-  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;
+  getFloat32(byteOffset: number, littleEndian?: boolean): 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
+   * @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
    */
-  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;
+  getFloat64(byteOffset: number, littleEndian?: boolean): 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
+   * @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
    */
-  setFullYear(yearValue: number, monthValue?: number, dayValue?: number): number;
+  getInt8(byteOffset: number, littleEndian?: boolean): 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()`
+   *
+   * @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
+
+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] - [optional] An 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_Date_toString
+   * @url http://www.espruino.com/Reference#l_Error_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
+ * The base class for runtime errors
+ * @url http://www.espruino.com/Reference#Error
  */
-declare const Date: DateConstructor
+declare const Error: ErrorConstructor
 
-/**
- * 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 {
+interface SyntaxErrorConstructor {
   /**
-   * Create a software OneWire implementation on the given pin
+   * Creates a SyntaxError object
    * @constructor
    *
-   * @param {Pin} pin - The pin to implement OneWire on
-   * @returns {any} A OneWire object
-   * @url http://www.espruino.com/Reference#l_OneWire_OneWire
+   * @param {any} [message] - [optional] An message string
+   * @returns {any} A SyntaxError object
+   * @url http://www.espruino.com/Reference#l_SyntaxError_SyntaxError
    */
-  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;
+  new(message?: string): SyntaxError;
 }
 
-interface NumberConstructor {
+interface SyntaxError {
   /**
-   * @returns {number} Not a  Number
-   * @url http://www.espruino.com/Reference#l_Number_NaN
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_SyntaxError_toString
    */
-  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;
+  toString(): string;
 }
 
 /**
- * This is the built-in JavaScript class for numbers.
- * @url http://www.espruino.com/Reference#Number
+ * The base class for syntax errors
+ * @url http://www.espruino.com/Reference#SyntaxError
  */
-declare const Number: NumberConstructor
+declare const SyntaxError: SyntaxErrorConstructor
+
+interface TypeErrorConstructor {
+  /**
+   * Creates a TypeError object
+   * @constructor
+   *
+   * @param {any} [message] - [optional] An 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] - [optional] An 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] - [optional] An 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 ArrayBufferConstructor {
   /**
@@ -6135,7 +6451,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    * 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)
+   * @param {number} [offset] - [optional] The offset in this array at which to write the values
    * @url http://www.espruino.com/Reference#l_ArrayBufferView_set
    */
   set(arr: ArrayLike<number>, offset: number): void
@@ -6147,7 +6463,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    *  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)
+   * @param {any} [thisArg] - [optional] If specified, the function is called with 'this' set to thisArg
    * @returns {any} An array containing the results
    * @url http://www.espruino.com/Reference#l_ArrayBufferView_map
    */
@@ -6168,7 +6484,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    * 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
+   * @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
    */
@@ -6178,7 +6494,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    * 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
+   * @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
    */
@@ -6207,7 +6523,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    * 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)
+   * @param {any} [thisArg] - [optional] If specified, the function is called with 'this' set to thisArg
    * @url http://www.espruino.com/Reference#l_ArrayBufferView_forEach
    */
   forEach(callbackfn: (value: number, index: number, array: T) => void, thisArg?: any): void;
@@ -6240,7 +6556,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    * 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)
+   * @param {any} [thisArg] - [optional] If specified, the function is called with 'this' set to thisArg
    * @returns {any} An array containing the results
    * @url http://www.espruino.com/Reference#l_ArrayBufferView_filter
    */
@@ -6278,7 +6594,7 @@ declare class ArrayBufferView<T = ArrayBuffer> {
    *  **Note:** This currently returns a normal `Array`, not an `ArrayBuffer`
    *
    * @param {number} start - Start index
-   * @param {any} end - End index (optional)
+   * @param {any} [end] - [optional] End index
    * @returns {any} A new array
    * @url http://www.espruino.com/Reference#l_ArrayBufferView_slice
    */
@@ -6526,1009 +6842,491 @@ type Float64Array = ArrayBufferView<Float64Array>;
 
 declare const Float64Array: Float64ArrayConstructor
 
-interface PromiseConstructor {
+interface DateConstructor {
   /**
-   * 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
+   * 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
    */
-  all(promises: Promise<any>[]): Promise<void>;
+  now(): number;
 
   /**
-   * Return a new promise that is already resolved (at idle it'll call `.then`)
+   * 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} promises - Data to pass to the `.then` handler
-   * @returns {any} A new Promise
-   * @url http://www.espruino.com/Reference#l_Promise_resolve
+   * @param {any} str - A String
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_parse
    */
-  resolve<T extends any>(promises: T): Promise<T>;
+  parse(str: string): number;
 
   /**
-   * 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
+   * Creates a date object
    * @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
+   * @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<T>(executor: (resolve: (value: T) => void, reject: (reason?: any) => void) => void): Promise<T>;
+  new(): Date;
+  new(value: number | string): Date;
+  new(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
 }
 
-interface Promise<T> {
+interface Date {
   /**
-   *
-   * @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
+   * 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
    */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | Promise<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | Promise<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
+  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, e.g. 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 {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
+   * @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
    */
-  catch(onRejected: any): any;
+  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, e.g: `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, e.g: `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, e.g: `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), e.g:
+   * `2014-06-20T14:52:20.123-0500`
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Date_toLocalISOString
+   */
+  toLocalISOString(): string;
 }
 
 /**
- * This is the built-in class for ES6 Promises
- * @url http://www.espruino.com/Reference#Promise
+ * 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 Promise: PromiseConstructor
+declare const Date: DateConstructor
+
+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;
 
-/**
- * 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
+   * @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
    */
-  static find(pin: Pin): any;
+  abs(x: number): number;
 
   /**
-   * 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
+   * @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
    */
-  setup(options: any): void;
+  acos(x: number): number;
 
   /**
-   * 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
+   * @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
    */
-  send(data: any, nss_pin: Pin): any;
+  asin(x: number): number;
 
   /**
-   * 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
+   * @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
    */
-  write(...data: any[]): void;
+  atan(x: number): number;
 
   /**
-   * 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
+   * @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
    */
-  send4bit(data: any, bit0: number, bit1: number, nss_pin: Pin): void;
+  atan2(y: number, x: number): number;
 
   /**
-   * 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
+   * @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
    */
-  send8bit(data: any, bit0: number, bit1: number, nss_pin: Pin): void;
+  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;
+
+  /**
+   *
+   * @param {number} x - The value to get the sign from
+   * @returns {number} sign on x - -1, 1, or 0
+   * @url http://www.espruino.com/Reference#l_Math_sign
+   */
+  sign(x: number): number;
 }
 
-/**
- * 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 {
+interface Math {
 
 }
 
 /**
- * This class contains information about Espruino itself
- * @url http://www.espruino.com/Reference#process
+ * This is a standard JavaScript class that contains useful Maths routines
+ * @url http://www.espruino.com/Reference#Math
  */
-declare const process: processConstructor
+declare const Math: MathConstructor
 
 /**
  * Built-in class that caches the modules used by the `require` command
@@ -7568,870 +7366,126 @@ declare class Modules {
 
 }
 
-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 {
+  /**
+   * 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>;
+
   /**
    * 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.
@@ -8497,174 +7551,15 @@ declare class E {
    * 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 }`
+   * @param {any} [options]
+   * [optional] An 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;
+  static flashFatFS(options?: any): boolean;
 
   /**
    * Display a menu on the screen, and set up the buttons to navigate through it.
@@ -8708,6 +7603,8 @@ declare class E {
    * * The options object can contain:
    *   * `back : function() { }` - add a 'back' button, with the function called when
    *     it is pressed
+   *   * `remove : function() { }` - add a handler function to be called when the
+   *     menu is removed
    *   * (Bangle.js 2) `scroll : int` - an integer specifying how much the initial
    *     menu should be scrolled by
    * * The object returned by `E.showMenu` contains:
@@ -8752,7 +7649,7 @@ declare class E {
    * ```
    *
    * @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}`
+   * @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;
@@ -8789,15 +7686,16 @@ declare class E {
    *   title: "Hello",                       // optional Title
    *   buttons : {"Ok":true,"Cancel":false}, // optional list of button text & return value
    *   img: "image_string"                   // optional image string to draw
+   *   remove: function() { }                // Bangle.js: optional function to be called when the prompt is removed
    * }
    * ```
    *
    * @param {any} message - A message to display. Can include newlines
-   * @param {any} options - (optional) an object of options (see below)
+   * @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<T = boolean>(message: string, options?: { title?: string, buttons?: { [key: string]: T }, image?: string, remove?: () => void }): Promise<T>;
   static showPrompt(): void;
 
   /**
@@ -8810,10 +7708,13 @@ declare class E {
    *   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) { ... }
+   *   // a function to call when the item is selected, touch parameter is only relevant
+   *   // for Bangle.js 2 and contains the coordinates touched inside the selected item
+   *   select : function(idx, touch) { ... }
    *   // optional function to be called when 'back' is tapped
    *   back : function() { ...}
+   *   // Bangle.js: optional function to be called when the scroller should be removed
+   *   remove : function() {}
    * }
    * ```
    * For example to display a list of numbers:
@@ -8829,11 +7730,11 @@ declare class E {
    * ```
    * To remove the scroller, just call `E.showScroller()`
    *
-   * @param {any} options - An object containing `{ h, c, draw, select }` (see below)
+   * @param {any} options - An object containing `{ h, c, draw, select, back, remove }` (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(options?: { h: number, c: number, draw: (idx: number, rect: { x: number, y: number, w: number, h: number }) => void, select: (idx: number, touch?: {x: number, y: number}) => void, back?: () => void, remove?: () => void }): { draw: () => void, drawItem: (itemNo: number) => void };
   static showScroller(): void;
 
   /**
@@ -8871,11 +7772,58 @@ declare class E {
    * 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
+   * @param {any} [options] - [optional] a title for the message or an object containing options
    * @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>;
+  static showAlert(message?: string, options?: { title?: string, remove?: () => void }): 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 `NRF.ancsGetNotificationInfo`, for instance:
+   * ```
+   * E.on('ANCS', event => {
+   *   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;
 
   /**
    * This event is called right after the board starts up, and has a similar effect
@@ -9081,12 +8029,13 @@ declare class E {
    * // 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
+   * **NOTE:** This is only implemented on STM32, nRF5x and ESP32 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)`.
+   * **NOTE:** On ESP32, the timeout will be rounded to the nearest second.
    *
    * @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
@@ -9153,14 +8102,14 @@ declare class E {
    *
    * @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 }`
+   * @param {any} [options]
+   * [optional] An 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
+  static pipe(source: any, destination: any, options?: PipeOptions): void
 
   /**
    * Create an ArrayBuffer from the given string. This is done via a reference, not a
@@ -9175,21 +8124,65 @@ declare class E {
   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.
+   * Returns a `String` representing the data in the arguments.
+   * This creates a string from the given arguments in the same way as `E.toUint8Array`. If each argument is:
+   * * A String or an Array, each element is traversed and added as an 8 bit character
+   * * `{data : ..., count : N}` causes `data` to be repeated `count` times
+   * * `{callback : fn}` calls the function and adds the result
+   * * Anything else 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.
+   * ```JS
+   * E.toString(0,1,2,"Hi",3)
+   * "\0\1\2Hi\3"
+   * E.toString(1,2,{data:[3,4], count:4},5,6)
+   * "\1\2\3\4\3\4\3\4\3\4\5\6"
+   * >E.toString(1,2,{callback : () => "Hello World"},5,6)
+   * ="\1\2Hello World\5\6"
+   * ```
+   * **Note:** Prior to Espruino 2v18 `E.toString` would always return a flat string,
+   * or would return `undefined` if one couldn't be allocated. Now, it will return
+   * a normal (fragmented) String if a contiguous chunk of memory cannot be allocated.
+   * You can still check if the returned value is a Flat string using `E.getAddressOf(str, true)!=0`,
+   * or can use `E.toFlatString` instead.
    *
    * @param {any} args - The arguments to convert to a String
-   * @returns {any} A String (or `undefined` if a Flat String cannot be created)
+   * @returns {any} A String
    * @url http://www.espruino.com/Reference#l_E_toString
    */
-  static toString(...args: any[]): string | undefined;
+  static toString(...args: any[]): string;
+
+  /**
+   * Returns a Flat `String` representing the data in the arguments, or `undefined` if one can't be allocated.
+   * This provides the same behaviour that `E.toString` had in Espruino before 2v18 - see `E.toString` for
+   * more information.
+   *
+   * @param {any} args - The arguments to convert to a Flat String
+   * @returns {any} A Flat String (or undefined)
+   * @url http://www.espruino.com/Reference#l_E_toFlatString
+   */
+  static toFlatString(...args: any[]): string | undefined;
+
+  /**
+   * By default, strings in Espruino are standard 8 bit binary strings.
+   * However calling E.asUTF8 will convert one of those strings to
+   * UTF8.
+   * ```
+   * var s = String.fromCharCode(0xF0,0x9F,0x8D,0x94);
+   * var u = E.asUTF8(s);
+   * s.length // 4
+   * s[0] // "\xF0"
+   * u.length // 1
+   * u[0] // hamburger emoji
+   * ```
+   *
+   * @param {any} str - The string to turn into a UTF8 Unicode String
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_E_asUTF8
+   */
+  static asUTF8(str: any): string;
 
   /**
    * This creates a Uint8Array from the given arguments. These are handled as
@@ -9326,7 +8319,7 @@ declare class E {
    * ```
    *
    * @param {any} device
-   * @param {any} options - (optional) object of options, see below
+   * @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;
@@ -9359,6 +8352,10 @@ declare class E {
   /**
    * Dump any locked variables that aren't referenced from `global` - for debugging
    * memory leaks only.
+   * **Note:** This does a linear scan over memory, finding variables
+   * that are currently locked. In some cases it may show variables
+   * like `Unknown 66` which happen when *part* of a string has ended
+   * up placed in memory ahead of the String that it's part of. See https://github.com/espruino/Espruino/issues/2345
    * @url http://www.espruino.com/Reference#l_E_dumpLockedVars
    */
   static dumpLockedVars(): void;
@@ -9534,20 +8531,23 @@ declare class E {
    * 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))`
+   * with 24 bit colour it can be used as: `Graphics.setColor(E.HSBtoRGB(h, s, b))`,
+   * or on devices with 26 bit colour use `Graphics.setColor(E.HSBtoRGB(h, s, b, 16))`
    * 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
+   * `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
+   * @param {number} format - If `true` or `1`, return an array of [R,G,B] values betwen 0 and 255. If `16`, return a 16 bit number. `undefined`/`24` is the same as normal (returning a 24 bit number)
    * @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];
+  static HSBtoRGB(hue: number, sat: number, bri: number, format?: false): number;
+  static HSBtoRGB(hue: number, sat: number, bri: number, format: 16): number;
+  static HSBtoRGB(hue: number, sat: number, bri: number, format: 24): number;
+  static HSBtoRGB(hue: number, sat: number, bri: number, format: true): [number, number, number];
 
   /**
    * Set a password on the console (REPL). When powered on, Espruino will then demand
@@ -9788,159 +8788,724 @@ declare class E {
    */
   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
+   * When using events with `X.on('foo', function() { ... })`
+   * and then `X.emit('foo')` you might want to stop subsequent
+   * event handlers from being executed.
+   * Calling this function doing the execution of events will
+   * ensure that no subsequent event handlers are executed.
+   * ```
+   * var X = {}; // in Espruino all objects are EventEmitters
+   * X.on('foo', function() { print("A"); })
+   * X.on('foo', function() { print("B"); E.stopEventPropagation(); })
+   * X.on('foo', function() { print("C"); })
+   * X.emit('foo');
+   * // prints A,B but not C
+   * ```
+   * @url http://www.espruino.com/Reference#l_E_stopEventPropagation
    */
-  log(...text: any[]): void;
-}
+  static stopEventPropagation(): void;
 
-interface console {
 
 }
 
 /**
- * An Object that contains functions for writing to the interactive console
- * @url http://www.espruino.com/Reference#console
+ * This class provides a software-defined OneWire master. It is designed to be
+ * similar to Arduino's OneWire library.
+ * **Note:** OneWire commands are very timing-sensitive, and on nRF52 devices
+ * (Bluetooth LE Espruino boards) the bluetooth stack can get in the way. Before
+ * version 2v18 of Espruino OneWire could be unreliable, but as of firmware 2v18
+ * Espruino now schedules OneWire accesses with the bluetooth stack to ensure it doesn't interfere.
+ * OneWire is now reliable but some functions such as `OneWire.search` can now take
+ * a while to execute (around 1 second).
+ * @url http://www.espruino.com/Reference#OneWire
  */
-declare const console: consoleConstructor
-
-interface ErrorConstructor {
+declare class OneWire {
   /**
-   * Creates an Error object
+   * Create a software OneWire implementation on the given pin
    * @constructor
    *
-   * @param {any} message - An optional message string
-   * @returns {any} An Error object
-   * @url http://www.espruino.com/Reference#l_Error_Error
+   * @param {Pin} pin - The pin to implement OneWire on
+   * @returns {any} A OneWire object
+   * @url http://www.espruino.com/Reference#l_OneWire_OneWire
    */
-  new(message?: string): Error;
+  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 Error {
+interface ObjectConstructor {
   /**
-   * @returns {any} A String
-   * @url http://www.espruino.com/Reference#l_Error_toString
+   * 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
    */
-  toString(): string;
-}
+  keys(object: any): Array<any>;
 
-/**
- * The base class for runtime errors
- * @url http://www.espruino.com/Reference#Error
- */
-declare const Error: ErrorConstructor
-
-interface SyntaxErrorConstructor {
   /**
-   * Creates a SyntaxError object
+   * 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): Array<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): Array<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): Array<[string, any]>;
+
+  /**
+   * Transforms an array of key-value pairs into an object
+   *
+   * @param {any} entries - An array of `[key,value]` pairs to be used to create an object
+   * @returns {any} An object containing all the specified pairs
+   * @url http://www.espruino.com/Reference#l_Object_fromEntries
+   */
+  fromEntries(entries: 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;
+
+  /**
+   * Get information on all properties in the object (from `Object.getOwnPropertyDescriptor`), or just `{}` if no properties
+   *
+   * @param {any} obj - The object
+   * @returns {any} An object containing all the property descriptors of an object
+   * @url http://www.espruino.com/Reference#l_Object_getOwnPropertyDescriptors
+   */
+  getOwnPropertyDescriptors(obj: 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} message - An optional message string
-   * @returns {any} A SyntaxError object
-   * @url http://www.espruino.com/Reference#l_SyntaxError_SyntaxError
+   * @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(message?: string): SyntaxError;
+  new(value: any): any;
 }
 
-interface SyntaxError {
+interface Object {
   /**
-   * @returns {any} A String
-   * @url http://www.espruino.com/Reference#l_SyntaxError_toString
+   * Find the length of the object
+   * @returns {any} The length of the object
+   * @url http://www.espruino.com/Reference#l_Object_length
    */
-  toString(): string;
+  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] - [optional] 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): string;
+
+  /**
+   * 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
+   * ```
+   * If you have more than one handler for an event, and you'd
+   * like that handler to stop the event being passed to other handlers
+   * then you can call `E.stopEventPropagation()` in that handler.
+   *
+   * @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] - [optional] 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;
 }
 
 /**
- * The base class for syntax errors
- * @url http://www.espruino.com/Reference#SyntaxError
+ * This is the built-in class for Objects
+ * @url http://www.espruino.com/Reference#Object
  */
-declare const SyntaxError: SyntaxErrorConstructor
+declare const Object: ObjectConstructor
 
-interface TypeErrorConstructor {
+interface FunctionConstructor {
   /**
-   * Creates a TypeError object
+   * Creates a function
    * @constructor
    *
-   * @param {any} message - An optional message string
-   * @returns {any} A TypeError object
-   * @url http://www.espruino.com/Reference#l_TypeError_TypeError
+   * @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(message?: string): TypeError;
+  new(...args: any[]): any;
 }
 
-interface TypeError {
+interface Function {
   /**
-   * @returns {any} A String
-   * @url http://www.espruino.com/Reference#l_TypeError_toString
+   * 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
    */
-  toString(): string;
+  replaceWith(newFunc: any): void;
+
+  /**
+   * This executes the function with the supplied 'this' argument and parameters
+   *
+   * @param {any} thisArg - 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(thisArg: any, ...params: any[]): any;
+
+  /**
+   * This executes the function with the supplied 'this' argument and parameters
+   *
+   * @param {any} thisArg - 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(thisArg: any, args: ArrayLike<any>): any;
+
+  /**
+   * This executes the function with the supplied 'this' argument and parameters
+   *
+   * @param {any} thisArg - 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(thisArg: any, ...params: any[]): any;
 }
 
 /**
- * The base class for type errors
- * @url http://www.espruino.com/Reference#TypeError
+ * This is the built-in class for Functions
+ * @url http://www.espruino.com/Reference#Function
  */
-declare const TypeError: TypeErrorConstructor
+declare const Function: FunctionConstructor
 
-/**
- * The base class for internal errors
- * @url http://www.espruino.com/Reference#InternalError
- */
-declare class InternalError {
+interface ArrayConstructor {
   /**
-   * Creates an InternalError object
+   * 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} message - An optional message string
-   * @returns {any} An InternalError object
-   * @url http://www.espruino.com/Reference#l_InternalError_InternalError
+   * @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
    */
-  static new(message?: string): InternalError;
-
-  /**
-   * @returns {any} A String
-   * @url http://www.espruino.com/Reference#l_InternalError_toString
-   */
-  toString(): string;
+  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 ReferenceErrorConstructor {
+interface Array<T> {
   /**
-   * Creates a ReferenceError object
-   * @constructor
+   * Convert the Array to a string
    *
-   * @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
+   * @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] - [optional] If specified, the function is called with 'this' set to thisArg
+   * @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
+   * @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] - [optional] If specified, the function is called with 'this' set to thisArg
+   * @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] - [optional] If specified, the function is called with 'this' set to thisArg
+   * @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] - [optional] If specified, the function is called with 'this' set to thisArg
+   * @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] - [optional] End index
+   * @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
 }
 
 /**
- * The base class for reference errors - where a variable which doesn't exist has
- * been accessed.
- * @url http://www.espruino.com/Reference#ReferenceError
+ * 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 ReferenceError: ReferenceErrorConstructor
+declare const Array: ArrayConstructor
 
 interface JSONConstructor {
   /**
@@ -9981,6 +9546,949 @@ interface JSON {
  */
 declare const JSON: JSONConstructor
 
+/**
+ * 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 (e.g. `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 (e.g. `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]
+   * [optional] A 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;
+}
+
+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
+
+/**
+ * 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 (e.g. `"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;
+
+  /**
+   * 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]
+   * [optional] An 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_StorageFile_pipe
+   */
+  pipe(destination: any, options?: PipeOptions): void
+}
+
+interface processConstructor {
+  /**
+   * This event is called when an exception gets thrown and isn't caught (e.g. 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 (e.g. `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(',')`
+   * **Note:** `process.env` is not writeable - so as not to waste RAM, the contents
+   * are generated on demand. If you need to be able to change them, use `process.env=process.env;`
+   * first to ensure the values stay allocated.
+   * @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.
+   * * `stackFree` : (on ARM) how many bytes of free execution stack are there
+   *   at the point of execution.
+   * * `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] - [optional] A 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
+
+/**
+ * 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 (e.g. 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 (e.g. 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 (e.g.
+   * `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.
+   * e.g.
+   * ```
+   * 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] - [optional] A 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 occurrences 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, e.g.
+   *  `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, e.g. `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]
+   * [optional] An 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?: PipeOptions): void
+
+  /**
+   * Flush this serial stream (pause execution until all data has been sent)
+   * @url http://www.espruino.com/Reference#l_Serial_flush
+   */
+  flush(): 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' RegExp 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 occurrence 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] - [optional] 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. e.g.
+   * ```'1,2,3'.split(',')==['1', '2', '3']```
+   * Regular Expressions can also be used to split strings, e.g. `'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 beginning 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 RegExpConstructor {
   /**
    * Creates a RegExp object, for handling Regular Expressions
@@ -10041,418 +10549,174 @@ interface 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 {
+interface NumberConstructor {
   /**
-   * @returns {Pin} A Pin
-   * @url http://www.espruino.com/Reference#l_Nucleo_A0
+   * @returns {number} Not a  Number
+   * @url http://www.espruino.com/Reference#l_Number_NaN
    */
-  static A0: Pin;
+  NaN: number;
 
   /**
-   * @returns {Pin} A Pin
-   * @url http://www.espruino.com/Reference#l_Nucleo_A1
+   * @returns {number} Maximum representable value
+   * @url http://www.espruino.com/Reference#l_Number_MAX_VALUE
    */
-  static A1: Pin;
+  MAX_VALUE: number;
 
   /**
-   * @returns {Pin} A Pin
-   * @url http://www.espruino.com/Reference#l_Nucleo_A2
+   * @returns {number} Smallest representable value
+   * @url http://www.espruino.com/Reference#l_Number_MIN_VALUE
    */
-  static A2: Pin;
+  MIN_VALUE: number;
 
   /**
-   * @returns {Pin} A Pin
-   * @url http://www.espruino.com/Reference#l_Nucleo_A3
+   * @returns {number} Negative Infinity (-1/0)
+   * @url http://www.espruino.com/Reference#l_Number_NEGATIVE_INFINITY
    */
-  static A3: Pin;
+  NEGATIVE_INFINITY: number;
 
   /**
-   * @returns {Pin} A Pin
-   * @url http://www.espruino.com/Reference#l_Nucleo_A4
+   * @returns {number} Positive Infinity (1/0)
+   * @url http://www.espruino.com/Reference#l_Number_POSITIVE_INFINITY
    */
-  static A4: Pin;
+  POSITIVE_INFINITY: number;
 
   /**
-   * @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
+   * Creates a number
    * @constructor
    *
-   * @param {any} queueName - Name of the queue
-   * @returns {any} A Queue object
-   * @url http://www.espruino.com/Reference#l_Queue_Queue
+   * @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
    */
-  static new(queueName: any): any;
+  new(...value: any[]): any;
+}
 
+interface Number {
   /**
-   * reads one character from queue, if available
-   * @url http://www.espruino.com/Reference#l_Queue_read
-   */
-  read(): void;
-
-  /**
-   * Writes one character to queue
+   * Format the number as a fixed point number
    *
-   * @param {any} char - char to be send
-   * @url http://www.espruino.com/Reference#l_Queue_writeChar
+   * @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
    */
-  writeChar(char: any): void;
-
-  /**
-   * logs list of queues
-   * @url http://www.espruino.com/Reference#l_Queue_log
-   */
-  log(): void;
+  toFixed(decimalPlaces: number): any;
 }
 
 /**
- * A class to support some simple Task handling for RTOS tasks
- * @url http://www.espruino.com/Reference#Task
+ * This is the built-in JavaScript class for numbers.
+ * @url http://www.espruino.com/Reference#Number
  */
-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;
-}
+declare const Number: NumberConstructor
 
 /**
- * A class to handle Timer on base of ESP32 Timer
- * @url http://www.espruino.com/Reference#Timer
+ * 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 Timer {
+declare class Pin {
   /**
-   * Creates a Timer Object
+   * Creates a pin from the given argument (or returns undefined if no argument)
    * @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
+   * @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(timerName: any, group: number, index: number, isrIndex: number): any;
+  static new(value: any): any;
 
   /**
-   * Starts a timer
+   * 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 {number} duration - duration of timmer in micro secs
-   * @url http://www.espruino.com/Reference#l_Timer_start
+   * @param {boolean} value - Whether to set output high (true/1) or low (false/0)
+   * @url http://www.espruino.com/Reference#l_Pin_write
    */
-  start(duration: number): void;
+  write(value: boolean): void;
 
   /**
-   * Reschedules a timer, needs to be started at least once
+   * 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 {number} duration - duration of timmer in micro secs
-   * @url http://www.espruino.com/Reference#l_Timer_reschedule
+   * @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
    */
-  reschedule(duration: number): void;
+  writeAtTime(value: boolean, time: number): void;
 
   /**
-   * logs list of timers
-   * @url http://www.espruino.com/Reference#l_Timer_log
+   * 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
    */
-  log(): void;
+  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 BooleanConstructor {
@@ -10476,16 +10740,32 @@ declare const Boolean: BooleanConstructor
 
 // GLOBALS
 
+/**
+ * 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;
+
 /**
  * **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
+ * * A number where each bit represents a pixel (so 25 bits). e.g. `5` or
  *   `0x1FFFFFF`
- * * A string, eg: `show("10001")`. Newlines are ignored, and anything that is not
+ * * A string, e.g: `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])`
+ * * An array of 4 bytes (more will be ignored), e.g `show([1,2,3,0])`
  * For instance the following works for images:
  * ```
  * show("#   #"+
@@ -10527,6 +10807,54 @@ declare function acceleration(): any;
  */
 declare function compass(): any;
 
+/**
+ * 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 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;
+
 /**
  * The pin connected to the 'A' button. Reads as `1` when pressed, `0` when not
  * @returns {Pin}
@@ -10612,68 +10940,11 @@ declare const CORNER5: Pin;
 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
+ * The Bluetooth Serial port - used when data is sent or received over Bluetooth
+ * Smart on nRF51/nRF52 chips.
+ * @url http://www.espruino.com/Reference#l__global_Bluetooth
  */
-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;
+declare const Bluetooth: Serial;
 
 /**
  * @returns {Pin} A Pin
@@ -10724,158 +10995,388 @@ declare const IOEXT2: Pin;
 declare const IOEXT3: Pin;
 
 /**
- * @returns {number} Not a  Number
- * @url http://www.espruino.com/Reference#l__global_NaN
+ * A simple VT100 terminal emulator.
+ * When data is sent to the `Terminal` object, `Graphics.getInstance()` is called
+ * and if an instance of `Graphics` is found then characters are written to it.
+ * @url http://www.espruino.com/Reference#l__global_Terminal
  */
-declare const NaN: number;
+declare const Terminal: Serial;
+
+declare const global: {
+  SDA: typeof SDA;
+  SCL: typeof SCL;
+  show: typeof show;
+  acceleration: typeof acceleration;
+  compass: typeof compass;
+  FET: typeof FET;
+  VIBRATE: typeof VIBRATE;
+  LED: typeof LED;
+  LED1: typeof LED1;
+  LED2: typeof LED2;
+  BTNA: typeof BTNA;
+  BTNB: typeof BTNB;
+  BTNU: typeof BTNU;
+  BTND: typeof BTND;
+  BTNL: typeof BTNL;
+  BTNR: typeof BTNR;
+  CORNER1: typeof CORNER1;
+  CORNER2: typeof CORNER2;
+  CORNER3: typeof CORNER3;
+  CORNER4: typeof CORNER4;
+  CORNER5: typeof CORNER5;
+  CORNER6: typeof CORNER6;
+  Bluetooth: typeof Bluetooth;
+  MOS1: typeof MOS1;
+  MOS2: typeof MOS2;
+  MOS3: typeof MOS3;
+  MOS4: typeof MOS4;
+  IOEXT0: typeof IOEXT0;
+  IOEXT1: typeof IOEXT1;
+  IOEXT2: typeof IOEXT2;
+  IOEXT3: typeof IOEXT3;
+  Terminal: typeof Terminal;
+  global: typeof global;
+  setBusyIndicator: typeof setBusyIndicator;
+  setSleepIndicator: typeof setSleepIndicator;
+  setDeepSleep: typeof setDeepSleep;
+  dump: typeof dump;
+  load: typeof load;
+  save: typeof save;
+  reset: typeof reset;
+  edit: typeof edit;
+  echo: typeof echo;
+  getTime: typeof getTime;
+  setTime: typeof setTime;
+  getSerial: typeof getSerial;
+  setInterval: typeof setInterval;
+  setTimeout: typeof setTimeout;
+  clearInterval: typeof clearInterval;
+  clearTimeout: typeof clearTimeout;
+  changeInterval: typeof changeInterval;
+  peek8: typeof peek8;
+  poke8: typeof poke8;
+  peek16: typeof peek16;
+  poke16: typeof poke16;
+  peek32: typeof peek32;
+  poke32: typeof poke32;
+  analogRead: typeof analogRead;
+  analogWrite: typeof analogWrite;
+  digitalPulse: typeof digitalPulse;
+  digitalWrite: typeof digitalWrite;
+  digitalRead: typeof digitalRead;
+  pinMode: typeof pinMode;
+  getPinMode: typeof getPinMode;
+  shiftOut: typeof shiftOut;
+  setWatch: typeof setWatch;
+  clearWatch: typeof clearWatch;
+  arguments: typeof arguments;
+  eval: typeof eval;
+  parseInt: typeof parseInt;
+  parseFloat: typeof parseFloat;
+  isFinite: typeof isFinite;
+  isNaN: typeof isNaN;
+  btoa: typeof btoa;
+  atob: typeof atob;
+  encodeURIComponent: typeof encodeURIComponent;
+  decodeURIComponent: typeof decodeURIComponent;
+  trace: typeof trace;
+  print: typeof print;
+  require: typeof require;
+  __FILE__: typeof __FILE__;
+  SPI1: typeof SPI1;
+  SPI2: typeof SPI2;
+  SPI3: typeof SPI3;
+  I2C1: typeof I2C1;
+  I2C2: typeof I2C2;
+  I2C3: typeof I2C3;
+  USB: typeof USB;
+  Serial1: typeof Serial1;
+  Serial2: typeof Serial2;
+  Serial3: typeof Serial3;
+  Serial4: typeof Serial4;
+  Serial5: typeof Serial5;
+  Serial6: typeof Serial6;
+  LoopbackA: typeof LoopbackA;
+  LoopbackB: typeof LoopbackB;
+  Telnet: typeof Telnet;
+  NaN: typeof NaN;
+  Infinity: typeof Infinity;
+  HIGH: typeof HIGH;
+  LOW: typeof LOW;
+  [key: string]: any;
+}
 
 /**
- * @returns {number} Positive Infinity (1/0)
- * @url http://www.espruino.com/Reference#l__global_Infinity
+ * 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 const Infinity: number;
+declare function setBusyIndicator(pin: any): void;
 
 /**
- * @returns {number} Logic 1 for Arduino compatibility - this is the same as just typing `1`
- * @url http://www.espruino.com/Reference#l__global_HIGH
+ * 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 const HIGH: 1;
+declare function setSleepIndicator(pin: any): void;
 
 /**
- * @returns {number} Logic 0 for Arduino compatibility - this is the same as just typing `0`
- * @url http://www.espruino.com/Reference#l__global_LOW
+ * 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 const LOW: 0;
+declare function setDeepSleep(sleep: boolean): void;
 
 /**
- * A variable containing the arguments given to the function:
+ * 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;
+
+/**
+ * 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:
  * ```
- * function hello() {
- *   console.log(arguments.length, JSON.stringify(arguments));
- * }
- * hello()        // 0 []
- * hello("Test")  // 1 ["Test"]
- * hello(1,2,3)   // 3 [1,2,3]
+ * setTime((new Date("Tue, 19 Feb 2019 10:57")).getTime()/1000)
  * ```
- * **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
+ * To set the timezone for all new Dates, use `E.setTimeZone(hours)`.
  *
- * @param {any} code
- * @returns {any} The result of evaluating the string
- * @url http://www.espruino.com/Reference#l__global_eval
+ * @param {number} time
+ * @url http://www.espruino.com/Reference#l__global_setTime
  */
-declare function eval(code: any): any;
+declare function setTime(time: number): void;
 
 /**
- * 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
+ * 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 parseInt(string: any, radix: any): any;
+declare function getSerial(): 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:
+ * Call the function (or evaluate the string) specified REPEATEDLY after the
+ * timeout in milliseconds.
+ * For instance:
  * ```
- * var s = require("Storage");
- * s.write("test", "hello world");
- * print(s.read("test"));
- * // prints "hello world"
+ * setInterval(function () {
+ *   console.log("Hello World");
+ * }, 1000);
+ * // or
+ * setInterval('console.log("Hello World");', 1000);
+ * // both print 'Hello World' every second
  * ```
- * Check out [the page on Modules](/Modules) for an explanation of what modules are
- * and how you can use them.
+ * 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} 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
+ * @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 require<T extends keyof Libraries>(moduleName: T): Libraries[T];
-declare function require<T extends Exclude<string, keyof Libraries>>(moduleName: T): any;
+declare function setInterval(func: string | Function, timeout: number, ...args: any[]): IntervalId;
+
+/**
+ * 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: string | Function, timeout: number, ...args: any[]): TimeoutId;
+
+/**
+ * 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: IntervalId): 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: TimeoutId): 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: IntervalId, time: number): void;
 
 /**
  * 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.
+ * @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
  */
@@ -10895,7 +11396,7 @@ 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.
+ * @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
  */
@@ -10915,7 +11416,7 @@ 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.
+ * @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
  */
@@ -10932,7 +11433,7 @@ declare function peek32(addr: number, count: number): Uint8Array;
 declare function poke32(addr: number, value: number | number[]): void;
 
 /**
- * Get the analog value of the given pin
+ * Get the analogue value of the given pin
  * This is different to Arduino which only returns an integer between 0 and 1023
  * However only pins connected to an ADC will work (see the datasheet)
  *  **Note:** if you didn't call `pinMode` beforehand then this function will also
@@ -10949,7 +11450,7 @@ 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 });``` -
+ * * `freq` - pulse frequency in Hz, e.g. ```analogWrite(A0,0.5,{ freq : 10 });``` -
  *   specifying a frequency will force PWM output, even if the pin has a DAC
  * * `soft` - boolean, If true software PWM is used if hardware is not available.
  * * `forceSoft` - boolean, If true software PWM is used even if hardware PWM or a
@@ -10972,7 +11473,7 @@ declare function analogWrite(pin: Pin, value: number, options?: { freq?: number,
  * 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.
+ * e.g. `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
@@ -10991,7 +11492,7 @@ declare function digitalPulse(pin: Pin, value: boolean, time: number | number[])
  * Set the digital value of the given pin.
  *  **Note:** if you didn't call `pinMode` beforehand then this function will also
  *  reset pin's state to `"output"`
- * If pin argument is an array of pins (eg. `[A2,A1,A0]`) the value argument will
+ * If pin argument is an array of pins (e.g. `[A2,A1,A0]`) the value argument will
  * be treated as an array of bits where the last array element is the least
  * significant bit.
  * In this case, pin values are set least significant bit first (from the
@@ -11005,13 +11506,13 @@ declare function digitalPulse(pin: Pin, value: boolean, time: number | number[])
  * @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;
+declare function digitalWrite(pin: Pin, value: boolean): 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
+ * If the pin argument is an array of pins (e.g. `[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
@@ -11150,7 +11651,7 @@ declare function shiftOut(pins: Pin | Pin[], options: { clk?: Pin, clkPol?: bool
  * **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`.
+ * [Pico](/Pico)) cannot watch two pins with the same number - e.g. `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`.
@@ -11167,125 +11668,116 @@ declare function setWatch(func: ((arg: { state: boolean, time: number, lastTime:
  * 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.**
+ * @param {any} id - The id returned by a previous call to setWatch. **Only one argument is allowed.** (or pass nothing to clear all watches)
  * @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;
-}
+declare function clearWatch(): void;
 
 /**
- * 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
+ * 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 function setBusyIndicator(pin: any): void;
+declare const arguments: any;
 
 /**
- * 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.
+ * Evaluate a string containing JavaScript code
  *
- * @param {any} pin
- * @url http://www.espruino.com/Reference#l__global_setSleepIndicator
+ * @param {any} code
+ * @returns {any} The result of evaluating the string
+ * @url http://www.espruino.com/Reference#l__global_eval
  */
-declare function setSleepIndicator(pin: any): void;
+declare function eval(code: any): any;
 
 /**
- * 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.
+ * Convert a string representing a number into an integer
  *
- * @param {boolean} sleep
- * @url http://www.espruino.com/Reference#l__global_setDeepSleep
+ * @param {any} string
+ * @param {any} [radix] - [optional] The Radix of the string
+ * @returns {any} The integer value of the string (or NaN)
+ * @url http://www.espruino.com/Reference#l__global_parseInt
  */
-declare function setDeepSleep(sleep: boolean): void;
+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 number 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;
 
 /**
  * Output debugging information
@@ -11297,84 +11789,6 @@ declare function setDeepSleep(sleep: boolean): void;
  */
 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
@@ -11387,1626 +11801,1783 @@ declare function reset(clearFlash: boolean): void;
  */
 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;
+declare function require(moduleName: "ESP8266"): typeof import("ESP8266");
+declare function require(moduleName: "crypto"): typeof import("crypto");
+declare function require(moduleName: "neopixel"): typeof import("neopixel");
+declare function require(moduleName: "net"): typeof import("net");
+declare function require(moduleName: "dgram"): typeof import("dgram");
+declare function require(moduleName: "tls"): typeof import("tls");
+declare function require(moduleName: "Wifi"): typeof import("Wifi");
+declare function require(moduleName: "NetworkJS"): typeof import("NetworkJS");
+declare function require(moduleName: "http"): typeof import("http");
+declare function require(moduleName: "WIZnet"): typeof import("WIZnet");
+declare function require(moduleName: "CC3000"): typeof import("CC3000");
+declare function require(moduleName: "TelnetServer"): typeof import("TelnetServer");
+declare function require(moduleName: "fs"): typeof import("fs");
+declare function require(moduleName: "tv"): typeof import("tv");
+declare function require(moduleName: "tensorflow"): typeof import("tensorflow");
+declare function require(moduleName: "heatshrink"): typeof import("heatshrink");
+declare function require(moduleName: "Flash"): typeof import("Flash");
+declare function require(moduleName: "Storage"): typeof import("Storage");
+declare function require(moduleName: string): any;
 
 /**
- * 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
+ * The filename of the JavaScript that is currently executing.
+ * If `load` has been called with a filename (eg `load("myfile.js")`) then
+ * `__FILE__` is set to that filename. Otherwise (eg `load()`) or immediately
+ * after booting, `__FILE__` is not set.
+ * @returns {any} The filename of the JavaScript that is currently executing
+ * @url http://www.espruino.com/Reference#l__global___FILE__
  */
-declare function echo(echoOn: boolean): void;
+declare const __FILE__: any;
 
 /**
- * Return the current system time in Seconds (as a floating point number)
- * @returns {number}
- * @url http://www.espruino.com/Reference#l__global_getTime
+ * The first SPI port
+ * @url http://www.espruino.com/Reference#l__global_SPI1
  */
-declare function getTime(): number;
+declare const SPI1: SPI;
 
 /**
- * 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
+ * The second SPI port
+ * @url http://www.espruino.com/Reference#l__global_SPI2
  */
-declare function setTime(time: number): void;
+declare const SPI2: SPI;
 
 /**
- * Get the serial number of this board
- * @returns {any} The board's serial number
- * @url http://www.espruino.com/Reference#l__global_getSerial
+ * The third SPI port
+ * @url http://www.espruino.com/Reference#l__global_SPI3
  */
-declare function getSerial(): any;
+declare const SPI3: SPI;
 
 /**
- * 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
+ * The first I2C port
+ * @url http://www.espruino.com/Reference#l__global_I2C1
  */
-declare function setInterval(func: any, timeout: number, ...args: any[]): any;
+declare const I2C1: I2C;
 
 /**
- * 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
+ * The second I2C port
+ * @url http://www.espruino.com/Reference#l__global_I2C2
  */
-declare function setTimeout(func: any, timeout: number, ...args: any[]): any;
+declare const I2C2: I2C;
 
 /**
- * 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
+ * The third I2C port
+ * @url http://www.espruino.com/Reference#l__global_I2C3
  */
-declare function clearInterval(...id: any[]): void;
+declare const I2C3: I2C;
 
 /**
- * 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
+ * The USB Serial port
+ * @url http://www.espruino.com/Reference#l__global_USB
  */
-declare function clearTimeout(...id: any[]): void;
+declare const USB: Serial;
 
 /**
- * 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
+ * The first Serial (USART) port
+ * @url http://www.espruino.com/Reference#l__global_Serial1
  */
-declare function changeInterval(id: any, time: number): void;
+declare const Serial1: Serial;
+
+/**
+ * The second Serial (USART) port
+ * @url http://www.espruino.com/Reference#l__global_Serial2
+ */
+declare const Serial2: Serial;
+
+/**
+ * The third Serial (USART) port
+ * @url http://www.espruino.com/Reference#l__global_Serial3
+ */
+declare const Serial3: Serial;
+
+/**
+ * The fourth Serial (USART) port
+ * @url http://www.espruino.com/Reference#l__global_Serial4
+ */
+declare const Serial4: Serial;
+
+/**
+ * The fifth Serial (USART) port
+ * @url http://www.espruino.com/Reference#l__global_Serial5
+ */
+declare const Serial5: Serial;
+
+/**
+ * The sixth Serial (USART) port
+ * @url http://www.espruino.com/Reference#l__global_Serial6
+ */
+declare const Serial6: Serial;
+
+/**
+ * A loopback serial device. Data sent to `LoopbackA` comes out of `LoopbackB` and
+ * vice versa
+ * @url http://www.espruino.com/Reference#l__global_LoopbackA
+ */
+declare const LoopbackA: Serial;
+
+/**
+ * A loopback serial device. Data sent to `LoopbackA` comes out of `LoopbackB` and
+ * vice versa
+ * @url http://www.espruino.com/Reference#l__global_LoopbackB
+ */
+declare const LoopbackB: Serial;
+
+/**
+ * A telnet serial device that maps to the built-in telnet console server (devices
+ * that have built-in wifi only).
+ * @url http://www.espruino.com/Reference#l__global_Telnet
+ */
+declare const Telnet: Serial;
+
+/**
+ * @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: true;
+
+/**
+ * @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: false;
 
 // LIBRARIES
 
-type Libraries = {
+/**
+ * The ESP8266 library is specific to the ESP8266 version of Espruino, i.e.,
+ * running Espruino on an ESP8266 module (not to be confused with using the ESP8266
+ * as Wifi add-on to an Espruino board). This library contains functions to handle
+ * ESP8266-specific actions. For example: `var esp8266 = require('ESP8266');
+ * esp8266.reboot();` performs a hardware reset of the module.
+ * @url http://www.espruino.com/Reference#ESP8266
+ */
+declare module "ESP8266" {
   /**
-   * @url http://www.espruino.com/Reference#tensorflow
+   * Perform a hardware reset/reboot of the esp8266.
+   * @url http://www.espruino.com/Reference#l_ESP8266_reboot
    */
-  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;
-  }
+  function reboot(): void;
 
   /**
-   * 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
+   * 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
    */
-  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;
-  }
+  function getResetInfo(): any;
 
   /**
-   * 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
+   * 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
    */
-  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;
-  }
+  function logDebug(enable: boolean): void;
 
   /**
-   * Library that initialises a network device that calls into JavaScript
-   * @url http://www.espruino.com/Reference#NetworkJS
+   * 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
    */
-  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;
-  }
+  function setLog(mode: number): void;
 
   /**
-   * 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
+   * Prints the contents of the debug log to the console.
+   * @url http://www.espruino.com/Reference#l_ESP8266_printLog
    */
-  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;
-  }
+  function printLog(): 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
+   * Returns one line from the log or up to 128 characters.
+   * @url http://www.espruino.com/Reference#l_ESP8266_readLog
    */
-  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;
-  }
+  function readLog(): void;
 
   /**
-   * 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
+   * Dumps info about all sockets to the log. This is for troubleshooting the socket
+   * implementation.
+   * @url http://www.espruino.com/Reference#l_ESP8266_dumpSocketInfo
    */
-  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;
-  }
+  function dumpSocketInfo(): void;
 
   /**
-   * 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
+   * **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
    */
-  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;
-  }
+  function setCPUFreq(freq: any): void;
 
   /**
-   * @url http://www.espruino.com/Reference#CC3000
+   * 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
    */
-  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;
-  }
+  function getState(): any;
 
   /**
-   * Library for communication with the WIZnet Ethernet module
-   * @url http://www.espruino.com/Reference#WIZnet
+   * **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
    */
-  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;
-  }
+  function getFreeFlash(): any;
 
   /**
-   * 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
+   *
+   * @param {any} arrayOfData - Array of data to CRC
+   * @returns {any} 32-bit CRC
+   * @url http://www.espruino.com/Reference#l_ESP8266_crc32
    */
-  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;
-  }
+  function crc32(arrayOfData: any): any;
 
   /**
-   * 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
+   * **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
    */
-  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;
-  }
+  function neopixelWrite(pin: Pin, arrayOfData: any): void;
 
   /**
-   * 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
+   * 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
    */
-  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;
-  }
+  function deepSleep(micros: any, option: any): void;
 
   /**
-   * 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
+   * **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
    */
-  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;
-  }
+  function ping(ipAddr: any, pingCallback: 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
+ */
+declare module "crypto" {
+  /**
+   * Class containing AES encryption/decryption
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_crypto_AES
+   */
+  const 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function PBKDF2(passphrase: any, salt: any, options: 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
+ */
+declare module "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.
+   * * On STM32, `neopixel.write` chooses a hardware SPI device to output the signal on
+   * and uses that. However in order to avoid spikes in the output, if that hardware device is *already
+   * initialised* it will not be re-initialised. This means that if the SPI device was already in use,
+   * you may have to use `SPIx.setup({baud:3200000, mosi:the_pin})` to force it to be re-setup on the pin.
+   * * 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
+   */
+  function write(pin: Pin, data: 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
+ */
+declare module "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
+   */
+  function 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
+   */
+  function 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
+ */
+declare module "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
+   */
+  function 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
+ */
+declare module "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
+   */
+  function connect(options: any, callback: any): Socket;
+}
+
+/**
+ * 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
+ */
+declare module "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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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] - [optional] An `callback()` function to be called back on disconnection. The callback function receives no argument.
+   * @url http://www.espruino.com/Reference#l_Wifi_disconnect
+   */
+  function 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] - [optional] An `callback()` function to be called back on successful stop. The callback function receives no argument.
+   * @url http://www.espruino.com/Reference#l_Wifi_stopAP
+   */
+  function 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 address 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] - [optional] Connection options.
+   * @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
+   */
+  function connect(ssid: string, options?: { password?: string, dnsServers?: string[], authMode?: string, channel?: number, bssid?: string }, callback?: (err: string | null) => void): 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
+   */
+  function 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] - [optional] Configuration options.
+   * @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
+   */
+  function startAP(ssid: string, options?: { password?: string, authMode?: "open" | "wpa2" | "wpa" | "wpa_wpa2", channel?: number, hidden?: boolean }, callback?: (err: string | null) => void): 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
+   */
+  function 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
+   */
+  function 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] - [optional] An `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
+   */
+  function 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] - [optional] A `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
+   */
+  function 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
+   */
+  function save(what: any): void;
+
+  /**
+   * Restores the saved Wifi configuration from flash. See `Wifi.save()`.
+   * @url http://www.espruino.com/Reference#l_Wifi_restore
+   */
+  function 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] - [optional] A `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
+   */
+  function 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] - [optional] A `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
+   */
+  function 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
+   */
+  function 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] - [optional] A `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
+   */
+  function getHostname(callback?: any): any;
+
+  /**
+   * Set the hostname. Depending on implementation, 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] - [optional] A `callback()` function to be called back when the hostname is set
+   * @url http://www.espruino.com/Reference#l_Wifi_setHostname
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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. * e.g.
+   * `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
+   */
+  function turbo(enable: any, callback: any): void;
+}
+
+/**
+ * Library that initialises a network device that calls into JavaScript
+ * @url http://www.espruino.com/Reference#NetworkJS
+ */
+declare module "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
+   */
+  function create(obj: any): any;
+}
+
+/**
+ * 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
+ */
+declare module "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
+   */
+  function 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
+   */
+  function 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
+   */
+  function get(options: any, callback: any): httpCRq;
+}
+
+/**
+ * Library for communication with the WIZnet Ethernet module
+ * @url http://www.espruino.com/Reference#WIZnet
+ */
+declare module "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
+   */
+  function connect(spi: any, cs: Pin): Ethernet;
+}
+
+/**
+ * @url http://www.espruino.com/Reference#CC3000
+ */
+declare module "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
+   */
+  function connect(spi: any, cs: Pin, en: Pin, irq: Pin): WLAN;
+}
+
+/**
+ * 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
+ */
+declare module "TelnetServer" {
+  /**
+   *
+   * @param {any} options - Options controlling the telnet console server `{ mode : 'on|off'}`
+   * @url http://www.espruino.com/Reference#l_TelnetServer_setOptions
+   */
+  function setOptions(options: any): void;
+}
+
+/**
+ * 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
+ */
+declare module "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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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]
+   * [optional] An 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
+   */
+  function pipe(destination: any, options?: PipeOptions): void
+}
+
+/**
+ * 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
+ */
+declare module "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
+   */
+  function setup(options: any, width: number): any;
+}
+
+/**
+ * @url http://www.espruino.com/Reference#tensorflow
+ */
+declare module "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
+   */
+  function create(arenaSize: number, model: any): TFMicroInterpreter;
+}
+
+/**
+ * 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.
+ * If you'd like a way to perform compression/decompression on desktop, check out https://github.com/espruino/EspruinoWebTools#heatshrinkjs
+ * @url http://www.espruino.com/Reference#heatshrink
+ */
+declare module "heatshrink" {
+  /**
+   * Compress the heatshrink-encoded data supplied as input.
+   * If you'd like a way to perform compression/decompression on desktop, check out https://github.com/espruino/EspruinoWebTools#heatshrinkjs
+   *
+   * @param {any} data - The data to compress
+   * @returns {any} Returns the result as an ArrayBuffer
+   * @url http://www.espruino.com/Reference#l_heatshrink_compress
+   */
+  function compress(data: any): ArrayBuffer;
+
+  /**
+   * Decompress the heatshrink-encoded data supplied as input.
+   * If you'd like a way to perform compression/decompression on desktop, check out https://github.com/espruino/EspruinoWebTools#heatshrinkjs
+   *
+   * @param {any} data - The data to decompress
+   * @returns {any} Returns the result as an ArrayBuffer
+   * @url http://www.espruino.com/Reference#l_heatshrink_decompress
+   */
+  function decompress(data: any): ArrayBuffer;
+}
+
+/**
+ * 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
+ */
+declare module "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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function read(length: number, addr: number): any;
+}
+
+/**
+ * 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 - e.g. 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
+ */
+declare module "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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function readJSON(name: string, noExceptions?: false | 0): unknown;
+  function readJSON(name: string, noExceptions?: ShortBoolean): unknown | undefined;
+
+  /**
+   * 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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 (e.g. created with Storage.write)
+   * require("Storage").list(undefined, {sf:false})
+   * ```
+   * **Note:** This will output system files (e.g. 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
+   */
+  function list(regex?: RegExp, filter?: { sf: boolean }): string[];
+
+  /**
+   * List all files in the flash storage area matching the specified regex (ignores
+   * StorageFiles), and then hash their filenames *and* file locations.
+   * Identical files may have different hashes (e.g. 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
+   */
+  function 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/trash files 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 (e.g. 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
+   */
+  function 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
+   */
+  function 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
+   */
+  function 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? (can be cleared with .compact)
+   * }
+   * ```
+   * @returns {any} An object containing info about the current Storage system
+   * @url http://www.espruino.com/Reference#l_Storage_getStats
+   */
+  function 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
+   */
+  function 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
+   */
+  function open(name: string, mode: "r" | "w" | "a"): StorageFile;
+}
\ No newline at end of file
diff --git a/typescript/types/modules.d.ts b/typescript/types/modules.d.ts
new file mode 100644
index 000000000..ad3612117
--- /dev/null
+++ b/typescript/types/modules.d.ts
@@ -0,0 +1,7 @@
+// locally declared modules
+declare function require(moduleName: "locale"): Locale.Locale;
+declare function require(moduleName: "sched"): typeof Sched;
+
+declare function require(moduleName: "ClockFace"): typeof ClockFace_.ClockFace;
+declare function require(moduleName: "clock_info"): typeof ClockInfo;
+declare function require(moduleName: "Layout"): typeof Layout.Layout;
diff --git a/typescript/types/other.d.ts b/typescript/types/other.d.ts
index 2a58b9fe1..9839286fa 100644
--- a/typescript/types/other.d.ts
+++ b/typescript/types/other.d.ts
@@ -9,3 +9,7 @@ interface IArguments {
 
 // Helper type
 type Exclude<T, U> = T extends U ? never : T;
+
+type ReturnType<T> = T extends (...args: any[]) => infer R ? R : never;
+
+type NonNull<T> = Exclude<T, undefined | null>;
diff --git a/typescript/types/sched.d.ts b/typescript/types/sched.d.ts
new file mode 100644
index 000000000..78ad0c8d4
--- /dev/null
+++ b/typescript/types/sched.d.ts
@@ -0,0 +1,118 @@
+declare module Sched {
+  const enum Dow {
+    SUN = 1,
+    MON = 2,
+    TUE = 4,
+    WED = 8,
+    THU = 16,
+    FRI = 32,
+    SAT = 64,
+  }
+
+  type Dows = number;
+  type Milliseconds = number;
+
+  // slight hack - all objects have a `on()`, this unions with that type so we can add it to an object
+  type OnBoolean<T extends boolean = boolean>
+    = T | Object["on"];
+
+  type VibratePattern = string; // "." | "," | "-" | ":" | ";" | "="
+
+  type DateString = `${number}-${number}-${number}`;
+
+  type NewSched = {
+    msg?: string,
+    appid?: string,
+    dow?: Dows,
+    on?: OnBoolean<false>,
+    js?: string,
+  } & (NewTimer | NewAlarm);
+
+  type NewTimer = { timer: number };
+  type NewAlarm = { t: number, date?: DateString };
+
+  type DefaultSched = {
+    on: OnBoolean<true>,
+    del: boolean,
+    rp: false,
+    as: false,
+    dow: Dows,
+    last: number,
+    vibrate: VibratePattern,
+  };
+
+  type DefaultAlarm = DefaultSched & { t: number };
+
+  type DefaultTimer = DefaultSched & { timer: number };
+
+  type Sched = {
+    // from NewSched / set in setAlarm()
+    msg: string,
+    appid?: string,
+    dow: Dows,
+    on: OnBoolean,
+    timer?: Milliseconds, // this is a timer
+
+    // setAlarm adds:
+    id: string,
+    t: Milliseconds, // time of day since midnight (in ms)
+
+    // optional NewSched
+    vibrate?: VibratePattern,
+    hidden?: boolean,
+    as?: boolean, // auto snooze
+    del?: boolean,
+    js?: string,
+    data?: unknown,
+
+    // set by sched
+    last?: number,
+  } & (
+    {
+      date: DateString,
+      rp?: Repeat,
+    } | {
+      date: undefined,
+      rp: boolean,
+    }
+  );
+
+  type Repeat = {
+    num: number,
+    interval: "day" | "week" | "month" | "year",
+  };
+
+  type SchedSettings = {
+    unlockAtBuzz: boolean,
+    defaultSnoozeMillis: number,
+    defaultAutoSnooze: boolean,
+    defaultDeleteExpiredTimers: boolean,
+    buzzCount: number,
+    buzzIntervalMillis: number,
+    defaultAlarmPattern: string,
+    defaultTimerPattern: string,
+  };
+
+  function getAlarms(): Sched[];
+
+  function setAlarms(alarms: readonly Sched[]): void;
+
+  function getAlarm(id: string): Sched | undefined;
+
+  function getActiveAlarms(alarms: Sched[], time?: Date): Sched[];
+
+  function setAlarm(id: string, alarm?: NewSched): void;
+
+  function getTimeToAlarm(alarm: Sched | undefined | null, time?: Date): number | undefined;
+  function getTimeToAlarm(alarm?: undefined | null, time?: Date): undefined;
+
+  function reload(): void;
+
+  function newDefaultAlarm(): DefaultAlarm;
+
+  function newDefaultTimer(): DefaultTimer;
+
+  function getSettings(): SchedSettings;
+
+  function setSettings(settings: SchedSettings): void;
+}
diff --git a/typescript/types/settings.d.ts b/typescript/types/settings.d.ts
new file mode 100644
index 000000000..a46b6ace7
--- /dev/null
+++ b/typescript/types/settings.d.ts
@@ -0,0 +1,51 @@
+type Settings = {
+	beep: boolean,
+	vibrate: boolean,
+	quiet: number,
+
+	ble: boolean,
+	blerepl: boolean,
+	HID?: false | "kbmedia" | "kb" | "com" | "joy",
+
+	passkey?: string,
+	whitelist_disabled?: boolean,
+	whitelist: string[],
+
+	theme: Theme,
+
+	brightness: number,
+	timeout: number,
+	rotate: number,
+
+	options: SettingsOptions,
+
+	timezone: number,
+	log: number,
+
+	clock: string,
+	clockHasWidgets: boolean,
+	launcher: string,
+};
+
+type SettingsTheme = {
+	fg: string,
+	bg: string,
+	fg2: string,
+	bg2: string,
+	fgH: string,
+	bgH: string,
+	dark: boolean,
+};
+
+type SettingsOptions = {
+	wakeOnBTN1: boolean,
+	wakeOnBTN2: boolean,
+	wakeOnBTN3: boolean,
+	wakeOnFaceUp: boolean,
+	wakeOnTouch: boolean,
+
+	wakeOnTwist: boolean,
+	twistThreshold: number,
+	twistMaxY: number,
+	twistTimeout: number,
+};
