From e409ada3471a8a9cefe389c909a837be56284ede Mon Sep 17 00:00:00 2001
From: Weiming <weiming@psu.edu>
Date: Mon, 7 Jun 2021 16:40:23 -0400
Subject: [PATCH 01/37] Update ChangeLog

---
 apps/gpsrec/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/gpsrec/ChangeLog b/apps/gpsrec/ChangeLog
index 412dbe9d3..c71a29482 100644
--- a/apps/gpsrec/ChangeLog
+++ b/apps/gpsrec/ChangeLog
@@ -21,3 +21,4 @@
 0.17: Disable recording if storage is full (fix #574)
 0.18: Period counter now uses GPS time rather than counting packets (allows use with GPS Setup)
 0.19: Fix memory usage issues inside track viewer app
+0.20: Add documentation to explain time needed for getting a time fix

From 3df0e9d64c6eb917b638e1c622585bcad3510c19 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Thu, 10 Jun 2021 20:18:21 +0200
Subject: [PATCH 02/37] remove duplicate omnitrix "readme" key from apps.json
 (no code change)

---
 apps.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps.json b/apps.json
index f5b4c47a6..aee81676b 100644
--- a/apps.json
+++ b/apps.json
@@ -3212,7 +3212,6 @@
   "readme": "README.md",
   "description": "An Omnitrix Showpiece",
   "tags": "game",
-  "readme": "README.md",
   "storage": [
     {"name":"omnitrix.app.js","url":"omnitrix.app.js"},
     {"name":"omnitrix.img","url":"omnitrix.icon.js","evaluate":true}

From 002f861038674221327a50c256bcea881d3e0ab0 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Thu, 10 Jun 2021 20:17:03 +0200
Subject: [PATCH 03/37] barclock: use timeout to tick exactly on the second,
 instead of interval

---
 apps.json                  |  2 +-
 apps/barclock/ChangeLog    |  3 ++-
 apps/barclock/clock-bar.js | 18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps.json b/apps.json
index aee81676b..c10395020 100644
--- a/apps.json
+++ b/apps.json
@@ -1312,7 +1312,7 @@
   { "id": "barclock",
     "name": "Bar Clock",
     "icon": "clock-bar.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "A simple digital clock showing seconds as a bar",
     "tags": "clock",
     "type":"clock",
diff --git a/apps/barclock/ChangeLog b/apps/barclock/ChangeLog
index 616ee66e9..551926191 100644
--- a/apps/barclock/ChangeLog
+++ b/apps/barclock/ChangeLog
@@ -2,4 +2,5 @@
 0.02: Apply locale, 12-hour setting
 0.03: Fix dates drawing over each other at midnight
 0.04: Small bugfix
-0.05: Clock does not start if app Languages is not installed
\ No newline at end of file
+0.05: Clock does not start if app Languages is not installed
+0.06: Improve accuracy
\ No newline at end of file
diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 0f2609298..4bb6c048a 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -12,12 +12,12 @@
     date.setMonth(1, 3) // februari: months are zero-indexed
     const localized = locale.date(date, true)
     locale.dayFirst = /3.*2/.test(localized)
-    
+
     locale.hasMeridian = false
     if(typeof locale.meridian === 'function') {  // function does not exists if languages  app is not installed
       locale.hasMeridian = (locale.meridian(date) !== '')
     }
-    
+
   }
   const screen = {
     width: g.getWidth(),
@@ -124,7 +124,7 @@
     g.fillRect(0, timeTop, screen.width, screen.height)
   }
 
-  let lastSeconds
+  let lastSeconds, tTick
   const tick = function () {
     g.reset()
     const date = new Date()
@@ -136,20 +136,20 @@
     }
     // the bar only gets larger, so drawing on top of the previous one is fine
     drawBar(date)
-
     lastSeconds = seconds
+    // schedule next update
+    const millis = date.getMilliseconds()
+    tTick = setTimeout(tick, 1000-millis)
   }
 
-  let iTick
   const start = function () {
     lastSeconds = 99 // force redraw
     tick()
-    iTick = setInterval(tick, 1000)
   }
   const stop = function () {
-    if (iTick) {
-      clearInterval(iTick)
-      iTick = undefined
+    if (tTick) {
+      clearTimeout(tTick)
+      tTick = undefined
     }
   }
 

From c6bafb6b0a1cd7f6efa71a800c41e5b67229c740 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Thu, 10 Jun 2021 20:46:02 +0200
Subject: [PATCH 04/37] barclock: add readme with screenshots

---
 apps.json                       |   1 +
 apps/barclock/README.md         |   6 ++++++
 apps/barclock/screenshot.png    | Bin 0 -> 2764 bytes
 apps/barclock/screenshot_pm.png | Bin 0 -> 2595 bytes
 4 files changed, 7 insertions(+)
 create mode 100644 apps/barclock/README.md
 create mode 100644 apps/barclock/screenshot.png
 create mode 100644 apps/barclock/screenshot_pm.png

diff --git a/apps.json b/apps.json
index c10395020..31c791c86 100644
--- a/apps.json
+++ b/apps.json
@@ -1316,6 +1316,7 @@
     "description": "A simple digital clock showing seconds as a bar",
     "tags": "clock",
     "type":"clock",
+    "readme": "README.md",
     "allow_emulator":true,
     "storage": [
       {"name":"barclock.app.js","url":"clock-bar.js"},
diff --git a/apps/barclock/README.md b/apps/barclock/README.md
new file mode 100644
index 000000000..4b92313c5
--- /dev/null
+++ b/apps/barclock/README.md
@@ -0,0 +1,6 @@
+# Bar Clock
+A simple digital clock showing seconds as a horizontal bar.
+
+| 24hr style | 12hr style |
+| --- | --- |
+| ![24-hour bar clock](screenshot.png) | ![12-hour bar clock with meridian](screenshot_pm.png) |
diff --git a/apps/barclock/screenshot.png b/apps/barclock/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..d37ee9cae2680e73889600e8eb29f87ba2956f87
GIT binary patch
literal 2764
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
G)xQ8u1KXki

literal 0
HcmV?d00001

diff --git a/apps/barclock/screenshot_pm.png b/apps/barclock/screenshot_pm.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2a3f63fb30e157b24f6a281b4e42bdb9064aa66
GIT binary patch
literal 2595
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

literal 0
HcmV?d00001


From ca12134ffe2a4ee3b464b49d1f497ca842a9e7af Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 11 Jun 2021 11:14:52 +0100
Subject: [PATCH 05/37] lock alignment

---
 apps/widlock/widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/widlock/widget.js b/apps/widlock/widget.js
index b710de8c6..ea664a083 100644
--- a/apps/widlock/widget.js
+++ b/apps/widlock/widget.js
@@ -5,6 +5,6 @@
   });
   WIDGETS["lock"]={area:"tl",width:Bangle.isLCDOn()?0:16,draw:function(w) {
     if (!Bangle.isLCDOn())
-      g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x, w.y);
+      g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
   }};
 })()

From 45b5ab231a5875e131a8f494f1701d0e39f84c6a Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 11 Jun 2021 11:15:18 +0100
Subject: [PATCH 06/37] minor colour change to help with rounding on 3bpp

---
 apps/widid/widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/widid/widget.js b/apps/widid/widget.js
index 68917c65a..d4f4d6386 100644
--- a/apps/widid/widget.js
+++ b/apps/widid/widget.js
@@ -2,7 +2,7 @@
 (() => {
   function draw() {
     var id = NRF.getAddress().substr().substr(12).split(":");
-    g.reset().setColor(0, 0.5, 1).setFont("6x8", 1);
+    g.reset().setColor(0, 0.49, 1).setFont("6x8", 1);
     g.drawString(id[0], this.x+2, this.y+4, true);
     g.drawString(id[1], this.x+2, this.y+14, true);
   }

From 7a287c497e17b8389ea683218de13edd22f6d822 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 11 Jun 2021 11:34:05 +0100
Subject: [PATCH 07/37] Add option for 3 bit maps, scrolling support

---
 apps.json                   |  2 +-
 apps/openstmap/ChangeLog    |  1 +
 apps/openstmap/app.js       | 16 +++++++++++++++-
 apps/openstmap/custom.html  | 11 +++++++++++
 apps/openstmap/openstmap.js | 15 ++++++++++-----
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/apps.json b/apps.json
index f5b4c47a6..a02aec925 100644
--- a/apps.json
+++ b/apps.json
@@ -1462,7 +1462,7 @@
     "name": "OpenStreetMap",
     "shortName":"OpenStMap",
     "icon": "app.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "[BETA] Loads map tiles from OpenStreetMap onto your Bangle.js and displays a map of where you are",
     "tags": "outdoors,gps",
     "custom": "custom.html",
diff --git a/apps/openstmap/ChangeLog b/apps/openstmap/ChangeLog
index 64b39b509..4d9b61031 100644
--- a/apps/openstmap/ChangeLog
+++ b/apps/openstmap/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Show widgets (mainly so we can use the GPS recorder widget)
 0.04: Move map rendering to a module (fix #396)
 0.05: Show currently active gpsrec GPS trace (fix #395)
+0.06: Add support for scrolling, option for 3 bit maps
diff --git a/apps/openstmap/app.js b/apps/openstmap/app.js
index 940557361..5a01a9059 100644
--- a/apps/openstmap/app.js
+++ b/apps/openstmap/app.js
@@ -34,7 +34,7 @@ Bangle.on('GPS',function(f) {
   g.drawString(txt,120,y1 + 4);
   drawMarker();
 });
-Bangle.setGPSPower(1);
+Bangle.setGPSPower(1, "app");
 
 if (HASWIDGETS) {
   Bangle.loadWidgets();
@@ -55,3 +55,17 @@ setWatch(function() {
   m.lon = fix.lon;
   redraw();
 }, BTN2, {repeat:true});
+
+var hasScrolled = false;
+E.on('touch',e=>{
+  if (e.b) {
+    g.setClipRect(0,y1,g.getWidth()-1,y2);
+    g.scroll(e.dx,e.dy);
+    m.scroll(e.dx,e.dy);
+    g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+    hasScrolled = true;
+  } else if (hasScrolled) {
+    hasScrolled = false;
+    redraw();
+  }
+});
diff --git a/apps/openstmap/custom.html b/apps/openstmap/custom.html
index 81a55a4f8..95a4ff0a6 100644
--- a/apps/openstmap/custom.html
+++ b/apps/openstmap/custom.html
@@ -32,6 +32,7 @@
     <div id="map">
     </div>
     <div id="controls">
+      <div style="display:inline-block;text-align:center;vertical-align: top;"> <input type="checkbox" id="3bit"></input><br/><span>3 bit</span></div>
       <button id="getmap" class="btn btn-primary">Get Map</button><br/>
       <canvas id="maptiles" style="display:none"></canvas>
       <div id="uploadbuttons" style="display:none"><button id="upload" class="btn btn-primary">Upload</button>
@@ -49,6 +50,7 @@
 
 TODO:
 
+* Allow a larger tilesize. Currently we use 'evaluate:true' which means we can only send 64x64x8 bit, but with some tweaking we could send 128x128 which would reduce the number of files and make things a bit snappier
 * Could maybe use palettised output?
 * Could potentially use a custom 16 color palette?
 * Allow user to choose size of map area to be uploaded (small/med/large)
@@ -75,6 +77,15 @@ TODO:
 
       function tilesLoaded(ctx, width, height) {
         var options = { compression:true, mode:"web", output:"string"};
+        if (document.getElementById("3bit").checked) {
+          options = {
+            compression:true,
+            //mode:"web",
+            mode:"3bit", brightness:-64,
+            output:"string"
+          };
+        }
+        console.log("Compression options", options);
         var w = Math.round(width / TILESIZE);
         var h = Math.round(height / TILESIZE);
         var tiles = [];
diff --git a/apps/openstmap/openstmap.js b/apps/openstmap/openstmap.js
index 0ca06a6f3..554a71ca3 100644
--- a/apps/openstmap/openstmap.js
+++ b/apps/openstmap/openstmap.js
@@ -45,15 +45,12 @@ exports.draw = function() {
     for (var y=oy,tty=ty;y<g.getHeight();y+=map.tilesize,tty++) {
       var img = s.read("openstmap-"+ttx+"-"+tty+".img");
       if (img) g.drawImage(img,x,y);
-      else {
-        g.clearRect(x,y,x+map.tilesize-1,y+map.tilesize-1);
-        g.drawLine(x,y,x+map.tilesize-1,y+map.tilesize-1);
-        g.drawLine(x,y+map.tilesize-1,x+map.tilesize-1,y);
-      }
+      else g.clearRect(x,y,x+map.tilesize-1,y+map.tilesize-1).drawLine(x,y,x+map.tilesize-1,y+map.tilesize-1).drawLine(x,y+map.tilesize-1,x+map.tilesize-1,y);
     }
   }
 };
 
+/// Convert lat/lon to pixels on the screen
 exports.latLonToXY = function(lat, lon) {
   var p = Bangle.project({lat:m.lat,lon:m.lon});
   var q = Bangle.project({lat:lat, lon:lon});
@@ -64,3 +61,11 @@ exports.latLonToXY = function(lat, lon) {
     y : cy - (q.y-p.y)*4096/map.scale
   };
 };
+
+/// Given an amount to scroll in pixels on the screen, adjust the lat/lon of the map to match
+exports.scroll = function(x,y) {
+  var a = Bangle.project({lat:this.lat,lon:this.lon});
+  var b = Bangle.project({lat:this.lat+1,lon:this.lon+1});
+  this.lon += x * this.map.scale / ((a.x-b.x) * 4096);
+  this.lat -= y * this.map.scale / ((a.y-b.y) * 4096);
+};

From 89306a9c047b40dee8c7a6f9c2d56782a1192859 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 11 Jun 2021 11:35:15 +0100
Subject: [PATCH 08/37] new image converter

---
 core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core b/core
index 3f2ff467f..09133e199 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 3f2ff467f22b746da94160e59ff89b621601b261
+Subproject commit 09133e1991c6430e93f1cab61704614649fc3f5e

From 2a209cb66a55993d3fd097bca9e18aba59640974 Mon Sep 17 00:00:00 2001
From: Weiming <cosmos.weiming@outlook.com>
Date: Fri, 11 Jun 2021 19:30:55 -0400
Subject: [PATCH 09/37] add doc for GPS fix

---
 apps.json             |  3 ++-
 apps/gpsrec/README.md | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 apps/gpsrec/README.md

diff --git a/apps.json b/apps.json
index c5e6d8aef..3bce6e104 100644
--- a/apps.json
+++ b/apps.json
@@ -457,10 +457,11 @@
   { "id": "gpsrec",
     "name": "GPS Recorder",
     "icon": "app.png",
-    "version":"0.19",
+    "version":"0.20",
     "interface": "interface.html",
     "description": "Application that allows you to record a GPS track. Can run in background",
     "tags": "tool,outdoors,gps,widget",
+    "readme": "README.md",
     "storage": [
       {"name":"gpsrec.app.js","url":"app.js"},
       {"name":"gpsrec.img","url":"app-icon.js","evaluate":true},
diff --git a/apps/gpsrec/README.md b/apps/gpsrec/README.md
new file mode 100644
index 000000000..ae6c159f0
--- /dev/null
+++ b/apps/gpsrec/README.md
@@ -0,0 +1,10 @@
+# GPS Recorder
+
+![icon](app.png)
+
+This app allows you to record a GPS track. It can run in background. The data can later be exported as KML or GPX files via the BangleJS app store.
+
+## Tips
+
+When you turn on recording, a widget badge that looks like a satellite will appear immediately at the top of the screen. However, the recording does not begin immediately. It usually takes several minutes for the watch to get a [GPS fix](https://en.wikipedia.org/wiki/Time_to_first_fix). You will notice a blinking question mark at the lower left of the badge indicating currently getting a fix. The badge will change when a GPS fix is achieved and that is when the app actually starts writing data to the log file.
+

From 664632f9a0ec4b1575f441c0ecff7b5b532f373c Mon Sep 17 00:00:00 2001
From: Weiming <cosmos.weiming@outlook.com>
Date: Fri, 11 Jun 2021 19:34:27 -0400
Subject: [PATCH 10/37] add tips

---
 apps/gpsrec/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gpsrec/README.md b/apps/gpsrec/README.md
index ae6c159f0..72f744452 100644
--- a/apps/gpsrec/README.md
+++ b/apps/gpsrec/README.md
@@ -6,5 +6,5 @@ This app allows you to record a GPS track. It can run in background. The data ca
 
 ## Tips
 
-When you turn on recording, a widget badge that looks like a satellite will appear immediately at the top of the screen. However, the recording does not begin immediately. It usually takes several minutes for the watch to get a [GPS fix](https://en.wikipedia.org/wiki/Time_to_first_fix). You will notice a blinking question mark at the lower left of the badge indicating currently getting a fix. The badge will change when a GPS fix is achieved and that is when the app actually starts writing data to the log file.
+When you turn on recording, a widget badge that looks like a satellite will appear immediately at the top of the screen. However, the recording does not begin immediately. It usually takes several minutes for the watch to get a [GPS fix](https://en.wikipedia.org/wiki/Time_to_first_fix). You will notice a blinking question mark at the lower left of the badge indicating currently getting a fix. The badge will change when a GPS fix is achieved and that is when the app actually starts writing data to the log file. You can [upload assistant files](https://banglejs.com/apps/#assisted%20gps%20update) to speed up the time spent on getting a GPS fix.
 

From 5d93dc0a97b726e0b93ce70571d2895a388b0740 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 14 Jun 2021 16:41:09 +0100
Subject: [PATCH 11/37] Add simple thermometer

---
 apps.json                |  12 ++++++++++++
 apps/thermom/app-icon.js |   1 +
 apps/thermom/app.js      |  28 ++++++++++++++++++++++++++++
 apps/thermom/app.png     | Bin 0 -> 567 bytes
 4 files changed, 41 insertions(+)
 create mode 100644 apps/thermom/app-icon.js
 create mode 100644 apps/thermom/app.js
 create mode 100644 apps/thermom/app.png

diff --git a/apps.json b/apps.json
index c5e6d8aef..285d0315d 100644
--- a/apps.json
+++ b/apps.json
@@ -3262,6 +3262,18 @@
     {"name":"gbtwist.img","url":"app-icon.js","evaluate":true}
   ]
 },
+{ "id": "thermom",
+  "name": "Thermometer",
+  "icon": "app.png",
+  "version":"0.02",
+  "description": "Displays the current temperature, updated every 20 seconds",
+  "tags": "tool",
+  "allow_emulator":true,
+  "storage": [
+    {"name":"thermom.app.js","url":"app.js"},
+    {"name":"thermom.img","url":"app-icon.js","evaluate":true}
+  ]
+},
 { "id": "mysticdock",
   "name": "Mystic Dock",
   "icon": "mystic-dock.png",
diff --git a/apps/thermom/app-icon.js b/apps/thermom/app-icon.js
new file mode 100644
index 000000000..ad4a8131e
--- /dev/null
+++ b/apps/thermom/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwYurgP/8AROh///gROv///+ACOtJkARhI/5H/I98SpMkwMkCZgRUGqJH/I/5HeyQRByAQMggRCyQRMBwIRCoARcgIREpAR/CMiPjYqTpRgECCIIQNADo="))
diff --git a/apps/thermom/app.js b/apps/thermom/app.js
new file mode 100644
index 000000000..baa38e8ec
--- /dev/null
+++ b/apps/thermom/app.js
@@ -0,0 +1,28 @@
+function onTemperature(p) {
+  g.reset(1).clearRect(0,24,g.getWidth(),g.getHeight());
+  g.setFont("6x8",2).setFontAlign(0,0);
+  var x = g.getWidth()/2;
+  var y = g.getHeight()/2 + 10;
+  g.drawString("Temperature", x, y - 45);
+  g.setFontVector(70).setFontAlign(0,0);
+  g.drawString(p.temperature.toFixed(1), x, y);
+}
+
+function drawTemperature() {
+  if (Bangle.getPressure) {
+    Bangle.getPressure().then(onTemperature);
+  } else {
+    onTemperature({
+      temperature : E.getTemperature()
+    });
+  }
+}
+
+
+setInterval(function() {
+  drawTemperature();
+}, 20000);
+drawTemperature();
+E.showMessage("Loading...");
+Bangle.loadWidgets();
+Bangle.drawWidgets();
\ No newline at end of file
diff --git a/apps/thermom/app.png b/apps/thermom/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b899db75db4365d10c290fc7917dbd51efdade2
GIT binary patch
literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0qjXcK~!jg?U}(!8&MR7zdMGyQc&nJZ4noOggii1YN;*pHMB1vUGya+
zB36Xf=MY*`1nIIMXbM6WqDw&+ZC&V$r;AQBMv3O0V{c3Ew@YTu{pQTMe}*Iw35&B{
zaJ$hcW~o#K_cDL0mXN$Hj|}ZvyTG`C?M9=Rrm_WYu<g)sp+LDbJbYm314t|v%TlS{
zaPa^GY3k-JT}@0IXxTP59eri#YGT>|(AVKuzp)E|!hI}y8#0cxzIL1bS+t(OA1BBJ
zG<Uq6H~}AG23m+22u;jDXkrFJWBPrdeQ#fr<#+z!>y0bt9ln3||7IY_1T6XIClKUQ
zC}yCAn1Rs541^|TAT%ZoNQGV*XZhCi##oY39#}Y=s7ERldil;8j>$WgeCCLXt8=P#
zgT(}Xu+YWD13YICvmbg@6Oai?2wQZ2BQnk@yD!u=emunO%zCcTL&A*G4W9B#gcpk1
zDU~}%JAp^um5#?sH=u8z<AduSYcJ3?;QybOu&;Cj`V4&Xu62A=xpQ<46!-vS9+ere
zs&eP38gLuzAgpv>$UC>mH;ucA{z-hy98l|`Vx6D7QG0XL4Y)d|95D?n(Rn*%I2Ji!
z+I{6r>%H(>Ed(G>86{x`VG75S-*2*)2X@tJ+eH2*egP1$e;`eaz19E#002ovPDHLk
FV1gQM`Qrcp

literal 0
HcmV?d00001


From d40c64a805ae06002c77e6f4ba0f5073799fd142 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 17 Jun 2021 14:13:38 +0100
Subject: [PATCH 12/37] Reset file modes

---
 apps/banglerun/ChangeLog                            |   0
 apps/buffgym/buffgym-scrn1.png                      | Bin
 apps/buffgym/buffgym-scrn2.png                      | Bin
 apps/buffgym/buffgym-scrn3.png                      | Bin
 apps/buffgym/buffgym-scrn4.png                      | Bin
 apps/buffgym/buffgym-scrn5.png                      | Bin
 apps/buffgym/buffgym-scrn6.png                      | Bin
 apps/buffgym/buffgym.app.js                         |   0
 apps/buffgym/buffgym.png                            | Bin
 apps/dotmatrixclock/app.js                          |   0
 apps/dotmatrixclock/dotmatrix-clock-screen-shot.png | Bin
 apps/dotmatrixclock/dotmatrixclock.png              | Bin
 apps/marioclock/mario-clock-screen-shot.png         | Bin
 apps/miclock/clock-mixed.png                        | Bin
 apps/miclock2/clock-mixed.png                       | Bin
 apps/minionclk/ChangeLog                            |   0
 apps/minionclk/app-icon.js                          |   0
 apps/minionclk/app.js                               |   0
 apps/minionclk/minionclk.png                        | Bin
 apps/rpgdice/ChangeLog                              |   0
 apps/rpgdice/app-icon.js                            |   0
 apps/rpgdice/app.js                                 |   0
 apps/rpgdice/rpgdice.png                            | Bin
 apps/sclock/clock-simple.png                        | Bin
 apps/scolor/show-color.png                          | Bin
 apps/worldclock/app.png                             | Bin
 26 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 apps/banglerun/ChangeLog
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn1.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn2.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn3.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn4.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn5.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn6.png
 mode change 100755 => 100644 apps/buffgym/buffgym.app.js
 mode change 100755 => 100644 apps/buffgym/buffgym.png
 mode change 100755 => 100644 apps/dotmatrixclock/app.js
 mode change 100755 => 100644 apps/dotmatrixclock/dotmatrix-clock-screen-shot.png
 mode change 100755 => 100644 apps/dotmatrixclock/dotmatrixclock.png
 mode change 100755 => 100644 apps/marioclock/mario-clock-screen-shot.png
 mode change 100755 => 100644 apps/miclock/clock-mixed.png
 mode change 100755 => 100644 apps/miclock2/clock-mixed.png
 mode change 100755 => 100644 apps/minionclk/ChangeLog
 mode change 100755 => 100644 apps/minionclk/app-icon.js
 mode change 100755 => 100644 apps/minionclk/app.js
 mode change 100755 => 100644 apps/minionclk/minionclk.png
 mode change 100755 => 100644 apps/rpgdice/ChangeLog
 mode change 100755 => 100644 apps/rpgdice/app-icon.js
 mode change 100755 => 100644 apps/rpgdice/app.js
 mode change 100755 => 100644 apps/rpgdice/rpgdice.png
 mode change 100755 => 100644 apps/sclock/clock-simple.png
 mode change 100755 => 100644 apps/scolor/show-color.png
 mode change 100755 => 100644 apps/worldclock/app.png

diff --git a/apps/banglerun/ChangeLog b/apps/banglerun/ChangeLog
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn1.png b/apps/buffgym/buffgym-scrn1.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn2.png b/apps/buffgym/buffgym-scrn2.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn3.png b/apps/buffgym/buffgym-scrn3.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn4.png b/apps/buffgym/buffgym-scrn4.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn5.png b/apps/buffgym/buffgym-scrn5.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn6.png b/apps/buffgym/buffgym-scrn6.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym.app.js b/apps/buffgym/buffgym.app.js
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym.png b/apps/buffgym/buffgym.png
old mode 100755
new mode 100644
diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
old mode 100755
new mode 100644
diff --git a/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png b/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png
old mode 100755
new mode 100644
diff --git a/apps/dotmatrixclock/dotmatrixclock.png b/apps/dotmatrixclock/dotmatrixclock.png
old mode 100755
new mode 100644
diff --git a/apps/marioclock/mario-clock-screen-shot.png b/apps/marioclock/mario-clock-screen-shot.png
old mode 100755
new mode 100644
diff --git a/apps/miclock/clock-mixed.png b/apps/miclock/clock-mixed.png
old mode 100755
new mode 100644
diff --git a/apps/miclock2/clock-mixed.png b/apps/miclock2/clock-mixed.png
old mode 100755
new mode 100644
diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog
old mode 100755
new mode 100644
diff --git a/apps/minionclk/app-icon.js b/apps/minionclk/app-icon.js
old mode 100755
new mode 100644
diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
old mode 100755
new mode 100644
diff --git a/apps/minionclk/minionclk.png b/apps/minionclk/minionclk.png
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/ChangeLog b/apps/rpgdice/ChangeLog
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/app-icon.js b/apps/rpgdice/app-icon.js
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/app.js b/apps/rpgdice/app.js
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/rpgdice.png b/apps/rpgdice/rpgdice.png
old mode 100755
new mode 100644
diff --git a/apps/sclock/clock-simple.png b/apps/sclock/clock-simple.png
old mode 100755
new mode 100644
diff --git a/apps/scolor/show-color.png b/apps/scolor/show-color.png
old mode 100755
new mode 100644
diff --git a/apps/worldclock/app.png b/apps/worldclock/app.png
old mode 100755
new mode 100644

From ac751105047f71923d07accd800653c509d15259 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 17 Jun 2021 14:14:09 +0100
Subject: [PATCH 13/37] widlock: Handle new firmwares with 'lock' event

---
 apps.json              |  2 +-
 apps/widlock/ChangeLog |  1 +
 apps/widlock/widget.js | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps.json b/apps.json
index ba8f7fece..aef51980f 100644
--- a/apps.json
+++ b/apps.json
@@ -587,7 +587,7 @@
   { "id": "widlock",
     "name": "Lock Widget",
     "icon": "widget.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked",
     "tags": "widget,lock",
     "type":"widget",
diff --git a/apps/widlock/ChangeLog b/apps/widlock/ChangeLog
index b4d1ae593..4c101acb8 100644
--- a/apps/widlock/ChangeLog
+++ b/apps/widlock/ChangeLog
@@ -1 +1,2 @@
 0.01: First commit
+0.02: Handle new firmwares with 'lock' event
diff --git a/apps/widlock/widget.js b/apps/widlock/widget.js
index ea664a083..b8c3336dc 100644
--- a/apps/widlock/widget.js
+++ b/apps/widlock/widget.js
@@ -1,10 +1,12 @@
 (function(){
-  Bangle.on('lcdPower', function(on) {
-    WIDGETS["lock"].width = Bangle.isLCDOn()?0:16;
+  Bangle.on(Bangle.isLocked?'lock':'lcdPower', function(on) {
+    WIDGETS["lock"].width = Bangle.isLocked()?0:16;
     Bangle.drawWidgets();
   });
-  WIDGETS["lock"]={area:"tl",width:Bangle.isLCDOn()?0:16,draw:function(w) {
-    if (!Bangle.isLCDOn())
+  if (Bangle.isLocked===undefined)
+    Bangle.isLocked = Bangle.isLCDOn;
+  WIDGETS["lock"]={area:"tl",width:Bangle.isLocked()?0:16,draw:function(w) {
+    if (!Bangle.isLocked())
       g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
   }};
 })()

From aaadbd89f2a8e0d47014357c125967adb581de5d Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Fri, 18 Jun 2021 19:27:50 +0200
Subject: [PATCH 14/37] fix #762: Adjust "weather unknown" message according to
 Bluetooth status

Also make weather setup instructions more explicit.
---
 apps.json              | 2 +-
 apps/weather/ChangeLog | 3 ++-
 apps/weather/app.js    | 8 ++++++--
 apps/weather/readme.md | 8 ++++----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps.json b/apps.json
index aef51980f..96a224d6e 100644
--- a/apps.json
+++ b/apps.json
@@ -531,7 +531,7 @@
   { "id": "weather",
     "name": "Weather",
     "icon": "icon.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "Show Gadgetbridge weather report",
     "readme": "readme.md",
     "tags": "widget,outdoors",
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index 5e27e1bf4..d202a5562 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Make minor adjustments to widget, and discard stale weather data after a configurable period.
-0.03: Fix flickering last updated time.
\ No newline at end of file
+0.03: Fix flickering last updated time.
+0.04: Adjust "weather unknown" message according to Bluetooth connection.
\ No newline at end of file
diff --git a/apps/weather/app.js b/apps/weather/app.js
index ea8936886..288f0a3e3 100644
--- a/apps/weather/app.js
+++ b/apps/weather/app.js
@@ -56,10 +56,14 @@
   }
 
   function update() {
+    NRF.removeListener("connect", update);
     if (weather.current) {
       draw();
+    } else if (NRF.getSecurityStatus().connected) {
+      E.showMessage("Weather unknown\n\nIs Gadgetbridge\nweather reporting\nset up on your\nphone?");
     } else {
-      E.showMessage('Weather unknown\n\nIs Gadgetbridge\nconnected?');
+      E.showMessage("Weather unknown\n\nGadgetbridge\nnot connected");
+      NRF.on("connect", update);
     }
   }
 
@@ -77,7 +81,7 @@
 
   weather.on("update", update);
 
-  update(weather.current);
+  update();
 
   // Show launcher when middle button pressed
   setWatch(Bangle.showLauncher, BTN2, {repeat: false, edge: 'falling'});
diff --git a/apps/weather/readme.md b/apps/weather/readme.md
index a326b67dd..e2fb886b7 100644
--- a/apps/weather/readme.md
+++ b/apps/weather/readme.md
@@ -1,15 +1,15 @@
 # Weather
 
-Shows Gadgetbridge weather reports.
+This allows your Bangle.js to display weather reports from the Gadgetbridge app on an Android phone.
 
-This adds a widget with a weather pictogram and the temperature.   
+It adds a widget with a weather pictogram and the temperature.   
 You can view the full report through the app:   
 ![Screenshot](screenshot.png)
 
 ## Setup
 
-See [this guide](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Weather) 
-to setup Gadgetbridge weather reporting.
+1. Install [Gadgetbridge for Android](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/) on your phone.
+2. Set up [Gadgetbridge weather reporting](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Weather).
 
 ## Controls
 

From 863923a3aa7502ceafdcea7bfd15df8d1634df21 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Fri, 18 Jun 2021 20:16:00 +0200
Subject: [PATCH 15/37] fix #485: weather: add wind direction

---
 apps.json                   |   2 +-
 apps/weather/ChangeLog      |   3 ++-
 apps/weather/app.js         |   8 ++++++--
 apps/weather/lib.js         |  17 +++++++++++++++++
 apps/weather/screenshot.png | Bin 4039 -> 4296 bytes
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/apps.json b/apps.json
index 96a224d6e..cb40456fe 100644
--- a/apps.json
+++ b/apps.json
@@ -531,7 +531,7 @@
   { "id": "weather",
     "name": "Weather",
     "icon": "icon.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "Show Gadgetbridge weather report",
     "readme": "readme.md",
     "tags": "widget,outdoors",
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index d202a5562..8d8585db9 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Make minor adjustments to widget, and discard stale weather data after a configurable period.
 0.03: Fix flickering last updated time.
-0.04: Adjust "weather unknown" message according to Bluetooth connection.
\ No newline at end of file
+0.04: Adjust "weather unknown" message according to Bluetooth connection.
+0.05: Add wind direction.
\ No newline at end of file
diff --git a/apps/weather/app.js b/apps/weather/app.js
index 288f0a3e3..6ea043467 100644
--- a/apps/weather/app.js
+++ b/apps/weather/app.js
@@ -30,10 +30,14 @@
     g.setFont("6x8", 1);
     g.setFontAlign(-1, 0, 0);
     g.drawString("Humidity", 135, 130);
-    g.drawString("Wind", 135, 142);
     g.setFontAlign(1, 0, 0);
     g.drawString(w.hum+"%", 225, 130);
-    g.drawString(locale.speed(w.wind), 225, 142);
+    if ('wind' in w) {
+      g.setFontAlign(-1, 0, 0);
+      g.drawString("Wind", 135, 142);
+      g.setFontAlign(1, 0, 0);
+      g.drawString(locale.speed(w.wind)+' '+w.wrose.toUpperCase(), 225, 142);
+    }
 
     g.setFont("6x8", 2).setFontAlign(0, 0, 0);
     g.drawString(w.loc, 120, 170);
diff --git a/apps/weather/lib.js b/apps/weather/lib.js
index fffc523ca..597eac105 100644
--- a/apps/weather/lib.js
+++ b/apps/weather/lib.js
@@ -22,6 +22,20 @@ function scheduleExpiry(json) {
   }
 }
 
+/**
+ * Convert numeric direction into human-readable label
+ *
+ * @param {number} deg - Direction in degrees
+ * @return {string|null} - Nearest compass point
+ */
+function compassRose(deg) {
+  if (typeof deg === 'undefined') return null;
+  while (deg<0 || deg>360) {
+    deg = (deg+360)%360;
+  }
+  return ['n','ne','e','se','s','sw','w','nw','n'][Math.floor((deg+22.5)/45)];
+}
+
 function setCurrentWeather(json) {
   scheduleExpiry(json);
   exports.current = json.weather;
@@ -30,6 +44,9 @@ function setCurrentWeather(json) {
 function update(weatherEvent) {
   let weather = Object.assign({}, weatherEvent);
   weather.time = Date.now();
+  if ('wdir' in weather) {
+    weather.wrose = compassRose(weather.wdir);
+  }
   delete weather.t;
 
   let json = storage.readJSON('weather.json')||{};
diff --git a/apps/weather/screenshot.png b/apps/weather/screenshot.png
index ce79b3b646bfebdad6c29f57779c018ce0ce457e..0cd6de46aa209adb623fb1a5c89cd448883b0b15 100644
GIT binary patch
literal 4296
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
OU}l#rE>aAg?)@JQE$p2D

literal 4039
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
Fe*nCRR)+up


From 5aa11ef71e78d965445993ddbb037e2187dcda61 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 21 Jun 2021 09:23:09 +0100
Subject: [PATCH 16/37] 0.21: Fix issue where a period of 1s recorded every 2s,
 5s every 6s, and so on

---
 apps.json             | 2 +-
 apps/gpsrec/ChangeLog | 1 +
 apps/gpsrec/widget.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index aef51980f..a6e16bc5d 100644
--- a/apps.json
+++ b/apps.json
@@ -457,7 +457,7 @@
   { "id": "gpsrec",
     "name": "GPS Recorder",
     "icon": "app.png",
-    "version":"0.20",
+    "version":"0.21",
     "interface": "interface.html",
     "description": "Application that allows you to record a GPS track. Can run in background",
     "tags": "tool,outdoors,gps,widget",
diff --git a/apps/gpsrec/ChangeLog b/apps/gpsrec/ChangeLog
index c71a29482..e3360d67b 100644
--- a/apps/gpsrec/ChangeLog
+++ b/apps/gpsrec/ChangeLog
@@ -22,3 +22,4 @@
 0.18: Period counter now uses GPS time rather than counting packets (allows use with GPS Setup)
 0.19: Fix memory usage issues inside track viewer app
 0.20: Add documentation to explain time needed for getting a time fix
+0.21: Fix issue where a period of 1s recorded every 2s, 5s every 6s, and so on
diff --git a/apps/gpsrec/widget.js b/apps/gpsrec/widget.js
index 8e4286db5..cbc244a96 100644
--- a/apps/gpsrec/widget.js
+++ b/apps/gpsrec/widget.js
@@ -29,7 +29,7 @@
       var period = 1000000;
       if (lastFixTime!==undefined)
         period = fix.time.getTime() - lastFixTime;
-      if (period > settings.period*1000) {
+      if (period+500 > settings.period*1000) { // round up
         lastFixTime = fix.time.getTime();
         try {
           if (gpsTrack) gpsTrack.write([

From 38068ba981784d58d8e9c0cb32c9fc788933ff38 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 21 Jun 2021 12:49:05 +0100
Subject: [PATCH 17/37] ensure rotating cube is a bit more reliable

---
 apps/welcome/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/welcome/app.js b/apps/welcome/app.js
index 565e87d5d..2f56a887f 100644
--- a/apps/welcome/app.js
+++ b/apps/welcome/app.js
@@ -182,6 +182,7 @@ function getScene(n) {
     g.drawString("banglejs.com",x,y+=h);
 
     var rx = 0, ry = 0;
+    E.defrag(); // rearrange memory to ensure we have space
     var h = Graphics.createArrayBuffer(96,96,1,{msb:true});
     // draw a cube
     function draw() {

From 3c2eedbda434f4cc386b6422f453c2a665b84bd1 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 21 Jun 2021 12:58:34 +0100
Subject: [PATCH 18/37] misc welcome tweaks to bring both in line

---
 apps/mywelcome/app.js | 70 ++++++++++++++++++++++---------------------
 apps/welcome/app.js   | 11 +++----
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/apps/mywelcome/app.js b/apps/mywelcome/app.js
index 23cdd0d49..9d4a54928 100644
--- a/apps/mywelcome/app.js
+++ b/apps/mywelcome/app.js
@@ -11,11 +11,9 @@ function animate(seq,period) {
 // Fade in to FG color with angled lines
 function fade(col, callback) {
   var n = 0;
-  function f() {
+  function f() {"ram"
     g.setColor(col);
-    for (var i=n;i<240;i+=10) {
-      g.drawLine(i,0,0,i).drawLine(i,240,240,i);
-    }
+    for (var i=n;i<240;i+=10) g.drawLine(i,0,0,i).drawLine(i,240,240,i);
     g.flip();
     n++;
     if (n<10) setTimeout(f,0);
@@ -25,19 +23,22 @@ function fade(col, callback) {
 }
 
 
-var scenes = [
-  function() {
+var SCENE_COUNT=11;
+function getScene(n) {
+  if (n==0) return function() {
     console.log("Start app");
     g.clear(1);
     eval(require("Storage").read("mywelcome.custom.js"));
-  },function() {
+  }
+  if (n==1) return function() {
     g.clear(1);
     g.setFont("4x6",2);
     var n=0;
+    var l = Bangle.getLogo();
     var i = setInterval(function() {
       n+=0.04;
       g.setColor(n,n,n);
-      g.drawImage(Bangle.getLogo(),(240-222)/2,(240-100)/2);
+      g.drawImage(l,(240-222)/2,(240-100)/2);
       if (n>=1) {
         clearInterval(i);
         setTimeout(()=>g.drawString("Open",34,144), 500);
@@ -45,7 +46,8 @@ var scenes = [
         setTimeout(()=>g.drawString("Smart Watch",34,168), 1500);
       }
     },50);
-  },function() {
+  };
+  if (n==2) return function() {
     var img = require("heatshrink").decompress(atob("ptRxH+qYAfvl70mj5gAC0ekvd8FkAAdz3HJAYAH4+eJXWkJJYAF0hK2vfNJaIAB5t7S3fN5/V6wAD6vOTg9SumXy2W3QAB3eXul2JdnO63XAApPEVYvAJQIACJoRQDzBLoJQ3W5/NIwr4GJohMFAAROgJYvVJQiPGABZNN3bsdvYyESwnWJSIAC3RNM3V1JjZAES4nVJSYAB4xMNJrbkE56WD5xLVdB5NbFofNJbgABJh26qREPrFXrlbAAWjFgfWJgRLaTQhMLy5KNJINhsJLDrYrD5xLC6pLa5nGTR7oLq9bJQJMKTAXWJbbnR3RLJSoRMHv4pC5rkec6SaIrBLGw2r2XW1epcoqYeJiOXJYziEsOH2RBBw7lF56Yg5nGc6FScZOGJQPX2TmDFIfVTEBMSc4hLEw5KB6+rsJMH63X6pMf5hMQzBLCq5LD1ZLEJhTlfJiWXTA2GJYpMIcwPNc2O6TAuGRIPX1igDJg/PJmyYDcgXWwxMH1ApC53XcsHAJiVYcg2HJYZME0YpC5vWJkhLNJgLlDTAeFJhF/FQfVJkG6JiGXcomyJgOrJYhMErYqD53NJj7lRzBMDcoeGJhzoBJb3GJiN1qZBCJgWyJYpNF1LigAAXAJiNSJgzlGJgt/JkZLRy9TJgeHJhznFcuSZGw5MHJomjcuhLBqdcJiSaiTChMV1CYxy5LCqdXIAWy6+rJhCalTCN2JgdYH4WHJiGpTF7kDc43W2RMJTUZLQzBLFc4mr6+GJh2jTFmXJYyaEwuyc5Sag4xLZTQmG2WFJhxNaJYZMLJZSaEJoOHTR9/Ja+6JbdTqRNETRRNF1JLV4BLcAANYI5ToK1BLYJhWYJZwABq5NoJZ91JaAABdAZNS0ZLey9SJaRNYv5KM426JZmXuxKUJrKcL0lTzBLKzBKYJrVXvfGSol7EYWXJI27zF1JLQADq5NUrgYB4wAEEIV0comXI7wAFrCcPJgYWBTIIAETIN2JYmWuhMkdSdYCgOeJgueqRLFyzhfTi9bq4TC45MF49TuuXJlpONcogAC0hKB0gHDvZMEqRMpAANSq9crlbJAYADqwRDxGk0mIA4eCTQOeveXJdYAHqxNFdAeIAAQGCrOI0oHEAGVXTRJMGvgGCwRM7TAZMHwQGCvhM1rBMERIhMGAwdZJmtSqVTwNcwJEDJg19cvIADa4d9JhANDJnSLHJgrl6AAhFFAwpZDegjn7vhMGcvwABrJAFJgjl/TQpBBI4jl/AAN8TQhHDcv4ADcJBMDvpM+IYaeDAAhL+qd9SgycEJn7iEAA18Jf7nEcv4AIrJLIcv6aMcv4ADvhMHrJJ/AAbl/c6ZM/AAt9cv7nSIv7nLcv4AHrLl/TRpJBvgnjA=="));
     g.reset();
     g.setBgColor("#6633ff");
@@ -76,7 +78,8 @@ var scenes = [
       },20);
     },3500);
 
-  },function() {
+  };
+  if (n==3) return function() {
     g.reset();
     g.setBgColor("#ffa800");g.clear();
     g.setFont("6x8",2);
@@ -91,8 +94,8 @@ var scenes = [
       ()=>g.drawString("2",200,120),
       ()=>g.drawString("3",200,200)
     ],200);
-  },
-  function() {
+  };
+  if (n==4) return function() {
     g.reset();
     g.setBgColor("#00a8ff");g.clear();
     g.setFontAlign(0,0);
@@ -101,8 +104,8 @@ var scenes = [
     g.setFontAlign(-1,-1);
     g.setFont("6x8",2);
     g.drawString("Move up\nin menus\n\nTurn Bangle.js on\nif it was off", 20,40);
-  },
-  function() {
+  };
+  if (n==5) return function() {
     g.reset();
     g.setBgColor("#00a8ff");g.clear();
     g.setFontAlign(0,0);
@@ -111,8 +114,8 @@ var scenes = [
     g.setFontAlign(-1,-1);
     g.setFont("6x8",2);
     g.drawString("Select menu\nitem\n\nLaunch app\nwhen watch\nis showing", 20,70);
-  },
-  function() {
+  };
+  if (n==6) return function() {
     g.reset();
     g.setBgColor("#00a8ff");g.clear();
     g.setFontAlign(0,0);
@@ -121,8 +124,8 @@ var scenes = [
     g.setFontAlign(-1,-1);
     g.setFont("6x8",2);
     g.drawString("Move down\nin menus\n\nLong press\nto exit app\nand go back\nto clock", 20,100);
-  },
-  function() {
+  };
+  if (n==7) return function() {
     g.reset();
     g.setBgColor("#ff3300");g.clear();
     g.setFontAlign(0,0);
@@ -132,8 +135,8 @@ var scenes = [
     g.setFontAlign(-1,-1);
     g.setFont("6x8",2);
     g.drawString("If Bangle.js\never stops,\nhold buttons\n1 and 2 for\naround six\nseconds.\n\n\n\nBangle.js will\nthen reboot.", 20,20);
-  },
-  function() {
+  };
+  if (n==8) return function() {
     g.reset();
     g.setBgColor("#00a8ff");g.clear();
     g.setFont("6x8",2);
@@ -150,8 +153,8 @@ var scenes = [
         g.drawString("work too. Try now",x,y+=h);
         g.drawString("to change page.",x,y+=h);}
     ],300);
-  },
-  function() {
+  };
+  if (n==9) return function() {
     g.reset();
     g.setBgColor("#339900");g.clear();
     g.setFont("6x8",2);
@@ -168,8 +171,8 @@ var scenes = [
         g.drawString("with a Bluetooth",x,y+=h);
         g.drawString("capable device",x,y+=h);},
     ],400);
-  },
-  function() {
+  };
+  if (n==10) return function() {
     g.reset();
     g.setBgColor("#990066");g.clear();
     g.setFont("6x8",2);
@@ -182,6 +185,7 @@ var scenes = [
     g.drawString("banglejs.com",x,y+=h);
 
     var rx = 0, ry = 0;
+    E.defrag(); // rearrange memory to ensure we have space
     var h = Graphics.createArrayBuffer(96,96,1,{msb:true});
     // draw a cube
     function draw() {
@@ -230,8 +234,8 @@ var scenes = [
     }
 
     setInterval(draw,50);
-  },
-  function() {
+  };
+  if (n==11) return function() {
     g.reset();
     g.setBgColor("#660099");g.clear();
     g.setFontAlign(0,0);
@@ -248,20 +252,18 @@ var scenes = [
         g.drawString("Bangle.js",x,y+=h);}
     ],400);
   }
-];
+}
 
 var sceneNumber = 0;
 
 function move(dir) {
-  if (dir>0 && sceneNumber+1 == scenes.length) return; // at the end
-  sceneNumber = (sceneNumber+dir)%scenes.length;
+  if (dir>0 && sceneNumber+1 == SCENE_COUNT) return; // at the end
+  sceneNumber = (sceneNumber+dir)%SCENE_COUNT;
   if (sceneNumber<0) sceneNumber=0;
   clearInterval();
-  Bangle.setLCDMode();
-  g.clear();
-  scenes[sceneNumber]();
+  getScene(sceneNumber)();
   if (sceneNumber>2) {
-    var l = scenes.length;
+    var l = SCENE_COUNT;
     for (var i=0;i<l-2;i++) {
       var x = 120+(i-(l-2)/2)*12;
       if (i<sceneNumber-1) {
@@ -275,7 +277,7 @@ function move(dir) {
       }
     }
   }
-  if (sceneNumber < scenes.length-1)
+  if (sceneNumber < SCENE_COUNT-1)
     setTimeout(function() {
       move(1);
     }, (sceneNumber==0) ? 20000 : 5000);
diff --git a/apps/welcome/app.js b/apps/welcome/app.js
index 2f56a887f..1b413e080 100644
--- a/apps/welcome/app.js
+++ b/apps/welcome/app.js
@@ -9,13 +9,10 @@ function animate(seq,period) {
 }
 
 // Fade in to FG color with angled lines
-function fade(callback) {
+function fade(col, callback) {
   var n = 0;
   function f() {"ram"
-    for (var i=n;i<240;i+=10) {
-      g.drawLine(i,0,0,i);
-      g.drawLine(i,240,240,i);
-    }
+    for (var i=n;i<240;i+=10) g.drawLine(i,0,0,i).drawLine(i,240,240,i);
     g.flip();
     n++;
     if (n<10) setTimeout(f,0);
@@ -24,6 +21,7 @@ function fade(callback) {
   f();
 }
 
+
 var SCENE_COUNT=11;
 function getScene(n) {
   if (n==0) return function() {
@@ -46,7 +44,6 @@ function getScene(n) {
   if (n==1) return function() {
     var img = require("heatshrink").decompress(atob("ptRxH+qYAfvl70mj5gAC0ekvd8FkAAdz3HJAYAH4+eJXWkJJYAF0hK2vfNJaIAB5t7S3fN5/V6wAD6vOTg9SumXy2W3QAB3eXul2JdnO63XAApPEVYvAJQIACJoRQDzBLoJQ3W5/NIwr4GJohMFAAROgJYvVJQiPGABZNN3bsdvYyESwnWJSIAC3RNM3V1JjZAES4nVJSYAB4xMNJrbkE56WD5xLVdB5NbFofNJbgABJh26qREPrFXrlbAAWjFgfWJgRLaTQhMLy5KNJINhsJLDrYrD5xLC6pLa5nGTR7oLq9bJQJMKTAXWJbbnR3RLJSoRMHv4pC5rkec6SaIrBLGw2r2XW1epcoqYeJiOXJYziEsOH2RBBw7lF56Yg5nGc6FScZOGJQPX2TmDFIfVTEBMSc4hLEw5KB6+rsJMH63X6pMf5hMQzBLCq5LD1ZLEJhTlfJiWXTA2GJYpMIcwPNc2O6TAuGRIPX1igDJg/PJmyYDcgXWwxMH1ApC53XcsHAJiVYcg2HJYZME0YpC5vWJkhLNJgLlDTAeFJhF/FQfVJkG6JiGXcomyJgOrJYhMErYqD53NJj7lRzBMDcoeGJhzoBJb3GJiN1qZBCJgWyJYpNF1LigAAXAJiNSJgzlGJgt/JkZLRy9TJgeHJhznFcuSZGw5MHJomjcuhLBqdcJiSaiTChMV1CYxy5LCqdXIAWy6+rJhCalTCN2JgdYH4WHJiGpTF7kDc43W2RMJTUZLQzBLFc4mr6+GJh2jTFmXJYyaEwuyc5Sag4xLZTQmG2WFJhxNaJYZMLJZSaEJoOHTR9/Ja+6JbdTqRNETRRNF1JLV4BLcAANYI5ToK1BLYJhWYJZwABq5NoJZ91JaAABdAZNS0ZLey9SJaRNYv5KM426JZmXuxKUJrKcL0lTzBLKzBKYJrVXvfGSol7EYWXJI27zF1JLQADq5NUrgYB4wAEEIV0comXI7wAFrCcPJgYWBTIIAETIN2JYmWuhMkdSdYCgOeJgueqRLFyzhfTi9bq4TC45MF49TuuXJlpONcogAC0hKB0gHDvZMEqRMpAANSq9crlbJAYADqwRDxGk0mIA4eCTQOeveXJdYAHqxNFdAeIAAQGCrOI0oHEAGVXTRJMGvgGCwRM7TAZMHwQGCvhM1rBMERIhMGAwdZJmtSqVTwNcwJEDJg19cvIADa4d9JhANDJnSLHJgrl6AAhFFAwpZDegjn7vhMGcvwABrJAFJgjl/TQpBBI4jl/AAN8TQhHDcv4ADcJBMDvpM+IYaeDAAhL+qd9SgycEJn7iEAA18Jf7nEcv4AIrJLIcv6aMcv4ADvhMHrJJ/AAbl/c6ZM/AAt9cv7nSIv7nLcv4AHrLl/TRpJBvgnjA=="));
     g.reset();
-    g.setColor("#6633ff");
     g.setBgColor("#6633ff");
     var y = 240, speed = 5;
     function balloon(callback) {
@@ -57,7 +54,7 @@ function getScene(n) {
       if (y>60) setTimeout(balloon,0,callback);
       else callback();
     }
-    fade(function() {
+    fade("#6633ff", function() {
       balloon(function() {
         g.setColor(-1);
         g.setFont("6x8",3);

From ba60870f5df329df3f512e61a16c91c216704d39 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 21 Jun 2021 12:58:50 +0100
Subject: [PATCH 19/37] update image converter

---
 core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core b/core
index 09133e199..8d9a012d6 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 09133e1991c6430e93f1cab61704614649fc3f5e
+Subproject commit 8d9a012d62d40aae1b2304d0149440fb3c022393

From cd329f5f2032c60b7dc05e118188ad0de0ddbbc1 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 21 Jun 2021 13:46:16 +0100
Subject: [PATCH 20/37] 0.07: Move to 96px tiles - less files (64 -> 25) and
 speed up rendering

---
 apps.json                  |  2 +-
 apps/openstmap/ChangeLog   |  1 +
 apps/openstmap/custom.html | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/apps.json b/apps.json
index 376723f46..b1ac963ee 100644
--- a/apps.json
+++ b/apps.json
@@ -1464,7 +1464,7 @@
     "name": "OpenStreetMap",
     "shortName":"OpenStMap",
     "icon": "app.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "[BETA] Loads map tiles from OpenStreetMap onto your Bangle.js and displays a map of where you are",
     "tags": "outdoors,gps",
     "custom": "custom.html",
diff --git a/apps/openstmap/ChangeLog b/apps/openstmap/ChangeLog
index 4d9b61031..d050d302b 100644
--- a/apps/openstmap/ChangeLog
+++ b/apps/openstmap/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Move map rendering to a module (fix #396)
 0.05: Show currently active gpsrec GPS trace (fix #395)
 0.06: Add support for scrolling, option for 3 bit maps
+0.07: Move to 96px tiles - less files (64 -> 25) and speed up rendering
diff --git a/apps/openstmap/custom.html b/apps/openstmap/custom.html
index 95a4ff0a6..ac046d41d 100644
--- a/apps/openstmap/custom.html
+++ b/apps/openstmap/custom.html
@@ -50,16 +50,16 @@
 
 TODO:
 
-* Allow a larger tilesize. Currently we use 'evaluate:true' which means we can only send 64x64x8 bit, but with some tweaking we could send 128x128 which would reduce the number of files and make things a bit snappier
 * Could maybe use palettised output?
 * Could potentially use a custom 16 color palette?
 * Allow user to choose size of map area to be uploaded (small/med/large)
 * What is faster? Storing as a compressed image and decompressing, or storing decompressed?
 
     */
-      var TILESIZE = 64;
-      var OSMTILESIZE = 256;
-      var OSMSUBTILES = OSMTILESIZE / TILESIZE;
+      var TILESIZE = 96; // Size of our tiles
+      var OSMTILESIZE = 256; // Size of openstreetmap tiles
+      var MAPSIZE = TILESIZE*5; ///< 480 - Size of map we download
+      var OSMTILECOUNT = 3; // how many tiles do we download in each direction (Math.floor(MAPSIZE / OSMTILESIZE)+1)
       /* Can see possible tiles on http://leaflet-extras.github.io/leaflet-providers/preview/
       However some don't allow cross-origin use */
       var TILELAYER = 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png'; // simple, high contrast
@@ -76,13 +76,14 @@ TODO:
       tileLayer.addTo(map);
 
       function tilesLoaded(ctx, width, height) {
-        var options = { compression:true, mode:"web", output:"string"};
+        var options = {
+          compression:false, output:"raw",
+          mode:"web"
+        };
         if (document.getElementById("3bit").checked) {
           options = {
-            compression:true,
-            //mode:"web",
+            compression:false, output:"raw",
             mode:"3bit", brightness:-64,
-            output:"string"
           };
         }
         console.log("Compression options", options);
@@ -103,8 +104,7 @@ TODO:
             imgstr = imgstr.slice(compress.length,-1);*/
             tiles.push({
               name:"openstmap-"+x+"-"+y+".img",
-              content:imgstr,
-              evaluate:true
+              content:imgstr
             });
           }
         }
@@ -125,10 +125,10 @@ TODO:
         var canvas = document.getElementById("maptiles");
         canvas.style.display="";
         var ctx = canvas.getContext('2d');
-        canvas.width = OSMTILESIZE*2;
-        canvas.height = OSMTILESIZE*2;
-        for (var i = 0; i < 3; i++) {
-            for (var j = 0; j < 3; j++) {
+        canvas.width = MAPSIZE;
+        canvas.height = MAPSIZE;
+        for (var i = 0; i < OSMTILECOUNT; i++) {
+            for (var j = 0; j < OSMTILECOUNT; j++) {
               (function(i,j){
                 var coords = new L.Point(center.x+i-1, center.y+j-1);
                 coords.z = zoom;

From 50c7c15a503f2e1c10805d047c13b9c1e3f9e294 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Tue, 22 Jun 2021 09:36:57 +0100
Subject: [PATCH 21/37] tweaks for low BPP screens

---
 apps.json               |  8 ++++----
 apps/widbat/ChangeLog   |  1 +
 apps/widbat/widget.js   |  5 ++---
 apps/widbt/ChangeLog    |  1 +
 apps/widbt/widget.js    |  8 ++++----
 apps/widlock/ChangeLog  |  1 +
 apps/widlock/widget.js  | 11 +++++------
 apps/widpedom/ChangeLog |  1 +
 apps/widpedom/widget.js | 12 +++++++-----
 9 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/apps.json b/apps.json
index b1ac963ee..dc3c95e61 100644
--- a/apps.json
+++ b/apps.json
@@ -576,7 +576,7 @@
   { "id": "widbat",
     "name": "Battery Level Widget",
     "icon": "widget.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "Show the current battery level and charging status in the top right of the clock",
     "tags": "widget,battery",
     "type":"widget",
@@ -587,7 +587,7 @@
   { "id": "widlock",
     "name": "Lock Widget",
     "icon": "widget.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked",
     "tags": "widget,lock",
     "type":"widget",
@@ -632,7 +632,7 @@
   { "id": "widbt",
     "name": "Bluetooth Widget",
     "icon": "widget.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "Show the current Bluetooth connection status in the top right of the clock",
     "tags": "widget,bluetooth",
     "type":"widget",
@@ -1143,7 +1143,7 @@
   { "id": "widpedom",
     "name": "Pedometer widget",
     "icon": "widget.png",
-    "version":"0.13",
+    "version":"0.14",
     "description": "Daily pedometer widget",
     "tags": "widget",
     "type":"widget",
diff --git a/apps/widbat/ChangeLog b/apps/widbat/ChangeLog
index 128cee034..138ed64e6 100644
--- a/apps/widbat/ChangeLog
+++ b/apps/widbat/ChangeLog
@@ -3,3 +3,4 @@
 0.04: Ensure redrawing works with variable size widget system
 0.05: Fix regression stopping correct widget updates
 0.06: Use 'g.theme' (requires bootloader 0.23)
+0.07: Move CHARGING variable to more readable string
diff --git a/apps/widbat/widget.js b/apps/widbat/widget.js
index 95fad1b20..3fb07a099 100644
--- a/apps/widbat/widget.js
+++ b/apps/widbat/widget.js
@@ -1,5 +1,4 @@
 (function(){
-  var CHARGING = 0x07E0;
 
   function setWidth() {
     WIDGETS["bat"].width = 40 + (Bangle.isCharging()?16:0);
@@ -9,14 +8,14 @@
     var x = this.x, y = this.y;
     g.reset();
     if (Bangle.isCharging()) {
-      g.setColor(CHARGING).drawImage(atob("DhgBHOBzgc4HOP////////////////////3/4HgB4AeAHgB4AeAHgB4AeAHg"),x,y);
+      g.setColor("#0f0").drawImage(atob("DhgBHOBzgc4HOP////////////////////3/4HgB4AeAHgB4AeAHgB4AeAHg"),x,y);
       x+=16;
     }
     g.setColor(g.theme.fg);
     g.fillRect(x,y+2,x+s-4,y+21);
     g.clearRect(x+2,y+4,x+s-6,y+19);
     g.fillRect(x+s-3,y+10,x+s,y+14);
-    g.setColor(CHARGING).fillRect(x+4,y+6,x+4+E.getBattery()*(s-12)/100,y+17);
+    g.setColor("#0f0").fillRect(x+4,y+6,x+4+E.getBattery()*(s-12)/100,y+17);
   }
   Bangle.on('charging',function(charging) {
     if(charging) Bangle.buzz();
diff --git a/apps/widbt/ChangeLog b/apps/widbt/ChangeLog
index 59dc603a9..e639f4044 100644
--- a/apps/widbt/ChangeLog
+++ b/apps/widbt/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Tweaks for variable size widget system
 0.03: Ensure redrawing works with variable size widget system
 0.04: Fix automatic update of Bluetooth connection status
+0.05: Make Bluetooth widget thinner, and when on a bright theme use light grey for disabled color
diff --git a/apps/widbt/widget.js b/apps/widbt/widget.js
index 0dac82e76..89a3cbdb8 100644
--- a/apps/widbt/widget.js
+++ b/apps/widbt/widget.js
@@ -2,10 +2,10 @@
   function draw() {
     g.reset();
     if (NRF.getSecurityStatus().connected)
-      g.setColor(0,0.5,1);
+      g.setColor("#07f");
     else
-      g.setColor(0.3,0.3,0.3);
-    g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),10+this.x,2+this.y);
+      g.setColor(g.theme.bg ? "#AAA" : "#555");
+    g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),2+this.x,2+this.y);
   }
   function changed() {
     WIDGETS["bluetooth"].draw();
@@ -13,5 +13,5 @@
   }
   NRF.on('connect',changed);
   NRF.on('disconnect',changed);
-  WIDGETS["bluetooth"]={area:"tr",width:24,draw:draw};
+  WIDGETS["bluetooth"]={area:"tr",width:15,draw:draw};
 })()
diff --git a/apps/widlock/ChangeLog b/apps/widlock/ChangeLog
index 4c101acb8..3b1436feb 100644
--- a/apps/widlock/ChangeLog
+++ b/apps/widlock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First commit
 0.02: Handle new firmwares with 'lock' event
+0.03: Don't try to be fancy - just bail out on firmwares without a lock event
diff --git a/apps/widlock/widget.js b/apps/widlock/widget.js
index b8c3336dc..4c59e6575 100644
--- a/apps/widlock/widget.js
+++ b/apps/widlock/widget.js
@@ -1,12 +1,11 @@
 (function(){
-  Bangle.on(Bangle.isLocked?'lock':'lcdPower', function(on) {
-    WIDGETS["lock"].width = Bangle.isLocked()?0:16;
+  if (!Bangle.isLocked) return; // bail out on old firmware
+  Bangle.on("lock", function(on) {
+    WIDGETS["lock"].width = Bangle.isLocked()?16:0;
     Bangle.drawWidgets();
   });
-  if (Bangle.isLocked===undefined)
-    Bangle.isLocked = Bangle.isLCDOn;
-  WIDGETS["lock"]={area:"tl",width:Bangle.isLocked()?0:16,draw:function(w) {
-    if (!Bangle.isLocked())
+  WIDGETS["lock"]={area:"tl",width:Bangle.isLocked()?16:0,draw:function(w) {
+    if (Bangle.isLocked())
       g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
   }};
 })()
diff --git a/apps/widpedom/ChangeLog b/apps/widpedom/ChangeLog
index ba198f889..1b431df93 100644
--- a/apps/widpedom/ChangeLog
+++ b/apps/widpedom/ChangeLog
@@ -10,3 +10,4 @@
 0.11: added getSteps() method for apps to retrieve step count
 0.12: Respect Quiet Mode
 0.13: Now use system color theme
+0.14: Improve memory usage
diff --git a/apps/widpedom/widget.js b/apps/widpedom/widget.js
index e73475526..17a442cb6 100644
--- a/apps/widpedom/widget.js
+++ b/apps/widpedom/widget.js
@@ -1,10 +1,5 @@
 (() => {
   const PEDOMFILE = "wpedom.json"
-  const DEFAULTS = {
-    'goal': 10000,
-    'progress': false,
-  }
-  const TAU = Math.PI*2;
   let lastUpdate = new Date();
   let stp_today = 0;
   let settings;
@@ -16,6 +11,10 @@
 
   function setting(key) {
     if (!settings) { loadSettings() }
+    const DEFAULTS = {
+      'goal': 10000,
+      'progress': false,
+    }
     return (key in settings) ? settings[key] : DEFAULTS[key];
   }
 
@@ -24,6 +23,7 @@
     const goal = setting('goal'), left = Math.max(goal-stps,0);
     const c = left ? "#00f" : "#090"; // blue or dark green
     g.setColor(c).fillCircle(this.x + half, this.y + half, half);
+    const TAU = Math.PI*2;
     if (left) {
       const f = left/goal; // fraction to blank out
       let p = [];
@@ -64,6 +64,7 @@
     }
     g.setFontAlign(0, 0); // align to x: center, y: center
     g.drawString(stps, this.x+width/2, this.y+19);
+    // on low bpp screens, draw 1 bit. Currently there is no getBPP so we just do it based on resolution
     g.drawImage(atob("CgoCLguH9f2/7+v6/79f56CtAAAD9fw/n8Hx9A=="),this.x+(width-10)/2,this.y+2);
   }
 
@@ -118,5 +119,6 @@
     if (pedomData.lastUpdate)
       lastUpdate = new Date(pedomData.lastUpdate);
     stp_today = pedomData.stepsToday|0;
+    delete pedomData;
   }
 })()

From 532f1fe6a7aad3f15aaa7a6efd25b752be0b6366 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 23 Jun 2021 08:59:09 +0100
Subject: [PATCH 22/37] tag apps we know work on the new device as 'b2'

---
 apps.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps.json b/apps.json
index dc3c95e61..1d4423676 100644
--- a/apps.json
+++ b/apps.json
@@ -1,7 +1,7 @@
 [
   { "id": "boot",
     "name": "Bootloader",
-    "tags": "tool,system",
+    "tags": "tool,system,b2",
     "type":"bootloader",
     "icon": "bootloader.png",
     "version":"0.26",
@@ -44,7 +44,7 @@
     "icon": "app.png",
     "version":"0.06",
     "description": "This is needed by Bangle.js to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
-    "tags": "tool,system,launcher",
+    "tags": "tool,system,launcher,b2",
     "type":"launch",
     "storage": [
       {"name":"launch.app.js","url":"app.js"}
@@ -56,7 +56,7 @@
     "icon": "app.png",
     "version":"0.08",
     "description": "Bangle.js About page - showing software version, stats, and a collaborative mural from the Bangle.js KickStarter backers",
-    "tags": "tool,system",
+    "tags": "tool,system,b2",
     "allow_emulator":true,
     "storage": [
       {"name":"about.app.js","url":"app.js"},
@@ -68,7 +68,7 @@
     "icon": "locale.png",
     "version":"0.09",
     "description": "Translations for different countries",
-    "tags": "tool,system,locale,translate",
+    "tags": "tool,system,locale,translate,b2",
     "type": "locale",
     "custom":"locale.html",
     "readme": "README.md",
@@ -174,7 +174,7 @@
     "icon": "settings.png",
     "version":"0.26",
     "description": "A menu for setting up Bangle.js",
-    "tags": "tool,system",
+    "tags": "tool,system,b2",
     "readme": "README.md",
     "storage": [
       {"name":"setting.app.js","url":"settings.js"},
@@ -191,7 +191,7 @@
     "icon": "app.png",
     "version":"0.11",
     "description": "Set and respond to alarms",
-    "tags": "tool,alarm,widget",
+    "tags": "tool,alarm,widget,b2",
     "storage": [
       {"name":"alarm.app.js","url":"app.js"},
       {"name":"alarm.boot.js","url":"boot.js"},
@@ -578,7 +578,7 @@
     "icon": "widget.png",
     "version":"0.07",
     "description": "Show the current battery level and charging status in the top right of the clock",
-    "tags": "widget,battery",
+    "tags": "widget,battery,b2",
     "type":"widget",
     "storage": [
       {"name":"widbat.wid.js","url":"widget.js"}
@@ -589,7 +589,7 @@
     "icon": "widget.png",
     "version":"0.03",
     "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked",
-    "tags": "widget,lock",
+    "tags": "widget,lock,b2",
     "type":"widget",
     "storage": [
       {"name":"widlock.wid.js","url":"widget.js"}
@@ -634,7 +634,7 @@
     "icon": "widget.png",
     "version":"0.05",
     "description": "Show the current Bluetooth connection status in the top right of the clock",
-    "tags": "widget,bluetooth",
+    "tags": "widget,bluetooth,b2",
     "type":"widget",
     "storage": [
       {"name":"widbt.wid.js","url":"widget.js"}
@@ -867,7 +867,7 @@
     "icon": "icon.png",
     "version":"0.02",
     "description": "A simple 7 segment Clock with date",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
@@ -1145,7 +1145,7 @@
     "icon": "widget.png",
     "version":"0.14",
     "description": "Daily pedometer widget",
-    "tags": "widget",
+    "tags": "widget,b2",
     "type":"widget",
     "storage": [
       {"name":"widpedom.wid.js","url":"widget.js"},
@@ -1466,7 +1466,7 @@
     "icon": "app.png",
     "version":"0.07",
     "description": "[BETA] Loads map tiles from OpenStreetMap onto your Bangle.js and displays a map of where you are",
-    "tags": "outdoors,gps",
+    "tags": "outdoors,gps,b2",
     "custom": "custom.html",
     "storage": [
       {"name":"openstmap","url":"openstmap.js"},

From fec0aad0ebdcc2294c29f3982e8361ff50119314 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 11:37:30 +0100
Subject: [PATCH 23/37] openstmap Update for drag event refactor

---
 apps.json                | 2 +-
 apps/openstmap/ChangeLog | 1 +
 apps/openstmap/app.js    | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps.json b/apps.json
index 1d4423676..c39b165a4 100644
--- a/apps.json
+++ b/apps.json
@@ -1464,7 +1464,7 @@
     "name": "OpenStreetMap",
     "shortName":"OpenStMap",
     "icon": "app.png",
-    "version":"0.07",
+    "version":"0.08",
     "description": "[BETA] Loads map tiles from OpenStreetMap onto your Bangle.js and displays a map of where you are",
     "tags": "outdoors,gps,b2",
     "custom": "custom.html",
diff --git a/apps/openstmap/ChangeLog b/apps/openstmap/ChangeLog
index d050d302b..fb5776351 100644
--- a/apps/openstmap/ChangeLog
+++ b/apps/openstmap/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Show currently active gpsrec GPS trace (fix #395)
 0.06: Add support for scrolling, option for 3 bit maps
 0.07: Move to 96px tiles - less files (64 -> 25) and speed up rendering
+0.08: Update for drag event refactor
diff --git a/apps/openstmap/app.js b/apps/openstmap/app.js
index 5a01a9059..18c8df74b 100644
--- a/apps/openstmap/app.js
+++ b/apps/openstmap/app.js
@@ -49,15 +49,17 @@ if (HASWIDGETS) {
 
 redraw();
 
-setWatch(function() {
+function recenter() {
   if (!fix.fix) return;
   m.lat = fix.lat;
   m.lon = fix.lon;
   redraw();
-}, BTN2, {repeat:true});
+}
+
+setWatch(recenter, global.BTN2?BTN2:BTN1, {repeat:true});
 
 var hasScrolled = false;
-E.on('touch',e=>{
+Bangle.on('drag',e=>{
   if (e.b) {
     g.setClipRect(0,y1,g.getWidth()-1,y2);
     g.scroll(e.dx,e.dy);

From 547d9c8bf5d79d85bb87a6eb40a22f885b87ebb6 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 12:04:53 +0100
Subject: [PATCH 24/37] 0.15: Add color scheme, different size screen support

---
 apps.json                   |  4 ++--
 apps/aclock/ChangeLog       |  1 +
 apps/aclock/clock-analog.js | 39 ++++++++++++++++++-------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps.json b/apps.json
index c39b165a4..ca5956c78 100644
--- a/apps.json
+++ b/apps.json
@@ -312,9 +312,9 @@
   { "id": "aclock",
     "name": "Analog Clock",
     "icon": "clock-analog.png",
-    "version": "0.14",
+    "version": "0.15",
     "description": "An Analog Clock",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/aclock/ChangeLog b/apps/aclock/ChangeLog
index 77d4ea646..aa910b6f6 100644
--- a/apps/aclock/ChangeLog
+++ b/apps/aclock/ChangeLog
@@ -9,3 +9,4 @@
 0.12: Fix regression after 0.11
 0.13: Fix broken date padding (fix #376)
 0.14: Remove hardcoded hour buzz (you can install widchime if you miss it)
+0.15: Add color scheme support
diff --git a/apps/aclock/clock-analog.js b/apps/aclock/clock-analog.js
index 7516a0eb7..146f022fc 100644
--- a/apps/aclock/clock-analog.js
+++ b/apps/aclock/clock-analog.js
@@ -2,13 +2,16 @@
 const locale = require('locale');
 const p = Math.PI / 2;
 const pRad = Math.PI / 180;
-const faceWidth = 100; // watch face radius (240/2 - 24px for widget area)
+const faceWidth = g.getWidth()/2 - 20; // watch face radius (240/2 - 24px for widget area)
 const widgetHeight=24+1;
 let timer = null;
 let currentDate = new Date();
 const centerX = g.getWidth() / 2;
 const centerY = (g.getWidth() / 2) + widgetHeight/2;
-
+g.theme.dark=false;
+let colSecA = g.theme.dark ? "#00A" : "#58F"; // before the second
+let colSecB = g.theme.dark ? "#58F" : "#00A"; // after the second
+let colSec1 = g.theme.dark ? "#F83" : "#000"; // ON the second
 
 const seconds = (angle) => {
   const a = angle * pRad;
@@ -46,40 +49,35 @@ const drawAll = () => {
   // draw all secs
 
   for (let i = 0; i < 60; i++) {
-    if (i > currentSec) {
-      g.setColor(0, 0, 0.6);
-    } else {
-      g.setColor(0.3, 0.3, 1);
-    }
+    g.setColor((i > currentSec) ? colSecA : colSecB);
     seconds((360 * i) / 60);
   }
   onSecond();
-
 };
 
 const resetSeconds = () => {
-  g.setColor(0, 0, 0.6);
+  g.setColor(colSecA);
   for (let i = 0; i < 60; i++) {
     seconds((360 * i) / 60);
   }
 };
 
 const onSecond = () => {
-  g.setColor(0.3, 0.3, 1);
+  g.setColor(colSecB);
   seconds((360 * currentDate.getSeconds()) / 60);
   if (currentDate.getSeconds() === 59) {
     resetSeconds();
     onMinute();
   }
-  g.setColor(1, 0.7, 0.2);
+  g.setColor(colSec1);
   currentDate = new Date();
   seconds((360 * currentDate.getSeconds()) / 60);
-  g.setColor(1, 1, 1);
+  g.setColor(g.theme.fg);
 };
 
 const drawDate = () => {
   g.reset();
-  g.setColor(1, 0, 0);
+  g.setColor("#f00");
   g.setFont('6x8', 2);
 
   const dayString = locale.dow(currentDate, true);
@@ -89,7 +87,7 @@ const drawDate = () => {
   // console.log(`${dayString}|${dateString}`);
   // center date
   const l = (g.getWidth() - g.stringWidth(dateDisplay)) / 2;
-  const t = centerY + 37;
+  const t = centerY + faceWidth*0.37;
   g.drawString(dateDisplay, l, t, true);
   // console.log(l, t);
 };
@@ -99,7 +97,7 @@ const onMinute = () => {
     resetSeconds();
   }
   // clear existing hands
-  g.setColor(0, 0, 0);
+  g.setColor(g.theme.bg);
   // Hour
   hand((360 * (currentDate.getHours() + currentDate.getMinutes() / 60)) / 12, -8, faceWidth - 35);
   // Minute
@@ -107,10 +105,10 @@ const onMinute = () => {
 
   // get new date, then draw new hands
   currentDate = new Date();
-  g.setColor(1, 0.9, 0.9);
+  g.setColor(g.theme.fg);
   // Hour
   hand((360 * (currentDate.getHours() + currentDate.getMinutes() / 60)) / 12, -8, faceWidth - 35);
-  g.setColor(1, 1, 0.9);
+  g.setColor(g.theme.fg);
   // Minute
   hand((360 * currentDate.getMinutes()) / 60, -8, faceWidth - 10);
   drawDate();
@@ -137,8 +135,9 @@ g.clear();
 resetSeconds();
 startTimers();
 drawAll();
+
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });

From 8fe6a38eaf7c0dc5bea19117dac7788d14c3a430 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 12:13:56 +0100
Subject: [PATCH 25/37] analogimgclk Update to use setUI

---
 apps.json                   | 4 ++--
 apps/analogimgclk/ChangeLog | 1 +
 apps/analogimgclk/app.js    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps.json b/apps.json
index ca5956c78..141e3a400 100644
--- a/apps.json
+++ b/apps.json
@@ -2157,9 +2157,9 @@
     "name": "Analog Clock (Image background)",
     "shortName":"Analog Clock",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "An analog clock with an image background",
-    "tags": "clock",
+    "tags": "clock,nob2",
     "type": "clock",
     "storage": [
       {"name":"analogimgclk.app.js","url":"app.js"},
diff --git a/apps/analogimgclk/ChangeLog b/apps/analogimgclk/ChangeLog
index 864afc91e..877ecc04d 100644
--- a/apps/analogimgclk/ChangeLog
+++ b/apps/analogimgclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Add BTN2 -> launcher
+0.03: Update to use setUI
diff --git a/apps/analogimgclk/app.js b/apps/analogimgclk/app.js
index 99dace78e..1aea97961 100644
--- a/apps/analogimgclk/app.js
+++ b/apps/analogimgclk/app.js
@@ -114,5 +114,5 @@ if (g.drawImages) {
   E.showMessage("Please update\nBangle.js firmware\nto use this clock","analogimgclk");
 }
 
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+// Show launcher when button pressed
+Bangle.setUI("clock");

From 0abc0ae2135a77ea2d8c0d1943a95125af22cc85 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 12:15:01 +0100
Subject: [PATCH 26/37] animclk 0.03: Update to use setUI

---
 apps.json              | 4 ++--
 apps/animclk/ChangeLog | 1 +
 apps/animclk/app.js    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps.json b/apps.json
index 141e3a400..a4f4a50ab 100644
--- a/apps.json
+++ b/apps.json
@@ -2141,9 +2141,9 @@
     "name": "Animated Clock",
     "shortName":"Anim Clock",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art",
-    "tags": "clock,animated",
+    "tags": "clock,animated,nob2",
     "type": "clock",
     "storage": [
       {"name":"animclk.app.js","url":"app.js"},
diff --git a/apps/animclk/ChangeLog b/apps/animclk/ChangeLog
index 7852105a0..348448c34 100644
--- a/apps/animclk/ChangeLog
+++ b/apps/animclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Fix bug if image clock wasn't installed
+0.03: Update to use setUI
diff --git a/apps/animclk/app.js b/apps/animclk/app.js
index ced5372a0..4bf63daf6 100644
--- a/apps/animclk/app.js
+++ b/apps/animclk/app.js
@@ -102,5 +102,5 @@ if (g.drawImages) {
 } else {
   E.showMessage("Please update\nBangle.js firmware\nto use this clock","animclk");
 }
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+// Show launcher when button pressed
+Bangle.setUI("clock");

From 03ee6aea8352c5f8fa89ab5f309d0ab5db4ba2ae Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 13:12:59 +0100
Subject: [PATCH 27/37] Update to use Bangle.setUI instead of setWatch

---
 apps.json                          |  24 +-
 apps/astral/ChangeLog              |   1 +
 apps/astral/app.js                 |  20 +-
 apps/barclock/ChangeLog            |   3 +-
 apps/barclock/clock-bar.js         | 318 ++++++++--------
 apps/batclock/ChangeLog            |   1 +
 apps/batclock/bat-clock.app.js     |   7 +-
 apps/bclock/ChangeLog              |   1 +
 apps/bclock/clock-binary.js        |   4 +-
 apps/beebclock/ChangeLog           |   1 +
 apps/beebclock/beebclock.js        | 591 ++++++++++++++---------------
 apps/berlinc/ChangeLog             |   1 +
 apps/berlinc/berlin-clock.js       |  20 +-
 apps/binclock/ChangeLog            |   1 +
 apps/binclock/app.js               |  52 +--
 apps/blobclk/ChangeLog             |   1 +
 apps/blobclk/clock-blob.js         |  31 +-
 apps/boot/ChangeLog                |   1 +
 apps/boot/bootupdate.js            |  17 +-
 apps/numerals/ChangeLog            |   1 +
 apps/numerals/numerals.app.js      |  19 +-
 apps/numerals/numerals.settings.js |   8 -
 22 files changed, 568 insertions(+), 555 deletions(-)

diff --git a/apps.json b/apps.json
index a4f4a50ab..3a68bc8b5 100644
--- a/apps.json
+++ b/apps.json
@@ -4,7 +4,7 @@
     "tags": "tool,system,b2",
     "type":"bootloader",
     "icon": "bootloader.png",
-    "version":"0.26",
+    "version":"0.27",
     "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
     "storage": [
       {"name":".boot0","url":"boot0.js"},
@@ -1030,7 +1030,7 @@
   { "id": "bclock",
     "name": "Binary Clock",
     "icon": "clock-binary.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "A simple binary clock watch face",
     "tags": "clock",
     "type":"clock",
@@ -1106,9 +1106,9 @@
     "name": "Large Digit Blob Clock",
     "shortName" : "Blob Clock",
     "icon": "clock-blob.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "A clock with big digits",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
@@ -1155,7 +1155,7 @@
   { "id": "berlinc",
     "name": "Berlin Clock",
     "icon": "berlin-clock.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "Berlin Clock (see https://en.wikipedia.org/wiki/Mengenlehreuhr)",
     "tags": "clock",
     "type":"clock",
@@ -1313,7 +1313,7 @@
   { "id": "barclock",
     "name": "Bar Clock",
     "icon": "clock-bar.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "A simple digital clock showing seconds as a bar",
     "tags": "clock",
     "type":"clock",
@@ -1572,7 +1572,7 @@
     "name": "Numerals Clock",
     "shortName": "Numerals Clock",
     "icon": "numerals.png",
-    "version":"0.08",
+    "version":"0.09",
     "description": "A simple big numerals clock",
     "tags": "numerals,clock",
 	"type":"clock",
@@ -1986,7 +1986,7 @@
     "id": "beebclock",
     "name": "Beeb Clock",
     "icon": "beebclock.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "Clock face that may be coincidentally familiar to BBC viewers",
     "tags": "clock",
     "type": "clock",
@@ -2114,7 +2114,7 @@
     "name": "Binary Clock",
     "shortName":"Binary Clock",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "A binary clock with hours and minutes. BTN1 toggles a digital clock.",
     "tags": "clock,binary",
     "type": "clock",
@@ -2755,7 +2755,7 @@
 { "id": "astral",
   "name": "Astral Clock",
   "icon": "app-icon.png",
-  "version":"0.02",
+  "version":"0.03",
   "readme": "README.md",
   "description": "Clock that calculates and displays Alt Az positions of all planets, Sun as well as several other astronomy targets (customizable) and current Moon phase. Coordinates are calculated by GPS & time and onscreen compass assists orienting. See Readme before using.",
   "tags": "clock",
@@ -3223,7 +3223,7 @@
   "name": "Bat Clock",
   "shortName":"Bat Clock",
   "icon": "bat-clock.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Morphing Clock, with an awesome \"The Dark Knight\" themed logo.",
   "tags": "clock",
   "type": "clock",
@@ -3278,7 +3278,7 @@
 { "id": "mysticdock",
   "name": "Mystic Dock",
   "icon": "mystic-dock.png",
-  "version":"1.0",
+  "version":"1.00",
   "description": "A retro-inspired dockface that displays the current time and battery charge while plugged in, and which features an interactive mode that shows the time, date, and a rotating data display line.",
   "tags": "dock",
   "type":"dock",
diff --git a/apps/astral/ChangeLog b/apps/astral/ChangeLog
index 7a9d48bf1..a51c96760 100644
--- a/apps/astral/ChangeLog
+++ b/apps/astral/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Create astral clock app
 0.02: Fixed Whirlpool galaxy RA/DA, larger compass display, fixed moonphase overlapping battery widget
+0.03: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/astral/app.js b/apps/astral/app.js
index 5d2d16e8f..c445463f2 100644
--- a/apps/astral/app.js
+++ b/apps/astral/app.js
@@ -503,8 +503,8 @@ function coord_to_horizon(utc, ra, dec, lat, lon, h) {
 }
 
 //
-// "mean_sidereal_time" returns the Mean Sidereal Time in units of degrees. 
-// Use lon = 0 to get the Greenwich MST. 
+// "mean_sidereal_time" returns the Mean Sidereal Time in units of degrees.
+// Use lon = 0 to get the Greenwich MST.
 // East longitudes are positive; West longitudes are negative
 //
 // returns: time in degrees
@@ -523,7 +523,7 @@ function mean_sidereal_time(lon) {
     var c = Math.floor(365.25 * year);
     var da = Math.floor(30.6001 * (month + 1));
 
-    // days since J2000.0   
+    // days since J2000.0
     var jd = b + c + da - 730550.5 + day
         + (hour + mins / 60.0 + secs / 3600.0) / 24.0;
 
@@ -796,10 +796,11 @@ Bangle.on('lcdPower', on => {
 Bangle.setCompassPower(1);
 Bangle.setGPSPower(1);
 
-// Buttons
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+// Show launcher when button pressed
+Bangle.setClockMode();
 
-setWatch(function () {
+Bangle.setUI("clockupdown", btn => {
+  if (btn==0) {
     if (!processing) {
         if (!modeswitch) {
             modeswitch = true;
@@ -809,12 +810,11 @@ setWatch(function () {
         else
             modeswitch = false;
     }
-}, BTN3, { repeat: true });
-
-setWatch(function () {
+  } else {
     if (!processing)
         ready_to_compute = true;
-}, BTN1, { repeat: true });
+  }
+});
 
 setWatch(function () {
     if (!astral_settings.astral_default) {
diff --git a/apps/barclock/ChangeLog b/apps/barclock/ChangeLog
index 551926191..9589a1902 100644
--- a/apps/barclock/ChangeLog
+++ b/apps/barclock/ChangeLog
@@ -3,4 +3,5 @@
 0.03: Fix dates drawing over each other at midnight
 0.04: Small bugfix
 0.05: Clock does not start if app Languages is not installed
-0.06: Improve accuracy
\ No newline at end of file
+0.06: Improve accuracy
+0.07: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 4bb6c048a..5069faa39 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -2,170 +2,168 @@
 /**
  * A simple digital clock showing seconds as a bar
  **/
-{
-  // Check settings for what type our clock should be
-  const is12Hour = (require('Storage').readJSON('setting.json', 1) || {})['12hour']
-  let locale = require('locale')
-  { // add some more info to locale
-    let date = new Date()
-    date.setFullYear(1111)
-    date.setMonth(1, 3) // februari: months are zero-indexed
-    const localized = locale.date(date, true)
-    locale.dayFirst = /3.*2/.test(localized)
+// Check settings for what type our clock should be
+const is12Hour = (require('Storage').readJSON('setting.json', 1) || {})['12hour']
+let locale = require('locale')
+{ // add some more info to locale
+  let date = new Date()
+  date.setFullYear(1111)
+  date.setMonth(1, 3) // februari: months are zero-indexed
+  const localized = locale.date(date, true)
+  locale.dayFirst = /3.*2/.test(localized)
 
-    locale.hasMeridian = false
-    if(typeof locale.meridian === 'function') {  // function does not exists if languages  app is not installed
-      locale.hasMeridian = (locale.meridian(date) !== '')
-    }
-
-  }
-  const screen = {
-    width: g.getWidth(),
-    height: g.getWidth(),
-    middle: g.getWidth() / 2,
-    center: g.getHeight() / 2,
+  locale.hasMeridian = false
+  if(typeof locale.meridian === 'function') {  // function does not exists if languages  app is not installed
+    locale.hasMeridian = (locale.meridian(date) !== '')
   }
 
-  // hardcoded "settings"
-  const settings = {
-    time: {
+}
+const screen = {
+  width: g.getWidth(),
+  height: g.getWidth(),
+  middle: g.getWidth() / 2,
+  center: g.getHeight() / 2,
+}
+
+// hardcoded "settings"
+const settings = {
+  time: {
+    color: -1,
+    font: '6x8',
+    size: (is12Hour && locale.hasMeridian) ? 6 : 8,
+    middle: screen.middle,
+    center: screen.center,
+    ampm: {
       color: -1,
       font: '6x8',
-      size: (is12Hour && locale.hasMeridian) ? 6 : 8,
-      middle: screen.middle,
-      center: screen.center,
-      ampm: {
-        color: -1,
-        font: '6x8',
-        size: 2,
-      },
+      size: 2,
     },
-    date: {
-      color: -1,
-      font: 'Vector',
-      size: 20,
-      middle: screen.height - 20, // at bottom of screen
-      center: screen.center,
-    },
-    bar: {
-      color: -1,
-      top: 155, // just below time
-      thickness: 6, // matches 24h time "pixel" size
-    },
-  }
-
-  const SECONDS_PER_MINUTE = 60
-
-  const timeText = function (date) {
-    if (!is12Hour) {
-      return locale.time(date, true)
-    }
-    const date12 = new Date(date.getTime())
-    const hours = date12.getHours()
-    if (hours === 0) {
-      date12.setHours(12)
-    } else if (hours > 12) {
-      date12.setHours(hours - 12)
-    }
-    return locale.time(date12, true)
-  }
-  const ampmText = function (date) {
-    return is12Hour ? locale.meridian(date) : ''
-  }
-
-  const dateText = function (date) {
-    const dayName = locale.dow(date, true),
-      month = locale.month(date, true),
-      day = date.getDate()
-    const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}`
-    return `${dayName}  ${dayMonth}`
-  }
-
-  const drawDateTime = function (date) {
-    const t = settings.time
-    g.setColor(t.color)
-    g.setFont(t.font, t.size)
-    g.setFontAlign(0, 0) // centered
-    g.drawString(timeText(date), t.center, t.middle, true)
-    if (is12Hour && locale.hasMeridian) {
-      const a = settings.time.ampm
-      g.setColor(a.color)
-      g.setFont(a.font, a.size)
-      g.setFontAlign(1, -1) // right top
-      // at right edge of screen, aligned with time bottom
-      const left = screen.width - a.size * 2,
-        top = t.middle + t.size - a.size
-      g.drawString(ampmText(date), left, top, true)
-    }
-
-    const d = settings.date
-    g.setColor(d.color)
-    g.setFont(d.font, d.size)
-    g.setFontAlign(0, 0) // centered
-    g.drawString(dateText(date), d.center, d.middle, true)
-  }
-
-  const drawBar = function (date) {
-    const b = settings.bar
-    const seconds = date.getSeconds()
-    if (seconds === 0) {
-      // zero-size rect stills draws one line of pixels, we don't want that
-      return
-    }
-    const fraction = seconds / SECONDS_PER_MINUTE,
-      width = fraction * screen.width
-    g.setColor(b.color)
-    g.fillRect(0, b.top, width, b.top + b.thickness)
-  }
-
-  const clearScreen = function () {
-    g.setColor(0)
-    const timeTop = settings.time.middle - (settings.time.size * 4)
-    g.fillRect(0, timeTop, screen.width, screen.height)
-  }
-
-  let lastSeconds, tTick
-  const tick = function () {
-    g.reset()
-    const date = new Date()
-    const seconds = date.getSeconds()
-    if (lastSeconds > seconds) {
-      // new minute
-      clearScreen()
-      drawDateTime(date)
-    }
-    // the bar only gets larger, so drawing on top of the previous one is fine
-    drawBar(date)
-    lastSeconds = seconds
-    // schedule next update
-    const millis = date.getMilliseconds()
-    tTick = setTimeout(tick, 1000-millis)
-  }
-
-  const start = function () {
-    lastSeconds = 99 // force redraw
-    tick()
-  }
-  const stop = function () {
-    if (tTick) {
-      clearTimeout(tTick)
-      tTick = undefined
-    }
-  }
-
-  // clean app screen
-  g.clear()
-  Bangle.loadWidgets()
-  Bangle.drawWidgets()
-  // Show launcher when middle button pressed
-  setWatch(Bangle.showLauncher, BTN2, {repeat: false, edge: 'falling'})
-
-  Bangle.on('lcdPower', function (on) {
-    if (on) {
-      start()
-    } else {
-      stop()
-    }
-  })
-  start()
+  },
+  date: {
+    color: -1,
+    font: 'Vector',
+    size: 20,
+    middle: screen.height - 20, // at bottom of screen
+    center: screen.center,
+  },
+  bar: {
+    color: -1,
+    top: 155, // just below time
+    thickness: 6, // matches 24h time "pixel" size
+  },
 }
+
+const SECONDS_PER_MINUTE = 60
+
+const timeText = function (date) {
+  if (!is12Hour) {
+    return locale.time(date, true)
+  }
+  const date12 = new Date(date.getTime())
+  const hours = date12.getHours()
+  if (hours === 0) {
+    date12.setHours(12)
+  } else if (hours > 12) {
+    date12.setHours(hours - 12)
+  }
+  return locale.time(date12, true)
+}
+const ampmText = function (date) {
+  return is12Hour ? locale.meridian(date) : ''
+}
+
+const dateText = function (date) {
+  const dayName = locale.dow(date, true),
+    month = locale.month(date, true),
+    day = date.getDate()
+  const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}`
+  return `${dayName}  ${dayMonth}`
+}
+
+const drawDateTime = function (date) {
+  const t = settings.time
+  g.setColor(t.color)
+  g.setFont(t.font, t.size)
+  g.setFontAlign(0, 0) // centered
+  g.drawString(timeText(date), t.center, t.middle, true)
+  if (is12Hour && locale.hasMeridian) {
+    const a = settings.time.ampm
+    g.setColor(a.color)
+    g.setFont(a.font, a.size)
+    g.setFontAlign(1, -1) // right top
+    // at right edge of screen, aligned with time bottom
+    const left = screen.width - a.size * 2,
+      top = t.middle + t.size - a.size
+    g.drawString(ampmText(date), left, top, true)
+  }
+
+  const d = settings.date
+  g.setColor(d.color)
+  g.setFont(d.font, d.size)
+  g.setFontAlign(0, 0) // centered
+  g.drawString(dateText(date), d.center, d.middle, true)
+}
+
+const drawBar = function (date) {
+  const b = settings.bar
+  const seconds = date.getSeconds()
+  if (seconds === 0) {
+    // zero-size rect stills draws one line of pixels, we don't want that
+    return
+  }
+  const fraction = seconds / SECONDS_PER_MINUTE,
+    width = fraction * screen.width
+  g.setColor(b.color)
+  g.fillRect(0, b.top, width, b.top + b.thickness)
+}
+
+const clearScreen = function () {
+  g.setColor(0)
+  const timeTop = settings.time.middle - (settings.time.size * 4)
+  g.fillRect(0, timeTop, screen.width, screen.height)
+}
+
+let lastSeconds, tTick
+const tick = function () {
+  g.reset()
+  const date = new Date()
+  const seconds = date.getSeconds()
+  if (lastSeconds > seconds) {
+    // new minute
+    clearScreen()
+    drawDateTime(date)
+  }
+  // the bar only gets larger, so drawing on top of the previous one is fine
+  drawBar(date)
+  lastSeconds = seconds
+  // schedule next update
+  const millis = date.getMilliseconds()
+  tTick = setTimeout(tick, 1000-millis)
+}
+
+const start = function () {
+  lastSeconds = 99 // force redraw
+  tick()
+}
+const stop = function () {
+  if (tTick) {
+    clearTimeout(tTick)
+    tTick = undefined
+  }
+}
+
+// clean app screen
+g.clear()
+Bangle.loadWidgets()
+Bangle.drawWidgets()
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
+Bangle.on('lcdPower', function (on) {
+  if (on) {
+    start()
+  } else {
+    stop()
+  }
+})
+start()
diff --git a/apps/batclock/ChangeLog b/apps/batclock/ChangeLog
index 5d221b4c4..e6e21b146 100644
--- a/apps/batclock/ChangeLog
+++ b/apps/batclock/ChangeLog
@@ -1 +1,2 @@
 0.01: App Created!
+0.02: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/batclock/bat-clock.app.js b/apps/batclock/bat-clock.app.js
index abb5fbd3a..31b8f5b9b 100644
--- a/apps/batclock/bat-clock.app.js
+++ b/apps/batclock/bat-clock.app.js
@@ -256,8 +256,5 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {
-    repeat: false,
-    edge: "falling"
-});
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/bclock/ChangeLog b/apps/bclock/ChangeLog
index 7819dbe2a..5b2cf598c 100644
--- a/apps/bclock/ChangeLog
+++ b/apps/bclock/ChangeLog
@@ -1 +1,2 @@
 0.02: Modified for use with new bootloader and firmware
+0.03: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/bclock/clock-binary.js b/apps/bclock/clock-binary.js
index 833aa00f6..fdf945ee6 100644
--- a/apps/bclock/clock-binary.js
+++ b/apps/bclock/clock-binary.js
@@ -105,5 +105,5 @@ Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(() => { drawClock(); }, 1000);
 drawClock();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/beebclock/ChangeLog b/apps/beebclock/ChangeLog
index ac1c58c29..b9a4dacec 100644
--- a/apps/beebclock/ChangeLog
+++ b/apps/beebclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Initial commit.  Not very efficient, and widgets not working for some reason.
 0.02: Fixes; widget support
 0.03: Remove hardcoded hour buzz (you can install widchime if you miss it)
+0.04: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/beebclock/beebclock.js b/apps/beebclock/beebclock.js
index bbf65697f..2f7c48c36 100644
--- a/apps/beebclock/beebclock.js
+++ b/apps/beebclock/beebclock.js
@@ -51,341 +51,332 @@ Graphics.prototype.drawRotLine = function (sina, cosa, cx, cy, r1, r2) {
   );
 };
 
+// Display modes
+//
+// 0: full-screen
+// 1: with widgets
+// 2: centred on Bangle (v.1), no widgets or time/date
+// 3: centred with time above
+// 4: centred with date above
+// 5: centred with time and date above
+let mode;
 
-(function(g) {
-  // Display modes
-  //
-  // 0: full-screen
-  // 1: with widgets
-  // 2: centred on Bangle (v.1), no widgets or time/date
-  // 3: centred with time above
-  // 4: centred with date above
-  // 5: centred with time and date above
-  let mode;
+// R1, R2:   Outer and inner radii of hour marks
+// RC1, RC2: Outer and inner radii of hub
+// CX, CY:   Centre location, relative to buffer (not screen, necessarily)
+// HW2, MW2: Half-width of hour and minute hand
+// HR, MR:   Length of hour and minute hand, relative to CX,CY
+// M:        Half-width of gap in hour marks
+// HSCALE:   Half-width of hour mark as function(0<h<13)
+let R1, R2, RC1, RC2, CX, CY, HW2, MW2, HR, MR, M, HSCALE;
 
-  // R1, R2:   Outer and inner radii of hour marks
-  // RC1, RC2: Outer and inner radii of hub
-  // CX, CY:   Centre location, relative to buffer (not screen, necessarily)
-  // HW2, MW2: Half-width of hour and minute hand
-  // HR, MR:   Length of hour and minute hand, relative to CX,CY
-  // M:        Half-width of gap in hour marks
-  // HSCALE:   Half-width of hour mark as function(0<h<13)
-  let R1, R2, RC1, RC2, CX, CY, HW2, MW2, HR, MR, M, HSCALE;
+// Screen size
+const GW = g.getWidth();
+const GH = g.getHeight();
 
-  // Screen size
-  const GW = g.getWidth();
-  const GH = g.getHeight();
+// Top margin: the gap taken from the top of the buffer, except when
+// in mode 0 (full screen)
+let TM;
 
-  // Top margin: the gap taken from the top of the buffer, except when
-  // in mode 0 (full screen)
-  let TM;
+// Buffer image.  undefined means it needs regenerating
+let faceImg;
 
-  // Buffer image.  undefined means it needs regenerating
-  let faceImg;
+// with_seconds flag determines whether the face is updated every
+// second or every minute, and to draw the hand or not.
+let with_seconds = true;
 
-  // with_seconds flag determines whether the face is updated every
-  // second or every minute, and to draw the hand or not.
-  let with_seconds = true;
+// Display flags, determined from `mode` by setMode()
+let with_widgets = false;
+let with_digital_time = true;
+let with_digital_date = true;
 
-  // Display flags, determined from `mode` by setMode()
-  let with_widgets = false;
-  let with_digital_time = true;
-  let with_digital_date = true;
+// Create offscreen buffer for the once-per-minute face draw
+const G1 = Graphics.createArrayBuffer(g.getWidth(), g.getHeight(), 1, {msb:true});
 
-  // Create offscreen buffer for the once-per-minute face draw
-  const G1 = Graphics.createArrayBuffer(g.getWidth(), g.getHeight(), 1, {msb:true});
+// Precalculate sin/cos for the hour marks.  Might be premature
+// optimisation, but might as well.
+let ss = [], cs = [];
+for (let h=1; h<=12; h++) {
+  const a = Math.PI * h / 6;
+  ss[h] = Math.sin(a);
+  cs[h] = Math.cos(a);
+}
 
-  // Precalculate sin/cos for the hour marks.  Might be premature
-  // optimisation, but might as well.
-  let ss = [], cs = [];
+// Draw the face with hour and minute hand.  Ideally, we'd separate
+// the face from the hands and double-buffer, but memory is limited,
+// so we buffer once and minute, and draw the second hand dynamically
+// (with a bit of flicker)
+const drawFace = (G) => {
+  const fw = R1 * 2;
+  const fh = R1 * 2;
+  const fw2 = R1;
+  const fh2 = R1;
+  let hs = [];
+
+  // Wipe the image and start with white
+  G.clear();
+  G.setColor(1,1,1);
+
+  // Draw the hour marks.
   for (let h=1; h<=12; h++) {
-    const a = Math.PI * h / 6;
-    ss[h] = Math.sin(a);
-    cs[h] = Math.cos(a);
+    hs[h] = HSCALE(h);
+    G.fillRotRect(ss[h], cs[h], CX, CY, -hs[h], hs[h], R2, R1);
+
   }
 
-  // Draw the face with hour and minute hand.  Ideally, we'd separate
-  // the face from the hands and double-buffer, but memory is limited,
-  // so we buffer once and minute, and draw the second hand dynamically
-  // (with a bit of flicker)
-  const drawFace = (G) => {
-    const fw = R1 * 2;
-    const fh = R1 * 2;
-    const fw2 = R1;
-    const fh2 = R1;
-    let hs = [];
+  // Draw the hub
+  G.fillCircle(CX, CY, RC1);
 
-    // Wipe the image and start with white
-    G.clear();
-    G.setColor(1,1,1);
+  // Black
+  G.setColor(0,0,0);
 
-    // Draw the hour marks.
-    for (let h=1; h<=12; h++) {
-      hs[h] = HSCALE(h);
-      G.fillRotRect(ss[h], cs[h], CX, CY, -hs[h], hs[h], R2, R1);
+  // Clear the centre of the hub
+  G.fillCircle(CX, CY, RC2);
 
+  // Draw the gap in the hour marks
+  for (let h=1; h<=12; h++) {
+    G.fillRotRect(ss[h], cs[h], CX, CY, -M, M, R2-1, R1+1);
+  }
+
+  // Back to white for future draw operations
+  G.setColor(1,1,1);
+
+  // While the buffer remains full-screen, we may trim out the
+  // bottom of the image so we can shift the whole thing down for
+  // widgets.
+  const img = {width:GW,height:GH-TM,buffer:G.buffer};
+  return img;
+};
+
+let hours, minutes, seconds, date;
+
+// Schedule event for calling at the start of the next second
+const inOneSecond = (cb) => {
+  let now = new Date();
+  clearTimeout();
+  setTimeout(cb, 1000 - now.getMilliseconds());
+};
+
+// Schedule event for calling at the start of the next minute
+const inOneMinute = (cb) => {
+  let now = new Date();
+  clearTimeout();
+  setTimeout(cb, 60000 - (now.getSeconds() * 1000 + now.getMilliseconds()));
+};
+
+// Draw a fat hour/minute hand
+const drawHand = (G, a, w2, r1, r2) =>
+  G.fillRotRect(Math.sin(a), Math.cos(a), CX, CY, -w2, w2, r1, r2);
+
+// Redraw function
+const drawAll = (force) => {
+  let now = new Date();
+
+  if (!faceImg) force = true;
+
+  let face_changed = force;
+  let date_changed = false;
+
+  tmp = hours;
+  hours = now.getHours();
+  if (tmp !== hours)
+    face_changed = true;
+
+  tmp = minutes;
+  minutes = now.getMinutes();
+  if (tmp !== minutes)
+    face_changed = true;
+
+  // If the face has been updated and/or needs a redraw,
+  // face_changed is true.
+
+  let time_changed = face_changed;
+
+  // If the screen needs an update, regardless of whether the face
+  // needs a redraw, time_changed is true.
+
+  if (with_seconds) {
+    // If we're going by second, we always need an update.
+    seconds = now.getSeconds();
+    time_changed = true;
+  }
+
+  if (with_digital_date) {
+    // See if the date has changed.  If it has, then we need a
+    // full-blown redraw of the screen and the face, plus text.
+    tmp = date;
+    date = now.getDate();
+    if (tmp !== date) {
+      date_changed = true;
+      face_changed = true; // Should have changed anyway with hour/minute rollover
+    }
+  }
+
+  if (face_changed) {
+    // Redraw the face and hands onto the buffer G1.
+    faceImg = drawFace(G1);
+    drawHand(G1, Math.PI*hours/6, HW2, RC1, HR);
+    drawHand(G1, Math.PI*minutes/30, MW2, RC1, MR);
+  }
+
+  // Has the time updated?  If so, we'll need to draw something.
+  if (time_changed) {
+
+    // Are we adding text?
+    if (with_digital_date || with_digital_time) {
+
+      // Construct the date/time text to add above the face
+      let d = now.toString();
+      let da = d.toString().split(" ");
+      let txt;
+
+      if (with_digital_time) {
+        txt = da[4].substr(0, 5);
+        if (with_digital_date)
+          G1.drawStringDH(txt+',', 24, 0, 'L', GW);
+        else
+          G1.drawStringDH(txt, 0, 0, 'C', GW);
+      }
+
+      if (with_digital_date) {
+        let txt = [da[0], da[1], da[2]].join(" ");
+        if (with_digital_time)
+          G1.drawStringDH(txt, -24, 0, 'R', GW);
+        else
+          G1.drawStringDH(txt, 0, 0, 'C', GW);
+      }
     }
 
-    // Draw the hub
-    G.fillCircle(CX, CY, RC1);
-
-    // Black
-    G.setColor(0,0,0);
-
-    // Clear the centre of the hub
-    G.fillCircle(CX, CY, RC2);
-
-    // Draw the gap in the hour marks
-    for (let h=1; h<=12; h++) {
-      G.fillRotRect(ss[h], cs[h], CX, CY, -M, M, R2-1, R1+1);
-    }
-
-    // Back to white for future draw operations
-    G.setColor(1,1,1);
-
-    // While the buffer remains full-screen, we may trim out the
-    // bottom of the image so we can shift the whole thing down for
-    // widgets.
-    const img = {width:GW,height:GH-TM,buffer:G.buffer};
-    return img;
-  };
-
-  let hours, minutes, seconds, date;
-
-  // Schedule event for calling at the start of the next second
-  const inOneSecond = (cb) => {
-    let now = new Date();
-    clearTimeout();
-    setTimeout(cb, 1000 - now.getMilliseconds());
-  };
-
-  // Schedule event for calling at the start of the next minute
-  const inOneMinute = (cb) => {
-    let now = new Date();
-    clearTimeout();
-    setTimeout(cb, 60000 - (now.getSeconds() * 1000 + now.getMilliseconds()));
-  };
-
-  // Draw a fat hour/minute hand
-  const drawHand = (G, a, w2, r1, r2) =>
-    G.fillRotRect(Math.sin(a), Math.cos(a), CX, CY, -w2, w2, r1, r2);
-
-  // Redraw function
-  const drawAll = (force) => {
-    let now = new Date();
-
-    if (!faceImg) force = true;
-
-    let face_changed = force;
-    let date_changed = false;
-
-    tmp = hours;
-    hours = now.getHours();
-    if (tmp !== hours)
-      face_changed = true;
-
-    tmp = minutes;
-    minutes = now.getMinutes();
-    if (tmp !== minutes)
-      face_changed = true;
-
-    // If the face has been updated and/or needs a redraw,
-    // face_changed is true.
-
-    let time_changed = face_changed;
-
-    // If the screen needs an update, regardless of whether the face
-    // needs a redraw, time_changed is true.
+    // If the time has updated, we need to _at least_ draw the
+    // image to the screen.
+    g.setColor(1,1,1);
+    g.drawImage({width:GW,
+      height:GH-TM,
+      buffer:G1.buffer}, 0, TM);
 
+    // and possibly add the second hand
     if (with_seconds) {
-      // If we're going by second, we always need an update.
-      seconds = now.getSeconds();
-      time_changed = true;
+      let a = 2.0 * Math.PI * seconds / 60.0;
+      g.drawRotLine(Math.sin(a), Math.cos(a), CX, CY+TM, RC1, R1);
     }
 
-    if (with_digital_date) {
-      // See if the date has changed.  If it has, then we need a
-      // full-blown redraw of the screen and the face, plus text.
-      tmp = date;
-      date = now.getDate();
-      if (tmp !== date) {
-        date_changed = true;
-        face_changed = true; // Should have changed anyway with hour/minute rollover
-      }
-    }
+    // And draw widgets if we're in that mode
+    if (with_widgets)
+      Bangle.drawWidgets();
+  }
 
-    if (face_changed) {
-      // Redraw the face and hands onto the buffer G1.
-      faceImg = drawFace(G1);
-      drawHand(G1, Math.PI*hours/6, HW2, RC1, HR);
-      drawHand(G1, Math.PI*minutes/30, MW2, RC1, MR);
-    }
+  // Schedule to repeat this.  A `setTimeout(1000)` isn't good
+  // enough, as all the above might've taken some milliseconds and
+  // we don't want to drift.
+  if (with_seconds)
+    inOneSecond(drawAll);
+  else
+    inOneMinute(drawAll);
+};
 
-    // Has the time updated?  If so, we'll need to draw something.
-    if (time_changed) {
+const setButtons = () => {
+  // Show launcher when button pressed
+  Bangle.setUI("clockupdown", btn=> {
+    if (btn==0) changeSeconds();
+    if (btn==1) { ++mode; setMode(); drawAll(true); }
+  });
+};
 
-      // Are we adding text?
-      if (with_digital_date || with_digital_time) {
+// Load display parameters based on `mode`
+const setMode = () => {
+  // Normalize mode to 0 <= mode <= 5
+  mode = (6+mode) % 6;
 
-        // Construct the date/time text to add above the face
-        let d = now.toString();
-        let da = d.toString().split(" ");
-        let txt;
+  // [R1, R2, RC1, RC2, HW2, MW3, HR, MR, M, HSCALE] =
+  const scales = [
+    [120, 84, 17,   12.4, 4.6,  2.2, 8, 2, 1,    h => (3.0 + Math.ceil(h/1.5)) ],
+    [102, 70, 14.6, 10.7, 3.88, 1.8, 8, 2, 1,    h => (2.4 + Math.ceil(h/1.6)) ],
+  ];
 
-        if (with_digital_time) {
-          txt = da[4].substr(0, 5);
-          if (with_digital_date)
-            G1.drawStringDH(txt+',', 24, 0, 'L', GW);
-          else
-            G1.drawStringDH(txt, 0, 0, 'C', GW);
-        }
+  if (mode < 3) {
+    // Face without time/date text.  Might have widgets though.
+    with_digital_time = with_digital_date = false;
+    with_widgets = (mode == 1);
+  }
+  else {
+    // Face with time/date text, but no widgets
+    with_digital_time = (mode-2)&1;
+    with_digital_date = (mode-2)&2;
+    with_widgets = false;
+  }
 
-        if (with_digital_date) {
-          let txt = [da[0], da[1], da[2]].join(" ");
-          if (with_digital_time)
-            G1.drawStringDH(txt, -24, 0, 'R', GW);
-          else
-            G1.drawStringDH(txt, 0, 0, 'C', GW);
-        }
-      }
+  // Destructure the array to the global display parameters
+  let arr = scales[mode > 0 ? 1 : 0];
+  R1 = arr[0];
+  R2 = arr[1];
+  RC1 = arr[2];
+  RC2 = arr[3];
+  HW2 = arr[4];
+  MW2 = arr[5];
+  HR = R2 - arr[6];
+  MR = R1 - arr[7];
+  M = arr[8];
+  HSCALE = arr[9];
+  TM = with_widgets ? 36 : 0;
 
-      // If the time has updated, we need to _at least_ draw the
-      // image to the screen.
-      g.setColor(1,1,1);
-      g.drawImage({width:GW,
-        height:GH-TM,
-        buffer:G1.buffer}, 0, TM);
+  CX = GW/2;
+  CY = R1;
 
-      // and possibly add the second hand
-      if (with_seconds) {
-        let a = 2.0 * Math.PI * seconds / 60.0;
-        g.drawRotLine(Math.sin(a), Math.cos(a), CX, CY+TM, RC1, R1);
-      }
+  // If we're in the small-face + text regime, we're going to buffer
+  // the full screen but draw the clock face further down to give
+  // space for the text.
+  //
+  // Compare with modes 0 (full-screen) and 1 (with_widgets==true)
+  // where the face is drawn at the top of the buffer, but drawn
+  // lower down the screen (so CY doesn't move)
+  if (mode > 1) {
+    CY += 36;
+  }
 
-      // And draw widgets if we're in that mode
-      if (with_widgets)
-        Bangle.drawWidgets();
-    }
+  // We only don't bother redrawing the face from modes 2 to 5, as
+  // they're the same.
+  if (!faceImg || mode<3) {
+    faceImg = undefined;
+  }
 
-    // Schedule to repeat this.  A `setTimeout(1000)` isn't good
-    // enough, as all the above might've taken some milliseconds and
-    // we don't want to drift.
-    if (with_seconds)
-      inOneSecond(drawAll);
-    else
-      inOneMinute(drawAll);
-  };
-
-  const setButtons = () => {
-    const opts = { repeat: true, edge:'rising', debounce:30};
-
-    // BTN1: enable/disable second hand
-    setWatch(changeSeconds, BTN1, opts);
-
-    // BTN2: return to launcher
-    setWatch(Bangle.showLauncher, BTN2, { repeat:false, edge:'falling' });
-
-    // BTN3: change display mode
-    setWatch(function () { ++mode; setMode(); drawAll(true); }, BTN3, opts);
-  };
-
-  // Load display parameters based on `mode`
-  const setMode = () => {
-    // Normalize mode to 0 <= mode <= 5
-    mode = (6+mode) % 6;
-
-    // [R1, R2, RC1, RC2, HW2, MW3, HR, MR, M, HSCALE] =
-    const scales = [
-      [120, 84, 17,   12.4, 4.6,  2.2, 8, 2, 1,    h => (3.0 + Math.ceil(h/1.5)) ],
-      [102, 70, 14.6, 10.7, 3.88, 1.8, 8, 2, 1,    h => (2.4 + Math.ceil(h/1.6)) ],
-    ];
-
-    if (mode < 3) {
-      // Face without time/date text.  Might have widgets though.
-      with_digital_time = with_digital_date = false;
-      with_widgets = (mode == 1);
-    }
-    else {
-      // Face with time/date text, but no widgets
-      with_digital_time = (mode-2)&1;
-      with_digital_date = (mode-2)&2;
-      with_widgets = false;
-    }
-
-    // Destructure the array to the global display parameters
-    let arr = scales[mode > 0 ? 1 : 0];
-    R1 = arr[0];
-    R2 = arr[1];
-    RC1 = arr[2];
-    RC2 = arr[3];
-    HW2 = arr[4];
-    MW2 = arr[5];
-    HR = R2 - arr[6];
-    MR = R1 - arr[7];
-    M = arr[8];
-    HSCALE = arr[9];
-    TM = with_widgets ? 36 : 0;
-
-    CX = GW/2;
-    CY = R1;
-
-    // If we're in the small-face + text regime, we're going to buffer
-    // the full screen but draw the clock face further down to give
-    // space for the text.
-    //
-    // Compare with modes 0 (full-screen) and 1 (with_widgets==true)
-    // where the face is drawn at the top of the buffer, but drawn
-    // lower down the screen (so CY doesn't move)
-    if (mode > 1) {
-      CY += 36;
-    }
-
-    // We only don't bother redrawing the face from modes 2 to 5, as
-    // they're the same.
-    if (!faceImg || mode<3) {
-      faceImg = undefined;
-    }
-
-    // Store the settings for next time
-    try {
-      storage.writeJSON(filename, [mode,with_seconds]);
-    } catch (e) {
-      console.log(e);
-    }
-
-    // Clear the screen: we need to make sure all parts are cleaned off.
-    g.clear();
-  };
-
-  const changeSeconds = () => {
-    with_seconds = !with_seconds;
-    drawAll(true);
-  };
-
-  Bangle.loadWidgets();
-
-  // Restore mode
+  // Store the settings for next time
   try {
-    conf = storage.readJSON(filename);
-    mode = conf[0];
-    with_seconds = conf[1];
+    storage.writeJSON(filename, [mode,with_seconds]);
   } catch (e) {
     console.log(e);
-    mode = 1;
   }
 
-  setButtons();
-  setMode();
-  drawAll();
+  // Clear the screen: we need to make sure all parts are cleaned off.
+  g.clear();
+};
 
-  Bangle.on('lcdPower', (on) => {
-    if (on) {
-      Bangle.loadWidgets();
-      Bangle.drawWidgets();
-      drawAll();
-    } else {
-      clearTimeout();
-    }
-  });
+const changeSeconds = () => {
+  with_seconds = !with_seconds;
+  drawAll(true);
+};
 
-})(g);
+Bangle.loadWidgets();
+
+// Restore mode
+try {
+  conf = storage.readJSON(filename);
+  mode = conf[0];
+  with_seconds = conf[1];
+} catch (e) {
+  console.log(e);
+  mode = 1;
+}
+
+setButtons();
+setMode();
+drawAll();
+
+Bangle.on('lcdPower', (on) => {
+  if (on) {
+    Bangle.loadWidgets();
+    Bangle.drawWidgets();
+    drawAll();
+  } else {
+    clearTimeout();
+  }
+});
diff --git a/apps/berlinc/ChangeLog b/apps/berlinc/ChangeLog
index a33332bc4..65ed0505f 100644
--- a/apps/berlinc/ChangeLog
+++ b/apps/berlinc/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Shrinked size to avoid cut-off edges on the physical device. BTN3: show date. BTN1: show time in decimal.
+0.04: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/berlinc/berlin-clock.js b/apps/berlinc/berlin-clock.js
index 3950147b8..144fa5ba7 100644
--- a/apps/berlinc/berlin-clock.js
+++ b/apps/berlinc/berlin-clock.js
@@ -16,7 +16,7 @@ time_digit = [];
 function drawBerlinClock() {
   g.clear();
   var now = new Date();
-  
+
   // show date below the clock
   if (show_date) {
     var yr = now.getFullYear();
@@ -28,7 +28,7 @@ function drawBerlinClock() {
     g.setFontAlign(-1,-1);
     g.drawString(dateString, ( g.getWidth() - strWidth ) / 2, height + offset + 4);
   }
-  
+
   rowlights[0] = Math.floor(now.getHours() / 5);
   rowlights[1] = now.getHours() % 5;
   rowlights[2] = Math.floor(now.getMinutes() / 5);
@@ -62,7 +62,7 @@ function drawBerlinClock() {
         } else {
           g.setColor(1, 0, 0);
         }
-        g.fillRect(x1 + 2, y1 + 2, x2 - 2, y2 - 2);        
+        g.fillRect(x1 + 2, y1 + 2, x2 - 2, y2 - 2);
       }
       if (row == 3 && show_time) {
         g.setColor(1,1,1);
@@ -100,9 +100,11 @@ g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 drawBerlinClock();
-// Toggle date display, when BTN3 is pressed
-setWatch(toggleTime,BTN1, { repeat : true, edge: "falling"});
-// Toggle date display, when BTN3 is pressed
-setWatch(toggleDate,BTN3, { repeat : true, edge: "falling"});
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+if (BTN3) {
+  // Toggle date display, when BTN3 is pressed
+  setWatch(toggleTime,BTN1, { repeat : true, edge: "falling"});
+  // Toggle date display, when BTN3 is pressed
+  setWatch(toggleDate,BTN3, { repeat : true, edge: "falling"});
+}
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/binclock/ChangeLog b/apps/binclock/ChangeLog
index 2378e52f8..dc4ed8308 100644
--- a/apps/binclock/ChangeLog
+++ b/apps/binclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Fixed bug where screen didn't clear so incorrect time displayed.
+0.03: Update to use Bangle.setUI instead of setWatch
diff --git a/apps/binclock/app.js b/apps/binclock/app.js
index 7808dfe45..f8cbe8dd5 100644
--- a/apps/binclock/app.js
+++ b/apps/binclock/app.js
@@ -23,17 +23,17 @@ function drawTime(d) {
 }
 
 function updateHourArray(hours){
-  
+
   var j;
   for(j=0;j<hourLED.length;j++){
     prevHour[j] = hourLED[j];
   }
-  
+
   var i;
   for(i = 0;i < hourLED.length;i++){
-    hourLED[i]=0; 
+    hourLED[i]=0;
   }
-  
+
   if(hours > 15){
     hourLED[0] = 1;
     hours = hours - 16;
@@ -53,9 +53,9 @@ function updateHourArray(hours){
   if(hours > 0){
     hourLED[4] = 1;
   }
-  
+
   return hourLED;
-  
+
 }
 
 function updateMinuteArray(minutes){
@@ -63,12 +63,12 @@ function updateMinuteArray(minutes){
   for(j=0;j<minuteLED.length;j++){
     prevMinute[j] = minuteLED[j];
   }
-  
+
   var i;
   for(i = 0;i < minuteLED.length;i++){
-    minuteLED[i]=0; 
+    minuteLED[i]=0;
   }
-  
+
   if(minutes > 31){
     minuteLED[0] = 1;
     minutes = minutes - 32;
@@ -92,20 +92,20 @@ function updateMinuteArray(minutes){
   if(minutes > 0){
     minuteLED[5] = 1;
   }
-  
+
   return minuteLED;
-  
+
 }
 
 function draw(){
-  
+
   // work out how to display the current time
   var d = new Date();
   var h = d.getHours(), m = d.getMinutes();
-  
+
   updateHourArray(h);
   updateMinuteArray(m);
-  
+
   var i;
   //Draw hour circles
   for(i=0; i<hourLED.length; i++){
@@ -118,10 +118,10 @@ function draw(){
         g.fillCircle(24+i*48,50,10);
         g.setColor(colour);
         g.drawCircle(24+i*48,50,10);
-      } 
+      }
     }
-  }  
-  
+  }
+
   for(i=0; i<minuteLED.length; i++){
     if(prevMinute[i] == minuteLED[i]){
       if(minuteLED[i] == 1){
@@ -132,21 +132,21 @@ function draw(){
         g.fillCircle(20+i*40,100,10);
         g.setColor(colour);
         g.drawCircle(20+i*40,100,10);
-      }    
+      }
     }
   }
-  
+
   // draw the date, in a normal font
   g.setFont("6x8");
   g.setFontAlign(0,1); // align center bottom
   // pad the date - this clears the background if the date were to change length
   var dateStr = "    "+require("locale").date(d)+"    ";
   g.drawString(dateStr, g.getWidth()/2, 130, true /*clear background*/);
-  
+
   if(displayTime){
     drawTime(d);
   }else{
-    g.clearRect(0,240,240,130); 
+    g.clearRect(0,240,240,130);
   }
 }
 
@@ -167,12 +167,12 @@ Bangle.on('lcdPower',on=>{
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
-setWatch(function() {
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn!=1) return;
   if(displayTime == 0){
     displayTime = 1;
   } else{
-    displayTime = 0; 
+    displayTime = 0;
   }
-}, BTN, {edge:"rising", debounce:50, repeat:true});
+});
diff --git a/apps/blobclk/ChangeLog b/apps/blobclk/ChangeLog
index 10983d7e1..9c4ef5b7b 100644
--- a/apps/blobclk/ChangeLog
+++ b/apps/blobclk/ChangeLog
@@ -4,3 +4,4 @@
 0.03: Modified for use with new bootloader and firmware
 0.04: Modified to account for changes in the behavior of Graphics.fillPoly
 0.05: Slight increase to draw speed after LCD on
+0.06: Update to use Bangle.setUI instead of setWatch, allow themes and different size screens
diff --git a/apps/blobclk/clock-blob.js b/apps/blobclk/clock-blob.js
index 9b68bd4bd..c84b8a1e6 100644
--- a/apps/blobclk/clock-blob.js
+++ b/apps/blobclk/clock-blob.js
@@ -1,4 +1,6 @@
-const buf = Graphics.createArrayBuffer(144,200,1,{msb:true});
+let big = g.getHeight() > 200;
+const buf = Graphics.createArrayBuffer(big ? 144 : 120, big ? 180 : 150,1,{msb:true});
+// TODO: convert these to Polys -> much faster and cleaner!
 const NUMBERS = [
   [1,1,1,1,3,1,1,0,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1],//0
   [0,1,1,1,3,0,0,1,1,1,0,0,1,1,1,0,0,1,1,1,0,0,1,1,1],//1
@@ -14,8 +16,10 @@ const NUMBERS = [
 let intervalRef = null;
 let digits = [-1,-1,-1,-1,-1,-1];
 function flip() {
-  g.setColor(1,1,1);
-  g.drawImage({width:buf.getWidth(),height:buf.getHeight(),buffer:buf.buffer},55,26);
+  g.reset();
+  g.drawImage({width:buf.getWidth(),height:buf.getHeight(),buffer:buf.buffer},
+              (g.getWidth() - buf.getWidth())/2,
+              26 + (g.getHeight() - (buf.getHeight()+24))/2);
 }
 function drawPixel(ox,oy,x,y,r,p) {
   let x1 = ox+x*(r*2);
@@ -53,26 +57,31 @@ function redraw() {
 
   let newDigits = [Math.floor(hours/10),hours%10,Math.floor(mins/10),mins%10,Math.floor(secs/10),secs%10];
 
+  let s = big?6:5; // size of main digits
+  let y2 = big?72:55;
+  let y3 = big?144:110;
+
+
   for (var p = 0;p<25;p++) {
     var px = p%5;
     var py = Math.floor(p/5);
     if (digits[0] === -1 || NUMBERS[newDigits[0]][p] !== NUMBERS[digits[0]][p] ) {
-      drawPixel(0,20,px,py,6,NUMBERS[newDigits[0]][p]);
+      drawPixel(0,0,px,py,s,NUMBERS[newDigits[0]][p]);
     }
     if (digits[1] === -1 || NUMBERS[newDigits[1]][p] !== NUMBERS[digits[1]][p] ) {
-      drawPixel(78,20,px,py,6,NUMBERS[newDigits[1]][p]);
+      drawPixel(13*s,0,px,py,s,NUMBERS[newDigits[1]][p]);
     }
     if (digits[2] === -1 || NUMBERS[newDigits[2]][p] !== NUMBERS[digits[2]][p] ) {
-      drawPixel(0,92,px,py,6,NUMBERS[newDigits[2]][p]);
+      drawPixel(0,y2,px,py,s,NUMBERS[newDigits[2]][p]);
     }
     if (digits[3] === -1 || NUMBERS[newDigits[3]][p] !== NUMBERS[digits[3]][p] ) {
-      drawPixel(78,92,px,py,6,NUMBERS[newDigits[3]][p]);
+      drawPixel(13*s,y2,px,py,s,NUMBERS[newDigits[3]][p]);
     }
     if (digits[4] === -1 || NUMBERS[newDigits[4]][p] !== NUMBERS[digits[4]][p] ) {
-      drawPixel(69,164,px,py,3,NUMBERS[newDigits[4]][p]);
+      drawPixel(17*s - 3*12,y3,px,py,3,NUMBERS[newDigits[4]][p]);
     }
     if (digits[5] === -1 || NUMBERS[newDigits[5]][p] !== NUMBERS[digits[5]][p] ) {
-      drawPixel(108,164,px,py,3,NUMBERS[newDigits[5]][p]);
+      drawPixel(17*s,y3,px,py,3,NUMBERS[newDigits[5]][p]);
     }
   }
   digits = newDigits;
@@ -99,5 +108,5 @@ Bangle.on('lcdPower',function(on) {
     clearTimers();
   }
 });
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index 37ce0d0ac..ccf97a9eb 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -25,3 +25,4 @@
 0.24: Add Bangle.setUI polyfill
 0.25: Fix error in 'no clock app' message
 0.26: Remove buzz in setUI polyfill (#750)
+0.27: Update polyfill for most recent changes
diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js
index 9dd49453e..014edd552 100644
--- a/apps/boot/bootupdate.js
+++ b/apps/boot/bootupdate.js
@@ -3,6 +3,7 @@ recalculates, but this avoids us doing a whole bunch of reconfiguration most
 of the time. */
 E.showMessage("Updating boot0...");
 var s = require('Storage').readJSON('setting.json',1)||{};
+var isB2 = process.env.HWVERSION; // Is Bangle.js 2
 var boot = "";
 var CRC = E.CRC32(require('Storage').read('setting.json'))+E.CRC32(require('Storage').list(/\.boot\.js/));
 boot += `if (E.CRC32(require('Storage').read('setting.json'))+E.CRC32(require('Storage').list(/\.boot\.js/))!=${CRC}) { eval(require('Storage').read('bootupdate.js'));} else {\n`;
@@ -81,9 +82,9 @@ if (s.passkey!==undefined && s.passkey.length==6) boot+=`NRF.setSecurity({passke
 if (s.whitelist) boot+=`NRF.on('connect', function(addr) { if (!(require('Storage').readJSON('setting.json',1)||{}).whitelist.includes(addr)) NRF.disconnect(); });\n`;
 // Pre-2v10 firmwares without a theme/setUI
 if (!g.theme) {
-  boot += `g.theme={fg:-1,bg:0,fg2:-1,bg2:7,fgH:-1,bgH:0x02F7};\n`;
+  boot += `g.theme={fg:-1,bg:0,fg2:-1,bg2:7,fgH:-1,bgH:0x02F7,dark:true};\n`;
 }
-if (!Bangle.setUI) {
+if (!Bangle.setUI) { // assume this is just for F18 - Q3 should already have it
   boot += `Bangle.setUI=function(mode, cb) {
 if (Bangle.btnWatches) {
   Bangle.btnWatches.forEach(clearWatch);
@@ -114,6 +115,18 @@ else if (mode=="updown") {
   Bangle.on("swipe", Bangle.swipeHandler);
   Bangle.touchHandler = d => {cb();};
   Bangle.on("touch", Bangle.touchHandler);
+} else if (mode=="clock") {
+  Bangle.CLOCK=1;
+  Bangle.btnWatches = [
+    setWatch(Bangle.showLauncher, BTN2, {repeat:1,edge:"falling"})
+  ];
+} else if (mode=="clockupdown") {
+  Bangle.CLOCK=1;
+  Bangle.btnWatches = [
+    setWatch(function() { cb(-1); }, BTN1, {repeat:1}),
+    setWatch(function() { cb(1); }, BTN3, {repeat:1}),
+    setWatch(Bangle.showLauncher, BTN2, {repeat:1,edge:"falling"})
+  ];
 } else
   throw new Error("Unknown UI mode");
 };\n`;
diff --git a/apps/numerals/ChangeLog b/apps/numerals/ChangeLog
index 2869074a6..f94d719f4 100644
--- a/apps/numerals/ChangeLog
+++ b/apps/numerals/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Improve rendering of Numeral 1, fix issue with alarms not showing up
 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
diff --git a/apps/numerals/numerals.app.js b/apps/numerals/numerals.app.js
index 49a41732e..3c7607eb1 100644
--- a/apps/numerals/numerals.app.js
+++ b/apps/numerals/numerals.app.js
@@ -22,16 +22,17 @@ var _12hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]||fal
 var _hCol = ["#ff5555","#ffff00","#FF9901","#2F00FF"];
 var _mCol = ["#55ff55","#ffffff","#00EFEF","#FFBF00"];
 var _rCol = 0;
+var scale = g.getWidth()/240;
 var interval = 0;
 const REFRESH_RATE = 10E3;
 var drawFuncs = {
   fill : function(poly,isHole){
-    if (isHole) g.setColor(0);
+    if (isHole) g.setColor(g.theme.bg);
     g.fillPoly(poly,true);
   },
   framefill : function(poly,isHole){
     var c = g.getColor();
-    g.setColor(isHole ? 0 : ((c&0b1111011111011110)>>1)); // 16 bit half bright
+    g.setColor(isHole ? g.theme.bg : ((c&0b1111011111011110)>>1)); // 16 bit half bright
     g.fillPoly(poly,true);
     g.setColor(c);
     g.drawPoly(poly,true);
@@ -48,7 +49,8 @@ var drawFuncs = {
 };
 
 function translate(tx, ty, p){
-  return p.map((x, i)=> x+((i&1)?ty:tx));
+  //return p.map((x, i)=> x+((i&1)?ty:tx));
+  return g.transformVertices(p, {x:tx,y:ty,scale:scale});
 }
 
 
@@ -57,15 +59,14 @@ if (!settings) {
   settings = {
     color:0,
     drawMode:"fill",
-    menuButton:24,
     showDate:0
   };
 }
 
 function drawNum(num,col,x,y,func,funcName){
   g.setColor(col);
-  let tx = x*100+25;
-  let ty = y*104+32;
+  let tx = (x*100+25) * scale;
+  let ty = (y*104+32) * scale;
   for (let i=0;i<numerals[num].length;i++){
     g.setColor(col);
     func(translate(tx,ty,numerals[num][i]), i>0);
@@ -98,9 +99,9 @@ function setUpdateInt(set){
   if (set) interval=setInterval(draw, REFRESH_RATE);
 }
 
-Bangle.setLCDMode();
-g.reset().clear();
-setWatch(Bangle.showLauncher, settings.menuButton, {repeat:false,edge:"falling"});
+g.clear(1);
+// Show launcher when button pressed
+Bangle.setUI("clock");
 if (settings.color>0) _rCol=settings.color-1;
 setUpdateInt(1);
 draw();
diff --git a/apps/numerals/numerals.settings.js b/apps/numerals/numerals.settings.js
index 991abc888..70f6e0d98 100644
--- a/apps/numerals/numerals.settings.js
+++ b/apps/numerals/numerals.settings.js
@@ -6,14 +6,12 @@
     numeralsSettings = {
       color:0,
       drawMode:"fill",
-      menuButton:22,
       showDate:0
     };
     updateSettings();
   }
   let numeralsSettings = storage.readJSON('numerals.json',1);
   if (!numeralsSettings) resetSettings();
-  if (numeralsSettings.menuButton===undefined) numeralsSettings.menuButton=22;
   let dm = ["fill","frame","framefill","thickframe"];
   let col = ["rnd","r/g","y/w","o/c","b/y"];
   let btn = [[24,"BTN1"],[22,"BTN2"],[23,"BTN3"],[11,"BTN4"],[16,"BTN5"]];
@@ -31,12 +29,6 @@
       format: v=>dm[v],
       onchange: v=> { numeralsSettings.drawMode=dm[v]; updateSettings();}
     },
-    "Menu button": {
-      value: btn.findIndex(e=>e[0]==numeralsSettings.menuButton),
-      min:0,max:btn.length-1,
-      format: v=>btn[v][1],
-      onchange: v=> { numeralsSettings.menuButton=btn[v][0]; updateSettings();}
-    },
     "Date on touch": {
       value: 0|numeralsSettings.showDate,
       min:0,max:1,

From f6389ead767f6003edaf9507662e33a694044df5 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 13:24:43 +0100
Subject: [PATCH 28/37] cliock 0.13: Use setUI, work with smaller screens and
 themes

---
 apps.json             |  4 ++--
 apps/cliock/ChangeLog |  3 ++-
 apps/cliock/app.js    | 43 ++++++++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/apps.json b/apps.json
index 3a68bc8b5..7b8b0c6f9 100644
--- a/apps.json
+++ b/apps.json
@@ -1289,9 +1289,9 @@
     "name": "Commandline-Clock",
     "shortName":"CLI-Clock",
     "icon": "app.png",
-    "version":"0.12",
+    "version":"0.13",
     "description": "Simple CLI-Styled Clock",
-    "tags": "clock,cli,command,bash,shell",
+    "tags": "clock,cli,command,bash,shell,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/cliock/ChangeLog b/apps/cliock/ChangeLog
index 53616638b..66ef62eae 100644
--- a/apps/cliock/ChangeLog
+++ b/apps/cliock/ChangeLog
@@ -1,6 +1,7 @@
 0.07: Submitted to App Loader
-0.08: Fixes issue where face would redraw on wake leading to all memory being used and watch crashing. 
+0.08: Fixes issue where face would redraw on wake leading to all memory being used and watch crashing.
 0.09: Add BTN1 status line with ID,Fw ver, mem %, battery %
 0.10: Icon fixed for transparency
 0.11: added Heart Rate Monitor status and ability to turn on/off
 0.12: added support for different locales
+0.13: Use setUI, work with smaller screens and themes
diff --git a/apps/cliock/app.js b/apps/cliock/app.js
index d9541f545..6853aaf6f 100644
--- a/apps/cliock/app.js
+++ b/apps/cliock/app.js
@@ -1,4 +1,5 @@
-var fontsize = 3;
+var fontsize = g.getWidth()>200 ? 3 : 2;
+var fontheight = 10*fontsize;
 var locale = require("locale");
 var marginTop = 40;
 var flag = false;
@@ -39,22 +40,23 @@ function updateTime(){
     updateRest(now);
 }
 function writeLineStart(line){
-  g.drawString(">",4,marginTop+line*30);
+  g.drawString(">",4,marginTop+line*fontheight);
 }
 function writeLine(str,line){
+  var y = marginTop+line*fontheight;
   g.setFont("6x8",fontsize);
   //g.setColor(0,1,0);
-  g.setColor(0,0x07E0,0);
+  g.setColor("#0f0");
   g.setFontAlign(-1,-1);
-  g.clearRect(0,marginTop+line*30,((str.length+1)*20),marginTop+25+line*30);
+  g.clearRect(0,y,((str.length+1)*20),y+fontheight-1);
   writeLineStart(line);
-  g.drawString(str,25,marginTop+line*30);
-} 
+  g.drawString(str,25,y);
+}
 
 function drawInfo(line) {
   let val;
   let str = "";
-  let col = 0x07E0; // green
+  let col = "#0f0"; // green
 
   //console.log("drawInfo(), infoMode=" + infoMode + " funcMode=" + functionMode);
 
@@ -62,15 +64,15 @@ function drawInfo(line) {
   case NONE_FN_MODE:
     break;
   case HRT_FN_MODE:
-    col = 0x07FF; // cyan
+    col = "#0ff"; // cyan
     str = "HRM: " + (hrtOn ? "ON" : "OFF");
     drawModeLine(line,str,col);
     return;
   }
-  
+
   switch(infoMode) {
   case NONE_MODE:
-    col = 0x0000;
+    col = "#fff";
     str = "";
     break;
   case HRT_MODE:
@@ -100,10 +102,11 @@ function drawInfo(line) {
 
 function drawModeLine(line, str, col) {
   g.setColor(col);
-  g.fillRect(0, marginTop-3+line*30, 239, marginTop+25+line*30);
-  g.setColor(0,0,0);
+  var y = marginTop+line*fontheight;
+  g.fillRect(0, y, 239, y+fontheight-1);
+  g.setColor(0);
   g.setFontAlign(0, -1);
-  g.drawString(str, g.getWidth()/2, marginTop+line*30);
+  g.drawString(str, g.getWidth()/2, y);
 }
 
 function changeInfoMode() {
@@ -160,7 +163,7 @@ function changeFunctionMode() {
     functionMode = NONE_FN_MODE;
   }
   //console.log(functionMode);
-  
+
 }
 
 function stepsWidget() {
@@ -185,10 +188,12 @@ Bangle.loadWidgets();
 Bangle.drawWidgets();
 drawAll();
 Bangle.on('lcdPower',function(on) {
-  if (on)
-    drawAll();
+  if (on) drawAll();
 });
 var click = setInterval(updateTime, 1000);
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
-setWatch(() => { changeInfoMode(); drawAll(); }, BTN1, {repeat: true});
-setWatch(() => { changeFunctionMode(); drawAll(); }, BTN3, {repeat: true});
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn==0) changeInfoMode();
+  if (btn==1) changeFunctionMode();
+  drawAll();
+});

From 1d3079528ace55e5e9415b0b782fe25b919a3fdb Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 13:34:45 +0100
Subject: [PATCH 29/37] Use setUI, work with smaller screens and themes

---
 apps/boldclk/ChangeLog        |  1 +
 apps/boldclk/bold_clock.js    | 23 ++++++++++-------------
 apps/clock2x3/ChangeLog       |  1 +
 apps/clock2x3/clock2x3-app.js | 14 ++++++++------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/apps/boldclk/ChangeLog b/apps/boldclk/ChangeLog
index 0d02bf644..f5d1af878 100644
--- a/apps/boldclk/ChangeLog
+++ b/apps/boldclk/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Tweak for more efficient rendering, and firmware 2v06
+0.04: Work with themes, smaller screens
diff --git a/apps/boldclk/bold_clock.js b/apps/boldclk/bold_clock.js
index b7eaa8968..191b6ec4f 100644
--- a/apps/boldclk/bold_clock.js
+++ b/apps/boldclk/bold_clock.js
@@ -12,9 +12,9 @@ var minute_hand = {
 //g.fillRect(0,24,239,239); // Apps area
 let intervalRef = null;
 const p180 = Math.PI/180;
-const clock_center = {x:Math.floor((240-1)/2), y:24+Math.floor((239-24)/2)};
+const clock_center = {x:Math.floor((g.getWidth()-1)/2), y:24+Math.floor((g.getHeight()-25)/2)};
 // ={ x: 119, y: 131 }
-const radius = Math.floor((239-24+1)/2); // =108
+const radius = Math.floor((g.getWidth()-24+1)/2); // =108
 
 let tick0 = Graphics.createArrayBuffer(30,8,1,{msb:true});
 tick0.fillRect(0,0,tick0.getWidth()-1, tick0.getHeight()-1);
@@ -60,18 +60,15 @@ function hour_angle(date){
 function draw_clock(){
   //console.log("draw_clock");
   let date = new Date();
-  //g.clear();
-  g.setBgColor(0,0,0);
-  g.setColor(0,0,0);
-  g.fillRect(0,24,239,239); // clear app area
-  g.setColor(1,1,1);
+  g.reset();
+  g.clearRect(0,24,239,239); // clear app area
 
   // draw cross lines for testing
   // g.setColor(1,0,0);
   // g.drawLine(clock_center.x - radius, clock_center.y, clock_center.x + radius, clock_center.y);
   // g.drawLine(clock_center.x, clock_center.y - radius, clock_center.x, clock_center.y + radius);
 
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
   let ticks = [0, 90, 180, 270];
   ticks.forEach((item)=>{
     let agl = item+180;
@@ -87,13 +84,13 @@ function draw_clock(){
   let minute_agl = minute_angle(date);
   g.drawImage(hour_hand, hour_pos_x(hour_agl), hour_pos_y(hour_agl), {rotate:hour_agl*p180}); //
   g.drawImage(minute_hand, minute_pos_x(minute_agl), minute_pos_y(minute_agl), {rotate:minute_agl*p180}); //
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
   g.fillCircle(clock_center.x, clock_center.y, 6);
-  g.setColor(0,0,0);
+  g.setColor(g.theme.bg);
   g.fillCircle(clock_center.x, clock_center.y, 3);
 
   // draw minute ticks. Takes long time to draw!
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
   for (var i=0; i<60; i++){
     let agl = i*6+180;
     g.drawImage(tick1.asImage(), rotate_around_x(big_wheel_x(i*6), agl, tick1), rotate_around_y(big_wheel_y(i*6), agl, tick1), {rotate:agl*p180});
@@ -141,5 +138,5 @@ g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 startTimers();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/clock2x3/ChangeLog b/apps/clock2x3/ChangeLog
index 88876affa..ef8057d6e 100644
--- a/apps/clock2x3/ChangeLog
+++ b/apps/clock2x3/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Added 'reset' so we don't get the font color from widgets
 0.04: Changed name from clck3x2 to clock2x3
+0.05: Use setUI, work with smaller screens and themes
diff --git a/apps/clock2x3/clock2x3-app.js b/apps/clock2x3/clock2x3-app.js
index 4caec28cb..bfe6a9ea8 100644
--- a/apps/clock2x3/clock2x3-app.js
+++ b/apps/clock2x3/clock2x3-app.js
@@ -1,8 +1,10 @@
+
+const big = g.getWidth()>200;
 const ox=10; // x offset
-const oy=80;
-const pw=20; // pixel width
-const ps=5; // pixel spacing
-const ds=10; // digit spacing
+const oy=big ? 80 : 70;
+const pw=big ? 20 : 14; // pixel width
+const ps=big ? 5 : 3; // pixel spacing
+const ds=big ? 10 : 8; // digit spacing
 const ms=20; // middle space
 
 const x00=ox; // digit 0, pixel 0, x position
@@ -90,7 +92,7 @@ Bangle.on('lcdPower', function(on){
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 drawTime();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

From 36a16789315e56a4c6ab6eb0434f4dda25b97d50 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:00:40 +0100
Subject: [PATCH 30/37] update APIs

---
 apps.json                 | 18 +++++++++---------
 apps/vibrclock/ChangeLog  |  1 +
 apps/vibrclock/app.js     | 27 ++++++++++++++-------------
 apps/wclock/ChangeLog     |  1 +
 apps/wclock/clock-word.js | 24 +++++++++++++-----------
 apps/widclk/ChangeLog     |  1 +
 apps/widclk/widget.js     |  5 ++++-
 apps/worldclock/ChangeLog |  1 +
 apps/worldclock/app.js    | 16 ++++++++--------
 9 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/apps.json b/apps.json
index 7b8b0c6f9..2e9124c2f 100644
--- a/apps.json
+++ b/apps.json
@@ -206,9 +206,9 @@
   { "id": "wclock",
     "name": "Word Clock",
     "icon": "clock-word.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "Display Time as Text",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
@@ -325,9 +325,9 @@
   { "id": "clock2x3",
     "name": "2x3 Pixel Clock",
     "icon": "clock2x3.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "This is a simple clock using minimalist 2x3 pixel numerical digits",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type": "clock",
     "allow_emulator":true,
     "storage": [
@@ -878,7 +878,7 @@
   { "id": "vibrclock",
     "name": "Vibrate Clock",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "When BTN1 is pressed, vibrate out the time as a series of buzzes, one digit at a time. Hours, then Minutes. Zero is signified by one long buzz. Otherwise a simple digital clock.",
     "tags": "clock",
     "type":"clock",
@@ -1119,9 +1119,9 @@
   { "id": "boldclk",
     "name": "Bold Clock",
     "icon": "bold_clock.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "Simple, readable and practical clock",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
@@ -1132,7 +1132,7 @@
   { "id": "widclk",
     "name": "Digital clock widget",
     "icon": "widget.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "A simple digital clock widget",
     "tags": "widget,clock",
     "type":"widget",
@@ -2477,7 +2477,7 @@
     "name": "World Clock - 4 time zones",
     "shortName":"World Clock",
     "icon": "app.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "Current time zone plus up to four others",
     "tags": "clock",
     "type" : "clock",
diff --git a/apps/vibrclock/ChangeLog b/apps/vibrclock/ChangeLog
index 82be3ac70..410bd0656 100644
--- a/apps/vibrclock/ChangeLog
+++ b/apps/vibrclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First commit
 0.02: Made Date more visible
+0.03: setUI and support for different screens
diff --git a/apps/vibrclock/app.js b/apps/vibrclock/app.js
index 9995eea12..3941c1b47 100644
--- a/apps/vibrclock/app.js
+++ b/apps/vibrclock/app.js
@@ -4,8 +4,9 @@ require("Font7x11Numeric7Seg").add(Graphics);
 // Check settings for what type our clock should be
 var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
 // position on screen
-const X = 160, Y = 140;
- 
+const big = g.getWidth()>200;
+const X = big?160:135, Y = big?140:100;
+
 function draw() {
   // work out how to display the current time
   var d = new Date();
@@ -25,13 +26,13 @@ function draw() {
   g.setFont("7x11Numeric7Seg",2);
   g.drawString(("0"+d.getSeconds()).substr(-2), X+35, Y, true /*clear background*/);
   // draw the date, in a normal font
-  g.setFont("6x8", 3);
+  g.setFont("6x8", big?3:2);
   g.setFontAlign(0,1); // align center bottom
   // pad the date - this clears the background if the date were to change length
   var dateStr = "    "+require("locale").date(d)+"    ";
   g.drawString(dateStr, g.getWidth()/2, Y+35, true /*clear background*/);
 }
- 
+
 // Clear the screen once, at startup
 g.clear();
 // draw immediately at first
@@ -46,12 +47,15 @@ Bangle.on('lcdPower',on=>{
     draw(); // draw immediately
   }
 });
+
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn==0) vibrateTime();
+});
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
- 
+
 // ====================================== Vibration
 // vibrate 0..9
 function vibrateDigit(num) {
@@ -74,24 +78,21 @@ function vibrateNumber(num) {
     });
   });
 }
- 
+
 var vibrateBusy;
 function vibrateTime() {
   if (vibrateBusy) return;
   vibrateBusy = true;
- 
+
   var d = new Date();
   var hours = d.getHours(), minutes = d.getMinutes();
   if (is12Hour) {
     if (hours == 0) hours = 12;
     else if (hours>12) hours -= 12;
   }
- 
+
   vibrateNumber(hours.toString()).
     then(() => new Promise(resolve=>setTimeout(resolve,500))).
     then(() => vibrateNumber(minutes.toString())).
     then(() => vibrateBusy=false);
 }
- 
-// when BTN1 pressed, vibrate
-setWatch(vibrateTime, BTN1, {repeat:true,edge:"rising"});
diff --git a/apps/wclock/ChangeLog b/apps/wclock/ChangeLog
index 7819dbe2a..9a2ebdd5f 100644
--- a/apps/wclock/ChangeLog
+++ b/apps/wclock/ChangeLog
@@ -1 +1,2 @@
 0.02: Modified for use with new bootloader and firmware
+0.03: setUI and support for different screens
diff --git a/apps/wclock/clock-word.js b/apps/wclock/clock-word.js
index b8c36f548..aff134273 100644
--- a/apps/wclock/clock-word.js
+++ b/apps/wclock/clock-word.js
@@ -36,16 +36,18 @@ const mins = {
   7: ["TO", 43, 53]
 };
 
+var big = g.getWidth()>200
 // offsets and incerments
-const xs = 35;
-const ys = 31;
-const dy = 22;
-const dx = 25;
+const xs = big ? 35 : 20;
+const ys = big ? 31 : 28;
+const dx = big ? 25 : 20;
+const dy = big ? 22 : 16;
 
 // font size and color
-const fontSize = 3;  // "6x8"
-const passivColor = 0x3186 /*grey*/ ;
-const activeColor = 0xF800 /*red*/ ;
+const fontSize = big ? 3 : 2;  // "6x8"
+const lowBPP = g.getBPP && (g.getBPP()<12);
+const passivColor = lowBPP ? "#788" : "#333" /*grey*/ ;
+const activeColor = lowBPP ? "#F00" : "#F00" /*red*/ ;
 
 function drawWordClock() {
 
@@ -112,8 +114,8 @@ function drawWordClock() {
 
   // display digital time
   g.setColor(activeColor);
-  g.clearRect(0, 215, 240, 240);
-  g.drawString(time, 120, 215);
+  g.clearRect(0, g.getHeight()-fontSize*8, g.getWidth(), g.getHeight());
+  g.drawString(time, g.getWidth()/2, g.getHeight()-fontSize*8);
 }
 
 Bangle.on('lcdPower', function(on) {
@@ -126,5 +128,5 @@ Bangle.drawWidgets();
 setInterval(drawWordClock, 1E4);
 drawWordClock();
 
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/widclk/ChangeLog b/apps/widclk/ChangeLog
index 6fda78a08..655679515 100644
--- a/apps/widclk/ChangeLog
+++ b/apps/widclk/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Now refresh battery monitor every minute if LCD on
 0.03: Ensure redrawing works with variable size widget system
 0.04: Fix regression stopping correct widget updates
+0.05: Don't show clock widget if already showing clock app
diff --git a/apps/widclk/widget.js b/apps/widclk/widget.js
index 90280139e..cd4b29367 100644
--- a/apps/widclk/widget.js
+++ b/apps/widclk/widget.js
@@ -1,4 +1,7 @@
-(() => {
+(function() {
+  // don't show widget if we know we have a clock app running
+  if (Bangle.CLOCK) return;
+
   let intervalRef = null;
   var width = 5 * 6*2
 
diff --git a/apps/worldclock/ChangeLog b/apps/worldclock/ChangeLog
index 0cd912725..e922ef2a4 100644
--- a/apps/worldclock/ChangeLog
+++ b/apps/worldclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First try
 0.02: Update custom.html for refactor; add README
 0.03: Update for larger secondary timezone display (#610)
+0.04: setUI, different screen sizes
diff --git a/apps/worldclock/app.js b/apps/worldclock/app.js
index 5d676b615..84cb29874 100644
--- a/apps/worldclock/app.js
+++ b/apps/worldclock/app.js
@@ -1,8 +1,9 @@
 /* jshint esversion: 6 */
 
+const big = g.getWidth()>200;
 // Font for primary time and date
-const primaryTimeFontSize = 6;
-const primaryDateFontSize = 3;
+const primaryTimeFontSize = big?6:5;
+const primaryDateFontSize = big?3:2;
 
 // Font for single secondary time
 const secondaryTimeFontSize = 4;
@@ -16,9 +17,9 @@ const xcol2 = g.getWidth() - xcol1;
 const font = "6x8";
 
 const xyCenter = g.getWidth() / 2;
-const yposTime = 75;
-const yposDate = 130;
-const yposWorld = 170;
+const yposTime = big ? 75 : 60;
+const yposDate = big ? 130 : 90;
+const yposWorld = big ? 170 : 120;
 
 const OFFSET_TIME_ZONE = 0;
 const OFFSET_HOURS = 1;
@@ -135,6 +136,8 @@ function drawSimpleClock() {
 
 // clean app screen
 g.clear();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
@@ -153,6 +156,3 @@ drawSimpleClock();
 if (Bangle.isLCDOn()) {
   secondInterval = setInterval(drawSimpleClock, 15e3);
 }
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });

From 083eac0143bb2b18678603b2739eaea64cb9d0b2 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:14:42 +0100
Subject: [PATCH 31/37] setUI tweaks

---
 apps.json             |  6 +++---
 apps/pipboy/ChangeLog |  1 +
 apps/pipboy/app.js    | 20 ++++++++++----------
 apps/s7clk/ChangeLog  |  1 +
 apps/s7clk/app.js     |  5 ++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/apps.json b/apps.json
index 2e9124c2f..6ea646d58 100644
--- a/apps.json
+++ b/apps.json
@@ -865,7 +865,7 @@
   { "id": "s7clk",
     "name": "Simple 7 segment Clock",
     "icon": "icon.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "A simple 7 segment Clock with date",
     "tags": "clock,b2",
     "type":"clock",
@@ -1208,9 +1208,9 @@
     "id": "pipboy",
     "name": "Pipboy",
     "icon": "app.png",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Pipboy themed clock",
-    "tags": "clock",
+    "tags": "clock,nob2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/pipboy/ChangeLog b/apps/pipboy/ChangeLog
index edbadd9b4..1f6d13ad0 100644
--- a/apps/pipboy/ChangeLog
+++ b/apps/pipboy/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New Watch!
 0.02: Changed colors for better readability and added current date
 0.03: Added Info to HP (day in year) and LEVEL (day of week / progress bar show day progress)
+0.04: Using setUI, portable colors
diff --git a/apps/pipboy/app.js b/apps/pipboy/app.js
index 5f885d769..9c2e21cb6 100644
--- a/apps/pipboy/app.js
+++ b/apps/pipboy/app.js
@@ -1,9 +1,9 @@
 const bigFont = 4;
 const smallFont = 2;
 const tinyFont = 1;
-const green = 0x0661;
-const darkGreen = 0x0461;
-const darkerGreen = 0x0261;
+const green = "#0d1";
+const darkGreen = "#091";
+const darkerGreen = "#051";
 const pip = require("heatshrink").decompress(atob("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"));
 
 function isLeapYear(year)
@@ -37,16 +37,16 @@ function bottomLine() {
   var yy = today.getFullYear();
   var day = today.getDay(); //day of week as number
   var h = today.getHours();
-  
+
   var startDate = new Date(yy, 0, 0);
   var oneDay = 1000 * 60 * 60 * 24;
   var daysInYear = 0;
   var diff = today - startDate;
   var currDayInYear = Math.floor(diff / oneDay);
-  
+
   if (isLeapYear(yy)) daysInYear = 366;
   else daysInYear = 365;
-  
+
   g.setFont("6x8", tinyFont);
 
   //first line
@@ -55,7 +55,7 @@ function bottomLine() {
   g.fillRect(105, 175, 160, 185);//STIM
   g.fillRect(166, 175, 239, 185); // RADAWAY
   g.setColor(green);
-  
+
   g.drawString("DATE", 20, 177);
   g.drawString("STIM (3)", 135, 177);
   g.drawString("RADAWAY (8)", 205, 177);
@@ -84,7 +84,7 @@ function drawClock() {
   var mm = t.getMonth()+1; //month is zero-based
   var yy = t.getFullYear();
   var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2);
-  
+
   //create date string
   if (dd.toString().length < 2) dd = '0' + dd;
   if (mm.toString().length < 2) mm = '0' + mm;
@@ -114,9 +114,9 @@ Bangle.on('lcdPower', function(on) {
 });
 
 g.clear();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(drawClock, 1E4);
 drawAll();
-
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
diff --git a/apps/s7clk/ChangeLog b/apps/s7clk/ChangeLog
index a08e25f2f..985b2d489 100644
--- a/apps/s7clk/ChangeLog
+++ b/apps/s7clk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Tweaks for Q3 watch
+0.03: setUI
diff --git a/apps/s7clk/app.js b/apps/s7clk/app.js
index 5bc2bff8f..14f2c69e8 100644
--- a/apps/s7clk/app.js
+++ b/apps/s7clk/app.js
@@ -34,8 +34,7 @@ Bangle.on('lcdPower', function(on) {
 g.clear();
 var secondInterval = setInterval(draw, 1000);
 draw();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

From 490a0b9670a3445aead54787c770b8b4a5bdc6d1 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:17:16 +0100
Subject: [PATCH 32/37] 0.05: setUI, screen size changes

---
 apps.json                   |  4 ++--
 apps/sclock/ChangeLog       |  1 +
 apps/sclock/clock-simple.js | 17 +++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps.json b/apps.json
index 6ea646d58..2d556ce06 100644
--- a/apps.json
+++ b/apps.json
@@ -852,9 +852,9 @@
   { "id": "sclock",
     "name": "Simple Clock",
     "icon": "clock-simple.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "A Simple Digital Clock",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/sclock/ChangeLog b/apps/sclock/ChangeLog
index afe0c99cb..a6e5b4f8e 100644
--- a/apps/sclock/ChangeLog
+++ b/apps/sclock/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Actually make into 24h clock since there's a 12h variant
 0.04: Make this clock do 12h and 24h
+0.05: setUI, screen size changes
diff --git a/apps/sclock/clock-simple.js b/apps/sclock/clock-simple.js
index dc0eb159c..f61e7d5ad 100644
--- a/apps/sclock/clock-simple.js
+++ b/apps/sclock/clock-simple.js
@@ -1,14 +1,15 @@
 /* jshint esversion: 6 */
-const timeFontSize = 6;
-const dateFontSize = 3;
+const big = g.getWidth()>200;
+const timeFontSize = big?6:5;
+const dateFontSize = big?3:2;
 const gmtFontSize = 2;
 const font = "6x8";
 
 const xyCenter = g.getWidth() / 2;
-const yposTime = 75;
-const yposDate = 130;
-const yposYear = 175;
-const yposGMT = 220;
+const yposTime = xyCenter*0.6;
+const yposDate = xyCenter*1.1;
+const yposYear = xyCenter*1.4;
+const yposGMT = xyCenter*1.9;
 
 // Check settings for what type our clock should be
 var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
@@ -77,5 +78,5 @@ setInterval(drawSimpleClock, 15E3);
 // draw now
 drawSimpleClock();
 
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");

From 272007c6526991ae027a19018e48c3b7d6e81556 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:28:46 +0100
Subject: [PATCH 33/37] more tweaks

---
 apps.json                   |   8 +-
 apps/calendar/ChangeLog     |   1 +
 apps/calendar/calendar.js   |  42 +++++------
 apps/digiclock/ChangeLog    |   1 +
 apps/digiclock/digiclock.js | 145 +++++++-----------------------------
 5 files changed, 52 insertions(+), 145 deletions(-)

diff --git a/apps.json b/apps.json
index 2d556ce06..9b23b4e53 100644
--- a/apps.json
+++ b/apps.json
@@ -1858,9 +1858,9 @@
   { "id": "calendar",
     "name": "Calendar",
     "icon": "calendar.png",
-    "version": "0.01",
+    "version": "0.02",
     "description": "Simple calendar",
-    "tags": "calendar",
+    "tags": "calendar,b2",
     "readme": "README.md",
     "allow_emulator": true,
     "storage": [
@@ -2495,9 +2495,9 @@
   "name": "Digital Clock Face",
   "shortName":"Digi Clock",
   "icon": "digiclock.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "A simple digital clock with the time, day, month, and year",
-  "tags": "clock",
+  "tags": "clock,nob2",
   "type" : "clock",
   "storage": [
     {"name":"digiclock.app.js","url":"digiclock.js"},
diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog
index 3cf79ffe8..8bafff34a 100644
--- a/apps/calendar/ChangeLog
+++ b/apps/calendar/ChangeLog
@@ -1 +1,2 @@
 0.01: Basic calendar
+0.02: Make Bangle 2 compatible
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index 720986162..6f3c33164 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -1,5 +1,6 @@
-const maxX = 240;
-const maxY = 240;
+const maxX = g.getWidth();
+const maxY = g.getHeight();
+const fontSize = g.getWidth()>200?2:1;
 const rowN = 7;
 const colN = 7;
 const headerH = maxY / 7;
@@ -50,7 +51,7 @@ function drawCalendar(date) {
     11: "December"
   };
   g.setFontAlign(0, 0);
-  g.setFont("6x8", 2);
+  g.setFont("6x8", fontSize);
   g.setColor(white);
   g.drawString(`${monthMap[month]} ${year}`, maxX / 2, headerH / 2);
   g.drawPoly([10, headerH / 2, 20, 10, 20, headerH - 10], true);
@@ -59,7 +60,7 @@ function drawCalendar(date) {
     true
   );
 
-  g.setFont("6x8", 2);
+  g.setFont("6x8", fontSize);
   const dowLbls = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
   dowLbls.forEach((lbl, i) => {
     g.drawString(lbl, i * colW + colW / 2, headerH + rowH / 2);
@@ -135,26 +136,21 @@ const today = {
 };
 drawCalendar(date);
 clearWatch();
-setWatch(
-  () => {
-    const month = date.getMonth();
-    const prevMonth = month > 0 ? month - 1 : 11;
+Bangle.on("touch",area=>{
+  const month = date.getMonth();
+  let prevMonth;
+  if (area==1) {
+    let prevMonth = month > 0 ? month - 1 : 11;
     if (prevMonth === 11) date.setFullYear(date.getFullYear() - 1);
     date.setMonth(prevMonth);
-    drawCalendar(date);
-  },
-  BTN4,
-  { repeat: true }
-);
-setWatch(
-  () => {
-    const month = date.getMonth();
-    const prevMonth = month < 11 ? month + 1 : 0;
+  } else {
+    let prevMonth = month < 11 ? month + 1 : 0;
     if (prevMonth === 0) date.setFullYear(date.getFullYear() + 1);
     date.setMonth(month + 1);
-    drawCalendar(date);
-  },
-  BTN5,
-  { repeat: true }
-);
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+  }
+  drawCalendar(date);
+});
+
+// Show launcher when button pressed
+Bangle.setUI("clock"); // TODO: ideally don't set 'clock' mode
+// No space for widgets!
diff --git a/apps/digiclock/ChangeLog b/apps/digiclock/ChangeLog
index 0bb55854e..e41fae573 100644
--- a/apps/digiclock/ChangeLog
+++ b/apps/digiclock/ChangeLog
@@ -1 +1,2 @@
 0.01: App Made!
+0.02: Changed setWatch to Bangle.setUI, code tidy
diff --git a/apps/digiclock/digiclock.js b/apps/digiclock/digiclock.js
index 7f74f2242..f404d30b2 100644
--- a/apps/digiclock/digiclock.js
+++ b/apps/digiclock/digiclock.js
@@ -1,141 +1,50 @@
 //load fonts
 require("Font7x11Numeric7Seg").add(Graphics);
-require("FontHaxorNarrow7x17").add(Graphics); 
+require("FontHaxorNarrow7x17").add(Graphics);
 //screen position
-const X = 170; 
-const Y = 140; 
+const X = 170;
+const Y = 140;
 
 function draw() {
   // Date Variables
-  var date = new Date(); 
-  var h = date.getHours(); 
-  var m = date.getMinutes(); 
-  var day = date.getDay(); 
-  var month = date.getMonth();
-  var dateNum = date.getDate(); 
-  var year = date.getFullYear(); 
-  var half = "AM"; 
-  var time = (" " + h).substr(-2) + ":" + ("0" + m).substr(-2); 
-  
-  //convert day into string 
-  switch (day) {
-    case 0:
-      day = "Sunday"; 
-      break; 
-    
-    case 1:
-      day = "Monday"; 
-      break; 
-      
-    case 2:
-      day = "Tuesday"; 
-      break; 
-      
-    case 3:
-      day = "Wednesday"; 
-      break; 
-      
-    case 4:
-      day = "Thursday"; 
-      break; 
-      
-    case 5:
-      day = "Friday"; 
-      break; 
-      
-    case 6:
-      day = "Saturday"; 
-      break; 
-      
-    default:
-      day = "ERROR"; 
-      break; 
-  }
-  
-  //convert month into String
-  switch(month) {
-    case 0:
-      month = "Jan"; 
-      break; 
-      
-    case 1:
-      month = "Feb"; 
-      break; 
-      
-    case 2:
-      month = "Mar"; 
-      break; 
-      
-    case 3:
-      month = "Apr"; 
-      break; 
-      
-    case 4:
-      month = "May"; 
-      break; 
-      
-    case 5:
-      month = "Jun"; 
-      break; 
-      
-    case 6:
-      month = "Jul"; 
-      break; 
-      
-    case 7:
-      month = "Aug"; 
-      break; 
-      
-    case 8:
-      month = "Sep"; 
-      break;
-      
-    case 9:
-      month = "Oct"; 
-      break; 
-      
-    case 10:
-      month = "Nov"; 
-      break; 
-      
-    case 11:
-      month = "Dec"; 
-      break; 
-      
-    default:
-      month = "ERROR"; 
-      break; 
-      
-  }
-      
+  var date = new Date();
+  var h = date.getHours();
+  var m = date.getMinutes();
+  var day = require("locale").dow(date);
+  var month = require("locale").month(date,1);
+  var dateNum = date.getDate();
+  var year = date.getFullYear();
+  var half = "AM";
+  var time = (" " + h).substr(-2) + ":" + ("0" + m).substr(-2);
+
   if (h > 12) {
-    half = "PM"; 
-    h = h - 12; 
+    half = "PM";
+    h = h - 12;
   }
   //reset graphics
-  g.reset(); 
+  g.reset();
   //draw the time
   g.setFont("7x11Numeric7Seg", 5);
   g.setFontAlign(1,1);
   g.drawString(time, X, Y, true /*clear background*/);
-  g.setFont("7x11Numeric7Seg", 3);  
-  g.drawString(("0"+date.getSeconds()).substr(-2), X+50, Y, true /*clear background*/); 
+  g.setFont("7x11Numeric7Seg", 3);
+  g.drawString(("0"+date.getSeconds()).substr(-2), X+50, Y, true /*clear background*/);
   g.setFontAlign(0,1);
   g.setFont("HaxorNarrow7x17", 2);
   g.drawString(half, X+30, Y-35, true);
   g.setFont("HaxorNarrow7x17", 3);
   g.drawString(day, X-60, Y+53, true);
-  g.drawString(month, X-100, Y+95, true);  
-  g.drawString(dateNum, X-40, Y+95, true); 
-  g.drawString(year, X-90, Y-55, true); 
-  
-  
+  g.drawString(month, X-100, Y+95, true);
+  g.drawString(dateNum, X-40, Y+95, true);
+  g.drawString(year, X-90, Y-55, true);
+
+
 }
 
 //clear screen at startup
-g.clear(); 
+g.clear();
 //draw immediatly
-draw(); 
+draw();
 
 var secondInterval = setInterval(draw, 1000);
 // Stop updates when LCD is off, restart when on
@@ -148,7 +57,7 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-setWatch(Bangle.showLauncher, BTN2, {repeat : false, edge: "falling"}); 

From 1d0a6183567bb5bcf0093e15111d7d1d68c6895c Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:39:25 +0100
Subject: [PATCH 34/37] setui

---
 apps.json                  |  4 +--
 apps/dotclock/ChangeLog    |  1 +
 apps/dotclock/clock-dot.js | 61 ++++++++++++++++++--------------------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/apps.json b/apps.json
index 9b23b4e53..8ce8bc3d8 100644
--- a/apps.json
+++ b/apps.json
@@ -1327,9 +1327,9 @@
   { "id": "dotclock",
     "name": "Dot Clock",
     "icon": "clock-dot.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "A Minimal Dot Analog Clock",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/dotclock/ChangeLog b/apps/dotclock/ChangeLog
index c9658afb8..563db87e7 100644
--- a/apps/dotclock/ChangeLog
+++ b/apps/dotclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Based on the Analog Clock app, minimal dot
 0.02: Remove hardcoded hour buzz (you can install widchime if you miss it)
+0.03: Use setUI, adjust for themes and different size screens
diff --git a/apps/dotclock/clock-dot.js b/apps/dotclock/clock-dot.js
index c4a8be921..66255d1b4 100644
--- a/apps/dotclock/clock-dot.js
+++ b/apps/dotclock/clock-dot.js
@@ -1,20 +1,22 @@
-let g;
-let Bangle;
-
+const big = g.getWidth()>200;
 const locale = require('locale');
 const p = Math.PI / 2;
 const pRad = Math.PI / 180;
-const faceWidth = 100; // watch face radius
 let timer = null;
 let currentDate = new Date();
-let hourRadius = 60;
-let minRadius = 80;
-const centerPx = g.getWidth() / 2;
+const faceWidth = big?100:65; // watch face radius
+let hourRadius = big?60:40;
+let minRadius = big?80:55;
+const centerX = g.getWidth() / 2;
+const centerY = 24 + (g.getHeight()-24) / 2;
+let colSecA = g.theme.dark ? "#00A" : "#58F"; // before the second
+let colSecB = g.theme.dark ? "#58F" : "#00A"; // after the second
+let colSec1 = g.theme.dark ? "#F83" : "#000"; // ON the second
 
 const seconds = (angle) => {
   const a = angle * pRad;
-  const x = centerPx + Math.sin(a) * faceWidth;
-  const y = centerPx - Math.cos(a) * faceWidth;
+  const x = centerX + Math.sin(a) * faceWidth;
+  const y = centerY - Math.cos(a) * faceWidth;
 
   // if 15 degrees, make hour marker larger
   const radius = (angle % 15) ? 2 : 4;
@@ -23,15 +25,15 @@ const seconds = (angle) => {
 
 const hourDot = (angle,radius) => {
   const a = angle * pRad;
-  const x = centerPx + Math.sin(a) * hourRadius;
-  const y = centerPx - Math.cos(a) * hourRadius;
+  const x = centerX + Math.sin(a) * hourRadius;
+  const y = centerY - Math.cos(a) * hourRadius;
   g.fillCircle(x, y, radius);
 };
 
 const minDot = (angle,radius) => {
   const a = angle * pRad;
-  const x = centerPx + Math.sin(a) * minRadius;
-  const y = centerPx - Math.cos(a) * minRadius;
+  const x = centerX + Math.sin(a) * minRadius;
+  const y = centerY - Math.cos(a) * minRadius;
   g.fillCircle(x, y, radius);
 };
 
@@ -45,54 +47,49 @@ const drawAll = () => {
   // draw all secs
 
   for (let i = 0; i < 60; i++) {
-    if (i > currentSec) {
-      g.setColor(0, 0, 0.6);
-    } else {
-      g.setColor(0.3, 0.3, 1);
-    }
+    g.setColor((i > currentSec) ? colSecA : colSecB);
     seconds((360 * i) / 60);
   }
   onSecond();
 };
 
 const resetSeconds = () => {
-  g.setColor(0, 0, 0.6);
+  g.setColor(colSecA);
   for (let i = 0; i < 60; i++) {
     seconds((360 * i) / 60);
   }
 };
 
 const drawMin = () => {
-  g.setColor(0.5, 0.5, 0.5);
+  g.setColor("#777");
   for (let i = 0; i < 60; i++) {
     minDot((360 * i) / 60,1);
   }
 };
 
 const drawHour = () => {
-  g.setColor(0.5, 0.5, 0.5);
+  g.setColor("#777");
   for (let i = 0; i < 12; i++) {
     hourDot((360 * 5 * i) / 60,1);
   }
 };
 
 const onSecond = () => {
-  g.setColor(0.3, 0.3, 1);
+  g.setColor(colSecB);
   seconds((360 * currentDate.getSeconds()) / 60);
   if (currentDate.getSeconds() === 59) {
     resetSeconds();
     onMinute();
   }
-  g.setColor(1, 0.7, 0.2);
+  g.setColor(colSec1);
   currentDate = new Date();
   seconds((360 * currentDate.getSeconds()) / 60);
-  g.setColor(1, 1, 1);
+  g.setColor(g.theme.fg);
 };
 
 const drawDate = () => {
   g.reset();
-  g.setColor(1, 1, 1);
-  g.setFont('6x8', 2);
+  g.setFont('6x8', big?2:1);
 
   const dayString = locale.dow(currentDate, true);
   // pad left date
@@ -101,7 +98,7 @@ const drawDate = () => {
   // console.log(`${dayString}|${dateString}`);
   // center date
   const l = (g.getWidth() - g.stringWidth(dateDisplay)) / 2;
-  const t = centerPx - 6 ;
+  const t = centerY - 6 ;
   g.drawString(dateDisplay, l, t);
   // console.log(l, t);
 };
@@ -111,7 +108,7 @@ const onMinute = () => {
     resetSeconds();
   }
   // clear existing hands
-  g.setColor(0, 0, 0);
+  g.setColor(g.theme.bg);
   hourDot((360 * currentDate.getHours()) / 12,4);
   minDot((360 * currentDate.getMinutes()) / 60,3);
 
@@ -125,7 +122,7 @@ const onMinute = () => {
   g.setColor(1, 0, 0);
   // Hour
   hourDot((360 * currentDate.getHours()) / 12,4);
-  g.setColor(1, 0.9, 0.9);
+  g.setColor(g.theme.fg2);
   // Minute
   minDot((360 * currentDate.getMinutes()) / 60,3);
   drawDate();
@@ -152,8 +149,8 @@ g.clear();
 resetSeconds();
 startTimers();
 drawAll();
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });

From e54466d7b36d6fb71234e095b774b835dba614af Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 15:11:14 +0100
Subject: [PATCH 35/37] Changed setWatch to Bangle.setUI

---
 apps.json                | 10 +++++-----
 apps/ctrclk/ChangeLog    |  1 +
 apps/ctrclk/app.js       | 15 +++++++--------
 apps/dclock/ChangeLog    |  1 +
 apps/dclock/clock-dev.js | 22 +++++++++++-----------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/apps.json b/apps.json
index 8ce8bc3d8..1d3983aa6 100644
--- a/apps.json
+++ b/apps.json
@@ -904,9 +904,9 @@
   { "id": "dclock",
     "name": "Dev Clock",
     "icon": "clock-dev.png",
-    "version":"0.09",
+    "version":"0.10",
     "description": "A Digital Clock including timestamp (tst), beats(@), days in current month (dm) and days since new moon (l)",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
@@ -1168,9 +1168,9 @@
   { "id": "ctrclk",
     "name": "Centerclock",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "Watch-centered digital 24h clock with date in dd.mm.yyyy format.",
-    "tags": "clock",
+    "tags": "clock,nob2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
@@ -3051,7 +3051,7 @@
   "version":"0.01",
   "description": "Displays RGB565 and RGB888 colors, its name and code in screen.",
   "readme": "README.md",
-  "tags": "Color, input,buttons,touch,UI",
+  "tags": "Color,input,buttons,touch,UI,nob2",
   "storage": [
     {"name":"color_catalog.app.js","url":"app.js"},
     {"name":"color_catalog.img","url":"app-icon.js","evaluate":true}
diff --git a/apps/ctrclk/ChangeLog b/apps/ctrclk/ChangeLog
index 7819dbe2a..e4659c1ae 100644
--- a/apps/ctrclk/ChangeLog
+++ b/apps/ctrclk/ChangeLog
@@ -1 +1,2 @@
 0.02: Modified for use with new bootloader and firmware
+0.03: Changed setWatch to Bangle.setUI
diff --git a/apps/ctrclk/app.js b/apps/ctrclk/app.js
index 060aac2f9..7f6ab0570 100644
--- a/apps/ctrclk/app.js
+++ b/apps/ctrclk/app.js
@@ -46,26 +46,25 @@ function drawSegment (align, base, str) {
     point = base + (maxSegmentWidth / 2) -
       (g.stringWidth(str) / 2);
   }
-  g.setColor(1, 1, 1);
+  g.setColor(g.theme.fg);
   g.drawString(str, point, middleY - 4, false);
 }
 
 function drawDots (center) {
-  g.setColor(0xFD20);
+  g.setColor("#FA0");
   g.fillCircle(center, middleY + 10, 2);
   g.fillCircle(center, middleY + 40, 2);
 }
 
 function drawLines () {
-  g.setColor(0.5, 0.5, 0.5);
+  g.setColor("#777");
   g.drawLine(middleX - lineLength, lineY1, middleX + lineLength, lineY1);
   g.drawLine(middleX - lineLength, lineY2, middleX + lineLength, lineY2);
 }
 
 function drawDate (str) {
   let maxSegmentWidth = 236;
-  g.setColor(0.5, 0.5, 0.5);
-  g.setColor(0.5, 0.5, 0.5);
+  g.setColor("#777");
   g.drawString(str, (maxSegmentWidth) - (g.stringWidth(str)), middleY - 22,
     false);
 }
@@ -149,6 +148,9 @@ function start () {
 }
 
 start();
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 Bangle.on('lcdPower', function (on) {
@@ -158,6 +160,3 @@ Bangle.on('lcdPower', function (on) {
     stop();
   }
 });
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
diff --git a/apps/dclock/ChangeLog b/apps/dclock/ChangeLog
index edf7da4c2..aa8ae23fe 100644
--- a/apps/dclock/ChangeLog
+++ b/apps/dclock/ChangeLog
@@ -7,3 +7,4 @@
 0.07: add days in current month (md) and days since new moon (l)
 0.08: update icon
 0.09: Use localised month and day of the week from locale
+0.10: Changed setWatch to Bangle.setUI and allow small screen
diff --git a/apps/dclock/clock-dev.js b/apps/dclock/clock-dev.js
index d2c08726a..d2c3893d5 100644
--- a/apps/dclock/clock-dev.js
+++ b/apps/dclock/clock-dev.js
@@ -1,17 +1,18 @@
 var locale = require("locale");
 /* jshint esversion: 6 */
-const timeFontSize = 4;
-const dateFontSize = 3;
-const smallFontSize = 2;
+const big = g.getWidth()>200;
+const timeFontSize = big?4:3;
+const dateFontSize = big?3:2;
+const smallFontSize = big?2:1;
 const font = "6x8";
 
 const xyCenter = g.getWidth() / 2;
 const yposTime = 50;
-const yposDate = 85;
-const yposTst = 115;
-const yposDml = 170;
-const yposDayMonth = 195;
-const yposGMT = 220;
+const yposDate = big?85:75;
+const yposTst = big?115:95;
+const yposDml = big?170:130;
+const yposDayMonth = big?195:140;
+const yposGMT = big?220:150;
 
 // Check settings for what type our clock should be
 var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
@@ -99,6 +100,8 @@ Bangle.on('lcdPower', function(on) {
 
 // clean app screen
 g.clear();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
@@ -107,6 +110,3 @@ setInterval(drawSimpleClock, 100);
 
 // draw now
 drawSimpleClock();
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
\ No newline at end of file

From e4dc3e7afd236d7966a26128b76e295367e3613b Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 15:13:45 +0100
Subject: [PATCH 36/37] Changed setWatch to Bangle.setUI

---
 apps.json               | 8 ++++----
 apps/gallifr/ChangeLog  | 1 +
 apps/gallifr/app.js     | 4 ++--
 apps/geissclk/ChangeLog | 1 +
 apps/geissclk/clock.js  | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps.json b/apps.json
index 1d3983aa6..0ff053b8c 100644
--- a/apps.json
+++ b/apps.json
@@ -338,9 +338,9 @@
   { "id": "geissclk",
     "name": "Geiss Clock",
     "icon": "clock.png",
-    "version":"0.02",
+    "version":"0.03",
     "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",
-    "tags": "clock",
+    "tags": "clock,nob2",
     "type":"clock",
     "storage": [
       {"name":"geissclk.app.js","url":"clock.js"},
@@ -2030,9 +2030,9 @@
     "name": "Time Traveller's Chronometer",
     "shortName": "Time Travel Clock",
     "icon": "gallifr.png",
-    "version": "0.01",
+    "version": "0.02",
     "description": "A clock for time travellers. The light pie segment shows the minutes, the black circle, the hour. The dial itself reads 'time' just in case you forget.",
-    "tags": "clock",
+    "tags": "clock,b2",
     "readme": "README.md",
     "type": "clock",
     "allow_emulator":true,
diff --git a/apps/gallifr/ChangeLog b/apps/gallifr/ChangeLog
index c785cbd67..0e1f45042 100644
--- a/apps/gallifr/ChangeLog
+++ b/apps/gallifr/ChangeLog
@@ -1 +1,2 @@
 0.01: First released version
+0.02: Changed setWatch to Bangle.setUI
diff --git a/apps/gallifr/app.js b/apps/gallifr/app.js
index 281988ad7..d327bcdc1 100644
--- a/apps/gallifr/app.js
+++ b/apps/gallifr/app.js
@@ -243,5 +243,5 @@ startTimers();
 Bangle.loadWidgets();
 drawAll();
 
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/geissclk/ChangeLog b/apps/geissclk/ChangeLog
index bd718a5b1..7458fadee 100644
--- a/apps/geissclk/ChangeLog
+++ b/apps/geissclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: BTN2->launcher, use smaller text to allow "20:00" to fit on screen
+0.03: Changed setWatch to Bangle.setUI
diff --git a/apps/geissclk/clock.js b/apps/geissclk/clock.js
index 7d63b815e..f14ea5f39 100644
--- a/apps/geissclk/clock.js
+++ b/apps/geissclk/clock.js
@@ -148,4 +148,5 @@ Bangle.drawWidgets();
 iterate();
 animInterval = setInterval(iterate, 50);
 
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");

From 9aa746fbc311d4ee61bc62c3f661ae5b169f925d Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 15:45:49 +0100
Subject: [PATCH 37/37] Modified to use setUI, theme and different screens

---
 apps.json                   |  6 ++---
 apps/de-stress/ChangeLog    |  2 ++
 apps/de-stress/app.js       | 32 +++++++++---------------
 apps/devstopwatch/ChangeLog |  1 +
 apps/devstopwatch/app.js    | 49 ++++++++++++++++++-------------------
 5 files changed, 42 insertions(+), 48 deletions(-)
 create mode 100644 apps/de-stress/ChangeLog

diff --git a/apps.json b/apps.json
index 0ff053b8c..7151661fb 100644
--- a/apps.json
+++ b/apps.json
@@ -1531,9 +1531,9 @@
   "name": "Dev Stopwatch",
   "shortName":"Dev Stopwatch",
   "icon": "app.png",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Stopwatch with 5 laps supported (cyclically replaced)",
-  "tags": "stopwatch, chrono, timer, chronometer",
+  "tags": "stopwatch,chrono,timer,chronometer,b2",
   "allow_emulator":true,
   "storage": [
     {"name":"devstopwatch.app.js","url":"app.js"},
@@ -2814,7 +2814,7 @@
   "name": "De-Stress",
   "shortName":"De-Stress",
   "icon": "app.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Simple haptic heartbeat",
   "storage": [
     {"name":"de-stress.app.js","url":"app.js"},
diff --git a/apps/de-stress/ChangeLog b/apps/de-stress/ChangeLog
new file mode 100644
index 000000000..fcd7580b1
--- /dev/null
+++ b/apps/de-stress/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Adjust for different screen types and themes
diff --git a/apps/de-stress/app.js b/apps/de-stress/app.js
index 445e853c5..b292fe601 100644
--- a/apps/de-stress/app.js
+++ b/apps/de-stress/app.js
@@ -1,29 +1,21 @@
+g.setBgColor(0).clear();
 
-//g.clear();
-
-var img = {
-  width : 100, height : 100, bpp : 8,
-  transparent : 254,
-  buffer : require("heatshrink").decompress(atob("/wA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4AglYAGE/44gHz4nnHKtPumez3C4WezFzp49ZLAgoCE4WeugnaHStPG4QAHzw9DE/Y6VHJQ9YMJwnEMk46CF4lzfglPug9WCAWYDQl0E4tzN4gLCMVC5Cp+YGoOezxBCubKHExxUEuiFCEoInECAhkjMQuYLArCFGwLLEHpjsGMIRpEfAsrMkwhBFAQ6BHJA9EKApDBHpAJBQYhPBE5iZBzAsDMb4gBEwg6MJhBkIYorgBPQiMMUAhkeHgkrug7ObI5qBHwhiGZYomOEojGeJQVzTx5kOMQ6JREAR3CDIJkcHobwEMiw+CAAYJEMSYWCAgRjcDgI4CYyiiDXopiFBooAWRwJkaHwjGVKwdzH4rADuhiXZAaICMbbtGHy2YBQ+YRDCiEMbidCULBkDLIwIIdqbmCp5jZPwIfDAYQAXXwNPzwACIQLQIACt0ZDIZBTwRFBHjWeHoSJCETlPc4ZjdAYYA7L4Jj/Mf5jCEYQDDAHhEEMbzH+McBfCMf4ADzxjep+YL/1PMb10MYQDCAHd0MYV0MbdzEYoA7UYdPMTBkCc4hj9leeAYRjbL4aIDAHN0UwRjeL4WYZHlPzBnCMbZkBQojtCAG6gEp5ibZARfCdwjG3ugDBzzGcMYTIEFAQA1ujGFMbjIFeAgA0HobGeZA9PAgYAyG4jGfZAyPBzBizf4LGjMggtCFAJpDAFw0FMURjCeAd0AgYAup90AgZjjMgWYFYZkwGImYMUhkDeYdPuZituZiDzximMYUrFwj6DAFF0TAg6CMcpkCSYpkqMQtPMVBkDuZktMQtzMVRkDLwZkoMQoFBMVZkJp5ijX4JizMhFPMkQjBMWpkHIAKjEADTrGMWZkDuY8DuZkdMQKKEMWpkDUIxFEACocGdoJi1MhCqBAwgATLYLkEMXJkDIY4GEAB+ep9PC4aDBMXRkJukruhiRCgxi+MglzJAtPMR7cGNIJi+MglPJYhSBzBhLzB0FzwWBMX5lGMghVGAAtzld0bwph/MhNzWYzKGNwR2Euhi/MhhTHA4ZrHA4Rh/Mp10YIlzA4JoCBQjE/ZTK8BA45i/MqtzX4jE/Mj0rYQjECBYZP/MrFPMoWep5h/ZT90ujE/MsZh/MsZB/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/ACg"))
-};
+var img = require("heatshrink").decompress(atob("plB4X/ln7A4OGmMs5dVAANa1WlAoQADBI9W1QAByoJNtWv4f61ISEtWrBI2q4EAgeqCQgJHq2sLoU6IYdaBIg5CrWAn2q2EDF4dq4EO1W8gQcCtUD1fP9cA9QSC1cA9f/9XADgWohxBBh2whQvBq2gAwMAh+wlQSB1k7IIXogYvBrXAlYJC9k6DYOw9gIChXA9JBC0AJCncOytWwAtBAAMDF4RBDAAMOgWVrXDwDjD9kKy2gIIcAgXD0taDYgvCRIJBDF4OA0trhwIDJgK2B4BKDAAXptcLA4kC4HrD4IJE8HptE4BAhfBLAJBEgEslISGL4JOBBAoSB1ksBIs6/70DBIgSHh+q+AIFnASIABASU0EgCR0IhWgEp4SBHCBxJLzusXowAIaBISLhYSO8EptcOCR2w9NagXACJkDwGlrXDwASMgXDCQOA2ASMh0C0tW2HgCRkLh2Vq2glASMlEKytV1iFN9k6qtVtEOORcD2EpCQNqOwJwL4GpCQNa4GgCRUKgelCQJyBlgSKnBwBCQWgnZdLOAQAB1BfKLoMqCIVVtYHBXZPA9ISDL4PsCRE7LoZfDnRKJLoYAC1kOTI8CDoIREJgMA1gSGFwJKEJgaGH9hKFTIaGGPQKVEAAeogbTFhXASogADtXAlYSE9cDeYRMG2A5EG4MOJQxMC1g5EG4M6JQ4AB1Q5E9ED1QRIHIatBG5Y5EVoM6G5Y5DnXDCwJvIHIsD32AG5Y5C1aUBgHqG5atDLwI3MHIReCG5hgD4aUKHI2+G5xgC1RcNAAdpBJA"))
 
 
 function hr(){
-  
-Bangle.buzz(100,0.1).then(()=>{
-  g.clear();
-  return new Promise(resolve=>setTimeout(resolve,250)); // wait 250ms
-}).then(()=>{
-  return Bangle.buzz(150);
-}).then(()=>{
-  g.drawImage(img, 25, 40, {scale:2});
-});
-
+  Bangle.buzz(100,0.1).then(()=>{
+    g.clear();
+    return new Promise(resolve=>setTimeout(resolve,250)); // wait 250ms
+  }).then(()=>{
+    return Bangle.buzz(150);
+  }).then(()=>{
+    g.drawImage(img, g.getWidth()/2 - 76, g.getHeight()/2 - 65, {scale:2});
+  });
 }
 setInterval(hr, 2000);
 
 g.flip();
 
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
-
-
+//  TODO - not clock but we still want a press to show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/devstopwatch/ChangeLog b/apps/devstopwatch/ChangeLog
index c6d24e9bc..e2b392fe9 100644
--- a/apps/devstopwatch/ChangeLog
+++ b/apps/devstopwatch/ChangeLog
@@ -1,2 +1,3 @@
 0.01: App created
 0.02: Persist state to storage to enable stopwatch to continue in the background
+0.03: Modified to use setUI, theme and different screens
diff --git a/apps/devstopwatch/app.js b/apps/devstopwatch/app.js
index 665ba084e..83bb693a9 100644
--- a/apps/devstopwatch/app.js
+++ b/apps/devstopwatch/app.js
@@ -2,13 +2,16 @@ const EMPTY_LAP = '--:--:---';
 const EMPTY_H = '00:00:000';
 const MAX_LAPS = 6;
 const XY_CENTER = g.getWidth() / 2;
+const big = g.getWidth()>200;
 const Y_CHRONO = 40;
-const Y_HEADER = 80;
-const Y_LAPS = 125;
-const Y_BTN3 = 225;
+const Y_HEADER = big?80:60;
+const Y_LAPS = big?125:90;
+const H_LAPS = big?15:8;
+const Y_BTN3 = big?225:165;
 const FONT = '6x8';
 const CHRONO = '/* C H R O N O */';
 
+
 var reset = false;
 var currentLap = '';
 var chronoInterval;
@@ -22,11 +25,11 @@ var state = require("Storage").readJSON("devstopwatch.state.json",1) || {
   laps: [EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP],
 };
 
-// Set laps.
-setWatch(() => {
-
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn==0) {
   reset = false;
-  
+
   if (state.started) {
     changeLap();
   } else {
@@ -34,13 +37,9 @@ setWatch(() => {
       chronoInterval = setInterval(chronometer, 10);
     }
   }
-}, BTN1, { repeat: true, edge: 'rising' });
-
-// Reset chronometre.
-setWatch(() => { resetChrono(); }, BTN3, { repeat: true, edge: 'rising' });
-
-// Show launcher when middle button pressed.
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: 'falling' });
+}
+  if (btn==1) resetChrono();
+});
 
 function resetChrono() {
   state.laps = [EMPTY_H, EMPTY_H, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP];
@@ -106,33 +105,33 @@ function printChrono() {
 
   var print = '';
 
-  g.setFont(FONT, 2);
+  g.setFont(FONT, big?2:1);
   print = CHRONO;
   g.drawString(print, XY_CENTER, Y_CHRONO, true);
 
-  g.setColor(0, 220, 0);
-  g.setFont(FONT, 3);
+  g.setColor("#0e0");
+  g.setFont(FONT, big?3:2);
   print = ` T ${state.laps[0]}\n`;
   print += ` C ${state.laps[1]}\n`;
   g.drawString(print, XY_CENTER, Y_HEADER, true);
 
-  g.setColor(255, 255, 255);
-  g.setFont(FONT, 2);
+  g.setColor(g.theme.fg);
+  g.setFont(FONT, big?2:1);
 
   for (var i = 2; i < MAX_LAPS + 1; i++) {
 
-    g.setColor(255, 255, 255);
+    g.setColor(g.theme.fg);
     let suffix = ' ';
     if (state.currentLapIndex === i) {
       let suffix = '*';
-      g.setColor(255, 200, 0);
+      g.setColor("#f70");
     }
 
     const lapLine = `L${i - 1} ${state.laps[i]} ${suffix}\n`;
-    g.drawString(lapLine, XY_CENTER, Y_LAPS + (15 * (i - 1)), true);
+    g.drawString(lapLine, XY_CENTER, Y_LAPS + (H_LAPS * (i - 1)), true);
   }
 
-  g.setColor(255, 255, 255);
+  g.setColor(g.theme.fg);
   g.setFont(FONT, 1);
   print = 'Press 3 to reset';
   g.drawString(print, XY_CENTER, Y_BTN3, true);
@@ -166,7 +165,7 @@ E.on('kill', function(){
 });
 
 if(state.started){
-  chronoInterval = setInterval(chronometer, 10); 
+  chronoInterval = setInterval(chronometer, 10);
 } else {
-  resetChrono();  
+  resetChrono();
 }