diff --git a/.gitignore b/.gitignore
index f4588ac6f..7687a770a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ _site
 .owncloudsync.log
 Desktop.ini
 .sync_*.db*
+*.swp
diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog
index 7f749ff25..77e11c92e 100644
--- a/apps/agenda/ChangeLog
+++ b/apps/agenda/ChangeLog
@@ -7,3 +7,5 @@
 0.07: Clkinfo improvements.
 0.08: Fix error in clkinfo (didn't require Storage & locale)
       Fix clkinfo icon
+0.09: Ensure Agenda supplies an image for clkinfo items
+0.10: Update clock_info to avoid a redraw
diff --git a/apps/agenda/agenda.clkinfo.js b/apps/agenda/agenda.clkinfo.js
index baa8b9516..7c89446a2 100644
--- a/apps/agenda/agenda.clkinfo.js
+++ b/apps/agenda/agenda.clkinfo.js
@@ -19,8 +19,8 @@
 
     agendaItems.items.push({
       name: "Agenda "+i,
-      get: () => ({ text: title + "\n" + dateStr, img: null}),
-      show: function() { agendaItems.items[i].emit("redraw"); },
+      get: () => ({ text: title + "\n" + dateStr, img: agendaItems.img }),
+      show: function() {},
       hide: function () {}
     });
   });
diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json
index 7e49e3f96..8253b36bc 100644
--- a/apps/agenda/metadata.json
+++ b/apps/agenda/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "0.08",
+  "version": "0.10",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
diff --git a/apps/astrocalc/ChangeLog b/apps/astrocalc/ChangeLog
index 746ab2162..11b2d7177 100644
--- a/apps/astrocalc/ChangeLog
+++ b/apps/astrocalc/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Create astrocalc app
 0.02: Store last GPS lock, can be used instead of waiting for new GPS on start
 0.03: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps
+0.04: Compatibility with Bangle.js 2, get location from My Location
diff --git a/apps/astrocalc/astrocalc-app.js b/apps/astrocalc/astrocalc-app.js
index 46fb855ec..6629842cf 100644
--- a/apps/astrocalc/astrocalc-app.js
+++ b/apps/astrocalc/astrocalc-app.js
@@ -11,8 +11,7 @@
 
 const SunCalc = require("suncalc"); // from modules folder
 const storage = require("Storage");
-const LAST_GPS_FILE = "astrocalc.gps.json";
-let lastGPS = (storage.readJSON(LAST_GPS_FILE, 1) || null);
+const BANGLEJS2 = process.env.HWVERSION == 2; // check for bangle 2
 
 function drawMoon(phase, x, y) {
   const moonImgFiles = [
@@ -73,7 +72,7 @@ function drawTitle(key) {
  */
 function drawPoint(angle, radius, color) {
   const pRad = Math.PI / 180;
-  const faceWidth = 80; // watch face radius
+  const faceWidth = g.getWidth()/3; // watch face radius
   const centerPx = g.getWidth() / 2;
 
   const a = angle * pRad;
@@ -141,6 +140,7 @@ function drawData(title, obj, startX, startY) {
 
 function drawMoonPositionPage(gps, title) {
   const pos = SunCalc.getMoonPosition(new Date(), gps.lat, gps.lon);
+  const moonColor = g.theme.dark ? {r: 1, g: 1, b: 1} : {r: 0, g: 0, b: 0};
 
   const pageData = {
     Azimuth: pos.azimuth.toFixed(2),
@@ -150,59 +150,61 @@ function drawMoonPositionPage(gps, title) {
   };
   const azimuthDegrees = parseInt(pos.azimuth * 180 / Math.PI);
 
-  drawData(title, pageData, null, 80);
+  drawData(title, pageData, null, g.getHeight()/2 - Object.keys(pageData).length/2*20);
   drawPoints();
-  drawPoint(azimuthDegrees, 8, {r: 1, g: 1, b: 1});
+  drawPoint(azimuthDegrees, 8, moonColor);
 
   let m = setWatch(() => {
     let m = moonIndexPageMenu(gps);
-  }, BTN3, {repeat: false, edge: "falling"});
+  }, BANGLEJS2 ? BTN : BTN3, {repeat: false, edge: "falling"});
 }
 
 function drawMoonIlluminationPage(gps, title) {
   const phaseNames = [
-    "New Moon", "Waxing Crescent", "First Quarter", "Waxing Gibbous",
-    "Full Moon", "Waning Gibbous", "Last Quater", "Waning Crescent",
+    /*LANG*/"New Moon", /*LANG*/"Waxing Crescent", /*LANG*/"First Quarter", /*LANG*/"Waxing Gibbous",
+    /*LANG*/"Full Moon", /*LANG*/"Waning Gibbous", /*LANG*/"Last Quater", /*LANG*/"Waning Crescent",
   ];
 
   const phase = SunCalc.getMoonIllumination(new Date());
+  const phaseIdx = Math.round(phase.phase*8);
   const pageData = {
-    Phase: phaseNames[phase.phase],
+    Phase: phaseNames[phaseIdx],
   };
 
   drawData(title, pageData, null, 35);
-  drawMoon(phase.phase, g.getWidth() / 2, g.getHeight() / 2);
+  drawMoon(phaseIdx, g.getWidth() / 2, g.getHeight() / 2);
 
   let m = setWatch(() => {
     let m = moonIndexPageMenu(gps);
-  }, BTN3, {repease: false, edge: "falling"});
+  }, BANGLEJS2 ? BTN : BTN3, {repease: false, edge: "falling"});
 }
 
 
 function drawMoonTimesPage(gps, title) {
   const times = SunCalc.getMoonTimes(new Date(), gps.lat, gps.lon);
+  const moonColor = g.theme.dark ? {r: 1, g: 1, b: 1} : {r: 0, g: 0, b: 0};
 
   const pageData = {
     Rise: dateToTimeString(times.rise),
     Set: dateToTimeString(times.set),
   };
 
-  drawData(title, pageData, null, 105);
+  drawData(title, pageData, null, g.getHeight()/2 - Object.keys(pageData).length/2*20 + 5);
   drawPoints();
 
   // Draw the moon rise position
   const risePos = SunCalc.getMoonPosition(times.rise, gps.lat, gps.lon);
   const riseAzimuthDegrees = parseInt(risePos.azimuth * 180 / Math.PI);
-  drawPoint(riseAzimuthDegrees, 8, {r: 1, g: 1, b: 1});
+  drawPoint(riseAzimuthDegrees, 8, moonColor);
 
   // Draw the moon set position
   const setPos = SunCalc.getMoonPosition(times.set, gps.lat, gps.lon);
   const setAzimuthDegrees = parseInt(setPos.azimuth * 180 / Math.PI);
-  drawPoint(setAzimuthDegrees, 8, {r: 1, g: 1, b: 1});
+  drawPoint(setAzimuthDegrees, 8, moonColor);
 
   let m = setWatch(() => {
     let m = moonIndexPageMenu(gps);
-  }, BTN3, {repease: false, edge: "falling"});
+  }, BANGLEJS2 ? BTN : BTN3, {repease: false, edge: "falling"});
 }
 
 function drawSunShowPage(gps, key, date) {
@@ -224,7 +226,7 @@ function drawSunShowPage(gps, key, date) {
     Degrees: azimuthDegrees
   };
 
-  drawData(key, pageData, null, 85);
+  drawData(key, pageData, null, g.getHeight()/2 - Object.keys(pageData).length/2*20 + 5);
 
   drawPoints();
 
@@ -233,7 +235,7 @@ function drawSunShowPage(gps, key, date) {
 
   m = setWatch(() => {
     m = sunIndexPageMenu(gps);
-  }, BTN3, {repeat: false, edge: "falling"});
+  }, BANGLEJS2 ? BTN : BTN3, {repeat: false, edge: "falling"});
 
   return null;
 }
@@ -273,15 +275,15 @@ function moonIndexPageMenu(gps) {
     },
     "Times": () => {
       m = E.showMenu();
-      drawMoonTimesPage(gps, "Times");
+      drawMoonTimesPage(gps, /*LANG*/"Times");
     },
     "Position": () => {
       m = E.showMenu();
-      drawMoonPositionPage(gps, "Position");
+      drawMoonPositionPage(gps, /*LANG*/"Position");
     },
     "Illumination": () => {
       m = E.showMenu();
-      drawMoonIlluminationPage(gps, "Illumination");
+      drawMoonIlluminationPage(gps, /*LANG*/"Illumination");
     },
     "< Back": () => m = indexPageMenu(gps),
   };
@@ -292,15 +294,15 @@ function moonIndexPageMenu(gps) {
 function indexPageMenu(gps) {
   const menu = {
     "": {
-      "title": "Select",
+      "title": /*LANG*/"Select",
     },
-    "Sun": () => {
+    /*LANG*/"Sun": () => {
       m = sunIndexPageMenu(gps);
     },
-    "Moon": () => {
+    /*LANG*/"Moon": () => {
       m = moonIndexPageMenu(gps);
     },
-    "< Exit": () => { load(); }
+    "< Back": () => { load(); }
   };
 
   return E.showMenu(menu);
@@ -310,78 +312,9 @@ function getCenterStringX(str) {
   return (g.getWidth() - g.stringWidth(str)) / 2;
 }
 
-/**
- * GPS wait page, shows GPS locating animation until it gets a lock, then moves to the Sun page
- */
-function drawGPSWaitPage() {
-  const img = require("heatshrink").decompress(atob("mEwxH+AH4A/AH4AW43GF1wwsFwYwqFwowoFw4wmFxIwdE5YAPF/4vM5nN6YAE5vMF8YtHGIgvhFpQxKF7AuOGA4vXFyAwGF63MFyIABF6xeWMC4UDLwvNGpAJG5gwSdhIIDRBLyWCIgcJHAgJJDoouQF4vMQoICBBJoeGFx6GGACIfHL6YvaX6gvZeCIdFc4gAFXogvGFxgwFDwovQCAguOGAnMMBxeG5guTGAggGGAwNKFySREcA3N5vM5gDBdpQvXEY4AKXqovGGCKbFF7AwPZQwvZGJgtGF7vGdQItG5gSIF7gASF/44WEzgwRF0wwHF1AwFF1QwDF1gvwAH4A/AFAA=="));
-  const str1 = "Astrocalc v0.02";
-  const str2 = "Locating GPS";
-  const str3 = "Please wait...";
-
-  g.clear();
-  g.drawImage(img, 100, 50);
-  g.setFont("6x8", 1);
-  g.drawString(str1, getCenterStringX(str1), 105);
-  g.drawString(str2, getCenterStringX(str2), 140);
-  g.drawString(str3, getCenterStringX(str3), 155);
-
-  if (lastGPS) {
-    lastGPS = JSON.parse(lastGPS);
-    lastGPS.time = new Date();
-
-    const str4 = "Press Button 3 to use last GPS";
-    g.setColor("#d32e29");
-    g.fillRect(0, 190, g.getWidth(), 215);
-    g.setColor("#ffffff");
-    g.drawString(str4, getCenterStringX(str4), 200);
-
-    setWatch(() => {
-      clearWatch();
-      Bangle.setGPSPower(0);
-      m = indexPageMenu(lastGPS);
-    }, BTN3, {repeat: false});
-  }
-
-  g.flip();
-
-  const DEBUG = false;
-  if (DEBUG) {
-    clearWatch();
-
-    const gps = {
-      "lat": 56.45783133333,
-      "lon": -3.02188583333,
-      "alt": 75.3,
-      "speed": 0.070376,
-      "course": NaN,
-      "time":new Date(),
-      "satellites": 4,
-      "fix": 1
-    };
-
-    m = indexPageMenu(gps);
-
-    return;
-  }
-
-  Bangle.on('GPS', (gps) => {
-    if (gps.fix === 0) return;
-    clearWatch();
-
-    if (isNaN(gps.course)) gps.course = 0;
-    require("Storage").writeJSON(LAST_GPS_FILE, JSON.stringify(gps));
-    Bangle.setGPSPower(0);
-    Bangle.buzz();
-    Bangle.setLCDPower(true);
-
-    m = indexPageMenu(gps);
-  });
-}
-
 function init() {
-  Bangle.setGPSPower(1);
-  drawGPSWaitPage();
+  let location = require("Storage").readJSON("mylocation.json",1)||{"lat":51.5072,"lon":0.1276,"location":"London"};
+  indexPageMenu(location);
 }
 
 let m;
diff --git a/apps/astrocalc/metadata.json b/apps/astrocalc/metadata.json
index d77474700..653c097da 100644
--- a/apps/astrocalc/metadata.json
+++ b/apps/astrocalc/metadata.json
@@ -1,12 +1,13 @@
 {
   "id": "astrocalc",
   "name": "Astrocalc",
-  "version": "0.03",
-  "description": "Calculates interesting information on the sun and moon cycles for the current day based on your location.",
+  "version": "0.04",
+  "description": "Calculates interesting information on the sun like sunset and sunrise and moon cycles for the current day based on your location from MyLocation app",
   "icon": "astrocalc.png",
-  "tags": "app,sun,moon,cycles,tool,outdoors",
-  "supports": ["BANGLEJS"],
+  "tags": "app,sun,moon,cycles,tool",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "allow_emulator": true,
+  "dependencies": {"mylocation":"app"},
   "storage": [
     {"name":"astrocalc.app.js","url":"astrocalc-app.js"},
     {"name":"astrocalc.img","url":"astrocalc-icon.js","evaluate":true},
diff --git a/apps/bthometemp/ChangeLog b/apps/bthometemp/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/bthometemp/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/bthometemp/README.md b/apps/bthometemp/README.md
new file mode 100644
index 000000000..1a8212ea4
--- /dev/null
+++ b/apps/bthometemp/README.md
@@ -0,0 +1,9 @@
+# BTHome Temperature and Pressure
+
+This app displays temperature and pressure and advertises them over bluetooth using BTHome.io standard (along with battery level)
+
+This can be used to integrate with [Home Assistant](https://www.home-assistant.io/), so you can use your Bangle as a wireless temperature/pressure sensor.
+
+More info on the standard at https://bthome.io
+
+And the data format used is https://bthome.io/format/
diff --git a/apps/bthometemp/app-icon.js b/apps/bthometemp/app-icon.js
new file mode 100644
index 000000000..e2dff3eb9
--- /dev/null
+++ b/apps/bthometemp/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4kA///1N6BIPf//1gMIwdE8sG2me+9Y/8C/2snXsoUNpdnzdt/xj/AH4AYgMRAAUQCyoYSCQNXs1muoFBFyHm1X//+qtwwPiMX1+YmczxP6uIwNFwN6yeDnGDmc504wNFwOpnGYC4OJweaGBsR9WTmYtBmc4GAOuC5ZGBt4SBAAQEBwf2JBcBiupnIuCmedxGTzVRC5cX1AuDnPZF4OKuIXLi3zIoedMgMzn9hC5uICQON5IDBxAXSznYC6RdDPQYXNO4JcB7pdCO56nBnGZ7p6DU5zXBXgSqDa5sAiPqIgOZd4c510RCxQXBi+pRQIXBxODzVxC5hIBvR1DnE505GMGAevzAvC/QuNGAfm1X//+qtwuOGAURq9ms11AoIWOGAQAEFw1EDBwWFggBCkUgAQMigUAAIIAJoABDCgIXQFwYXBCYYBDHAMCEAIkCFgcEAIIKCCoQFCkAhBAQIlCkAsBOoIXCBoIvEAwQTCAYI2BIwgXIF4YXDQwIVCC4YIBMIwfCAQRfGYBSPNC6TBFACgwBACouWAH4AiA="))
diff --git a/apps/bthometemp/app.js b/apps/bthometemp/app.js
new file mode 100644
index 000000000..7b55777d1
--- /dev/null
+++ b/apps/bthometemp/app.js
@@ -0,0 +1,58 @@
+// history of temperature/pressure readings
+var history = [];
+
+// When we get temperature...
+function onTemperature(p) {
+  // Average the last 5 temperature readings
+  while (history.length>4) history.shift();
+  history.push(p);
+  var avrTemp = history.reduce((i,h)=>h.temperature+i,0) / history.length;
+  var avrPressure = history.reduce((i,h)=>h.pressure+i,0) / history.length;
+  var t = require('locale').temp(avrTemp).replace("'","°");
+  // Draw
+  var rect = Bangle.appRect;
+  g.reset(1).clearRect(rect.x, rect.y, rect.x2, rect.y2);
+  var x = (rect.x+rect.x2)/2;
+  var y = (rect.y+rect.y2)/2 + 10;
+  g.setFont("6x15").setFontAlign(0,0).drawString("Temperature:", x, y - 65);
+  g.setFontVector(50).setFontAlign(0,0).drawString(t, x, y-25);
+  g.setFont("6x15").setFontAlign(0,0).drawString("Pressure:", x, y+15 );
+  g.setFont("12x20").setFontAlign(0,0).drawString(Math.round(avrPressure)+" hPa", x, y+40);
+  // Set Bluetooth Advertising
+  // https://bthome.io/format/
+  var temp100 = Math.round(avrTemp*100);
+  var pressure100 = Math.round(avrPressure*100);
+
+  Bangle.bleAdvert[0xFCD2] = [ 0x40, /* BTHome Device Information
+              bit 0: "Encryption flag"
+              bit 1-4: "Reserved for future use"
+              bit 5-7: "BTHome Version" */
+
+              0x01, // Battery, 8 bit
+              E.getBattery(),
+
+              0x02, // Temperature, 16 bit
+              temp100&255,temp100>>8,
+
+              0x04, // Pressure, 16 bit
+              pressure100&255,(pressure100>>8)&255,pressure100>>16
+  ];
+  NRF.setAdvertising(Bangle.bleAdvert);
+}
+
+// Gets the temperature in the most accurate way with pressure sensor
+function drawTemperature() {
+  Bangle.getPressure().then(p =>{if (p) onTemperature(p);});
+}
+
+if (!Bangle.bleAdvert) Bangle.bleAdvert = {};
+setInterval(function() {
+  drawTemperature();
+}, 10000); // update every 10s
+Bangle.loadWidgets();
+Bangle.setUI({
+  mode : "custom",
+  back : function() {load();}
+});
+E.showMessage("Reading temperature...");
+drawTemperature();
diff --git a/apps/bthometemp/app.png b/apps/bthometemp/app.png
new file mode 100644
index 000000000..6c8eb3f14
Binary files /dev/null and b/apps/bthometemp/app.png differ
diff --git a/apps/bthometemp/metadata.json b/apps/bthometemp/metadata.json
new file mode 100644
index 000000000..4bfd08c31
--- /dev/null
+++ b/apps/bthometemp/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "bthometemp",
+  "name": "BTHome Temperature and Pressure",
+  "shortName":"BTHome T",
+  "version":"0.01",
+  "description": "Displays temperature and pressure, and advertises them over bluetooth using BTHome.io standard",
+  "icon": "app.png",
+  "tags": "bthome,bluetooth,temperature",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"bthometemp.app.js","url":"app.js"},
+    {"name":"bthometemp.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/bwclk/ChangeLog b/apps/bwclk/ChangeLog
index 546c83894..e3e059318 100644
--- a/apps/bwclk/ChangeLog
+++ b/apps/bwclk/ChangeLog
@@ -20,4 +20,5 @@
 0.20: Better handling of async data such as getPressure.
 0.21: On the default menu the week of year can be shown.
 0.22: Use the new clkinfo module for the menu.
-0.23: Feedback of apps after run is now optional and decided by the corresponding clkinfo.
\ No newline at end of file
+0.23: Feedback of apps after run is now optional and decided by the corresponding clkinfo.
+0.24: Update clock_info to avoid a redraw
diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js
index 7dcca9d75..c29fdf2ef 100644
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@@ -93,7 +93,7 @@ var bwItems = {
   items: [
   { name: "WeekOfYear",
     get: () => ({ text: "Week " + weekOfYear(), img: null}),
-    show: function() { bwItems.items[0].emit("redraw"); },
+    show: function() {},
     hide: function () {}
   },
   ]
diff --git a/apps/bwclk/metadata.json b/apps/bwclk/metadata.json
index fa0f7b01f..8ef812f41 100644
--- a/apps/bwclk/metadata.json
+++ b/apps/bwclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "bwclk",
   "name": "BW Clock",
-  "version": "0.23",
+  "version": "0.24",
   "description": "A very minimalistic clock to mainly show date and time.",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/calclock/ChangeLog b/apps/calclock/ChangeLog
index 5c1b7c4bc..90bcfb9d4 100644
--- a/apps/calclock/ChangeLog
+++ b/apps/calclock/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Tell clock widgets to hide.
 0.04: Improve current time readability in light theme.
 0.05: Show calendar colors & improved all day events.
+0.06: Improved multi-line locations & titles
diff --git a/apps/calclock/calclock.js b/apps/calclock/calclock.js
index 5a13a202f..1f98502ef 100644
--- a/apps/calclock/calclock.js
+++ b/apps/calclock/calclock.js
@@ -54,13 +54,15 @@ function drawEventBody(event, y) {
   var yStart = y;
   if (lines.length > 2) {
     lines = lines.slice(0,2);
-    lines[1] = lines[1].slice(0,-3)+"...";
+    lines[1] += "...";
   }
   g.drawString(lines.join('\n'),10,y);
   y+=20 * lines.length;
   if(event.location) {
     g.drawImage(atob("DBSBAA8D/H/nDuB+B+B+B3Dn/j/B+A8A8AYAYAYAAAAAAA=="),10,y);
-    g.drawString(event.location,25,y);
+    var loclines = g.wrapString(event.location, g.getWidth()-30);
+    if(loclines.length>1) loclines[0] += "...";
+    g.drawString(loclines[0],25,y);
     y+=20;
   }
   if (event.color) {
@@ -131,4 +133,3 @@ var minuteInterval = setInterval(redraw, 60 * 1000);
 Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
diff --git a/apps/calclock/metadata.json b/apps/calclock/metadata.json
index be0a1bdd8..bfd847595 100644
--- a/apps/calclock/metadata.json
+++ b/apps/calclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "calclock",
   "name": "Calendar Clock",
   "shortName": "CalClock",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Show the current and upcoming events synchronized from Gadgetbridge",
   "icon": "calclock.png",
   "type": "clock",
diff --git a/apps/choozi/ChangeLog b/apps/choozi/ChangeLog
index 03f7ef832..35adc7430 100644
--- a/apps/choozi/ChangeLog
+++ b/apps/choozi/ChangeLog
@@ -1,3 +1,9 @@
 0.01: New App!
 0.02: Support Bangle.js 2
 0.03: Fix bug for Bangle.js 2 where g.flip was not being called.
+0.04: Combine code for both apps
+      Better colors for Bangle.js 2
+      Fix selection animation for Bangle.js 2
+      New icon
+      Slightly wider arc segments for better visibility
+      Extract arc drawing code in library
diff --git a/apps/choozi/README.md b/apps/choozi/README.md
index f1e4255bc..ccaa97a27 100644
--- a/apps/choozi/README.md
+++ b/apps/choozi/README.md
@@ -11,16 +11,21 @@ the players seated in a circle, set the number of segments equal to the number
 of players, ensure that each person knows which colour represents them, and then
 choose a segment. After a short animation, the chosen segment will fill the screen.
 
-You can use Choozi to randomly select an element from any set with 2 to 13 members,
+You can use Choozi to randomly select an element from any set with 2 to 15 members,
 as long as you can define a bijection between members of the set and coloured
 segments on the Bangle.js display.
 
-## Controls
+## Controls Bangle 1
 
 BTN1: increase the number of segments
 BTN2: choose a segment at random
 BTN3: decrease the number of segments
 
+## Controls Bangle 2
+
+Swipe up/down: increase/decrease the number of segments
+BTN1 or tap: choose a segment at random
+
 ## Creator
 
 James Stanley
diff --git a/apps/choozi/app-icon.js b/apps/choozi/app-icon.js
index 51b3bead3..560286098 100644
--- a/apps/choozi/app-icon.js
+++ b/apps/choozi/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwggLIrnM4uqAAIhPgvMAAPFzIABzWgCxkMCweqC4QABDBYtC5QVFDBoWCCo5KLOQIWKDARFICxhJIFwOpC5owFFyAwGUYIuOGAwuRC4guSJAgXBCyIwDIyQXF5IXSzJeVMAReUAAOQhheTMAVcC6yOUC4aOUC7GZUyoXXzWqhQXVxGqC9mYC7OqC9eoxEKC6uBC6uIwAXBPCSmBwEAC6Z2BiAXBJCR2BgEAjQXSlGBC4JgSLwYABJCJGBLwJIDGB+IIwRIDGByNBIwZIDGBhdBRoQwSLoIuFGAYYKCwIuGGAgYI1QWBRgYYJMYmaFoSMEAAyrBAAgVCCxgYGjAWQAAMBC4UILZQA=="))
+require("heatshrink").decompress(atob("mEwwcH/4AW/u27dt2wQL/YOBCIXbv4QI+AODAQVsh4RHwEbCI0LCI9gCIOANAXbsFbG437tkDPg1btoRFFoILBgmSpMggECHQO/CAf2CIVJkgRBAQIjC24RFsECCItIgIRFMYMAiQRFpMAlqmDVwPYgAOEAQUggu274RD4BWCCIskCIPbCIPt20ABwwCCwARFgIRJyEWCIVt2EJCJi2BCJmSUgIRCwARNt/7CIIOICI1sWAwCFoFbCOtt8EACJsAgARR8hwBCJlJk4RlgARQAgIRKDwMn/gRBdJgRPyARBn4RBpARLiQRB/4RBgIRJwAREpIRLAYP///ypMgCJMACI0ECI4JCp4RB/wZECIsAAYN/CIP/5JPDCIhjDCIraHTIWTCAX//K7DCI+fCIf/EZA1CCAn//ipCLIsBk4RF/5ZHCIIQG//wPo8vCI//6QRFpYQIAAPpCIeXCBQAC/VfBI4="))
\ No newline at end of file
diff --git a/apps/choozi/app.js b/apps/choozi/app.js
index 1a5b2f17e..b9f53bc89 100644
--- a/apps/choozi/app.js
+++ b/apps/choozi/app.js
@@ -4,15 +4,16 @@
  *
  * James Stanley 2021
  */
-
-var colours = ['#ff0000', '#ff8080', '#00ff00', '#80ff80', '#0000ff', '#8080ff', '#ffff00', '#00ffff', '#ff00ff', '#ff8000', '#ff0080', '#8000ff', '#0080ff'];
+const GU = require("graphics_utils");
+var colours = ['#ff0000', '#00ff00', '#0000ff', '#ffff00', '#00ffff', '#ff00ff', '#ffffff'];
+var colours2 = ['#808080', '#404040', '#000040', '#004000', '#400000', '#ff8000', '#804000', '#4000c0'];
 
 var stepAngle = 0.18; // radians - resolution of polygon
 var gapAngle = 0.035; // radians - gap between segments
-var perimMin = 110; // px - min. radius of perimeter
-var perimMax = 120; // px - max. radius of perimeter
+var perimMin = g.getWidth()*0.40; // px - min. radius of perimeter
+var perimMax = g.getWidth()*0.49; // px - max. radius of perimeter
 
-var segmentMax = 106; // px - max radius of filled-in segment
+var segmentMax = g.getWidth()*0.38; // px - max radius of filled-in segment
 var segmentStep = 5; // px - step size of segment fill animation
 var circleStep = 4; // px - step size of circle fill animation
 
@@ -22,10 +23,10 @@ var minSpeed = 0.001; // rad/sec
 var animStartSteps = 300; // how many steps before it can start slowing?
 var accel = 0.0002; // rad/sec/sec - acc-/deceleration rate
 var ballSize = 3; // px - ball radius
-var ballTrack = 100; // px - radius of ball path
+var ballTrack = perimMin - ballSize*2; // px - radius of ball path
 
-var centreX = 120; // px - centre of screen
-var centreY = 120; // px - centre of screen
+var centreX = g.getWidth()*0.5; // px - centre of screen
+var centreY = g.getWidth()*0.5; // px - centre of screen
 
 var fontSize = 50; // px
 
@@ -33,7 +34,6 @@ var radians = 2*Math.PI; // radians per circle
 
 var defaultN = 3; // default value for N
 var minN = 2;
-var maxN = colours.length;
 var N;
 var arclen;
 
@@ -51,42 +51,14 @@ function shuffle (array) {
   }
 }
 
-// draw an arc between radii minR and maxR, and between
-// angles minAngle and maxAngle
-function arc(minR, maxR, minAngle, maxAngle) {
-  var step = stepAngle;
-  var angle = minAngle;
-  var inside = [];
-  var outside = [];
-  var c, s;
-  while (angle < maxAngle) {
-    c = Math.cos(angle);
-    s = Math.sin(angle);
-    inside.push(centreX+c*minR); // x
-    inside.push(centreY+s*minR); // y
-    // outside coordinates are built up in reverse order
-    outside.unshift(centreY+s*maxR); // y
-    outside.unshift(centreX+c*maxR); // x
-    angle += step;
-  }
-  c = Math.cos(maxAngle);
-  s = Math.sin(maxAngle);
-  inside.push(centreX+c*minR);
-  inside.push(centreY+s*minR);
-  outside.unshift(centreY+s*maxR);
-  outside.unshift(centreX+c*maxR);
-  
-  var vertices = inside.concat(outside);
-  g.fillPoly(vertices, true);
-}
-
 // draw the arc segments around the perimeter
 function drawPerimeter() {
+  g.setBgColor('#000000');
   g.clear();
   for (var i = 0; i < N; i++) {
     g.setColor(colours[i%colours.length]);
     var minAngle = (i/N)*radians;
-    arc(perimMin,perimMax,minAngle,minAngle+arclen);
+    GU.fillArc(g, centreX, centreY, perimMin,perimMax,minAngle,minAngle+arclen, stepAngle);
   }
 }
 
@@ -131,6 +103,7 @@ function animateChoice(target) {
     g.fillCircle(x, y, ballSize);
     oldx=x;
     oldy=y;
+    if (process.env.HWVERSION == 2) g.flip();
   }
 }
 
@@ -141,11 +114,15 @@ function choose() {
   var maxAngle = minAngle + arclen;
   animateChoice((minAngle+maxAngle)/2);
   g.setColor(colours[chosen%colours.length]);
-  for (var i = segmentMax-segmentStep; i >= 0; i -= segmentStep)
-    arc(i, perimMax, minAngle, maxAngle);
-  arc(0, perimMax, minAngle, maxAngle);
-  for (var r = 1; r < segmentMax; r += circleStep)
+  for (var i = segmentMax-segmentStep; i >= 0; i -= segmentStep){
+    GU.fillArc(g, centreX, centreY, i, perimMax, minAngle, maxAngle, stepAngle);
+    if (process.env.HWVERSION == 2) g.flip();
+  }
+  GU.fillArc(g, centreX, centreY, 0, perimMax, minAngle, maxAngle, stepAngle);
+  for (var r = 1; r < segmentMax; r += circleStep){
     g.fillCircle(centreX,centreY,r);
+    if (process.env.HWVERSION == 2) g.flip();
+  }
   g.fillCircle(centreX,centreY,segmentMax);
 }
 
@@ -171,38 +148,47 @@ function setN(n) {
   drawPerimeter();
 }
 
-// save N to choozi.txt
+// save N to choozi.save
 function writeN() {
-  var file = require("Storage").open("choozi.txt","w");
-  file.write(N);
+  var savedN = read();
+  if (savedN != N) require("Storage").write("choozi.save","" + N);
 }
 
-// load N from choozi.txt
+function read(){
+  var n = require("Storage").read("choozi.save");
+  if (n !== undefined) return parseInt(n);
+  return defaultN;
+}
+
+// load N from choozi.save
 function readN() {
-  var file = require("Storage").open("choozi.txt","r");
-  var n = file.readLine();
-  if (n !== undefined) setN(parseInt(n));
-  else setN(defaultN);
+  setN(read());
 }
 
-shuffle(colours); // is this really best?
-Bangle.setLCDMode("direct");
-Bangle.setLCDTimeout(0); // keep screen on
+if (process.env.HWVERSION == 1){
+  colours=colours.concat(colours2);
+  shuffle(colours);
+} else {
+  shuffle(colours);
+  shuffle(colours2);
+  colours=colours.concat(colours2);
+}
+
+var maxN = colours.length;
+if (process.env.HWVERSION == 1){
+  Bangle.setLCDMode("direct");
+  Bangle.setLCDTimeout(0); // keep screen on
+}
 readN();
 drawN();
 
-setWatch(() => {
-  setN(N+1);
-  drawN();
-}, BTN1, {repeat:true});
-
-setWatch(() => {
-  writeN();
-  drawPerimeter();
-  choose();
-}, BTN2, {repeat:true});
-
-setWatch(() => {
-  setN(N-1);
-  drawN();
-}, BTN3, {repeat:true});
+Bangle.setUI("updown", (v)=>{
+  if (!v){
+    writeN();
+    drawPerimeter();
+    choose();
+  } else {
+    setN(N-v);
+    drawN();
+  }
+});
diff --git a/apps/choozi/app.png b/apps/choozi/app.png
index 99c9fa07a..50f09f164 100644
Binary files a/apps/choozi/app.png and b/apps/choozi/app.png differ
diff --git a/apps/choozi/appb2.js b/apps/choozi/appb2.js
deleted file mode 100644
index 5f217f638..000000000
--- a/apps/choozi/appb2.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/* Choozi - Choose people or things at random using Bangle.js.
- * Inspired by the "Chwazi" Android app
- *
- * James Stanley 2021
- */
-
-var colours = ['#ff0000', '#ff8080', '#00ff00', '#80ff80', '#0000ff', '#8080ff', '#ffff00', '#00ffff', '#ff00ff', '#ff8000', '#ff0080', '#8000ff', '#0080ff'];
-
-var stepAngle = 0.18; // radians - resolution of polygon
-var gapAngle = 0.035; // radians - gap between segments
-var perimMin = 80; // px - min. radius of perimeter
-var perimMax = 87; // px - max. radius of perimeter
-
-var segmentMax = 70; // px - max radius of filled-in segment
-var segmentStep = 5; // px - step size of segment fill animation
-var circleStep = 4; // px - step size of circle fill animation
-
-// rolling ball animation:
-var maxSpeed = 0.08; // rad/sec
-var minSpeed = 0.001; // rad/sec
-var animStartSteps = 300; // how many steps before it can start slowing?
-var accel = 0.0002; // rad/sec/sec - acc-/deceleration rate
-var ballSize = 3; // px - ball radius
-var ballTrack = 75; // px - radius of ball path
-
-var centreX = 88; // px - centre of screen
-var centreY = 88; // px - centre of screen
-
-var fontSize = 50; // px
-
-var radians = 2*Math.PI; // radians per circle
-
-var defaultN = 3; // default value for N
-var minN = 2;
-var maxN = colours.length;
-var N;
-var arclen;
-
-// https://www.frankmitchell.org/2015/01/fisher-yates/
-function shuffle (array) {
-  var i = 0
-    , j = 0
-    , temp = null;
-
-  for (i = array.length - 1; i > 0; i -= 1) {
-    j = Math.floor(Math.random() * (i + 1));
-    temp = array[i];
-    array[i] = array[j];
-    array[j] = temp;
-  }
-}
-
-// draw an arc between radii minR and maxR, and between
-// angles minAngle and maxAngle
-function arc(minR, maxR, minAngle, maxAngle) {
-  var step = stepAngle;
-  var angle = minAngle;
-  var inside = []; 
-  var outside = [];
-  var c, s;
-  while (angle < maxAngle) {
-    c = Math.cos(angle);
-    s = Math.sin(angle);
-    inside.push(centreX+c*minR); // x
-    inside.push(centreY+s*minR); // y
-    // outside coordinates are built up in reverse order
-    outside.unshift(centreY+s*maxR); // y
-    outside.unshift(centreX+c*maxR); // x
-    angle += step;
-  }
-  c = Math.cos(maxAngle);
-  s = Math.sin(maxAngle);
-  inside.push(centreX+c*minR);
-  inside.push(centreY+s*minR);
-  outside.unshift(centreY+s*maxR);
-  outside.unshift(centreX+c*maxR);
-
-  var vertices = inside.concat(outside);
-  g.fillPoly(vertices, true);
-}
-
-// draw the arc segments around the perimeter
-function drawPerimeter() {
-  g.clear();
-  for (var i = 0; i < N; i++) {
-    g.setColor(colours[i%colours.length]);
-    var minAngle = (i/N)*radians;
-    arc(perimMin,perimMax,minAngle,minAngle+arclen);
-  }
-}
-
-// animate a ball rolling around and settling at "target" radians
-function animateChoice(target) {
-  var angle = 0;
-  var speed = 0;
-  var oldx = -10;
-  var oldy = -10;
-  var decelFromAngle = -1;
-  var allowDecel = false;
-  for (var i = 0; true; i++) {
-    angle = angle + speed;
-    if (angle > radians) angle -= radians;
-    if (i < animStartSteps || (speed < maxSpeed && !allowDecel)) {
-      speed = speed + accel;
-      if (speed > maxSpeed) {
-        speed = maxSpeed;
-        /* when we reach max speed, we know how long it takes
-         * to accelerate, and therefore how long to decelerate, so
-         * we can work out what angle to start decelerating from */
-        if (decelFromAngle < 0) {
-          decelFromAngle = target-angle;
-          while (decelFromAngle < 0) decelFromAngle += radians;
-          while (decelFromAngle > radians) decelFromAngle -= radians;
-        }
-      }
-    } else {
-      if (!allowDecel && (angle < decelFromAngle) && (angle+speed >= decelFromAngle)) allowDecel = true;
-      if (allowDecel) speed = speed - accel;
-      if (speed < minSpeed) speed = minSpeed;
-      if (speed == minSpeed && angle < target && angle+speed >= target) return;
-    }
-
-    var r = i/2;
-    if (r > ballTrack) r = ballTrack;
-    var x = centreX+Math.cos(angle)*r;
-    var y = centreY+Math.sin(angle)*r;
-    g.setColor('#000000');
-    g.fillCircle(oldx,oldy,ballSize+1);
-    g.setColor('#ffffff');
-    g.fillCircle(x, y, ballSize);
-    oldx=x;
-    oldy=y;
-    g.flip();
-  }
-}
-
-// choose a winning segment and animate its selection
-function choose() {
-  var chosen = Math.floor(Math.random()*N);
-  var minAngle = (chosen/N)*radians;
-  var maxAngle = minAngle + arclen;
-  animateChoice((minAngle+maxAngle)/2);
-  g.setColor(colours[chosen%colours.length]);
-  for (var i = segmentMax-segmentStep; i >= 0; i -= segmentStep)
-    arc(i, perimMax, minAngle, maxAngle);
-  arc(0, perimMax, minAngle, maxAngle);
-  for (var r = 1; r < segmentMax; r += circleStep)
-    g.fillCircle(centreX,centreY,r);
-  g.fillCircle(centreX,centreY,segmentMax);
-}
-
-// draw the current value of N in the middle of the screen, with
-// up/down arrows
-function drawN() {
-  g.setColor(g.theme.fg);
-  g.setFont("Vector",fontSize);
-  g.drawString(N,centreX-g.stringWidth(N)/2+4,centreY-fontSize/2);
-  if (N < maxN)
-    g.fillPoly([centreX-6,centreY-fontSize/2-7, centreX+6,centreY-fontSize/2-7, centreX, centreY-fontSize/2-14]);
-  if (N > minN)
-    g.fillPoly([centreX-6,centreY+fontSize/2+5, centreX+6,centreY+fontSize/2+5, centreX, centreY+fontSize/2+12]);
-}
-
-// update number of segments, with min/max limit, "arclen" update,
-// and screen reset
-function setN(n) {
-  N = n;
-  if (N < minN) N = minN;
-  if (N > maxN) N = maxN;
-  arclen = radians/N - gapAngle;
-  drawPerimeter();
-}
-
-// save N to choozi.txt
-function writeN() {
-  var file = require("Storage").open("choozi.txt","w");
-  file.write(N);
-}
-
-// load N from choozi.txt
-function readN() {
-  var file = require("Storage").open("choozi.txt","r");
-  var n = file.readLine();
-  if (n !== undefined) setN(parseInt(n));
-  else setN(defaultN);
-}
-
-shuffle(colours); // is this really best?
-Bangle.setLCDTimeout(0); // keep screen on
-readN();
-drawN();
-
-setWatch(() => {
-  writeN();
-  drawPerimeter();
-  choose();
-}, BTN1, {repeat:true});
-
-Bangle.on('touch', function(zone,e) {
-  if(e.x>+88){
-    setN(N-1);
-    drawN();
-  }else{
-    setN(N+1);
-    drawN();
-  }
-});
diff --git a/apps/choozi/bangle1-choozi-screenshot1.png b/apps/choozi/bangle1-choozi-screenshot1.png
index 104024958..ee422ed10 100644
Binary files a/apps/choozi/bangle1-choozi-screenshot1.png and b/apps/choozi/bangle1-choozi-screenshot1.png differ
diff --git a/apps/choozi/bangle1-choozi-screenshot2.png b/apps/choozi/bangle1-choozi-screenshot2.png
index f3b6868bf..20edf4c78 100644
Binary files a/apps/choozi/bangle1-choozi-screenshot2.png and b/apps/choozi/bangle1-choozi-screenshot2.png differ
diff --git a/apps/choozi/metadata.json b/apps/choozi/metadata.json
index 79af76fa2..c42abe079 100644
--- a/apps/choozi/metadata.json
+++ b/apps/choozi/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "choozi",
   "name": "Choozi",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Choose people or things at random using Bangle.js.",
   "icon": "app.png",
   "tags": "tool",
@@ -10,8 +10,10 @@
   "allow_emulator": true,
   "screenshots": [{"url":"bangle1-choozi-screenshot1.png"},{"url":"bangle1-choozi-screenshot2.png"}],
   "storage": [
-    {"name":"choozi.app.js","url":"app.js","supports": ["BANGLEJS"]},
-    {"name":"choozi.app.js","url":"appb2.js","supports": ["BANGLEJS2"]},
+    {"name":"choozi.app.js","url":"app.js"},
     {"name":"choozi.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"choozi.save"}
   ]
 }
diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog
index cb5248e32..83abde6df 100644
--- a/apps/circlesclock/ChangeLog
+++ b/apps/circlesclock/ChangeLog
@@ -38,3 +38,4 @@
       Add fast load capability
 0.21: Remade all icons without a palette for dark theme
       Now re-adds widgets if they were hidden when fast-loading
+0.22: Fixed crash if item has no image and cutting long overflowing text
diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js
index 444040ef0..30d6a48f4 100644
--- a/apps/circlesclock/app.js
+++ b/apps/circlesclock/app.js
@@ -183,9 +183,12 @@ let drawCircle = function(index, item, data) {
   if (txt.endsWith(" bpm")) txt=txt.slice(0,-4); // hack for heart rate - remove the 'bpm' text
   if(item.hasRange) percent = (data.v-data.min) / (data.max-data.min);
   if(data.short) txt = data.short;
+  //long text can overflow and we do not draw there anymore..
+  if(txt.length>6) txt = txt.slice(0,5)+"\n"+txt.slice(5,10)
   drawGauge(w, h3, percent, color);
   drawInnerCircleAndTriangle(w);
   writeCircleText(w, txt);
+  if(!img) return; //or get it from the clkinfo?
   g.setColor(getCircleIconColor(index, color, percent))
     .drawImage(img, w - iconOffset, h3 + radiusOuter - iconOffset, {scale: 16/24});
 }
diff --git a/apps/circlesclock/metadata.json b/apps/circlesclock/metadata.json
index 7b4c25532..1b94c00b3 100644
--- a/apps/circlesclock/metadata.json
+++ b/apps/circlesclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "circlesclock",
   "name": "Circles clock",
   "shortName":"Circles clock",
-  "version":"0.21",
+  "version":"0.22",
   "description": "A clock with three or four circles for different data at the bottom in a probably familiar style",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot-dark.png"}, {"url":"screenshot-light.png"}, {"url":"screenshot-dark-4.png"}, {"url":"screenshot-light-4.png"}],
diff --git a/apps/clkinfofw/ChangeLog b/apps/clkinfofw/ChangeLog
new file mode 100644
index 000000000..10810802b
--- /dev/null
+++ b/apps/clkinfofw/ChangeLog
@@ -0,0 +1,2 @@
+0.01: First release
+0.02: Update clock_info to avoid a redraw and image allocation
diff --git a/apps/clkinfofw/app.png b/apps/clkinfofw/app.png
new file mode 100644
index 000000000..c6575b73b
Binary files /dev/null and b/apps/clkinfofw/app.png differ
diff --git a/apps/clkinfofw/clkinfo.js b/apps/clkinfofw/clkinfo.js
new file mode 100644
index 000000000..2b3cb32ba
--- /dev/null
+++ b/apps/clkinfofw/clkinfo.js
@@ -0,0 +1,17 @@
+(function() {
+  return {
+    name: "Bangle",
+    items: [
+      { name : "FW",
+        get : () => {
+          return {
+            text : process.env.VERSION,
+            img : atob("GBjC////AADve773VWmmmmlVVW22nnlVVbLL445VVwAAAADVWAAAAAAlrAAAAAA6sAAAAAAOWAAAAAAlrAD//wA6sANVVcAOWANVVcAlrANVVcA6rANVVcA6WANVVcAlsANVVcAOrAD//wA6WAAAAAAlsAAAAAAOrAAAAAA6WAAAAAAlVwAAAADVVbLL445VVW22nnlVVWmmmmlV")
+          };
+        },
+        show : function() {},
+        hide : function() {}
+      }
+    ]
+  };
+})
diff --git a/apps/clkinfofw/metadata.json b/apps/clkinfofw/metadata.json
new file mode 100644
index 000000000..720a5baa5
--- /dev/null
+++ b/apps/clkinfofw/metadata.json
@@ -0,0 +1,13 @@
+{ "id": "clkinfofw",
+  "name": "Firmware Clockinfo",
+  "version":"0.02",
+  "description": "For clocks that display 'clockinfo', this displays the firmware version string",
+  "icon": "app.png",
+  "type": "clkinfo",
+  "screenshots": [{"url":"screenshot.png"}],
+  "tags": "clkinfo,firmware",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"clkinfofw.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/clkinfofw/screenshot.png b/apps/clkinfofw/screenshot.png
new file mode 100644
index 000000000..da185bd2e
Binary files /dev/null and b/apps/clkinfofw/screenshot.png differ
diff --git a/apps/ha/ChangeLog b/apps/ha/ChangeLog
index f9ca3c16d..c0d58e5bc 100644
--- a/apps/ha/ChangeLog
+++ b/apps/ha/ChangeLog
@@ -3,4 +3,5 @@
 0.03: Added clkinfo for clocks.
 0.04: Feedback if clkinfo run is called.
 0.05: Clkinfo improvements.
-0.06: Updated clkinfo icon.
\ No newline at end of file
+0.06: Updated clkinfo icon.
+0.07: Update clock_info to avoid a redraw
diff --git a/apps/ha/ha.clkinfo.js b/apps/ha/ha.clkinfo.js
index d6a0f72a0..09724ba45 100644
--- a/apps/ha/ha.clkinfo.js
+++ b/apps/ha/ha.clkinfo.js
@@ -12,7 +12,7 @@
       haItems.items.push({
         name: null,
         get: () => ({ text: trigger.display, img: trigger.getIcon()}),
-        show: function() { haItems.items[i].emit("redraw"); },
+        show: function() {},
         hide: function () {},
         run: function() {
           ha.sendTrigger("TRIGGER_BW");
@@ -23,4 +23,4 @@
     });
 
     return haItems;
-})
\ No newline at end of file
+})
diff --git a/apps/ha/metadata.json b/apps/ha/metadata.json
index 089450f55..1432e010e 100644
--- a/apps/ha/metadata.json
+++ b/apps/ha/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ha",
   "name": "HomeAssistant",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Integrates your BangleJS into HomeAssistant.",
   "icon": "ha.png",
   "type": "app",
diff --git a/apps/health/metadata.json b/apps/health/metadata.json
index d4eab1f38..12f6b617f 100644
--- a/apps/health/metadata.json
+++ b/apps/health/metadata.json
@@ -1,6 +1,7 @@
 {
   "id": "health",
   "name": "Health Tracking",
+  "shortName": "Health",
   "version": "0.17",
   "description": "Logs health data and provides an app to view it",
   "icon": "app.png",
diff --git a/apps/hworldclock/ChangeLog b/apps/hworldclock/ChangeLog
index 13e3fa809..99727c50b 100644
--- a/apps/hworldclock/ChangeLog
+++ b/apps/hworldclock/ChangeLog
@@ -13,3 +13,7 @@
 0.27: BJS2: Changed swipe down to swipe up
 0.28: Reverted changes to implementation of 0.25
 0.29: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps
+0.30: BJS2: swipe seems to be working now
+0.31: Tweaking the swipe option; Added mylocation as a dependency.
+      Remove calls to Bangle.loadWidgets as they are not needed and create warnings
+0.32: Added setting to show single timezone small, like where multiple ones are configured
\ No newline at end of file
diff --git a/apps/hworldclock/README.md b/apps/hworldclock/README.md
index 93780bc2d..d8343e5b9 100644
--- a/apps/hworldclock/README.md
+++ b/apps/hworldclock/README.md
@@ -1,8 +1,17 @@
+
 # Hanks World Clock - See the time in four locations
 
 In addition to the main clock and date in your current location, you can add up to three other locations. Great for travel or remote working.  
-Additionally we show the sunset/sunrise and seconds for the current location and the day name is shown in your locale.  
-If watch is locked, seconds get refreshed every 10 seconds.
+Additionally we show the sunset/sunrise and seconds for the current location. The day name is shown in your locale.
+Also, you can swipe up to show the current time to a friend.
+
+All this is configurable:
+
+ - Show seconds only when unlocked (saves battery) / always / do not show seconds
+ - Green color on dark mode (on/off)
+ - 1 Offset Small: single location shows as small (like more than 1)
+ - Show sun info (on/off) (set your location in the mylocation app)
+ - Rotation degree on swipe (off / 90 / 180 / 270)
 
 ![](hworldclock.png)
 
@@ -10,9 +19,11 @@ If watch is locked, seconds get refreshed every 10 seconds.
 
 Location for sun set / rise set with mylocation app.  
 
-Provide names and the UTC offsets for up to three other timezones in the app store. These are stored in a json file on your watch. UTC offsets can be decimal (e.g., 5.5 for India).  
+Provide names and the UTC offsets for up to three other timezones in the App Loader before uploading. These are stored in a json file on your watch. UTC offsets can be decimal (e.g., 5.5 for India).  
 
-The clock does not handle summer time / daylight saving time changes automatically. If one of your three locations changes its UTC offset, you can simply change the setting in the app store and update. Currently the clock only supports 24 hour time format for the additional time zones.
+The clock does not handle summer time / daylight saving time changes automatically. If one of your three locations changes its UTC offset, you can simply change the setting in the App Launcher and update. Currently the clock only supports 24 hour time format for the additional time zones.
+
+BangleJS2: Swipe up to rotate screen (Target rotation can be set in the settings). Swipe up again to go back to the default rotation. So you can show the time to a friend real quick or temporarily change orientation for sports etc.
 
 ## Requests
 
@@ -22,5 +33,4 @@ Please use [the Espruino Forum](http://forum.espruino.com/microcosms/1424/) if y
 
 Created by Hank.
 
-Based on the great work of "World Clock - 4 time zones". Made by [Scott Hale](https://www.github.com/computermacgyver), based upon the [Simple Clock](https://github.com/espruino/BangleApps/tree/master/apps/sclock).  
-And Sun Clock [Sun Clock](https://github.com/espruino/BangleApps/tree/master/apps/sunclock)
\ No newline at end of file
+Based on the great work of "World Clock - 4 time zones". Made by [Scott Hale](https://www.github.com/computermacgyver)
diff --git a/apps/hworldclock/app.js b/apps/hworldclock/app.js
index 6bd30be8e..79e916ea9 100644
--- a/apps/hworldclock/app.js
+++ b/apps/hworldclock/app.js
@@ -2,20 +2,22 @@
 
 // ------- Settings file
 const SETTINGSFILE = "hworldclock.json";
-var secondsMode;
-var showSunInfo;
-var colorWhenDark;
+let secondsMode;
+let showSunInfo;
+let colorWhenDark;
+let rotationTarget;
 // ------- Settings file
 
+//const BANGLEJS2 = process.env.HWVERSION == 2;
 const big = g.getWidth()>200;
 // Font for primary time and date
 const primaryTimeFontSize = big?6:5;
 const primaryDateFontSize = big?3:2;
-require("Font5x9Numeric7Seg").add(Graphics);
-require("FontTeletext10x18Ascii").add(Graphics);
+let font5x9 = require("Font5x9Numeric7Seg").add(Graphics);
+let font10x18 = require("FontTeletext10x18Ascii").add(Graphics);
 
 // Font for single secondary time
-const secondaryTimeFontSize = 4;
+const secondaryTimeFontSize = 4; 
 const secondaryTimeZoneFontSize = 2;
 
 // Font / columns for multiple secondary times
@@ -24,9 +26,8 @@ const xcol1 = 10;
 const xcol2 = g.getWidth() - xcol1;
 
 const font = "6x8";
+let drag;
 
-/* TODO: we could totally use 'Layout' here and
-avoid a whole bunch of hard-coded offsets */
 
 const xyCenter = g.getWidth() / 2;
 const xyCenterSeconds = xyCenter + (big ? 85 : 68);
@@ -39,22 +40,27 @@ const yposWorld = big ? 170 : 120;
 const OFFSET_TIME_ZONE = 0;
 const OFFSET_HOURS = 1;
 
-var PosInterval = 0;
+let PosInterval = 0; 
 
-var offsets = require("Storage").readJSON("hworldclock.settings.json") || [];
+let offsets = require("Storage").readJSON("hworldclock.settings.json") || [];
 
 //=======Sun
-setting = require("Storage").readJSON("setting.json",1);
+let setting = require("Storage").readJSON("setting.json",1);
 E.setTimeZone(setting.timezone); // timezone = 1 for MEZ, = 2 for MESZ
-SunCalc = require("suncalc"); // from modules folder
+//https://raw.githubusercontent.com/pebl-hank/BangleApps/master/modules/suncalc.js
+let SunCalc = require("suncalc"); // from modules folder
 const LOCATION_FILE = "mylocation.json";
-var rise = "read";
-var set	= "...";
+let rise = "read";
+let set	= "...";
 //var pos	 = {altitude: 20, azimuth: 135};
 //var noonpos = {altitude: 37, azimuth: 180};
 //=======Sun
 
-var ampm = "AM";
+let ampm = "AM";
+
+let defaultRotation = setting.rotate || 0;
+let currentRotation = defaultRotation;
+
 
 // TESTING CODE
 // Used to test offset array values during development.
@@ -87,32 +93,39 @@ const mockOffsets = {
 //offsets = mockOffsets.fourOffsets; // should render in columns
 
 // END TESTING CODE
+ 
 
-
-// Load settings
-function loadMySettings() {
-	// Helper function default setting
-	function def (value, def) {return value !== undefined ? value : def;}
-
-	var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
-	secondsMode = def(settings.secondsMode, "when unlocked");
-	showSunInfo = def(settings.showSunInfo, true);
-	colorWhenDark = def(settings.colorWhenDark, "green");
+// ================ Load settings
+// Helper function default setting
+let def = function(value, def) {
+	return value !== undefined ? value : def;
 }
 
+let settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
+secondsMode = def(settings.secondsMode, "when unlocked");
+showSunInfo = def(settings.showSunInfo, true);
+singleOffsetSmall = def(settings.singleOffsetSmall, false);
+colorWhenDark = def(settings.colorWhenDark, "green");
+rotationTarget = def(settings.rotationTarget, "90");
+rotationTarget = parseInt(rotationTarget) || 0;
+if (rotationTarget == 90) rotationTarget = 1; // very lame, but works for now.
+if (rotationTarget == 180) rotationTarget = 2;
+if (rotationTarget == 270) rotationTarget = 3;
+// ================ Load settings
+
 
 // Check settings for what type our clock should be
-var _12hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]||false;
+let _12hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]||false;
 
 // timeout used to update every minute
-var drawTimeout;
-var drawTimeoutSeconds;
-var secondsTimeout;
+let drawTimeout;
+let drawTimeoutSeconds;
+let secondsTimeout;
 
 g.setBgColor(g.theme.bg);
 
 // schedule a draw for the next minute
-function queueDraw() {
+let queueDraw = function() {
 	if (drawTimeout) clearTimeout(drawTimeout);
 		drawTimeout = setTimeout(function() {
 			drawTimeout = undefined;
@@ -121,7 +134,7 @@ function queueDraw() {
 }
 
 // schedule a draw for the next second
-function queueDrawSeconds() {
+let queueDrawSeconds = function() {
 	if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
 		drawTimeoutSeconds = setTimeout(function() {
 			drawTimeoutSeconds = undefined;
@@ -130,28 +143,29 @@ function queueDrawSeconds() {
 		}, secondsTimeout - (Date.now() % secondsTimeout));
 }
 
-function doublenum(x) {
+let doublenum = function(x) {	
 	return x < 10 ? "0" + x : "" + x;
 }
 
-function getCurrentTimeFromOffset(dt, offset) {
+let getCurrentTimeFromOffset = function(dt, offset) {
 	return new Date(dt.getTime() + offset * 60 * 60 * 1000);
 }
 
-function updatePos() {
-	coord = require("Storage").readJSON(LOCATION_FILE,1)||  {"lat":0,"lon":0,"location":"-"}; //{"lat":53.3,"lon":10.1,"location":"Pattensen"};
+let updatePos = function() {	
+	let coord = require("Storage").readJSON(LOCATION_FILE,1)||  {"lat":0,"lon":0,"location":"-"}; //{"lat":53.3,"lon":10.1,"location":"Pattensen"};
 	if (coord.lat != 0 && coord.lon != 0) {
+	//pos = SunCalc.getPosition(Date.now(), coord.lat, coord.lon);	
 	times = SunCalc.getTimes(Date.now(), coord.lat, coord.lon);
 	rise = "^" + times.sunrise.toString().split(" ")[4].substr(0,5);
 	set	= "v" + times.sunset.toString().split(" ")[4].substr(0,5);
+	//noonpos = SunCalc.getPosition(times.solarNoon, coord.lat, coord.lon);
 	} else {
 		rise = null;
 		set  = null;
 	}
 }
 
-
-function drawSeconds() {
+let drawSeconds = function() {
 	// get date
 	let d = new Date();
 	let da = d.toString().split(" ");
@@ -173,16 +187,13 @@ function drawSeconds() {
 	} else {
 		g.setColor(g.theme.fg);
 	}
-	//console.log("---");
-	//console.log(seconds);
 	if (Bangle.isLocked() && secondsMode != "always") seconds = seconds.slice(0, -1) + ':::'; // we use :: as the font does not have an x
-	//console.log(seconds);
-	g.drawString(`${seconds}`, xyCenterSeconds, yposTime+14, true);
+	g.drawString(`${seconds}`, xyCenterSeconds, yposTime+14, true); 
 	queueDrawSeconds();
 
 }
 
-function draw() {
+let draw = function() {
 	// get date
 	let d = new Date();
 	let da = d.toString().split(" ");
@@ -194,20 +205,19 @@ function draw() {
 	let time = da[4].split(":");
 	let hours = time[0],
 	minutes = time[1];
-
-
+	
+	
 	if (_12hour){
 		//do 12 hour stuff
 		if (hours > 12) {
 			ampm = "PM";
-			hours = hours - 12;
-			if (hours < 10) hours = doublenum(hours);
+			hours = hours - 12;	
+			if (hours < 10) hours = doublenum(hours);	
 		} else {
-			ampm = "AM";
-		}
-	}
+			ampm = "AM";	 
+		}	 
+	}	
 
-	//g.setFont(font, primaryTimeFontSize);
 	g.setFont("5x9Numeric7Seg",primaryTimeFontSize);
 	if (g.theme.dark) {
 		if (colorWhenDark == "green") {
@@ -219,18 +229,18 @@ function draw() {
 		g.setColor(g.theme.fg);
 	}
 	g.drawString(`${hours}:${minutes}`, xyCenter-10, yposTime, true);
-
+	
 	// am / PM ?
 	if (_12hour){
 	//do 12 hour stuff
 		//let ampm = require("locale").medidian(new Date()); Not working
 		g.setFont("Vector", 17);
 		g.drawString(ampm, xyCenterSeconds, yAmPm, true);
-	}
+	}	
 
 	if (secondsMode != "none") drawSeconds(); // To make sure...
-
-	// draw Day, name of month, Date
+	
+	// draw Day, name of month, Date	
 	//DATE
 	let localDate = require("locale").date(new Date(), 1);
 	localDate = localDate.substring(0, localDate.length - 5);
@@ -248,8 +258,8 @@ function draw() {
 	minutes = doublenum(dx.getMinutes());
 
 
-	if (offsets.length === 1) {
-		let date = [require("locale").dow(new Date(), 1), require("locale").date(new Date(), 1)];
+	if (offsets.length === 1 && !singleOffsetSmall) {
+		let date = [require("locale").dow(new Date(), 1), require("locale").date(new Date(), 1)];	
 		// For a single secondary timezone, draw it bigger and drop time zone to second line
 		const xOffset = 30;
 		g.setFont(font, secondaryTimeFontSize).drawString(`${hours}:${minutes}`, xyCenter, yposTime2, true);
@@ -275,7 +285,7 @@ function draw() {
 			g.setFontAlign(-1, 0).setFont("Vector",12).drawString(`${rise}`, 10, 3 + yposWorld + 3 * 15, true); // draw rise
 			g.setFontAlign(1, 0).drawString(`${set}`, xcol2, 3 + yposWorld + 3 * 15, true); // draw set
 		} else {
-			g.setFontAlign(-1, 0).setFont("Vector",11).drawString("set city in \'my location\' app!", 10, 3 + yposWorld + 3 * 15, true);
+			g.setFontAlign(-1, 0).setFont("Vector",11).drawString("set city in \'my location\' app!", 10, 3 + yposWorld + 3 * 15, true); 
 		}
 	}
 	//debug settings
@@ -285,34 +295,62 @@ function draw() {
 	//g.drawString(colorWhenDark, xcol2, 3 + yposWorld + 3 * 15, true);
 
 	queueDraw();
-
+	
 	if (secondsMode != "none") queueDrawSeconds();
 }
 
-// clean app screen
-g.clear();
-
-// Init the settings of the app
-loadMySettings();
-
-// Show launcher when middle button pressed
-Bangle.setUI({
-  mode : "clock",
-  remove : function() {
-    // Called to unload all of the clock app
-    if (PosInterval) clearInterval(PosInterval);
-    PosInterval = undefined;
-    if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
-    drawTimeoutSeconds = undefined;
-    if (drawTimeout) clearTimeout(drawTimeout);
-    drawTimeout = undefined;
-  }});
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 
 
-// draw immediately at first, queue update
-draw();
+	
+//if (BANGLEJS2) { 	
+	let onDrag = e => {	
+		if (!drag) { // start dragging
+			drag = {x: e.x, y: e.y};
+		} else if (!e.b) { // released
+			const dx = e.x-drag.x, dy = e.y-drag.y;
+			drag = null;
+			if (Math.abs(dx)>Math.abs(dy)+10) {
+				// horizontal
+				if (dx < dy) {
+					// for later purpose
+				} else {
+					// for later purpose
+				}
+			} else if (Math.abs(dy)>Math.abs(dx)+10) {
+				// vertical
+				if (dx < dy) { //down
+					//g.clear().setRotation(defaultRotation);
+					//currentRotation = defaultRotation;
+					//draw();
+					//Bangle.drawWidgets();
+				} else {
+					if (currentRotation == rotationTarget) {
+						g.clear().setRotation(defaultRotation);
+						currentRotation = defaultRotation;
+					} else {
+						g.clear().setRotation(rotationTarget);
+						currentRotation = rotationTarget;
+					}
+
+					draw();
+					Bangle.drawWidgets();
+				}
+			} else {
+				//console.log("tap " + e.x + " " + e.y);
+				if (e.x > 145 && e.y > 145) {
+					// for later purpose
+				}
+			}
+		}
+	}; //);
+	Bangle.on("drag", onDrag);
+	//} <-- BJS2 only    } else {
+			//setWatch(xxx, BTN1, { repeat: true, debounce:50 }); // maybe adding this later
+			//setWatch(xxx, BTN3, { repeat: true, debounce:50 });
+			//setWatch(xxx, BTN4, { repeat: true, debounce:50 });
+			//setWatch(xxx, BTN5, { repeat: true, debounce:50 });
+	//	}
+
 
 
 if (!Bangle.isLocked())  { // Initial state
@@ -326,15 +364,15 @@ if (!Bangle.isLocked())  { // Initial state
 		if (secondsMode != "none") {
 			if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
 			drawTimeoutSeconds = undefined;
-		}
+		}	
 		if (drawTimeout) clearTimeout(drawTimeout);
 		drawTimeout = undefined;
 		draw(); // draw immediately, queue redraw
-
+		
   }else{
 		if (secondsMode == "always") secondsTimeout = 1000;
 		if (secondsMode == "when unlocked") secondsTimeout = 10 * 1000;
-
+		
 		if (secondsMode != "none") {
 			if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
 			drawTimeoutSeconds = undefined;
@@ -348,11 +386,10 @@ if (!Bangle.isLocked())  { // Initial state
 			updatePos();
 		}
 		draw(); // draw immediately, queue redraw
-
   }
+ 
 
-
-Bangle.on('lock',on=>{
+let onLock = on => {	
   if (!on) { // UNlocked
 		if (showSunInfo) {
 			if (PosInterval != 0) clearInterval(PosInterval);
@@ -364,7 +401,7 @@ Bangle.on('lock',on=>{
 		if (secondsMode != "none") {
 			if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
 			drawTimeoutSeconds = undefined;
-		}
+		}	
 		if (drawTimeout) clearTimeout(drawTimeout);
 		drawTimeout = undefined;
 
@@ -373,7 +410,7 @@ Bangle.on('lock',on=>{
 
 		if (secondsMode == "always") secondsTimeout = 1000;
 		if (secondsMode == "when unlocked") secondsTimeout = 10 * 1000;
-
+		
 		if (secondsMode != "none") {
 			if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
 			drawTimeoutSeconds = undefined;
@@ -386,7 +423,39 @@ Bangle.on('lock',on=>{
 			PosInterval = setInterval(updatePos, 60*60E3);	// refesh every 60 mins
 			updatePos();
 		}
-		draw(); // draw immediately, queue redraw
+		draw(); // draw immediately, queue redraw		
   }
- });
+ };
+Bangle.on('lock', onLock);
+
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "custom",clock:true,
+  remove : function() {
+    // Called to unload all of the clock app
+	g.setRotation(defaultRotation); // bring back default rotation
+	if (typeof PosInterval === "undefined") {
+		console.log("PosInterval is undefined");
+	} else {
+		if (PosInterval) clearInterval(PosInterval);
+	}	
+    PosInterval = undefined;
+    if (drawTimeoutSeconds) clearTimeout(drawTimeoutSeconds);
+    drawTimeoutSeconds = undefined;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+	//if (BANGLEJS2) 
+	Bangle.removeListener("drag",onDrag);
+	Bangle.removeListener("onLock",onLock);
+  }});
+
+
+g.clear().setRotation(defaultRotation); // clean app screen and make sure the default rotation is set
+draw(); // draw immediately at first, queue update
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+ 
+// );
 }
diff --git a/apps/hworldclock/metadata.json b/apps/hworldclock/metadata.json
index 3b633ead7..fe5865ad0 100644
--- a/apps/hworldclock/metadata.json
+++ b/apps/hworldclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "hworldclock",
   "name": "Hanks World Clock",
   "shortName": "Hanks World Clock",
-  "version": "0.29",
+  "version": "0.32",
   "description": "Current time zone plus up to three others",
   "allow_emulator":true,
   "icon": "app.png",
@@ -12,6 +12,7 @@
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "custom": "custom.html",
+  "dependencies": {"mylocation":"app"},  
   "storage": [
     {"name":"hworldclock.app.js","url":"app.js"},
     {"name":"hworldclock.img","url":"hworldclock-icon.js","evaluate":true},
@@ -19,6 +20,6 @@
   ],
   "data": [
     {"name":"hworldclock.settings.json"},
-	  {"name":"hworldclock.json"}
+	{"name":"hworldclock.json"}
   ]
 }
diff --git a/apps/hworldclock/settings.js b/apps/hworldclock/settings.js
index 26c946b5f..98b91dc7b 100644
--- a/apps/hworldclock/settings.js
+++ b/apps/hworldclock/settings.js
@@ -36,13 +36,21 @@
     "< Back": () => back(),
 	"Seconds": stringInSettings("secondsMode", ["always", "when unlocked", "none"]),
 	"Color w. dark": stringInSettings("colorWhenDark", ["green", "default"]),
-    "Show SunInfo": {
-      value: (settings.showSunInfo !== undefined ? settings.showSunInfo : true),
-      onchange: v => {
-        settings.showSunInfo = v;
-        writeSettings();
-      }
+  "1 Offset Small": {
+    value: (settings.singleOffsetSmall !== undefined ? settings.singleOffsetSmall : false),
+    onchange: v=> {
+      settings.singleOffsetSmall = v;
+      writeSettings();
     }
+  },
+  "Show SunInfo": {
+    value: (settings.showSunInfo !== undefined ? settings.showSunInfo : true),
+    onchange: v => {
+      settings.showSunInfo = v;
+      writeSettings();
+    }
+  },
+	"Rotation": stringInSettings("rotationTarget", ["off", "90", "180", "270"]),
   };
 
   E.showMenu(mainmenu);
diff --git a/apps/iconlaunch/ChangeLog b/apps/iconlaunch/ChangeLog
index b03599ae6..0c33a4871 100644
--- a/apps/iconlaunch/ChangeLog
+++ b/apps/iconlaunch/ChangeLog
@@ -17,4 +17,6 @@
 0.12: Use Bangle.load and Bangle.showClock
 0.13: Fix automatic switch to clock
 0.14: Revert use of Bangle.load to classic load calls since widgets would
-still be loaded when they weren't supposed to.
+      still be loaded when they weren't supposed to.
+0.15: Ensure that we hide widgets if in fullscreen mode
+      (So that widgets are still hidden if launcher is fast-loaded)
diff --git a/apps/iconlaunch/app.js b/apps/iconlaunch/app.js
index ccc39f3bb..acf695ddb 100644
--- a/apps/iconlaunch/app.js
+++ b/apps/iconlaunch/app.js
@@ -12,6 +12,8 @@
   if (!settings.fullscreen) {
     Bangle.loadWidgets();
     Bangle.drawWidgets();
+  } else { // for fast-load, if we had widgets then we should hide them
+    require("widget_utils").hide();
   }
   let launchCache = s.readJSON("iconlaunch.cache.json", true)||{};
   let launchHash = s.hash(/\.info/);
@@ -190,6 +192,9 @@
     btn: _=> { if (settings.oneClickExit) Bangle.showClock(); },
     remove: function() {
       if (timeout) clearTimeout(timeout);
+      if (settings.fullscreen) { // for fast-load, if we hid widgets then we should show them again
+        require("widget_utils").show();
+      }
     }
   };
 
diff --git a/apps/iconlaunch/metadata.json b/apps/iconlaunch/metadata.json
index 155e7bd9b..27f6386d3 100644
--- a/apps/iconlaunch/metadata.json
+++ b/apps/iconlaunch/metadata.json
@@ -2,7 +2,7 @@
 	"id": "iconlaunch",
 	"name": "Icon Launcher",
 	"shortName" : "Icon launcher",
-	"version": "0.14",
+	"version": "0.15",
 	"icon": "app.png",
 	"description": "A launcher inspired by smartphones, with an icon-only scrollable menu.",
 	"tags": "tool,system,launcher",
diff --git a/apps/ios/ChangeLog b/apps/ios/ChangeLog
index 5763801f5..8ab99b4db 100644
--- a/apps/ios/ChangeLog
+++ b/apps/ios/ChangeLog
@@ -10,3 +10,4 @@
 0.10: Added more bundleIds
 0.11: Added letters with caron to unicodeRemap, to properly display messages in Czech language
 0.12: Use new message library
+0.13: Making ANCS message receive more resilient (#2402)
diff --git a/apps/ios/boot.js b/apps/ios/boot.js
index ee19ca14b..8952a047e 100644
--- a/apps/ios/boot.js
+++ b/apps/ios/boot.js
@@ -26,7 +26,7 @@ E.on('ANCS',msg=>{
   // not a remove - we need to get the message info first
   function ancsHandler() {
     var msg = Bangle.ancsMessageQueue[0];
-    NRF.ancsGetNotificationInfo( msg.uid ).then( info => {
+    NRF.ancsGetNotificationInfo( msg.uid ).then( info => { // success
 
       if(msg.preExisting === true){
         info.new = false;
@@ -38,6 +38,10 @@ E.on('ANCS',msg=>{
       Bangle.ancsMessageQueue.shift();
       if (Bangle.ancsMessageQueue.length)
         ancsHandler();
+    }, err=>{ // failure
+      console.log("ancsGetNotificationInfo failed",err);
+      if (Bangle.ancsMessageQueue.length)
+        ancsHandler();
     });
   }
   Bangle.ancsMessageQueue.push(msg);
@@ -196,7 +200,11 @@ Bangle.messageResponse = (msg,response) => {
   // error/warn here?
 };
 // remove all messages on disconnect
-NRF.on("disconnect", () => require("messages").clearAll());
+NRF.on("disconnect", () => {
+  require("messages").clearAll();
+  // Remove any messages from the ANCS queue
+  Bangle.ancsMessageQueue = [];
+});
 
 /*
 // For testing...
diff --git a/apps/ios/metadata.json b/apps/ios/metadata.json
index 5042ff1c0..42e0060d0 100644
--- a/apps/ios/metadata.json
+++ b/apps/ios/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ios",
   "name": "iOS Integration",
-  "version": "0.12",
+  "version": "0.13",
   "description": "Display notifications/music/etc from iOS devices",
   "icon": "app.png",
   "tags": "tool,system,ios,apple,messages,notifications",
diff --git a/apps/kbswipe/ChangeLog b/apps/kbswipe/ChangeLog
index 568db372e..a7b2d44c2 100644
--- a/apps/kbswipe/ChangeLog
+++ b/apps/kbswipe/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Fix issue if going back without typing.
 0.05: Keep drag-function in ram, hopefully improving performance and input reliability somewhat.
 0.06: Support input of numbers and uppercase characters.
+0.07: Support input of symbols.
diff --git a/apps/kbswipe/README.md b/apps/kbswipe/README.md
index c4c3fbd99..105d7cd9b 100644
--- a/apps/kbswipe/README.md
+++ b/apps/kbswipe/README.md
@@ -4,7 +4,7 @@ A library that provides the ability to input text by swiping PalmOS Graffiti-sty
 
 To get a legend of available characters, just tap the screen.
 
-To switch between the input of alphabetic and numeric characters tap the widget which displays either "123" or "ABC".
+To switch between the input of alphabetic, numeric and symbol characters tap the widget which displays either "123", "ABC" or "?:$".
 
 To switch between lowercase and uppercase characters do an up swipe.
 
diff --git a/apps/kbswipe/lib.js b/apps/kbswipe/lib.js
index 75a434999..ea6d78255 100644
--- a/apps/kbswipe/lib.js
+++ b/apps/kbswipe/lib.js
@@ -1,5 +1,6 @@
 exports.INPUT_MODE_ALPHA = 0;
 exports.INPUT_MODE_NUM = 1;
+exports.INPUT_MODE_SYM = 2;
 
 /* To make your own strokes, type:
 
@@ -47,9 +48,41 @@ exports.getStrokes = function(mode, cb) {
     cb("7", new Uint8Array([47, 38, 48, 38, 53, 38, 66, 38, 85, 38, 103, 38, 117, 38, 125, 38, 129, 38, 134, 41, 135, 47, 135, 54, 135, 66, 131, 93, 124, 126, 116, 149, 109, 161, 105, 168]));
     cb("8", new Uint8Array([122, 61, 102, 61, 83, 61, 60, 61, 47, 62, 45, 78, 58, 99, 84, 112, 105, 122, 118, 134, 121, 149, 113, 165, 86, 171, 59, 171, 47, 164, 45, 144, 50, 132, 57, 125, 67, 117, 78, 109, 87, 102, 96, 94, 105, 86, 113, 85]));
     cb("9", new Uint8Array([122, 58, 117, 55, 112, 51, 104, 51, 95, 51, 86, 51, 77, 51, 68, 51, 60, 51, 54, 56, 47, 64, 46, 77, 46, 89, 46, 96, 51, 103, 64, 109, 74, 110, 83, 110, 94, 107, 106, 102, 116, 94, 124, 84, 127, 79, 128, 78, 128, 94, 128, 123, 128, 161, 128, 175]));
+  } else if (mode === exports.INPUT_MODE_SYM) {
+    cb("?", new Uint8Array([36, 69, 39, 68, 44, 65, 52, 60, 61, 56, 70, 51, 78, 47, 87, 46, 96, 46, 108, 46, 121, 49, 128, 56, 129, 63, 126, 76, 119, 91, 108, 105, 103, 114, 98, 118, 93, 124, 91, 131, 91, 143, 91, 155, 91, 163]));
+    cb(".", new Uint8Array([105, 158, 97, 157, 80, 150, 60, 140, 44, 127, 34, 110, 31, 97, 31, 84, 35, 74, 48, 59, 78, 55, 115, 57, 145, 70, 159, 89, 162, 112, 160, 138, 153, 153, 144, 164, 125, 170, 103, 171]));
+    cb(",", new Uint8Array([140, 44, 139, 45, 138, 46, 137, 47, 135, 49, 132, 51, 127, 55, 123, 58, 117, 62, 112, 67, 105, 71, 100, 77, 93, 82, 86, 86, 80, 91, 74, 96, 69, 101, 64, 105, 60, 108, 57, 112, 53, 115, 51, 117, 49, 119, 48, 121, 47, 122, 46, 122, 46, 123]));
+    cb("'", new Uint8Array([100, 50, 100, 160]));
+    cb("-", new Uint8Array([34, 63, 36, 63, 40, 63, 46, 63, 54, 63, 63, 63, 72, 63, 82, 63, 92, 63, 103, 63, 113, 63, 124, 63, 132, 63, 139, 63, 143, 63, 145, 63, 147, 63, 149, 63, 152, 63]));
+    cb("_", new Uint8Array([34, 84, 36, 84, 40, 84, 47, 84, 56, 84, 67, 84, 81, 84, 95, 84, 108, 84, 120, 84, 131, 84, 139, 84, 146, 84, 149, 84, 151, 84, 154, 84, 155, 83, 154, 81, 150, 78, 143, 74, 130, 71, 111, 68, 90, 65, 73, 64, 60, 64, 51, 64, 46, 64]));
+    cb("\"", new Uint8Array([24, 168, 24, 158, 28, 132, 33, 102, 37, 82, 41, 66, 46, 54, 50, 47, 54, 46, 60, 49, 67, 64, 73, 88, 80, 114, 87, 138, 95, 149, 109, 145, 123, 128, 130, 108, 135, 87, 136, 70, 136, 57, 136, 50]));
+    cb(":", new Uint8Array([24, 62, 24, 63, 24, 68, 26, 73, 27, 80, 29, 88, 31, 94, 33, 101, 35, 108, 37, 114, 39, 121, 39, 127, 39, 131, 39, 134, 39, 135, 39, 133, 39, 130, 41, 125, 45, 114, 48, 100, 51, 89, 52, 81, 52, 74, 52, 70, 52, 67, 52, 63, 52, 60, 52, 57]));
+    cb(";", new Uint8Array([142, 58, 139, 59, 136, 61, 131, 65, 124, 71, 116, 79, 105, 87, 94, 98, 82, 109, 70, 121, 58, 132, 49, 141, 40, 149, 33, 156, 28, 160, 24, 164, 23, 166, 22, 164, 25, 156, 33, 138, 47, 111, 66, 81, 82, 58, 95, 41, 103, 30]));
+    cb("(", new Uint8Array([72, 51, 70, 51, 68, 51, 66, 54, 63, 56, 61, 59, 58, 61, 56, 65, 54, 70, 51, 74, 49, 79, 47, 83, 45, 87, 44, 92, 44, 94, 44, 96, 44, 99, 44, 101, 44, 104, 44, 107, 44, 114, 44, 120, 46, 127, 49, 135, 52, 141, 56, 145]));
+    cb(")", new Uint8Array([18, 42, 21, 43, 24, 45, 28, 47, 32, 50, 37, 53, 40, 58, 44, 62, 46, 69, 48, 76, 50, 81, 52, 85, 53, 90, 53, 94, 53, 98, 53, 103, 53, 106, 53, 111, 53, 119, 53, 129, 52, 137, 50, 142, 47, 146]));
+    cb("[", new Uint8Array([121, 138, 118, 143, 114, 146, 110, 149, 105, 152, 98, 152, 91, 152, 83, 152, 77, 152, 67, 151, 59, 146, 52, 138, 47, 131, 47, 124, 48, 118, 57, 115, 64, 115, 67, 113, 64, 106, 59, 95, 53, 85, 48, 80, 47, 74, 47, 64, 53, 57, 65, 56, 83, 56, 99, 61]));
+    cb("]", new Uint8Array([36, 136, 42, 140, 54, 145, 70, 149, 84, 151, 98, 149, 109, 143, 113, 135, 113, 127, 104, 115, 87, 105, 75, 103, 76, 98, 87, 84, 96, 67, 100, 54, 97, 48, 90, 45, 76, 45, 60, 47, 44, 52]));
+    cb("<", new Uint8Array([154, 122, 151, 122, 149, 121, 147, 118, 144, 116, 139, 114, 133, 112, 126, 110, 118, 107, 108, 105, 97, 102, 86, 97, 75, 93, 64, 90, 56, 88, 49, 85, 46, 84, 41, 82, 40, 80, 47, 76, 63, 69, 86, 59, 106, 50, 121, 44, 128, 40]));
+    cb(">", new Uint8Array([28, 115, 31, 115, 38, 113, 48, 110, 57, 107, 68, 103, 79, 98, 90, 94, 98, 92, 104, 90, 111, 88, 117, 85, 122, 83, 125, 81, 127, 80, 129, 80, 132, 80, 130, 78, 126, 75, 120, 72, 110, 69, 98, 66, 85, 63, 72, 60, 59, 57, 45, 53, 36, 49, 30, 46]));
+    cb("@", new Uint8Array([82, 50, 76, 50, 67, 50, 59, 50, 50, 51, 43, 57, 38, 68, 34, 83, 33, 95, 33, 108, 34, 121, 42, 136, 57, 148, 72, 155, 85, 157, 98, 155, 110, 149, 120, 139, 128, 127, 134, 119, 137, 114, 138, 107, 138, 98, 138, 88, 138, 77, 137, 71, 134, 65, 128, 60, 123, 58]));
+    cb("#", new Uint8Array([23, 70, 23, 76, 26, 85, 30, 97, 36, 112, 40, 129, 45, 142, 49, 152, 53, 158, 59, 161, 67, 155, 78, 130, 84, 98, 88, 76, 90, 68, 96, 62, 102, 61, 108, 61, 119, 67, 126, 80, 131, 101, 135, 129, 136, 152]));
+    cb("$", new Uint8Array([159, 72, 157, 70, 155, 68, 151, 66, 145, 63, 134, 60, 121, 58, 108, 56, 96, 55, 83, 55, 73, 55, 64, 56, 57, 60, 52, 65, 49, 71, 49, 76, 50, 81, 55, 87, 71, 94, 94, 100, 116, 104, 131, 108, 141, 114, 145, 124, 142, 135, 124, 146, 97, 153, 70, 157, 52, 158]));
+    cb("%", new Uint8Array([31, 39, 39, 54, 51, 78, 60, 97, 62, 107, 59, 118, 47, 118, 44, 109, 46, 92, 56, 73, 69, 62, 92, 61, 115, 70, 125, 90, 126, 110, 125, 122, 118, 127, 111, 127, 105, 124, 105, 115, 105, 97, 109, 75, 117, 56, 124, 45]));
+    cb("^", new Uint8Array([28, 175, 28, 168, 33, 156, 37, 142, 41, 128, 46, 111, 51, 95, 58, 82, 62, 75, 68, 68, 74, 57, 81, 49, 88, 44, 93, 44, 102, 56, 113, 79, 118, 95, 123, 110, 131, 130, 135, 146, 136, 158]));
+    cb("&", new Uint8Array([122, 61, 102, 61, 83, 61, 60, 61, 47, 62, 45, 78, 58, 99, 84, 112, 105, 122, 118, 134, 121, 149, 113, 165, 86, 171, 59, 171, 47, 164, 45, 144, 50, 132, 57, 125, 67, 117, 78, 109, 87, 102, 96, 94, 105, 86, 113, 85]));
+    cb("*", new Uint8Array([35, 61, 41, 62, 53, 68, 72, 78, 91, 91, 103, 99, 113, 103, 119, 106, 124, 107, 131, 107, 139, 107, 150, 107, 161, 104, 166, 97, 166, 89, 165, 78, 162, 70, 158, 61, 151, 54, 144, 51, 132, 51, 115, 57, 98, 66, 82, 78, 65, 89, 52, 100, 44, 109]));
+    cb("!", new Uint8Array([100, 160, 100, 50]));
+    cb("~", new Uint8Array([133, 40, 133, 48, 133, 65, 133, 87, 133, 105, 132, 116, 128, 125, 124, 133, 120, 140, 114, 146, 107, 148, 101, 147, 91, 139, 82, 126, 74, 108, 70, 91, 70, 82, 70, 75, 70, 65, 68, 57, 62, 51, 57, 50, 49, 57, 41, 76, 36, 96, 33, 114, 33, 132]));
+    cb("+", new Uint8Array([151, 41, 146, 46, 133, 55, 116, 71, 101, 87, 87, 98, 74, 105, 63, 109, 54, 110, 43, 106, 36, 94, 36, 80, 36, 68, 42, 60, 60, 58, 91, 64, 115, 77, 129, 88, 139, 99, 144, 106]));
+    cb("=", new Uint8Array([34, 46, 47, 46, 70, 46, 87, 46, 96, 46, 101, 46, 104, 46, 102, 50, 96, 58, 80, 78, 62, 100, 49, 117, 40, 127, 43, 132, 61, 132, 84, 132, 99, 132]));
+    cb("\\", new Uint8Array([25, 38, 26, 40, 30, 43, 35, 48, 43, 54, 54, 63, 65, 74, 76, 85, 87, 96, 98, 108, 108, 121, 116, 131, 123, 138, 127, 144, 131, 148, 134, 152, 136, 155]));
+    cb("|", new Uint8Array([66, 146, 66, 144, 66, 140, 66, 134, 66, 125, 66, 114, 66, 102, 66, 92, 66, 83, 66, 77, 66, 71, 66, 67, 66, 62, 66, 58, 66, 53, 66, 49, 66, 48, 66, 46, 64, 42, 61, 41, 58, 42, 54, 47, 51, 55, 46, 67, 40, 81, 37, 93, 34, 102, 30, 109, 28, 116]));
+    cb("/", new Uint8Array([24, 173, 26, 171, 30, 166, 36, 158, 44, 148, 53, 137, 63, 126, 73, 115, 82, 104, 91, 95, 99, 87, 105, 80, 112, 74, 117, 70, 122, 65, 125, 61, 127, 60, 129, 57, 133, 53, 136, 50, 137, 47]));
   }
   cb("\b", new Uint8Array([183, 103, 182, 103, 180, 103, 176, 103, 169, 103, 159, 103, 147, 103, 133, 103, 116, 103, 101, 103, 85, 103, 73, 103, 61, 103, 52, 103, 38, 103, 34, 103, 29, 103, 27, 103, 26, 103, 25, 103, 24, 103]));
-  cb(" ", new Uint8Array([39, 118, 40, 118, 41, 118, 44, 118, 47, 118, 52, 118, 58, 118, 66, 118, 74, 118, 84, 118, 94, 118, 104, 117, 114, 116, 123, 116, 130, 116, 144, 116, 149, 116, 154, 116, 158, 116, 161, 116, 163, 116]));
+  if (mode === exports.INPUT_MODE_ALPHA || mode === exports.INPUT_MODE_NUM) {
+    cb(" ", new Uint8Array([39, 118, 40, 118, 41, 118, 44, 118, 47, 118, 52, 118, 58, 118, 66, 118, 74, 118, 84, 118, 94, 118, 104, 117, 114, 116, 123, 116, 130, 116, 144, 116, 149, 116, 154, 116, 158, 116, 161, 116, 163, 116]));
+  }
 };
 
 exports.input = function(options) {
@@ -129,14 +162,26 @@ exports.input = function(options) {
     flashInterval = undefined;
 
     g.reset();
-    g.clearRect(R).setColor("#f00");
-    var n=0;
+    g.setFont("6x8");
+    g.clearRect(R);
+    let n=0;
     exports.getStrokes(input_mode, (id,s) => {
-      var x = n%6;
-      var y = (n-x)/6;
+      let x = n%6;
+      let y = (n-x)/6;
       s = g.transformVertices(s, {scale:0.16, x:R.x+x*30-4, y:R.y+y*30-4});
       g.fillRect(s[0]-1,s[1]-2,s[0]+1,s[1]+1);
-      g.drawPoly(s);
+      g.setColor("#f00").drawPoly(s);
+      switch(id) {
+        case 'SHIFT':
+          g.setBgColor(0).setColor("#00f").drawImage(atob("CgqBAfP4fh8D4fh+H4fh+HA="), R.x+x*30+20, R.y+y*30+20);
+          break;
+        case '\b':
+        case '\n':
+        case ' ':
+          break;
+        default:
+          g.setColor("#00f").drawString(shift ? id.toUpperCase() : id, R.x+x*30+20, R.y+y*30+20);
+      }
       n++;
     });
   }
@@ -177,7 +222,7 @@ exports.input = function(options) {
   // Switches between alphabetic and numeric input
   function cycleInput() {
     input_mode++;
-    if (input_mode > exports.INPUT_MODE_NUM) input_mode = 0;
+    if (input_mode > exports.INPUT_MODE_SYM) input_mode = 0;
     shift = false;
     setupStrokes();
     show();
@@ -201,6 +246,8 @@ exports.input = function(options) {
         g.drawString(shift ? "ABC" : "abc", this.x, this.y);
       } else if (input_mode === exports.INPUT_MODE_NUM) {
         g.drawString("123", this.x, this.y);
+      } else if (input_mode === exports.INPUT_MODE_SYM) {
+        g.drawString("?:$", this.x, this.y);
       }
     }
   };
diff --git a/apps/kbswipe/metadata.json b/apps/kbswipe/metadata.json
index 5e290e1dd..6b597a371 100644
--- a/apps/kbswipe/metadata.json
+++ b/apps/kbswipe/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbswipe",
   "name": "Swipe keyboard",
-  "version":"0.06",
+  "version":"0.07",
   "description": "A library for text input via PalmOS style swipe gestures (beta!)",
   "icon": "app.png",
   "type":"textinput",
diff --git a/apps/lato/icon.js b/apps/lato/icon.js
index 345458d53..746f010dc 100644
--- a/apps/lato/icon.js
+++ b/apps/lato/icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwkA/4A/AH4AUiIAKCxXzC5c/C5PyC5cvC8PxC5cfLxNEABhgI+gXNp4X3//+9wAK96PJC6/zC5bvKC6//C5YWKC4nUoMUpoXS8lDn/zmlOC6NCA4ckC6Hkl4HD+QwCC5c+LoIsCoSKBMIPjC5tD//0olEp//mgXNmMRiYuBC4JjBBAYAK+MRj//CwIABBAgXkI5AXOiRyBC4J8BkIXN+dEoKnFiNEAYIXNa4sUC59EJAIACkIHBC5iMCoMTn/zmIuBSQIXODAMRAAKqDABikCAAqqBC8i8CAArCBC/n0C49PC5oA/AH4AIA=="))
+require("heatshrink").decompress(atob("mEw4UA///1NygH+zn/Jf4AJgdVAAnABZ8BBYtABbc1BYtcBYcVBYtUBbcC1QAEwALPgYLFQYoLWgAHBytWAYK0F1Wpv/9tQLH0v//9aBY+XBYPWBY3qz/1r/21YLGv/Vq/9BY3Vv6NB/tXBaMVBYamEBZ1fHYP1BY01r5TB+ruEBYVXNYPVBY9VBYNVBY0FqoiBqtQBY4ACBb0NBYdwBbsBBYdABYoA/AAg="))
diff --git a/apps/lato/screenshot1..png b/apps/lato/screenshot1.png
similarity index 100%
rename from apps/lato/screenshot1..png
rename to apps/lato/screenshot1.png
diff --git a/apps/lcdclock/ChangeLog b/apps/lcdclock/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/lcdclock/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/lcdclock/app-icon.js b/apps/lcdclock/app-icon.js
new file mode 100644
index 000000000..ed3161c41
--- /dev/null
+++ b/apps/lcdclock/app-icon.js
@@ -0,0 +1 @@
+atob("MDABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf///T//+f///T///Q///Qf//Sf//Qf//Pf//Qf//AP//Yf//f///c///f///f///fiD/f8f/fur/f9f/fir/f9f/f67/f9f/fy7/f8f/fz//f+//AAAAAAAAAAAAAAAAf///////TD/u///vQB/EX/9PUV/d3/9fSd/F3/9HWd/d3/9Xf9/d//9Hf///////f///////f///8Hg/fmefwPAffmecz/Offmecz/Offmecz/OffmAcwHOffngc8DPffn+c/zOffn+c/zOffn+c/zOffn+f8DAff///8Hg/f///8Pw/f///////f//////+P//////8AAAAAAAAAAAAAAAAAAAAAAAA")
diff --git a/apps/lcdclock/app.js b/apps/lcdclock/app.js
new file mode 100644
index 000000000..2bc23247c
--- /dev/null
+++ b/apps/lcdclock/app.js
@@ -0,0 +1,84 @@
+Graphics.prototype.setFont7Seg = function() {
+  return this.setFontCustom(atob("AAAAAAAAAAAACAQCAAAAAAIAd0BgMBdwAAAAAAAADuAAAB0RiMRcAAAAAiMRiLuAAAcAQCAQdwAADgiMRiIOAAAd0RiMRBwAAAAgEAgDuAAAd0RiMRdwAADgiMRiLuAAAABsAAAd0QiEQdwAADuCIRCIOAAAd0BgMBAAAAAOCIRCLuAAAd0RiMRAAAADuiEQiAAAAAd0BgMBBwAADuCAQCDuAAAdwAAAAAAAAAAAIBALuAAAdwQCAQdwAADuAIBAIAAAAd0AgEAcEAgEAdwAd0AgEAdwAADugMBgLuAAAd0QiEQcAAADgiEQiDuAAAd0AgEAAAAADgiMRiIOAAAAEAgEAdwAADuAIBALuAAAdwBAIBdwAADuAIBAIOAIBALuADuCAQCDuAAAcAQCAQdwAAAOiMRiLgAAAA=="), 32, atob("BwAAAAAAAAAAAAAAAAcCAAcHBwcHBwcHBwcEAAAAAAAABwcHBwcHBwcHBwcHCgcHBwcHBwcHBwoHBwc="), 9);
+}
+
+
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+let drawTimeout;
+
+// Actually draw the watch face
+let draw = function() {
+  var x = R.x + R.w/2;
+  var y = R.y + R.h/2;
+  g.reset().setColor(g.theme.bg).setBgColor(g.theme.fg);
+  g.clearRect(R.x,barY+2,R.x2,R.y2-8);
+  var date = new Date();
+  var timeStr = require("locale").time(date, 1); // Hour and minute
+  g.setFontAlign(0, 0).setFont("7Seg:5").drawString(timeStr, x, y+39);
+  // Show date and day of week
+  g.setFontAlign(0, 0).setFont("7Seg:2");
+  g.setFontAlign(-1, 0).drawString(require("locale").meridian(date).toUpperCase(), R.x+6, y);
+  g.setFontAlign(0, 0).drawString(require("locale").dow(date, 1).toUpperCase(), x, y);
+  g.setFontAlign(1, 0).drawString(date.getDate(), R.x2 - 6, y);
+
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+};
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    delete Graphics.prototype.setFont7Seg;
+    // remove info menu
+    clockInfoMenu.remove();
+    delete clockInfoMenu;
+    clockInfoMenu2.remove();
+    delete clockInfoMenu2;
+    // reset theme
+    g.setTheme(oldTheme);
+  }});
+// Load widgets
+Bangle.loadWidgets();
+var R = Bangle.appRect;
+R.x+=1;
+R.y+=1;
+R.x2-=1;
+R.y2-=1;
+R.w-=2;
+R.h-=2;
+var midX = R.x+R.w/2;
+var barY = 80;
+// Clear the screen once, at startup
+let oldTheme = g.theme;
+g.setTheme({bg:"#000",fg:"#fff",dark:true}).clear(1);
+g.fillRect({x:R.x, y:R.y, w:R.w, h:R.h, r:8}).clearRect(R.x,barY,R.w,barY+1).clearRect(midX,R.y,midX+1,barY);
+draw();
+setTimeout(Bangle.drawWidgets,0);
+
+let clockInfoDraw = (itm, info, options) => {
+  let texty = options.y+41;
+  g.reset().setFont("7Seg").setColor(g.theme.bg).setBgColor(g.theme.fg);
+  if (options.focus) g.setBgColor("#FF0");
+  g.clearRect({x:options.x,y:options.y,w:options.w,h:options.h,r:8});
+
+  if (info.img) g.drawImage(info.img, options.x+2, options.y+2);
+  var title = clockInfoItems[options.menuA].name;
+  var text = info.text.toString().toUpperCase();
+  if (title!="Bangle") g.setFontAlign(1,0).drawString(title.toUpperCase(), options.x+options.w-2, options.y+14);
+  if (g.setFont("7Seg:2").stringWidth(text)+8>options.w) g.setFont("7Seg");
+  g.setFontAlign(0,0).drawString(text, options.x+options.w/2, options.y+40);
+
+};
+let clockInfoItems = require("clock_info").load();
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:R.x, y:R.y, w:midX-2, h:barY-R.y-2, draw : clockInfoDraw});
+let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { x:midX+2, y:R.y, w:midX-3, h:barY-R.y-2, draw : clockInfoDraw});
+}
diff --git a/apps/lcdclock/app.png b/apps/lcdclock/app.png
new file mode 100644
index 000000000..6a117b525
Binary files /dev/null and b/apps/lcdclock/app.png differ
diff --git a/apps/lcdclock/metadata.json b/apps/lcdclock/metadata.json
new file mode 100644
index 000000000..d7d09b106
--- /dev/null
+++ b/apps/lcdclock/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "lcdclock",
+  "name": "LCD Clock",
+  "version":"0.01",
+  "description": "A Casio-style clock, with ClockInfo areas at the top and bottom. Tap them and swipe up/down to toggle between different information",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock,clkinfo",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"lcdclock.app.js","url":"app.js"},
+    {"name":"lcdclock.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/lcdclock/screenshot.png b/apps/lcdclock/screenshot.png
new file mode 100644
index 000000000..b0bb5934a
Binary files /dev/null and b/apps/lcdclock/screenshot.png differ
diff --git a/apps/linuxclock/ChangeLog b/apps/linuxclock/ChangeLog
index 3f1ef5c55..1c4f7d79b 100644
--- a/apps/linuxclock/ChangeLog
+++ b/apps/linuxclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App.
-0.02: Performance improvements.
\ No newline at end of file
+0.02: Performance improvements.
+0.03: Update clock_info to avoid a redraw
diff --git a/apps/linuxclock/app.js b/apps/linuxclock/app.js
index 02676310e..9470b803c 100644
--- a/apps/linuxclock/app.js
+++ b/apps/linuxclock/app.js
@@ -52,22 +52,22 @@ var H = g.getHeight();
    items: [
      { name: "time",
      get: () => ({ text: getTime(), img: null}),
-     show: function() { dateMenu.items[0].emit("redraw"); },
+     show: function() {},
      hide: function () {}
    },
    { name: "day",
     get: () => ({ text: getDay(), img: null}),
-    show: function() { dateMenu.items[2].emit("redraw"); },
+    show: function() {},
     hide: function () {}
    },
    { name: "date",
      get: () => ({ text: getDate(), img: null}),
-     show: function() { dateMenu.items[1].emit("redraw"); },
+     show: function() {},
      hide: function () {}
    },
    { name: "week",
      get: () => ({ text: weekOfYear(), img: null}),
-     show: function() { dateMenu.items[3].emit("redraw"); },
+     show: function() {},
      hide: function () {}
    },
    ]
diff --git a/apps/linuxclock/metadata.json b/apps/linuxclock/metadata.json
index dfb17a315..06ef66498 100644
--- a/apps/linuxclock/metadata.json
+++ b/apps/linuxclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "linuxclock",
   "name": "Linux Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A Linux inspired clock.",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index 3f5ff70fd..228a952de 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -82,3 +82,7 @@
 0.58: Fast load messages without writing to flash
       Don't write messages to flash until the app closes
 0.59: Ensure we do write messages if messages app can't be fast loaded (see #2373)
+0.60: Fix saving of removal messages if UI not open
+0.61: Fix regression where loading into messages app stops back from working (#2398)
+0.62: Remove '.show' field, tidyup and fix .open if fast load not enabled
+0.63: Fix messages app loading on clock without fast load
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index 0f3d90a9d..b158310a1 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -72,10 +72,7 @@ var onMessagesModified = function(type,msg) {
 Bangle.on("message", onMessagesModified);
 
 function saveMessages() {
-  require("messages").write(MESSAGES.map(m => {
-    delete m.show;
-    return m;
-  }));
+  require("messages").write(MESSAGES);
 }
 E.on("kill", saveMessages);
 
@@ -116,11 +113,12 @@ function showMapMessage(msg) {
   Bangle.setUI({mode:"updown", back: back}, back); // any input takes us back
 }
 
-let updateLabelsInterval,
-  music = {artist: "", album: "", title: ""}; // defaults, so e.g. msg.title.length doesn't error
+let updateLabelsInterval;
+
 function showMusicMessage(msg) {
   active = "music";
-  msg = Object.assign(music, msg); // combine+remember "musicinfo" and "musicstate" messages
+  // defaults, so e.g. msg.xyz.length doesn't error. `msg` should contain up to date info
+  msg = Object.assign({artist: "", album: "", track: "Music"}, msg);
   openMusic = msg.state=="play";
   var trackScrollOffset = 0;
   var artistScrollOffset = 0;
@@ -349,6 +347,7 @@ function showMessage(msgid) {
   clockIfNoMsg : bool
   clockIfAllRead : bool
   showMsgIfUnread : bool
+  openMusic : bool      // open music if it's playing
 }
 */
 function checkMessages(options) {
@@ -364,12 +363,9 @@ function checkMessages(options) {
   }
   // we have >0 messages
   var newMessages = MESSAGES.filter(m=>m.new&&m.id!="music");
-  var toShow = MESSAGES.find(m=>m.show);
-  if (toShow) {
-    newMessages.unshift(toShow);
-  }
   // If we have a new message, show it
-  if ((toShow||options.showMsgIfUnread) && newMessages.length) {
+  if (options.showMsgIfUnread && newMessages.length) {
+    delete newMessages[0].show; // stop us getting stuck here if we're called a second time
     showMessage(newMessages[0].id);
     // buzz after showMessage, so being busy during layout doesn't affect the buzz pattern
     if (global.BUZZ_ON_NEW_MESSAGE) {
@@ -381,8 +377,8 @@ function checkMessages(options) {
     }
     return;
   }
-  // no new messages: show playing music? (only if we have playing music to show)
-  if (options.openMusic && MESSAGES.some(m=>m.id=="music" && m.track && m.state=="play"))
+  // no new messages: show playing music? Only if we have playing music, or state=="show" (set by messagesmusic)
+  if (options.openMusic && MESSAGES.some(m=>m.id=="music" && ((m.track && m.state=="play") || m.state=="show")))
     return showMessage('music');
   // no new messages - go to clock?
   if (options.clockIfAllRead && newMessages.length==0)
@@ -448,7 +444,9 @@ setTimeout(() => {
   if (!isFinite(settings.unreadTimeout)) settings.unreadTimeout=60;
   if (settings.unreadTimeout)
     unreadTimeout = setTimeout(load, settings.unreadTimeout*1000);
-  // only openMusic on launch if music is new
-  var newMusic = MESSAGES.some(m => m.id === "music" && m.new);
-  checkMessages({ clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1, openMusic: newMusic && settings.openMusic });
+  // only openMusic on launch if music is new, or state=="show" (set by messagesmusic)
+  var musicMsg = MESSAGES.find(m => m.id === "music");
+  checkMessages({
+    clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1,
+    openMusic: ((musicMsg&&musicMsg.new) && settings.openMusic) || (musicMsg&&musicMsg.state=="show") });
 }, 10); // if checkMessages wants to 'load', do that
diff --git a/apps/messagegui/boot.js b/apps/messagegui/boot.js
index 4592f825d..ce7f1b99c 100644
--- a/apps/messagegui/boot.js
+++ b/apps/messagegui/boot.js
@@ -1,3 +1 @@
-(function() {
-  Bangle.on("message", (type, msg) => require("messagegui").listener(type, msg));
-})();
\ No newline at end of file
+Bangle.on("message", (type, msg) => require("messagegui").listener(type, msg));
diff --git a/apps/messagegui/lib.js b/apps/messagegui/lib.js
index f9919c01c..a9436a77b 100644
--- a/apps/messagegui/lib.js
+++ b/apps/messagegui/lib.js
@@ -1,3 +1,11 @@
+// Will calling Bangle.load reset everything? if false, we fast load
+function loadWillReset() {
+  return Bangle.load === load || !Bangle.uiRemove;
+    /* FIXME: Maybe we need a better way of deciding if an app will
+    be fast loaded than just hard-coding a Bangle.uiRemove check.
+    Bangle.load could return a bool (as the load doesn't happen immediately). */
+}
+
 /**
  * Listener set up in boot.js, calls into here to keep boot.js short
  */
@@ -10,46 +18,49 @@ exports.listener = function(type, msg) {
     clearTimeout(exports.messageTimeout);
     delete exports.messageTimeout;
   }
-  if (msg.t==="remove") return;
+  if (msg.t==="remove") {
+    // we won't open the UI for removed messages, so make sure to delete it from flash
+    if (Bangle.MESSAGES) {
+      // we were waiting for exports.messageTimeout
+      require("messages").apply(msg, Bangle.MESSAGES);
+      if (!Bangle.MESSAGES.length) delete Bangle.MESSAGES;
+    }
+    return require("messages").save(msg); // always write removal to flash
+  }
 
   const appSettings = require("Storage").readJSON("messages.settings.json", 1) || {};
-  let loadMessages = (Bangle.CLOCK || event.important);
+  let loadMessages = (Bangle.CLOCK || event.important); // should we load the messages app?
   if (type==="music") {
     if (Bangle.CLOCK && msg.state && msg.title && appSettings.openMusic) loadMessages = true;
     else return;
   }
-  if (Bangle.load === load || !Bangle.uiRemove) {
-    // no fast loading: store message to flash
-    /* FIXME: Maybe we need a better way of deciding if an app will
-    be fast loaded than just hard-coding a Bangle.uiRemove check.
-    Bangle.load could return a bool (as the load doesn't happen immediately). */
-    require("messages").save(msg);
-  } else {
-    if (!Bangle.MESSAGES) Bangle.MESSAGES = [];
-    Bangle.MESSAGES.push(msg);
-  }
+  // Write the message to Bangle.MESSAGES. We'll deal with it in messageTimeout below
+  if (!Bangle.MESSAGES) Bangle.MESSAGES = [];
+  require("messages").apply(msg, Bangle.MESSAGES);
+  if (!Bangle.MESSAGES.length) delete Bangle.MESSAGES;
   const saveToFlash = () => {
-    // save messages from RAM to flash after all, if we decide not to launch app
-    if (!Bangle.MESSAGES) return;
-    Bangle.MESSAGES.forEach(m => require("messages").save(m));
+    // save messages from RAM to flash if we decide not to launch app
+    // We apply all of Bangle.MESSAGES here in one write
+    if (!Bangle.MESSAGES || !Bangle.MESSAGES.length) return;
+    let messages = require("messages").getMessages(msg);
+    (Bangle.MESSAGES || []).forEach(m => require("messages").apply(m, messages));
+    require("messages").write(messages);
     delete Bangle.MESSAGES;
   }
   msg.handled = true;
-  if ((msg.t!=="add" || !msg.new) && (type!=="music")) { // music always has t:"modify"
-    saveToFlash();
-    return;
-  }
+  if ((msg.t!=="add" || !msg.new) && (type!=="music")) // music always has t:"modify"
+    return saveToFlash();
 
   const quiet = (require("Storage").readJSON("setting.json", 1) || {}).quiet;
   const unlockWatch = appSettings.unlockWatch;
   // don't auto-open messages in quiet mode if quietNoAutOpn is true
   if ((quiet && appSettings.quietNoAutOpn) || appSettings.noAutOpn)
     loadMessages = false;
-
   // after a delay load the app, to ensure we have all the messages
   if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
   exports.messageTimeout = setTimeout(function() {
     delete exports.messageTimeout;
+    if (!Bangle.MESSAGES) return; // message was removed during the delay
     if (type!=="music") {
       if (!loadMessages) {
         // not opening the app, just buzz
@@ -61,6 +72,8 @@ exports.listener = function(type, msg) {
         Bangle.setLCDPower(1); // turn screen on
       }
     }
+    // if loading the gui would reload everything, we must save our messages
+    if (loadWillReset()) saveToFlash();
     exports.open(msg);
   }, 500);
 };
@@ -70,11 +83,17 @@ exports.listener = function(type, msg) {
  * @param {object} msg
  */
 exports.open = function(msg) {
-  if (msg && msg.id && !msg.show) {
-    msg.show = 1;
-    if (Bangle.load === load) {
-      // no fast loading: store message to load in flash
+  if (msg && msg.id) {
+    // force a display by setting it as new and ensuring it ends up at the beginning of messages list
+    msg.new = 1;
+    if (loadWillReset()) {
+      // no fast loading: store message to load in flash - `msg` will be put in first
       require("messages").save(msg, {force: 1});
+    } else {
+      // fast load - putting it at the end of Bangle.MESSAGES ensures it goes at the start of messages list
+      if (!Bangle.MESSAGES) Bangle.MESSAGES=[];
+      Bangle.MESSAGES = Bangle.MESSAGES.filter(m => m.id!=msg.id)
+      Bangle.MESSAGES.push(msg); // putting at the
     }
   }
 
diff --git a/apps/messagegui/metadata.json b/apps/messagegui/metadata.json
index 80b362551..1a7a6c750 100644
--- a/apps/messagegui/metadata.json
+++ b/apps/messagegui/metadata.json
@@ -2,7 +2,7 @@
   "id": "messagegui",
   "name": "Message UI",
   "shortName": "Messages",
-  "version": "0.59",
+  "version": "0.63",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messageicons/ChangeLog b/apps/messageicons/ChangeLog
index fefc6ee6e..c923b169f 100644
--- a/apps/messageicons/ChangeLog
+++ b/apps/messageicons/ChangeLog
@@ -1,2 +1,5 @@
 0.01: Moved message icons from messages into standalone library
 0.02: Added several new icons and colors
+0.03: Fix icons broken in 0v02 (#2386)
+      Store all icons in a separate binary file (much faster lookup)
+
diff --git a/apps/messageicons/icons.img b/apps/messageicons/icons.img
new file mode 100644
index 000000000..104168357
Binary files /dev/null and b/apps/messageicons/icons.img differ
diff --git a/apps/messageicons/icons/bibel.png b/apps/messageicons/icons/bibel.png
new file mode 100644
index 000000000..053fcf178
Binary files /dev/null and b/apps/messageicons/icons/bibel.png differ
diff --git a/apps/messageicons/icons/bring.png b/apps/messageicons/icons/bring.png
new file mode 100644
index 000000000..673d1b7be
Binary files /dev/null and b/apps/messageicons/icons/bring.png differ
diff --git a/apps/messageicons/icons/default.png b/apps/messageicons/icons/default.png
new file mode 100644
index 000000000..1f85079df
Binary files /dev/null and b/apps/messageicons/icons/default.png differ
diff --git a/apps/messageicons/icons/etar.png b/apps/messageicons/icons/etar.png
new file mode 100644
index 000000000..24f0cc587
Binary files /dev/null and b/apps/messageicons/icons/etar.png differ
diff --git a/apps/messageicons/icons/generate.js b/apps/messageicons/icons/generate.js
new file mode 100755
index 000000000..e857032af
--- /dev/null
+++ b/apps/messageicons/icons/generate.js
@@ -0,0 +1,143 @@
+#!/usr/bin/node
+
+// Creates lib.js from icons
+// npm install png-js
+
+// default icon must come first in icon_names
+
+var imageconverter = require("../../../webtools/imageconverter.js");
+var icons = JSON.parse(require("fs").readFileSync(__dirname+"/icon_names.json"));
+const imgOptions = {
+  mode : "1bit",
+  inverted : true,
+  transparent : true,
+  output: "raw"
+};
+var PNG = require('png-js');
+var IMAGE_BYTES = 76;
+
+var iconTests = [];
+var iconImages = []; // array of converted icons
+var iconIndices = {}; // maps filename -> index in iconImages
+
+var promises = [];
+
+icons.forEach(icon => {
+  var index = iconIndices[icon.icon];
+  if (index===undefined) { // need a new icon
+    index = iconImages.length;
+    iconIndices[icon.icon] = index;
+    iconImages.push(""); // placeholder
+    // create image
+    console.log("Loading "+icon.icon);
+    var png = new PNG(require("fs").readFileSync(__dirname+"/"+icon.icon));
+    if (png.width!=24 || png.height!=24) {
+      console.warn(icon.icon+" should be 24x24px");
+    }
+
+    promises.push(new Promise(r => {
+      png.decode(function (pixels) {
+        var rgba = new Uint8Array(pixels);
+        var isTransparent = false;
+        for (var i=0;i<rgba.length;i+=4)
+          if (rgba[i+3]<255) isTransparent=true;
+        if (!isTransparent) { // make it transparent
+          for (var i=0;i<rgba.length;i+=4)
+            rgba[i+3] = 255-rgba[i];
+        }
+
+        imgOptions.width = png.width;
+        imgOptions.height = png.height;
+        var img = imageconverter.RGBAtoString(rgba, imgOptions);
+        iconImages[index] = img;
+        console.log("Loaded "+icon.icon);
+        if (img.length != IMAGE_BYTES) throw new Error("Image size should be 76 bytes");
+        r(); // done
+      });
+    }));
+    //
+  }
+  icon.index = index;
+});
+
+Promise.all(promises).then(function() {
+  // Allocate a big array of icons
+  var iconData = new Uint8Array(IMAGE_BYTES * iconImages.length);
+  iconImages.forEach((img,idx) => {
+    // Yay, more JS. Why is it so hard to get the bytes???
+    iconData.set(Array.prototype.slice.call(Buffer.from(img,"binary")), idx*IMAGE_BYTES)
+  });
+
+  console.log("Saving images");
+  require("fs").writeFileSync(__dirname+"/../icons.img", Buffer.from(iconData,"binary"));
+
+  console.log("Saving library");
+  require("fs").writeFileSync(__dirname+"/../lib.js", `exports.getImage = function(msg) {
+  if (msg.img) return atob(msg.img);
+  let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
+  if (msg.id=="music") s="music";
+  let match = ${JSON.stringify(","+icons.map(icon=>icon.app+"|"+icon.index).join(",")+",")}.match(new RegExp(\`,\${s}\\\\|(\\\\d+)\`))
+  return require("Storage").read("messageicons.img", (match===null)?0:match[1]*${IMAGE_BYTES}, ${IMAGE_BYTES});
+};
+
+exports.getColor = function(msg,options) {
+  options = options||{};
+  var st = options.settings || require('Storage').readJSON("messages.settings.json", 1) || {};
+  if (options.default===undefined) options.default=g.theme.fg;
+  if (st.iconColorMode == 'mono') return options.default;
+  const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
+  return {
+    // generic colors, using B2-safe colors
+    // DO NOT USE BLACK OR WHITE HERE, just leave the declaration out and then the theme's fg color will be used
+    "airbnb": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/
+    "mail": "#ff0",
+    "music": "#f0f",
+    "phone": "#0f0",
+    "sms message": "#0ff",
+    // brands, according to https://www.schemecolor.com/?s (picking one for multicolored logos)
+    // all dithered on B2, but we only use the color for the icons.  (Could maybe pick the closest 3-bit color for B2?)
+    "bibel": "#54342c",
+    "bring": "#455a64",
+    "discord": "#5865f2", // https://discord.com/branding
+    "etar": "#36a18b",
+    "facebook": "#1877f2", // https://www.facebook.com/brand/resources/facebookapp/logo
+    "gmail": "#ea4335",
+    "gmx": "#1c449b",
+    "google": "#4285F4",
+    "google home": "#fbbc05",
+// "home assistant": "#41bdf5", // ha-blue is #41bdf5, but that's the background
+    "instagram": "#ff0069", // https://about.instagram.com/brand/gradient
+    "lieferando": "#ff8000",
+    "linkedin": "#0a66c2", // https://brand.linkedin.com/
+    "messenger": "#0078ff",
+    "mastodon": "#563acc", // https://www.joinmastodon.org/branding
+    "mattermost": "#00f",
+    "n26": "#36a18b",
+    "nextbike": "#00f",
+    "newpipe": "#f00",
+    "nina": "#e57004",
+    "opentasks": "#409f8f",
+    "outlook mail": "#0078d4", // https://developer.microsoft.com/en-us/fluentui#/styles/web/colors/products
+    "paypal": "#003087",
+    "pocket": "#ef4154f", // https://blog.getpocket.com/press/
+    "post & dhl": "#f2c101",
+    "reddit": "#ff4500", // https://www.redditinc.com/brand
+    "signal": "#3a76f0", // https://github.com/signalapp/Signal-Desktop/blob/main/images/signal-logo.svg
+    "skype": "#0078d4", // https://developer.microsoft.com/en-us/fluentui#/styles/web/colors/products
+    "slack": "#e51670",
+    "snapchat": "#ff0",
+    "steam": "#171a21",
+    "teams": "#6264a7", // https://developer.microsoft.com/en-us/fluentui#/styles/web/colors/products
+    "telegram": "#0088cc",
+    "telegram foss": "#0088cc",
+    "to do": "#3999e5",
+    "twitch": "#9146ff", // https://brand.twitch.tv/
+    "twitter": "#1d9bf0", // https://about.twitter.com/en/who-we-are/brand-toolkit
+    "vlc": "#ff8800",
+    "whatsapp": "#4fce5d",
+    "wordfeud": "#e7d3c7",
+    "youtube": "#f00", // https://www.youtube.com/howyoutubeworks/resources/brand-resources/#logos-icons-and-colors
+  }[s]||options.default;
+};
+  `);
+});
diff --git a/apps/messageicons/icons/gmx.png b/apps/messageicons/icons/gmx.png
new file mode 100644
index 000000000..185c90aa3
Binary files /dev/null and b/apps/messageicons/icons/gmx.png differ
diff --git a/apps/messageicons/icons/home assistant.png b/apps/messageicons/icons/home assistant.png
new file mode 100644
index 000000000..d08932ae8
Binary files /dev/null and b/apps/messageicons/icons/home assistant.png differ
diff --git a/apps/messageicons/icons/icon_names.json b/apps/messageicons/icons/icon_names.json
new file mode 100644
index 000000000..0085731cc
--- /dev/null
+++ b/apps/messageicons/icons/icon_names.json
@@ -0,0 +1,111 @@
+[
+  { "app":"default", "icon":"default.png" },
+  { "app":"airbnb", "icon":"airbnb.png" },
+  { "app":"alarm", "icon":"alarm.png" },
+	{ "app":"alarmclockreceiver", "icon":"alarm.png" },
+  { "app":"amazon shopping", "icon":"amazon.png" },
+  { "app":"bibel", "icon":"bibel.png" },
+  { "app":"bitwarden", "icon":"security.png" },
+	{ "app":"1password", "icon":"security.png" },
+	{ "app":"lastpass", "icon":"security.png" },
+	{ "app":"dashlane", "icon":"security.png" },
+  { "app":"bring", "icon":"bring.png" },
+  { "app":"calendar", "icon":"etar.png" },
+	{ "app":"etar", "icon":"etar.png" },
+  { "app":"chat", "icon":"google chat.png" },
+  { "app":"chrome", "icon":"chrome.png" },
+  { "app":"corona-warn", "icon":"coronavirus.png" },
+  { "app":"bmo", "icon":"bank.png" },
+	{ "app":"desjardins", "icon":"bank.png" },
+	{ "app":"rbc mobile", "icon":"bank.png" },
+	{ "app":"nbc", "icon":"bank.png" },
+	{ "app":"rabobank", "icon":"bank.png" },
+	{ "app":"scotiabank", "icon":"bank.png" },
+	{ "app":"td (canada)", "icon":"bank.png" },
+  { "app":"discord", "icon":"discord.png" },
+  { "app":"drive", "icon":"google drive.png" },
+  { "app":"element", "icon":"matrix element.png" },
+  { "app":"facebook", "icon":"facebook.png" },
+  { "app":"messenger", "icon":"facebook messenger.png" },
+  { "app":"firefox", "icon":"firefox.png" },
+	{ "app":"firefox beta", "icon":"firefox.png" },
+	{ "app":"firefox nightly", "icon":"firefox.png" },
+  { "app":"f-droid", "icon":"security.png" },
+	{ "app":"neo store", "icon":"security.png" },
+	{ "app":"aurora droid", "icon":"security.png" },
+  { "app":"github", "icon":"github.png" },
+  { "app":"gitlab", "icon":"gitlab.png" },
+  { "app":"gmx", "icon":"gmx.png" },
+  { "app":"google", "icon":"google.png" },
+  { "app":"google home", "icon":"google home.png" },
+  { "app":"google play store", "icon":"google play store.png" },
+  { "app":"home assistant", "icon":"home assistant.png" },
+  { "app":"instagram", "icon":"instagram.png" },
+  { "app":"kalender", "icon":"kalender.png" },
+  { "app":"keep notes", "icon":"google keep.png" },
+  { "app":"lieferando", "icon":"lieferando.png" },
+  { "app":"linkedin", "icon":"linkedin.png" },
+  { "app":"maps", "icon":"map.png" },
+	{ "app":"organic maps", "icon":"map.png" },
+	{ "app":"osmand", "icon":"map.png" },
+  { "app":"mastodon", "icon":"mastodon.png" },
+	{ "app":"fedilab", "icon":"mastodon.png" },
+	{ "app":"tooot", "icon":"mastodon.png" },
+	{ "app":"tusky", "icon":"mastodon.png" },
+  { "app":"mattermost", "icon":"mattermost.png" },
+  { "app":"n26", "icon":"n26.png" },
+  { "app":"netflix", "icon":"netflix.png" },
+  { "app":"news", "icon":"news.png" },
+	{ "app":"cbc news", "icon":"news.png" },
+	{ "app":"rc info", "icon":"news.png" },
+	{ "app":"reuters", "icon":"news.png" },
+	{ "app":"ap news", "icon":"news.png" },
+	{ "app":"la presse", "icon":"news.png" },
+	{ "app":"nbc news", "icon":"news.png" },
+  { "app":"nextbike", "icon":"nextbike.png" },
+  { "app":"nina", "icon":"nina.png" },
+  { "app":"outlook mail", "icon":"outlook.png" },
+  { "app":"paypal", "icon":"paypal.png" },
+  { "app":"phone", "icon":"phone.png" },
+  { "app":"plex", "icon":"plex.png" },
+  { "app":"pocket", "icon":"pocket.png" },
+  { "app":"post & dhl", "icon":"delivery.png" },
+  { "app":"proton mail", "icon":"protonmail.png" },
+  { "app":"reddit", "icon":"reddit.png" },
+	{ "app":"sync pro", "icon":"reddit.png" },
+	{ "app":"sync dev", "icon":"reddit.png" },
+	{ "app":"boost", "icon":"reddit.png" },
+	{ "app":"infinity", "icon":"reddit.png" },
+	{ "app":"slide", "icon":"reddit.png" },
+  { "app":"signal", "icon":"signal.png" },
+  { "app":"skype", "icon":"skype.png" },
+  { "app":"slack", "icon":"slack.png" },
+  { "app":"snapchat", "icon":"snapchat.png" },
+  { "app":"starbucks", "icon":"cafe.png" },
+  { "app":"steam", "icon":"steam.png" },
+  { "app":"teams", "icon":"teams.png" },
+  { "app":"telegram", "icon":"telegram.png" },
+	{ "app":"telegram foss", "icon":"telegram.png" },
+  { "app":"threema", "icon":"threema.png" },
+  { "app":"tiktok", "icon":"tiktok.png" },
+  { "app":"to do", "icon":"task.png" },
+	{ "app":"opentasks", "icon":"task.png" },
+	{ "app":"tasks", "icon":"task.png" },
+  { "app":"transit", "icon":"transit.png" },
+  { "app":"twitch", "icon":"twitch.png" },
+  { "app":"twitter", "icon":"twitter.png" },
+  { "app":"uber", "icon":"taxi.png" },
+	{ "app":"lyft", "icon":"taxi.png" },
+  { "app":"vlc", "icon":"vlc.png" },
+  { "app":"warnapp", "icon":"warnapp.png" },
+  { "app":"whatsapp", "icon":"whatsapp.png" },
+  { "app":"wordfeud", "icon":"wordfeud.png" },
+  { "app":"youtube", "icon":"youtube.png" },
+	{ "app":"newpipe", "icon":"youtube.png" },
+  { "app":"zoom", "icon":"videoconf.png" },
+	{ "app":"meet", "icon":"videoconf.png" },
+  { "app":"music", "icon":"music.png" },
+  { "app":"sms message", "icon":"default.png" },
+	{ "app":"mail", "icon":"default.png" },
+	{ "app":"gmail", "icon":"default.png" }
+]
diff --git a/apps/messageicons/icons/kalender.png b/apps/messageicons/icons/kalender.png
new file mode 100644
index 000000000..dd807dd9e
Binary files /dev/null and b/apps/messageicons/icons/kalender.png differ
diff --git a/apps/messageicons/icons/music.png b/apps/messageicons/icons/music.png
new file mode 100644
index 000000000..62f7acfee
Binary files /dev/null and b/apps/messageicons/icons/music.png differ
diff --git a/apps/messageicons/icons/n26.png b/apps/messageicons/icons/n26.png
new file mode 100644
index 000000000..aa441ab8b
Binary files /dev/null and b/apps/messageicons/icons/n26.png differ
diff --git a/apps/messageicons/icons/nextbike.png b/apps/messageicons/icons/nextbike.png
new file mode 100644
index 000000000..467bed8ac
Binary files /dev/null and b/apps/messageicons/icons/nextbike.png differ
diff --git a/apps/messageicons/icons/nina.png b/apps/messageicons/icons/nina.png
new file mode 100644
index 000000000..2669b6401
Binary files /dev/null and b/apps/messageicons/icons/nina.png differ
diff --git a/apps/messageicons/icons/warnapp.png b/apps/messageicons/icons/warnapp.png
new file mode 100644
index 000000000..988485053
Binary files /dev/null and b/apps/messageicons/icons/warnapp.png differ
diff --git a/apps/messageicons/icons/wordfeud.png b/apps/messageicons/icons/wordfeud.png
new file mode 100644
index 000000000..83963d4d4
Binary files /dev/null and b/apps/messageicons/icons/wordfeud.png differ
diff --git a/apps/messageicons/lib.js b/apps/messageicons/lib.js
index 5a24ac098..c5be21bb0 100644
--- a/apps/messageicons/lib.js
+++ b/apps/messageicons/lib.js
@@ -1,80 +1,9 @@
 exports.getImage = function(msg) {
-  /*
-  * icons should be 24x24px or less with 1bpp colors and 'Transparency to Color'
-  * http://www.espruino.com/Image+Converter
-  */
   if (msg.img) return atob(msg.img);
-  const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
-  if (s=="airbnb") return atob("GBgBAAAAADwAAH4AAMMAAIMAAYGAAQGAAwDAAwDABjxgBn5gDMMwDMMwGMMYGMMYMGYMMGYMIDwEIBgEIDwEMH4MHee4D4HwAAAA"); // icons/airbnb.png
-  if (s=="alarm" || s =="alarmclockreceiver") return atob("GBgBAAAAAAAAAgBABwDgHn54Of+cE8PIBwDgDhhwDBgwHBg4GBgYGBgYGBgYGA4YHAc4DAEwDgBwBwDgA8PAAf+AAH4AAAAAAAAA"); // icons/alarm.png
-  if (s=="amazon shopping") return atob("GBgBAAAAAP8AAf+AA//AA+fAA8PAAIPAAD/AAP/AA//AA+PAB8PAB8fAB8fgB//gA//gA/3AAPCecAAeOAAeDwH0B//kAf+AAAAA"); // icons/amazon.png
-  if (s=="bibel") return atob("GBgBAAAAA//wD//4D//4H//4H/f4H/f4H+P4H4D4H4D4H/f4H/f4H/f4H/f4H/f4H//4H//4H//4GAAAEAAAEAAACAAAB//4AAAA");
-  if (s=="bitwarden" || s=="1password" || s=="lastpass" || s=="dashlane") return atob("GBgBAAAAABgAAP8AA//AD4/wHg/4GA/4GA/4GA/4GA/4GA/4GA/4H/AYH/AYH/A4D/AwD/BwB/BgB/DgA/HAAfeAAP8AADwAAAAA"); // icons/security.png
-  if (s=="bring") return atob("GBgBAAAAAAAAAAAAAAAAAHwAAFoAAf+AA/+AA/+AA/+AA/eAA+eAA0+AAx+AA7+AA/+AA//AA/+AAf8AAAIAAAAAAAAAAAAAAAAA");
-  if (s=="calendar" || s=="etar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
-  if (s=="chat") return atob("GBgBAAAAAf/8A//+A//+A//+OAB+e/8+e/++e/++e/++e/++e/++e/++ef+8fAAAf//Af//Af//Af//Af/+AcAAAYAAAQAAAAAAA"); // icons/google chat.png
-  if (s=="chrome") return atob("GBgBAAAAAAAAAP8AA//AB+fgDwDwHgB4HAA4Pj/8OmYcO8McMYEMMYEMOMMcOGccOD4cHAw4Hgx4DxjwB//gA//AAP8AAAAAAAAA"); // icons/chrome.png
-  if (s=="corona-warn") return atob("GBgBAAAAAAAAABgAABgABhhgDn5wD//wA8PAA+fAB2bgBgBgPpl8Ppl8BgBgB2bgA+fAA8PAD//wDn5wBhhgABgAABgAAAAAAAAA"); // icons/coronavirus.png
-  if (s=="bmo" || s=="desjardins" || s=="rbc mobile" || s=="nbc" || s=="rabobank" || s=="scotiabank" || s=="td (canada)") return atob("GBgBAAAAADgAAP4AAe8AB4PAHgDwP//4P//4AAAAAAAADjjgDjjgDjjgDjjgDjjgDjjgDjjgAAAAAAAAP//4P//4AAAAAAAAAAAA"); // icons/bank.png
-  if (s=="discord") return atob("GBgBAAAAAAAAAAAAAAAAA4HAD//wH//4H//4P//8P//8P//8fn5+fDw+fDw+fn5+f//+f//+ff++PgB8DgBwAAAAAAAAAAAAAAAA"); // icons/discord.png
-  if (s=="drive") return atob("GBgBAAAAAAAAAH8AAH8AAT+AA7/AA9/AB8/gB+/gD+fwD+fwH8P4P8P8P4H8fwAAf3/+Pn/8Pv/8HP/4Df/wC//wAAAAAAAAAAAA"); // icons/google drive.png
-  if (s=="element") return atob("GBgBAAAAAHwAAH4AAH8AAAeAAePAB+HAD+DgHgDgPADuOADucAAOcAAOdwAcdwA8BwB4BwfwA4fgA8eAAeAAAP4AAH4AAD4AAAAA"); // icons/matrix element.png
-  if (s=="facebook") return atob("GBgBAAAAAAAAAH4AAf+AB//gD//wD/DwH+D4H+P4P+f8P+f8P+f8PwD8PwD8PwD8H+f4H+f4D+fwD+fwB+fgAeeAAOcAAAAAAAAA"); // icons/facebook.png
-  if (s=="messenger") return atob("GBgBAAAAAAAAAP8AA//AB//gD//wH//4H//4P//8P9+8P458PwB8PgD8PnH8Pfv8H//4H//4D//wB//gB//AB/8AAwAAAAAAAAAA"); // icons/facebook messenger.png
-  if (s=="firefox" || s=="firefox beta" || s=="firefox nightly") return atob("GBgBAAAAAAAAAAMAAAcAAAeABA/ADY/gH4P4H4H4H8H8P/H8P+D8PwD8PwD8PwD8H4H4H8P4H//4D//wB//gA//AAP8AAAAAAAAA"); // icons/firefox.png
-  if (s=="f-droid" || s=="neo store" || s=="aurora droid") return atob("GBgBAAAAQAACYAAGP//8H//4H//4HH44HH44H//4AAAAH//4H8P4H734H374HsN4Hvl4Hv14Hvl4HsN4H374H734H8P4D//wAAAA"); // icons/security.png
-  if (s=="github") return atob("GBgBAAAAAAAAAH4AAf+AB//gD//wDv9wHgB4HgB4PAA8PAA8PAA8PAA8PAA8PgB8HwD4G8P4DcPwDgPwB4PgAcOAAAAAAAAAAAAA"); // icons/github.png
-  if (s=="gitlab") return atob("GBgBAAAABAAgDAAwDAAwHgB4HgB4PgB8PwD8P//8f//+f//+f//+f//+f//+f//+P//8H//4D//wA//AAf+AAP8AADwAABgAAAAA"); // icons/gitlab.png
-  if (s=="gmx") return atob("GBgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEJmfmd8Zuc85v847/88Z9s8fttmHIHiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-  if (s=="google") return atob("GBgBAAAAAP8AA//AB//gD//gH+fAP4CAPwAAPgAAfAAAfA/+fA/+fA/+fA/+fAA+PgA+PwB8P4D8H+f4D//4B//wA//AAP8AAAAA"); // icons/google.png
-  if (s=="google home") return atob("GBgBAAAAABgAADwAAH4AAf4AA/zAB/vgD/fwH+f4P4H8fwD+fgB+fAA+eAA+cAA+bAA+HAA+PAA+ff++ff++ff++ff++Pf+8AAAA"); // icons/google home.png
-  if (s=="google play store") return atob("GBgBAAAAAAAAAH4AAP8AAMMAAMMAP//8P//8MAAMMAAMMGAMMHgMMH4MMH8MMH4MMHgMMGAMMAAMMAAMP//8H//4AAAAAAAAAAAA"); // icons/google play store.png
-  if (s=="home assistant") return atob("FhaBAAAAAADAAAeAAD8AAf4AD/3AfP8D7fwft/D/P8ec572zbzbNsOEhw+AfD8D8P4fw/z/D/P8P8/w/z/AAAAA=");
-  if (s=="instagram") return atob("GBgBAAAAD//wH//4OAAccAAOYABmYDxmYP8GYeeGYYGGY4HGYwDGYwDGY4HGYYGGYeeGYP8GYDwGYAAGcAAOOAAcH//4D//wAAAA"); // icons/instagram.png
-  if (s=="kalender") return atob("GBgBBgBgBQCgff++RQCiRgBiQAACf//+QAACQAACR//iRJkiRIEiR//iRNsiRIEiRJkiR//iRIEiRIEiR//iQAACQAACf//+AAAA");
-  if (s=="keep notes") return atob("GBgBAAAAAAAAH//4P//8P8P8Pzz8P378Pv98Pv98Pv98Pv98P378Pzz8P738P4H8P738P738P4GMP8OYP/+wP//gH//AAAAAAAAA"); // icons/google keep.png
-  if (s=="lieferando") return atob("GBgBAAAAADwAAH4AAP/gAf/wA//wB//wD//wH//4H/98Pt58ft5+Ptx8DtxwDtxwDhxwDhhwDhhwDzhwD75wD75wD75wB77gAAAA"); // icons/lieferando.png
-  if (s=="linkedin") return atob("GBgBAAAAf//+f//+f//+ef/+cf/+cf/+f//+f//+ccw+ccAeccAecccOcceOcceOcceOcceOcceOcceOec+ef//+f//+f//+AAAA"); // icons/linkedin.png
-  if (s=="maps" || s=="organic maps" || s=="osmand") return atob("GBgBAAAAAAAAAAAAAeAYD/z4H//4GMeYGMMYGMMYGMMYGMMYGMMYGMMYGMMYGMMYGMMYGMMYGeMYH//4Hz/wGAeAAAAAAAAAAAAA"); // icons/map.png
-  if (s=="mastodon" || s=="fedilab" || s=="tooot" || s=="tusky") return atob("GBgBAAAAB//gD//4H//4P//8PBg8PAA8fOMeeOeeeOeeOOeeOOecOP+cOP+cP//8P//4P//4P//gHwAAH4AAD+cAB/8AAf4AAAAA"); // icons/mastodon.png
-  if (s=="mattermost") return atob("GBgBAAAAAPAAA+EAB4GADgOQHAeYOA+cOB+MeB+OcD+GcD+GcD+GeD8OeB4OeAAOfAAePgA8P4B8H/f4D//wB//gA//AAP8AAAAA"); // icons/mattermost.png
-  if (s=="n26") return atob("GBgBAAAAAAAAAAAAAAAAAP8AAAAAAAAAAAAAAOIAAOIAAPIAANoAANoAAM4AAMYAAMYAAAAAAAAAAAAAAP8AAAAAAAAAAAAAAAAA");
-  if (s=="netflix") return atob("GBgBAAAAA8PAA+PAAePAAePAAfPAAvPAA/PAAvvAAn/AA/nAA3/AA/7AA5/AA/5AA99AA8/AA89AA8+AA8eAA8eAA8fAA8PAAAAA"); // icons/netflix.png
-  if (s=="news" || s=="cbc news" || s=="rc info" || s=="reuters" || s=="ap news" || s=="la presse" || s=="nbc news") return atob("GBgBAAAAAAAAAAAALaW0P//8P//8P//8P//8MAAMMAAMMAAMP//8P//8MBwcMBwcMB/8MB/8MBwcMBwcP//8P//8AAAAAAAAAAAA"); // icons/news.png
-  if (s=="nextbike") return atob("GBgBAAAAAAAAAAAAAAAAAAAAAACAfgDAPwDAP4HAH4N4H8f8D82GMd8CMDsDMGMDMGGGGMHOD4D8AAAAAAAAAAAAAAAAAAAAAAAA");
-  if (s=="nina") return atob("GBgBAAAABAAQCAAICAAIEAAEEgAkJAgSJBwSKRxKSj4pUn8lVP+VVP+VUgAlSgApKQBKJAASJAASEgAkEAAECAAICAAIBAAQAAAA");
-  if (s=="outlook mail") return atob("GBgBAAAAAAAAAP/8AP/8AP/8AJjMf/jMf//8f//8cHjMd3jMZz/+Zz/+d3jecHj+f//mf/eGf/PGAwDmAwA+A//+Af/+AAAAAAAA"); // icons/outlook.png
-  if (s=="paypal") return atob("GBgBAAAAA/+AA//gA//wB//wB//wB//wB//wB//wB//gD//gD//ID/+ID/wwD4BwD5/gD74AH7gAHzAAHzAAHzAAAHAAAHAAAAAA"); // icons/paypal.png
-  if (s=="phone") return atob("GBgBAAAAAAAAH4AAP8AAP8AAP8AAH8AAH8AAH8AAH4AADwAADwAABwAAA4AAA8HwAeP8AP/8AH/8AD/8AA/8AAP8AAB4AAAAAAAA"); // icons/phone.png
-  if (s=="plex") return atob("GBgBAAAAB/gAB/gAA/wAAf4AAf4AAP8AAH+AAH+AAD/AAB/gAB/gAB/gAB/gAD/AAH+AAH+AAP8AAf4AAf4AA/wAB/gAB/gAAAAA"); // icons/plex.png
-  if (s=="pocket") return atob("GBgBAAAAAAAAP//8f//+f//+f//+f//+f//+fP8+eH4efDw+fhh+fwD+f4H+P8P8P+f8H//4H//4D//wB//gAf+AAH4AAAAAAAAA"); // icons/pocket.png
-  if (s=="post & dhl") return atob("GBgBAAAAAAAAAAAAAAAAP/+Af/+AYAGAYAGAYAHwYAH4YAGMYAGGYAH+YAH+bwH+f//+ef+eGYGYH4H4DwDwAAAAAAAAAAAAAAAA"); // icons/delivery.png
-  if (s=="proton mail") return atob("GBgBAAAAAAAAAAAAQAACYAAGcAAOeAAePABeXgDebwHed4Pee/fefe/efh/ef//ef//ef//ef//ef//ef//eP//cAAAAAAAAAAAA"); // icons/protonmail.png
-  if (s=="reddit" || s=="sync pro" || s=="sync dev" || s=="boost" || s=="infinity" || s=="slide") return atob("GBgBAAAAAAAAAAYwAAX4AAh4AAgwAAgAAAgAAH4AAf+AN//sf//+fn5+PDw8HDw4Hn54H//4H//4DzzwB4HgAf+AAH4AAAAAAAAA"); // icons/reddit.png
-  if (s=="signal") return atob("GBgBAAAAAL0AAYGABH4gCf+QE//IB//gL//0b//2H//4X//6X//6X//6X//6H//4b//2L//0D//gL//ID/+QYH4gVYGAcL0AAAAA"); // icons/signal.png
-  if (s=="skype") return atob("GBgBAAAAB8AAH/8AP//AP//gf8fwfwD4fgB4fjx8fj/8Pg/8PwH8P4B8P/h8Pnx+Pjx+Hhh+HwD+D8P+B//8A//8AP/4AAPgAAAA"); // icons/skype.png
-  if (s=="slack") return atob("GBgBAAAAAOcAAeeAAeeAAeeAAGeAAAeAP+ecf+eef+e+f+e+AAAAAAAAfef+fef+eef+Oef8AeAAAeYAAeeAAeeAAeeAAOcAAAAA"); // icons/slack.png
-  if (s=="snapchat") return atob("GBgBAAAAAAAAAAAAAH4AAf+AAYGAAwDAAwDAAwDADwDwDwDwDgBwBwDgBwDgDgBwHAA4OAAcHAA4D4HwB//gAH4AAAAAAAAAAAAA"); // icons/snapchat.png
-  if (s=="starbucks") return atob("GBgBAAAAAAAAAAAAD//4D//8DADMDADMDADMDAD8DAD4DADADADADADADADADgHAB/+AA/8AAAAAAAAAP//wP//wAAAAAAAAAAAA"); // icons/cafe.png
-  if (s=="steam") return atob("GBgBAAAAAAAAAf+AA//AD//wD//wH/g4P/OcP/RcP+RcP+ReH8OeB4A+AAH+AMP8IC/8OS/8HN/4Dj/wD//wA//AAf+AAAAAAAAA"); // icons/steam.png
-  if (s=="teams") return atob("GBgBAAAAAAgAAD4AADcYAGM8AGNmP/dmP/48MDAYMD/+PP/+PPBmPPBmPPBmPPBmP/BmP/BmH+B+AYD4AMDAAOOAAH8AABwAAAAA"); // icons/teams.png
-  if (s=="telegram" || s=="telegram foss") return atob("GBgBAAAAAAAAAAAAAAAeAAB+AAP+AA/+AD/+Af9+B/z+H/n8f+P8f8f8Dw/8AB/8AB/8AB/4AAf4AAP4AAD4AABwAAAAAAAAAAAA"); // icons/telegram.png
-  if (s=="threema") return atob("GBgBAAAAAP8AA//AB//gD//wH8P4H9v4H734P5n8P4H8P4H8H4H4H4H4D//wD//gD//AH/8AHDwAAAAAAAAABhhgDzzwBhhgAAAA"); // icons/threema.png
-  if (s=="tiktok") return atob("GBgBAAAAAAAAAAcAAAcAAAeAAAfAAAfwAAf4AAf4AMd4A8cAB8cAD8cADwcAHgcAHgcAHg8ADw8AD/4AB/4AA/wAAfAAAAAAAAAA"); // icons/tiktok.png
-  if (s=="to do" || s=="opentasks" || s=="tasks") return atob("GBgBAAAAAHwAAf+AA//ID4GcHwA8HAB4PADwOAHgcAPGcAeOcY8Oc94OcfwOcPgOOHAcOCAcHAA4DgB4D4HwB//gAf+AAH4AAAAA"); // icons/task.png
-  if (s=="transit") return atob("GBgBAAAAD//wP//8P//8f//+f/j+ffA+eOA+eOMef+cefef+eOe+fecef+e+eOf+eOcefAcefA++fx/+f//+P//8P//8D//wAAAA"); // icons/transit.png
-  if (s=="twitch") return atob("GBgBAAAAA//8B//8DgAMHgAMPhjMPhjMPhjMPhjMPhjMPgAMPgAMPgAYPgAwP+fgP+/AP/+AP/8AP/4AAeAAAcAAAYAAAQAAAAAA"); // icons/twitch.png
-  if (s=="twitter") return atob("GBgBAAAAAAAAAAAAAAPAIAf8MA/4PA/8Pg/4H//4H//4P//4P//wH//wD//wD//gD//AA//AAf+AB/8AP/wAD/AAAAAAAAAAAAAA"); // icons/twitter.png
-  if (s=="uber" || s=="lyft") return atob("GBgBAAAAAAAAAAAAAH4AAH4AB//gB//gDgBwDAAwDAAwH//4H//4GAAYG4HYG4HYG4HYGAAYH//4H//4HAA4HAA4AAAAAAAAAAAA"); // icons/taxi.png
-  if (s=="vlc") return atob("GBgBAAAAABgAABgAADwAADwAAAAAAAAAAAAAAAAAAIEAAP8AAP8AAf+AAP8AAAAADAAwDAAwHAA4HwD4H//4P//8P//8P//8AAAA"); // icons/vlc.png
-  if (s=="warnapp") return atob("GBgBAAAAAAAAAAAAAH4AAP8AA//AA//AD//gP//gf//4f//+/+P+/8H//8n//4n/fxh/fzg+Pj88Dn44AA4AAAwAAAwAAAgAAAAA");
-  if (s=="whatsapp") return atob("GBgBAAAAAP8AA//AB4HwDgB4HAA4OAAcMYAMc8AOc8AGY8AGYcAGYeAGYPOGcH/OcD/OMA+MOAAcMAA4MgBwf8Pgf//AcP8AAAAA"); // icons/whatsapp.png
-  if (s=="wordfeud") return atob("GBgCWqqqqqqlf//////9v//////+v/////++v/////++v8///Lu+v8///L++v8///P/+v8v//P/+v9v//P/+v+fx/P/+v+Pk+P/+v/PN+f/+v/POuv/+v/Ofdv/+v/NvM//+v/I/Y//+v/k/k//+v/i/w//+v/7/6//+v//////+v//////+f//////9Wqqqqqql");
-  if (s=="youtube" || s=="newpipe") return atob("GBgBAAAAAAAAAAAAAAAAAAAAH//4P//8P//8f//+f8/+f8P+f8D+f8D+f8P+f8/+f//+P//8P//8H//4AAAAAAAAAAAAAAAAAAAA"); // icons/youtube.png
-  if (s=="zoom" || s=="meet") return atob("GBgBAAAAAAAAAAAAP/+Af//Af//AcADicADmcADucAD+cAD+cAD+cAD+cAD+cAD+cADucADmcADif//Af//AP/+AAAAAAAAAAAAA"); // icons/videoconf.png
-  if (msg.id=="music") return atob("FhaBAH//+/////////////h/+AH/4Af/gB/+H3/7/f/v9/+/3/7+f/vB/w8H+Dwf4PD/x/////////////3//+A=");
-  // if (s=="sms message" || s=="mail" || s=="gmail") // .. default icon (below)
-  return atob("FhKBAH//+P//yf/+c//z5/+fz/z/n+f/Pz/+ef/8D///////////////////////f//4///A");
+  let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
+  if (msg.id=="music") s="music";
+  let match = ",default|0,airbnb|1,alarm|2,alarmclockreceiver|2,amazon shopping|3,bibel|4,bitwarden|5,1password|5,lastpass|5,dashlane|5,bring|6,calendar|7,etar|7,chat|8,chrome|9,corona-warn|10,bmo|11,desjardins|11,rbc mobile|11,nbc|11,rabobank|11,scotiabank|11,td (canada)|11,discord|12,drive|13,element|14,facebook|15,messenger|16,firefox|17,firefox beta|17,firefox nightly|17,f-droid|5,neo store|5,aurora droid|5,github|18,gitlab|19,gmx|20,google|21,google home|22,google play store|23,home assistant|24,instagram|25,kalender|26,keep notes|27,lieferando|28,linkedin|29,maps|30,organic maps|30,osmand|30,mastodon|31,fedilab|31,tooot|31,tusky|31,mattermost|32,n26|33,netflix|34,news|35,cbc news|35,rc info|35,reuters|35,ap news|35,la presse|35,nbc news|35,nextbike|36,nina|37,outlook mail|38,paypal|39,phone|40,plex|41,pocket|42,post & dhl|43,proton mail|44,reddit|45,sync pro|45,sync dev|45,boost|45,infinity|45,slide|45,signal|46,skype|47,slack|48,snapchat|49,starbucks|50,steam|51,teams|52,telegram|53,telegram foss|53,threema|54,tiktok|55,to do|56,opentasks|56,tasks|56,transit|57,twitch|58,twitter|59,uber|60,lyft|60,vlc|61,warnapp|62,whatsapp|63,wordfeud|64,youtube|65,newpipe|65,zoom|66,meet|66,music|67,sms message|0,mail|0,gmail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
+  return require("Storage").read("messageicons.img", (match===null)?0:match[1]*76, 76);
 };
 
 exports.getColor = function(msg,options) {
@@ -136,3 +65,4 @@ exports.getColor = function(msg,options) {
     "youtube": "#f00", // https://www.youtube.com/howyoutubeworks/resources/brand-resources/#logos-icons-and-colors
   }[s]||options.default;
 };
+  
\ No newline at end of file
diff --git a/apps/messageicons/metadata.json b/apps/messageicons/metadata.json
index b621c55b9..079835a0b 100644
--- a/apps/messageicons/metadata.json
+++ b/apps/messageicons/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messageicons",
   "name": "Message Icons",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Library containing a list of icons and colors for apps",
   "icon": "app.png",
   "type": "module",
@@ -10,6 +10,7 @@
   "provides_modules" : ["messageicons"],
   "default": true,
   "storage": [
-    {"name":"messageicons","url":"lib.js"}
+    {"name":"messageicons","url":"lib.js"},
+    {"name":"messageicons.img","url":"icons.img"}
   ]
 }
diff --git a/apps/messagelist/ChangeLog b/apps/messagelist/ChangeLog
new file mode 100644
index 000000000..759f68777
--- /dev/null
+++ b/apps/messagelist/ChangeLog
@@ -0,0 +1 @@
+0.01: New app!
\ No newline at end of file
diff --git a/apps/messagelist/README.md b/apps/messagelist/README.md
new file mode 100644
index 000000000..776d0d0e6
--- /dev/null
+++ b/apps/messagelist/README.md
@@ -0,0 +1,69 @@
+# Message List
+
+Display messages inline as a single list:   
+Displays one message at a time, if it doesn't fit on the screen you can scroll
+up/down.  When you reach the bottom, you can scroll on to the next message.
+
+## Installation
+**First** uninstall the default [Message UI](/?id=messagegui) app (`messagegui`,
+not the library!).   
+Then install this app.
+
+## Screenshots
+
+### Main menu:   
+![Screenshot](screenshot0.png)
+
+### Unread message:   
+![Screenshot](screenshot1.png)   
+The chevrons are hints for swipe actions:
+- Swipe right to go back
+- Swipe left for the message-actions menu
+- Swipe down to show the previous message: We are currently viewing message 2 of 2,
+  so message 1 is "above" this one.
+
+### Long (read) message:   
+![Screenshot](screenshot2.png)   
+The button is disabled until you scroll all the way to the bottom.
+
+### Music:   
+![Screenshot](screenshot3.png)   
+Minimal setup: album name and buttons disabled through settings.
+Swipe for next/previous song, tap to pause/resume.
+
+## Settings
+
+### Interface
+* `Font size` - The font size used when displaying messages/music.
+* `On Tap` - If messages are too large to fit on the screen, tapping the screen scrolls down.    
+  This is the action to take when tapping a message after reaching the bottom:
+  - `Message menu`: Open menu with message actions
+  - `Dismiss`: Dismiss message right away
+  - `Back`: Go back to clock/main menu
+  - `Nothing`: Do nothing
+* `Dismiss button` - Show inline button to dismiss message right away
+
+### Behaviour
+* `Vibrate` - The pattern of buzzes when a new message is received.
+* `Vibrate for calls` - The pattern of buzzes for incoming calls.
+* `Vibrate for alarms` - The pattern of buzzes for (phone) alarms.
+* `Repeat` - How often buzzes repeat - the default of 4 means the Bangle will buzz every 4 seconds.
+* `Unread timer` - When a new message is received the Messages app is opened.
+  If there is no user input for this amount of time then the app will exit and return to the clock.
+* `Auto-open` - Automatically open app when a new message arrives.
+* `Respect quiet mode` - Prevent auto-opening during quiet mode.
+
+### Music
+* `Auto-open` - Automatically open app when music starts playing.
+* `Always visible` - Show "music" in the main menu even when nothing is playing.
+* `Buttons` - Show `previous`/`play/pause`/`next` buttons on music screen.
+* `Show album` - Display album names?
+
+
+### Util
+* `Delete all` - Erase all messages.
+
+
+## Attributions
+
+Some icons used in this app are from https://icons8.com
diff --git a/apps/messagelist/TODO.txt b/apps/messagelist/TODO.txt
new file mode 100644
index 000000000..3a6d7b664
--- /dev/null
+++ b/apps/messagelist/TODO.txt
@@ -0,0 +1,17 @@
+## Nice to have:
+* Add labels to B1 music HW buttons
+* Add volume buttons to B2 music screen (when controls are enabled)
+* Draw messages ourselves instead of piling hacks on Layout
+* Make sure all icons are 24x24px: icon sizes affect layout
+* Check/optimize layout for B1, other fonts (scrolling for just 5px is a shame)
+
+## Wishlist:
+* Option to swipe-dismiss (instead of action menu)
+* Maybe refactor showGrid() out into a general-use module?
+
+* Message replies (needs `android` support)
+* Customize replies
+* Custom replies (i.e. `textinput`)
+* Hooks to add custom replies/actions, 
+  e.g. external code could add "Send intent" option to Home Assistant messages
+  Maybe just use this for all replies, so we don't hardcode anything in "messages"?
diff --git a/apps/messagelist/app-icon.js b/apps/messagelist/app-icon.js
new file mode 100644
index 000000000..6ed3c1141
--- /dev/null
+++ b/apps/messagelist/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4UA///rkcAYP9ohL/ABMBqoAEoALDioLFqgLDBQoABERIkEBZcFBY9QBed61QAC1oLF7wLD24LF24LD7wLF1vqBQOrvQLFA4IuC9QLFD4IuC1QLGGAQOBBYwgBEwQLHvQBBEZHVq4jI7wWBHY5TLNZaDLTZazLffMBBY9ABZsABY4KCgEVBQtUBYYkGEQYA/AAwA="))
diff --git a/apps/messagelist/app.js b/apps/messagelist/app.js
new file mode 100644
index 000000000..ebd5d4217
--- /dev/null
+++ b/apps/messagelist/app.js
@@ -0,0 +1,1208 @@
+/* MESSAGES is a list of:
+  {id:int,
+    src,
+    title,
+    subject,
+    body,
+    sender,
+    tel:string,
+    new:true // not read yet
+  }
+*/
+
+/* For example for maps:
+
+// a message
+{"t":"add","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"}
+// maps
+{"t":"add","id":1,"src":"Maps","title":"0 yd - High St","body":"Campton - 11:48 ETA","img":"GhqBAAAMAAAHgAAD8AAB/gAA/8AAf/gAP/8AH//gD/98B//Pg/4B8f8Afv+PP//n3/f5//j+f/wfn/4D5/8Aef+AD//AAf/gAD/wAAf4AAD8AAAeAAADAAA="}
+// call
+{"t":"add","id":"call","src":"Phone","name":"Bob","number":"12421312",positive:true,negative:true}
+*/
+{
+  const B2 = process.env.HWVERSION>1, // Bangle.js 2?
+    RIGHT = 1, LEFT = -1, // swipe directions
+    UP = -1, DOWN = 1;    // updown directions
+  const Layout = require("Layout");
+
+  const settings = () => require("messagegui").settings();
+  const fontTiny = "6x8"; // fixed size, don't use this for important things
+  let fontNormal;
+  // setFont() is also called after we close the settings screen
+  const setFont = function() {
+    const fontSize = settings().fontSize;
+    if (fontSize===0) // small
+      fontNormal = g.getFonts().includes("6x15") ? "6x15" : "6x8:2";
+    else if (fontSize===2) // large
+      fontNormal = g.getFonts().includes("6x15") ? "6x15:2" : "6x8:4";
+    else // medium
+      fontNormal = g.getFonts().includes("12x20") ? "12x20" : "6x8:3";
+  };
+  setFont();
+
+  let active, back; // active screen, last active screen
+
+  /// List of all our messages
+  let MESSAGES;
+  const saveMessages = function() {
+    const noSave = ["alarm", "call", "music"]; // assume these are outdated once we close the app
+    noSave.forEach(id => remove({id: id}));
+    require("messages").write(MESSAGES
+      .filter(m => m.id && !noSave.includes(m.id))
+      .map(m => {
+        delete m.show;
+        return m;
+      })
+    );
+  };
+  const uiRemove = function() {
+    if (musicTimeout) clearTimeout(musicTimeout);
+    layout = undefined;
+    Bangle.removeListener("message", onMessage);
+    saveMessages();
+    clearUnreadStuff();
+    delete Bangle.appRect;
+  };
+  const quitApp = () => load(); // TODO: revert to Bangle.showClock after fixing memory leaks
+  try {
+    MESSAGES = require("messages").getMessages();
+    // Apply fast loaded messages
+    (Bangle.MESSAGES || []).forEach(m => require("messages").apply(m, MESSAGES));
+    delete Bangle.MESSAGES;
+    // Write them back to storage when we're done
+    E.on("kill", saveMessages);
+  } catch(e) {
+    g.reset().clear();
+    E.showPrompt(/*LANG*/"Message file corrupt, erase all messages?", {title:/*LANG*/"Delete All Messages"}).then(isYes => {
+      // We are troubleshooting, so do a clean "load" in both cases (instead of Bangle.load)
+      if (isYes) {    // OK: erase message file and reload this app
+        require("messages").clearAll();
+        load("messagelist.app.js");
+      } else {
+        load(); // well, this app won't work... let's go back to the clock
+      }
+    });
+  }
+
+  const setUI = function(options, cb) {
+    options = Object.assign({remove: () => uiRemove()}, options);
+    Bangle.setUI(options, cb);
+    Bangle.on("message", onMessage);
+  };
+
+  const remove = function(msg) {
+    if (msg.id==="call") call = undefined;
+    else if (msg.id==="map") map = undefined;
+    else if (msg.id==="alarm") alarm = undefined;
+    else if (msg.id==="music") music = undefined;
+    else MESSAGES = MESSAGES.filter(m => m.id!==msg.id);
+  };
+  const buzz = function(msg) {
+    return require("messages").buzz(msg.src);
+  };
+  const show = function(msg) {
+    delete msg.show; // don't show this again
+    if (msg.id==="call") showCall(msg);
+    else if (msg.id==="map") showMap(msg);
+    else if (msg.id==="alarm") showAlarm(msg);
+    else if (msg.id==="music") showMusic(msg);
+    else showMessage(msg);
+  };
+
+  const onMessage = function(type, msg) {
+    if (msg.handled) return;
+    msg.handled = true;
+    switch(type) {
+      case "call":
+        return onCall(msg);
+      case "music":
+        return onMusic(msg);
+      case "map":
+        return onMap(msg);
+      case "alarm":
+        return onAlarm(msg);
+      case "text":
+        return onText(msg);
+      case "clearAll":
+        MESSAGES = [];
+        if (["messages", "menu"].includes(active)) showMenu();
+        break;
+      default:
+        E.showAlert(/*LANG*/"Unknown message type:"+"\n"+type).then(goBack);
+    }
+  };
+  Bangle.on("message", onMessage);
+
+  const onCall = function(msg) {
+    if (msg.t==="remove") {
+      call = undefined;
+      return exitScreen("call");
+    }
+    // incoming call: show it
+    call = msg;
+    buzz(call);
+    showCall();
+  };
+  const onAlarm = function(msg) {
+    if (msg.t==="remove") {
+      alarm = undefined;
+      return exitScreen("alarm");
+    }
+    alarm = msg;
+    buzz(alarm);
+    showAlarm();
+  };
+  let musicTimeout;
+  const onMusic = function(msg) {
+    const hadMusic = !!music;
+    if (musicTimeout) clearTimeout(musicTimeout);
+    musicTimeout = undefined;
+    if (msg.t==="remove") {
+      music = undefined;
+      if (active==="main" && hadMusic) return showMain(); // refresh menu: remove "Music" entry (if not always visible)
+      else return exitScreen("music");
+    }
+
+    music = Object.assign({}, music, msg);
+
+    // auto-close after being paused
+    if (music.state!=="play") musicTimeout = setTimeout(function() {
+      musicTimeout = undefined;
+      if (active==="music" && (!music || music.state!=="play")) quitApp();
+    }, 60*1000); // paused for 1 minute
+    // auto-close after "playing" way beyond song duration (because "stop" messages don't seem to exist)
+    else musicTimeout = setTimeout(function() {
+      musicTimeout = undefined;
+      if (active==="music" && (!music || music.state==="play")) quitApp();
+    }, 2*Math.max(music.dur || 0, 5*60)*1000); // playing: assume ended after twice song duration, or at least 10 minutes
+
+    if (active==="music") showMusic(); // update music screen
+    else if (active==="main" && !hadMusic) {
+      if (settings().openMusic && music.state==="play" && music.track) showMusic();
+      else showMain(); // refresh menu: add "Music" entry
+    }
+  };
+  const onMap = function(msg) {
+    const hadMap = !!map;
+    if (msg.t==="remove") {
+      map = undefined;
+      if (back==="map") back = undefined;
+      if (active==="main" && hadMap) return showMain(); // refresh menu: remove "Map" entry
+      else return exitScreen("map");
+    }
+    map = msg;
+    if (["map", "music"].includes(active)) showMap(); // update map screen, or switch away from music (not other screens)
+    else if (active==="main" && !hadMap) showMain(); // refresh menu: add "Map" entry
+  };
+  const onText = function(msg) {
+    require("messages").apply(msg, MESSAGES);
+    const mIdx = MESSAGES.findIndex(m => m.id===msg.id);
+    if (!MESSAGES[mIdx]) if (back==="messages") back = undefined;
+    if (active==="main") showMain(); // update message count
+    if (MESSAGES.length===0) exitScreen("messages"); // removed last message
+    else if (active==="messages") showMessage(messageNum);
+    if (msg.new) buzz(msg);
+    if (active!=="call") {// don't switch away from incoming call
+      if (active!=="messages" || messageNum===mIdx) showMessage(mIdx);
+    }
+    if (active==="messages") drawFooter(); // update footer with new number of messages
+  };
+
+  const getImage = function(msg, def) {
+    // app icons, provided by `messages` app
+    return require("messageicons").getImage(msg);
+  };
+  const getImageColor = function(msg, def) {
+    // app colors, provided by `messages` app
+    return require("messageicons").getColor(msg, {default: def});
+  };
+  const getIcon = function(icon) {
+    return require("messagegui").getIcon(icon);
+  };
+  const getIconColor = function(icon) {
+    return require("messagegui").getColor(icon);
+  };
+
+  /*
+  * icons should be 24x24px with 1bpp colors and transparancy
+  */
+  const getMessageImage = function(msg) {
+    if (msg.img) return atob(msg.img);
+    if (msg.id==="music") return getIcon("Music");
+    if (msg.id==="back") return getIcon("Back");
+    const s = (msg.src || "").toLowerCase();
+
+    return getImage(s, "notification");
+  };
+
+  const showMap = function() {
+    setActive("map");
+    delete map.new;
+    let m, distance, street, target, eta;
+    m = map.title.match(/(.*) - (.*)/);
+    if (m) {
+      distance = m[1];
+      street = m[2];
+    } else {
+      street = map.title;
+    }
+    m = map.body.match(/(.*) - (.*)/);
+    if (m) {
+      target = m[1];
+      eta = m[2];
+    } else {
+      target = map.body;
+    }
+    let layout = new Layout({
+      type: "v", c: [
+        {type: "txt", font: fontNormal, label: target, bgCol: g.theme.bg2, col: g.theme.fg2, fillx: 1, pad: 2},
+        {
+          type: "h", bgCol: g.theme.bg2, col: g.theme.fg2, fillx: 1, c: [
+            {type: "txt", font: "6x8", label: "Towards"},
+            {type: "txt", font: fontNormal, label: street},
+          ]
+        },
+        {
+          type: "h", fillx: 1, filly: 1, c: [
+            map.img ? {type: "img", src: () => atob(map.img), scale: 2} : {},
+            {
+              type: "v", fillx: 1, c: [
+                {type: "txt", font: fontNormal, label: distance || ""},
+              ]
+            },
+          ]
+        },
+        {type: "txt", font: "6x8:2", label: eta}
+      ]
+    });
+    layout.render();
+    // go back on any input
+    setUI({
+      mode: "custom",
+      back: goBack,
+      btn: b => {
+        if (B2 || b===2) goBack();
+      },
+      swipe: dir => {
+        if (dir===RIGHT) showMain();
+      },
+    });
+  };
+
+  const toggleMusic = function() {
+    const mc = cmd => {
+      if (Bangle.musicControl) Bangle.musicControl(cmd);
+    };
+    if (!music) {
+      music = {state: "play"};
+      mc("play");
+    } else if (music.state==="play") {
+      music.state = "pause";
+      mc("pause");
+    } else {
+      music.state = "play";
+      mc("play");
+    }
+    if (layout && layout.musicIcon) {
+      // musicIcon/musicToggle .src returns icon based on current music.state
+      layout.update(layout.musicIcon);
+      if (layout.musicToggle) layout.update(layout.musicToggle);
+      layout.render();
+    }
+  };
+
+  const doMusic = function(action) {
+    if (!Bangle.musicControl) return;
+    Bangle.buzz(50);
+    if (action==="toggle") toggleMusic();
+    else Bangle.musicControl(action);
+  };
+  const showMusic = function() {
+    if (active!==music) setActive("music");
+    if (!music) music = {track: "<unknown>", artist: "<unknown>", album: "", state: "pause"};
+    delete music.new;
+    const w = Bangle.appRect.w-50; // title/album need to leave room for icon
+    let artist, album;
+    if (music.album && settings().showAlbum) {
+      // max 2 lines for artist/album
+      artist = g.setFont(fontNormal).wrapString(music.artist, w).slice(0, 2).join("\n");
+      album = g.wrapString(music.album, w).slice(0, 2).join("\n");
+    } else {
+      // no album: artist gets 3 lines
+      artist = g.setFont(fontNormal).wrapString(music.artist, w).slice(0, 3).join("\n");
+      album = "";
+    }
+    // place (subtitle) on a new line
+    let track = music.track.replace(/ \(/, "\n(");
+    track = g.wrapString(track, Bangle.appRect.w).slice(0, 5).join("\n");
+    // "unknown" n/c/dur can show up as -1
+    let num, dur;
+    if ("n" in music && music.n>0) {
+      num = "#"+music.n;
+      if ("c" in music && music.c>0) {
+        num += "/"+music.c;
+      }
+      num = {type: "txt", font: fontTiny, bgCol: g.theme.bg, label: num};
+    }
+    if ("dur" in music && music.dur>0) {
+      dur = Math.floor(music.dur/60)+":"+(music.dur%60).toString().padStart(2, "0");
+      dur = {type: "txt", font: fontTiny, bgCol: g.theme.bg, label: dur};
+    }
+    let info;
+    if (num && dur) info = {type: "h", fillx: 1, c: [{fillx: 1}, dur, {fillx: 1}, num, {fillx: 1},]};
+    else if (num) info = num;
+    else if (dur) info = dur;
+    else info = {};
+
+    layout = new Layout({
+      type: "v", c: [
+        {
+          type: "h", fillx: 1, bgCol: g.theme.bg2, col: g.theme.fg2, c: [
+            {
+              id: "musicIcon", type: "img", pad: 10, bgCol: g.theme.bg2, col: g.theme.fg2
+              , src: () => getIcon((music.state==="play") ? "music" : "pause")
+            },
+            {
+              type: "v", fillx: 1, c: [
+                {type: "txt", font: fontNormal, col: g.theme.fg2, bgCol: g.theme.bg2, label: artist, pad: 2, id: "artist"},
+                album ? {type: "txt", font: fontNormal, col: g.theme.fg2, bgCol: g.theme.bg2, label: album, pad: 2, id: "album"} : {},
+              ]
+            }
+          ]
+        },
+        {type: "txt", halign: 0, font: fontNormal, bgCol: g.theme.bg, label: track, fillx: 1, filly: 1, pad: 2, id: "track"},
+        settings().musicButtons ? {
+          type: "h", fillx: 1, c: [
+            B2 ? {} : {width: 4},
+            {
+              type: "btn", id: "previous", cb: () => doMusic("previous")
+              , src: () => getIcon("previous")
+            },
+            {fillx: 1},
+            {
+              type: "btn", id: "musicToggle", cb: () => doMusic("toggle")
+              , src: () => getIcon((music.state==="play") ? "pause" : "play")
+            },
+            {fillx: 1},
+            {
+              type: "btn", id: "next", cb: () => doMusic("next")
+              , src: () => getIcon("next")
+            },
+            B2 ? {} : {width: 4},
+          ]
+        } : {},
+        info,
+      ]
+    });
+    layout.render();
+    let options = {mode: "updown"};
+    // B1 with buttons: left hand side of screen is used for "previous"
+    if (B2 || !settings().musicButtons) options.back = goBack;
+    setUI(options, ud => {
+      if (ud) Bangle.musicControl(ud>0 ? "volumedown" : "volumeup");
+      else {
+        if (B2 || settings().musicButtons) goBack(); // B1 left-hand touch is "previous", so we need a way to go back
+        else doMusic("toggle");
+      }
+    });
+
+    Bangle.swipeHandler = dir => {
+      if (dir!==0) doMusic(dir===RIGHT ? "previous" : "next");
+    };
+    Bangle.on("swipe", Bangle.swipeHandler);
+
+    if (Bangle.touchHandler) Bangle.removeListener("touch", Bangle.touchHandler);
+    if (settings().musicButtons) {
+      // visible buttons
+      // left = previous, middle = toggle, right = next
+      if (B2) Bangle.touchHandler = (_side, xy) => {
+        // accept touches on the whole bottom and pick the closest button
+        if (xy.y<Bangle.appRect.y+Bangle.appRect.h/2) return; // ignore touches top half
+        if (xy.x<Bangle.appRect.w/3) doMusic("previous");
+        else if (xy.x>2*Bangle.appRect.w/3) doMusic("next");
+        else doMusic("toggle");
+      };
+      else Bangle.touchHandler = (side) => {
+        if (side===1) doMusic("previous");
+        if (side===2) doMusic("next");
+        if (side===3) doMusic("toggle");
+      };
+    } else {
+      // no buttons: touch = toggle
+      // B2 setUI sets touchHandler, override that (we only want up/down swipes from the UI)
+      Bangle.touchHandler = (side, e) => {
+        // B1: side 1 (left) = back, B2: only toggle for e outside widget area
+        if ((!B2 && side>1) || (B2 && e.y>Bangle.appRect.y)) doMusic("toggle");
+      };
+    }
+    Bangle.on("touch", Bangle.touchHandler);
+  };
+
+  let layout;
+
+  const clearStuff = function() {
+    delete Bangle.appRect;
+    layout = undefined;
+    setUI();
+    g.reset().clearRect(Bangle.appRect);
+  };
+  const setActive = function(screen, args) {
+    clearStuff();
+    if (active && screen!==active) back = active;
+    if (screen==="messages") messageNum = args;
+    active = screen;
+  };
+  /**
+   * Go back to previous screen, preserving history
+   */
+  const goBack = function() {
+    if (back==="call" && call) showCall();
+    else if (back==="map" && map) showMap();
+    else if (back==="music" && music) showMusic();
+    else if (back==="messages" && MESSAGES.length) showMessage();
+    else if (back) showMain(); // previous screen was "main", or no longer valid
+    else quitApp(); // no previous screen: go back to clock
+  };
+  /**
+   * Leave screen, and make sure goBack() won't take us there anymore;
+   * @param {string} screen
+   */
+  const exitScreen = function(screen) {
+    if (back===screen) back = (active==="main") ? undefined : "main";
+    if (active===screen) {
+      active = undefined;
+      goBack();
+    }
+  };
+  const showMain = function() {
+    setActive("main");
+    let grid = {"": {title:/*LANG*/"Messages", align: 0, back: load}};
+    if (call) grid[/*LANG*/"Incoming Call"] = {icon: "Phone", cb: showCall};
+    if (alarm) grid[/*LANG*/"Alarm"] = {icon: "Alarm", cb: showAlarm};
+    const unread = MESSAGES.filter(m => m.new).length;
+    if (unread) {
+      grid[unread+" "+/*LANG*/"New"] = {icon: "Unread", cb: () => showMessage(MESSAGES.findIndex(m => m.new))};
+      grid[/*LANG*/"All"+` (${MESSAGES.length})`] = {icon: "Notification", cb: showMessage};
+    } else {
+      const allLabel = MESSAGES.length+" "+(MESSAGES.length===1 ?/*LANG*/"Message" :/*LANG*/"Messages");
+      if (MESSAGES.length) grid[allLabel] = {icon: "Notification", cb: showMessage};
+      else grid[/*LANG*/"No Messages"] = {icon: "Neg", cb: load};
+    }
+    if (unread<MESSAGES.length) {
+      grid[/*LANG*/"Dismiss Read"] = {
+        icon: "Trash", cb: () => {
+          E.showPrompt(/*LANG*/"Are you sure?", {title:/*LANG*/"Dismiss Read Messages"}).then(isYes => {
+            if (isYes) {
+              MESSAGES.filter(m => !m.new).forEach(msg => {
+                Bangle.messageResponse(msg, false);
+                remove(msg);
+              });
+            }
+            showMain();
+          });
+        }
+      };
+    }
+    if (map) grid[/*LANG*/"Map"] = {icon: "Map", cb: showMap};
+    if (music || settings().alwaysShowMusic) grid[/*LANG*/"Music"] = {icon: "Music", cb: showMusic};
+    grid[/*LANG*/"settings"] = {icon: "settings", cb: showSettings};
+    showGrid(grid);
+  };
+  const clamp = function(val, min, max) {
+    if (val<min) return min;
+    if (val>max) return max;
+    return val;
+  };
+  /**
+   * Show grid of labeled buttons,
+   *
+   * items:
+   *   {
+   *     cb: callback,
+   *     img: button image,
+   *     icon: icon name, // string, use getIcon(icon) instead of img
+   *     col: icon color, // optional: defaults to getColor(icon)
+   *   }
+   * "" item is options:
+   *   {
+   *     title: string,
+   *     back: callback,
+   *     rows/cols: (optional) fit to this many columns/rows, omit for automatic fit
+   *     align: bottom row alignment if items don't fit perfectly into a grid
+   *            -1: left
+   *             1: right
+   *             0: left, but move final button to the right
+   *             undefined: spread (can be unaligned with rest of grid!)
+   *   }
+   * @param items
+   */
+  const showGrid = function(items) {
+    clearStuff();
+    const options = items[""] || {},
+      back = options.back || items["< Back"];
+    const keys = Object.keys(items).filter(k => k!=="" && k!=="< Back");
+    let cols;
+    if (options.cols) {
+      cols = options.cols;
+    } else if (options.rows) {
+      cols = Math.ceil(keys.length/options.rows);
+    } else {
+      const rows = Math.round(Math.sqrt(keys.length));
+      cols = Math.ceil(keys.length/rows);
+    }
+
+    let l = {type: "v", c: []};
+    if (options.title) {
+      l.c.push({id: "title", type: "txt", label: options.title, font: (B2 ? "12x20" : "6x8:2"), fillx: 1});
+    }
+    const w = Bangle.appRect.w/cols, // set explicit width, because labels can stick out
+      bgs = [g.theme.bgH, g.theme.bg2], // background colors used for buttons
+      newRow = () => ({type: "h", filly: 1, c: []});
+    let row = newRow(),
+      cbs = [[]]; // callbacks for Bangle.js 2 touchHandler below
+    keys.forEach(key => {
+      const item = items[key],
+        label = g.setFont(fontTiny).wrapString(key, w).join("\n");
+      let color = "col" in item ? item.col : getIconColor(item.icon || "Unknown");
+      if (color && bgs.includes(g.setColor(color).getColor())) color = undefined; // make sure button is not invisible
+      row.c.push({
+        type: "v", pad: 2, width: w, c: [
+          {
+            type: "btn",
+            src: item.img || (() => getIcon(item.icon || "Unknown")),
+            col: color,
+            cb: B2
+              ? undefined // We handle B2 touches below
+              : () => setTimeout(item.cb), // prevent MEMORY error from running cb() inside the Layout touchHandler
+          },
+          {height: 2},
+          {type: "txt", label: label, font: fontTiny},
+        ]
+      });
+      if (B2) cbs[cbs.length-1].push(item.cb);
+      if (row.c.length>=cols) {
+        l.c.push(row);
+        row = newRow();
+        if (B2) cbs.push([]);
+      }
+    });
+    if (row.c.length) {
+      if (options.align!==undefined) {
+        const filler = {width: w*(cols-row.c.length)};
+        if (options.align=== -1) row.c.unshift(filler); // left
+        else if (options.align===1) row.c.push(filler); // right
+        else if (options.align===0) row.c.splice(row.c.length-1, 0, filler); // left, but final item on right
+      }
+      l.c.push(row);
+    }
+    layout = new Layout(l, {back: back});
+    layout.render();
+
+    if (B2) {
+      // override touchHandler: no need to hit buttons exactly, just pick the nearest
+      if (Bangle.touchHandler) Bangle.removeListener("touch", Bangle.touchHandler);
+      Bangle.touchHandler = (side, xy) => {
+        if (xy.y<=Bangle.appRect.y) return; // widgetbar: ignore
+        let rows = l.c.length,
+          y = Bangle.appRect.y, h = Bangle.appRect.h;
+        if (options.title) {
+          rows--;
+          y += layout.title.h;
+          h -= layout.title.h;
+        }
+        const r = clamp(Math.floor(rows*(xy.y-y)/h), 0, rows-1); // row (0-indexed)
+        let c; // column (0-indexed)
+        if (r<rows-1) {
+          // regular row
+          c = clamp(Math.floor(cols*(xy.x-Bangle.appRect.x)/Bangle.appRect.w), 0, cols-1);
+        } else {
+          // bottom row: layout depends on align
+          if (options.align=== -1) { // left
+            c = clamp(Math.floor(cols*(xy.x-Bangle.appRect.x)/Bangle.appRect.w), 0, cols-1);
+          } else if (options.align===1) { // right
+            c = clamp(Math.floor(cols*(xy.x-Bangle.appRect.x)/Bangle.appRect.w)+(cols-cbs[r].length), 0, cols-1);
+          } else if (options.align===0) { // left, but with final item on right
+            c = clamp(Math.floor(cols*(xy.x-Bangle.appRect.x)/Bangle.appRect.w), 0, cols-1);
+            if (c===cols-1) c = cbs[r].length-1; // final row=last item
+            else if (c>cbs[r].length-2) return; // gap before final item
+          } else { // spread
+            c = clamp(Math.floor(cbs[r].length*(xy.x-Bangle.appRect.x)/Bangle.appRect.w), 0, cols-1);
+          }
+        }
+        if (r<cbs.length && c<cbs[r].length) {// should always be true
+          Bangle.buzz(50);
+          cbs[r][c]();
+        }
+      };
+      Bangle.on("touch", Bangle.touchHandler);
+    }
+  };
+
+  const showSettings = function() {
+    setActive("settings");
+    eval(require("Storage").read("messagelist.settings.js"))(() => {
+      setFont();
+      showMain();
+    });
+  };
+  const showCall = function() {
+    setActive("call");
+    delete call.new;
+    Bangle.setLocked(false);
+    Bangle.setLCDPower(1);
+
+    const w = g.getWidth()-48,
+      lines = g.setFont(fontNormal).wrapString(call.title, w),
+      title = (lines.length>2) ? lines.slice(0, 2).join("\n")+"..." : lines.join("\n");
+    const respond = function(accept) {
+      Bangle.buzz(50);
+      Bangle.messageResponse(call, accept);
+      remove(call);
+      call = undefined;
+      goBack();
+    };
+    let options = {};
+    if (!B2) {
+      options.btns = [
+        {
+          label:/*LANG*/"accept",
+          cb: () => respond(true),
+        }, {
+          label:/*LANG*/"ignore",
+          cb: goBack,
+        }, {
+          label:/*LANG*/"reject",
+          cb: () => respond(false),
+        }
+      ];
+    }
+
+    layout = new Layout({
+      type: "v", c: [
+        {
+          type: "h", fillx: 1, bgCol: g.theme.bg2, col: g.theme.fg2, c: [
+            {type: "img", pad: 10, src: () => getIcon("phone"), col: getIconColor("phone")},
+            {
+              type: "v", fillx: 1, c: [
+                {type: "txt", font: fontTiny, label: call.src ||/*LANG*/"Incoming Call", bgCol: g.theme.bg2, col: g.theme.fg2, fillx: 1, pad: 2, halign: 1},
+                title ? {type: "txt", font: fontNormal, label: title, bgCol: g.theme.bg2, col: g.theme.fg2, fillx: 1, pad: 2} : {},
+              ]
+            },
+          ]
+        },
+        {type: "txt", font: fontNormal, label: call.body, fillx: 1, filly: 1, pad: 2, wrap: true},
+        {
+          type: "h", fillx: 1, c: [
+            // button callbacks won't actually be used: setUI below overrides the touchHandler set by Layout
+            {type: B2 ? "btn" : "img", src: () => getIcon("Neg"), cb: () => respond(false)},
+            {fillx: 1},
+            {type: B2 ? "btn" : "img", src: () => getIcon("Pos"), cb: () => respond(true)},
+          ]
+        }
+      ]
+    }, options);
+    layout.render();
+    setUI({
+      mode: "custom",
+      back: goBack,
+      touch: (side, xy) => {
+        if (B2 && xy.y<Bangle.appRect.y) return;
+        if (side===1) respond(false);
+        if (side===2) respond(true);
+      },
+      btn: b => {
+        if (B2 || b===2) goBack();
+        else if (b===1) respond(true);
+        else respond(false);
+      },
+      swipe: dir => {
+        if (dir===RIGHT) showMain();
+      },
+    });
+  };
+  const showAlarm = function() {
+    // dismissing alarms doesn't seem to work, so this is simple */
+    setActive("alarm");
+    delete alarm.new;
+    Bangle.setLocked(false);
+    Bangle.setLCDPower(1);
+
+    const w = g.getWidth()-48,
+      lines = g.setFont(fontNormal).wrapString(alarm.title, w),
+      title = (lines.length>2) ? lines.slice(0, 2).join("\n")+"..." : lines.join("\n");
+    layout = new Layout({
+      type: "v", c: [
+        {
+          type: "h", fillx: 1, bgCol: g.theme.bg2, col: g.theme.fg2, c: [
+            alarm.body ? {type: "img", pad: 10, src: () => getIcon("alarm"), col: getIconColor("alarm")} : {},
+            {type: "txt", font: fontNormal, label: title ||/*LANG*/"Alarm", bgCol: g.theme.bg2, col: g.theme.fg2, fillx: 1, pad: 2, halign: 1},
+          ]
+        },
+        alarm.body
+          ? {type: "txt", font: fontNormal, label: alarm.body, fillx: 1, filly: 1, pad: 2, wrap: true}
+          : {type: "img", pad: 10, scale: 3, src: () => getIcon("alarm"), col: getIconColor("alarm")},
+      ]
+    });
+    layout.render();
+    setUI({
+      mode: "custom",
+      back: goBack,
+      btn: b => {
+        if (B2 || b===2) goBack();
+      },
+      swipe: dir => {
+        if (dir===RIGHT) showMain();
+      },
+    });
+  };
+  /**
+   * Send message response, and delete it from list
+   * @param {string|boolean} reply Response text, false to dismiss (true to open on phone)
+   */
+  const respondToMessage = function(reply) {
+    const msg = MESSAGES[messageNum];
+    if (msg) {
+      Bangle.messageResponse(msg, reply);
+      if (reply===false) remove(msg);
+    }
+    if (MESSAGES.length<1) goBack(); // no more messages
+    else showMessage((msg && reply===false) ? messageNum : messageNum+1); // show next message
+  };
+  const showMessageActions = function() {
+    let title = MESSAGES[messageNum].title || "";
+    if (g.setFont(fontNormal).stringMetrics(title).width>Bangle.appRect.w-(B2 ? 0 : 20)) {
+      title = g.wrapString("..."+title, Bangle.appRect.w-(B2 ? 0 : 20))[0].substring(3)+"...";
+    }
+    clearStuff();
+    let grid = {
+      "": {
+        title: title ||/*LANG*/"Message",
+        back: () => showMessage(messageNum),
+        cols: 3, // fit all replies on first row, dismiss on bottom
+      }
+    };
+    // Text replies don't work (yet)
+    // grid[/*LANG*/"OK"] = {icon: "Ok", col: "#0f0", cb: () => respondToMessage("\u{1F44D}")}; // "Thumbs up" emoji
+    // grid[/*LANG*/"Nak"] = {icon: "Nak", col: "#f00", cb: () => respondToMessage("\u{1F44E}")}; // "Thumbs down" emoji
+    // grid[/*LANG*/"No Phone"] = {icon: "NoPhone", col: "#f0f", cb: () => respondToMessage("\u{1F4F5}")}; // "No Mobile Phones" emoji
+
+    grid[/*LANG*/"Dismiss"] = {icon: "Trash", col: "#ff0", cb: () => respondToMessage(false)};
+    showGrid(grid);
+  };
+  /**
+   * Show message
+   *
+   * @param {number} [num=0] Message to show
+   * @param {boolean} [bottom=false] Scroll message to bottom right away
+   */
+  let buzzing = false, moving = false, switching = false;
+  let h, fh, offset;
+
+  /**
+   * draw (sticky) footer
+   */
+  const drawFooter = function() {
+    // left hint: swipe from left for main menu
+    g.reset().clearRect(Bangle.appRect.x, Bangle.appRect.y2-fh, Bangle.appRect.x2, Bangle.appRect.y2)
+      .setFont(fontTiny)
+      .setFontAlign(-1, 1) // bottom left
+      .drawString(
+        "\0"+atob("CAiBACBA/EIiAnwA")+ // back
+        "\0"+atob("CAiBAEgkEgkSJEgA"), // >>
+        Bangle.appRect.x+(B2 ? 1 : 28), Bangle.appRect.y2
+      );
+    // center message count+hints: swipe up/down for next/prev message
+    const footer = `  ${messageNum+1}/${MESSAGES.length}  `,
+      fw = g.stringWidth(footer);
+    g.setFontAlign(0, 1); // bottom center
+    if (B2 && messageNum>0 && offset<=0)
+      g.drawString("\0"+atob("CAiBAABBIhRJIhQI"), Bangle.appRect.x+Bangle.appRect.w/2-fw/2, Bangle.appRect.y2); // ^ swipe to prev
+    g.drawString(footer, Bangle.appRect.x+Bangle.appRect.w/2, Bangle.appRect.y2);
+    if (B2 && messageNum<MESSAGES.length-1 && offset>=h-(Bangle.appRect.h-fh))
+      g.drawString("\0"+atob("CAiBABAoRJIoRIIA"), Bangle.appRect.x+Bangle.appRect.w/2+fw/2, Bangle.appRect.y2); // v swipe to next
+    // right hint: swipe from right for message actions
+    g.setFontAlign(1, 1) // bottom right
+      .drawString(
+        "\0"+atob("CAiBABIkSJBIJBIA")+ // <<
+        "\0"+atob("CAiBAP8AAP8AAP8A"), // = ("hamburger menu")
+        Bangle.appRect.x2-(B2 ? 1 : 28), Bangle.appRect.y2
+      );
+  };
+  const showMessage = function(num, bottom) {
+    if (num<0) num = 0;
+    if (!num) num = 0; // no number: show first
+    if (num>=MESSAGES.length) num = MESSAGES.length-1;
+    setActive("messages", num);
+    if (!MESSAGES.length) {
+      // I /think/ this should never happen...
+      return E.showPrompt(/*LANG*/"No Messages", {
+        title:/*LANG*/"Messages",
+        img: require("heatshrink").decompress(atob("kkk4UBrkc/4AC/tEqtACQkBqtUDg0VqAIGgoZFDYQIIM1sD1QAD4AIBhnqA4WrmAIBhc6BAWs8AIBhXOBAWz0AIC2YIC5wID1gkB1c6BAYFBEQPqBAYXBEQOqBAnDAIQaEnkAngaEEAPDFgo+IKA5iIOhCGIAFb7RqAIGgtUBA0VqobFgNVA")),
+        buttons: {/*LANG*/"Ok": 1}
+      }).then(showMain);
+    }
+    Bangle.setLocked(false);
+    Bangle.setLCDPower(1);
+    // only clear msg.new on user input
+    const msg = MESSAGES[messageNum]; // message
+    fh = 10; // footer height
+    offset = 0;
+    let oldOffset = 0;
+    const move = (dy) => {
+      offset = Math.max(0, Math.min(h-(Bangle.appRect.h-fh), offset+dy)); // clip at message height
+      dy = oldOffset-offset; // real dy
+      // move all elements to new offset
+      const offsetRecurser = function(l) {
+        if (l.y) l.y += dy;
+        if (l.c) l.c.forEach(offsetRecurser);
+      };
+      offsetRecurser(layout.l);
+      oldOffset = offset;
+      draw();
+    };
+    const draw = () => {
+      g.reset()
+        .clearRect(Bangle.appRect.x, Bangle.appRect.y, Bangle.appRect.x2, Bangle.appRect.y2-fh)
+        .setClipRect(Bangle.appRect.x, Bangle.appRect.y, Bangle.appRect.x2, Bangle.appRect.y2-fh);
+      g.reset = () => g.setColor(g.theme.fg).setBgColor(g.theme.bg); // stop Layout resetting ClipRect
+      layout.render();
+      if (layout.button && h>Bangle.appRect.h-fh && offset<h-(Bangle.appRect.h-fh)) {
+        // not yet at bottom: draw button "disabled", i.e. in fg+bg instead of fg2/fgH+bg2/bgH
+        g.theme = Object.assign({}, g.theme); // allow overriding
+        g.theme.fg2 = g.theme.fgH = g.theme.fg;
+        g.theme.bg2 = g.theme.bgH = g.theme.bg;
+        layout.render(layout.button);
+        delete g.theme; // restore original
+      }
+      delete g.reset;
+      // draw scrollbar (simply on top of everything)
+      if (h>(Bangle.appRect.h-fh)) {
+        const sbh = (Bangle.appRect.h-fh)/h*(Bangle.appRect.h-fh), // scrollbar height
+          y1 = Bangle.appRect.y+offset/h*(Bangle.appRect.h-fh), y2 = y1+sbh;
+        g.setColor(g.theme.bg).drawLine(Bangle.appRect.x2, Bangle.appRect.y, Bangle.appRect.x2, Bangle.appRect.y2-fh);
+        g.setColor(g.theme.fg).drawLine(Bangle.appRect.x2, y1, Bangle.appRect.x2, y2);
+      }
+      drawFooter();
+    };
+    const buzzOnce = () => {
+      if (buzzing) return;
+      buzzing = true;
+      Bangle.buzz(50).then(() => setTimeout(() => {buzzing = false;}, 500));
+    };
+
+    layout = getMessageLayout(msg);
+    h = layout.l.h; // message height
+    if (bottom) move(h); // scrolling backwards: jump to bottom of message
+    else draw();
+    const PAGE_SIZE = Bangle.appRect.h-fh;
+    const // shared B1/B2 handlers
+      back = () => {
+        delete msg.new; // we mark messages as read on any input
+        goBack();
+      },
+      swipe = dir => {
+        delete msg.new;
+        if (dir===RIGHT) showMain();
+        else if (dir===LEFT) showMessageActions();
+      },
+      touch = (side, xy) => {
+        delete msg.new;
+        if (h<=Bangle.appRect.h-fh || offset>=h-(Bangle.appRect.h-fh)) { // already at bottom
+          // B2: check for button-press
+          //     setUI overrides Layout listeners, so we need to check for button presses ourselves
+          if (B2 && layout.button) {
+            const b = layout.button;
+            // the button is at the bottom of the screen, so we accept touches all the way down
+            if (xy.x>=b.x && xy.y>=b.y && xy.x<=b.x+b.w /*&& xy.y<=b.y+b.h*/) return b.cb();
+          }
+          if (B2 && xy.y<Bangle.appRect.y) return;
+        }
+
+        // first: pagedown until we reach the bottom
+        if (h>Bangle.appRect.h-fh && offset<h-(Bangle.appRect.h-fh)) return move(+PAGE_SIZE);
+
+        // B1: when scrolled all the way down, treat whole right-side as button
+        if (!B2 && layout.button && side===2) return layout.button.cb();
+
+        // touch anywhere else:
+        switch(settings().onTap) {
+          case 1: // Dismiss
+            return respondToMessage(false);
+          case 2: // Back
+            return goBack();
+          case 3: // Do nothing
+            return;
+          case 0: // Message Menu
+          default:
+            return showMessageActions();
+        }
+      };
+
+    if (B2) { // Bangle.js 2
+      setUI({
+        mode: "custom",
+        back: back,
+        swipe: swipe,
+        drag: e => {
+          delete msg.new;
+          if (!switching) {
+            const dy = -e.dy;
+            if (dy>0) { // up
+              if (h>Bangle.appRect.h-fh && offset<h-(Bangle.appRect.h-fh)) {
+                moving = true; // prevent scrolling right into next message
+                move(dy);
+              } else if (messageNum<MESSAGES.length-1) { // already at bottom: show next
+                if (!moving) { // don't scroll right through to next message
+                  Bangle.buzz(30);
+                  switching = true; // don't process any more drag events until we lift our finger
+                  showMessage(messageNum+1);
+                }
+              } else { // already at bottom of last message
+                buzzOnce();
+              }
+            } else if (dy<0) { // down
+              if (offset>0) {
+                moving = true; // prevent scrolling right into prev message
+                move(dy);
+              } else if (messageNum>0) { // already at top: show prev
+                if (!moving) { // don't scroll right through to previous message
+                  Bangle.buzz(30);
+                  switching = true; // don't process any more drag events until we lift our finger
+                  showMessage(messageNum-1, true);
+                }
+              } else { // already at top of first message
+                buzzOnce();
+              }
+            }
+          }
+          if (!e.b) {
+            // touch end: we can swipe to another message (if we reached the top/bottom) or move the new message
+            moving = false;
+            switching = false;
+          }
+        },
+        touch: touch,
+      });
+    } else { // Bangle.js 1
+      setUI({
+        mode: "updown",
+        back: back,
+      }, dir => {
+        delete msg.new;
+        if (dir===DOWN) {
+          if (h>Bangle.appRect.h-fh && offset<h-(Bangle.appRect.h-fh)) {
+            move(+PAGE_SIZE);
+          } else if (messageNum<MESSAGES.length-1) { // bottom reached: show next
+            Bangle.buzz(30);
+            showMessage(messageNum+1);
+          } else {
+            buzzOnce(); // already at bottom of last message
+          }
+        } else if (dir===UP) {
+          if (offset>0) {
+            move(-PAGE_SIZE);
+          } else if (messageNum>0) { // top reached: show previous
+            Bangle.buzz(30);
+            showMessage(messageNum-1, true);
+          } else {
+            buzzOnce(); // already at top of first message
+          }
+        } else { // button
+          showMessageActions();
+        }
+      });
+      Bangle.swipeHandler = swipe;
+      Bangle.on("swipe", Bangle.swipeHandler);
+      Bangle.touchHandler = touch;
+      Bangle.on("touch", Bangle.touchHandler);
+    } // Bangle.js 1/2
+  };
+  /**
+   * Determine message layout information: size, fonts, and wrapped title/body texts
+   *
+   * @param msg
+   * @returns {{h: number, w: number,
+   *            src: (string),
+   *            title: (string), titleFont: (string),
+   *            body: (string), bodyFont: (string)}}
+   */
+  const getMessageLayoutInfo = function(msg) {
+    // header: [icon][title]
+    //         [ src]
+    //
+    // But: no title? -> use src as title
+    let w, src = msg.src || "",
+      title = msg.title || "",
+      body = msg.body || "",
+      h = 0, // total height
+      th = 0, // title height
+      ih = 46; // icon height: // icon(24) + internal padding(20) + icon<->src spacer(2)
+    if (!title) {
+      title = src;
+      src = "";
+    }
+
+    // top bar
+    if (title) {
+      w = Bangle.appRect.w-59;  // icon(24) + padding:left(5) + padding:btn-txt(5) + internal btn padding(20) + padding:right(5)
+      title = g.setFont(fontNormal).wrapString(title, w).join("\n");
+      th += 2+g.stringMetrics(title).height; // 2px padding
+    }
+    if (src) {
+      w = 59;  // icon(24) + padding:left(5) + padding:btn-txt(5) + internal btn padding(20) + padding:right(5)
+      src = g.setFont(fontTiny).wrapString(src, w).join("\n");
+      ih += g.stringMetrics(src).height;
+    }
+
+    h = Math.max(ih, th); // maximum of icon/title
+
+    // body
+    w = Bangle.appRect.w-4; // padding(2x2)
+    body = g.setFont(fontNormal).wrapString(msg.body, w).join("\n");
+    h += 4+g.stringMetrics(body).height; // padding(2x2)
+
+    if (settings().button) h += 44; // icon(24) + padding(2x2) + internal btn padding(16)
+
+    w = Bangle.appRect.w;
+    // always expand to <full height>-<(10x)footer>
+    h = Math.max(h, Bangle.appRect.h-10);
+
+    return {
+      src: src,
+      title: title,
+      body: body,
+      h: h,
+      w: w,
+    };
+  };
+
+  const getMessageLayout = function(msg) {
+    // Crafted so that on B2, with "medium" font, a message with
+    //   icon + src + 2-line title + 2-line body + button
+    // fits exactly, i.e. no need for scrolling
+    const info = getMessageLayoutInfo(msg);
+    const hCol = msg.new ? g.theme.fgH : g.theme.fg2,
+      hBg = msg.new ? g.theme.bgH : g.theme.bg2;
+
+    // lie to Layout library about available space
+    Bangle.appRect = Object.assign({}, Bangle.appRect,
+      {w: info.w, h: info.h, x2: Bangle.appRect.x+info.w-1, y2: Bangle.appRect.y+info.h-1});
+
+    // make sure icon is not invisible
+    let imageCol = getImageColor(msg);
+    if (g.setColor(imageCol).getColor()==hBg) imageCol = hCol;
+
+    layout = new Layout({
+      type: "v", c: [
+        {
+          type: "h", fillx: 1, bgCol: hBg, col: hCol, c: [
+            {width: 3},
+            {
+              type: "v", c: [
+                {type: "img", /*pad: 2,*/ src: () => getMessageImage(msg), col: imageCol},
+                {height: 2},
+                info.src ? {type: "txt", font: fontTiny, label: info.src, bgCol: hBg, col: hCol} : {},
+              ]
+            },
+            info.title ? {type: "txt", font: fontNormal, label: info.title, bgCol: hBg, col: hCol, fillx: 1, pad: 2} : {},
+            {width: 3},
+          ]
+        },
+        {type: "txt", font: fontNormal, label: info.body, fillx: 1, filly: 1, pad: 2},
+        {filly: 1},
+        settings().button ? {
+          type: "h", c: [
+            B2 ? {} : {fillx: 1}, // Bangle.js 1: touching right side = press button
+            {id: "button", type: "btn", pad: 2, src: () => getIcon("trash"), cb: () => respondToMessage(false)},
+          ]
+        } : {},
+      ]
+    });
+    layout.update();
+    delete Bangle.appRect;
+    return layout;
+  };
+
+  /** this is a timeout if the app has started and is showing a single message
+   but the user hasn't seen it (e.g. no user input) - in which case
+   we should start a timeout for settings().unreadTimeout to return
+   to the clock. */
+  let unreadTimeout;
+  /**
+   * Stop auto-unload timeout and buzzing, remove listeners for this function
+   */
+  const clearUnreadStuff = function() {
+    require("messages").stopBuzz();
+    if (unreadTimeout) clearTimeout(unreadTimeout);
+    unreadTimeout = undefined;
+    ["touch", "drag", "swipe"].forEach(l => Bangle.removeListener(l, clearUnreadStuff));
+    watches.forEach(w => clearWatch(w));
+    watches = [];
+  };
+
+  let messageNum, // currently visible message
+    watches = [], // button watches
+    savedMusic = false; // did we find a stored "music" message when loading?
+// special messages
+  let call, music, map, alarm;
+  /**
+   * Find special messages, and remove them from MESSAGES
+   */
+  const findSpecials = function() {
+    let idx = MESSAGES.findIndex(m => m.id==="call");
+    if (idx>=0) call = MESSAGES.splice(idx, 1)[0];
+    idx = MESSAGES.findIndex(m => m.id==="music");
+    if (idx>=0) {
+      music = MESSAGES.splice(idx, 1)[0];
+      savedMusic = true;
+    }
+    idx = MESSAGES.findIndex(m => m.id==="map");
+    if (idx>=0) map = MESSAGES.splice(idx, 1)[0];
+    idx = MESSAGES.findIndex(m => m.src && m.src.toLowerCase().startsWith("alarm"));
+    if (idx>=0) alarm = MESSAGES.splice(idx, 1)[0];
+  };
+  if (MESSAGES!==undefined) { // only if loading MESSAGES worked
+    g.reset().clear();
+    Bangle.loadWidgets();
+    require("messages").toggleWidget(false);
+    Bangle.drawWidgets();
+    findSpecials(); // sets global vars for special messages
+    // any message we asked to show?
+    const showIdx = MESSAGES.findIndex(m => m.show);
+    // any new text messages?
+    const newIdx = MESSAGES.findIndex(m => m.new);
+
+    // figure out why the app was loaded
+    if (showIdx>=0) show(showIdx);
+    else if (call && call.new) showCall();
+    else if (alarm && alarm.new) showAlarm();
+    else if (map && map.new) showMap();
+    else if (music && music.new && settings().openMusic) {
+      if (settings().alwaysShowMusic===undefined) {
+        // if not explicitly disabled, enable this the first time we see music
+        let s = settings();
+        s.alwaysShowMusic = true;
+        require("Storage").writeJSON("messages.settings.json", s);
+      }
+      showMusic();
+    }
+    // check for new message last: Maybe we already showed it, but timed out before
+    // if that happened, and we're loading for e.g. music now, we want to show the music screen
+    else if (newIdx>=0) {
+      showMessage(newIdx);
+      // auto-loaded for message(s): auto-close after timeout
+      let unreadTimeoutSecs = settings().unreadTimeout;
+      if (unreadTimeoutSecs===undefined) unreadTimeoutSecs = 60;
+      if (unreadTimeoutSecs) {
+        unreadTimeout = setTimeout(load, unreadTimeoutSecs*1000);
+      }
+    } else if (MESSAGES.length) { // not autoloaded, but we have messages to show
+      back = "main"; // prevent "back" from loading clock
+      showMessage();
+    } else showMain();
+
+    // stop buzzing, auto-close timeout on input
+    ["touch", "drag", "swipe"].forEach(l => Bangle.on(l, clearUnreadStuff));
+    (B2 ? [BTN1] : [BTN1, BTN2, BTN3]).forEach(b => watches.push(setWatch(clearUnreadStuff, b, false)));
+  }
+}
\ No newline at end of file
diff --git a/apps/messagelist/app.png b/apps/messagelist/app.png
new file mode 100644
index 000000000..6eae4bb96
Binary files /dev/null and b/apps/messagelist/app.png differ
diff --git a/apps/messagelist/boot.js b/apps/messagelist/boot.js
new file mode 100644
index 000000000..994a2cfed
--- /dev/null
+++ b/apps/messagelist/boot.js
@@ -0,0 +1,3 @@
+(function() {
+  Bangle.on("message", require("messagegui").messageListener);
+})();
\ No newline at end of file
diff --git a/apps/messagelist/lib.js b/apps/messagelist/lib.js
new file mode 100644
index 000000000..33b6d9d69
--- /dev/null
+++ b/apps/messagelist/lib.js
@@ -0,0 +1,246 @@
+// Handle incoming messages while the app is not loaded
+// The messages app overrides Bangle.messageListener
+// (placed in separate file, so we don't read this all at boot time)
+exports.messageListener = function(type, msg) {
+  if (msg.handled || (global.__FILE__ && __FILE__.startsWith("messagelist."))) return; // already handled/app open
+  // clean up, in case previous message didn't load the app after all
+  if (exports.loadTimeout) clearTimeout(exports.loadTimeout);
+  delete exports.loadTimeout;
+  delete exports.buzz;
+  const quiet = () => (require("Storage").readJSON("setting.json", 1) || {}).quiet;
+  /**
+   * Quietly load the app for music/map, if not already loading
+   */
+  function loadQuietly(msg) {
+    if (exports.loadTimeout) return; // already loading
+    exports.loadTimeout = setTimeout(function() {
+      Bangle.load("messagelist.app.js");
+    }, 500);
+  }
+  function loadNormal(msg) {
+    if (exports.loadTimeout) clearTimeout(exports.loadTimeout); // restart timeout
+    exports.loadTimeout = setTimeout(function() {
+      delete exports.loadTimeout;
+      // check there are still new messages (for #1362)
+      let messages = require("messages").getMessages(msg);
+      (Bangle.MESSAGES || []).forEach(m => require("messages").apply(m, messages));
+      if (!messages.some(m => m.new)) return; // don't use `status()`: also load for new music!
+      // if we're in a clock, or it's important, open app
+      if (Bangle.CLOCK || msg.important) {
+        if (exports.buzz) require("messages").buzz(msg.src);
+        Bangle.load("messagelist.app.js");
+      }
+    }, 500);
+  }
+
+  /**
+   * Mark message as handled, and save it for the app
+   */
+  const handled = () => {
+    if (!Bangle.MESSAGES) Bangle.MESSAGES = [];
+    require("messages").apply(msg, Bangle.MESSAGES);
+    if (!Bangle.MESSAGES.length) delete Bangle.MESSAGES;
+    if (msg.t==="remove") require("messages").save(msg);
+    else msg.handled = true;
+  };
+  /**
+   * Write messages to flash after all, when not laoding the app
+   */
+  const saveToFlash = () => {
+    (Bangle.MESSAGES||[]).forEach(m=>require("messages").save(m));
+    delete Bangle.MESSAGES;
+  }
+
+  switch(type) {
+    case "music":
+      if (!Bangle.CLOCK) return;
+      // only load app if we are playing, and we know which song
+      if (msg.state!=="play" || !msg.title) return;
+      if (exports.openMusic===undefined) {
+        // only read settings for first music message
+        exports.openMusic = !!(exports.settings().openMusic);
+      }
+      if (!exports.openMusic) return; // we don't care about music
+      if (quiet()) return;
+      msg.new = true;
+      handled();
+      return loadQuietly();
+
+    case "map":
+      handled();
+      if (msg.t!=="remove" && Bangle.CLOCK) loadQuietly();
+      else saveToFlash();
+      return;
+
+    case "text":
+      handled();
+      if (exports.settings().autoOpen===false) return saveToFlash();
+      if (quiet()) return saveToFlash();
+      if (msg.t!=="add" || !msg.new || !(Bangle.CLOCK || msg.important)) {
+        // not important enough to load the app
+        if (msg.t==="add" && msg.new) require("messages").buzz(msg);
+        return saveToFlash();
+      }
+      if (msg.t==="add" && msg.new) exports.buzz = true;
+      return loadNormal(msg);
+
+    case "alarm":
+      if (quiet()<2) return saveToFlash();
+    // fall through
+    case "call":
+      handled();
+      exports.buzz = true;
+      return loadNormal(msg);
+
+    // case "clearAll": do nothing
+  }
+};
+
+exports.settings = function() {
+  return Object.assign({
+      // Interface //
+      fontSize: 1,
+      onTap: 0, // [Message menu, Dismiss, Back, Nothing]
+      button: true,
+
+      // Behaviour //
+      vibrate: ":",
+      vibrateCalls: ":",
+      vibrateAlarms: ":",
+      repeat: 4,
+      vibrateTimeout: 60,
+      unreadTimeout: 60,
+      autoOpen: true,
+
+      // Music //
+      openMusic: true,
+      // no default: alwaysShowMusic (auto-enabled by app when music happens)
+      showAlbum: true,
+      musicButtons: false,
+
+      // Widget //
+      flash: true,
+      // showRead: false,
+
+      // Utils //
+    },
+    // fall back to default app settings if not set for messagelist
+    (require("Storage").readJSON("messages.settings.json", true) || {}),
+    (require("Storage").readJSON("messagelist.settings.json", true) || {}));
+};
+
+/**
+ * @param {string} icon Icon name
+ * @returns string Icon image string, for use with g.drawImage()
+ */
+exports.getIcon = function(icon) {
+  // TODO: icons should be 24x24px with 1bpp colors
+  switch(icon.toLowerCase()) {
+    // generic icons:
+    case "alert":
+      return atob("GBgBAAAAAP8AA//AD8PwHwD4HBg4ODwcODwccDwOcDwOYDwGYDwGYBgGYBgGcBgOcAAOOBgcODwcHDw4Hxj4D8PwA//AAP8AAAAA");
+    case "alarm":
+    case "alarmclockreceiver":
+      return atob("GBjBAP////8AAAAAAAACAEAHAOAefng5/5wTgcgHAOAOGHAMGDAYGBgYGBgYGBgYGBgYDhgYBxgMATAOAHAHAOADgcAB/4AAfgAAAAAAAAA=");
+    case "back": // TODO: 22x22
+      return atob("FhYBAAAAEAAAwAAHAAA//wH//wf//g///BwB+DAB4EAHwAAPAAA8AADwAAPAAB4AAHgAB+AH/wA/+AD/wAH8AA==");
+    case "calendar":
+      return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
+    case "mail":  // TODO: 28x18
+    case "sms message":
+    case "notification":
+      return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A==");
+    case "map":  // TODO: 25x25,
+      return atob("GRmBAAAAAAAAAAAAAAIAYAHx/wH//+D/+fhz75w/P/4f//8P//uH///D///h3f/w4P+4eO/8PHZ+HJ/nDu//g///wH+HwAYAIAAAAAAAAAAAAAA=");
+    case "menu":
+      return atob("GBiBAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAAAAAAAA==");
+    case "music":  // TODO: 22x22
+      return atob("FhaBAH//+/////////////h/+AH/4Af/gB/+H3/7/f/v9/+/3/7+f/vB/w8H+Dwf4PD/x/////////////3//+A=");
+    case "nak":  // TODO: 22x25
+      return atob("FhmBAA//wH//j//+P//8///7///v//+///7//////////////v//////////z//+D8AAPwAAfgAB+AAD4AAPgAAeAAB4AAHAAA==");
+    case "neg":  // TODO: 22x22
+      return atob("FhaBADAAMeAB78AP/4B/fwP4/h/B/P4D//AH/4AP/AAf4AB/gAP/AB/+AP/8B/P4P4fx/A/v4B//AD94AHjAAMA=");
+    case "next":
+      return atob("GBiBAAAAAAAAAAAAAAwAcB8A+B+A+B/g+B/4+B/8+B//+B//+B//+B//+B//+B//+B/8+B/4+B/g+B+A+B8A+AwAcAAAAAAAAAAAAA==");
+    case "nophone":  // TODO: 30x30
+      return atob("Hh6BAAAAAAGAAAAHAAAADgAAABwADwA4Af8AcA/8AOB/+AHH/+ADv/8AB//wAA/HAAAeAAACOAAADHAAAHjgAAPhwAAfg4AAfgcAAfwOAA/wHAA/wDgA/gBwA/gA4AfAAcAfAAOAGAAHAAAADgAAABgAAAAA");
+    case "ok":  // TODO: 22x25
+      return atob("FhmBAAHAAAeAAB4AAPgAA+AAH4AAfgAD8AAPwAD//+//////////////7//////////////v//+///7///v//8///gf/+A//wA==");
+    case "pause":
+      return atob("GBiBAAAAAAAAAAAAAAOBwAfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AfD4AOBwAAAAAAAAAAAAA==");
+    case "phone":  // TODO: 23x23
+    case "call":
+      return atob("FxeBABgAAPgAAfAAB/AAD+AAH+AAP8AAP4AAfgAA/AAA+AAA+AAA+AAB+AAB+AAB+OAB//AB//gB//gA//AA/8AAf4AAPAA=");
+    case "play":
+      return atob("GBiBAAAAAAAAAAAAAAcAAA+AAA/gAA/4AA/8AA//AA//wA//4A//8A//8A//4A//wA//AA/8AA/4AA/gAA+AAAcAAAAAAAAAAAAAAA==");
+    case "pos":  // TODO: 25x20
+      return atob("GRSBAAAAAYAAAcAAAeAAAfAAAfAAAfAAAfAAAfAAAfBgAfA4AfAeAfAPgfAD4fAA+fAAP/AAD/AAA/AAAPAAADAAAA==");
+    case "previous":
+      return atob("GBiBAAAAAAAAAAAAAA4AMB8A+B8B+B8H+B8f+B8/+B//+B//+B//+B//+B//+B//+B8/+B8f+B8H+B8B+B8A+A4AMAAAAAAAAAAAAA==");
+    case "settings":  // TODO: 20x20
+      return atob("FBSBAAAAAA8AAPABzzgf/4H/+A//APnwfw/n4H5+B+fw/g+fAP/wH/+B//gc84APAADwAAAA");
+    case "to do":
+      return atob("GBgBAAAAAAAAAAAwAAB4AAD8AAH+AAP/DAf/Hg//Px/+f7/8///4///wf//gP//AH/+AD/8AB/4AA/wAAfgAAPAAAGAAAAAAAAAA");
+    case "trash":
+      return atob("GBiBAAAAAAAAAAB+AA//8A//8AYAYAYAYAZmYAZmYAZmYAZmYAZmYAZmYAZmYAZmYAZmYAZmYAZmYAYAYAYAYAf/4AP/wAAAAAAAAA==");
+    case "unknown":  // TODO: 30x30
+      return atob("Hh6BAAAAAAAAAAAAAAAAAAPwAAA/8AAB/+AAD//AAD4fAAHwPgAHwPgAAAPgAAAfAAAA/AAAD+AAAH8AAAHwAAAPgAAAPgAAAPgAAAAAAAAAAAAAAAAAAHAAAAPgAAAPgAAAPgAAAHAAAAAAAAAAAAAAAAAA");
+    case "unread":  // TODO: 29x24
+      return atob("HRiBAAAAH4AAAf4AAB/4AAHz4AAfn4AA/Pz/5+fj/z8/j/n5/j/P//j/Pn3j+PPPx+P8fx+Pw/x+AF/B4A78RiP3xwOPvHw+Pcf/+Ox//+NH//+If//+B///+A==");
+    default: //should never happen
+      return exports.getIcon("unknown");
+  }
+};
+/**
+ * @param {string} icon Icon
+ * @returns {string} Color to use with g.setColor()
+ */
+exports.getColor = function(icon) {
+  switch(icon.toLowerCase()) {
+    // generic colors, using B2-safe colors
+    case "alert":
+      return "#ff0";
+    case "alarm":
+      return "#fff";
+    case "calendar":
+      return "#f00";
+    case "mail":
+      return "#ff0";
+    case "map":
+      return "#f0f";
+    case "music":
+      return "#f0f";
+    case "neg":
+      return "#f00";
+    case "notification":
+      return "#0ff";
+    case "phone":
+    case "call":
+      return "#0f0";
+    case "settings":
+      return "#000";
+    case "sms message":
+      return "#0ff";
+    case "trash":
+      return "#f00";
+    case "unknown":
+      return g.theme.fg;
+    case "unread":
+      return "#ff0";
+    default:
+      return g.theme.fg;
+  }
+};
+
+/**
+ * Launch GUI app with given message
+ * @param {object} msg
+ */
+exports.open = function(msg) {
+  if (msg && msg.id && !msg.show) {
+    // store which message to load
+    msg.show = 1;
+  }
+
+  Bangle.load((msg && msg.new && msg.id!=="music") ? "messagelist.new.js" : "messagelist.app.js");
+};
diff --git a/apps/messagelist/metadata.json b/apps/messagelist/metadata.json
new file mode 100644
index 000000000..7947e2db4
--- /dev/null
+++ b/apps/messagelist/metadata.json
@@ -0,0 +1,28 @@
+{
+  "id": "messagelist",
+  "name": "Message List",
+  "version": "0.01",
+  "description": "Display notifications from iOS and Gadgetbridge/Android as a list",
+  "icon": "app.png",
+  "type": "app",
+  "tags": "tool,system",
+  "screenshots": [
+    {"url": "screenshot0.png"},
+    {"url": "screenshot1.png"},
+    {"url": "screenshot2.png"},
+    {"url": "screenshot3.png"}
+  ],
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "dependencies" : { "messageicons":"module" },
+  "provides_modules": ["messagegui"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"messagelist.boot.js","url":"boot.js"},
+    {"name":"messagegui","url":"lib.js"},
+    {"name":"messagelist.app.js","url":"app.js"},
+    {"name":"messagelist.settings.js","url":"settings.js"},
+    {"name":"messagelist.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"messagelist.settings.json"}],
+  "sortorder": -9
+}
diff --git a/apps/messagelist/screenshot0.png b/apps/messagelist/screenshot0.png
new file mode 100644
index 000000000..b6f37c053
Binary files /dev/null and b/apps/messagelist/screenshot0.png differ
diff --git a/apps/messagelist/screenshot1.png b/apps/messagelist/screenshot1.png
new file mode 100644
index 000000000..f4d4db9fa
Binary files /dev/null and b/apps/messagelist/screenshot1.png differ
diff --git a/apps/messagelist/screenshot2.png b/apps/messagelist/screenshot2.png
new file mode 100644
index 000000000..67c192a1c
Binary files /dev/null and b/apps/messagelist/screenshot2.png differ
diff --git a/apps/messagelist/screenshot3.png b/apps/messagelist/screenshot3.png
new file mode 100644
index 000000000..02fed81a7
Binary files /dev/null and b/apps/messagelist/screenshot3.png differ
diff --git a/apps/messagelist/settings.js b/apps/messagelist/settings.js
new file mode 100644
index 000000000..cd2767336
--- /dev/null
+++ b/apps/messagelist/settings.js
@@ -0,0 +1,139 @@
+(function(back) {
+  let settings = require("messagegui").settings();
+  const inApp = (global.__FILE__ && __FILE__.startsWith("messagelist."));
+
+  function updateSetting(setting, value) {
+    settings[setting] = value;
+    let file;
+    switch(setting) {
+      case "flash":
+      case "showRead":
+      case "iconColorMode":
+      case "maxMessages":
+      case "maxUnreadTimeout":
+      case "openMusic":
+      case "repeat":
+      case "unlockWatch":
+      case "unreadTimeout":
+      case "vibrate":
+      case "vibrateCalls":
+      case "vibrateTimeout":
+        // Default app has this setting: update that file
+        file = "messages";
+        break;
+      default:
+        // write to our own settings file
+        file = "messagelist";
+    }
+    file += ".settings.json";
+    let saved = require("Storage").readJSON(file, true) || {};
+    saved[setting] = value;
+    require("Storage").writeJSON(file, saved);
+  }
+
+  function toggler(setting) {
+    return {
+      value: !!settings[setting],
+      onchange: v => updateSetting(setting, v)
+    };
+  }
+
+  function showIfMenu() {
+    const tapOptions = [/*LANG*/"Message menu",/*LANG*/"Dismiss",/*LANG*/"Back",/*LANG*/"Nothing"];
+    E.showMenu({
+      "": {"title": /*LANG*/"Interface"},
+      "< Back": () => showMainMenu(),
+      /*LANG*/"Font size": {
+        value: 0|settings.fontSize,
+        min: 0, max: 2,
+        format: v => [/*LANG*/"Small",/*LANG*/"Medium",/*LANG*/"Large",/*LANG*/"Huge"][v],
+        onchange: v => updateSetting("fontSize", v)
+      },
+      /*LANG*/"On Tap": {
+        value: settings.onTap,
+        min: 0, max: tapOptions.length-1, wrap: true,
+        format: v => tapOptions[v],
+        onchange: v => updateSetting("onTap", v)
+      },
+      /*LANG*/"Dismiss button": toggler("button"),
+    });
+  }
+
+  function showBMenu() {
+    E.showMenu({
+      "": {"title": /*LANG*/"Behaviour"},
+      "< Back": () => showMainMenu(),
+      /*LANG*/"Vibrate": require("buzz_menu").pattern(settings.vibrate, v => updateSetting("vibrate", v)),
+      /*LANG*/"Vibrate for calls": require("buzz_menu").pattern(settings.vibrateCalls, v => updateSetting("vibrateCalls", v)),
+      /*LANG*/"Vibrate for alarms": require("buzz_menu").pattern(settings.vibrateAlarms, v => updateSetting("vibrateAlarms", v)),
+      /*LANG*/"Repeat": {
+        value: settings.repeat,
+        min: 0, max: 10,
+        format: v => v ? v+"s" :/*LANG*/"Off",
+        onchange: v => updateSetting("repeat", v)
+      },
+      /*LANG*/"Vibrate timer": {
+        value: settings.vibrateTimeout,
+        min: 0, max: 240, step: 10,
+        format: v => v ? v+"s" :/*LANG*/"Forever",
+        onchange: v => updateSetting("vibrateTimeout", v)
+      },
+      /*LANG*/"Unread timer": {
+        value: settings.unreadTimeout,
+        min: 0, max: 240, step: 10,
+        format: v => v ? v+"s" :/*LANG*/"Off",
+        onchange: v => updateSetting("unreadTimeout", v)
+      },
+      /*LANG*/"Auto-open": toggler("autoOpen"),
+    });
+  }
+
+  function showMusicMenu() {
+    E.showMenu({
+      "": {"title": /*LANG*/"Music"},
+      "< Back": () => showMainMenu(),
+      /*LANG*/"Auto-open": toggler("openMusic"),
+      /*LANG*/"Always visible": toggler("alwaysShowMusic"),
+      /*LANG*/"Buttons": toggler("musicButtons"),
+      /*LANG*/"Show album": toggler("showAlbum"),
+    });
+  }
+
+  function showWidMenu() {
+    E.showMenu({
+      "": {"title": /*LANG*/"Widget"},
+      "< Back": () => showMainMenu(),
+      /*LANG*/"Flash icon": toggler("flash"),
+      // /*LANG*/"Show Read": toggler("showRead"),
+    });
+  }
+
+  function showUtilsMenu() {
+    let m = E.showMenu({
+      "": {"title": /*LANG*/"Utilities"},
+      "< Back": () => showMainMenu(),
+      /*LANG*/"Delete all": () => {
+        E.showPrompt(/*LANG*/"Are you sure?",
+          {title:/*LANG*/"Delete All Messages"})
+          .then(isYes => {
+            if (isYes) require("messages").write([]);
+            showUtilsMenu();
+          });
+      }
+    });
+  }
+
+  function showMainMenu() {
+    E.showMenu({
+      "": {"title": inApp ?/*LANG*/"Settings" :/*LANG*/"Messages"},
+      "< Back": back,
+      /*LANG*/"Interface": () => showIfMenu(),
+      /*LANG*/"Behaviour": () => showBMenu(),
+      /*LANG*/"Music": () => showMusicMenu(),
+      /*LANG*/"Widget": () => showWidMenu(),
+      /*LANG*/"Utils": () => showUtilsMenu(),
+    });
+  }
+
+  showMainMenu();
+});
diff --git a/apps/messages/TEST_ME.txt b/apps/messages/TEST_ME.txt
new file mode 100644
index 000000000..8ce50d8b6
--- /dev/null
+++ b/apps/messages/TEST_ME.txt
@@ -0,0 +1,7 @@
+We need automated tests for this. Specifically:
+
+
+* send notification in clock with fast load -> messagesgui appears
+* send notification in clock without fast load -> messagesgui appears
+* send notification and delete notification quick -> messagesgui doesn't load
+* music?
diff --git a/apps/messages/lib.js b/apps/messages/lib.js
index a710c81c4..f301a91cd 100644
--- a/apps/messages/lib.js
+++ b/apps/messages/lib.js
@@ -72,7 +72,7 @@ exports.apply = function(event, messages) {
     messages.splice(mIdx, 1);
   } else if (event.t==="add") {
     if (mIdx>=0) messages.splice(mIdx, 1); // duplicate ID! erase previous version
-    messages.unshift(event);
+    messages.unshift(event); // add at the beginning
   } else if (event.t==="modify") {
     if (mIdx>=0) messages[mIdx] = Object.assign(messages[mIdx], event);
     else messages.unshift(event);
diff --git a/apps/messagesmusic/ChangeLog b/apps/messagesmusic/ChangeLog
index 8cc3079a3..cd1c49b60 100644
--- a/apps/messagesmusic/ChangeLog
+++ b/apps/messagesmusic/ChangeLog
@@ -2,4 +2,5 @@
 0.02: Remove one line of code that didn't do anything other than in some instances hinder the function of the app.
 0.03: Use the new messages library
 0.04: Fix dependency on messages library
-      Fix loading message UI
\ No newline at end of file
+      Fix loading message UI
+0.05: Ensure we don't clear artist info
diff --git a/apps/messagesmusic/app.js b/apps/messagesmusic/app.js
index 26fedecc1..68e88c2d8 100644
--- a/apps/messagesmusic/app.js
+++ b/apps/messagesmusic/app.js
@@ -1 +1,2 @@
-setTimeout(()=>require('messages').openGUI({"t":"add","artist":" ","album":" ","track":" ","dur":0,"c":-1,"n":-1,"id":"music","title":"Music","state":"play","new":true}));
+// don't define artist/etc here so we don't wipe them out of memory if they were stored from before
+setTimeout(()=>require('messages').openGUI({"t":"add","id":"music","state":"show","new":true}));
diff --git a/apps/messagesmusic/metadata.json b/apps/messagesmusic/metadata.json
index 22e0eff52..eef528f55 100644
--- a/apps/messagesmusic/metadata.json
+++ b/apps/messagesmusic/metadata.json
@@ -1,7 +1,8 @@
 {
   "id": "messagesmusic",
   "name":"Messages Music",
-  "version":"0.04",
+  "shortName": "Music",
+  "version":"0.05",
   "description": "Uses Messages library to push a music message which in turn displays Messages app music controls",
   "icon":"app.png",
   "type": "app",
diff --git a/apps/mitherm/ChangeLog b/apps/mitherm/ChangeLog
new file mode 100644
index 000000000..630459c15
--- /dev/null
+++ b/apps/mitherm/ChangeLog
@@ -0,0 +1 @@
+0.01: Create mitherm app with support for pvvx firmware only
diff --git a/apps/mitherm/README.md b/apps/mitherm/README.md
new file mode 100644
index 000000000..cdf3daa61
--- /dev/null
+++ b/apps/mitherm/README.md
@@ -0,0 +1,22 @@
+Reads BLE advertisement data from Xiaomi temperature/humidity sensors running the
+`pvvx` custom firmware (https://github.com/pvvx/ATC_MiThermometer).
+
+## Features
+
+* Display temperature
+* Display humidity
+* Display battery state of sensor
+* Auto-refresh every 5 minutes
+* Manual refresh on demand
+* Add aliases for MAC addresses to easily recognise devices
+
+## Planned features
+
+* Supprt for other advertising formats:
+  * atc1441 format
+  * BTHome
+  * Xiaomi Mijia format
+* Configurable auto-refresh interval
+* Configurable scan length (currently 30s)
+* Alerts when temperature outside defined limits (with a widget or bootcode to
+  work when app is inactive)
diff --git a/apps/mitherm/app-icon.js b/apps/mitherm/app-icon.js
new file mode 100644
index 000000000..2e8737704
--- /dev/null
+++ b/apps/mitherm/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AH4Ac5gWVhnM4AWVAAIYTCwQABCywYRIoYADJJwWHDB4RD5sz7hJPFIlP//0MRxFE6f/AAM9JJgWE4gWCAANMDBZcEn4XE+ZiKFwhcBCYPdDYRiEGAoXDLgf97vfMQwXILggXFMQYXHLgoXB6czMQoXHLgQXJMQQXG4YWEI44ABngXGh4XHF4v/+DAGC6DXGC5BHGC509F4IXTdwIABV4gXOIwIABJAoX/C6p3Xa4a/UABAXfgczABswC/4XmAH4A/ABY"))
diff --git a/apps/mitherm/app.js b/apps/mitherm/app.js
new file mode 100644
index 000000000..b7abdb2fc
--- /dev/null
+++ b/apps/mitherm/app.js
@@ -0,0 +1,172 @@
+var filterTemperature = [{
+  serviceData: {
+    "181a": {}
+  }
+}];
+var results = {};
+var macs = [];
+
+var aliases = require("Storage").readJSON("mitherm.json", true);
+if (!aliases) aliases = {};
+
+var lastSeen = {};
+var current = 0;
+var scanning = false;
+var timeoutDraw;
+var timeoutScan;
+
+
+const scan = function() {
+  if (!scanning) { // Don't start scanning if already doing so.
+    scanning = true;
+    if (timeoutScan) clearTimeout(timeoutScan);
+    timeoutScan = setTimeout(scan, 300000); // Scan again in 5 minutes.
+    drawScanState(scanning);
+    NRF.findDevices(function(devices) {
+      onDevices(devices);
+    }, {
+      filters: filterTemperature,
+      timeout: 30000  // Scan for 30s
+    });
+  }
+};
+
+
+const onDevices = function(devices) {
+  let now = Date.now();
+  for (let i = 0; i < devices.length; i++) {
+    let device = devices[i];
+
+    let processedData = extractData(device.data);
+    console.log({
+      rssi: device.rssi,
+      data: processedData
+    });
+    if (!macs.includes(processedData.MAC)) {
+      macs.push(processedData.MAC);
+    }
+    results[processedData.MAC] = processedData;
+    lastSeen[processedData.MAC] = now;
+  }
+  console.log("Scan complete.");
+  scanning = false;
+  writeOutput();
+};
+
+
+const extractData = function(thedata) {
+  let data = DataView(thedata);
+  let MAC = [];
+  for (let i = 9; i > 3; i--) {
+    MAC.push(data.getUint8(i, true).toString(16).padStart(2, "0"));
+  }
+  out = {
+    size: data.getUint8(0, true),
+    uid: data.getUint8(1, true),
+    UUID: data.getUint16(2, true),
+    MAC: MAC.join(":"),
+    temperature: data.getInt16(10, true) * 0.01,
+    humidity: data.getUint16(12, true) * 0.01,
+    battery_mv: data.getUint16(14, true),
+    battery_level: data.getUint8(16, true),
+  };
+  return out;
+};
+
+
+const writeOutput = function() {
+  let now = Date.now();
+  if (timeoutDraw) clearTimeout(timeoutDraw);
+  timeoutDraw = setTimeout(writeOutput, 60000); // Refresh in 1 minute.
+  g.clear(true);
+  Bangle.drawWidgets();
+  g.reset();
+  drawScanState(scanning);
+
+  if (macs.length == 0) return;
+
+  processedData = results[macs[current]];
+  g.setFont12x20(2);
+  g.drawString(`${processedData.temperature.toFixed(2)}°C`, 10, 30);
+  g.drawString(`${processedData.humidity.toFixed(2)} %`, 10, 70);
+
+  g.setFont6x15();
+  g.drawString(`${((now - lastSeen[macs[current]]) / 60000).toFixed(0)} min ago`, 10, 130);
+  g.drawString(`${processedData.battery_level} % battery`, 80, 130);
+  g.drawString(` ${processedData.MAC in aliases ? aliases[processedData.MAC] : processedData.MAC}: ${current + 1} / ${macs.length}`, 10, 150);
+};
+
+
+const scrollDevices = function(directionLR) {
+  // Swipe left or right to move between devices.
+  current -= directionLR; // inverted feels a more familiar gesture.
+  if (current + 1 > macs.length)
+    current = 0;
+  if (current < 0)
+    current = macs.length - 1;
+  writeOutput();
+};
+
+const drawScanState = function(state) {
+  if (state)
+    g.fillRect(160, 160, 170, 170);
+  else
+    g.clearRect(160, 160, 170, 170);
+};
+
+const setAlias = function(mac, alias) {
+  if (alias === "") {
+    delete aliases[mac];
+  }
+  else {
+    aliases[mac] = alias;
+    require("Storage").writeJSON("mitherm.json", aliases);
+  }
+};
+
+const changeAlias = function(mac) {
+  g.clear();
+  require("textinput").input((mac in aliases) ? aliases[mac] : "").then(function(text) {
+    setAlias(mac, text);
+    setUI();
+    writeOutput();
+  });
+};
+
+
+const setUI = function() {
+  Bangle.setUI({
+    mode: "custom",
+    swipe: scrollDevices,
+    btn: function() {
+      E.showMenu(actionsMenu);
+    }
+  });
+};
+
+
+const actionsMenu = {
+  "": {
+    "title": "-- Actions --",
+    "back": function() {
+      E.showMenu();
+    },
+    "remove": function() {
+      setUI();
+      writeOutput();
+    },
+  },
+  "Scan now": function() {
+    scan();
+    E.showMenu();
+  },
+  "Edit alias": function() {
+    changeAlias(macs[current]);
+  },
+};
+
+setUI();
+Bangle.loadWidgets();
+g.setClipRect(Bangle.appRect);
+scan();
+writeOutput();
diff --git a/apps/mitherm/app.png b/apps/mitherm/app.png
new file mode 100644
index 000000000..81d6bb24f
Binary files /dev/null and b/apps/mitherm/app.png differ
diff --git a/apps/mitherm/metadata.json b/apps/mitherm/metadata.json
new file mode 100644
index 000000000..a8da6fd26
--- /dev/null
+++ b/apps/mitherm/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "mitherm",
+  "name": "Xiaomi Mijia Temperature and Humidity display",
+  "shortName": "MiTherm",
+  "version": "0.01",
+  "description": "Reads and displays data from Xiaomi temperature/humidity sensors running custom firmware",
+  "icon": "app.png",
+  "tags": "xiaomi,mi,ble,bluetooth,thermometer,humidity",
+  "readme": "README.md",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "storage": [
+    {"name":"mitherm.app.js","url":"app.js"},
+    {"name":"mitherm.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
index 6d9d5caee..b24ba9266 100644
--- a/apps/sched/ChangeLog
+++ b/apps/sched/ChangeLog
@@ -1,6 +1,6 @@
 0.01: New App!
 0.02: Fix scheduling of other alarms if there is a pending alarm from the past (fix #1667)
-0.03: Fix `getTimeToAlarm` for a timer already used at same day, don't set `last` for timers. 
+0.03: Fix `getTimeToAlarm` for a timer already used at same day, don't set `last` for timers.
 0.04: Fix `getTimeToAlarm` to check for next dow if alarm.t lower currentTime.
 0.05: Export new functions (`newDefaultAlarm/Timer`), add Settings page
 0.06: Refactor some methods to library
@@ -17,3 +17,5 @@
 0.14: Added clkinfo for alarms and timers
 0.15: Automatic translation of some string in clkinfo
 0.16: Improve support for date timezone
+0.17: Fix midnight in local timezone (alarms wouldn't always fire as expected in timezone != 0)
+0.18: Update clock_info to avoid a redraw
diff --git a/apps/sched/boot.js b/apps/sched/boot.js
index c1bb1fc66..d736dd0e7 100644
--- a/apps/sched/boot.js
+++ b/apps/sched/boot.js
@@ -26,7 +26,7 @@
     If active[0].js is defined, just run that code as-is and not alarm.js */
     Bangle.SCHED = setTimeout(active[0].js||'load("sched.js")',t);
   } else { // check for new alarms at midnight (so day of week works)
-    Bangle.SCHED = setTimeout('eval(require("Storage").read("sched.boot.js"))', 86400000 - (Date.now()%86400000));
+    Bangle.SCHED = setTimeout('eval(require("Storage").read("sched.boot.js"))', 86400000 - currentTime);
   }
 })();
 /* DEBUGGING
diff --git a/apps/sched/clkinfo.js b/apps/sched/clkinfo.js
index 3bd11f70b..439784039 100644
--- a/apps/sched/clkinfo.js
+++ b/apps/sched/clkinfo.js
@@ -63,7 +63,7 @@
         hasRange: true,
         get: () => ({ text: getAlarmText(a), img: getAlarmIcon(a),
           v: getAlarmValue(a), min:0, max:getAlarmMax(a)}),
-        show: function() { alarmItems.items[i].emit("redraw"); },
+        show: function() {},
         hide: function () {},
         run: function() { }
       })),
diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
index 9c1a1d6b0..a99e62089 100644
--- a/apps/sched/metadata.json
+++ b/apps/sched/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.16",
+  "version": "0.18",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",
diff --git a/apps/simplestpp/metadata.json b/apps/simplestpp/metadata.json
index 10f756e32..d808b132b 100644
--- a/apps/simplestpp/metadata.json
+++ b/apps/simplestpp/metadata.json
@@ -1,6 +1,7 @@
 {
   "id": "simplestpp",
   "name": "Simplest++ Clock",
+  "shortName": "Simplest++",
   "version": "0.01",
   "description": "The simplest working clock, with fast load and clock_info, acts as a tutorial piece",
   "readme": "README.md",
diff --git a/apps/slopeclock/ChangeLog b/apps/slopeclock/ChangeLog
index 2eb04a4f0..da82f6355 100644
--- a/apps/slopeclock/ChangeLog
+++ b/apps/slopeclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Reset font to save some memory during remove
 0.03: Added support for locale based time
+0.04: Stability improvements
diff --git a/apps/slopeclock/app.js b/apps/slopeclock/app.js
index cc3dce630..2164e7ede 100644
--- a/apps/slopeclock/app.js
+++ b/apps/slopeclock/app.js
@@ -1,7 +1,12 @@
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+  
+const fontBitmap = E.toString(require('heatshrink').decompress(atob('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')));
+
 Graphics.prototype.setFontPaytoneOne = function(scale) {
   // Actual height 81 (91 - 11)
   this.setFontCustom(
-    E.toString(require('heatshrink').decompress(atob('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'))),
+    fontBitmap,
     46,
     atob("ITZOMzs7SDxHNUdGIQ=="),
     113+(scale<<8)+(1<<16)
@@ -9,8 +14,6 @@ Graphics.prototype.setFontPaytoneOne = function(scale) {
   return this;
 };
 
-{ // must be inside our own scope here so that when we are unloaded everything disappears
-  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
 let drawTimeout;
 
 let g2 = Graphics.createArrayBuffer(g.getWidth(),90,1,{msb:true});
diff --git a/apps/slopeclock/metadata.json b/apps/slopeclock/metadata.json
index 6ee78350f..d9d4d85ca 100644
--- a/apps/slopeclock/metadata.json
+++ b/apps/slopeclock/metadata.json
@@ -1,12 +1,12 @@
 { "id": "slopeclock",
   "name": "Slope Clock",
-  "version":"0.03",
+  "version":"0.04",
   "description": "A clock where hours and minutes are divided by a sloping line. When the minute changes, the numbers slide off the screen",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",
   "tags": "clock",
-  "supports" : ["BANGLEJS2"],  
+  "supports" : ["BANGLEJS2"],
   "storage": [
     {"name":"slopeclock.app.js","url":"app.js"},
     {"name":"slopeclock.img","url":"app-icon.js","evaluate":true}
diff --git a/apps/slopeclockpp/ChangeLog b/apps/slopeclockpp/ChangeLog
index eef1840ea..58299b236 100644
--- a/apps/slopeclockpp/ChangeLog
+++ b/apps/slopeclockpp/ChangeLog
@@ -7,3 +7,5 @@
 0.05: Images in clkinfo are optional now
 0.06: Added support for locale based time
 0.07: README file update as UI interaction was not easy to understand
+0.08: Stability improvements - ensure we continue even if a flat string can't be allocated
+      Stop ClockInfo text drawing outside the allocated area
diff --git a/apps/slopeclockpp/app.js b/apps/slopeclockpp/app.js
index bf719344e..dca4a84e4 100644
--- a/apps/slopeclockpp/app.js
+++ b/apps/slopeclockpp/app.js
@@ -1,14 +1,3 @@
-Graphics.prototype.setFontPaytoneOne = function(scale) {
-  // Actual height 71 (81 - 11)
-  this.setFontCustom(
-    E.toString(require('heatshrink').decompress(atob('AFv4BZU/+ALJh//wALIgP//gYJj//8ALIgf//4YJv//HxMHDAI+JDAJkJDBgLBDBJvBDEZKYDBaVMn6VKY4P+cBfAXZQ9JEoIkKAGcDBZUBPhJkCBZU/DBSJBBZLUBDBLHMBYIYJdgIYJj4YKJAIYJHgQYIe4IYKBYYYHn4YKJAQYIQoIYJJAYYHJAgYHQoQYIJAn//iFIAAP+JBX/wBIJ//AQpAAB8BIK/CFJJAxtMDApIEDAxIFW5gYEJAoYFQooYGBYwYEJAoYFQooYFJAwYEQooYFJA4YEBZAYCQowYEJBAYCQo4YDJBIYCBZUBQo4A5WBKYDOhLWCDJE/cZUPBYT8HgYLDTY4LDGQ7VBEpIkEfw9/EpRJEEox6CJZJuDOI8HBYo+FBYo+FHow+EHoy9FHo3/4B7IK4wYHK4ZWGK4qUC/BCDK4ZWCIoIMDN4o4CIYQYGApAYCIgY3BOAYSBLoYlCRIQ4CR4b+BDAYFFCQoYGFYIYFYIgYHZooYebQhjTPhKVOVwwYFY5gGCcAz5CGQIECDAcHCYQAD/wYGAAhQDHAQYJn4MG4DaFAAiCDRIQAFN4ZeDAAbNEK44LDHw5WDK449EHw49EHww9EHwx7EEo57DEo7rDEo4kGEopJFZIpuEWAwwGPwh6FBgoLJAH4AVSgKRDRoKHFQoazBcIgYaX4oYFCQYYSXAIYKn74DAATeGAAgYEFYIYJFYIYWh4YLBYwYEN4IYJRAIYKN44YDN46bGDBJvHDH4Y0AAwSBBZIrBDH4YhAHF4BZUPLghjG//gAohjEh//4AFCj4YEgISBwAFBgYYFCQqIBAoYSFFQIYEn4+DFQQYF/wREDAgrBJQRiBDAgGB/hiEDBJPBDBJPCDAhvEDoIYELoP4MQgYIMQQYJMQQYIMQQYJBYQYIEgYYHEgYYG4BJDDAyuBEgRxBDAvwSYX3DAwAD/wYHAAfHDBX8DBeHY4xUEDArCCHoQSBDBPgDBX8DAr0DUoQYFVQYVBDAqeETAIYFSQSxCDApwEZQIYFaAoYGHwfgDAw+D/gYHV4Z2DBYZ9D4AYHEoRJBDA4TBGAIYHGQILCDA4A/ABMHBhd+Aws8NwjpBTYiZBcAZ7DBYIFEfILRBbIYFDVoIlDAooYCFYYeFgYxEDAwrBDAbyBY4YYB/AVBBAL9DZoeAFwIYGcwIYQCQQYE+AYDCQSIDCoIYIG4RNBDBRmBDEgIBDBWADBAIDDBAICDBACBZQIYHwACB4APBDAv8RAP+TAIYG+4CB/BNBDAoAGDAoAFDBjgFAAr5FDCyrBAAv+DAZdBAAvgDA3vAYSYBAASGBEAI1D4AMDA4XHN4xwDSYSIFK4Y1DKwY+D8A1DBYYlCFgI9HEoSNDHohLCHAI+CBYpbFPYYAFIQIkGIQiHEAH4ADPgKgEAAkBPZaIBDBLXCEhYYJVpYkCDBAkCDBIkCDBAkCDBAkDDBF/DBQkDDA4kDDBAkDDA4kC34YHgYLB8YYIEgP8OIIkJDYIYGEgXgDBAkB/AYIj5gCDA4kC4AYIEgQYIEgP+DgQYFEgYYIEgIUBDA8HVgawHVgYADIYIYKwAY/DH4Y/DF4AEn//BI4ABgf/+AMJDH4YjAH4AJj/ABRDiB/jzCdgcBdIfgOIIPBAAQLD/wnB/4oDh4MD+AeBDBCgBDAPgDBASBFAIYHwASBDBH4CQQYI4ASBZIYYEI4J0BDBJ8BDBAxBDAKJDJQoYBB4JjIDBSuCDAvwBAJsBDAyCBAQQYH8CFDDBLgDDAzQDDA7QDDBQxBOYQYGGgISBDBD5CDBAIBn4YJ/ybCDBClEDAylEDEZzBVwwACOYKuGAAalBDBKlBDAq3BAARvDDAS3BAASIDDAaSBKwwYCK4hWDDAY+DHogIBG4I9HgFgAQMDSgwAESwR7EAAh7GAAglCEhBCCJIgMGBZQA9j5JKcAKHJaYQMIUATrFAAT4Eb4gABdYjTFGAjsGVYYlJEgv/EhRLGJIjtHBYpxFNwYACfQkDBYpkFT4I+JHow+FBYx9EHox9EPYxXFPYoYFKw6WEDAXh/+DOApWC+E/+AFCN4v8FAJQCOAYSDv4hBRIpECcQISCDAYIBOwJTCIgIYFwEfNgI0BDAv4P4IYV+AIBDBIICDBZjBDCwIBR4IYIwBdCDA/8cwQYI+AkBY4YYEcA4SBfgrgF/AYLwAYERgIYJUoIACCoPAewIAC4ALCMAoABcwIYKN4YVBFYJWHgAVB8BBBKwyJDLQJWFRIXgK4Y9ECoIrBHwY9DOALACHo8AniADPYoAESwR7DAAokHAAaNCBZAMBBZQA5PAKoENYyDJXQYYQjgYKg4FEDAsDAogYGAowSEZIIYJfYLIEDAjuCwAYHagP//AYIBYIYJv4LBcQgYDHgIAB4AYGHgRdFAoQ8CAAJdDDAYLDOAgYCHgQABOAYYCHgYYHBwIADOAYJB8YLEOAgYBBYoYFAApjFAAzHFAAqIDDA7TEDAzGEDAw8EDA4LEDAw8EDAy4DDA48FDAr2EDA4LGDAiqDDA48GDAiFEDAw8HDAaFFDAw8HDAY8HDAY8IDAQ8IAH4AFv5nJgE/QBMAg6ZKgKBLEgIlGEIICCRwwhBFoN/WY4IB+DxDZA/Bfo5GC/0fco5GC+YLCHwhGC/+/AYXAdooAEDAhGDAAZXDHoQAESwhGDAAZXDgYLGOAhWCDBBWDDBCdCDB2DRIt//gzC8BpB/BvEwALBBAIrBDAYqBE4RdCDArVDLoQYE8ByCwCPBDAiOBCgIIBR4IYFUgXADBAUBYgIYHawQYJJoIcDMYoYCGoRjGOAZjGCIKJCPg/AUQWADA3/z4CB/goBDAoAD+LHGfMa4CDBJUCAAicBDBKYBAASbBDBJwC/5BDZQJwF+YYD4BXF/xBDRAY+D4IYDRAY+C/CZDN4Y+DQAZWEEoXAM4Y9EUYIGBHwRWEFAyUEDYp7GAAglBEhJLBJIoyGBZQA/MBDPEPI7DFfQy3FAAUBaAkBUQrdCGQSKFewYlBv41EEgQlCj//wBJFAAPwaoJbEbgTqCCIJOEHoQVBgbhFHoYuBGIJXDHoYVBAoLuECQJXDDAorBDAZvBOAhWDCoI3BOAYYEFwIYFKwYYBNIIYDN4gYBCQKJDAoPwAQIYCRIY3BMAgYFPIQPBDBA3Bv4YIBAIVBDBCCBn4YKOYIYY4ASBDBCuDDCn4cwR8FDAWAZoIYFAoM/+C0CY4b2CBIIFCY4xgB8DyCcAv+g/8j7jCcA7jEfI78DBYRTBAAp/BAAQ4CAAnABYR2CAAhvDgBFCAAgLDNQQAEN4aJCKxJXHHoZXHHog+HBYg+GPYY+HPYh9HdYZ9HEgolFEgwlFBYxLENwhxGGAzvET4gZGC5AA/ABl8AYV4BY0fdIU/OQx8BSYIDDUQv+AYokESgQDDcI2AWQTUHHwIDDY43AXwWADAz3Bv4YGCgQYJCgIYDAYIYKOAoYYJRZjOPhKVGDAqqBCgKuHYYKqBDgLHGHQPggEPcA8/NYU/HoolCIQQkGAEIA=='))),
-    46,
-    atob("HTBFLTQ0PzU/Lz8+HQ=="),
-    100+(scale<<8)+(1<<16)
-  );
-  return this;
-};
-
 { // must be inside our own scope here so that when we are unloaded everything disappears
   // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
 
@@ -16,6 +5,17 @@ let settings = Object.assign(
   require("Storage").readJSON("slopeclockpp.default.json", true) || {},
   require("Storage").readJSON("slopeclockpp.json", true) || {}
 );
+const fontBitmap = E.toString(require('heatshrink').decompress(atob('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')));
+
+Graphics.prototype.setFontPaytoneOne = function(scale) {
+  // Actual height 71 (81 - 11)
+  this.setFontCustom(fontBitmap,
+    46,
+    atob("HTBFLTQ0PzU/Lz8+HQ=="),
+    100+(scale<<8)+(1<<16)
+  );
+  return this;
+};
 
 let drawTimeout;
 
@@ -47,6 +47,15 @@ let bgColor = bgColors[(Math.random()*bgColors.length)|0]||"#000";
 
 // Draw the hour, and the minute into an offscreen buffer
 let draw = function() {
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    animate(false, function() {
+      draw();
+    });
+  }, 60000 - (Date.now() % 60000));
+  // Now draw this one
   R = Bangle.appRect;
   x = R.w / 2;
   y = R.y + R.h / 2 - 12; // 12 = room for date
@@ -70,15 +79,6 @@ let draw = function() {
   g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
   // start the animation *in*
   animate(true);
-
-  // queue next draw
-  if (drawTimeout) clearTimeout(drawTimeout);
-  drawTimeout = setTimeout(function() {
-    drawTimeout = undefined;
-    animate(false, function() {
-      draw();
-    });
-  }, 60000 - (Date.now() % 60000));
 };
 
 let isAnimIn = true;
@@ -123,7 +123,9 @@ let animate = function(isIn, callback) {
 // clock info menus (scroll up/down for info)
 let clockInfoDraw = (itm, info, options) => {
   let texty = options.y+41;
-  g.reset().setFont("6x15").setBgColor(options.bg).setColor(options.fg).clearRect(options.x, texty-15, options.x+options.w-2, texty);
+  // set a cliprect to stop us drawing outside our box
+  g.reset().setClipRect(options.x, options.y, options.x+options.w-1, options.y+options.h-1);
+  g.setFont("6x15").setBgColor(options.bg).setColor(options.fg).clearRect(options.x, texty-15, options.x+options.w-2, texty);
 
   if (options.focus) g.setColor(options.hl);
   if (options.x < g.getWidth()/2) { // left align
@@ -135,6 +137,8 @@ let clockInfoDraw = (itm, info, options) => {
     if (info.img) g.clearRect(x-23, options.y, x, options.y+23).drawImage(info.img, x-23, options.y);
     g.setFontAlign(1,1).drawString(info.text, x,texty);
   }
+  // return ClipRect
+  g.setClipRect(0,0,g.getWidth()-1, g.getHeight()-1);
 };
 let clockInfoItems = require("clock_info").load();
 let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:126, y:24, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#f00"/*red*/ });
diff --git a/apps/slopeclockpp/metadata.json b/apps/slopeclockpp/metadata.json
index 3243d389a..fbab02fca 100644
--- a/apps/slopeclockpp/metadata.json
+++ b/apps/slopeclockpp/metadata.json
@@ -1,6 +1,6 @@
 { "id": "slopeclockpp",
   "name": "Slope Clock ++",
-  "version":"0.07",
+  "version":"0.08",
   "description": "A clock where hours and minutes are divided by a sloping line. When the minute changes, the numbers slide off the screen. This is a clone of the original Slope Clock which shows extra information and allows the colors to be selected.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/smpltmr/ChangeLog b/apps/smpltmr/ChangeLog
index 805e8546f..61111482e 100644
--- a/apps/smpltmr/ChangeLog
+++ b/apps/smpltmr/ChangeLog
@@ -2,4 +2,6 @@
 0.02: Rewrite with new interface
 0.03: Added clock infos to expose timer functionality to clocks.
 0.04: Improvements of clock infos.
-0.05: Updated clkinfo icon.
\ No newline at end of file
+0.05: Updated clkinfo icon.
+0.06: Ensure Timer supplies an image for clkinfo items
+0.07: Update clock_info to avoid a redraw
diff --git a/apps/smpltmr/clkinfo.js b/apps/smpltmr/clkinfo.js
index c16e6127e..ac01cfb59 100644
--- a/apps/smpltmr/clkinfo.js
+++ b/apps/smpltmr/clkinfo.js
@@ -69,8 +69,8 @@
     items: [
       {
         name: null,
-        get: () => ({ text: getAlarmMinutesText() + (isAlarmEnabled() ? " min" : ""), img: null}),
-        show: function() { smpltmrItems.items[0].emit("redraw"); },
+        get: () => ({ text: getAlarmMinutesText() + (isAlarmEnabled() ? " min" : ""), img: smpltmrItems.img }),
+        show: function() {},
         hide: function () {},
         run: function() { }
       },
@@ -81,8 +81,8 @@
   offsets.forEach((o, i) => {
     smpltmrItems.items = smpltmrItems.items.concat({
       name: null,
-      get: () => ({ text: (o > 0 ? "+" : "") + o + " min.", img: null}),
-      show: function() { smpltmrItems.items[i+1].emit("redraw"); },
+      get: () => ({ text: (o > 0 ? "+" : "") + o + " min.", img: smpltmrItems.img }),
+      show: function() {},
       hide: function () {},
       run: function() {
         if(o > 0) increaseAlarm(o);
@@ -94,4 +94,4 @@
   });
 
   return smpltmrItems;
-})
\ No newline at end of file
+})
diff --git a/apps/smpltmr/metadata.json b/apps/smpltmr/metadata.json
index 2191902de..b0d1a34da 100644
--- a/apps/smpltmr/metadata.json
+++ b/apps/smpltmr/metadata.json
@@ -2,7 +2,7 @@
   "id": "smpltmr",
   "name": "Simple Timer",
   "shortName": "Simple Timer",
-  "version": "0.05",
+  "version": "0.07",
   "description": "A very simple app to start a timer.",
   "icon": "app.png",
   "tags": "tool,alarm,timer,clkinfo",
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index f1d001c81..4b70d3531 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -19,3 +19,4 @@
 0.20: Added weather condition with temperature to clkinfo.
 0.21: Updated clkinfo icon.
 0.22: Automatic translation of strings, some left untranslated.
+0.23: Update clock_info to avoid a redraw
diff --git a/apps/weather/clkinfo.js b/apps/weather/clkinfo.js
index 3cdd31c59..f40924e06 100644
--- a/apps/weather/clkinfo.js
+++ b/apps/weather/clkinfo.js
@@ -34,14 +34,14 @@
                 name: "conditionWithTemperature",
                 get: () => ({ text: weather.temp, img: weatherIcon(weather.code),
                   v: parseInt(weather.temp), min: -30, max: 55}),
-                show: function() { this.emit("redraw"); },
+                show: function() {},
                 hide: function () {}
             },
             {
                 name: "condition",
                 get: () => ({ text: weather.txt, img: weatherIcon(weather.code),
                   v: weather.code}),
-                show: function() { this.emit("redraw"); },
+                show: function() {},
                 hide: function () {}
             },
             {
@@ -49,7 +49,7 @@
                 hasRange : true,
                 get: () => ({ text: weather.temp, img: atob("GBiBAAA8AAB+AADnAADDAADDAADDAADDAADDAADbAADbAADbAADbAADbAADbAAHbgAGZgAM8wAN+wAN+wAM8wAGZgAHDgAD/AAA8AA=="),
                   v: parseInt(weather.temp), min: -30, max: 55}),
-                show: function() { this.emit("redraw"); },
+                show: function() {},
                 hide: function () {}
             },
             {
@@ -57,7 +57,7 @@
                 hasRange : true,
                 get: () => ({ text: weather.hum, img: atob("GBiBAAAEAAAMAAAOAAAfAAAfAAA/gAA/gAI/gAY/AAcfAA+AQA+A4B/A4D/B8D/h+D/j+H/n/D/n/D/n/B/H/A+H/AAH/AAD+AAA8A=="),
                   v: parseInt(weather.hum), min: 0, max: 100}),
-                show: function() { this.emit("redraw"); },
+                show: function() {},
                 hide: function () {}
             },
             {
@@ -65,7 +65,7 @@
                 hasRange : true,
                 get: () => ({ text: weather.wind, img: atob("GBiBAAHgAAPwAAYYAAwYAAwMfAAY/gAZh3/xg//hgwAAAwAABg///g//+AAAAAAAAP//wH//4AAAMAAAMAAYMAAYMAAMcAAP4AADwA=="),
                   v: parseInt(weather.wind), min: 0, max: 118}),
-                show: function() { this.emit("redraw"); },
+                show: function() {},
                 hide: function () {}
             },
         ]
diff --git a/apps/weather/metadata.json b/apps/weather/metadata.json
index 7fefb7685..77ca37721 100644
--- a/apps/weather/metadata.json
+++ b/apps/weather/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "weather",
   "name": "Weather",
-  "version": "0.22",
+  "version": "0.23",
   "description": "Show Gadgetbridge weather report",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/widclkbttm/ChangeLog b/apps/widclkbttm/ChangeLog
index a7141a7dd..373337378 100644
--- a/apps/widclkbttm/ChangeLog
+++ b/apps/widclkbttm/ChangeLog
@@ -2,5 +2,5 @@
 0.02: Modification for bottom widget area and text color
 0.03: based in widclk v0.05 compatible at same time, bottom area and color
 0.04: refactored to use less memory, and allow turning on/off when quick-switching apps
-0.05: Different font size for bangle.js2 and bangle.js1
+0.05: Remove cyan color, use theme foreground instead
 
diff --git a/apps/widlock/ChangeLog b/apps/widlock/ChangeLog
index 665750150..abceba48e 100644
--- a/apps/widlock/ChangeLog
+++ b/apps/widlock/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Set sortorder to -10 so that others can take -1 etc
 0.06: Set sortorder to -10 in widget code
 0.07: Remove check for .isLocked (extremely old firmwares), speed up widget loading
+0.08: Don't completely remove the lock widget when screen unlocked (use 1px) to ensure appRect/drawWidgets still thinks there are widgets
diff --git a/apps/widlock/metadata.json b/apps/widlock/metadata.json
index db532851a..509a5b7a5 100644
--- a/apps/widlock/metadata.json
+++ b/apps/widlock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widlock",
   "name": "Lock Widget",
-  "version": "0.07",
+  "version": "0.08",
   "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widlock/widget.js b/apps/widlock/widget.js
index abcedde20..b5787e09d 100644
--- a/apps/widlock/widget.js
+++ b/apps/widlock/widget.js
@@ -1,8 +1,8 @@
 Bangle.on("lock", function() {
-  WIDGETS["lock"].width = Bangle.isLocked()?16:0;
+  WIDGETS["lock"].width = Bangle.isLocked()?16:1;
   Bangle.drawWidgets();
 });
-WIDGETS["lock"]={area:"tl",sortorder:10,width:Bangle.isLocked()?16:0,draw:function(w) {
+WIDGETS["lock"]={area:"tl",sortorder:10,width:Bangle.isLocked()?16:1,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/widmessages/ChangeLog b/apps/widmessages/ChangeLog
index 598068920..348d49528 100644
--- a/apps/widmessages/ChangeLog
+++ b/apps/widmessages/ChangeLog
@@ -1,3 +1,5 @@
 0.01: Moved messages widget into standalone widget app
 0.02: Fix 'srcs' being defined in global scope
       Remove library stub
+0.03: Fix messages not showing if UI auto-open is disabled
+0.04: Now shows message icons again (#2416)
diff --git a/apps/widmessages/metadata.json b/apps/widmessages/metadata.json
index a8a23df19..0e399f71f 100644
--- a/apps/widmessages/metadata.json
+++ b/apps/widmessages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widmessages",
   "name": "Message Widget",
-  "version": "0.02",
+  "version": "0.04",
   "description": "Widget showing new messages",
   "icon": "app.png",
   "type": "widget",
diff --git a/apps/widmessages/widget.js b/apps/widmessages/widget.js
index 316957e29..44f525ec8 100644
--- a/apps/widmessages/widget.js
+++ b/apps/widmessages/widget.js
@@ -22,10 +22,9 @@
       let settings = Object.assign({flash: true, maxMessages: 3}, require("Storage").readJSON("messages.settings.json", true) || {});
       if (recall!==true || settings.flash) {
         const msgsShown = E.clip(this.srcs.length, 0, settings.maxMessages);
-          srcs = Object.keys(this.srcs);
         g.reset().clearRect(this.x, this.y, this.x+this.width, this.y+23);
         for(let i = 0; i<msgsShown; i++) {
-          const src = srcs[i];
+          const src = this.srcs[i];
           const colors = [
             g.theme.bg,
             require("messageicons").getColor(src, {settings: settings})
@@ -72,6 +71,6 @@
     }
   };
 
-  Bangle.on("message", WIDGETS["messages"].onMsg);
+  Bangle.on("message", WIDGETS["messages"].onMsg.bind(WIDGETS["messages"]));
   WIDGETS["messages"].onMsg("init", {}); // abuse type="init" to prevent Bangle.drawWidgets();
 })();
diff --git a/bin/apploader.js b/bin/apploader.js
index 26c4c1f09..d4a5f828e 100755
--- a/bin/apploader.js
+++ b/bin/apploader.js
@@ -14,7 +14,6 @@ for Noble.
 var SETTINGS = {
   pretokenise : true
 };
-var APPSDIR = __dirname+"/../apps/";
 var noble;
 ["@abandonware/noble", "noble"].forEach(module => {
   if (!noble) try {
@@ -37,36 +36,18 @@ function ERROR(msg) {
   process.exit(1);
 }
 
-//eval(require("fs").readFileSync(__dirname+"../core/js/utils.js"));
-var AppInfo = require("../core/js/appinfo.js");
-global.Const = {
-  /* Are we only putting a single app on a device? If so
-  apps should all be saved as .bootcde and we write info
-  about the current app into app.info */
-  SINGLE_APP_ONLY : false,
-};
 var deviceId = "BANGLEJS2";
-var apps = [];
-var dirs = require("fs").readdirSync(APPSDIR, {withFileTypes: true});
-dirs.forEach(dir => {
-  var appsFile;
-  if (dir.name.startsWith("_example") || !dir.isDirectory())
-    return;
-  try {
-    appsFile = require("fs").readFileSync(APPSDIR+dir.name+"/metadata.json").toString();
-  } catch (e) {
-    ERROR(dir.name+"/metadata.json does not exist");
-    return;
-  }
-  apps.push(JSON.parse(appsFile));
-});
 
+var apploader = require("./lib/apploader.js");
 var args = process.argv;
 
 var bangleParam = args.findIndex(arg => /-b\d/.test(arg));
 if (bangleParam!==-1) {
   deviceId = "BANGLEJS"+args.splice(bangleParam, 1)[0][2];
 }
+apploader.init({
+  DEVICEID : deviceId
+});
 if (args.length==3 && args[2]=="list") cmdListApps();
 else if (args.length==3 && args[2]=="devices") cmdListDevices();
 else if (args.length==4 && args[2]=="install") cmdInstallApp(args[3]);
@@ -90,7 +71,7 @@ process.exit(0);
 }
 
 function cmdListApps() {
-  console.log(apps.map(a=>a.id).join("\n"));
+  console.log(apploader.apps.map(a=>a.id).join("\n"));
 }
 function cmdListDevices() {
   var foundDevices = [];
@@ -113,19 +94,10 @@ function cmdListDevices() {
 }
 
 function cmdInstallApp(appId, deviceAddress) {
-  var app = apps.find(a=>a.id==appId);
+  var app = apploader.apps.find(a=>a.id==appId);
   if (!app) ERROR(`App ${JSON.stringify(appId)} not found`);
   if (app.custom) ERROR(`App ${JSON.stringify(appId)} requires HTML customisation`);
-  return AppInfo.getFiles(app, {
-    fileGetter:function(url) {
-      console.log(__dirname+"/"+url);
-      return Promise.resolve(require("fs").readFileSync(__dirname+"/../"+url).toString("binary"));
-    },
-    settings : SETTINGS,
-    device : { id : deviceId }
-  }).then(files => {
-    //console.log(files);
-    var command = files.map(f=>f.cmd).join("\n")+"\n";
+  return apploader.getAppFilesString(app).then(command => {
     bangleSend(command, deviceAddress).then(() => process.exit(0));
   });
 }
diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
index 1dc5ec073..4535c4a5e 100755
--- a/bin/firmwaremaker.js
+++ b/bin/firmwaremaker.js
@@ -1,17 +1,12 @@
-#!/usr/bin/env nodejs
+#!/usr/bin/env node
 /*
 Mashes together a bunch of different apps to make
 a single firmware JS file which can be uploaded.
 */
-var SETTINGS = {
-  pretokenise : true
-};
-
 var path = require('path');
 var ROOTDIR = path.join(__dirname, '..');
-var APPDIR = ROOTDIR+'/apps';
 var OUTFILE = ROOTDIR+'/firmware.js';
-var DEVICE = "BANGLEJS";
+var DEVICEID = "BANGLEJS";
 var APPS = [ // IDs of apps to install
   "boot","launch","mclock","setting",
   "about","alarm","widbat","widbt","welcome"
@@ -19,53 +14,17 @@ var APPS = [ // IDs of apps to install
 var MINIFY = true;
 
 var fs = require("fs");
-global.Const = {
-  /* Are we only putting a single app on a device? If so
-  apps should all be saved as .bootcde and we write info
-  about the current app into app.info */
-  SINGLE_APP_ONLY : false,
-};
+var apploader = require("./lib/apploader.js");
+apploader.init({
+  DEVICEID : DEVICEID
+});
 
-var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
 var appfiles = [];
 
-function fileGetter(url) {
-  console.log("Loading "+url)
-  if (MINIFY) {
-    /*if (url.endsWith(".js")) {
-      var f = url.slice(0,-3);
-      console.log("MINIFYING "+f);
-      const execSync = require('child_process').execSync;
-      // --config PRETOKENISE=true
-      // --minify
-      code = execSync(`espruino --config SET_TIME_ON_WRITE=false --minify  --board BANGLEJS ${f}.js -o ${f}.min.js`);
-      console.log(code.toString());
-      url = f+".min.js";
-    }*/
-    if (url.endsWith(".json")) {
-      var f = url.slice(0,-5);
-      console.log("MINIFYING JSON "+f);
-      var j = eval("("+fs.readFileSync(url).toString("binary")+")");
-      var code = JSON.stringify(j);
-      //console.log(code);
-      url = f+".min.json";
-      fs.writeFileSync(url, code);
-    }
-  }
-  return Promise.resolve(fs.readFileSync(url).toString("binary"));
-}
-
 Promise.all(APPS.map(appid => {
-  try {
-    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "/metadata.json").toString());
-  } catch (e) {
-    throw new Error(`App ${appid} not found`);
-  }
-  return AppInfo.getFiles(app, {
-    fileGetter : fileGetter,
-    settings : SETTINGS,
-    device : { id : DEVICE }
-  }).then(files => {
+  var app = apploader.apps.find(a => a.id==appid);
+  if (!app) throw new Error(`App ${appid} not found`);
+  return apploader.getAppFiles(app).then(files => {
     appfiles = appfiles.concat(files);
   });
 })).then(() => {
diff --git a/bin/firmwaremaker_c.js b/bin/firmwaremaker_c.js
index 08fc6fe83..54b63d5d9 100755
--- a/bin/firmwaremaker_c.js
+++ b/bin/firmwaremaker_c.js
@@ -7,25 +7,20 @@ to populate Storage initially.
 Bangle.js 1 doesn't really have anough flash space for this,
 but we have enough on v2.
 */
-var SETTINGS = {
-  pretokenise : true
-};
-
-var DEVICE = process.argv[2];
+var DEVICEID = process.argv[2];
 
 var path = require('path');
+var fs = require("fs");
 var ROOTDIR = path.join(__dirname, '..');
-var APPDIR = ROOTDIR+'/apps';
-var MINIFY = true;
 var OUTFILE, APPS;
 
-if (DEVICE=="BANGLEJS") {
+if (DEVICEID=="BANGLEJS") {
   var OUTFILE = path.join(ROOTDIR, '../Espruino/libs/banglejs/banglejs1_storage_default.c');
   var APPS = [ // IDs of apps to install
     "boot","launch","mclock","setting",
     "about","alarm","sched","widbat","widbt","welcome"
   ];
-} else if (DEVICE=="BANGLEJS2") {
+} else if (DEVICEID=="BANGLEJS2") {
   var OUTFILE = path.join(ROOTDIR, '../Espruino/libs/banglejs/banglejs2_storage_default.c');
   var APPS = [ // IDs of apps to install
     "boot","launch","antonclk","setting",
@@ -37,16 +32,12 @@ if (DEVICE=="BANGLEJS") {
   console.log("  bin/firmwaremaker_c.js BANGLEJS2");
   process.exit(1);
 }
-console.log("Device = ",DEVICE);
+console.log("Device = ",DEVICEID);
 
-
-var fs = require("fs");
-global.Const = {
-  /* Are we only putting a single app on a device? If so
-  apps should all be saved as .bootcde and we write info
-  about the current app into app.info */
-  SINGLE_APP_ONLY : false,
-};
+var apploader = require("./lib/apploader.js");
+apploader.init({
+  DEVICEID : DEVICEID
+});
 
 
 function atob(input) {
@@ -84,31 +75,8 @@ function atob(input) {
     return new Uint8Array(output);
   }
 
-var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
 var appfiles = [];
 
-function fileGetter(url) {
-  console.log("Loading "+url)
-  if (MINIFY) {
-    if (url.endsWith(".json")) {
-      var f = url.slice(0,-5);
-      console.log("MINIFYING JSON "+f);
-      var j = eval("("+fs.readFileSync(url).toString("binary")+")");
-      var code = JSON.stringify(j);
-      //console.log(code);
-      url = f+".min.json";
-      fs.writeFileSync(url, code);
-    }
-  }
-  var blob = fs.readFileSync(url);
-  var data;
-  if (url.endsWith(".js") || url.endsWith(".json"))
-    data = blob.toString(); // allow JS/etc to be written in UTF-8
-  else
-    data = blob.toString("binary")
-  return Promise.resolve(data);
-}
-
 // If file should be evaluated, try and do it...
 function evaluateFile(file) {
   var hsStart = 'require("heatshrink").decompress(atob("';
@@ -132,16 +100,9 @@ function evaluateFile(file) {
 }
 
 Promise.all(APPS.map(appid => {
-  try {
-    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "/metadata.json").toString());
-  } catch (e) {
-    throw new Error(`App ${appid} not found`);
-  }
-  return AppInfo.getFiles(app, {
-    fileGetter : fileGetter,
-    settings : SETTINGS,
-    device : { id : DEVICE }
-  }).then(files => {
+  var app = apploader.apps.find(a => a.id==appid);
+  if (!app) throw new Error(`App ${appid} not found`);
+  return apploader.getAppFiles(app).then(files => {
     appfiles = appfiles.concat(files);
   });
 })).then(() => {
diff --git a/bin/lib/apploader.js b/bin/lib/apploader.js
new file mode 100644
index 000000000..6bf74eb7e
--- /dev/null
+++ b/bin/lib/apploader.js
@@ -0,0 +1,82 @@
+/* Node.js library with utilities to handle using the app loader from node.js */
+
+var DEVICEID = "BANGLEJS2";
+var MINIFY = true; // minify JSON?
+var BASE_DIR = __dirname + "/../..";
+var APPSDIR = BASE_DIR+"/apps/";
+
+//eval(require("fs").readFileSync(__dirname+"../core/js/utils.js"));
+var Espruino = require(__dirname + "/../../core/lib/espruinotools.js");
+//eval(require("fs").readFileSync(__dirname + "/../../core/lib/espruinotools.js").toString());
+//eval(require("fs").readFileSync(__dirname + "/../../core/js/utils.js").toString());
+var AppInfo = require(__dirname+"/../../core/js/appinfo.js");
+
+var SETTINGS = {
+  pretokenise : true
+};
+global.Const = {
+  /* Are we only putting a single app on a device? If so
+  apps should all be saved as .bootcde and we write info
+  about the current app into app.info */
+  SINGLE_APP_ONLY : false,
+};
+
+var apps = [];
+
+// call with {DEVICEID:"BANGLEJS/BANGLEJS2"}
+exports.init = function(options) {
+  if (options.DEVICEID)
+    DEVICEID = options.DEVICEID;
+  // Load app metadata
+  var dirs = require("fs").readdirSync(APPSDIR, {withFileTypes: true});
+  dirs.forEach(dir => {
+    var appsFile;
+    if (dir.name.startsWith("_example") || !dir.isDirectory())
+      return;
+    try {
+      appsFile = require("fs").readFileSync(APPSDIR+dir.name+"/metadata.json").toString();
+    } catch (e) {
+      ERROR(dir.name+"/metadata.json does not exist");
+      return;
+    }
+    apps.push(JSON.parse(appsFile));
+  });
+};
+
+exports.AppInfo = AppInfo;
+exports.apps = apps;
+
+// used by getAppFiles
+function fileGetter(url) {
+  url = BASE_DIR+"/"+url;
+  console.log("Loading "+url)
+  var data;
+  if (MINIFY && url.endsWith(".json")) {
+    var f = url.slice(0,-5);
+    console.log("MINIFYING JSON "+f);
+    var j = eval("("+require("fs").readFileSync(url).toString("binary")+")");
+    data = JSON.stringify(j);
+  } else {
+    var blob = require("fs").readFileSync(url);
+    if (url.endsWith(".js") || url.endsWith(".json"))
+      data = blob.toString(); // allow JS/etc to be written in UTF-8
+    else
+      data = blob.toString("binary")
+  }
+  return Promise.resolve(data);
+}
+
+exports.getAppFiles = function(app) {
+  return AppInfo.getFiles(app, {
+    fileGetter:fileGetter,
+    settings : SETTINGS,
+    device : { id : DEVICEID }
+  });
+};
+
+// Get all the files for this app as a string of Storage.write commands
+exports.getAppFilesString = function(app) {
+  return exports.getAppFiles(app).then(files => {
+    return files.map(f=>f.cmd).join("\n")+"\n"
+  })
+};
diff --git a/bin/lib/emulator.js b/bin/lib/emulator.js
new file mode 100644
index 000000000..f7c82ec3c
--- /dev/null
+++ b/bin/lib/emulator.js
@@ -0,0 +1,115 @@
+/* Node.js library with utilities to handle using the emulator from node.js */
+
+var EMULATOR = "banglejs2";
+var DEVICEID = "BANGLEJS2";
+
+var BASE_DIR = __dirname + "/../..";
+var DIR_IDE =  BASE_DIR + "/../EspruinoWebIDE";
+
+/* we factory reset ONCE, get this, then we can use it to reset
+state quickly for each new app */
+var factoryFlashMemory;
+
+// Log of messages from app
+var appLog = "";
+var lastOutputLine = "";
+
+function onConsoleOutput(txt) {
+  appLog += txt + "\n";
+  lastOutputLine = txt;
+}
+
+exports.init = function(options) {
+  if (options.EMULATOR)
+    EMULATOR = options.EMULATOR;
+  if (options.DEVICEID)
+    DEVICEID = options.DEVICEID;
+
+  eval(require("fs").readFileSync(DIR_IDE + "/emu/emulator_"+EMULATOR+".js").toString());
+  eval(require("fs").readFileSync(DIR_IDE + "/emu/emu_"+EMULATOR+".js").toString());
+  eval(require("fs").readFileSync(DIR_IDE + "/emu/common.js").toString()/*.replace('console.log("EMSCRIPTEN:"', '//console.log("EMSCRIPTEN:"')*/);
+
+  jsRXCallback = function() {};
+  jsUpdateGfx = function() {};
+
+  factoryFlashMemory = new Uint8Array(FLASH_SIZE);
+  factoryFlashMemory.fill(255);
+
+  exports.flashMemory = flashMemory;
+  exports.GFX_WIDTH = GFX_WIDTH;
+  exports.GFX_HEIGHT = GFX_HEIGHT;
+  exports.tx = jsTransmitString;
+  exports.idle = jsIdle;
+  exports.stopIdle = jsStopIdle;
+  exports.getGfxContents = jsGetGfxContents;
+
+  return new Promise(resolve => {
+    setTimeout(function() {
+      console.log("Emulator Loaded...");
+      jsInit();
+      jsIdle();
+      console.log("Emulator Factory reset");
+      exports.tx("Bangle.factoryReset()\n");
+      factoryFlashMemory.set(flashMemory);
+      console.log("Emulator Ready!");
+
+      resolve();
+    },0);
+  });
+};
+
+// Factory reset
+exports.factoryReset = function() {
+  exports.flashMemory.set(factoryFlashMemory);
+  exports.tx("reset()\n");
+  appLog="";
+};
+
+// Transmit a string
+exports.tx = function() {}; // placeholder
+exports.idle = function() {}; // placeholder
+exports.stopIdle = function() {}; // placeholder
+exports.getGfxContents = function() {}; // placeholder
+
+exports.flashMemory = undefined; // placeholder
+exports.GFX_WIDTH = undefined; // placeholder
+exports.GFX_HEIGHT = undefined; // placeholder
+
+// Get last line sent to console
+exports.getLastLine = function() {
+  return lastOutputLine;
+};
+
+// Gets the screenshot as RGBA Uint32Array
+exports.getScreenshot = function() {
+  var rgba = new Uint8Array(exports.GFX_WIDTH*exports.GFX_HEIGHT*4);
+  exports.getGfxContents(rgba);
+  var rgba32 = new Uint32Array(rgba.buffer);
+  return rgba32;
+}
+
+// Write the screenshot to a file options={errorIfBlank}
+exports.writeScreenshot = function(imageFn, options) {
+  options = options||{};
+  return new Promise((resolve,reject) => {
+    var rgba32 = exports.getScreenshot();
+
+    if (options.errorIfBlank) {
+      var firstPixel = rgba32[0];
+      var blankImage = rgba32.every(col=>col==firstPixel);
+      if (blankImage) reject("Image is blank");
+    }
+
+    var Jimp = require("jimp");
+    let image = new Jimp(exports.GFX_WIDTH, exports.GFX_HEIGHT, function (err, image) {
+      if (err) throw err;
+      let buffer = image.bitmap.data;
+      buffer.set(new Uint8Array(rgba32.buffer));
+      image.write(imageFn, (err) => {
+        if (err) return reject(err);
+        console.log("Image written as "+imageFn);
+        resolve();
+      });
+    });
+  });
+}
diff --git a/bin/runapptests.js b/bin/runapptests.js
new file mode 100755
index 000000000..8a415b109
--- /dev/null
+++ b/bin/runapptests.js
@@ -0,0 +1,138 @@
+#!/usr/bin/node
+/*
+
+This allows us to test apps using the Bangle.js emulator
+
+IT IS UNFINISHED
+
+It searches for `test.json` in each app's directory and will
+run them in sequence.
+
+TODO:
+
+* more code to test with
+* run tests that we have found and loaded (currently we just use TEST)
+* documentation
+* actual tests
+* detecting 'Uncaught Error'
+* logging of success/fail
+* ...
+
+*/
+
+// A si
+var TEST = {
+  app : "android",
+  tests : [ {
+    load : "messagesgui.app.js",
+    steps : [
+      {t:"gb", "obj":{"t":"notify","id":1234,"src":"Twitter","title":"A Name","body":"message contents"}},
+      {t:"cmd", "js":"X='hello';"},
+      {t:"eval", "js":"X", eq:"hello"}
+    ]
+  }]
+};
+
+var EMULATOR = "banglejs2";
+var DEVICEID = "BANGLEJS2";
+
+var BASE_DIR = __dirname + "/..";
+var APP_DIR = BASE_DIR + "/apps";
+var DIR_IDE =  BASE_DIR + "/../EspruinoWebIDE";
+
+
+if (!require("fs").existsSync(DIR_IDE)) {
+  console.log("You need to:");
+  console.log("  git clone https://github.com/espruino/EspruinoWebIDE");
+  console.log("At the same level as this project");
+  process.exit(1);
+}
+
+var apploader = require(BASE_DIR+"/bin/lib/apploader.js");
+apploader.init({
+  DEVICEID : DEVICEID
+});
+var emu = require(BASE_DIR+"/bin/lib/emulator.js");
+
+// Last set of text received
+var lastTxt;
+
+function ERROR(s) {
+  console.error(s);
+  process.exit(1);
+}
+
+function runTest(test) {
+  var app = apploader.apps.find(a=>a.id==test.app);
+  if (!app) ERROR(`App ${JSON.stringify(test.app)} not found`);
+  if (app.custom) ERROR(`App ${JSON.stringify(appId)} requires HTML customisation`);
+  return apploader.getAppFilesString(app).then(command => {
+    // What about dependencies??
+    test.tests.forEach((subtest,subtestIdx) => {
+      console.log(`==============================`);
+      console.log(`"${test.app}" Test ${subtestIdx}`);
+      console.log(`==============================`);
+      emu.factoryReset();
+      console.log("Sending app "+test.app);
+      emu.tx(command);
+      console.log("Sent app");
+      emu.tx(test.load ? `load(${JSON.stringify(test.load)})\n` : "load()\n");
+      console.log("App Loaded.");
+      var ok = true;
+      subtest.steps.forEach(step => {
+        if (ok) switch(step.t) {
+          case "cmd" : emu.tx(`${step.js}\n`); break;
+          case "gb" : emu.tx(`GB(${JSON.stringify(step.obj)})\n`); break;
+          case "tap" : emu.tx(`Bangle.emit(...)\n`); break;
+          case "eval" :
+            emu.tx(`\x10print(JSON.stringify(${step.js}))\n`);
+            var result = emu.getLastLine();
+            var expected = JSON.stringify(step.eq);
+            console.log("GOT "+result);
+            if (result!=expected) {
+              console.log("EXPECTED "+expected);
+              ok = false;
+            }
+            break;
+            // tap/touch/drag/button press
+            // delay X milliseconds?
+          case "screenshot" :
+            console.log("Compare screenshots");
+            break;
+          default: ERROR("Unknown step type "+step.t);
+        }
+      });
+    });
+    emu.stopIdle();
+  });
+}
+
+
+emu.init({
+  EMULATOR : EMULATOR,
+  DEVICEID : DEVICEID
+}).then(function() {
+  // Emulator is now loaded
+  console.log("Loading tests");
+  var tests = [];
+  apploader.apps.forEach(app => {
+    var testFile = APP_DIR+"/"+app.id+"/test.json";
+    if (!require("fs").existsSync(testFile)) return;
+    var test = JSON.parse(require("fs").readFileSync(testFile).toString());
+    test.app = app.id;
+    tests.push(test);
+  });
+  // Running tests
+  runTest(TEST);
+});
+/*
+  if (erroredApps.length) {
+    erroredApps.forEach(app => {
+      console.log(`::error file=${app.id}::${app.id}`);
+      console.log("::group::Log");
+      app.log.split("\n").forEach(line => console.log(`\u001b[38;2;255;0;0m${line}`));
+      console.log("::endgroup::");
+    });
+    process.exit(1);
+  }
+*/
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
old mode 100644
new mode 100755
index 6537f4389..82b2896b8
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -94,6 +94,7 @@ const INTERNAL_FILES_IN_APP_TYPE = { // list of app types and files they SHOULD
 var KNOWN_WARNINGS = [
 "App gpsrec data file wildcard .gpsrc? does not include app ID",
 "App owmweather data file weather.json is also listed as data file for app weather",
+  "App messagegui storage file messagegui is also listed as storage file for app messagelist",
 ];
 
 function globToRegex(pattern) {
@@ -245,7 +246,7 @@ apps.forEach((app,appIdx) => {
       if (!STORAGE_KEYS.includes(key)) ERROR(`App ${app.id} file ${file.name} has unknown key ${key}`, {file:appDirRelative+file.url});
     }
     // warn if JS icon is the wrong size
-    if (file.name == app.id+".img") {
+    if (file.name == app.id+".img" && file.evaluate) {
         let icon;
         let match = fileContents.match(/^\s*E\.toArrayBuffer\(atob\(\"([^"]*)\"\)\)\s*$/);
         if (match==null) match = fileContents.match(/^\s*atob\(\"([^"]*)\"\)\s*$/);
diff --git a/bin/thumbnailer.js b/bin/thumbnailer.js
index 0895098e9..22cdc27a5 100755
--- a/bin/thumbnailer.js
+++ b/bin/thumbnailer.js
@@ -6,6 +6,10 @@ var DEVICEID = "BANGLEJS2";
 */
 var EMULATOR = "banglejs1";
 var DEVICEID = "BANGLEJS";
+var SCREENSHOT_DIR = __dirname+"/../screenshots/";
+
+var emu = require("./lib/emulator.js");
+var apploader = require("./lib/apploader.js");
 
 var singleAppId;
 
@@ -20,130 +24,66 @@ if (process.argv.length!=3 && process.argv.length!=2) {
 if (process.argv.length==3)
   singleAppId = process.argv[2];
 
-if (!require("fs").existsSync(__dirname + "/../../EspruinoWebIDE")) {
-  console.log("You need to:");
-  console.log("  git clone https://github.com/espruino/EspruinoWebIDE");
-  console.log("At the same level as this project");
-  process.exit(1);
-}
-
-eval(require("fs").readFileSync(__dirname + "/../../EspruinoWebIDE/emu/emulator_"+EMULATOR+".js").toString());
-eval(require("fs").readFileSync(__dirname + "/../../EspruinoWebIDE/emu/emu_"+EMULATOR+".js").toString());
-eval(require("fs").readFileSync(__dirname + "/../../EspruinoWebIDE/emu/common.js").toString());
-
-var SETTINGS = {
-  pretokenise : true
-};
-var Const = {
-};
-module = undefined;
-var Espruino = require(__dirname + "/../core/lib/espruinotools.js");
-//eval(require("fs").readFileSync(__dirname + "/../core/lib/espruinotools.js").toString());
-eval(require("fs").readFileSync(__dirname + "/../core/js/utils.js").toString());
-eval(require("fs").readFileSync(__dirname + "/../core/js/appinfo.js").toString());
-var apps = JSON.parse(require("fs").readFileSync(__dirname+"/../apps.json"));
-
-/* we factory reset ONCE, get this, then we can use it to reset
-state quickly for each new app */
-var factoryFlashMemory = new Uint8Array(FLASH_SIZE);
-// Log of messages from app
-var appLog = "";
 // List of apps that errored
 var erroredApps = [];
 
-jsRXCallback = function() {};
-jsUpdateGfx = function() {};
-
 function ERROR(s) {
   console.error(s);
   process.exit(1);
 }
 
-function onConsoleOutput(txt) {
-  appLog += txt + "\n";
-}
-
 function getThumbnail(appId, imageFn) {
   console.log("Thumbnail for "+appId);
-  var app = apps.find(a=>a.id==appId);
+  var app = apploader.apps.find(a=>a.id==appId);
   if (!app) ERROR(`App ${JSON.stringify(appId)} not found`);
   if (app.custom) ERROR(`App ${JSON.stringify(appId)} requires HTML customisation`);
 
 
-  return new Promise(resolve => {
-    AppInfo.getFiles(app, {
-      fileGetter:function(url) {
-        console.log(__dirname+"/"+url);
-        return Promise.resolve(require("fs").readFileSync(__dirname+"/../"+url).toString("binary"));
-      },
-      settings : SETTINGS,
-      device : { id : DEVICEID }
-      }).then(files => {
-        console.log(`AppInfo returned for ${appId}`);//, files);
-        flashMemory.set(factoryFlashMemory);
-        jsTransmitString("reset()\n");
-        console.log("Uploading...");
-        jsTransmitString("g.clear()\n");
-        var command = files.map(f=>f.cmd).join("\n")+"\n";
-        command += `load("${appId}.app.js")\n`;
-        appLog = "";
-        jsTransmitString(command);
-        console.log("Done.");
-        jsTransmitString("Bangle.setLCDMode();clearInterval();clearTimeout();\n");
-        jsStopIdle();
-
-        var rgba = new Uint8Array(GFX_WIDTH*GFX_HEIGHT*4);
-        jsGetGfxContents(rgba);
-        var rgba32 = new Uint32Array(rgba.buffer);
-        var firstPixel = rgba32[0];
-        var blankImage = rgba32.every(col=>col==firstPixel)
-
-        if (appLog.replace("Uncaught Storage Updated!", "").indexOf("Uncaught")>=0)
-          erroredApps.push( { id : app.id, log : appLog } );
-
-        if (!blankImage) {
-          var Jimp = require("jimp");
-          let image = new Jimp(GFX_WIDTH, GFX_HEIGHT, function (err, image) {
-            if (err) throw err;
-            let buffer = image.bitmap.data;
-            buffer.set(rgba);
-            image.write(imageFn, (err) => {
-              if (err) throw err;
-              console.log("Image written as "+imageFn);
-              resolve(true);
-            });
-          });
-        } else {
-          console.log("Image is empty");
-          resolve(false);
-        }
+  return apploader.getAppFilesString(app).then(command => {
+      console.log(`AppInfo returned for ${appId}`);//, files);
+      emu.factoryReset();
+      console.log("Uploading...");
+      emu.tx("g.clear()\n");
+      command += `load("${appId}.app.js")\n`;
+      appLog = "";
+      emu.tx(command);
+      console.log("Done.");
+      emu.tx("Bangle.setLCDMode();clearInterval();clearTimeout();\n");
+      emu.stopIdle();
 
+      return emu.writeScreenshot(imageFn, { errorIfBlank : true }).then(() => console.log("X")).catch( err => {
+        console.log("Error", err);
       });
     });
 }
 
 var screenshots = [];
 
+apploader.init({
+  EMULATOR : EMULATOR,
+  DEVICEID : DEVICEID
+});
 // wait until loaded...
-setTimeout(function() {
-  console.log("Loaded...");
-  jsInit();
-  jsIdle();
-  console.log("Factory reset");
-  jsTransmitString("Bangle.factoryReset()\n");
-  factoryFlashMemory.set(flashMemory);
-  console.log("Ready!");
-
+emu.init({
+  EMULATOR : EMULATOR,
+  DEVICEID : DEVICEID
+}).then(function() {
   if (singleAppId) {
-    getThumbnail(singleAppId, "screenshots/"+singleAppId+"-"+EMULATOR+".png");
+    console.log("Single Screenshot");
+    getThumbnail(singleAppId, SCREENSHOT_DIR+singleAppId+"-"+EMULATOR+".png");
     return;
   }
 
-  var appList = apps.filter(app => (!app.type || app.type=="clock") && !app.custom);
+  console.log("Screenshot ALL");
+  var appList = apploader.apps.filter(app => (!app.type || app.type=="clock") && !app.custom);
   appList = appList.filter(app => !app.screenshots && app.supports.includes(DEVICEID));
 
   var promise = Promise.resolve();
   appList.forEach(app => {
+    if (!app.supports.includes(DEVICEID)) {
+      console.log(`App ${app.id} isn't designed for ${DEVICEID}`);
+      return;
+    }
     promise = promise.then(() => {
       var imageFile = "screenshots/"+app.id+"-"+EMULATOR+".png";
       return getThumbnail(app.id, imageFile).then(ok => {
diff --git a/core b/core
index 2a89ea64f..376824068 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 2a89ea64f7874b9264572f68836fe8ecd0a6b191
+Subproject commit 376824068d90986c245b46970fd80ccdca44e431
diff --git a/lang/de_DE.json b/lang/de_DE.json
index 84f29a6c2..5ae7e449f 100644
--- a/lang/de_DE.json
+++ b/lang/de_DE.json
@@ -193,7 +193,15 @@
         "cyan": "Cyan",
         "orange": "Orange",
         "purple": "Violett",
-        "grey": "Grau"
+        "grey": "Grau",
+        "New Moon": "Neumond",
+        "Waxing Crescent": "Zunehmender Sichelmond ",
+        "First Quarter": "Zunehmender Halbmond",
+        "Waxing Gibbous": "Zunehmender Mond",
+        "Full Moon": "Vollmond,",
+        "Waning Gibbous": "Abnehmender Mond",
+        "Last Quater": "Abnehmender Halbmond",
+        "Waning Crescent": "Abnehmender Sichelmond"
     },
     "alarm": {
         "//": "App-specific overrides",
diff --git a/loader.js b/loader.js
index c525fd963..a6e51192e 100644
--- a/loader.js
+++ b/loader.js
@@ -49,7 +49,7 @@ function onFoundDeviceInfo(deviceId, deviceVersion) {
   if (deviceId != "BANGLEJS" && deviceId != "BANGLEJS2") {
     showToast(`You're using ${deviceId}, not a Bangle.js. Did you want <a href="https://espruino.com/apps">espruino.com/apps</a> instead?` ,"warning", 20000);
   } else if (versionLess(deviceVersion, RECOMMENDED_VERSION)) {
-    showToast(`You're using an old Bangle.js firmware (${deviceVersion}) and ${RECOMMENDED_VERSION} is available (<a href="http://www.espruino.com/ChangeLog" target="_blank">see changes</a>). You can update ${fwExtraText}<a href="${fwURL}" target="_blank">with the instructions here</a>` ,"warning", 20000);
+    showToast(`You're using an old Bangle.js firmware (${deviceVersion}) and ${RECOMMENDED_VERSION} is available (<a href="https://www.espruino.com/ChangeLog" target="_blank">see changes</a>). You can update ${fwExtraText}<a href="${fwURL}" target="_blank">with the instructions here</a>` ,"warning", 20000);
   }
   // check against features shown?
   filterAppsForDevice(deviceId);
diff --git a/modules/ClockFace.js b/modules/ClockFace.js
index b1b007be9..bf64d418a 100644
--- a/modules/ClockFace.js
+++ b/modules/ClockFace.js
@@ -58,6 +58,7 @@ function ClockFace(options) {
 
 ClockFace.prototype.tick = function() {
   "ram"
+  if (this._removed) return;
   const time = new Date();
   const now = {
     d: `${time.getFullYear()}-${time.getMonth()}-${time.getDate()}`,
@@ -131,6 +132,7 @@ ClockFace.prototype.resume = function() {
   this.tick();
 };
 ClockFace.prototype.remove = function() {
+  this._removed = true;
   if (this._timeout) clearTimeout(this._timeout);
   Bangle.removeListener("lcdPower", this._onLcd);
   if (this._remove) this._remove.apply(this);
diff --git a/modules/clock_info.js b/modules/clock_info.js
index 50968311e..643a9f6f7 100644
--- a/modules/clock_info.js
+++ b/modules/clock_info.js
@@ -61,12 +61,15 @@ if (stepGoal == undefined) {
 
 exports.load = function() {
   // info used for drawing...
-  var hrm = "--";
+  var hrm = 0;
   var alt = "--";
   // callbacks (needed for easy removal of listeners)
   function batteryUpdateHandler() { bangleItems[0].emit("redraw"); }
   function stepUpdateHandler() { bangleItems[1].emit("redraw"); }
-  function hrmUpdateHandler() { bangleItems[2].emit("redraw"); }
+  function hrmUpdateHandler(e) {
+    if (e && e.confidence>60) hrm = Math.round(e.bpm);
+    bangleItems[2].emit("redraw");
+  }
   function altUpdateHandler() {
     Bangle.getPressure().then(data=>{
       if (!data) return;
@@ -99,12 +102,12 @@ exports.load = function() {
     },
     { name : "HRM",
       hasRange : true,
-      get : () => { let v =  Math.round(Bangle.getHealthStatus("last").bpm); return {
-        text : v + " bpm", v : v, min : 40, max : 200,
+      get : () => { return {
+        text : (hrm||"--") + " bpm", v : hrm, min : 40, max : 200,
         img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAADAAADAAAHAAAHjAAHjgAPngH9n/n82/gA+AAA8AAA8AAAcAAAYAAAYAAAAAAAAAAAAAAAAAAAAAA==")
       }},
-      show : function() { Bangle.setHRMPower(1,"clkinfo"); Bangle.on("HRM", hrmUpdateHandler); hrm = Math.round(Bangle.getHealthStatus("last").bpm); hrmUpdateHandler(); },
-      hide : function() { Bangle.setHRMPower(0,"clkinfo"); Bangle.removeListener("HRM", hrmUpdateHandler); hrm = "--"; },
+      show : function() { Bangle.setHRMPower(1,"clkinfo"); Bangle.on("HRM", hrmUpdateHandler); hrm = Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm); hrmUpdateHandler(); },
+      hide : function() { Bangle.setHRMPower(0,"clkinfo"); Bangle.removeListener("HRM", hrmUpdateHandler); hrm = 0; },
     }
   ],
   }];
@@ -236,10 +239,15 @@ exports.addInteractive = function(menu, options) {
     } else if (lr) {
       if (menu.length==1) return; // 1 item - can't move
       oldMenuItem = menu[options.menuA].items[options.menuB];
-      options.menuA += lr;
-      if (options.menuA<0) options.menuA = menu.length-1;
-      if (options.menuA>=menu.length) options.menuA = 0;
-      options.menuB = 0;
+      do {
+        options.menuA += lr;
+        if (options.menuA<0) options.menuA = menu.length-1;
+        if (options.menuA>=menu.length) options.menuA = 0;
+        options.menuB = 0;
+        //get the next one if the menu is empty
+        //can happen for dynamic ones (alarms, events)
+        //in the worst case we come back to 0
+      } while(menu[options.menuA].items.length==0);
     }
     if (oldMenuItem) {
       menuHideItem(oldMenuItem);
diff --git a/modules/graphics_utils.js b/modules/graphics_utils.js
new file mode 100644
index 000000000..5c08188bc
--- /dev/null
+++ b/modules/graphics_utils.js
@@ -0,0 +1,35 @@
+// draw an arc between radii minR and maxR, and between angles minAngle and maxAngle centered at X,Y. All angles are radians.
+exports.fillArc = function(graphics, X, Y, minR, maxR, minAngle, maxAngle, stepAngle) {
+  var step = stepAngle || 0.2;
+  var angle = minAngle;
+  var inside = [];
+  var outside = [];
+  var c, s;
+  while (angle < maxAngle) {
+    c = Math.cos(angle);
+    s = Math.sin(angle);
+    inside.push(X+c*minR); // x
+    inside.push(Y+s*minR); // y
+    // outside coordinates are built up in reverse order
+    outside.unshift(Y+s*maxR); // y
+    outside.unshift(X+c*maxR); // x
+    angle += step;
+  }
+  c = Math.cos(maxAngle);
+  s = Math.sin(maxAngle);
+  inside.push(X+c*minR);
+  inside.push(Y+s*minR);
+  outside.unshift(Y+s*maxR);
+  outside.unshift(X+c*maxR);
+
+  var vertices = inside.concat(outside);
+  graphics.fillPoly(vertices, true);
+}
+
+exports.degreesToRadians = function(degrees){
+  return Math.PI/180 * degrees;
+}
+
+exports.radiansToDegrees = function(radians){
+  return 180/Math.PI * degrees;
+}
\ No newline at end of file
diff --git a/modules/suncalc.js b/modules/suncalc.js
index 0c22c6cb2..fe17148e1 100644
--- a/modules/suncalc.js
+++ b/modules/suncalc.js
@@ -279,7 +279,7 @@ function hoursLater(date, h) {
 // calculations for moon rise/set times are based on http://www.stargazing.net/kepler/moonrise.html article
 
 SunCalc.getMoonTimes = function (date, lat, lng, inUTC) {
-    var t = new Date(date);
+    var t = typeof(date) === "object" ? date : new Date(date);
     if (inUTC) t.setUTCHours(0, 0, 0, 0);
     else t.setHours(0, 0, 0, 0);
 
diff --git a/modules/widget_utils.js b/modules/widget_utils.js
index 33fd303f9..154a95f68 100644
--- a/modules/widget_utils.js
+++ b/modules/widget_utils.js
@@ -53,8 +53,14 @@ exports.cleanup = function() {
 back onscreen with a downwards swipe. Use .show to undo.
 First parameter controls automatic hiding time, 0 equals not hiding at all.
 Default value is 2000ms until hiding.
-Bangle.js 2 only at the moment. */
+Bangle.js 2 only at the moment. On Bangle.js 1 widgets will be hidden permanently.
+
+Note: On Bangle.js 1 is is possible to draw widgets in an offscreen area of the LCD
+and use Bangle.setLCDOffset. However we can't detect a downward swipe so how to
+actually make this work needs some thought.
+*/
 exports.swipeOn = function(autohide) {
+  if (process.env.HWVERSION!==2) return exports.hide();
   exports.cleanup();
   if (!global.WIDGETS) return;
   exports.autohide=autohide===undefined?2000:autohide;