diff --git a/apps/90sclk/ChangeLog b/apps/90sclk/ChangeLog
index feb008f5f..057d6ff73 100644
--- a/apps/90sclk/ChangeLog
+++ b/apps/90sclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
-0.02: Fullscreen settings.
\ No newline at end of file
+0.02: Fullscreen settings.
+0.03: Tell clock widgets to hide.
diff --git a/apps/90sclk/app.js b/apps/90sclk/app.js
index 6babbfec2..351c235e0 100644
--- a/apps/90sclk/app.js
+++ b/apps/90sclk/app.js
@@ -115,6 +115,9 @@ function draw() {
   }
 }
 
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 
 // Clear the screen once, at startup
@@ -140,5 +143,3 @@ Bangle.on('lock', function(isLocked) {
 });
 
 
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
diff --git a/apps/90sclk/metadata.json b/apps/90sclk/metadata.json
index fb2824a6f..59b627427 100644
--- a/apps/90sclk/metadata.json
+++ b/apps/90sclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "90sclk",
   "name": "90s Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A 90s style watch-face",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/advcasio/ChangeLog b/apps/advcasio/ChangeLog
index 7189e4650..a1b528cf6 100644
--- a/apps/advcasio/ChangeLog
+++ b/apps/advcasio/ChangeLog
@@ -1,2 +1,3 @@
 0.01: AdvCasio first version
 0.02: Remove un-needed fonts to improve memory usage
+0.03: Tell clock widgets to hide.
diff --git a/apps/advcasio/app.js b/apps/advcasio/app.js
index f134ce23f..8cb904f90 100644
--- a/apps/advcasio/app.js
+++ b/apps/advcasio/app.js
@@ -294,9 +294,10 @@ Bangle.on("lock", (locked) => {
 });
 
 
+Bangle.setUI("clock");
+
 // Load widgets, but don't show them
 Bangle.loadWidgets();
-Bangle.setUI("clock");
 
 g.reset();
 g.clear();
diff --git a/apps/advcasio/metadata.json b/apps/advcasio/metadata.json
index bcc47fc79..152f47132 100644
--- a/apps/advcasio/metadata.json
+++ b/apps/advcasio/metadata.json
@@ -1,7 +1,7 @@
 { "id": "advcasio",
   "name": "Advanced Casio Clock",
   "shortName":"advcasio",
-  "version":"0.02",
+  "version":"0.03",
   "description": "An over-engineered clock inspired by Casio watches. It has a 4 days weather, a  timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
   "icon": "app.png",
   "tags": "clock",
diff --git a/apps/animclk/ChangeLog b/apps/animclk/ChangeLog
index 348448c34..e2e334d8d 100644
--- a/apps/animclk/ChangeLog
+++ b/apps/animclk/ChangeLog
@@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Fix bug if image clock wasn't installed
 0.03: Update to use setUI
+0.04; Tell clock widgets to hide. Move loadWidgets() so it only runs on
+startup and not on every draw.
diff --git a/apps/animclk/app.js b/apps/animclk/app.js
index 4bf63daf6..bdc399fbe 100644
--- a/apps/animclk/app.js
+++ b/apps/animclk/app.js
@@ -87,7 +87,6 @@ if (g.drawImages) {
   draw();
   var secondInterval = setInterval(draw,100);
   // load widgets
-  Bangle.loadWidgets();
   Bangle.drawWidgets();
   // Stop when LCD goes off
   Bangle.on('lcdPower',on=>{
@@ -104,3 +103,5 @@ if (g.drawImages) {
 }
 // Show launcher when button pressed
 Bangle.setUI("clock");
+
+Bangle.loadWidgets();
diff --git a/apps/animclk/metadata.json b/apps/animclk/metadata.json
index 31dfe453f..0b426a37d 100644
--- a/apps/animclk/metadata.json
+++ b/apps/animclk/metadata.json
@@ -2,7 +2,7 @@
   "id": "animclk",
   "name": "Animated Clock",
   "shortName": "Anim Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/astral/ChangeLog b/apps/astral/ChangeLog
index a51c96760..c93c2b6c2 100644
--- a/apps/astral/ChangeLog
+++ b/apps/astral/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Create astral clock app
 0.02: Fixed Whirlpool galaxy RA/DA, larger compass display, fixed moonphase overlapping battery widget
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
diff --git a/apps/astral/app.js b/apps/astral/app.js
index c445463f2..c4339bc09 100644
--- a/apps/astral/app.js
+++ b/apps/astral/app.js
@@ -767,6 +767,24 @@ function draw() {
 g.clear();
 current_moonphase = getMoonPhase();
 
+Bangle.setUI("clockupdown", btn => {
+  if (btn==0) {
+    if (!processing) {
+        if (!modeswitch) {
+            modeswitch = true;
+            if (mode == "planetary") mode = "extras";
+            else mode = "planetary";
+        }
+        else
+            modeswitch = false;
+    }
+  } else {
+    if (!processing)
+        ready_to_compute = true;
+  }
+});
+
+
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -799,23 +817,6 @@ Bangle.setGPSPower(1);
 // Show launcher when button pressed
 Bangle.setClockMode();
 
-Bangle.setUI("clockupdown", btn => {
-  if (btn==0) {
-    if (!processing) {
-        if (!modeswitch) {
-            modeswitch = true;
-            if (mode == "planetary") mode = "extras";
-            else mode = "planetary";
-        }
-        else
-            modeswitch = false;
-    }
-  } else {
-    if (!processing)
-        ready_to_compute = true;
-  }
-});
-
 setWatch(function () {
     if (!astral_settings.astral_default) {
         colours_switched = true;
diff --git a/apps/astral/metadata.json b/apps/astral/metadata.json
index 3317092db..d7120878b 100644
--- a/apps/astral/metadata.json
+++ b/apps/astral/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "astral",
   "name": "Astral Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Clock that calculates and displays Alt Az positions of all planets, Sun as well as several other astronomy targets (customizable) and current Moon phase. Coordinates are calculated by GPS & time and onscreen compass assists orienting. See Readme before using.",
   "icon": "app-icon.png",
   "type": "clock",
diff --git a/apps/barcode/ChangeLog b/apps/barcode/ChangeLog
index 4f99f15ac..7ab5d8587 100644
--- a/apps/barcode/ChangeLog
+++ b/apps/barcode/ChangeLog
@@ -7,3 +7,4 @@
 0.07: Step count resets at midnight
 0.08: Step count stored in memory to survive reloads. Now shows step count daily and since last reboot.
 0.09: NOW it really should reset daily (instead of every other day...)
+0.10: Tell clock widgets to hide.
diff --git a/apps/barcode/barcode.app.js b/apps/barcode/barcode.app.js
index 89419f33c..0d9df78d5 100644
--- a/apps/barcode/barcode.app.js
+++ b/apps/barcode/barcode.app.js
@@ -416,13 +416,13 @@ var layout = new Layout( {
 
 // Clear the screen once, at startup
 g.clear();
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-Bangle.setUI("clock");
 layout.render();
 
 Bangle.on('lock', function(locked) {
     if(!locked) {
         layout.render();
     }
-});
\ No newline at end of file
+});
diff --git a/apps/barcode/metadata.json b/apps/barcode/metadata.json
index cef267b2b..3f6bf06e6 100644
--- a/apps/barcode/metadata.json
+++ b/apps/barcode/metadata.json
@@ -2,7 +2,7 @@
   "name": "Barcode clock",
   "shortName":"Barcode clock",
   "icon": "barcode.icon.png",
-  "version":"0.09",
+  "version":"0.10",
   "description": "EAN-8 compatible barcode clock.",
   "tags": "barcode,ean,ean-8,watchface,clock,clockface",
   "type": "clock",
diff --git a/apps/batclock/ChangeLog b/apps/batclock/ChangeLog
index e6e21b146..2a2d91b74 100644
--- a/apps/batclock/ChangeLog
+++ b/apps/batclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: App Created!
 0.02: Update to use Bangle.setUI instead of setWatch
+0.03: Tell clock widgets to hide.
diff --git a/apps/batclock/bat-clock.app.js b/apps/batclock/bat-clock.app.js
index 31b8f5b9b..dc649160f 100644
--- a/apps/batclock/bat-clock.app.js
+++ b/apps/batclock/bat-clock.app.js
@@ -249,6 +249,9 @@ g.clear();
 g.setColor(0, 0.5, 0).drawImage(bg_crack);
 g.setColor(1, 1, 1).drawImage(batman);
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
@@ -256,5 +259,3 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/batclock/metadata.json b/apps/batclock/metadata.json
index 8aa115780..e6520cb90 100644
--- a/apps/batclock/metadata.json
+++ b/apps/batclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "batclock",
   "name": "Bat Clock",
   "shortName": "Bat Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Morphing Clock, with an awesome \"The Dark Knight\" themed logo.",
   "icon": "bat-clock.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/bclock/ChangeLog b/apps/bclock/ChangeLog
index 5b2cf598c..79c198431 100644
--- a/apps/bclock/ChangeLog
+++ b/apps/bclock/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
diff --git a/apps/bclock/clock-binary.js b/apps/bclock/clock-binary.js
index fdf945ee6..c08a7abe6 100644
--- a/apps/bclock/clock-binary.js
+++ b/apps/bclock/clock-binary.js
@@ -100,10 +100,12 @@ Bangle.on('lcdPower', on => {
   if (on) drawClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(() => { drawClock(); }, 1000);
 drawClock();
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/bclock/metadata.json b/apps/bclock/metadata.json
index 94219a30b..c6a24d89f 100644
--- a/apps/bclock/metadata.json
+++ b/apps/bclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "bclock",
   "name": "Binary Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A simple binary clock watch face",
   "icon": "clock-binary.png",
   "type": "clock",
diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index 09cc978fb..b373f1876 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
+0.06: Tell clock widgets to hide.
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index c013c6188..3adf96984 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -85,7 +85,8 @@ Bangle.on('charging', (charging) => {
     draw();
 });
 
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 draw();
 
-Bangle.setUI("clock");
diff --git a/apps/bigdclock/metadata.json b/apps/bigdclock/metadata.json
index 7359bcf20..ce91d921e 100644
--- a/apps/bigdclock/metadata.json
+++ b/apps/bigdclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bigdclock",
   "name": "Big digit clock containing just the essentials",
   "shortName":"Big digit clk",
-  "version":"0.05",
+  "version":"0.06",
   "description": "A clock containing just the essentials, made as easy to read as possible for those of us that need glasses. It contains the time, the day-of-week, the day-of-month, and the current battery state-of-charge.",
   "icon": "bigdclock.png",
   "type": "clock",
diff --git a/apps/binclock/ChangeLog b/apps/binclock/ChangeLog
index dc4ed8308..7c31cc0d3 100644
--- a/apps/binclock/ChangeLog
+++ b/apps/binclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Fixed bug where screen didn't clear so incorrect time displayed.
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
diff --git a/apps/binclock/app.js b/apps/binclock/app.js
index f8cbe8dd5..d9c74e6ce 100644
--- a/apps/binclock/app.js
+++ b/apps/binclock/app.js
@@ -164,9 +164,6 @@ Bangle.on('lcdPower',on=>{
     draw(); // draw immediately
   }
 });
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 // Show launcher when button pressed
 Bangle.setUI("clockupdown", btn=>{
   if (btn!=1) return;
@@ -176,3 +173,6 @@ Bangle.setUI("clockupdown", btn=>{
     displayTime = 0;
   }
 });
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/binclock/metadata.json b/apps/binclock/metadata.json
index d17045868..2ca2755a6 100644
--- a/apps/binclock/metadata.json
+++ b/apps/binclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "binclock",
   "name": "Binary Clock",
   "shortName": "Binary Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A binary clock with hours and minutes. BTN1 toggles a digital clock.",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/binwatch/ChangeLog b/apps/binwatch/ChangeLog
index 1e54f489c..e355155b3 100644
--- a/apps/binwatch/ChangeLog
+++ b/apps/binwatch/ChangeLog
@@ -2,3 +2,5 @@
 0.02: first running version for BangleJs2
 0.03: corrected icon, added screen shot, extended description
 0.04: corrected format of background image (raw binary)
+0.05: move setUI() up before draw() as to not have a false positive 'sanity
+check' when building on github.
diff --git a/apps/binwatch/app.js b/apps/binwatch/app.js
index 28d7a06a5..153bebb32 100644
--- a/apps/binwatch/app.js
+++ b/apps/binwatch/app.js
@@ -334,6 +334,7 @@ function setRuntimeValues(resolution) {
 var hour = 0, minute = 1, second = 50;
 var batVLevel = 20;
 
+Bangle.setUI("clock");
 
 function draw() {
   var d = new Date();
@@ -371,7 +372,6 @@ function draw() {
 }
 
 // Show launcher when button pressed
-Bangle.setUI("clock");
 setRuntimeValues(g.getWidth());
 g.reset().clear();
 Bangle.loadWidgets();
diff --git a/apps/binwatch/metadata.json b/apps/binwatch/metadata.json
index 0b5fb2c72..0b4dbc697 100644
--- a/apps/binwatch/metadata.json
+++ b/apps/binwatch/metadata.json
@@ -3,7 +3,7 @@
   "shortName":"BinWatch",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
-  "version":"0.04",
+  "version":"0.05",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator":true,