diff --git a/README.md b/README.md
index ee555cad2..b3da9f685 100644
--- a/README.md
+++ b/README.md
@@ -256,6 +256,7 @@ and which gives information about the app for the Launcher.
                               //   'clock' - a clock - required for clocks to automatically start
                               //   'widget' - a widget
                               //   'bootloader' - an app that at startup (app.boot.js) but doesn't have a launcher entry for 'app.js'
+                              //   'settings' - apps that appear in Settings->Apps (with appname.settings.js) but that have no 'app.js'
                               //   'RAM' - code that runs and doesn't upload anything to storage
                               //   'launch' - replacement 'Launcher'
                               //   'textinput' - provides a 'textinput' library that allows text to be input on the Bangle
diff --git a/apps/activityreminder/ChangeLog b/apps/activityreminder/ChangeLog
index d4b5100a2..4edb72aa5 100644
--- a/apps/activityreminder/ChangeLog
+++ b/apps/activityreminder/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Do not alarm while charging
 0.04: Obey system quiet mode
 0.05: Battery optimisation, add the pause option, bug fixes
+0.06: Add a temperature threshold to detect (and not alert) if the BJS isn't worn. Better support for the peoples using the app at night
diff --git a/apps/activityreminder/README.md b/apps/activityreminder/README.md
index 25e2c8d35..0c79b4141 100644
--- a/apps/activityreminder/README.md
+++ b/apps/activityreminder/README.md
@@ -11,4 +11,5 @@ Different settings can be personalized:
 - Dismiss delay: Delay added before the next alert if the alert is dismissed. From 5 to 60 min
 - Pause delay: Same as Dismiss delay but longer (usefull for meetings and such). From 30 to 240 min
 - Min steps: Minimal amount of steps to count as an activity
+- Temp Threshold: Temperature threshold to determine if the watch is worn
 
diff --git a/apps/activityreminder/boot.js b/apps/activityreminder/boot.js
index 7c094f521..4ae9548c2 100644
--- a/apps/activityreminder/boot.js
+++ b/apps/activityreminder/boot.js
@@ -2,17 +2,17 @@ function run() {
     if (isNotWorn()) return;
     let now = new Date();
     let h = now.getHours();
-    let health = Bangle.getHealthStatus("day");
 
-    if (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour) {
+    if (isDuringAlertHours(h)) {
+        let health = Bangle.getHealthStatus("day");
         if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps // more steps made than needed
             || health.steps < activityreminder_data.stepsOnDate) { // new day or reboot of the watch
             activityreminder_data.stepsOnDate = health.steps;
             activityreminder_data.stepsDate = now;
             activityreminder.saveData(activityreminder_data);
             /* todo in a futur release 
-            add settimer to trigger like 10 secs after the stepsDate + minSteps
-            cancel all other timers of this app
+            Add settimer to trigger like 30 secs after going in this part cause the person have been walking 
+            (pass some argument to run() to handle long walks and not triggering so often)
             */
         }
         
@@ -24,22 +24,42 @@ function run() {
 }
 
 function isNotWorn() {
-    // todo in a futur release check temperature and mouvement in a futur release 
-    return Bangle.isCharging();
+    return (Bangle.isCharging() || activityreminder_settings.tempThreshold >= E.getTemperature());
 }
 
+function isDuringAlertHours(h) {
+    if(activityreminder_settings.startHour < activityreminder_settings.endHour){ // not passing through midnight
+        return (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour)
+    } else{ // passing through midnight
+        return (h >= activityreminder_settings.startHour || h < activityreminder_settings.endHour)
+    }
+}
+
+Bangle.on('midnight', function() {
+    /*
+    Usefull trick to have the app working smothly for people using it at night 
+    */
+    let now = new Date();
+    let h = now.getHours();
+    if (activityreminder_settings.enabled && isDuringAlertHours(h)){
+        // updating only the steps and keeping the original stepsDate on purpose 
+        activityreminder_data.stepsOnDate = 0;
+        activityreminder.saveData(activityreminder_data);
+    }
+});
+
 const activityreminder = require("activityreminder");
 const activityreminder_settings = activityreminder.loadSettings();
 if (activityreminder_settings.enabled) {
     const activityreminder_data = activityreminder.loadData();
     if(activityreminder_data.firstLoad){
-        activityreminder_data.firstLoad =false;
+        activityreminder_data.firstLoad = false;
         activityreminder.saveData(activityreminder_data);
     }
     setInterval(run, 60000);
     /* todo in a futur release 
     increase setInterval time to something that is still sensible (5 mins ?)
-    add settimer to trigger like 10 secs after the stepsDate + minSteps
-    cancel all other timers of this app
+    when we added a settimer
     */
 }
+
diff --git a/apps/activityreminder/lib.js b/apps/activityreminder/lib.js
index 5b7959827..08fffd5f4 100644
--- a/apps/activityreminder/lib.js
+++ b/apps/activityreminder/lib.js
@@ -8,7 +8,8 @@ exports.loadSettings = function () {
         maxInnactivityMin: 30,
         dismissDelayMin: 15,
         pauseDelayMin: 120,
-        minSteps: 50
+        minSteps: 50,
+        tempThreshold: 27
     }, storage.readJSON("activityreminder.s.json", true) || {});
 };
 
diff --git a/apps/activityreminder/metadata.json b/apps/activityreminder/metadata.json
index 15f10f2ed..752c6c101 100644
--- a/apps/activityreminder/metadata.json
+++ b/apps/activityreminder/metadata.json
@@ -3,7 +3,7 @@
   "name": "Activity Reminder",
   "shortName":"Activity Reminder",
   "description": "A reminder to take short walks for the ones with a sedentary lifestyle",
-  "version":"0.05",
+  "version":"0.06",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,activity",
diff --git a/apps/activityreminder/settings.js b/apps/activityreminder/settings.js
index 9dff61f48..f25697de0 100644
--- a/apps/activityreminder/settings.js
+++ b/apps/activityreminder/settings.js
@@ -55,7 +55,7 @@
     },
     'Pause delay': {
       value: settings.pauseDelayMin,
-      min: 30, max: 240,
+      min: 30, max: 240, step: 5,
       onchange: v => {
         settings.pauseDelayMin = v;
         activityreminder.writeSettings(settings);
@@ -66,11 +66,20 @@
     },
     'Min steps': {
       value: settings.minSteps,
-      min: 10, max: 500,
+      min: 10, max: 500, step: 10, 
       onchange: v => {
         settings.minSteps = v;
         activityreminder.writeSettings(settings);
       }
+    },
+    'Temp Threshold': {
+      value: settings.tempThreshold,
+      min: 20, max: 40, step: 0.5,
+      format: v => v + "°C",
+      onchange: v => {
+        settings.tempThreshold = v;
+        activityreminder.writeSettings(settings);
+      }
     }
   });
 })
diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index b00055334..00187fa7c 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -29,3 +29,4 @@
 0.27: New UI!
 0.28: Fix bug with alarms not firing when configured to fire only once
 0.29: Fix wrong 'dow' handling in new timer if first day of week is Monday
+0.30: Fix "Enable All"
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index fe0f67dbb..2aff43de2 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -86,7 +86,8 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex) {
   const menu = {
     "": { "title": isNew ? /*LANG*/"New Alarm" : /*LANG*/"Edit Alarm" },
     "< Back": () => {
-      saveAlarm(alarm, alarmIndex, time);
+      prepareAlarmForSave(alarm, alarmIndex, time);
+      saveAndReload();
       showMainMenu();
     },
     /*LANG*/"Hour": {
@@ -144,7 +145,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex) {
   E.showMenu(menu);
 }
 
-function saveAlarm(alarm, alarmIndex, time) {
+function prepareAlarmForSave(alarm, alarmIndex, time) {
   alarm.t = require("time_utils").encodeTime(time);
   alarm.last = alarm.t < require("time_utils").getCurrentTimeMillis() ? new Date().getDate() : 0;
 
@@ -153,8 +154,6 @@ function saveAlarm(alarm, alarmIndex, time) {
   } else {
     alarms[alarmIndex] = alarm;
   }
-
-  saveAndReload();
 }
 
 function saveAndReload() {
@@ -251,7 +250,8 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
   const menu = {
     "": { "title": isNew ? /*LANG*/"New Timer" : /*LANG*/"Edit Timer" },
     "< Back": () => {
-      saveTimer(timer, timerIndex, time);
+      prepareTimerForSave(timer, timerIndex, time);
+      saveAndReload();
       showMainMenu();
     },
     /*LANG*/"Hours": {
@@ -293,7 +293,7 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
   E.showMenu(menu);
 }
 
-function saveTimer(timer, timerIndex, time) {
+function prepareTimerForSave(timer, timerIndex, time) {
   timer.timer = require("time_utils").encodeTime(time);
   timer.t = require("time_utils").getCurrentTimeMillis() + timer.timer;
   timer.last = 0;
@@ -303,8 +303,6 @@ function saveTimer(timer, timerIndex, time) {
   } else {
     alarms[timerIndex] = timer;
   }
-
-  saveAndReload();
 }
 
 function showAdvancedMenu() {
@@ -327,7 +325,16 @@ function enableAll(on) {
   } else {
     E.showPrompt(/*LANG*/"Are you sure?", { title: on ? /*LANG*/"Enable All" : /*LANG*/"Disable All" }).then((confirm) => {
       if (confirm) {
-        alarms.forEach(alarm => alarm.on = on);
+        alarms.forEach((alarm, i) => {
+          alarm.on = on;
+          if (on) {
+            if (alarm.timer) {
+              prepareTimerForSave(alarm, i, require("time_utils").decodeTime(alarm.timer))
+            } else {
+              prepareAlarmForSave(alarm, i, require("time_utils").decodeTime(alarm.t))
+            }
+          }
+        });
         saveAndReload();
         showMainMenu();
       } else {
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index cac837b5e..3c17ee177 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.29",
+  "version": "0.30",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm,widget",
diff --git a/apps/barclock/ChangeLog b/apps/barclock/ChangeLog
index 5df032c4d..197a24738 100644
--- a/apps/barclock/ChangeLog
+++ b/apps/barclock/ChangeLog
@@ -9,3 +9,5 @@
 0.09: Fix time/date disappearing after fullscreen notification
 0.10: Use ClockFace library
 0.11: Use ClockFace.is12Hour
+0.12: Add settings to hide date,widgets
+0.13: Add font setting
diff --git a/apps/barclock/README.md b/apps/barclock/README.md
index 4b92313c5..ff66a5cbb 100644
--- a/apps/barclock/README.md
+++ b/apps/barclock/README.md
@@ -4,3 +4,7 @@ A simple digital clock showing seconds as a horizontal bar.
 | 24hr style | 12hr style |
 | --- | --- |
 | ![24-hour bar clock](screenshot.png) | ![12-hour bar clock with meridian](screenshot_pm.png) |
+
+## Settings
+* `Show date`: display date at the bottom of screen
+* `Font`: choose between bitmap or vector fonts
\ No newline at end of file
diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 987d41cc6..61ce07dfb 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -51,24 +51,25 @@ function dateText(date) {
 const ClockFace = require("ClockFace"),
   clock = new ClockFace({
     precision:1,
+    settingsFile:'barclock.settings.json',
     init: function() {
       const Layout = require("Layout");
       this.layout = new Layout({
         type: "v", c: [
           {
             type: "h", c: [
-              {id: "time", label: "88:88", type: "txt", font: "6x8:5", col:g.theme.fg, bgCol: g.theme.bg}, // size updated below
+              {id: "time", label: "88:88", type: "txt", font: "6x8:5", col:g.theme.fg, bgCol: g.theme.bg}, // updated below
               {id: "ampm", label: "  ", type: "txt", font: "6x8:2", col:g.theme.fg, bgCol: g.theme.bg},
             ],
           },
           {id: "bar", type: "custom", fraction: 0, fillx: 1, height: 6, col: g.theme.fg2, render: renderBar},
-          {height: 40},
-          {id: "date", type: "txt", font: "10%", valign: 1},
+          this.showDate ? {height: 40} : {},
+          this.showDate ? {id: "date", type: "txt", font: "10%", valign: 1} : {},
         ],
       }, {lazy: true});
       // adjustments based on screen size and whether we display am/pm
       let thickness; // bar thickness, same as time font "pixel block" size
-      if (this.is12Hour) {
+      if (this.is12Hour && locale.hasMeridian) {
         // Maximum font size = (<screen width> - <ampm: 2chars * (2*6)px>) / (5chars * 6px)
         thickness = Math.floor((Bangle.appRect.w-24)/(5*6));
       } else {
@@ -76,13 +77,23 @@ const ClockFace = require("ClockFace"),
         thickness = Math.floor(Bangle.appRect.w/(5*6));
       }
       this.layout.bar.height = thickness+1;
-      this.layout.time.font = "6x8:"+thickness;
+      if (this.font===1) { // vector
+        const B2 = process.env.HWVERSION>1;
+        if (this.is12Hour && locale.hasMeridian) {
+          this.layout.time.font = "Vector:"+(B2 ? 50 : 60);
+          this.layout.ampm.font = "Vector:"+(B2 ? 20 : 40);
+        } else {
+          this.layout.time.font = "Vector:"+(B2 ? 60 : 80);
+        }
+      } else {
+        this.layout.time.font = "6x8:"+thickness;
+      }
       this.layout.update();
     },
     update: function(date, c) {
       if (c.m) this.layout.time.label = timeText(date);
       if (c.h) this.layout.ampm.label = ampmText(date);
-      if (c.d) this.layout.date.label = dateText(date);
+      if (c.d && this.showDate) this.layout.date.label = dateText(date);
       const SECONDS_PER_MINUTE = 60;
       if (c.s) this.layout.bar.fraction = date.getSeconds()/SECONDS_PER_MINUTE;
       this.layout.render();
diff --git a/apps/barclock/metadata.json b/apps/barclock/metadata.json
index 7bc61096d..0a0b73778 100644
--- a/apps/barclock/metadata.json
+++ b/apps/barclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "barclock",
   "name": "Bar Clock",
-  "version": "0.11",
+  "version": "0.13",
   "description": "A simple digital clock showing seconds as a bar",
   "icon": "clock-bar.png",
   "screenshots": [{"url":"screenshot.png"},{"url":"screenshot_pm.png"}],
@@ -12,6 +12,10 @@
   "allow_emulator": true,
   "storage": [
     {"name":"barclock.app.js","url":"clock-bar.js"},
+    {"name":"barclock.settings.js","url":"settings.js"},
     {"name":"barclock.img","url":"clock-bar-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name":"barclock.settings.json"}
   ]
 }
diff --git a/apps/barclock/settings.js b/apps/barclock/settings.js
new file mode 100644
index 000000000..3e97688a1
--- /dev/null
+++ b/apps/barclock/settings.js
@@ -0,0 +1,26 @@
+(function(back) {
+  let s = require('Storage').readJSON("barclock.settings.json", true) || {};
+
+  function saver(key) {
+    return value => {
+      s[key] = value;
+      require('Storage').writeJSON("barclock.settings.json", s);
+    }
+  }
+
+  const fonts = [/*LANG*/"Bitmap",/*LANG*/"Vector"];
+  const menu = {
+    "": {"title": /*LANG*/"Bar Clock"},
+    /*LANG*/"< Back": back,
+    /*LANG*/"Show date": require("ClockFace_menu").showDate(s.showDate, saver('showDate')),
+    /*LANG*/"Load widgets": require("ClockFace_menu").loadWidgets(s.loadWidgets, saver('loadWidgets')),
+    /*LANG*/"Font": {
+      value: s.font|0,
+      min:0,max:1,wrap:true,
+      format:v=>fonts[v],
+      onchange:saver('font'),
+    },
+  };
+
+  E.showMenu(menu);
+});
diff --git a/apps/barcode/ChangeLog b/apps/barcode/ChangeLog
new file mode 100644
index 000000000..4f99f15ac
--- /dev/null
+++ b/apps/barcode/ChangeLog
@@ -0,0 +1,9 @@
+0.01: Please forgive me
+0.02: Now tells time!
+0.03: Interaction
+0.04: Shows day of week
+0.05: Shows day of month
+0.06: Updates every 5 minutes when locked, or when unlock occurs. Also shows nr of steps.
+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...)
diff --git a/apps/barcode/README.md b/apps/barcode/README.md
new file mode 100644
index 000000000..17b365d45
--- /dev/null
+++ b/apps/barcode/README.md
@@ -0,0 +1,23 @@
+# Barcode clockwatchface
+
+A scannable EAN-8 compatible clockwatchface for your Bangle 2
+
+The format of the bars are
+
+`||HHmm||MMwc||`
+
+* Left section: HHmm
+  * H: Hours
+  * m: Minutes
+* Right section: MM9c
+  * M: Day of month
+  * w: Day of week
+  * c: Calculated EAN-8 digit checksum
+
+Apart from that
+
+* The upper left section displays total number of steps per day
+* The upper right section displays total number of steps from last boot ("stepuptime")
+* The face updates every 5 minutes or on demant by pressing the hardware button
+
+This clockwathface is aware of theme choice, so it will adapt to Light/Dark themes.
diff --git a/apps/barcode/barcode.app.js b/apps/barcode/barcode.app.js
new file mode 100644
index 000000000..89419f33c
--- /dev/null
+++ b/apps/barcode/barcode.app.js
@@ -0,0 +1,428 @@
+/* Sizes */
+let checkBarWidth = 10;
+let checkBarHeight = 140;
+
+let digitBarWidth = 14;
+let digitBarHeight = 100;
+
+let textBarWidth = 56;
+let textBarHeight = 20;
+
+let textWidth = 14;
+let textHeight = 20;
+
+/* Offsets */
+var startOffsetX = 17;
+var startOffsetY = 30;
+
+let startBarOffsetX = startOffsetX;
+let startBarOffsetY = startOffsetY;
+
+let upperTextBarLeftOffsetX = startBarOffsetX + checkBarWidth;
+let upperTextBarLeftOffsetY = startOffsetY;
+
+let midBarOffsetX = upperTextBarLeftOffsetX + textBarWidth;
+let midBarOffsetY = startOffsetY;
+
+let upperTextBarRightOffsetX = midBarOffsetX + checkBarWidth;
+let upperTextBarRightOffsetY = startOffsetY;
+
+let endBarOffsetX = upperTextBarRightOffsetX + textBarWidth;
+let endBarOffsetY = startOffsetY;
+
+let leftBarsStartX = startBarOffsetX + checkBarWidth;
+let leftBarsStartY = upperTextBarLeftOffsetY + textBarHeight;
+
+let rightBarsStartX = midBarOffsetX + checkBarWidth;
+let rightBarsStartY = upperTextBarRightOffsetY + textBarHeight;
+
+/* Utilities */
+let stepCount = require("Storage").readJSON("stepCount",1);
+if(stepCount === undefined) stepCount = 0;
+let intCaster = num => Number(num);
+
+var drawTimeout;
+
+function renderWatch(l) {
+    g.setFont("4x6",2);
+
+    // work out how to display the current time
+
+    var d = new Date();
+    var h = d.getHours(), m = d.getMinutes();
+    var time = h + ":" + ("0"+m).substr(-2);
+    //var month = ("0" + (d.getMonth()+1)).slice(-2);
+    var dayOfMonth = ('0' + d.getDate()).slice(-2);
+    var dayOfWeek = d.getDay() || 7;
+    var concatTime = ("0"+h).substr(-2) + ("0"+m).substr(-2) + dayOfMonth + dayOfWeek;
+
+    const chars = String(concatTime).split("").map((concatTime) => {
+        return Number(concatTime);
+    });
+    const checkSum = calculateChecksum(chars);
+    concatTime += checkSum;
+
+    drawCheckBar(startBarOffsetX, startBarOffsetY);
+
+    drawLDigit(chars[0], 0, leftBarsStartY);
+    drawLDigit(chars[1], 1, leftBarsStartY);
+    drawLDigit(chars[2], 2, leftBarsStartY);
+    drawLDigit(chars[3], 3, leftBarsStartY);
+
+    g.drawString(getStepCount(), startOffsetX + checkBarWidth + 3, startOffsetY + 4);
+    g.drawString(concatTime.substring(0,4), startOffsetX + checkBarWidth + 3, startOffsetY + textBarHeight + digitBarHeight + 6);
+
+    drawCheckBar(midBarOffsetX, midBarOffsetY);
+
+    drawRDigit(chars[4], 0, rightBarsStartY);
+    drawRDigit(chars[5], 1, rightBarsStartY);
+    drawRDigit(chars[6], 2, rightBarsStartY);
+    drawRDigit(checkSum, 3, rightBarsStartY);
+
+    g.drawString(Bangle.getStepCount(), midBarOffsetX + checkBarWidth + 3, startOffsetY + 4);
+    g.drawString(concatTime.substring(4), midBarOffsetX + checkBarWidth + 3, startOffsetY + textBarHeight + digitBarHeight + 6);
+
+    drawCheckBar(endBarOffsetX, endBarOffsetY);
+
+    // schedule a draw for the next minute
+    if (drawTimeout) {
+        clearTimeout(drawTimeout);
+    }
+    drawTimeout = setTimeout(function() {
+        drawTimeout = undefined;
+        layout.render(layout.watch);
+    }, (1000 * 60 * 5) - (Date.now() % (1000 * 60 * 5)));
+}
+
+function drawLDigit(digit, index, offsetY) {
+    switch(digit) {
+        case 0:
+            drawLZeroWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 1:
+            drawLOneWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 2:
+            drawLTwoWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 3:
+            drawLThreeWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 4:
+            drawLFourWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 5:
+            drawLFiveWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 6:
+            drawLSixWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 7:
+            drawLSevenWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 8:
+            drawLEightWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 9:
+            drawLNineWithOffset(leftBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+    }
+}
+
+function drawRDigit(digit, index, offsetY) {
+    switch(digit) {
+        case 0:
+            drawRZeroWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 1:
+            drawROneWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 2:
+            drawRTwoWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 3:
+            drawRThreeWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 4:
+            drawRFourWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 5:
+            drawRFiveWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 6:
+            drawRSixWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 7:
+            drawRSevenWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 8:
+            drawREightWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+        case 9:
+            drawRNineWithOffset(rightBarsStartX+(digitBarWidth*index), offsetY);
+            break;
+    }
+}
+
+/*
+LEAN
+
+01234567890123
+    xxxx    xx
+    xx    xxxx
+  xxxxxxxx  xx
+  xx      xxxx
+  xxxx      xx
+  xx  xxxxxxxx
+  xxxxxx  xxxx
+  xxxx  xxxxxx
+      xx  xxxx
+      xxxx  xx
+*/
+function drawLOneWithOffset(offset, offsetY) {
+    let barOneX = 4;
+    let barTwoX = 12;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+3+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("1",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLTwoWithOffset(offset, offsetY) {
+    let barOneX = 4;
+    let barTwoX = 10;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+3+offset,offsetY+digitBarHeight);
+    //g.drawString("2",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLThreeWithOffset(offset, offsetY) {
+    let barOneX = 2;
+    let barTwoX = 12;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+7+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("3",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLFourWithOffset(offset, offsetY) {
+    let barOneX = 2;
+    let barTwoX = 10;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+3+offset,offsetY+digitBarHeight);
+    //g.drawString("4",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLFiveWithOffset(offset, offsetY) {
+    let barOneX = 2;
+    let barTwoX = 12;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+3+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("5",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLSixWithOffset(offset, offsetY) {
+    let barOneX = 2;
+    let barTwoX = 6;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+7+offset,offsetY+digitBarHeight);
+    //g.drawString("6",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLSevenWithOffset(offset, offsetY) {
+    let barOneX = 2;
+    let barTwoX = 10;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+5+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+3+offset,offsetY+digitBarHeight);
+    //g.drawString("7",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLEightWithOffset(offset, offsetY) {
+    let barOneX = 2;
+    let barTwoX = 8;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+3+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+5+offset,offsetY+digitBarHeight);
+    //g.drawString("8",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLNineWithOffset(offset, offsetY) {
+    let barOneX = 6;
+    let barTwoX = 10;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+3+offset,offsetY+digitBarHeight);
+    //g.drawString("9",offset+3,offsetY+digitHeight+5);
+}
+
+function drawLZeroWithOffset(offset, offsetY) {
+    let barOneX = 6;
+    let barTwoX = 12;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+3+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("0",offset+3,offsetY+digitHeight+5);
+}
+
+
+
+/*
+REAN
+
+01234567890123
+xxxx    xxxx
+xxxx  xxxx
+xx        xx
+xx  xxxxxx
+xx    xxxxxx
+xx  xx
+xx      xx
+xx    xx
+xxxxxx  xx
+xxxxxx    xx
+
+*/
+function drawROneWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 8;
+    g.fillRect(offset+barOneX,offsetY+0,offset+barOneX+3,offsetY+digitBarHeight);
+    g.fillRect(offset+barTwoX,offsetY+0,offset+barTwoX+3,offsetY+digitBarHeight);
+    //g.drawString("1",offset+2,offsetY+textHeight+5);
+}
+
+function drawRTwoWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 6;
+    g.fillRect(offset+barOneX,offsetY+0,offset+barOneX+3,offsetY+digitBarHeight);
+    g.fillRect(offset+barTwoX,offsetY+0,offset+barTwoX+3,offsetY+digitBarHeight);
+    //g.drawString("2",offset+2,offsetY+textHeight+5);
+}
+
+function drawRThreeWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 10;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("3",offset+2,offsetY+textHeight+5);
+}
+
+function drawRFourWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 4;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+5+offset,offsetY+digitBarHeight);
+    //g.drawString("4",offset+2,offsetY+textHeight+5);
+}
+
+function drawRFiveWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 6;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+5+offset,offsetY+digitBarHeight);
+    //g.drawString("5",offset+2,offsetY+textHeight+5);
+}
+
+function drawRSixWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 4;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("6",offset+2,offsetY+textHeight+5);
+}
+
+function drawRSevenWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 8;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+1+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("7",offset+2,offsetY+textHeight+5);
+}
+
+function drawREightWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 6;
+    g.fillRect(offset+barOneX,offsetY+0,offset+barOneX+1,offsetY+digitBarHeight);
+    g.fillRect(offset+barTwoX,offsetY+0,offset+barTwoX+1,offsetY+digitBarHeight);
+    //g.drawString("8",offset+2,offsetY+textHeight+5);
+}
+
+function drawRNineWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 8;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+5+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("9",offset+2,offsetY+textHeight+5);
+}
+
+function drawRZeroWithOffset(offset, offsetY) {
+    let barOneX = 0;
+    let barTwoX = 10;
+    g.fillRect(barOneX+offset,offsetY+0,barOneX+5+offset,offsetY+digitBarHeight);
+    g.fillRect(barTwoX+offset,offsetY+0,barTwoX+1+offset,offsetY+digitBarHeight);
+    //g.drawString("0",offset+2,offsetY+textHeight+5);
+}
+
+function drawCheckBar(offsetX, offsetY) {
+    const barOneX = offsetX+2;
+    const barOneWidth = 1;
+    const barTwoX = offsetX+6;
+    const barTwoWidth = 1;
+    g.fillRect(barOneX,offsetY,barOneX+barOneWidth,offsetY+checkBarHeight);
+    g.fillRect(barTwoX,offsetY,barTwoX+barTwoWidth,offsetY+checkBarHeight);
+}
+
+function calculateChecksum(digits) {
+    let oddSum = digits[6] + digits[4] + digits[2] + digits[0];
+    let evenSum = digits[5] + digits[3] + digits[1];
+
+    let checkSum = (10 - ((3 * oddSum + evenSum) % 10)) % 10;
+
+    return checkSum;
+}
+
+function storeStepCount() {
+    stepCount = Bangle.getStepCount();
+    require("Storage").writeJSON("stepCount",stepCount);
+}
+
+function getStepCount() {
+    let accumulatedSteps = Bangle.getStepCount();
+    if(accumulatedSteps <= stepCount) {
+        return 0;
+    }
+    return accumulatedSteps - stepCount;
+}
+
+function resetAtMidnight() {
+    let now = new Date();
+    let night = new Date(
+        now.getFullYear(),
+        now.getMonth(),
+        now.getDate(), // the next day, ...
+        23, 58, 0 // ...at 00:00:00 hours
+);
+    let msToMidnight = night.getTime() - now.getTime();
+
+    setTimeout(function() {
+        storeStepCount();              //      <-- This is the function being called at midnight.
+        resetAtMidnight();    //      Then, reset again next midnight.
+    }, msToMidnight);
+}
+
+resetAtMidnight();
+
+// The layout, referencing the custom renderer
+var Layout = require("Layout");
+var layout = new Layout( {
+    type:"v", c: [
+        {type:"custom", render:renderWatch, id:"watch", bgCol:g.theme.bg, fillx:1, filly:1 }
+    ]
+});
+
+// Clear the screen once, at startup
+g.clear();
+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/barcode.clock.png b/apps/barcode/barcode.clock.png
new file mode 100644
index 000000000..7d249cdeb
Binary files /dev/null and b/apps/barcode/barcode.clock.png differ
diff --git a/apps/barcode/barcode.icon.js b/apps/barcode/barcode.icon.js
new file mode 100644
index 000000000..969943e0e
--- /dev/null
+++ b/apps/barcode/barcode.icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("MDAE///+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifnD6khY+bTIiDTIn8gWq8n+if/////+ifrV6mlp+rXYiFXZr8k4q8r+if/////+if7+///u//79ie7/7//u///+if/////+ifnP6t+378r+ienvyf/K/7v+if/////+ifrfx6/I78j+ibe/+e/W75n+if/////+iee/+t/Z77f+iervyv/r/7v+if//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"))
diff --git a/apps/barcode/barcode.icon.png b/apps/barcode/barcode.icon.png
new file mode 100644
index 000000000..43fa77a6f
Binary files /dev/null and b/apps/barcode/barcode.icon.png differ
diff --git a/apps/barcode/metadata.json b/apps/barcode/metadata.json
new file mode 100644
index 000000000..cef267b2b
--- /dev/null
+++ b/apps/barcode/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "barcode",
+  "name": "Barcode clock",
+  "shortName":"Barcode clock",
+  "icon": "barcode.icon.png",
+  "version":"0.09",
+  "description": "EAN-8 compatible barcode clock.",
+  "tags": "barcode,ean,ean-8,watchface,clock,clockface",
+  "type": "clock",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"barcode.app.js","url":"barcode.app.js"},
+    {"name":"barcode.img","url":"barcode.icon.js","evaluate":true}
+  ],
+  "readme":"README.md",
+  "screenshots": [{"url":"barcode.clock.png"}]
+}
diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
new file mode 100644
index 000000000..2b6fcc7cb
--- /dev/null
+++ b/apps/bigdclock/ChangeLog
@@ -0,0 +1,3 @@
+0.01: Initial version
+0.02: setTimeout bug fix; no leading zero on date; lightmode; 12 hour format; cleanup
+0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
diff --git a/apps/bigdclock/README.md b/apps/bigdclock/README.md
new file mode 100644
index 000000000..71f4362fa
--- /dev/null
+++ b/apps/bigdclock/README.md
@@ -0,0 +1,14 @@
+# Big Digit Clock
+
+There are a number of big digit clocks available for the Bangle, but this is
+the first which shows all the essential information that a clock needs to show
+in a manner that is easy to read by those with poor eyesight.
+
+The clock shows the time-of-day, the day-of-week and the day-of-month, as well
+as an easy-to-see icon showing the current charge on the battery.
+
+![screenshot](./screenshot.png)
+
+## Creator
+
+Created by [Deirdre O'Byrne](https://github.com/deirdreobyrne)
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
new file mode 100644
index 000000000..7b26d4f17
--- /dev/null
+++ b/apps/bigdclock/bigdclock.app.js
@@ -0,0 +1,91 @@
+// <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@600&display=swap" rel="stylesheet">
+
+Graphics.prototype.setFontOpenSans = function(scale) {
+  // Actual height 48 (50 - 3)
+  this.setFontCustom(
+    atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAP8AAAAAAAAB/wAAAAAAAAH/gAAAAAAAAf+AAAAAAAAB/4AAAAAAAAH/gAAAAAAAAf8AAAAAAAAA/wAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAPAAAAAAAAAH8AAAAAAAAD/wAAAAAAAA//AAAAAAAAf/8AAAAAAAP//wAAAAAAH///AAAAAAB///4AAAAAA///8AAAAAAf///AAAAAAH///gAAAAAD///wAAAAAB///4AAAAAAf//+AAAAAAP///AAAAAAH///gAAAAAA///4AAAAAAD//8AAAAAAAP/+AAAAAAAA//gAAAAAAAD/wAAAAAAAAP4AAAAAAAAA8AAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/gAAAAAAAP///AAAAAAH////gAAAAD/////gAAAAf/////gAAAH//////AAAA//////+AAAD//////8AAAf//////4AAD//4AH//gAAP/gAAAf/AAA/4AAAAf8AAH/AAAAA/4AAf4AAAAB/gAB/AAAAAD+AAH8AAAAAP4AAfwAAAAA/gAB/AAAAAD+AAH8AAAAAP4AAf4AAAAB/gAB/gAAAAH+AAD/gAAAB/wAAP/gAAAf/AAA//4AAf/8AAB///////gAAD//////8AAAH//////wAAAP/////+AAAAf/////wAAAA/////8AAAAAf////AAAAAAf///gAAAAAAB//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAHgAAAAAAAAA/AAAAAAAAAH+AAAAAAAAA/4AAAAAAAAD/AAAAAAAAAf8AAAAAAAAD/gAAAAAAAAf8AAAAAAAAB/gAAAAAAAAP8AAAAAAAAB/wAAAAAAAAP///////AAA///////8AAD///////wAAP///////AAA///////8AAD///////wAAP///////AAA///////8AAD///////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAD8AAAOAAAAAfwAAB+AAAAD/AAAH8AAAAf8AAA/wAAAH/wAAH/AAAA//AAAf4AAAH/8AAD/gAAA//wAAP8AAAH//AAA/gAAA//8AAD+AAAH//wAAf4AAA/9/AAB/AAAH/n8AAH8AAA/8fwAAfwAAH/h/AAB/AAA/8H8AAH8AAH/gfwAAfwAA/8B/AAB/gAH/gH8AAH+AB/8AfwAAP8Af/gB/AAA////8AH8AAD////gAfwAAH///8AB/AAAf///gAH8AAA///8AAfwAAB///gAB/AAAD//4AAH8AAAH/+AAAfwAAAH/gAAB/AAAAAAAAAH8AAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAYAAAAB/gAAB4AAAAD+AAAPwAAAAP4AAA/gAAAAfwAAH+AAAAB/AAAf4AAAAH8AAD/AB+AAfwAAP8AH4AA/gAA/gAfgAD+AAH+AB+AAP4AAfwAH4AA/gAB/AAfgAD+AAH8AB+AAP4AAfwAH4AA/gAB/AA/wAD+AAH8AD/AAP4AAfwAP8AA/gAB/AA/wAD+AAH+AH/AAf4AAf4Af+AB/AAA/wH/8AP8AAD////4D/wAAP//+////AAAf//7///4AAB///P///gAAD//8f//8AAAP//h///gAAAf/8D//+AAAA//gH//wAAAA/4AP/8AAAAAAAAP/AAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAA/wAAAAAAAAH/AAAAAAAAB/8AAAAAAAAP/wAAAAAAAD//AAAAAAAAf/8AAAAAAAH//wAAAAAAA/+/AAAAAAAP/z8AAAAAAB/8PwAAAAAAf/g/AAAAAAD/4D8AAAAAAf/APwAAAAAH/4A/AAAAAA/+AD8AAAAAP/wAPwAAAAB/8AA/AAAAAf/gAD8AAAAD/4AAPwAAAA//AAA/AAAAD///////wAAP///////AAA///////8AAD///////wAAP///////AAA///////8AAD///////wAAP///////AAAAAAAA/AAAAAAAAAD8AAAAAAAAAPwAAAAAAAAA/AAAAAAAAAD8AAAAAAAAAPwAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAQAB/gAAAD//gAD+AAA////AAP8AAD///8AAfwAAP///wAB/AAA////AAH8AAD///8AAf4AAP///wAA/gAA////AAD+AAD/+H8AAP4AAP4AfwAA/gAA/gB+AAD+AAD+AH4AAP4AAP4AfwAA/gAA/gB/AAD+AAD+AH8AAP4AAP4AfwAB/gAA/gB/AAH+AAD+AH+AA/wAAP4Af8AD/AAA/gB/4A/8AAD+AD////gAAP4AP///+AAA/gAf///wAAD+AB////AAAP4AD///4AAA/gAH///AAAAAAAP//4AAAAAAAf/+AAAAAAAAf/gAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf//AAAAAAAf///gAAAAAP////gAAAAD/////gAAAAf/////AAAAD/////+AAAA//////8AAAD//////4AAAf/8/4//gAAD/8H+Af/AAAP/AfgAf8AAB/wD+AA/wAAH+APwAB/gAA/wB/AAD+AAD+AH4AAP4AAP4AfgAA/gAB/gB+AAD+AAH8AH4AAP4AAfwAfgAA/gAB/AB/AAH+AAH8AH8AAf4AAfwAf4AD/AAB/AB/4A/8AAH8AH////wAAfwAP///+AAB/AA////4AAH8AB////AAAfwAD///4AAA/AAH///AAAAAAAP//4AAAAAAAP/+AAAAAAAAP/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAA/gAAAAAAAAD+AAAAAAAAAP4AAAAAAAAA/gAAAAAAAAD+AAAAAAAAAP4AAAAADAAA/gAAAAB8AAD+AAAAAfwAAP4AAAAH/AAA/gAAAB/8AAD+AAAAf/wAAP4AAAP//AAA/gAAD//8AAD+AAA///wAAP4AAP//8AAA/gAD///AAAD+AB///wAAAP4Af//4AAAA/gH//+AAAAD+B///gAAAAP4f//wAAAAA/v//8AAAAAD////AAAAAAP///wAAAAAA///4AAAAAAD//+AAAAAAAP//gAAAAAAA//wAAAAAAAD/8AAAAAAAAP/AAAAAAAAA/wAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAH/wAAAAH8AB//gAAAB/8AP//gAAAf/8B//+AAAB//4P//8AAAP//w///4AAB///n///gAAH//+////AAA/////gf8AAD/h//4AfwAAP4B//AB/gAB/gD/4AD+AAH8AP/gAP4AAfwAf8AA/gAB/AA/wAB+AAH4AD/AAH4AAfwAP8AAfgAB/AB/4AD+AAH8AH/gAP4AAfwA//AA/gAA/gH/+AH+AAD/h//8AfwAAP//+/4D/AAAf//7///8AAB///H///gAAD//4P//+AAAP//g///wAAAf/8B//+AAAA//gD//wAAAA/4AH/+AAAAAAAAH/wAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAD//AAAAAAAA///AAAAAAAH//+AAPwAAB///8AA/gAAP///4AD+AAA////wAP4AAH////AA/gAAf///8AD+AAD/4B/4AP4AAP+AB/gA/gAA/gAD+AD+AAH+AAP4AP4AAfwAAfgA/gAB/AAB+AD+AAH8AAH4AP4AAfwAAfgB/AAB/AAB+AH8AAH8AAH4A/wAAf4AA/AH+AAA/gAD8A/4AAD/gAfwH/gAAP/AD+B/8AAAf/g/w//gAAB//////+AAAD//////wAAAH/////+AAAAP/////wAAAAf////8AAAAA/////AAAAAA////wAAAAAAf//4AAAAAAAH/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAfgAAAAP8AAD/AAAAA/4AAf8AAAAH/gAB/4AAAAf+AAH/gAAAB/4AAf+AAAAH/gAB/4AAAAf+AAH/AAAAA/wAAP8AAAAB+AAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
+    46,
+    atob("EhklJSUlJSUlJSUlEg=="),
+    64+(scale<<8)+(1<<16)
+  );
+};
+
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(function () {
+        draw();
+    }, 60300 - (Date.now() % 60000)); // We aim for 300ms into the next minute to ensure we make it!
+}
+
+function draw() {
+    var date = new Date();
+    var h = date.getHours(),
+        m = date.getMinutes();
+    var d = date.getDate(),
+        w = date.getDay(); // d=1..31; w=0..6
+    const level = E.getBattery();
+    const width = level + (level/2);
+    var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
+    var dows = require("date_utils").dows(0,1);
+
+    g.reset();
+    g.clear();
+
+    g.setFontOpenSans();
+    g.setFontAlign(0, -1);
+    if (is12Hour) {
+      if (h > 12) h -= 12;
+      if (h == 0) h = 12;
+      g.drawString(h + ":" + ("0"+m).substr(-2), g.getWidth() / 2, 30);
+    } else {
+      g.drawString(("0"+h).substr(-2) + ":" + ("0"+m).substr(-2), g.getWidth() / 2, 30);
+    }
+    g.setFontAlign(1, -1);
+    g.drawString(d, g.getWidth() -6, 98);
+    g.setFont('Vector', 52);
+    g.setFontAlign(-1, -1);
+    g.drawString(dows[w].slice(0,2).toUpperCase(), 6, 103);
+
+    g.fillRect(9,159,166,171);
+    g.fillRect(167,163,170,167);
+    if (Bangle.isCharging()) {
+      g.setColor(1,1,0);
+    } else if (level > 40) {
+      g.setColor(0,1,0);
+    } else {
+      g.setColor(1,0,0);
+    }
+    g.fillRect(12,162,12+width,168);
+    if (level < 100) {
+      g.setColor(g.theme.bg);
+      g.fillRect(12+width+1,162,162,168);
+    }
+
+    g.setColor(0, 1, 0);
+    g.fillRect(0, 90, g.getWidth(), 94);
+
+    // widget redraw
+    Bangle.drawWidgets();
+    queueDraw();
+}
+
+Bangle.on('lcdPower', on => {
+    if (on) {
+        draw(); // draw immediately, queue redraw
+    } else { // stop draw timer
+        if (drawTimeout) clearTimeout(drawTimeout);
+        drawTimeout = undefined;
+    }
+});
+
+Bangle.on('charging', (charging) => {
+    draw();
+});
+
+Bangle.loadWidgets();
+draw();
+
+Bangle.setUI("clock");
diff --git a/apps/bigdclock/bigdclock.icon.js b/apps/bigdclock/bigdclock.icon.js
new file mode 100644
index 000000000..4aaecfa23
--- /dev/null
+++ b/apps/bigdclock/bigdclock.icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgJC/AAMD4F4AgN4g/D/4FB/E/AoUH/F/AoOAh4FCz4FD4EPAoUHAoOHwAFDx/AAoUfAol/g4RD/w1Cg/B/AFD4fwn4XC4fg8/wAoPH//P7AFE9wFE8YFEEwcf4+BwAFBiACBAoUwAQPAAQMgAQNAArIjFF4sYgEBAoUIAoIRChi3B8AFBg8Ah/wAoIVBjH8ZAXguF+AoSDBn7WEh4FEg4"))
diff --git a/apps/bigdclock/bigdclock.png b/apps/bigdclock/bigdclock.png
new file mode 100644
index 000000000..4da1a9010
Binary files /dev/null and b/apps/bigdclock/bigdclock.png differ
diff --git a/apps/bigdclock/metadata.json b/apps/bigdclock/metadata.json
new file mode 100644
index 000000000..e80dd9a04
--- /dev/null
+++ b/apps/bigdclock/metadata.json
@@ -0,0 +1,17 @@
+{ "id": "bigdclock",
+  "name": "Big digit clock containing just the essentials",
+  "shortName":"Big digit clk",
+  "version":"0.03",
+  "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",
+  "tags": "clock",
+  "allow_emulator":true,
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "screenshots": [ { "url":"screenshot.png" } ],
+  "storage": [
+    {"name":"bigdclock.app.js","url":"bigdclock.app.js"},
+    {"name":"bigdclock.img","url":"bigdclock.icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/bigdclock/screenshot.png b/apps/bigdclock/screenshot.png
new file mode 100644
index 000000000..8a12b266e
Binary files /dev/null and b/apps/bigdclock/screenshot.png differ
diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog
index ea8934f84..873f90de6 100644
--- a/apps/calendar/ChangeLog
+++ b/apps/calendar/ChangeLog
@@ -7,3 +7,4 @@
 0.07: Fix off-by-one-error on previous month
 0.08: Do not register as watch, manually start clock on button
       read start of week from system settings
+0.09: Fix scope of let variables
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index fc7e93cf5..f4676fc22 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -16,6 +16,12 @@ const white = "#ffffff";
 const red = "#d41706";
 const blue = "#0000ff";
 const yellow = "#ffff00";
+let bgColor = color4;
+let bgColorMonth = color1;
+let bgColorDow = color2;
+let bgColorWeekend = color3;
+let fgOtherMonth = gray1;
+let fgSameMonth = white;
 
 let settings = require('Storage').readJSON("calendar.json", true) || {};
 let startOnSun = ((require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0) === 0;
@@ -27,19 +33,12 @@ if (settings.ndColors === undefined)
   }
 
 if (settings.ndColors === true) {
-  let bgColor = white;
-  let bgColorMonth = blue;
-  let bgColorDow = black;
-  let bgColorWeekend = yellow;
-  let fgOtherMonth = blue;
-  let fgSameMonth = black;
-} else {
-  let bgColor = color4;
-  let bgColorMonth = color1;
-  let bgColorDow = color2;
-  let bgColorWeekend = color3;
-  let fgOtherMonth = gray1;
-  let fgSameMonth = white;
+  bgColor = white;
+  bgColorMonth = blue;
+  bgColorDow = black;
+  bgColorWeekend = yellow;
+  fgOtherMonth = blue;
+  fgSameMonth = black;
 }
 
 function getDowLbls(locale) {
diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json
index 5f968b364..65a54c097 100644
--- a/apps/calendar/metadata.json
+++ b/apps/calendar/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "calendar",
   "name": "Calendar",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Simple calendar",
   "icon": "calendar.png",
   "screenshots": [{"url":"screenshot_calendar.png"}],
diff --git a/apps/calibration/ChangeLog b/apps/calibration/ChangeLog
new file mode 100644
index 000000000..0e22605af
--- /dev/null
+++ b/apps/calibration/ChangeLog
@@ -0,0 +1,2 @@
+1.00: New App!
+1.01: Use fractional numbers and scale the points to keep working consistently on whole screen
diff --git a/apps/calibration/README.md b/apps/calibration/README.md
index 37f637d21..ed1a29d9e 100644
--- a/apps/calibration/README.md
+++ b/apps/calibration/README.md
@@ -6,6 +6,7 @@ A simple calibration app for the touchscreen
 Once lauched touch the cross that appear on the screen to make
 another spawn elsewhere.
 
-each new touch on the screen will help to calibrate the offset
-of your finger on the screen. After five or more input, press
-the button to save the calibration and close the application.
\ No newline at end of file
+Each new touch on the screen will help to calibrate the offset
+of your finger on the screen. After four or more inputs, press
+the button to save the calibration and close the application. Quality
+of the calibration gets better with every touch on a cross.
diff --git a/apps/calibration/app.js b/apps/calibration/app.js
index d3823de63..049430d45 100644
--- a/apps/calibration/app.js
+++ b/apps/calibration/app.js
@@ -1,40 +1,60 @@
 class BanglejsApp {
   constructor() {
+    this.maxSamples = 16;
+    this.target = {
+      xMin: Math.floor(0.1 * g.getWidth()),
+      xMax: Math.floor(0.9 * g.getWidth()),
+      yMin: Math.floor(0.1 * g.getHeight()),
+      yMax: Math.floor(0.9 * g.getHeight()),
+    };
     this.x = 0;
     this.y = 0;
+    this.step = 0;
     this.settings = {
-      xoffset: 0,
-      yoffset: 0,
+      xoffset: [0],
+      yoffset: [0],
+      xMaxActual: [this.target.xMax],
+      yMaxActual: [this.target.yMax],
       };
   }
 
   load_settings() {
     let settings = require('Storage').readJSON('calibration.json', true) || {active: false};
 
-    // do nothing if the calibration is deactivated
-    if (settings.active === true) {
-      // cancel the calibration offset 
-      Bangle.on('touch', function(button, xy) {
-        xy.x += settings.xoffset;
-        xy.y += settings.yoffset;
-      });
-    }
-    if (!settings.xoffset) settings.xoffset = 0;
-    if (!settings.yoffset) settings.yoffset = 0;
-
     console.log('loaded settings:');
     console.log(settings);
 
     return settings;
   }
 
-  save_settings() {
-    this.settings.active = true;
-    this.settings.reload = false;
-    require('Storage').writeJSON('calibration.json', this.settings);
+  getMedian(array){
+    array.sort();
+    let i = Math.floor(array.length/2);
+    if ( array.length % 2 && array.length > 1 ){
+        return (array[i]+array[i+1])/2;
+    } else {
+        return array[i];
+    }
+  }
 
-    console.log('saved settings:');
-    console.log(this.settings);
+  getMedianSettings(){
+    let medianSettings = {
+      xoffset: this.getMedian(this.settings.xoffset),
+      yoffset: this.getMedian(this.settings.yoffset)
+    };
+
+    medianSettings.xscale = this.target.xMax / (medianSettings.xoffset + this.getMedian(this.settings.xMaxActual));
+    medianSettings.yscale = this.target.yMax / (medianSettings.yoffset + this.getMedian(this.settings.yMaxActual));
+    return medianSettings;
+  }
+
+  save_settings() {
+    let settingsToSave =  this.getMedianSettings();
+    settingsToSave.active = true;
+    settingsToSave.reload = false;
+    require('Storage').writeJSON('calibration.json', settingsToSave);
+
+    console.log('saved settings:', settingsToSave);
   }
 
   explain() {
@@ -46,29 +66,78 @@ class BanglejsApp {
   }
 
   drawTarget() {
-    this.x = 16 + Math.floor(Math.random() * (g.getWidth() - 32));
-    this.y = 40 + Math.floor(Math.random() * (g.getHeight() - 80));
+    switch (this.step){
+      case 0:
+        this.x = this.target.xMin;
+        this.y = this.target.yMin;
+        break;
+      case 1:
+        this.x = this.target.xMax;
+        this.y = this.target.yMin;
+        break;
+      case 2:
+        this.x = this.target.xMin;
+        this.y = this.target.yMax;
+        break;
+      case 3:
+        this.x = this.target.xMax;
+        this.y = this.target.yMax;
+        break;
+    }
 
-    g.clearRect(0, 24, g.getWidth(), g.getHeight() - 24);
+    g.clearRect(0, 0, g.getWidth(), g.getHeight());
+    g.setColor(g.theme.fg);
     g.drawLine(this.x, this.y - 5, this.x, this.y + 5);
     g.drawLine(this.x - 5, this.y, this.x + 5, this.y);
     g.setFont('Vector', 10);
-    g.drawString('current offset: ' + this.settings.xoffset + ', ' + this.settings.yoffset, 0, 24);
+    let medianSettings = this.getMedianSettings();
+    g.drawString('current offset: ' + medianSettings.xoffset.toFixed(3) + ', ' + medianSettings.yoffset.toFixed(3), 2, (g.getHeight()/2)-6);
+    g.drawString('current scale: ' + medianSettings.xscale.toFixed(3) + ', ' + medianSettings.yscale.toFixed(3), 2, (g.getHeight()/2)+6);
   }
 
   setOffset(xy) {
-    this.settings.xoffset = Math.round((this.settings.xoffset + (this.x - Math.floor((this.x + xy.x)/2)))/2);
-    this.settings.yoffset = Math.round((this.settings.yoffset + (this.y - Math.floor((this.y + xy.y)/2)))/2);
+    switch (this.step){
+      case 0:
+        this.settings.xoffset.push(this.x - xy.x);
+        this.settings.yoffset.push(this.y - xy.y);
+        break;
+      case 1:
+        this.settings.xMaxActual.push(xy.x);
+        this.settings.yoffset.push(this.y - xy.y);
+        break;
+      case 2:
+        this.settings.xoffset.push(this.x - xy.x);
+        this.settings.yMaxActual.push(xy.y);
+        break;
+      case 3:
+        this.settings.xMaxActual.push(xy.x);
+        this.settings.yMaxActual.push(xy.y);
+        break;
+    }
+
+    for (let c in this.settings){
+      if (this.settings[c].length > this.maxSamples) this.settings[c] = this.settings[c].slice(1, this.maxSamples);
+    }
+  }
+
+  nextStep() {
+    this.step++;
+    if ( this.step == 4 ) this.step = 0;
   }
 }
 
 
 E.srand(Date.now());
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 
 calibration = new BanglejsApp();
 calibration.load_settings();
+Bangle.disableCalibration = true;
+
+function touchHandler (btn, xy){
+  if (xy) calibration.setOffset(xy);
+  calibration.nextStep();
+  calibration.drawTarget();
+}
 
 let modes = {
   mode  : 'custom',
@@ -76,10 +145,7 @@ let modes = {
     calibration.save_settings(this.settings);
     load();
   },
-  touch : function(btn, xy) {
-    calibration.setOffset(xy);
-    calibration.drawTarget();
-  },
+  touch : touchHandler,
 };
 Bangle.setUI(modes);
 calibration.drawTarget();
diff --git a/apps/calibration/boot.js b/apps/calibration/boot.js
index 237fb2e0d..03b17a03a 100644
--- a/apps/calibration/boot.js
+++ b/apps/calibration/boot.js
@@ -1,7 +1,7 @@
 let cal_settings = require('Storage').readJSON("calibration.json", true) || {active: false};
 Bangle.on('touch', function(button, xy) {
   // do nothing if the calibration is deactivated
-  if (cal_settings.active === false) return;
+  if (cal_settings.active === false || Bangle.disableCalibration) return;
 
   // reload the calibration offset at each touch event /!\ bad for the flash memory
   if (cal_settings.reload === true) {
@@ -9,6 +9,6 @@ Bangle.on('touch', function(button, xy) {
   }
 
   // apply the calibration offset
-  xy.x += cal_settings.xoffset;
-  xy.y += cal_settings.yoffset;
+  xy.x = E.clip(Math.round((xy.x + (cal_settings.xoffset || 0)) * (cal_settings.xscale || 1)),0,g.getWidth());
+  xy.y = E.clip(Math.round((xy.y + (cal_settings.yoffset || 0)) * (cal_settings.yscale || 1)),0,g.getHeight());
 });
diff --git a/apps/calibration/metadata.json b/apps/calibration/metadata.json
index 122a2c175..b7a719e1c 100644
--- a/apps/calibration/metadata.json
+++ b/apps/calibration/metadata.json
@@ -2,7 +2,7 @@
   "name": "Touchscreen Calibration",
   "shortName":"Calibration",
   "icon": "calibration.png",
-  "version":"1.00",
+  "version":"1.01",
   "description": "A simple calibration app for the touchscreen",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
diff --git a/apps/cassioWatch/ChangeLog b/apps/cassioWatch/ChangeLog
new file mode 100644
index 000000000..f00b3fa0a
--- /dev/null
+++ b/apps/cassioWatch/ChangeLog
@@ -0,0 +1,10 @@
+0.0: Main App.
+0.1: Performance Fixes.
+0.2: Correct Screen Clear and Draw.
+0.3: Minor Fixes.
+0.4: Clear Old Time on Screen Before Draw new Time
+0.5: Update Date and Time to use Native date Funcions
+0.6: Add Settings Page
+0.7: Update Rocket Sequences Scope to not use memory all time
+0.8: Update Some Variable Scopes to not use memory until need
+0.9: Remove ESLint spaces
\ No newline at end of file
diff --git a/apps/cassioWatch/README.md b/apps/cassioWatch/README.md
new file mode 100644
index 000000000..1342af8e6
--- /dev/null
+++ b/apps/cassioWatch/README.md
@@ -0,0 +1,10 @@
+# cassioWatch
+
+![Screenshot](screens/screen_night.png) ![Screenshot](screens/screen_day.png)
+
+Clock with Space Cassio Watch Style.
+
+It displays current temperature,day,steps,battery.heartbeat and weather.
+
+**To-do**:
+Integrate heartbeat and Weather, Align and change size of some elements.
diff --git a/apps/cassioWatch/app.js b/apps/cassioWatch/app.js
new file mode 100644
index 000000000..93538ec50
--- /dev/null
+++ b/apps/cassioWatch/app.js
@@ -0,0 +1,133 @@
+require("Font6x12").add(Graphics);
+require("Font8x12").add(Graphics);
+require("Font7x11Numeric7Seg").add(Graphics);
+
+let ClockInterval;
+let RocketInterval;
+let BatteryInterval;
+
+function bigThenSmall(big, small, x, y) {
+  g.setFont("7x11Numeric7Seg", 2);
+  g.drawString(big, x, y);
+  x += g.stringWidth(big);
+  g.setFont("8x12");
+  g.drawString(small, x, y);
+}
+
+function ClearIntervals(inoreclock) {
+  if (RocketInterval) clearInterval(RocketInterval);
+  if (BatteryInterval) clearInterval(BatteryInterval);
+  RocketInterval = undefined;
+  BatteryInterval = undefined;
+  if (inoreclock) return;
+  if (ClockInterval) clearInterval(ClockInterval);
+  ClockInterval = undefined;
+}
+
+function getBackgroundImage() {
+  return require("heatshrink").decompress(atob("2GwwkGIf4AfgMRkUiiIHCiMRiAMDAwYCCBAYVDAHMv/4ACkBIBAgPxBgM/BYXyAoICBCowA5gRADKQUDKAYMCmYCBiBXBCo4A5J4MxiMSKQUf+YBBBgSiBgc/kBXBBAMyCoK2CK/btCiUhfAJLCkBkDiMQgBXDCoUvNAJX+AAU/+MB/8wAQIAC+cQK5hoDgIEBBIQFEAYIPHBIgBBAQQIDBwZXSKIMxgJaBgEjmZYCmBXLgLBBkkAgUhiMxBIM0iMSCoMRkZECkQJEichBINDiETAgISBiQTDK6MvJAXzVIQrBBYMCK5E/K4kwGIJXFgdAMgQQBiYiCDgU0HQSlCgMikIEBEAMTDYJXQ+UikYDBj6nCAAMTWoJ6BK4oVEK4c0oQ+BK4MjAgMDJoJXHNYJXHBwa0BohcDY4QAKgJQE+LzBNwJVBkQMEkBXBCoyvFJAVAKISaBiMiHQRIDkVBoSyCK5CvBAgavNDAJAC+cQn5DCgSpBl4MDgBXBgCsBCoYoMLAKREgIKDBJIdKK5oA/AH4A/AH4A/ADUBIH4APiAFEi1mAGUADrkRKwUGK2ZXes1gK2xXfD8A3/K/4AWgxX/ACtga2AwIHLkAgCwvJw6RcDgIABK+w4cK/I4dsEGP5BXtSAQ6BV/5XSG4RX/K6Y3fK+42CK/5XTGwcGK/5XSVwY5cK+o1DAAayYsAhDsCv4K7BTBK4YeYK7CyFVzJXFFIpXtVwYiYK/rmZKYYDDELJXXG4YiaK/Y0aKgQAEK+gkdKt5XGKzqv5GTpX6ETlgK4xWrKTyxKVthXmAGRX/K/5X/AH5X/K/4gBAH4A/AFz/uAH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AHNggEGHfEAgAEHKyQXVK0qTCAggbUK+6SDAApzXK/5BRDYZX3KxBBSYqxXngyvaV25XEd4ZCSsAcBAoRZ2dQZXBLwgaQCIYeCAGirCS4YGCDSJXCC6ZaodYICBZzSw4S4I+XDgSv4K4rzCK/47RAQTMaWHI9YV3TscV3aVagByBK3SwCSqyt8AAQ+XK/4A/AH4A/AH4A3gAA/AH4AuZbdggwc3ADpX/K/5XxsEAgA+XK/o8BgBX/K64/WK/4/XK/5X/K/5XvgBX/K64cYHrw4CSTFggCuXK4oDCEQJXYDS6ScDgg4CPKyRCAAZX0HAgBDK+LlYK4oeBAwZ9aK+lgAoQGBgyvzDIIDBK66sCG4JXYCwIBDK7ADCK+xZCHwJXzGoQ8BK7DpBAAaSXSgRXZO4okCK+IaXV4oABEILSWSYjRCHSo3BDSxXEAAIcBAISvyKawcIAYIGCK/4cUH4YlaHS0AHgI1XOg5YBPrY6WHgRXfAGRXDHzBX8VoJX/K68ADjRX6sBX/K/5X/K8wdcK/UAG7B0iKzZYbK/BWDAH4A/hWpzWhIf4ASgOpzIAB0EAhhH/AB8ZzGJ1WazMA4pH/AB+pxOZxOpzVMqA2ugUzmcgD7cKVYOqzGqpnRFw8ykchK8kviEBmQFBgMiFocSCAcSkUQAgMikRsHhWqxOq0Ut4mqBw0DC4IxBD4wpBHAQMCA4cCGJIAFj8hDIQuBkMTCwU/AYQJBiUxFoPxiIVDK4kyxUz4cxl+KK5MfDQXyD4UCmMSmAEBAQQHDgMTmIxHAAqpBmaqCFwMDEYZRBgEjCQQBB+USK5E/ns/0Uzwc6K48ykYkCK4IfCc4I4CK4QHEBAYAMiICBmYuDmQEBh8iAgRXCLISvJO4MqwcklEiK5CADV4oaBV4oHEK6Eve4JNCbwRfCiMTFoMDkMRSAJXCD49azWp0UqzWayJXIQwcAO4cCkMCFIJOCA4XxK6KPBkR6DTwYyBAwYPEAggfFzORpWK1OZyAOHJ4QfERAUSEgQxIIIgAr1URWIOZzOgGtwAhgMZzWq1OaIv4ASKgOqzTkvAEmq1WgFtQA=="));
+}
+
+function getRocketSequences() {
+  return {
+    1: require("heatshrink").decompress(atob("qFGwkCkQAiiEBEkUgKQhPhE8ogCE8YhCiQoEE7pKEPIgncTQ4neEwpQCPoh1eJYYwCJ7QmHKAh1hZIpOjPAUBJ0ZQCTzEhExZ1lPAZ1kKDQmOJ65O2E65OPOy5O2E64mPOyxO/J2wnPJyx2QJ35O/J2khE0p2POq52PEy4nOiQnlOrEhiSfMJrEggQnLJzB1CPBQmZkInMEzBQDPBImbPBR1ZEoRMCZYImhgQgEE0BzFKAgmaDwLDFKAbqdYQwHBOrcgDgLBFJrsiiRNGYbpLBY4Ymhd4omkkUhE0pQEEwUBJjrHBd4QmCdzoiBDwYrCPLyZHF4QnagQeCE8UgJwYniJwgnIOzwfFO0wJCJzMQE4gyFEzR2FBQombkInDQI4AakAnBTYS+ZE5BMDE0LEES7YnLE0R3FAEQA=")),
+    2: require("heatshrink").decompress(atob("qFGwkCkQAikMAgIliKYon/AA0gEAQniEwIhCAgYndEIjqBE8CaGKogmgKAp1fKAgncExBQBBQR1gKAp7BJ0IndExR4CE0idaOpYnbExqeYJxxPYEx0BJ0x2XExx2XJ20QE6xONJi5OPGwJOlBwLFkLoLFlBwJOkOwJOlE4JOkTjBOOE/52Pdi5OPEy7FnE5wmXE5xOZT5gmYEoMiiB1lgR4KTLAkDPBJ1WIAYDDKA4mWJwchDwYEDTjQiDJQh4GYLAhHFosSJy6OCTIxaEEywbBKYwjEEzMgUQxQFBogAURwZOGOjTKJdTYnOEryfHE0JQEfIpQgYQMAgJLeAgrtfTI4ndgSaFE4h0bdQkSZQpOfEAgIBO0AnEdrh2FJAb1EdbInEBIpObOwhOEEzYnFXzZ2HE4QlhE4QlDFMKcDYooniO0QnDT0YnCE0ciA")),
+    3: require("heatshrink").decompress(atob("qFGwkEogAjiMUEkVAKYgnhPYolgOQIniOYZ4FOcLqBE8CaGKojpgKAomhEYUQE7gmHKAIxCE0QkCPYR1gZIgnZExR4CJ0idmE7ZONYzImNgEUJ0p3YJRh2ZJJwnXOpQhBdkpaETsMEGQhOhE7jFLUYpOfTzgmKE4hOiE4hOigEUJ0rvCEywnPEqx2OTjBOOE7ImOTsqeZE5zFYoJOmT5kBJzEAih4LdK5mBAQInKOqoYDEgR4JEypHDEYbxJOq5ABdgZ7CEzZOEJQgnGihOYEIzJFTionCKYxWGEy9ADAYnGUIYmWog/EdBFAEy7KIKAwnjKwLqWE5pMeT48CVQpQfgMjKEtEiAnfEQJQCgJSCTcB6FJzkEdYcUE8FAdQghDOzonKTjh2EZAidcDoInHJzodBOwx/BE8JxcOwsAOwQmhJgSXDObwnFEwUUO0LFGE8aeiE4YmiokQE0tE")),
+    4: require("heatshrink").decompress(atob("qFGwkCkQAjiMSEkRTFE/4AGkMAgQCBE8MgEIYEDE7whDdQIngTQxVEE0ChFTjxQFE7jnFKAgxCOsBQFZgJ1gE7wmKPAROkTrTEHGAwnYiBHJFAaeXOoyXBEQZPac5AsFgJOhAoh2XJwwnFKoROdE4J9GJzwnIiQmVkInPAC0QE5AJFE64mHY5DFdE4SBEYr5JDJ0hKDJ0jCZJxoACgInmKLAmOTq5OOEy5OPTsxOYE5wmXO5wlYkAnMOqshiRNCgR4LOC8CkJCCEzxHDAgYnJOqpAEDoZ4HEyodDEQpQHdCsQOwwFHEyzoCPYzJGEy0gEwaZGA4acVEQSjHKAomXkQYEYAwlZeRKYDE8gjCYa7zJEwcCkImfKAb4FAD0hdTh4LgRSBOcR0CJz0gYYrrgN4QnEYrxOEE4bEeiAnGF4J2idL6VDE8ohBE0gnFE0J0BE4QGBiROgdIQABgJ2hJoTtjYgZSEE8ScgE4omikUQTcQADA=")),
+    5: require("heatshrink").decompress(atob("qFGwkCkQAikMAgIliKYonhiAnjkEATIIniEwIhCAgYndEIhQFYUZVEE0BQFOr5QEeQQmiKAL1DOr5QEE7ROCDgZVEAoInZDwchFQQoDPAJOdEQYrBdrZFDOYwncEJDsDVIpOXgJxEE4pObEAgGFgJOaE48BaIhOZJ5ZObY5ROcE441CE6xOGPAwtCJzpGCJ0hHDkI1DJzwoEJzInLFg52dUo5O/J35OzE54mWOx4mXJxx1XE54mXkUhExkSJzCfMOrAlBPBiZXgQDBAQQmgJgh4JOqoYEFYwmaDoZzEFgh1YDgkiiAFEKAroXJJAGFiQmVkCNDTIz5EJy57HKAomXkQYEJoqaYeRadEJrAnJEQUAgJPiAoYmeT4cCkAnBE0BKCJkT1EkDCeJYYiDOkLDFFL5wBE4guCPDhEBEwQiDY70CkInDiQnCJzkhOwhKDdzp2Idb4nEE0B0Bdo4niE0J0CeYhOhgESUYYnidsgnEE0KeCE0gnDE0ciA")),
+    6: require("heatshrink").decompress(atob("qFGwkCkQA/ABEgKQZPhEwgABEsAoGJkBxBE8JKEAowAbJIhQEgLDiPooAdKA4ncTZAndSwhQEFoInaJQkSKAwlZdgwnfSgYADE4h1ZDwInlcggnIOzAdCE8i7EY5J3XDgYhGd4pOZEI52bSYwGCOAJ2bYIodEOzZOFFAjFcEwwAIE6xOHABBO/J34ndEyx2PJ00BJ00SJ0p1XE54mXOxxO/J5wmYgQnMOrB2BPBgkWiJ1CPBbBYAYR4KiTAXRwIrFTjgZDJYZ4IEyoiEIwrDcEJJQFOqwiBDARxFFwgmXkAYDEogsBF4QmXEQJ7GUYYkBEzDKJAgYmdEQbKFEzonEKYgngJwgmfZggmjKQghgiBRGkBzeTgUikJRgc47LDErTnDEAkQJzkCJwYnEJzonEJIaddOwhJEJzgdBE4hYEJzieJADgnEE0KUCXzoAGkJLEiB2hOgQDBT0TsDT0YmlE4YmjkQ=")),
+    7: require("heatshrink").decompress(atob("qFGwkCkQAhkIpBiQlhkBSEJ8InlEIIoFE7whEE8pQFE7giBJQoneI4MCTYhQDE7YdCYYondEQYnEPwZ1bE5BQCJzonHkR2ZEAkBE4pNBE7zHFYrYhFUgonaXAQeEEwruZEYcgiROHJ7AfDAwxOeAAURiAmHE65HIOzwmOJ35OPE6xOPO35O/J35O/J1gnPEyx2PEy5OOOq5OnE5xOYO5omZgJQMJrQnLiQnagR4JOq5nCDgZ1fEYRLDE5DoZkUQNoZ4GOrJKGAoomXOw7lCAwYmYDgJSEAAUBA4QDBJzB6FOQrDXJwTJFdLjJKE9jDYZRAmkKAwmhKAgmiKAYmBkApdJIgjCKYIncOQYvJYTovGE84lagR2DE4xOakBOEgJXFOjYnEJAbtdOwggEkAmbDgInDE0B0BE4QgcE5AkiXYbpCOLonGYo4nhPMYnCUEgnBY0kiA==")),
+    8: require("heatshrink").decompress(atob("qFGwkCkQA/ABBSEJ8MgE4kBEsBPFE7xMCOIJ3hOYgFEE7rCGE70gE4pQBiAndYQwjBUohOZD4ZQFE7YkBE5AICYbZ2GE7sggJRCAA8iYzZOITroALE7EhExh4CAC0QExpPXOponZExx2XJ24nWdh52XdhzF/Yu5O/J35O0E55OXOx5O/J2omXE5x1XO54mYgQnMJrR4LOrciiAmiJgR4KEzIjDPBAlYiAiEeI51YkEBE4J5CD4KceTQQcBJgRQFdTZDCJIjDcNIqhGdTQmCkByFTTInDKgoAEE7ZEEJwhPdE1R1FE0InEE0R3DEwTGcDwomEE7hKFPYqafE8ROCE5DJbE5B/IEqh2ED4gnCJrMCJwgnEiB2bE4qeFEzUggQmIBQLEaEQImHLIImaE4YfcOw4lEFMLECS7onJO8wmkE4QljAAIA==")),
+  };
+}
+
+let rocket_sequence = 1;
+
+let settings = require('Storage').readJSON("cassioWatch.settings.json", true) || {};
+let rocketSpeed = settings.rocketSpeed || 700;
+delete settings;
+
+g.clear();
+
+function DrawClock() {
+  g.setFont("7x11Numeric7Seg", 3);
+  g.clearRect(80, 57, 170, 96);
+  g.setColor(0, 255, 255);
+  g.drawRect(80, 57, 170, 96);
+  g.fillRect(80, 57, 170, 96);
+  g.setColor(0, 0, 0);
+  g.drawString(require("locale").time(new Date(), 1), 70, 60);
+  g.setFont("8x12", 2);
+  g.drawString(require("locale").dow(new Date(), 2).toUpperCase(), 18, 130);
+  g.setFont("8x12");
+  g.drawString(require("locale").month(new Date(), 2).toUpperCase(), 80, 126);
+  g.setFont("8x12", 2);
+  const time = new Date().getDate();
+  g.drawString(time < 10 ? "0" + time : time, 78, 137);
+}
+
+function DrawBattery() {
+  bigThenSmall(E.getBattery(), "%", 135, 21);
+}
+
+function DrawRocket() {
+  let Rocket = getRocketSequences();
+  g.clearRect(5, 62, 63, 115);
+  g.setColor(0, 255, 255);
+  g.drawRect(5, 62, 63, 115);
+  g.fillRect(5, 62, 63, 115);
+  g.drawImage(Rocket[rocket_sequence], 5, 65, { scale: 0.7 });
+  g.setColor(0, 0, 0);
+  rocket_sequence = rocket_sequence + 1;
+  if (rocket_sequence > 8) rocket_sequence = 1;
+}
+
+function DrawScene() {
+  g.reset();
+  g.clear();
+  g.setColor(0, 255, 255);
+  g.fillRect(0, 0, g.getWidth(), g.getHeight());
+  let background = getBackgroundImage();
+  g.drawImage(background, 0, 0, { scale: 1 });
+  g.setColor(0, 0, 0);
+  g.setFont("6x12");
+  g.drawString("Launching Process", 30, 20);
+  g.setFont("8x12");
+  g.drawString("ACTIVATE", 40, 35);
+  g.setFont("8x12", 2);
+  g.drawString("30", 142, 132);
+  g.drawString("55", 95, 98);
+  g.setFont("8x12", 1);
+  g.drawString(Bangle.getStepCount(), 143, 104);
+  ClockInterval = setInterval(DrawClock, 30000);
+  DrawClock();
+  RocketInterval = setInterval(DrawRocket, rocketSpeed);
+  DrawRocket();
+  BatteryInterval = setInterval(DrawBattery, 5 * 60000);
+  DrawBattery();
+}
+
+Bangle.on("lcdPower", (on) => {
+  if (!on) {
+    g.clear();
+    ClearIntervals(true);
+  }
+});
+
+Bangle.on("lock", (locked) => {
+  if (locked) {
+    ClearIntervals(true);
+  } else {
+    ClearIntervals();
+    DrawScene();
+  }
+});
+
+g.reset();
+g.clear();
+Bangle.setUI("clock");
+DrawScene();
+
+if (Bangle.isLocked()) {
+  ClearIntervals(true);
+}
\ No newline at end of file
diff --git a/apps/cassioWatch/app.png b/apps/cassioWatch/app.png
new file mode 100644
index 000000000..3f9bbb36e
Binary files /dev/null and b/apps/cassioWatch/app.png differ
diff --git a/apps/cassioWatch/icon.js b/apps/cassioWatch/icon.js
new file mode 100644
index 000000000..4e4428f88
--- /dev/null
+++ b/apps/cassioWatch/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("lkswkGswAHtGIxGGBhATJAAYXNCYoWOFIwWNChQWKBYWYCxIqTxGJFgwnDnACBkUiCwuYFQo9ECYIAClAsJxIUElAUDwQWEyxAHBwITBmczmUiCwprHCgMjmUhiIYBA4JCGIAeCwQUBCYIXBiUyFggVCFQsziMjmdCkcxiZbBiJCEFQZUBmND93uolEochFgpWEIAUUCgIACp00iZVBzIVEAoJABmUeConu8cRiNEoMZNwIrCzEiiUxpwVF901IwNN6JuBtGJlAVBkchCg3umkSiMNCoIAEQIJWFkgCB8UYinUjIVFxEhKwszDAUU7tRCg2hilTH4xVB6kRzAUGBQIVECYVEorEDAAeBptBiUenw7BCYQACieCCosd6MYwUVBwNUAQYvBeYOJCYVoxVeoK5BAAq0C8MjiM4LALFCilNCAQpCN4lBmUoFQQVCxTlBiMieI3uqUoagIVDRAeCkclCgvlkciFYdmsxwDlESmTdE8lRmSCECosiFgMhqgUDkZABBwWYCoNpIIYXBmchiKLBkYqBNggVBNwIsECwMikQUBlEiBgWJCoRCEEQITDNIJrEIAQABZYOYnIWBFoQUGIAZCCTYYWCAAQUExIUDFggNDAA5AEFg4AIIAhvGEYU4ChgWHAAoUIWYpdFFRIWHChxEICZoWFFBIA=="))
diff --git a/apps/cassioWatch/metadata.json b/apps/cassioWatch/metadata.json
new file mode 100644
index 000000000..70cd9c242
--- /dev/null
+++ b/apps/cassioWatch/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "cassioWatch",
+  "name": "Cassio Watch",
+  "description": "Animated Clock with Space Cassio Watch Style",
+  "screenshots": [{ "url": "screens/screen_night.png" },{ "url": "screens/screen_day.png" }],
+  "icon": "app.png",
+  "version": "0.9",
+  "type": "clock",
+  "tags": "clock, weather, cassio, retro",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": true,
+  "readme": "README.md",
+  "storage": [
+    { "name": "cassioWatch.app.js", "url": "app.js" },
+    {"name":"cassioWatch.settings.js","url":"settings.js"},
+    { "name": "cassioWatch.img", "url": "icon.js", "evaluate": true }
+  ]
+}
diff --git a/apps/cassioWatch/screens/screen_day.png b/apps/cassioWatch/screens/screen_day.png
new file mode 100644
index 000000000..ba150b4f7
Binary files /dev/null and b/apps/cassioWatch/screens/screen_day.png differ
diff --git a/apps/cassioWatch/screens/screen_night.png b/apps/cassioWatch/screens/screen_night.png
new file mode 100644
index 000000000..4055e0943
Binary files /dev/null and b/apps/cassioWatch/screens/screen_night.png differ
diff --git a/apps/cassioWatch/settings.js b/apps/cassioWatch/settings.js
new file mode 100644
index 000000000..b07c6c58f
--- /dev/null
+++ b/apps/cassioWatch/settings.js
@@ -0,0 +1,24 @@
+(function(back) {
+    var FILE = "cassioWatch.settings.json";
+    var settings = Object.assign({
+      rocketSpeed: 700,
+    }, require('Storage').readJSON(FILE, true) || {});
+  
+    function writeSettings() {
+      require('Storage').writeJSON(FILE, settings);
+    }
+  
+
+    E.showMenu({
+      "" : { "title" : "Cassio Watch" },
+      "< Back" : () => back(),
+      'Rocket Speed': {
+        value: 0|settings.rocketSpeed,
+        min: 100, max: 60000,
+        onchange: v => {
+          settings.rocketSpeed = v;
+          writeSettings();
+        }
+      },
+    });
+  })
\ No newline at end of file
diff --git a/apps/cogclock/15x32.png b/apps/cogclock/15x32.png
new file mode 100644
index 000000000..0af326e71
Binary files /dev/null and b/apps/cogclock/15x32.png differ
diff --git a/apps/cogclock/ChangeLog b/apps/cogclock/ChangeLog
new file mode 100644
index 000000000..3158b6116
--- /dev/null
+++ b/apps/cogclock/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New clock
+0.02: Use ClockFace library, add settings
diff --git a/apps/cogclock/app.js b/apps/cogclock/app.js
new file mode 100644
index 000000000..d24031684
--- /dev/null
+++ b/apps/cogclock/app.js
@@ -0,0 +1,111 @@
+Graphics.prototype.setFont15x32N = function() {
+  this.setFontCustom(atob(
+    // 15x32.png, converted using http://ebfc.mattbrailsford.com/
+    "/////oAAAAKAAAACgAAAAoAAAAKAAAACgf//AoEAAQKB//8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+/wAB/oEAAQKBAAECgf//AoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAC////AgAAAQIAAAH+/w///oEIAAKBCAACgQgAAoEIAAKBCAACgQg/AoEIIQKB+CECgAAhAoAAIQKAACECgAAhAoAAIQL//+H+/w/h/oEIIQKBCCECgQghAoEIIQKBCCECgQghAoEIIQKB+D8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+///gAIAAIACAACAAgAAgAIAAIAD/+CAAAAggAAAIIAAACD/+//gAAoAAAAKAAAACgAAAAoAAAAL////+///h/oAAIQKAACECgAAhAoAAIQKAACECgfghAoEIIQKBCD8CgQgAAoEIAAKBCAACgQgAAoEIAAL/D//+/////oAAAAKAAAACgAAAAoAAAAKAAAACgfg/AoEIIQKBCD8CgQgAAoEIAAKBCAACgQgAAoEIAAL/D//+/wAAAIEAAACBAAAAgQAAAIEAAACBAAAAgQAAAIH///6AAAACgAAAAoAAAAKAAAACgAAAAoAAAAL////+/////oAAAAKAAAACgAAAAoAAAAKAAAACgfg/AoEIIQKB+D8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+///h/oAAIQKAACECgAAhAoAAIQKAACECgfghAoEIIQKB+D8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+"
+  ), "0".charCodeAt(0), 15, 32);
+};
+
+/**
+ * Add coordinates for nth tooth to vertices
+ * @param {array} poly Array to add points to
+ * @param {number} n Tooth number
+ */
+function addTooth(poly, n) {
+  const
+    tau = Math.PI*2, arc = tau/clock.teeth,
+    e = arc*clock.edge, p = arc*clock.point, s = (arc-(e+p))/2; // edge,point,slopes
+  const sin = Math.sin, cos = Math.cos,
+    x = clock.x, y = clock.y,
+    r2 = clock.r2, r3 = clock.r3;
+  let r = (n-1)*arc+e/2; // rads
+  poly.push(x+r2*sin(r), y-r2*cos(r));
+  r += s;
+  poly.push(x+r3*sin(r), y-r3*cos(r));
+  r += p;
+  poly.push(x+r3*sin(r), y-r3*cos(r));
+  r += s;
+  poly.push(x+r2*sin(r), y-r2*cos(r));
+}
+
+/**
+ * @param {number} n Tooth number to fill (1-based)
+ * @param col Fill color
+ */
+function fillTooth(n, col) {
+  if (!n) return; // easiest to check here
+  let poly = [];
+  addTooth(poly, n);
+  g.setColor(col).fillPoly(poly)
+    .setColor(g.theme.fg2).drawPoly(poly); // fillPoly colored over the outline
+}
+
+const ClockFace = require("ClockFace");
+const clock = new ClockFace({
+  precision: 1,
+  settingsFile: "cogclock.settings.json",
+  init: function() {
+    this.r1 = 84; // inner radius
+    this.r3 = Math.min(Bangle.appRect.w/2, Bangle.appRect.h/2); // outer radius
+    this.r2 = (this.r1*3+this.r3*2)/5;
+    this.teeth = 12;
+    this.edge = 0.45;
+    this.point = 0.35; // as fraction of arc
+    this.x = Bangle.appRect.x+Bangle.appRect.w/2;
+    this.y = Bangle.appRect.y+Bangle.appRect.h/2;
+  },
+  draw: function(d) {
+    const x = this.x, y = this.y;
+    g.setColor(g.theme.bg2).fillCircle(x, y, this.r2) // fill cog
+      .setColor(g.theme.bg).fillCircle(x, y, this.r1) // clear center
+      .setColor(g.theme.fg2).drawCircle(x, y, this.r1); // draw inner border
+    let poly = []; // complete teeth outline
+    for(let t = 1; t<=this.teeth; t++) {
+      fillTooth(t, g.theme.bg2);
+      addTooth(poly, t);
+    }
+    g.drawPoly(poly, true); // draw outer border
+    if (!this.showDate) {
+      // draw top/bottom rectangles (instead of year/date)
+      g.reset()
+        .fillRect(x-30, y-60, x+29, y-33).clearRect(x-28, y-58, x+27, y-33)
+        .fillRect(x-30, y+60, x+29, y+30).clearRect(x-28, y+58, x+27, y+30);
+    }
+    this.tooth = 0;
+    this.update(d, {s: 1, m: 1, h: 1, d: 1});
+  },
+  update: function(d, c) {
+    g.reset();
+    const pad2 = num => (num<10 ? "0" : "")+num,
+      year = d.getFullYear(),
+      date = pad2(d.getDate())+pad2(d.getMonth()),
+      time = pad2(d.getHours())+pad2(d.getMinutes()),
+      tooth = Math.round(d.getSeconds()/60*this.teeth);
+    const x = this.x, y = this.y;
+    if (c.m) {
+      g.setFont("15x32N:2").setFontAlign(0, 0) // center middle
+        .drawString(time, x, y, true);
+    }
+    if (this.showDate) {
+      if (c.d) {
+        g.setFont("15x32N").setFontAlign(0, -1) // center top
+          .drawString(year, x, y+32, true)
+          .setFont("15x32N").setFontAlign(0, 1) // center bottom
+          .drawString(date, x, y-32, true);
+      }
+    }
+
+    if (tooth!==this.tooth) {
+      if (tooth>this.tooth) {
+        for(let t = this.tooth; t<=tooth; t++) { // fill missing teeth
+          fillTooth(t, g.theme.fg2);
+        }
+      } else {
+        for(let t = this.tooth; t>tooth; t--) { // erase extraneous teeth
+          fillTooth(t, g.theme.bg2);
+        }
+      }
+    }
+    this.tooth = tooth;
+  }
+});
+clock.start();
diff --git a/apps/cogclock/icon.js b/apps/cogclock/icon.js
new file mode 100644
index 000000000..899cfc7c1
--- /dev/null
+++ b/apps/cogclock/icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/ACcikQXpCQUCC4MgBAgqMCQIXEAgQXNBwIDCAggXOABAXLHwQAHMYQXmmczI5oiCBwUjCwIABmQXDEgJ0KCwMwCwMDDAgyGLYoWBgAXBgAYBMZIXEkYWBC4YYBGAh7FFwgHCC4YEBPRIwCFwYXFGAaqHC56oIIwgXFJAbUJLwpgHI4qPDIwpIFR4wWDLwa6BAAQHDVIYYCC/gYCC453MPIR3HU5gADd5bXHC4rvJMAYAECwJeCd5MjGAjVDC4ZHGNARIFGAgNDFw5IJUogwFC4gwBDAhGBBghIFBQhhBbYguEPAweCDAgACCwZACNg5LFXQYsIC5QAFdg4XcCxJHNBwYTEC6A+BJYQEEC5YYBMYhbCCxo0GCaIXbAHgA="))
\ No newline at end of file
diff --git a/apps/cogclock/icon.png b/apps/cogclock/icon.png
new file mode 100644
index 000000000..8520fcf5d
Binary files /dev/null and b/apps/cogclock/icon.png differ
diff --git a/apps/cogclock/metadata.json b/apps/cogclock/metadata.json
new file mode 100644
index 000000000..40733bcd1
--- /dev/null
+++ b/apps/cogclock/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "cogclock",
+  "name": "Cog Clock",
+  "version": "0.02",
+  "description": "A cross-shaped clock inside a cog",
+  "icon": "icon.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"cogclock.app.js","url":"app.js"},
+    {"name":"cogclock.settings.js","url":"settings.js"},
+    {"name":"cogclock.img","url":"icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name": "cogclock.settings.json"}
+  ]
+}
diff --git a/apps/cogclock/screenshot.png b/apps/cogclock/screenshot.png
new file mode 100644
index 000000000..f49709aef
Binary files /dev/null and b/apps/cogclock/screenshot.png differ
diff --git a/apps/cogclock/settings.js b/apps/cogclock/settings.js
new file mode 100644
index 000000000..4eadc32c2
--- /dev/null
+++ b/apps/cogclock/settings.js
@@ -0,0 +1,19 @@
+(function(back) {
+  let s = require('Storage').readJSON("cogclock.settings.json", true) || {};
+
+  function saver(key) {
+    return value => {
+      s[key] = value;
+      require('Storage').writeJSON("cogclock.settings.json", s);
+    }
+  }
+
+  const menu = {
+    "": {"title": /*LANG*/"Cog Clock"},
+    /*LANG*/"< Back": back,
+    /*LANG*/"Show date": require("ClockFace_menu").showDate(s.showDate, saver('showDate')),
+    /*LANG*/"Load widgets": require("ClockFace_menu").loadWidgets(s.loadWidgets, saver('loadWidgets')),
+  };
+
+  E.showMenu(menu);
+});
diff --git a/apps/compass/ChangeLog b/apps/compass/ChangeLog
index d1adafc4c..deb1072f5 100644
--- a/apps/compass/ChangeLog
+++ b/apps/compass/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Fix for Bangle.js 2 and themes
 0.05: Fix bearing not clearing correctly (visible in single or double digit bearings)
 0.06: Add button for force compass calibration
+0.07: Use 360-heading to output the correct heading value (fix #1866)
diff --git a/apps/compass/compass.js b/apps/compass/compass.js
index 4730111ac..dd398ffa6 100644
--- a/apps/compass/compass.js
+++ b/apps/compass/compass.js
@@ -34,7 +34,7 @@ var oldHeading = 0;
 Bangle.on('mag', function(m) {
   if (!Bangle.isLCDOn()) return;
   g.reset();
-  if (isNaN(m.heading)) {
+  if (isNaN(m.heading)) {    
     if (!wasUncalibrated) {
       g.clearRect(0,24,W,48);
       g.setFontAlign(0,-1).setFont("6x8");
@@ -49,7 +49,7 @@ Bangle.on('mag', function(m) {
     g.setFontAlign(0,0).setFont("6x8",3);
     var y = 36;
     g.clearRect(M-40,24,M+40,48);
-    g.drawString(Math.round(m.heading),M,y,true);
+    g.drawString(Math.round(360-m.heading),M,y,true);
   }
 
 
diff --git a/apps/compass/metadata.json b/apps/compass/metadata.json
index 3e3b37f72..a3995a123 100644
--- a/apps/compass/metadata.json
+++ b/apps/compass/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "compass",
   "name": "Compass",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Simple compass that points North",
   "icon": "compass.png",
   "screenshots": [{"url":"screenshot_compass.png"}],
diff --git a/apps/football/ChangeLog b/apps/football/ChangeLog
new file mode 100644
index 000000000..9b91672a5
--- /dev/null
+++ b/apps/football/ChangeLog
@@ -0,0 +1 @@
+1.00: Initial implementation
diff --git a/apps/football/README.md b/apps/football/README.md
new file mode 100644
index 000000000..f751b927e
--- /dev/null
+++ b/apps/football/README.md
@@ -0,0 +1,3 @@
+# Classic Football Chronometer Game
+
+Context: https://www.anaitgames.com/analisis/analisis-casio-football-14
diff --git a/apps/football/app-icon.js b/apps/football/app-icon.js
new file mode 100644
index 000000000..7eec578c6
--- /dev/null
+++ b/apps/football/app-icon.js
@@ -0,0 +1 @@
+atob("MDABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAA/wAAAAAA/wAAAAAA/wAAAAAA/wAAAAAA/wAAAAAA/wAAAAAA/wAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAA//AAAAAA//AAAAAA//AAAAAA//AAAAAADw8AD/AADw8AD/AADw8AD/AADw8AD/AP/wAAD/AP/wAAD/AP/wAAD/AP/wAAD/AA8PAAAAAA8PAAAAAA8PAAAAAA8PAAAAAAAA8AAAAAAA8AAAAAAA8AAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
diff --git a/apps/football/app.js b/apps/football/app.js
new file mode 100644
index 000000000..8350bea88
--- /dev/null
+++ b/apps/football/app.js
@@ -0,0 +1,440 @@
+const digit = [];
+
+const dash = {
+  width: 75,
+  height: 128,
+  bpp: 1,
+  buffer: require('heatshrink').decompress(atob('AH4A/AH4A/AH4A/AH4A/AB0D/4AB+AJEBAX/BAk/CQ8PCQ4kDCQoIDCQgkDCQgkECQgIE4ASHFxH8JRgSEEgYSEPJAkEAH4A/AH4A/AH4A/AH4A/ACg='))
+};
+function loadDigits () {
+  digit[0] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AH4AGn//AAngBIMfBIvABIMPBIuABIMHBIoIBg0DBAn+gYSBgIJE/kHBIOABIn4h4JB4F/BIfwj4JB8BQEAoIJBBoJOEv4JBEIJOEIwMHGoIJDIIIJBJIJOEBIQOCJwYJDOIR9DBISFCSIYJCTISlDBIXwBIZoBBP4J/BP4J/BNX+gED//gBIc/BIMB//ABIcf/gDB/+ABIcP/AhCBAYuBFoU+BIkDFoUcBIkBFoUIBIkAFogA/AAZPJMZJ3JRZKfIWZLHJbZL5bBP4J/BP4J/BKPgBIc/BIfABIcfBIeA/4AB/EPBIcBBIX8AwIJB/0DBIQECBIIOCAAQYBBIIiCAAQsBBIPwGwIAC4F/BIPgJQIACAoIJBBoIJDDIIJBJwZQDBIJODKAcAgxODKAZxBJwgABPYROEKASFDAAiRCJwhQCTYYAkA'))
+  };
+
+  digit[1] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AH4A2wAIHgIJIgYJIg4JIh4JIj4JIn4JIv4JI/4JHgIJIgYJIg4JIh4JIj4JIn4J/BP4J/BP4Jqj//BA0Ah/+BI8H/gJHgf4BI8B+AJHgHgBJFABJAA/J55jIO5KLJT5KzJY5L5nBP4J/BP4J/AAcfBJEPBJEHBJEDBJEBBJEABJN/BJE/BJEfBJEPBJEHBJEDBJEBBJEABJIA/AAwA='))
+  };
+
+  digit[2] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AH4AGj//AAnwBIMPBIvgBIMHBIvABIMDBIuABIMBBIsBGQQIE/0DBIV/BIf8g4JCn4JD/EPKA/wj4JCKAngn4JCKAnAv4JCKAmA/4JCKAgEBQYZOEBIgADFgIJHIAKlJBI5oBBP4J/BP4J/BOcfBJEP/wJHg/8Aof/AAP+gf4BAUBBIX/gPwBIUDBIeA8AiDBIfAoA2DBIYSDJQQACEwZeCAAQ6DgF/BJATJE5I7IghPFBIUOMYomDO4g6EwCLDJwgiDAAhyFTohKEToheEBP4J/BP4J/BOHwBJHgBJHAv////8BImABAP//wJEAIIACBIf+BImABIX8g4JD4AJC/EPBIZACgfwj4JDKgUD8E/BIZoCgZODKAkDJwZQEgcBBIhQCgROEKAhOEKAhOEKAhOEKAgAm'))
+  };
+
+  digit[3] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AH4AGj//AAnwBIMPBIvgBIMHBIvABIMDBIuABIMBBIsBGQQIE/0DBIV/BIf8g4JCn4JD/EPKA/wj4JCKAngn4JCKAnAv4JCKAmA/4JCKAgEBQYZOEBIgADFgIJHIAKlJBI5oBBI58BBP4J/BP4J/BL8/BJEf/wJHh/8BI8H/AFD/4AB/0D+AICgIJDgPgBIUDBIQ5B4AiDBIeAwA2DBIYSDJQIJDEwZeCAAQ6DOQQACJwgTJE5I7JJ5JjEgIUDO4kDFAgJC/kDIwipNj4JIn7HIbZL5TBP4J/BP4J/BJs/BJEfBJEPBIgjB//8g4JDgIIB//+gYJDAgIACBwIJCDAIACwAJDFgIAC4F/IAgAC8E/KggAC+EfIgoAB/EPBIQIDKAROFKAZOGKAROGKAQJI4BOGKAQJI+CfHAEAA=='))
+  };
+  digit[4] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AH4AswEBBJOABAoHBgPABIsDBIPgBIsHBIPwBIsPBIP4BIsfBIP8BIs/BIP+BIt/BIP/BIv/BIRQEAwQCBKAkDBIZQEg4JDKAkPBIZQEj4JIn4J/BP4J/BP4JjgAJFj//AYN/8AJDh/+C4QJEg/8C4XAv////+gYjCh+ABAIABgPwC4Q9BAAWAEYUCgYJD4FAFgYJDIAoJDEwRUDAARoGAAROCCZYnJHZJPJMZAABO46hCRYwAFT4YAFWYYAFY4YAFbYYJ/BP4J/BP4Jnj4JIh4JIg4JIgYJIgIJIgAJJv4JIn4JIj4JIh4JIg4JIgYJIgIJIgAJJAH4AGA='))
+  };
+
+  digit[5] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AGUP/4AE/gJBg4JF/AJBgYJF+AJBgIJF8AJBwAJF4AJB4F/BImABIPgn4JEIoXwj4ID/wJC/BQEJwUA/hQEJwUA/xQEJwUA/5QEJwQJBKAhOCBIJQEJwQJBKAiVDFggAEIAgJFKgYJFNAYJ/BP4J/BP4Jmv/8BI8//AJHj/wBI8P8E//4ABBIcH4F/BIWABIUDwAIC//ABIUBgIJD8AeDgYJDGwkHBIZKEh4JDLwkfBIZyECZInJHZJPFkChEMYdwUIh3DFAiLDgKvIgbDIJQKvIUIgJFUIZ8FBP4J/BP4J/BL8PBJEHBJEDBJEBBIl//4ABwAJEBAQHBv4JCDAIAC8E/BIQsBAAXwj4JCIAIAC/EPBIRUBAAX8g4JCNAIAC/0DBI//gIJCJwZQCBIQIEKANAJwpQCJwxQCJwxQCJwxQCBJYAwA='))
+  };
+
+  digit[6] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AGU//4AE8AJBj4JF4AJBh4JFwAJBg4JFBAMGgYIE/wSCgIJE/gJCwAJE/AJC4F/BIfwBIXgKAhOCg/wKAhOCg/4KAhOD/hQEOwUH/xQDJwRiCKAZOCBIRQDJwQJCGwQAEBIJKCBIxeCBP4J/BP4J/BOED//gBI0B//ABI0A/+ABI9/CoIAB/gJDnwpBAAP+BIccHoIACBIcIh4JDFgkfBIZAEBIhUEv4JDNAgJE/ATNn4nIHZBPGKARjFgIUCO4sDFASLFg48COQsPKARyGUILHGn6hBBIJyGco4J/BP4J/BP4Jm8AJDn4JD4AJDj4JDwAJDh4JDgP/AAP8AwIJB/0DBIQECBIIOCAAQYBBIP4EQIACwAJC+A2BAAXAv4JB8BKBAAQFBBIINBBIYZBBIIhBAAYtBBIJODKAcAgxODKAZnBJwhQCOIYAEPoROEKASZDAAilCJwhQCTYYAuA=='))
+  };
+
+  digit[7] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AGUH/4AE/wJBgYJF/gJBgIJF+AeCBJN/BIngsAJBn4JE4HgBIMfBImBBIUPBIkDBIRQE/0HBIRQE/kPBIRQE/EfBIRQE+E/BIZQD8AJEKAfABYIJCKAYsBBIYADIAIJHKgIJHNAIJ/BP4J/BP4Jzg//4AJGgf/wAJGgP/BAwAB/wJIvgJInAJIiAJIAH5PPMZJ3JRZCfJWZLHJfM4J/BP4J/BP4JNg4JIgYJIgIJIgAJJv4JIn4JIj4JIh4JIeg4JIgYJIgIJIgAJJsAJIkAJIAH4AQA='))
+  };
+
+  digit[8] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AGUf/4AE+AJBh4JF8AJBg4JF4AJBgYJFwAIBgIJFgOAgeABAn+A4MD4F/BIf8g4JB8E/BIf4h4JB+BQEAoIJBBoJOEn4JBEIJOEv4JBGoJOEAIIHBKAgEBBIRQDDAQJCKAYsCBISFCSIYJCTISlDBIX4BIZoBBP4J/BP4J/BNkB//wBIcf/4DB//gBIcP/wDBv/ABIcH/ghCwH/AAP+gYtCj4pBAAUBFoUOHoIACwAtCgkHBIfAoA2DBIZAEJQIACKgheBAARoGBKInJHZBPJMZJ3JRZKfJWZDHJfM4J/BP4J/BP4JP+AJDj4JD8AJDh4JD4AJDg4JDwH/AAP+AwQCBgIJCAgQJBBwQACDAIJB/giBAAXAv4JB/A2BAAXgn4JB+BKBAAQFBBIINBBIYZBBIIhBBIYtBBIJODKAYJBJwhQCwECJwhQCwBxCAAh9CJwhQCTIYAEUoROEKASbDAFwA='))
+  };
+
+  digit[9] = {
+    width: 80,
+    height: 128,
+    bpp: 1,
+    buffer: require('heatshrink').decompress(atob('AGUP/4AE/gJBg4JF/AJBgYJF+AJBgIJF8AJBwAJF4FAgHAv4JEwHAgHgn4JEgIJB+EfBAf+gYJB/BQE/kHBIIDBJwkPBIIXBJwkfBIIrBJwk/BIRQEJYIJCKAgOBBIXgIwYiBBIR7CQ4YJCR4SbDBISjCV4YJC/wJDFYIJ/BP4J/BP4Jjv/8BIcP/+AgE//AJDg//C4XwBIcDEYUP8E//4ABgIjCg/Av4JCwAjCgeABAQ5BuAJBgMBBIfgkAsDBIY2EIAIACJQhUBAAReENAIACOQgTJE5I7JJ5KhBMYwABO44ABRY4AFT4YAFWYYAFY4YAFbYYJ/BP4J/BP4Jnh4JIg4JIgYJIgIJEv//AAOABIgICA4N/BIQYBAAXgn4JCFgIAC+EfBIRABAAX4h4JCKgIAC/kHBIRoBAAX+gYJCn4JD/8BBIRODKAQJCBAhQBoBOFKAROGKAROGKAROGKAQJLAGA='))
+  };
+}
+
+// sprites
+
+const left0 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('ADAwEDgUcCgEAA==')
+};
+
+const left1 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('ADAwEDh0ECAoAA==')
+};
+
+const left2 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('ADAwEBg4EBg0AA==')
+};
+
+const left4 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('ABgYVDgQEChEAA==')
+};
+
+const right0 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('AAwMCBwoDhQgAA==')
+};
+
+const right1 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('AAwMCBwuCAQUAA==')
+};
+
+const right2 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('AAwMCBgcCBgsAA==')
+};
+
+const right4 = left4;
+
+const ball0 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('AAAAAAAwMAAAAA==')
+};
+
+const ball1 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('AAAAAAAAGBgAAA==')
+};
+const gol01 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  transparent: 0,
+  buffer: atob('ABhkhIS0sIAAAA==')
+};
+
+const gol11 = {
+  width: 8,
+  height: 10,
+  bpp: 1,
+  buffer: require('heatshrink').decompress(atob('gEYk0hkMthsBBAI='))
+
+};
+
+loadDigits();
+
+let goalFrame = 0;
+let score0 = 0;
+let score1 = 0;
+
+function printNumber (n, x, y, options) {
+  if (n > 9 || n < -1) {
+    console.log(n);
+    return; // error
+  }
+  if (digit.length === 0) {
+    g.setColor(1, 1, 1);
+    if (options.scale == 0.2) {
+      g.setFont12x20(1);
+    } else {
+      g.setFont12x20(2.5);
+    }
+    g.drawString('' + n, x, y);
+    return;
+  }
+  const img = (n == -1) ? dash : digit[n];
+  if (img) {
+    //   g.setColor(0,0,0);
+    //   g.fillRect(x,y,x+32*options.scale,64*options.scale);
+    g.setColor(1, 1, 1);
+    g.drawImage(img, x, y, options);
+  }
+}
+let inc = 0;
+let msinc = 0;
+let seq0 = 0;
+let seq1 = 0;
+let goaler = -1;
+const w = g.getWidth();
+let owner = -1;
+g.setBgColor(0, 0, 0);
+g.clear();
+g.setColor(1, 1, 1);
+function onStop () {
+  if (goalFrame > 0) {
+    return;
+  }
+  stopped = !stopped;
+  if (stopped) {
+    // Bangle.beep();
+    if (msinc == 0) {
+      // GOOL
+      if (owner == 0) {
+        score0++;
+        goaler = 0;
+      } else if (owner == 1) {
+        score1++;
+        goaler = 1;
+      }
+      goalFrame = 5;
+    }
+    let newOwner = 0;
+    if (msinc % 2) {
+      newOwner = 1;
+    } else {
+      newOwner = 0;
+    }
+    if (newOwner) {
+      seq0--;
+      seq1++;
+    } else {
+      seq0++;
+      seq1--;
+    }
+    if (seq0 < 0) seq0 = 0;
+    if (seq0 > 3) seq0 = 3;
+    if (seq1 < 0) seq1 = 0;
+    if (seq1 > 3) seq1 = 3;
+    owner = newOwner;
+  }
+  refresh();
+  refresh_ms();
+}
+var stopped = true;
+Bangle.on('tap', function (pos) {
+  console.log('touch', pos);
+  if (endGame) {
+    Bangle.beep();
+    score0 = 0;
+    score1 = 0;
+    seq0 = 0;
+    seq1 = 0;
+    inc = 0;
+    msinc = 0;
+    stopped = true;
+    endGame = false;
+  } else {
+    if (inc == 0) {
+      autogame();
+    } else {
+      onStop();
+    }
+  }
+});
+g.setFont12x20(3);
+let part = 0;
+let endInc = 0;
+var endGame = false;
+function refresh () {
+  g.clear();
+  if (inc > 59) {
+    inc = 0;
+    part++;
+  }
+  if (inc > 44) {
+    if (part < 2) {
+      part++;
+    }
+    if (part >= 2) {
+      if (score0 != score1) {
+        endGame = true;
+        endInc = inc;
+        inc = 0;
+      }
+    }
+    // end of 1st or 2nd part of the game?
+  }
+  let two = (inc < 10) ? '0' + inc : '' + inc;
+  if (endGame) {
+    g.setColor(0, 0, 0);
+    g.fillRect(0, 64, w, h);
+    if (inc % 2) {
+      two = (endInc < 10) ? '0' + endInc : '' + endInc;
+      printNumber(-1, 2, 64 + 16, { scale: 0.4 });
+      printNumber(part, 34, 64 + 16, { scale: 0.4 });
+      printNumber(two[0], 74, 64 + 16, { scale: 0.4 });
+      printNumber(two[1], 74 + 32, 64 + 16, { scale: 0.4 });
+    }
+  } else {
+  // seconds
+    printNumber(0, 2, 64 + 16, { scale: 0.4 });
+    printNumber(part, 34, 64 + 16, { scale: 0.4 });
+    printNumber(two[0], 74, 64 + 16, { scale: 0.4 });
+    printNumber(two[1], 74 + 32, 64 + 16, { scale: 0.4 });
+  }
+  refresh_ms();
+  refresh_score();
+  refresh_pixels();
+}
+
+function refresh_pixels () {
+  let frame4 = inc % 2;
+  if (goalFrame > 0) {
+    frame4 = goalFrame % 2;
+    if (goaler == 0) {
+      g.drawImage(frame4 ? right4 : right0, 20, 10, { scale: 5 });
+      g.setColor(1, 1, 1);
+      g.drawImage(gol11, w - 50, 10, { scale: 5 });
+    } else if (goaler == 1) {
+      g.drawImage(frame4 ? left0 : left4, w - 50, 10, { scale: 5 });
+      g.setColor(1, 1, 1);
+      g.drawImage(gol01, 30, 10, { scale: 5 });
+    }
+    return;
+  }
+  if (endGame) {
+    if (score0 > score1) {
+      g.drawImage(frame4 ? right1 : right0, 5 + (seq0 * 10), 10, { scale: 5 });
+    } else if (score0 < score1) {
+      g.drawImage(frame4 ? left0 : left1, w - 30 - (seq1 * 10), 10, { scale: 5 });
+    }
+    return;
+  }
+  g.drawImage(frame4 ? right1 : right0, 5 + (seq0 * 10), 10, { scale: 5 });
+  g.drawImage(frame4 ? left0 : left1, w - 30 - (seq1 * 10), 10, { scale: 5 });
+  let bx = (owner == 0) ? w / 3 : w / 2;
+  bx += 2;
+  g.drawImage(frame4 ? ball0 : ball1, bx, 10, { scale: 5 });
+}
+let dots = 0;
+function refresh_dots () {
+  if (endGame) {
+    dots = 0;
+  } else {
+    dots++;
+  }
+  if (dots % 2) {
+    g.setColor(1, 1, 1);
+  } else {
+    g.setColor(0, 0, 0);
+  }
+  const x = 67;
+  let y = 100;
+  g.fillRect(x, y, x + 4, y + 4);
+  y += 16;
+  g.fillRect(x, y, x + 4, y + 4);
+}
+
+const h = g.getHeight();
+
+function refresh_ms () {
+  if (endGame) {
+    if (inc % 2) {
+      printNumber(-1, 80 + 64 - 4, 64 + 16 + 8 + 16, { scale: 0.2 });
+      printNumber(-1, 80 + 64 + 16 - 4, 64 + 32 + 8, { scale: 0.2 });
+    }
+    return;
+  }
+  // nanoseconds
+  if (msinc > 59) {
+    msinc = 0;
+  }
+  g.setColor(0, 0, 0);
+  g.fillRect(80 + 64, h / 2, 80 + 64 + 32, g.getHeight());
+  const two = (msinc < 10) ? '0' + msinc : '' + msinc;
+  printNumber(two[0], 80 + 64 - 4, 64 + 16 + 8 + 16, { scale: 0.2 });
+  printNumber(two[1], 80 + 64 + 16 - 4, 64 + 32 + 8, { scale: 0.2 });
+}
+
+function refresh_score () {
+  g.setColor(0, 0, 0);
+  g.fillRect(0, h - 32, w, h);
+  let two = (score0 < 10) ? '0' + score0 : '' + score0;
+  printNumber(two[0], 64 - 16, 32 + 64 + 16 + 8 + 16, { scale: 0.2 });
+  printNumber(two[1], 64, 32 + 64 + 32 + 8, { scale: 0.2 });
+  two = (score1 < 10) ? '0' + score1 : '' + score1;
+  printNumber(two[0], 32 + 64, 32 + 64 + 16 + 8 + 16, { scale: 0.2 });
+  printNumber(two[1], 32 + 64 + 16, 32 + 64 + 32 + 8, { scale: 0.2 });
+}
+refresh();
+
+setInterval(function () {
+  if (!stopped || endGame) {
+    inc++;
+  }
+  if (goalFrame > 0) {
+    goalFrame--;
+  }
+  refresh();
+}, 1000);
+
+setInterval(function () {
+  refresh_dots();
+}, 500);
+
+setInterval(function () {
+  if (!stopped) {
+    msinc++;
+    if (msinc > 59) {
+      msinc = 0;
+    }
+  }
+}, 10);
+
+setInterval(function () {
+  if (!stopped) {
+    refresh_ms();
+  }
+}, 250);
+
+function autogame () {
+  if (endGame) {
+    return;
+  }
+  onStop();
+  if (stopped) {
+    setTimeout(autogame, 500);
+  } else {
+    setTimeout(autogame, 315 + 10 * (Math.random() * 5));
+  }
+}
+
+Bangle.setOptions({ lockTimeout: 0, backlightTimeout: 0 });
+autogame();
diff --git a/apps/football/app.png b/apps/football/app.png
new file mode 100644
index 000000000..80d7cea15
Binary files /dev/null and b/apps/football/app.png differ
diff --git a/apps/football/media/ball0.png b/apps/football/media/ball0.png
new file mode 100644
index 000000000..5b890c180
Binary files /dev/null and b/apps/football/media/ball0.png differ
diff --git a/apps/football/media/ball1.png b/apps/football/media/ball1.png
new file mode 100644
index 000000000..c72e56189
Binary files /dev/null and b/apps/football/media/ball1.png differ
diff --git a/apps/football/media/dash.png b/apps/football/media/dash.png
new file mode 100644
index 000000000..6a9b0c4ac
Binary files /dev/null and b/apps/football/media/dash.png differ
diff --git a/apps/football/media/digit0.png b/apps/football/media/digit0.png
new file mode 100644
index 000000000..33856cc5e
Binary files /dev/null and b/apps/football/media/digit0.png differ
diff --git a/apps/football/media/digit1.png b/apps/football/media/digit1.png
new file mode 100644
index 000000000..53b914ded
Binary files /dev/null and b/apps/football/media/digit1.png differ
diff --git a/apps/football/media/digit2.png b/apps/football/media/digit2.png
new file mode 100644
index 000000000..7a7787b05
Binary files /dev/null and b/apps/football/media/digit2.png differ
diff --git a/apps/football/media/digit3.png b/apps/football/media/digit3.png
new file mode 100644
index 000000000..a197d5993
Binary files /dev/null and b/apps/football/media/digit3.png differ
diff --git a/apps/football/media/digit4.png b/apps/football/media/digit4.png
new file mode 100644
index 000000000..f2810a0b6
Binary files /dev/null and b/apps/football/media/digit4.png differ
diff --git a/apps/football/media/digit5.png b/apps/football/media/digit5.png
new file mode 100644
index 000000000..d8027c362
Binary files /dev/null and b/apps/football/media/digit5.png differ
diff --git a/apps/football/media/digit6.png b/apps/football/media/digit6.png
new file mode 100644
index 000000000..bd7980045
Binary files /dev/null and b/apps/football/media/digit6.png differ
diff --git a/apps/football/media/digit7.png b/apps/football/media/digit7.png
new file mode 100644
index 000000000..9ef0df11a
Binary files /dev/null and b/apps/football/media/digit7.png differ
diff --git a/apps/football/media/digit8.png b/apps/football/media/digit8.png
new file mode 100644
index 000000000..6916a301a
Binary files /dev/null and b/apps/football/media/digit8.png differ
diff --git a/apps/football/media/digit9.png b/apps/football/media/digit9.png
new file mode 100644
index 000000000..d8d327523
Binary files /dev/null and b/apps/football/media/digit9.png differ
diff --git a/apps/football/media/digits.png b/apps/football/media/digits.png
new file mode 100644
index 000000000..68ace56af
Binary files /dev/null and b/apps/football/media/digits.png differ
diff --git a/apps/football/media/digits128.png b/apps/football/media/digits128.png
new file mode 100644
index 000000000..f363a7e8e
Binary files /dev/null and b/apps/football/media/digits128.png differ
diff --git a/apps/football/media/digits64.png b/apps/football/media/digits64.png
new file mode 100644
index 000000000..445c14dfa
Binary files /dev/null and b/apps/football/media/digits64.png differ
diff --git a/apps/football/media/gol00.png b/apps/football/media/gol00.png
new file mode 100644
index 000000000..3b16aa967
Binary files /dev/null and b/apps/football/media/gol00.png differ
diff --git a/apps/football/media/gol01.png b/apps/football/media/gol01.png
new file mode 100644
index 000000000..3b16aa967
Binary files /dev/null and b/apps/football/media/gol01.png differ
diff --git a/apps/football/media/gol10.png b/apps/football/media/gol10.png
new file mode 100644
index 000000000..178b6fe3d
Binary files /dev/null and b/apps/football/media/gol10.png differ
diff --git a/apps/football/media/gol11.png b/apps/football/media/gol11.png
new file mode 100644
index 000000000..732fa815d
Binary files /dev/null and b/apps/football/media/gol11.png differ
diff --git a/apps/football/media/left0.png b/apps/football/media/left0.png
new file mode 100644
index 000000000..20599cbb7
Binary files /dev/null and b/apps/football/media/left0.png differ
diff --git a/apps/football/media/left1.png b/apps/football/media/left1.png
new file mode 100644
index 000000000..b6ffc22f9
Binary files /dev/null and b/apps/football/media/left1.png differ
diff --git a/apps/football/media/left2.png b/apps/football/media/left2.png
new file mode 100644
index 000000000..11ff8885f
Binary files /dev/null and b/apps/football/media/left2.png differ
diff --git a/apps/football/media/left4.png b/apps/football/media/left4.png
new file mode 100644
index 000000000..a7301a4f8
Binary files /dev/null and b/apps/football/media/left4.png differ
diff --git a/apps/football/media/right0.png b/apps/football/media/right0.png
new file mode 100644
index 000000000..ac418ad7b
Binary files /dev/null and b/apps/football/media/right0.png differ
diff --git a/apps/football/media/right1.png b/apps/football/media/right1.png
new file mode 100644
index 000000000..31554cbc3
Binary files /dev/null and b/apps/football/media/right1.png differ
diff --git a/apps/football/media/right2.png b/apps/football/media/right2.png
new file mode 100644
index 000000000..8c8d0ece4
Binary files /dev/null and b/apps/football/media/right2.png differ
diff --git a/apps/football/media/right4.png b/apps/football/media/right4.png
new file mode 100644
index 000000000..83a78b52c
Binary files /dev/null and b/apps/football/media/right4.png differ
diff --git a/apps/football/metadata.json b/apps/football/metadata.json
new file mode 100644
index 000000000..253026c39
--- /dev/null
+++ b/apps/football/metadata.json
@@ -0,0 +1,31 @@
+{
+  "id": "football",
+  "name": "football",
+  "shortName": "football",
+  "version": "1.00",
+  "type": "app",
+  "description": "Classic football game of the CASIO chronometer",
+  "icon": "app.png",
+  "allow_emulator": true,
+  "tags": "games",
+  "supports": [
+    "BANGLEJS2"
+  ],
+  "readme": "README.md",
+  "storage": [
+    {
+      "name": "football.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "football.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    }
+  ],
+  "screenshots": [
+    {
+      "url": "screenshot.png"
+    }
+  ]
+}
diff --git a/apps/football/screenshot.png b/apps/football/screenshot.png
new file mode 100644
index 000000000..5742fe9e1
Binary files /dev/null and b/apps/football/screenshot.png differ
diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index b3cd7e12d..0321e46bc 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -81,6 +81,7 @@ function onInit(device) {
     if (crc==3435933210) version = "2v11.52";
     if (crc==46757280) version = "2v11.58";
     if (crc==3508163280 || crc==1418074094) version = "2v12";
+    if (crc==4056371285) version = "2v13";
     if (!ok) {
       version += 	`(&#9888; update required)`;
     }
diff --git a/apps/homework/app.js b/apps/homework/app.js
index 4ba786690..3d9be31c9 100644
--- a/apps/homework/app.js
+++ b/apps/homework/app.js
@@ -14,7 +14,7 @@ var nhwmn = { // New homework Menu
 
 function newHomeworkMenu() {
   E.showMessage("Getting subjects...");
-  var rawsubjects = require("Storage").read("subjects.txt"); // This code reads out the subjects list and removes the newline character at the end
+  var rawsubjects = require("Storage").read("homework.subjects.txt"); // This code reads out the subjects list and removes the newline character at the end
   var splitsubjects = rawsubjects.split(",");
   var lastItem = splitsubjects[splitsubjects.length - 1];
   var thiscurrentsubject;
diff --git a/apps/homework/metadata.json b/apps/homework/metadata.json
index 2ba1e918f..a46c74dad 100644
--- a/apps/homework/metadata.json
+++ b/apps/homework/metadata.json
@@ -9,6 +9,10 @@
   "supports" : ["BANGLEJS2"],  
   "readme": "README.md",
   "custom": "subjects.html",
+ "data": [
+   {"name":"homework.txt" },
+   {"name":"homework.subjects.txt" }
+ ],
   "storage": [
     {"name":"homework.app.js","url":"app.js"},
     {"name":"homework.img","url":"app-icon.js","evaluate":true}
diff --git a/apps/homework/subjects.html b/apps/homework/subjects.html
index d3bf7a400..92c3023dd 100644
--- a/apps/homework/subjects.html
+++ b/apps/homework/subjects.html
@@ -20,9 +20,10 @@
         // send finished app (in addition to contents of app.json)
         sendCustomizedApp({
           storage:[
-            {name:"subjects.txt"},
+            {name:"homework.subjects.txt", url:"subjects.txt", content:app},
           ]
         });
+        console.log("Sent homework.subjects.txt!");
       });
 
     </script>
diff --git a/apps/iconlaunch/app.js b/apps/iconlaunch/app.js
index 4eeaff589..59e9eb0e3 100644
--- a/apps/iconlaunch/app.js
+++ b/apps/iconlaunch/app.js
@@ -158,6 +158,8 @@ const itemsN = Math.ceil(apps.length / appsN);
 Bangle.setUI({
   mode: "custom",
   drag: (e) => {
+    g.setColor(g.theme.fg);
+    g.setBgColor(g.theme.bg);
     let dy = e.dy;
     if (scroll + R.h - dy > itemsN * itemSize) {
       dy = scroll + R.h - itemsN * itemSize;
diff --git a/apps/imageclock/ChangeLog b/apps/imageclock/ChangeLog
new file mode 100644
index 000000000..5b99b5848
--- /dev/null
+++ b/apps/imageclock/ChangeLog
@@ -0,0 +1,9 @@
+0.01: New App
+0.02: Allow drawing polys
+0.03: Allow partly importing Amazfit decompiler formatted watchfaces
+0.04: Allow writing all image data to separate file to save some RAM
+      Allow hiding elements on lock
+0.05: Add precompilation to js for performance
+0.06: Watchfaces can be refreshed partly
+0.07: Allow wrapping drawing in timeouts to get faster reactions
+      Show/Hide widgets with swipe up or down
diff --git a/apps/imageclock/README.md b/apps/imageclock/README.md
new file mode 100644
index 000000000..c05c09a16
--- /dev/null
+++ b/apps/imageclock/README.md
@@ -0,0 +1,297 @@
+# Imageclock
+
+This app is a highly customizable watchface. To use it, you need to select
+a watchface from another source. There is a native format as described here. You can also load decompiled watchfaces for Amazfit BIP fitness trackers.
+
+# Usage
+
+## Install a watchface
+
+Choose the folder which contains the watchface, then clock "Upload to watch".
+
+## Usage on the watch
+
+Slide up/down to hide/show widgets.
+Press button to start launcher.
+
+# Design watch faces
+
+## Folder structure
+
+* watchfacename
+  * resources/
+  * face.json
+  * info.json
+
+
+### resources
+
+This folder contains image files. It can have subfolders. These files will
+be read and converted into a resource bundle used by the clock
+
+Folder types:
+
+* Number
+  * Contains files named 0.ext to 9.ext and minus.ext
+* CodedImage
+  * Contains files named with only digits for codes, i.e. 721.ext
+  * Contains a file named fallback.ext in case no code matches
+  * Codes are evaluated as follows: 721 -> if not found check 720 -> if not found check 700 -> if found use
+* MultiState
+  * Notifications: sound.ext, silent.ext, vibrate.ext
+  * other status icons: on.ext, off.ext
+* Scale
+  * Contains the components of the scale, named 0.ext to y.ext, y beeing the last element of the scale
+
+### face.json
+
+This file contains the description of the watch face elements. 
+
+#### Object types:
+
+##### Properties
+```
+Properties: {
+  "Redraw": {
+    "Unlocked": 5000,
+    "Locked": 60000,
+    "Default": "Always",
+    "Events": ["HRM"],
+    "Clear": true
+  },
+  "Events": ["lock","HRM"]
+}
+```
+
+Possible values for `Default` are `Always`, `Change`.
+
+##### Images
+
+```
+"Image": {
+  "X": 0,
+  "Y": 0,
+  "Scale": 1,
+  "RotationValue": "Seconds",
+  "MinRotationValue": 0,
+  "MaxRotationValue": 60,
+  "ImagePath": [ "path", "in", "resources", "file" ]
+}
+```
+
+`RotationValue` references one of the implemented numerical values.
+Mandatory:
+* `ImagePath`
+
+```
+"Image": {
+  "X": 0,
+  "Y": 0,
+  "Value": "BatteryPercentage",
+  "Steps": 7,
+  "ImagePath": [ "path", "in", "resources", "file" ]
+}
+```
+If `Value` and `Steps`are given, the value is scaled and `Steps` number of images starting at 0 are used to display the value.
+
+##### Coded Images
+```
+"CodedImage": {
+  "X": 0,
+  "Y": 0,
+  "Value": "WeatherCode",
+  "ImagePath": [ "path", "in", "resources", "file" ]
+}
+```
+The `Value` field is one of the implemented numerical values.
+
+##### Number
+
+Can be aligned to bottom left, top left, bottom right, top right and center. Will currently force all numbers to
+be integer.
+
+```
+"Number": {
+  "X": 123,
+  "Y": 123,
+  "Alignment": "BottomRight",
+  "Value": "Temperature",
+  "Spacing": 1,
+  "ImagePath": [ "path", "to", "numbers", "folder" ]
+}
+```
+The `Value` field is one of the implemented numerical values.
+`Alignment` is either `BottomRight` or `TopLeft`
+
+Mandatory:
+* `ImagePath`
+* `Value`
+
+##### Scale
+
+```
+"Scale": {
+  "X": 123,
+  "Y": 123,
+  "Value": "Temperature",
+  "MinValue": "-20",
+  "MaxValue": "50",
+  "ImagePath": [ "path", "to", "scale", "folder" ],
+  "Segments": [
+    { "X": 5, "Y": 5},
+    { "X": 10, "Y": 10 }
+  ]
+}
+```
+The `Value` field is one of the implemented numerical values.
+`MaxValue` and `MinValue` set the start and endpoints of the scale.
+
+Mandatory:
+* `ImagePath`
+* `Value`
+
+##### MultiState
+
+```
+"MultiState": {
+  "X": 0,
+  "Y": 0,
+  "Value": "Lock",
+  "ImagePath": ["icons", "status", "lock"]
+}
+```
+The `Value` field is one of the implemented multi state values.
+
+Mandatory:
+* `ImagePath`
+* `Value`
+
+##### Poly
+
+```
+"Poly":{
+  "Filled": true,
+  "RotationValue": "Second",
+  "MinRotationValue": "0",
+  "MaxRotationValue": "60",
+  "ForegroundColor": "#00f",
+  "BackgroundColor": "#008",
+  "Vertices":[
+    {"X":-1, "Y":13},
+    {"X":0, "Y":15},
+    {"X":1, "Y":13},
+    {"X":2, "Y":0},
+    {"X":1, "Y":-75},
+    {"X":0, "Y":-80},
+    {"X":-1, "Y":-75},
+    {"X":-2, "Y":0}
+  ]
+}
+```
+The `RotationValue` field is one of the implemented numeric values.
+
+##### Rect
+
+```
+"Rect":{
+  "X": 10,
+  "Y": 20,
+  "Width": 30,
+  "Height": 40,
+  "Filled": true,
+  "ForegroundColor": "#00f",
+  "BackgroundColor": "#008"
+}
+```
+The `RotationValue` field is one of the implemented numeric values.
+
+##### Nesting
+```
+"Container": {
+  "X": 10,
+  "Y": 10,
+  "OtherContainer": {
+    "X": 5,
+    "Y": 5,
+    "SomeElement": {
+      "X": 2,
+      "Y": 2,
+      <Content>
+    }
+  }
+}
+```
+`SomeElement` will be drawn at X- and Y-position 2+5+10=17, because positions are relative to parent element.
+Container names can be everything but other object names.
+
+#### Implemented data sources
+
+##### Numerical
+
+* Hour
+* Hour12Analog
+* Hour12
+* HourTens
+* HourOnes
+* Minute
+* MinuteAnalog
+* MinuteTens
+* MinuteOnes
+* Second
+* SecondAnalog
+* SecondTens
+* SecondOnes
+* WeekDay
+* WeekDayMondayFirst
+* Day
+* DayTens
+* DayOnes
+* Month
+* MonthTens
+* MonthOnes
+* Pulse
+* Steps
+* Temperature
+* Pressure
+* Altitude
+* BatteryPercentage 
+* BatteryVoltage
+* StepsGoal
+* WeatherCode
+* WeatherTemperature
+
+##### Multistate
+
+* on/off
+  * Lock
+  * Charge
+  * Alarm
+  * Bluetooth
+  * BluetoothPeripheral
+  * HRM
+  * Barometer
+  * Compass
+  * GPS
+  * StepsGoal
+  * WeatherTemperatureNegative
+* on/off/vibrate
+  * Notifications
+* celsius/fahrenheit/unknown
+  * WeatherTemperatureUnit
+
+### info.json
+
+This file contains information for the conversion process, it will not be 
+stored on the watch
+
+# TODO
+
+* Handle events and redraws better
+* Performance improvements
+  * Mark elements with how often they need to be redrawn
+* Finalize the file format
+* Localization
+
+# Creator
+
+[halemmerich](https://github.com/halemmerich)
diff --git a/apps/imageclock/app-icon.js b/apps/imageclock/app-icon.js
new file mode 100644
index 000000000..06f93e2ef
--- /dev/null
+++ b/apps/imageclock/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwIdah/wAof//4ECgYFB4AFBg4FB8AFBj/wh/4AoM/wEB/gFBvwCEBAU/AQP4gfAj8AgPwAoMPwED8AFBg/AAYIBDA4ngg4TB4EBApkPKgJSBJQIFTMgIFCJIIFDKoIFEvgFBGoMAnw7DP4IFEh+BAoItBg+DNIQwBMIaeCKoKxCPoIzCEgKVHUIqtFXIrFFaIrdFdIwAV"))
diff --git a/apps/imageclock/app.js b/apps/imageclock/app.js
new file mode 100644
index 000000000..7b933b710
--- /dev/null
+++ b/apps/imageclock/app.js
@@ -0,0 +1,774 @@
+var watchface = require("Storage").readJSON("imageclock.face.json");
+var watchfaceResources = require("Storage").readJSON("imageclock.resources.json");
+var precompiledJs = eval(require("Storage").read("imageclock.draw.js"));
+var settings = require('Storage').readJSON("imageclock.json", true) || {};
+
+var performanceLog = {};
+
+var startPerfLog = () => {};
+var endPerfLog = () => {};
+var printPerfLog = () => print("Deactivated");
+var resetPerfLog = () => {performanceLog = {};};
+
+var colormap={
+"#000":0,
+"#00f":1,
+"#0f0":2,
+"#0ff":3,
+"#f00":4,
+"#f0f":5,
+"#ff0":6,
+"#fff":7
+};
+
+var palette = new Uint16Array([
+0x0000, //black #000
+0x001f, //blue #00f
+0x07e0, //green #0f0
+0x07ff, //cyan #0ff
+0xf800, //red #f00
+0xf81f, //magenta #f0f
+0xffe0, //yellow #ff0
+0xffff, //white #fff
+0xffff, //white
+0xffff, //white
+0xffff, //white
+0xffff, //white
+0xffff, //white
+0xffff, //white
+0xffff, //white
+0xffff, //white
+])
+
+var p0 = g;
+var p1;
+
+if (settings.perflog){
+  startPerfLog = function(name){
+    var time = getTime();
+    if (!performanceLog.start) performanceLog.start={};
+    performanceLog.start[name] = time;
+  };
+  endPerfLog = function (name){
+    var time = getTime();
+    if (!performanceLog.last) performanceLog.last={};
+    var duration = time - performanceLog.start[name];
+    performanceLog.last[name] = duration;
+    if (!performanceLog.cum) performanceLog.cum={};
+    if (!performanceLog.cum[name]) performanceLog.cum[name] = 0;
+    performanceLog.cum[name] += duration;
+    if (!performanceLog.count) performanceLog.count={};
+    if (!performanceLog.count[name]) performanceLog.count[name] = 0;
+    performanceLog.count[name]++;
+  };
+
+  printPerfLog = function(){
+    var result = "";
+    var keys = [];
+    for (var c in performanceLog.cum){
+      keys.push(c);
+    }
+    keys.sort();
+    for (var k of keys){
+      print(k, "last:", (performanceLog.last[k] * 1000).toFixed(0), "average:", (performanceLog.cum[k]/performanceLog.count[k]*1000).toFixed(0), "count:", performanceLog.count[k], "total:", (performanceLog.cum[k] * 1000).toFixed(0));
+    }
+  };
+}
+
+function delay(t) {
+    return new Promise(function (resolve) {
+        setTimeout(resolve, t);
+    });
+}
+
+function prepareImg(resource){
+  startPerfLog("prepareImg");
+  //print("prepareImg: ", resource);
+
+  if (resource.dataOffset !== undefined){
+    resource.buffer = E.toArrayBuffer(require("Storage").read("imageclock.resources.data", resource.dataOffset, resource.dataLength));
+    delete resource.dataOffset;
+    delete resource.dataLength;
+    if (resource.paletteData){
+      result.palette = new Uint16Array(resource.paletteData);
+      delete resource.paletteData;
+    }
+  }
+  endPerfLog("prepareImg");
+  return resource;
+}
+
+function getByPath(object, path, lastElem){
+  startPerfLog("getByPath");
+  //print("getByPath", path,lastElem);
+  var current = object;
+  if (path.length) {
+    for (var c of path){
+      if (!current[c]) return undefined;
+      current = current[c];
+    }
+  }
+  if (lastElem!==undefined){
+    if (!current["" + lastElem]) return undefined;
+    //print("Found by lastElem", lastElem);
+    current = current["" + lastElem];
+  }
+  endPerfLog("getByPath");
+  if (typeof current == "function"){
+    //print("current was function");
+    return undefined;
+  }
+  return current;
+}
+
+function splitNumberToDigits(num){
+  return String(num).split('').map(item => Number(item));
+}
+
+function isChangedNumber(element){
+  return element.lastDrawnValue != getValue(element.Value);
+}
+
+function isChangedMultistate(element){
+  return element.lastDrawnValue != getMultistate(element.Value);
+}
+
+function drawNumber(graphics, resources, element){
+  startPerfLog("drawNumber");
+  var number = getValue(element.Value);
+  var spacing = element.Spacing ? element.Spacing : 0;
+  var unit = element.Unit;
+  
+  var imageIndexMinus = element.ImageIndexMinus;
+  var imageIndexUnit = element.ImageIndexUnit;
+  var numberOfDigits = element.Digits;
+  
+  
+  //print("drawNumber: ", number, element);
+  if (number) number = number.toFixed(0);
+
+  var isNegative;
+  var digits;
+  if (number == undefined){
+    isNegative = true;
+    digits = [];
+    numberOfDigits = 0;
+  } else {
+    isNegative = number < 0;
+    if (isNegative) number *= -1;
+    digits = splitNumberToDigits(number);
+  }
+
+  //print("digits: ", digits);
+  if (!numberOfDigits) numberOfDigits = digits.length;
+  var firstDigitX = element.X;
+  var firstDigitY = element.Y;
+  var imageIndex = element.ImageIndex ? element.ImageIndex : 0;
+
+  var firstImage;
+  if (imageIndex){
+    firstImage = getByPath(resources, [], "" + (0 + imageIndex));
+  } else {
+    firstImage = getByPath(resources, element.ImagePath, 0);
+  }
+
+  var minusImage;
+  if (imageIndexMinus){
+    minusImage = getByPath(resources, [], "" + (0 + imageIndexMinus));
+  } else {
+    minusImage = getByPath(resources, element.ImagePath, "minus");
+  }
+
+  var unitImage;
+  //print("Get image for unit", imageIndexUnit);
+  if (imageIndexUnit !== undefined){
+    unitImage = getByPath(resources, [], "" + (0 + imageIndexUnit));
+    //print("Unit image is", unitImage);
+  } else if (element.Unit){
+    unitImage = getByPath(resources, element.ImagePath, getMultistate(element.Unit, "unknown"));
+  }
+
+  var numberWidth = (numberOfDigits * firstImage.width) + (Math.max((numberOfDigits - 1),0) * spacing);
+  if (isNegative && minusImage){
+    //print("Adding to width", minusImage);
+    numberWidth += minusImage.width + spacing;
+  }
+  if (unitImage){
+    //print("Adding to width", unitImage);
+    numberWidth += unitImage.width + spacing;
+  }
+  //print("numberWidth:", numberWidth);
+
+  if (element.Alignment == "Center") {
+    firstDigitX = Math.round(element.X - (numberWidth/2)) + 1;
+    firstDigitY = Math.round(element.Y - (firstImage.height/2)) + 1;
+  } else if (element.Alignment == "BottomRight"){
+    firstDigitX = element.X - numberWidth + 1;
+    firstDigitY = element.Y - firstImage.height + 1;
+  } else if (element.Alignment == "TopRight") {
+    firstDigitX = element.X - numberWidth + 1;
+    firstDigitY = element.Y;
+  } else if (element.Alignment == "BottomLeft") {
+    firstDigitX = element.X;
+    firstDigitY = element.Y - firstImage.height + 1;
+  }
+
+  var currentX = firstDigitX;
+  if (isNegative && minusImage){
+    //print("Draw minus at", currentX);
+    if (imageIndexMinus){
+      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "" + (0 + imageIndexMinus));
+    } else {
+      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "minus");
+    }
+    currentX += minusImage.width + spacing;
+  }
+  for (var d = 0; d < numberOfDigits; d++){
+    var currentDigit;
+    var difference = numberOfDigits - digits.length;
+    if (d >= difference){
+      currentDigit = digits[d-difference];
+    } else {
+      currentDigit = 0;
+    }
+    //print("Digit " + currentDigit + " " + currentX);
+    drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, currentDigit + imageIndex);
+    currentX += firstImage.width + spacing;
+  }
+  if (imageIndexUnit){
+    //print("Draw unit at", currentX);
+    drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "" + (0 + imageIndexUnit));
+  } else if (element.Unit){
+    drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, getMultistate(element.Unit,"unknown"));
+  }
+  element.lastDrawnValue = number;
+
+  endPerfLog("drawNumber");
+}
+
+function drawElement(graphics, resources, pos, element, lastElem){
+  startPerfLog("drawElement");
+  var cacheKey = "_"+(lastElem?lastElem:"nole");
+  if (!element.cachedImage) element.cachedImage={};
+  if (!element.cachedImage[cacheKey]){
+    var resource = getByPath(resources, element.ImagePath, lastElem);
+    if (resource){
+      prepareImg(resource);
+      //print("lastElem", typeof resource)
+      if (resource) {
+        element.cachedImage[cacheKey] = resource;
+        //print("cache res ",typeof element.cachedImage[cacheKey]);
+      } else {
+        element.cachedImage[cacheKey] = null;
+        //print("cache null",typeof element.cachedImage[cacheKey]);
+        //print("Could not create image from", resource);
+      }
+    } else {
+      //print("Could not get resource from", element, lastElem);
+    }
+  }
+  
+  //print("cache ",typeof element.cachedImage[cacheKey], element.ImagePath, lastElem);
+  if(element.cachedImage[cacheKey]){
+    //print("drawElement ",pos, path, lastElem);
+    //print("resource ", resource,pos, path, lastElem);
+    //print("drawImage from drawElement", image, pos);
+    var options={};
+    if (element.RotationValue){
+      options.rotate = radians(element);
+    }
+    if (element.Scale){
+      options.scale = element.ScaleValue;
+    }
+    //print("options", options);
+    //print("Memory before drawing", process.memory(false));
+    startPerfLog("drawElement_g.drawImage");
+    try{
+    graphics.drawImage(element.cachedImage[cacheKey] ,(pos.X ? pos.X : 0), (pos.Y ? pos.Y : 0), options);} catch (e) {
+      //print("Error", e, element.cachedImage[cacheKey]);
+    }
+    endPerfLog("drawElement_g.drawImage");
+  }
+  endPerfLog("drawElement");
+}
+
+function getValue(value, defaultValue){
+  if (typeof value == "string"){
+    return numbers[value]();
+  }
+  if (value == undefined) return defaultValue;
+  return value;
+}
+
+function getMultistate(name, defaultValue){
+  if (typeof name == "string"){
+    return multistates[name]();
+  } else {
+    if (name == undefined) return defaultValue;
+  }
+  return undefined;
+}
+
+function drawScale(graphics, resources, scale){
+  startPerfLog("drawScale");
+  //print("drawScale", scale);
+  var segments = scale.Segments;
+  var imageIndex = scale.ImageIndex !== undefined ? scale.ImageIndex : 0;
+
+  var value = scaledown(scale.Value, scale.MinValue, scale.MaxValue);
+
+  //print("Value is ", value, "(", maxValue, ",", minValue, ")");
+
+  var segmentsToDraw = Math.ceil(value * segments.length);
+
+  for (var i = 0; i < segmentsToDraw; i++){
+    drawElement(graphics, resources, segments[i], scale, imageIndex + i);
+  }
+  scale.lastDrawnValue = segmentsToDraw;
+
+  endPerfLog("drawScale");
+}
+
+function drawImage(graphics, resources, image, name){
+  startPerfLog("drawImage");
+  //print("drawImage", image.X, image.Y, name);
+  if (image.Value && image.Steps){
+    var steps = Math.floor(scaledown(image.Value, image.MinValue, image.MaxValue) * (image.Steps - 1));
+    //print("Step", steps, "of", image.Steps);
+    drawElement(graphics, resources, image, image, "" + steps);
+  } else if (image.ImageIndex !== undefined) {
+    drawElement(graphics, resources, image, image, image.ImageIndex);
+  } else {
+    drawElement(graphics, resources, image, image, name ? "" + name: undefined);
+  }
+  
+  endPerfLog("drawImage");
+}
+
+function drawCodedImage(graphics, resources, image){
+  startPerfLog("drawCodedImage");
+  var code = getValue(image.Value);
+  //print("drawCodedImage", image, code);
+
+  if (image.ImagePath) {
+    var factor = 1;
+    var currentCode = code;
+    while (code / factor > 1){
+      currentCode = Math.floor(currentCode/factor)*factor;
+      //print("currentCode", currentCode);
+      if (getByPath(resources, image.ImagePath, currentCode)){
+        break;
+      }
+      factor *= 10;
+    }
+    if (code / factor > 1){
+      //print("found match");
+      drawImage(graphics, resources, image, currentCode);
+    } else {
+      //print("fallback");
+      drawImage(graphics, resources, image, "fallback");
+    }
+  }
+  image.lastDrawnValue = code;
+
+  startPerfLog("drawCodedImage");
+}
+
+function getWeatherCode(){
+  var jsonWeather = require("Storage").readJSON('weather.json');
+  var weather = (jsonWeather && jsonWeather.weather) ? jsonWeather.weather : undefined;
+
+  if (weather && weather.code){
+    return weather.code;
+  }
+  return undefined;
+}
+
+function getWeatherTemperature(){
+  var jsonWeather = require("Storage").readJSON('weather.json');
+  var weather = (jsonWeather && jsonWeather.weather) ? jsonWeather.weather : undefined;
+
+  var result = { unit: "unknown"};
+  if (weather && weather.temp){
+    //print("Weather is", weather);
+    var temp = require('locale').temp(weather.temp-273.15);
+    result.value = Number(temp.match(/[\d\-]*/)[0]);
+    var unit;
+    if (temp.includes("C")){
+      result.unit = "celsius";
+    } else if (temp.includes("F")){
+      result.unit = "fahrenheit";
+    }
+  }
+  return result;
+}
+
+function scaledown(value, min, max){
+  //print("scaledown", value, min, max);
+  var scaled = E.clip(getValue(value),getValue(min,0),getValue(max,1));
+  scaled -= getValue(min,0);
+  scaled /= getValue(max,1);
+  return scaled;
+}
+
+function radians(rotation){
+  var value = scaledown(rotation.RotationValue, rotation.MinRotationValue, rotation.MaxRotationValue);
+  value -= rotation.RotationOffset ? rotation.RotationOffset : 0;
+  value *= 360;
+  value *= Math.PI / 180;
+  return value;
+}
+
+function drawPoly(graphics, resources, element){
+    startPerfLog("drawPoly");
+    var vertices = [];
+
+    startPerfLog("drawPoly_transform");
+    for (var c of element.Vertices){
+      vertices.push(c.X);
+      vertices.push(c.Y);
+    }
+    var transform = { x: element.X ? element.X : 0,
+      y: element.Y ? element.Y : 0
+    };
+    if (element.RotationValue){
+      transform.rotate = radians(element);
+    }
+    vertices = graphics.transformVertices(vertices, transform);
+
+    endPerfLog("drawPoly_transform");
+
+    if (element.Filled){
+      startPerfLog("drawPoly_g.fillPoly");
+      graphics.fillPoly(vertices,true);
+      endPerfLog("drawPoly_g.fillPoly");
+    } else {
+      startPerfLog("drawPoly_g.drawPoly");
+      graphics.drawPoly(vertices,true);
+      endPerfLog("drawPoly_g.drawPoly");
+    }
+
+    endPerfLog("drawPoly");
+}
+
+function drawRect(graphics, resources, element){
+    startPerfLog("drawRect");
+    var vertices = [];
+
+    if (element.Filled){
+      startPerfLog("drawRect_g.fillRect");
+      graphics.fillRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
+      endPerfLog("drawRect_g.fillRect");
+    } else {
+      startPerfLog("drawRect_g.fillRect");
+      graphics.drawRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
+      endPerfLog("drawRect_g.fillRect");
+    }
+    endPerfLog("drawRect");
+}
+
+function drawCircle(graphics, resources, element){
+    startPerfLog("drawCircle");
+
+    if (element.Filled){
+      startPerfLog("drawCircle_g.fillCircle");
+      graphics.fillCircle(element.X, element.Y, element.Radius);
+      endPerfLog("drawCircle_g.fillCircle");
+    } else {
+      startPerfLog("drawCircle_g.drawCircle");
+      graphics.drawCircle(element.X, element.Y, element.Radius);
+      endPerfLog("drawCircle_g.drawCircle");
+    }
+    endPerfLog("drawCircle");
+}
+
+var numbers = {};
+numbers.Hour = () => { return new Date().getHours(); };
+numbers.HourTens = () => { return Math.floor(new Date().getHours()/10); };
+numbers.HourOnes = () => { return Math.floor(new Date().getHours()%10); };
+numbers.Hour12 = () => { return new Date().getHours()%12; };
+numbers.Hour12Analog = () => { var date = new Date(); return date.getHours()%12 + (date.getMinutes()/59); };
+numbers.Hour12Tens = () => { return Math.floor((new Date().getHours()%12)/10); };
+numbers.Hour12Ones = () => { return Math.floor((new Date().getHours()%12)%10); };
+numbers.Minute = () => { return new Date().getMinutes(); };
+numbers.MinuteAnalog = () => { var date = new Date(); return date.getMinutes() + (date.getSeconds()/59); };
+numbers.MinuteTens = () => { return Math.floor(new Date().getMinutes()/10); };
+numbers.MinuteOnes = () => { return Math.floor(new Date().getMinutes()%10); };
+numbers.Second = () => { return new Date().getSeconds(); };
+numbers.SecondAnalog = () => { var date = new Date(); return date.getSeconds() + (date.getMilliseconds()/999); };
+numbers.SecondTens = () => { return Math.floor(new Date().getSeconds()/10); };
+numbers.SecondOnes = () => { return Math.floor(new Date().getSeconds()%10); };
+numbers.WeekDay = () => { return new Date().getDay(); };
+numbers.WeekDayMondayFirst = () => {  var day = (new Date().getDay() - 1); if (day < 0) day = 7 + day; return day; };
+numbers.Day = () => { return new Date().getDate(); };
+numbers.DayTens = () => { return Math.floor(new Date().getDate()/10); };
+numbers.DayOnes = () => { return Math.floor(new Date().getDate()%10); };
+numbers.Month = () => { return new Date().getMonth() + 1; };
+numbers.MonthTens = () => { return Math.floor((new Date().getMonth() + 1)/10); };
+numbers.MonthOnes = () => { return Math.floor((new Date().getMonth() + 1)%10); };
+numbers.Pulse = () => { return pulse; };
+numbers.Steps = () => { return Bangle.getHealthStatus ? Bangle.getHealthStatus("day").steps : undefined; };
+numbers.StepsGoal = () => { return settings.stepsgoal || 10000; };
+numbers.Temperature = () => { return temp; };
+numbers.Pressure = () => { return press; };
+numbers.Altitude = () => { return alt; };
+numbers.BatteryPercentage = E.getBattery;
+numbers.BatteryVoltage = NRF.getBattery;
+numbers.WeatherCode = getWeatherCode;
+numbers.WeatherTemperature = () => { return getWeatherTemperature().value; };
+
+var multistates = {};
+multistates.Lock = () => { return Bangle.isLocked() ? "on" : "off"; };
+multistates.Charge = () => { return Bangle.isCharging() ? "on" : "off"; };
+multistates.Notifications = () => { return ((require("Storage").readJSON("setting.json", 1) || {}).quiet|0) ? "off" : "vibrate"; };
+multistates.Alarm = () => { return (require('Storage').readJSON('alarm.json',1)||[]).some(alarm=>alarm.on) ? "on" : "off"; };
+multistates.Bluetooth = () => { return NRF.getSecurityStatus().connected ? "on" : "off"; };
+//TODO: Implement peripheral connection status
+multistates.BluetoothPeripheral = () => { return NRF.getSecurityStatus().connected ? "on" : "off"; };
+multistates.HRM = () => { return Bangle.isHRMOn ? "on" : "off"; };
+multistates.Barometer = () => { return Bangle.isBarometerOn() ? "on" : "off"; };
+multistates.Compass = () => { return Bangle.isCompassOn() ? "on" : "off"; };
+multistates.GPS = () => { return Bangle.isGPSOn() ? "on" : "off"; };
+multistates.WeatherTemperatureNegative = () => { return getWeatherTemperature().value ? getWeatherTemperature().value : 0 < 0; };
+multistates.WeatherTemperatureUnit = () => { return getWeatherTemperature().unit; };
+multistates.StepsGoal = () => { return (numbers.Steps() >= (settings.stepsgoal || 10000)) ? "on": "off"; };
+
+function drawMultiState(graphics, resources, element){
+  startPerfLog("drawMultiState");
+  //print("drawMultiState", element);
+  var value = multistates[element.Value]();
+  //print("drawImage from drawMultiState", element, value);
+  drawImage(graphics, resources, element, value);
+  element.lastDrawnValue = value;
+  endPerfLog("drawMultiState");
+}
+
+var pulse,alt,temp,press;
+
+
+var requestedDraws = 0;
+var isDrawing = false;
+
+var drawingTime;
+
+var start;
+
+function initialDraw(resources, face){
+  //print("Free memory", process.memory(false).free);
+  requestedDraws++;
+  if (!isDrawing){
+    //print(new Date().toISOString(), "Can draw,", requestedDraws, "draws requested so far");
+    isDrawing = true;
+    resetPerfLog();
+    requestedDraws = 0;
+    //print(new Date().toISOString(), "Drawing start");
+    startPerfLog("initialDraw");
+    //start = Date.now();
+    drawingTime = 0;
+    //print("Precompiled");
+    var promise = precompiledJs(watchfaceResources, watchface);
+
+    promise.then(()=>{
+      var currentDrawingTime = Date.now();
+      if (showWidgets){
+        //print("Draw widgets");
+        Bangle.drawWidgets();
+        g.setColor(g.theme.fg);
+        g.drawLine(0,24,g.getWidth(),24);
+      }
+      lastDrawTime = Date.now() - start;
+      drawingTime += Date.now() - currentDrawingTime;
+      //print(new Date().toISOString(), "Drawing done in", lastDrawTime.toFixed(0), "active:", drawingTime.toFixed(0));
+      isDrawing=false;
+      firstDraw=false;
+      requestRefresh = false;
+      endPerfLog("initialDraw");
+    }).catch((e)=>{
+      print("Error during drawing", e);
+    });
+
+    if (requestedDraws > 0){
+      //print(new Date().toISOString(), "Had deferred drawing left, drawing again");
+      requestedDraws = 0;
+      setTimeout(()=>{initialDraw(resources, face);}, 10);
+    }
+  } //else {
+    //print("queued draw");
+  //}
+}
+
+function handleHrm(e){
+  if (e.confidence > 70){
+    pulse = e.bpm;
+    if (!redrawEvents || redrawEvents.includes("HRM") && !Bangle.isLocked()){
+      //print("Redrawing on HRM");
+      initialDraw(watchfaceResources, watchface);
+    }
+  }
+}
+
+function handlePressure(e){
+  alt = e.altitude;
+  temp = e.temperature;
+  press = e.pressure;
+  if (!redrawEvents || redrawEvents.includes("pressure") && !Bangle.isLocked()){
+    //print("Redrawing on pressure");
+    initialDraw(watchfaceResources, watchface);
+  }
+}
+
+function handleCharging(e){
+  if (!redrawEvents || redrawEvents.includes("charging") && !Bangle.isLocked()){
+    //print("Redrawing on charging");
+    initialDraw(watchfaceResources, watchface);
+  }
+}
+
+
+function getMatchedWaitingTime(time){
+  var result = time - (Date.now() % time);
+  //print("Matched timeout", time, result);
+  return result;
+}
+
+
+
+function setMatchedInterval(callable, time, intervalHandler, delay){
+  //print("Setting matched interval for", time);
+  var matchedTime = getMatchedWaitingTime(time + delay);
+  setTimeout(()=>{
+    var interval = setInterval(callable, time);
+    if (intervalHandler) intervalHandler(interval);
+    callable();
+  }, matchedTime);
+}
+
+var unlockedDrawInterval;
+var lockedDrawInterval;
+
+var lastDrawTime = 0;
+var firstDraw = true;
+
+var lockedRedraw = getByPath(watchface, ["Properties","Redraw","Locked"]) || 60000;
+var unlockedRedraw = getByPath(watchface, ["Properties","Redraw","Unlocked"]) || 1000;
+var defaultRedraw = getByPath(watchface, ["Properties","Redraw","Default"]) || "Always";
+var redrawEvents = getByPath(watchface, ["Properties","Redraw","Events"]);
+var clearOnRedraw = getByPath(watchface, ["Properties","Redraw","Clear"]);
+var events = getByPath(watchface, ["Properties","Events"]);
+
+//print("events", events);
+//print("redrawEvents", redrawEvents);
+
+function handleLock(isLocked, forceRedraw){
+  //print("isLocked", Bangle.isLocked());
+  if (lockedDrawInterval) clearInterval(lockedDrawInterval);
+  if (unlockedDrawInterval) clearInterval(unlockedDrawInterval);
+  if (!isLocked){
+    if (forceRedraw || !redrawEvents || (redrawEvents.includes("unlock"))){
+      //print("Redrawing on unlock", isLocked);
+      initialDraw(watchfaceResources, watchface);
+    }
+    setMatchedInterval(()=>{
+      //print("Redrawing on unlocked interval");
+      initialDraw(watchfaceResources, watchface);
+    },unlockedRedraw, (v)=>{
+      unlockedDrawInterval = v;
+    }, lastDrawTime);
+    if (!events || events.includes("HRM")) Bangle.setHRMPower(1, "imageclock");
+    if (!events || events.includes("pressure")) Bangle.setBarometerPower(1, 'imageclock');
+  } else {
+    if (forceRedraw || !redrawEvents || (redrawEvents.includes("lock"))){
+      //print("Redrawing on lock", isLocked);
+      initialDraw(watchfaceResources, watchface);
+    }
+    setMatchedInterval(()=>{
+      //print("Redrawing on locked interval");
+      initialDraw(watchfaceResources, watchface);
+    },lockedRedraw, (v)=>{
+      lockedDrawInterval = v;
+    }, lastDrawTime);
+    Bangle.setHRMPower(0, "imageclock");
+    Bangle.setBarometerPower(0, 'imageclock');
+  }
+}
+
+
+var showWidgets = false;
+var showWidgetsChanged = false;
+var currentDragDistance = 0;
+
+Bangle.setUI("clock");
+Bangle.on('drag', (e)=>{
+    currentDragDistance += e.dy;
+    if (Math.abs(currentDragDistance) < 10) return;
+    dragDown = currentDragDistance > 0;
+    currentDragDistance = 0;
+    if (!showWidgets && dragDown){
+      //print("Enable widgets");
+      if (WIDGETS && typeof WIDGETS === "object") {
+        for (let w in WIDGETS) {
+          var wd = WIDGETS[w];
+          wd.draw = originalWidgetDraw[w];
+          wd.area = originalWidgetArea[w];
+        }
+      }
+      showWidgetsChanged = true;
+    }
+    if (showWidgets && !dragDown){
+      //print("Disable widgets");
+      clearWidgetsDraw();
+      firstDraw = true;
+      showWidgetsChanged = true;
+    }
+    if (showWidgetsChanged){
+      showWidgetsChanged = false;
+      //print("Draw after widget change");
+      showWidgets = dragDown;
+      initialDraw();
+    }
+  }
+);
+
+if (!events || events.includes("pressure")){
+  Bangle.on('pressure', handlePressure);
+  try{
+    Bangle.setBarometerPower(1, 'imageclock');
+  } catch (e){
+    print("Error during barometer power up", e);
+  }
+}
+if (!events || events.includes("HRM")) {
+  Bangle.on('HRM', handleHrm);
+  Bangle.setHRMPower(1, "imageclock");
+}
+if (!events || events.includes("lock")) {
+  Bangle.on('lock', handleLock);
+}
+if (!events || events.includes("charging")) {
+  Bangle.on('charging', handleCharging);
+}
+
+var originalWidgetDraw = {};
+var originalWidgetArea = {};
+
+function clearWidgetsDraw(){
+  //print("Clear widget draw calls");
+  if (WIDGETS && typeof WIDGETS === "object") {
+    originalWidgetDraw = {};
+    originalWidgetArea = {};
+    for (let w in WIDGETS) {
+      var wd = WIDGETS[w];
+      originalWidgetDraw[w] = wd.draw;
+      originalWidgetArea[w] = wd.area;
+      wd.draw = () => {};
+      wd.area = "";
+    }
+  }
+}
+
+setTimeout(()=>{
+  Bangle.loadWidgets();
+  clearWidgetsDraw();
+}, 0);
+
+handleLock(Bangle.isLocked());
diff --git a/apps/imageclock/app.png b/apps/imageclock/app.png
new file mode 100644
index 000000000..cf057046b
Binary files /dev/null and b/apps/imageclock/app.png differ
diff --git a/apps/imageclock/custom.html b/apps/imageclock/custom.html
new file mode 100644
index 000000000..af7a1835f
--- /dev/null
+++ b/apps/imageclock/custom.html
@@ -0,0 +1,1144 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+  </head>
+  <body>
+
+    <script src="../../core/lib/heatshrink.js"></script>
+    <script src="../../core/lib/imageconverter.js"></script>
+    <script src="../../core/lib/customize.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.js"></script>
+
+    <h4>Upload watchface:</h4>
+
+    <p>
+      Select format:</br>
+      <input type="radio" id="useNative" name="mode" checked/>
+      <label for="useNative">Native</label></br>
+      <input type="radio" id="useAmazefit" name="mode"/>
+      <label for="useAmazefit">ALPHA: Decompiled Amazfit</label></br>
+    </p>
+
+    <p>
+      Options:</br>
+      <input type="checkbox" id="timeoutwrap" name="mode"/>
+      <label for="timeoutwrap">Wrap draw calls in timeouts (Slower, more RAM use, better interactivity)</label></br>
+      <input type="checkbox" id="debugprints" name="mode"/>
+      <label for="debugprints">Add debug prints to generated code</label></br>
+    </p>
+
+    <p>Select watchface folder:</br><input type="file" id="fileLoader" name="files[]" multiple directory="" webkitdirectory="" moxdirectory="" /></p>
+    <p><b>or</b></p>
+    <p>Select watchface zip file: </br><input type="file" id="zipLoader" name="zip"/></p><br/>
+    
+    <button id="btnUpload" class="btn btn-primary">Upload to watch</button></br>
+    <button id="btnSave" class="btn btn-secondary">Save resources file</button></br>
+    <button id="btnSaveFace" class="btn btn-secondary">Save face file</button></br>
+    <button id="btnSaveZip" class="btn btn-secondary">Save watchface zip file</button></br>
+    <canvas id="canvas" style="display:none;"></canvas></br>
+    <p>Download Demo Watchface here: </br>
+      <a href="digitalretro.zip">digitalretro.zip</a></br>
+      <a href="simpleanalog.zip">simpleanalog.zip</a></br>
+    </p>
+
+    <script>     
+      var result = "";
+      var resultJson = {};
+      var infoJson;
+      var faceJson;
+      var precompiledJs = "";
+      var resourceDataString = "";
+      var resourceDataOffset = 0;
+      var handledFiles = 0;
+      var expectedFiles = 0;
+      var rootZip = new JSZip();
+      var resourcesZip = rootZip.folder("resources");
+      
+      function isNativeFormat(){
+        return document.getElementById("useNative").checked;
+      }
+      
+      function addDebug(){
+        return document.getElementById("debugprints").checked;
+      }
+      
+      function convertAmazfitTime(time){
+        var result = {};
+        if (time.Hours){
+          result.Hours = {
+            Tens: convertAmazfitNumber(time.Hours.Tens, "HourTens", 0, 10),
+            Ones: convertAmazfitNumber(time.Hours.Ones, "HourOnes", 0, 10)
+          }
+          result.Hours.Tens.Number.Alignment = "TopLeft";
+          result.Hours.Tens.Number.Spacing = 0;
+          result.Hours.Ones.Number.Alignment = "TopLeft";
+          result.Hours.Ones.Number.Spacing = 0;
+        }
+        if (time.Minutes){
+          result.Minutes = {
+            Tens: convertAmazfitNumber(time.Minutes.Tens, "MinuteTens", 0, 10),
+            Ones: convertAmazfitNumber(time.Minutes.Ones, "MinuteOnes", 0, 10)
+          }
+          result.Minutes.Tens.Number.Alignment = "TopLeft";
+          result.Minutes.Tens.Number.Spacing = 0;
+          result.Minutes.Ones.Number.Alignment = "TopLeft";
+          result.Minutes.Ones.Number.Spacing = 0;
+        }
+        return result;
+      }
+      
+      function convertAmazfitDate(date){
+        var result = {};
+        if (date.MonthAndDay.Separate.Day) result.Day = convertAmazfitNumber(date.MonthAndDay.Separate.Day, "Day");
+        if (date.MonthAndDay.Separate.Month) result.Month = convertAmazfitNumber(date.MonthAndDay.Separate.Month, "Month");
+        if (date.WeekDay){
+          result.WeekDay = convertAmazfitNumber(date.WeekDay, "WeekDayMondayFirst");
+        }
+        return result;
+      }
+      
+      var filesToMove={};
+      
+      var zipChangePromise = Promise.resolve();
+      
+      function performFileChanges(){
+        var promise = Promise.resolve();
+        //rename all files to just numbers without leading zeroes
+        for (var c in resultJson){
+          console.log("Renaming", c, resultJson[c]);
+          var tmp = resultJson[c];
+          delete resultJson[c];
+          resultJson[Number(c)] = tmp;
+          
+          async function modZip(c){
+            console.log("Async modification of ", c)
+            var fileRegex = new RegExp(c + ".*");
+            var fileObject = resourcesZip.file(fileRegex)[0];
+            var fileData = await fileObject.async("uint8array");
+            console.log("Filedata is", fileData);
+            var extension = resourcesZip.file(fileRegex)[0].name.match(/\.[^.]*$/);
+            var newName = Number(c) + extension;
+            
+            console.log("Renaming to", newName);
+            resourcesZip.remove(c + extension);
+            resourcesZip.file(newName, fileData);
+          }
+          promise = promise.then(modZip(c));
+
+          
+        }
+          
+        
+        console.log("File moves:", filesToMove);
+        
+        for (var c in filesToMove){
+          var tmp = resultJson[c];
+          console.log("Handle filemove", c, filesToMove[c], tmp);
+          
+          var element = resultJson;
+          var path = filesToMove[c];
+          
+          
+          async function modZip(c){
+            console.log("Async modification of ", c)
+            var fileRegex = new RegExp(c + ".*");
+            var fileObject = resourcesZip.file(fileRegex)[0];
+            var fileData = await fileObject.async("uint8array");
+            console.log("Filedata is", fileData);
+            var extension = resourcesZip.file(fileRegex)[0].name.match(/\.[^.]*$/);
+            var newName = Number(c) + extension;
+            
+            console.log("Copying to", newName);
+            resourcesZip.file(filesToMove[c].join("/") + extension, fileData);
+          }
+          promise = promise.then(modZip(c));
+          
+          
+          for (var i = 0; i< path.length; i++){
+            if (!element[path[i]]) element[path[i]] = {};
+            if (i == path.length - 1){
+              element[path[i]] = tmp;
+            } else {
+              element = element[path[i]];
+            }
+          }
+          
+        }
+        promise.then(()=>{
+          document.getElementById('btnUpload').disabled = true; 
+        });
+        console.log("After moves", resultJson);
+        return promise;
+      };
+      
+      function convertAmazfitMultistate(multistate, value, minValue, maxValue){
+        var result = {
+          MultiState: {
+            X: multistate.Coordinates.X,
+            Y: multistate.Coordinates.Y,
+            Value: value,
+            ImagePath: [value]
+          }
+        };
+        if (minValue !== undefined) result.MultiState.MinValue = minValue;
+        if (maxValue !== undefined) result.MultiState.MaxValue = maxValue;
+        if (multistate.ImageIndexOn) filesToMove[multistate.ImageIndexOn] = ["status", value, "vibrate"];
+        if (multistate.ImageIndexOff) filesToMove[multistate.ImageIndexOff] = ["status", value, "off"];
+        return result;
+      }
+      
+      function convertAmazfitStatus(status){
+        var result = {};
+        
+        if (status.Alarm) result.Alarm = convertAmazfitMultistate(status.Alarm,"Alarm");
+        if (status.Bluetooth) result.Bluetooth = convertAmazfitMultistate(status.Bluetooth,"Bluetooth");
+        if (status.DoNotDisturb) result.DoNotDisturb = convertAmazfitMultistate(status.DoNotDisturb,"Notifications");
+        if (status.Lock) result.Lock = convertAmazfitMultistate(status.Lock,"Lock");
+        
+        return result;
+      }
+      
+      function convertAmazfitNumber(element, value, minValue, maxValue){
+        var number = {};
+        var result = {
+          Number: number
+        };
+        if (element.Alignment == "BottomRight"){
+          number.X = element.BottomRightX;
+          number.Y = element.BottomRightY;
+        } else if (element.Alignment == "TopLeft"){
+          number.X = element.TopLeftX;
+          number.Y = element.TopLeftY;
+        } else if (element.Alignment == "TopRight"){
+          number.X = element.BottomRightX;
+          number.Y = element.TopLeftY;
+        } else if (element.Alignment == "BottomLeft"){
+          number.X = element.TopLeftX;
+          number.Y = element.BottomLeftY;
+        } else if (element.Alignment == "Center"){
+          number.X = (element.TopLeftX + (element.BottomRightX - element.TopLeftX)/2),
+          number.Y = (element.TopLeftY + (element.BottomRightY - element.TopLeftY)/2)
+        } else {
+          number.X = element.X,
+          number.Y = element.Y
+        }
+        number.Alignment = element.Alignment;
+        number.Spacing = element.Spacing;
+        number.ImageIndex = element.ImageIndex;
+        number.ImagePath = [];
+        number.Value = value;
+        if (minValue !== undefined) number.MaxValue = maxValue;
+        if (maxValue !== undefined) number.MinValue = minValue;
+        return result;
+      }
+      
+      function moveWeatherIcons(icon){
+        filesToMove[icon.ImageIndex + 0] = ["weather", "fallback"];
+        
+        // Light clouds
+        filesToMove[icon.ImageIndex + 1] = ["weather", 801];
+        // Cloudy, possible rain
+        filesToMove[icon.ImageIndex + 2] = ["weather", 500];
+        // Cloudy, possible snow
+        filesToMove[icon.ImageIndex + 3] = ["weather", 600];
+        // Clear
+        filesToMove[icon.ImageIndex + 4] = ["weather", 800];
+        // Clouds
+        filesToMove[icon.ImageIndex + 5] = ["weather", 803];
+        // Light Rain
+        filesToMove[icon.ImageIndex + 6] = ["weather", 501];
+        // Light Snow
+        filesToMove[icon.ImageIndex + 7] = ["weather", 601];
+        // Rain
+        filesToMove[icon.ImageIndex + 8] = ["weather", 502];
+        // Snow
+        filesToMove[icon.ImageIndex + 9] = ["weather", 602];
+        // Heavy Snow
+        filesToMove[icon.ImageIndex + 10] = ["weather", 621];
+        // Heavy Rain
+        filesToMove[icon.ImageIndex + 11] = ["weather", 503];
+        // Sandstorm
+        filesToMove[icon.ImageIndex + 12] = ["weather", 751];
+        // Snow and Rain
+        filesToMove[icon.ImageIndex + 13] = ["weather", 616];
+        // Fog
+        filesToMove[icon.ImageIndex + 14] = ["weather", 741];
+        // Mist
+        filesToMove[icon.ImageIndex + 15] = ["weather", 701];
+        // Shower
+        filesToMove[icon.ImageIndex + 16] = ["weather", 521];
+        // Hail
+        filesToMove[icon.ImageIndex + 17] = ["weather", 611];
+        // Hailstorm
+        filesToMove[icon.ImageIndex + 18] = ["weather", 613];
+        // Heavy Shower
+        filesToMove[icon.ImageIndex + 19] = ["weather", 522];
+        // Dust whirls
+        filesToMove[icon.ImageIndex + 20] = ["weather", 731];
+        // Tornado
+        filesToMove[icon.ImageIndex + 21] = ["weather", 781];
+        // Very heavy shower
+        filesToMove[icon.ImageIndex + 22] = ["weather", 531];
+      }
+      
+      function convertAmazfitTemperature(temp){
+        var result = {};
+        result = convertAmazfitNumber(temp.Number, "WeatherTemperature");
+        if (temp.MinusImageIndex){
+          result.Number.ImageIndexMinus = temp.MinusImageIndex;
+        }
+        if (temp.DegreesImageIndex){
+          result.Number.ImageIndexUnit = temp.DegreesImageIndex;
+        }
+        return result;
+      }
+      
+      function convertAmazfitWeather(weather){
+        var result = {};
+        
+        if (weather.Temperature && weather.Temperature.Current){
+          if (!result.Temperature) result.Temperature = {};
+          result.Temperature.Current = convertAmazfitTemperature(weather.Temperature.Current);
+        }
+        
+        if (weather.Temperature && weather.Temperature.Today){
+          if (!result.Temperature) result.Temperature = {};          
+          if (weather.Temperature.Today.Separate){
+            if (weather.Temperature.Today.Separate.Day){
+              result.Temperature.Day = convertAmazfitTemperature(weather.Temperature.Today.Separate.Day);
+            }
+            if (weather.Temperature.Today.Separate.Night){
+              result.Temperature.Night = convertAmazfitTemperature(weather.Temperature.Today.Separate.Night);
+            }
+          }
+        }
+        if (weather.Icon){
+          result.WeatherIcon = {
+            CodedImage: {
+              X: weather.Icon.CustomIcon.X,
+              Y: weather.Icon.CustomIcon.Y,
+              Value: "WeatherCode",
+              ImagePath: ["weather"]
+            }
+          }
+          moveWeatherIcons(weather.Icon.CustomIcon);
+        }
+        return result;
+      }
+      
+      function convertAmazfitActivity(activity){
+        var result = {};
+        
+        if (activity.Steps){
+          result.Steps = convertAmazfitNumber(activity.Steps, "Steps");
+        }
+        if (activity.Pulse){
+          result.Pulse = convertAmazfitNumber(activity.Pulse, "Pulse");
+        }
+        return result;
+      }
+      
+      function convertAmazfitScale(scale, value, minValue, maxValue){
+        var result = {};
+        result.Scale = {
+          ImageIndex: scale.StartImageIndex,
+          ImagePath: [],
+          Value: value,
+          MaxValue: maxValue,
+          MinValue: minValue
+        };
+        result.Scale.Segments = [];
+        for (var c of scale.Segments){
+          result.Scale.Segments.push({
+            X: c.X,
+            Y: c.Y
+          });
+        }
+        
+        return result;
+      }
+      
+      function convertAmazfitStepsProgress(steps){
+        var result = {};
+        if (steps.GoalImage){
+          result.Goal = {
+            MultiState: {
+              X: steps.GoalImage.X,
+              Y: steps.GoalImage.Y,
+              Value: "StepsGoal",
+              ImagePath: ["StepsGoal"]
+            }
+          }
+          filesToMove[steps.GoalImage.ImageIndex] = ["StepsGoal", "on"];
+        }
+        if (steps.Linear){
+          result.Scale = convertAmazfitScale(steps.Linear, "Steps", 0, "StepsGoal").Scale;
+        }
+        return result;
+      }
+      
+      function convertAmazfitBattery(battery){
+        var result = {};
+        if (battery.Scale){
+          result.Scale = convertAmazfitScale(battery.Scale, "BatteryPercentage", 0, 100).Scale;
+        }
+        if (battery.Text){
+          result.Number = convertAmazfitNumber(battery.Text, "BatteryPercentage", 0, 100).Number;
+        }
+        return result;
+      }
+      
+      function convertAmazfitImage(image){
+        var result = {
+          Image: {
+            X: image.X,
+            Y: image.Y,
+            ImagePath: [],
+            ImageIndex: image.ImageIndex
+          }
+        };
+        return result;
+      }
+      
+      function convertAmazfitColor(color){
+        return "#" + color.substring(2);
+      }
+      
+      function convertAmazfitHand(hand, rotationValue, minRotationValue, maxRotationValue){
+        var result = {
+          Filled: !hand.OnlyBorder,
+          X: hand.Center.X,
+          Y: hand.Center.Y,
+          ForegroundColor: convertAmazfitColor(hand.Color),
+          BackgroundColor: convertAmazfitColor(hand.Color),
+          RotationValue: rotationValue,
+          RotationOffset: 0.25,
+          MaxRotationValue: maxRotationValue,
+          MinRotationValue: minRotationValue
+        };
+        
+        result.Vertices = []
+        for (var c of hand.Shape){
+          result.Vertices.push(c);
+        }
+        return { Poly: result };
+      }
+      
+      function convertAmazfitAnalog(analog, face){
+        var result = {
+        };
+        
+        if (analog.Hours){
+          result.Hours = {};
+          result.Hours.Hand = convertAmazfitHand(analog.Hours, "Hour12Analog", 0, 12);
+          if (analog.Hours.CenterImage){
+            result.Hours.Center = convertAmazfitImage(analog.Hours.CenterImage);
+          }
+        }
+        if (analog.Minutes){
+          result.Minutes = {};
+          result.Minutes.Hand = convertAmazfitHand(analog.Minutes, "Minute", 0, 60);
+          if (!face.Properties) face.Properties = {};
+          if (!face.Properties.Redraw) face.Properties.Redraw = {};
+          face.Properties.Redraw.Unlocked = 10000;
+          face.Properties.Redraw.Locked = 60000;
+          if (analog.Minutes.CenterImage){
+            result.Minutes.Center = convertAmazfitImage(analog.Minutes.CenterImage);
+          }
+        }
+        if (analog.Seconds){
+          result.Seconds = {};
+          result.Seconds = convertAmazfitHand(analog.Seconds, "Second", 0, 60);
+          result.Seconds.Poly.HideOn = ["Lock"];
+          if (!face.Properties) face.Properties = {};
+          if (!face.Properties.Redraw) face.Properties.Redraw = {};
+          face.Properties.Redraw.Unlocked = 1000;
+          face.Properties.Redraw.Locked = 60000;
+          if (!face.Properties.Redraw.Events) face.Properties.Redraw.Events = [];
+          if (!face.Properties.Redraw.Events.includes("lock")) face.Properties.Redraw.Events.push("lock");
+          if (analog.Seconds.CenterImage){
+            result.Seconds.Center = convertAmazfitImage(analog.Seconds.CenterImage);
+          }
+        }
+        return result;
+      }
+      
+      function restructureAmazfitFormat(dataString){
+        console.log("Amazfit data:", dataString);
+        
+        
+        var json = JSON.parse(dataString);
+        faceJson = json;
+        
+
+        var result = {};
+        result.Properties = {};
+        result.Properties.Redraw = {};
+        result.Properties.Redraw.Unlocked = 60000;
+        result.Properties.Redraw.Locked = 60000;
+        result.Properties.Redraw.Clear = true;
+        
+        
+        if (json.Background){
+          result.Background = json.Background;
+          result.Background.Image.ImagePath = [];
+          delete result.Background.Preview;
+          if (json.AnalogDialFace) result.Background.Plane = 1;
+        }
+        if (json.Time){
+          result.Time = convertAmazfitTime(json.Time);
+          if (json.AnalogDialFace) result.Time.Plane = 1;
+        }
+        
+        if (json.Date){
+          result.Date = convertAmazfitDate(json.Date);
+          if (json.AnalogDialFace) result.Date.Plane = 1;
+        }
+        
+        if (json.Status){
+          result.Status = convertAmazfitStatus(json.Status);
+          if (json.AnalogDialFace) result.Status.Plane = 1;
+        }
+        
+        if (json.Weather){
+          result.Weather = convertAmazfitWeather(json.Weather);
+          if (json.AnalogDialFace) result.Weather.Plane = 1;
+        }
+        
+        if (json.Activity){
+          result.Activity = convertAmazfitActivity(json.Activity);
+          if (json.AnalogDialFace) result.Activity.Plane = 1;
+        }
+        
+        if (json.StepsProgress){
+          result.StepsProgress = convertAmazfitStepsProgress(json.StepsProgress);
+          if (json.AnalogDialFace) result.StepsProgress.Plane = 1;
+        }
+        
+        if (json.Battery){
+          result.Battery = convertAmazfitBattery(json.Battery);
+          if (json.AnalogDialFace) result.Battery.Plane = 1;
+        }
+        if (json.AnalogDialFace){
+          result.Analog = convertAmazfitAnalog(json.AnalogDialFace, result);
+          result.Analog.Plane = 0;
+        }
+        console.log("Converted to native:", result);
+        return result;
+
+      }
+      
+      function parseFaceJson(jsonString){
+          if (isNativeFormat()){
+            return JSON.parse(jsonString);
+          } else {
+            return restructureAmazfitFormat(jsonString);
+          }
+      }
+      
+      function combineProperty(name, source, target){
+        if (source[name] && target[name]){
+          if (Array.isArray(target[name])){
+            target[name] = target[name].concat(source[name]);
+            target[name].filter((item, i) => target[name].indexOf(item) === i)
+          } else if (typeof target[name] == "number"){
+            target[name] = source[name] + target[name];
+          }
+        } else if (source[name]){
+          target[name] = source[name]
+        }
+      }
+
+      function collapseTree(element, props){
+        var result = [];
+        if (typeof element == "string" || typeof element == "number") return [];
+        for (var c in element){
+          var next = element[c];
+          
+          combineProperty("X",element,next);
+          combineProperty("Y",element,next);
+          combineProperty("Width",element,next);
+          combineProperty("Height",element,next);
+          combineProperty("HideOn",element,next);
+          combineProperty("Type",element,next);
+          combineProperty("ForegroundColor",element,next);
+          combineProperty("BackgroundColor",element,next);
+          combineProperty("RotationValue",element,next);
+          combineProperty("RotationOffset",element,next);
+          combineProperty("MinRotationValue",element,next);
+          combineProperty("MaxRotationValue",element,next);
+          if (typeof element.Plane == "number") next.Plane = element.Plane;
+          next.Layer = element.Layer ? (element.Layer) : "" + c;
+          
+          if (["MultiState","Image","CodedImage","Number","Circle","Poly","Rect","Scale"].includes(c)){
+            result.push({type:c, value: next});
+          } else {
+            result = result.concat(collapseTree(next));
+          }
+        }
+        return result;
+      }
+      
+      function convertToCode(elements, properties, wrapInTimeouts){        
+        var code = "(function (wr, wf) {\n";
+        if (!wrapInTimeouts){
+          code += "var ct=Date.now();\n";
+        }
+        code += "var lc;\n";
+        code += "var p = Promise.resolve();\n";  
+        
+        //get mapped by layer
+        var counter = 0;
+        var planes = {};
+        var planeNumbers = [];
+        for (var i = 0; i< elements.length; i++){
+          var c = elements[i].value;
+          console.log("Check element", c);
+          var name = c.Layer;
+          var plane = wrapInTimeouts ? 1 : 0;
+          if (typeof c.Plane == "number"){
+            plane = c.Plane;
+          }
+          console.log("Found plane for element", plane, c);
+          if (!planeNumbers.includes(plane)) planeNumbers.push(plane);
+          if (!planes[plane]) planes[plane] = {};
+          if (!planes[plane][name]) planes[plane][name] = [];
+          planes[plane][name].push({index: i, element: c});
+        }
+        if (!planeNumbers.includes(0)) planeNumbers.push(0);
+        planeNumbers.sort().reverse();
+        
+        console.log("Found planes", planes, "with numbers", planeNumbers)
+        
+        if (wrapInTimeouts && planes == 0) planes = 1;
+        
+        code += "p0 = g;\n";
+        
+        for (var planeIndex = 0; planeIndex < planeNumbers.length; planeIndex++){
+          var layers = planes[planeNumbers[planeIndex]];
+          var plane = planeNumbers[planeIndex];
+          
+          var lastSetColor;
+          var lastSetBgColor;
+          
+          if (plane != 0) code += "if (!p" + plane + ") p" + plane + " = Graphics.createArrayBuffer(g.getWidth(),g.getHeight(),4,{msb:true});\n";
+          
+          if (properties.Redraw && properties.Redraw.Clear){
+            if (wrapInTimeouts && plane != 0){
+              code += "p = p.then(()=>delay(0)).then(()=>{\n";
+            } else {
+              code += "p = p.then(()=>{\n";
+            }
+            code += "var ct=Date.now();\n"
+            if (addDebug()) code += 'print("Clear for redraw of plane ' + p + '");'+"\n";
+            code += 'startPerfLog("initialDraw_g.clear");'+"\n";
+            code += "p" + plane + ".clear(true);\n";
+            code += 'endPerfLog("initialDraw_g.clear");'+ "\n";
+  
+            code += "drawingTime += Date.now() - ct;\n";
+            code += "});\n";
+          }
+          
+          var previousPlane = plane + 1;
+          if (previousPlane < planeNumbers.length){
+            code += "p = p.then(()=>{\n";
+            code += "var ct=Date.now();\n";
+            
+            if (addDebug()) code += 'print("Copying of plane ' + previousPlane + ' to display");'+"\n";
+            //code += "g.drawImage(p" + i + ".asImage());";
+            code += "p0.drawImage({width: p" + previousPlane + ".getWidth(), height: p" + previousPlane + ".getHeight(), bpp: p" + previousPlane + ".getBPP(), buffer: p" + previousPlane + ".buffer, palette: palette});\n";
+            
+            
+            code += "drawingTime += Date.now() - ct;\n";
+            code += "});\n";
+          }
+          
+          console.log("Got layers", layers);
+          for (var layername in layers){
+            var layerElements = layers[layername];
+            
+            console.log("Layer elements", layername, layerElements);
+            //code for whole layer
+            
+            if (wrapInTimeouts && plane != 0){
+              code += "p = p.then(()=>delay(0)).then(()=>{\n";
+            } else {
+              code += "p = p.then(()=>{\n";
+            }
+            code += "var ct=Date.now();\n";
+            if (addDebug()) code += 'print("Starting layer ' + layername + '");' + "\n";
+            
+            var checkForLayerChange = false;
+            var checkcode = "";
+            
+            if (!(properties.Redraw && properties.Redraw.Clear)){
+              checkcode = 'firstDraw';
+              for (var i = 0; i< layerElements.length; i++){
+                var layerElement = layerElements[i];
+                var referencedElement = elements[layerElements[i].index];
+                var elementType = referencedElement.type;
+                console.log("Check for change:", layerElement, referencedElement);
+                if (layerElement.element.Value){
+                  if (elementType == "MultiState" && layerElement.element.Value) {
+                    checkcode += '| isChangedMultistate(wf.Collapsed[' + layerElement.index + '].value)';
+                  } else {
+                    checkcode += '| isChangedNumber(wf.Collapsed[' + layerElement.index + '].value)';
+                  }
+                  checkForLayerChange = true;
+                }
+              }
+            }
+            
+              
+            //code for elements
+            for (var i = 0; i< layerElements.length; i++){
+              var elementIndex = layerElements[i].index;
+              var c = elements[elementIndex];
+              console.log("convert to code", c);
+              
+              var condition = "";
+              if (checkcode.length > 0 && checkForLayerChange){
+                if (condition.length > 0) condition += " && ";
+                condition = '(' + checkcode + ')';
+              }
+              
+              if (c.value.HideOn && c.value.HideOn.includes("Lock")){
+                if (condition.length > 0) condition += " && ";
+                condition = '!Bangle.isLocked()';
+              }
+              
+              if (c.value.Type == "Once"){
+                if (condition.length > 0) condition += " && ";
+                condition += "firstDraw";
+              }
+              
+              var planeName = "p" + plane;
+              var colorsetting = "";
+              if (c.value.ForegroundColor && lastSetColor != c.value.ForegroundColor){
+                lastSetColor = c.value.ForegroundColor;
+                if (plane > 0)
+                  colorsetting += planeName + ".setColor(colormap[\"" + c.value.ForegroundColor + "\"]);\n";
+                else
+                  colorsetting += planeName + ".setColor(\"" + c.value.ForegroundColor + "\");\n";
+              }
+              if (c.value.BackgroundColor && lastSetBgColor != c.value.BackgroundColor){
+                lastSetBgColor = c.value.BackgroundColor;
+                if (plane > 0)
+                  colorsetting += planeName + ".setBgColor(colormap[\"" + c.value.BackgroundColor + "\"]);\n";
+                else
+                  colorsetting += planeName + ".setBgColor(\"" + c.value.BackgroundColor + "\");\n";
+              }
+              
+              if (addDebug()) code += 'print("Element condition is ' + condition + '");' + "\n";
+              code += "" + colorsetting;
+              code += (condition.length > 0 ? "if (" + condition + "){\n" : "");
+              if (addDebug()) code += 'print("Drawing element ' + elementIndex + ' with type ' + c.type + ' on plane ' + planeName + '");' + "\n";
+              code += "draw" + c.type + "(" + planeName + ", wr, wf.Collapsed[" + elementIndex + "].value);\n";
+
+              code += (condition.length > 0 ? "}\n" : "");
+            }
+            
+            code += "drawingTime += Date.now() - ct;\n";
+            code += "});\n";
+          }
+          console.log("Current plane is", plane);
+          
+
+          
+        }
+          
+        code += "return p;})";
+        console.log("Code:", code);
+        return code
+      }
+
+      function postProcess(){
+        moveData(resultJson);
+        console.log("Created data file", resourceDataString, resourceDataOffset, resultJson);
+        
+        var properties = faceJson.Properties;        
+        faceJson = { Properties: properties, Collapsed: collapseTree(faceJson,{X:0,Y:0})};
+        console.log("After collapsing", faceJson);
+        precompiledJs = convertToCode(faceJson.Collapsed, properties, document.getElementById('timeoutwrap').checked);
+        console.log("After precompiling", precompiledJs);
+      }
+      
+      function convertJsToJson(imgstr){
+        var E = {};
+        E.toArrayBuffer = (s)=>s;
+        var atob = (s)=>s;
+        var imgstr = "imgstr = " + imgstr;
+        eval(imgstr);
+        imgstr.img = imgstr.buffer;
+        delete imgstr.buffer;
+        if (imgstr.palette) {
+          imgstr.paletteData = "[" + imgstr.palette.toString() + "]";
+          delete imgstr.palette;
+        }
+        console.log("converted Image JSON", JSON.stringify(imgstr));
+        return JSON.stringify(imgstr);
+      }
+
+      function imageLoaded() {
+        var options = {};
+        
+        options.diffusion = infoJson.diffusion ? infoJson.diffusion : "none";
+        options.compression = false;
+        options.alphaToColor = false;
+        options.transparent = infoJson.transparent ? infoJson.transparent : false;
+        options.inverted = false;
+        options.autoCrop = false;
+        options.brightness = 0;
+        options.contrast = 0;
+        options.mode = infoJson.color ? infoJson.color : "1bit";
+        options.output = "object";
+        
+        console.log("Loaded image has path", this.path);
+        var jsonPath = this.path.split("/");
+        
+        var forcedTransparentColorMatch = jsonPath[jsonPath.length-1].match(/.*\.t([^.]+)\..*/)        
+        
+        var forcedTransparentColor;
+        if (jsonPath[jsonPath.length-1].includes(".t.")){
+          options.transparent = true;
+        } else if (forcedTransparentColorMatch){
+          options.transparent = false;
+          forcedTransparentColor = forcedTransparentColorMatch[1];
+        }
+        
+        
+        console.log("image has transparency", options.transparent);
+        console.log("image has forced transparent color", forcedTransparentColor);
+        jsonPath[jsonPath.length-1] = jsonPath[jsonPath.length-1].replace(/([^.]*)\..*/, "$1");
+        console.log("Loaded image has json path", jsonPath);
+ 
+        var canvas = document.getElementById("canvas")
+        canvas.width = this.width*2;
+        canvas.height = this.height;
+        var ctx = canvas.getContext("2d");
+        ctx.drawImage(this,0,0);
+
+        var imgstr = "";
+
+
+        var imageData = ctx.getImageData(0, 0, this.width, this.height);
+        ctx.fillStyle = 'white';
+        ctx.fillRect(options.width, 0, this.width, this.height);
+        var rgba = imageData.data;
+        options.rgbaOut = rgba;
+        options.width = this.width;
+        options.height = this.height;
+        console.log("options", options);
+        imgstr = imageconverter.RGBAtoString(rgba, options);
+        var outputImageData = new ImageData(options.rgbaOut, options.width, options.height);
+        ctx.putImageData(outputImageData,this.width,0);
+        
+        imgstr = convertJsToJson(imgstr);
+
+        // checkerboard for transparency on original image
+        var imageData = ctx.getImageData(0, 0, this.width, this.height);
+        imageconverter.RGBAtoCheckerboard(imageData.data, {width:this.width,height:this.height});
+        ctx.putImageData(imageData,0,0);
+
+       
+        var currentElement = resultJson;
+       
+        for (var i = 0; i < jsonPath.length; i++){
+          if (i == jsonPath.length - 1){
+            var resultingObject = JSON.parse(imgstr);
+            if (forcedTransparentColor !== undefined) resultingObject.transparent = forcedTransparentColor;
+            currentElement[jsonPath[i]] = resultingObject;
+            console.log("result is ", resultingObject);
+          } else {
+            if (!currentElement[jsonPath[i]]) currentElement[jsonPath[i]] = {};
+            currentElement = currentElement[jsonPath[i]];
+          }
+        }
+        
+        handledFiles++;
+        console.log("Expected:", expectedFiles, " handled:", handledFiles);
+        
+        if (handledFiles == expectedFiles){
+          if (!isNativeFormat()) {
+            performFileChanges().then(()=>{
+              postProcess();
+              
+              rootZip.file("face.json", JSON.stringify(faceJson, null, 2));
+              rootZip.file("info.json", JSON.stringify(infoJson, null, 2));
+              
+              document.getElementById('btnSave').disabled = false;
+              document.getElementById('btnSaveFace').disabled = false;
+              document.getElementById('btnSaveZip').disabled = false;
+              document.getElementById('btnUpload').disabled = false;
+            });
+          } else {
+            postProcess();
+              
+            document.getElementById('btnSave').disabled = false;
+            document.getElementById('btnSaveFace').disabled = false;
+            document.getElementById('btnUpload').disabled = false;
+          }
+        }
+      }
+      
+      function handleWatchFace(infoFile, faceFile, resourceFiles){
+        if (isNativeFormat()){
+          var reader = new FileReader();
+          reader.path = infoFile.webkitRelativePath;
+          reader.onload = function(event) {
+            infoJson = JSON.parse(reader.result);
+            
+            handleFaceJson(faceFile, resourceFiles);
+          };
+          reader.readAsText(infoFile);
+        } else {
+          console.log("Handling amazfit watch face");
+          handleFaceJson(faceFile, resourceFiles);
+        }
+      }
+      
+      function handleFaceJson(faceFile, resourceFiles){
+        var reader = new FileReader();
+        reader.path = faceFile.webkitRelativePath;
+        reader.onload = function(event) {
+          faceJson = parseFaceJson(reader.result);
+          
+          handleResourceFiles(resourceFiles);
+        };
+        reader.readAsText(faceFile);
+      }
+      
+      function handleResourceFiles(files){
+        for (var current of files){
+          console.log('Handle resource file ', current);
+          var reader = new FileReader();
+          console.log("Handling ", current.name, " with path ", current.webkitRelativePath);
+          var filteredPath;
+          if (isNativeFormat()){
+            filteredPath = current.webkitRelativePath.replace(/.*\/resources\//,"");
+          } else {
+            filteredPath = current.webkitRelativePath.replace(/.*\//,"");
+          }
+          reader.path = filteredPath;
+          resourcesZip.file(filteredPath, current);
+          reader.onload = function(event) {
+            var img = new Image();
+            img.path = this.path;
+            img.onload = imageLoaded;
+            img.src = event.target.result;
+          };        
+          reader.readAsDataURL(current);
+        }
+      }
+      
+      function handleFileSelect(event) {
+        handledFiles = 0;
+        expectedFiles = undefined;
+        
+        document.getElementById('btnSave').disabled = true;
+        document.getElementById('btnSaveZip').disabled = true;
+        document.getElementById('btnSaveFace').disabled = true;
+        document.getElementById('btnUpload').disabled = true;
+        
+        console.log("File select event", event);
+        if (event.target.files.length == 0) return;
+        result = "";
+        resultJson= {};
+        
+        var resourceFiles = [];
+        var faceFile;
+        var infoFile;
+        
+        for (var current of event.target.files){
+          console.log('Handle file ', current);
+          if (isNativeFormat()){
+            if (current.webkitRelativePath.split("/")[1].startsWith("resources")){
+              console.log('Found resource file', current.name);
+              resourceFiles.push(current);
+              expectedFiles = resourceFiles.length;
+            } else if (current.name == "face.json"){
+              console.log('Found face file', current.name);
+              faceFile = current;
+            } else if (current.name == "info.json"){
+              console.log('Found info file', current.name);
+              infoFile = current;
+            } else {
+              console.log('Found unsupported file', current.name);
+            }
+          } else {
+            infoJson = {
+              "color": "3bit",
+              "transparent": true
+            };
+            if (current.name.includes(".png")){
+              console.log('Found resource file', current.name);
+              resourceFiles.push(current);
+              expectedFiles = resourceFiles.length;
+            } else if (current.name.includes(".json")){
+              console.log('Found amazfit file', current.name);
+              faceFile = current;
+            } else {
+              console.log('Found unsupported file', current.name);
+            }
+          }
+        }
+        handleWatchFace(infoFile, faceFile, resourceFiles);
+       
+      };
+      document.getElementById('fileLoader').addEventListener('change', handleFileSelect, false);
+     
+      function moveData(json){
+        console.log("MoveData for", json);
+        for (var k in json){
+          var c = json[k];
+          if (c.img){
+            var currentData = atob(c.img);
+            delete c.img;
+            c.dataOffset = resourceDataOffset;
+            c.dataLength = currentData.length;
+            resourceDataString += currentData;
+            resourceDataOffset += currentData.length;
+          } else if (c.compressed){
+            var currentData = atob(c.compressed);
+            c.compressed = true;
+            c.dataOffset = resourceDataOffset;
+            c.dataLength = currentData.length;
+            resourceDataString += currentData;
+            resourceDataOffset += currentData.length;
+          } else {
+            moveData(c);
+          }
+        }
+      }
+     
+      document.getElementById("btnSave").addEventListener("click", function() {
+        var h = document.createElement('a');
+        h.href = 'data:text/json;charset=utf-8,' + encodeURI(JSON.stringify(resultJson));    
+        h.target = '_blank';
+        h.download = "imageclock.resources.json";
+        h.click();
+      });
+      document.getElementById("btnUpload").addEventListener("click", function() {
+        
+        var appDef = {
+          id : "imageclock",
+          storage:[
+            {name:"imageclock.app.js", url:"app.js"},
+            {name:"imageclock.resources.json", content: JSON.stringify(resultJson)},
+            {name:"imageclock.img", url:"app-icon.js", evaluate:true},
+          ]
+        };
+        if (resourceDataString.length > 0){
+          appDef.storage.push({name:"imageclock.resources.data", content: resourceDataString});
+        }
+        appDef.storage.push({name:"imageclock.draw.js", content: precompiledJs.length > 0 ? precompiledJs : "//empty"});
+        appDef.storage.push({name:"imageclock.face.json", content: JSON.stringify(faceJson)});
+
+        console.log("Uploading app:", appDef);        
+        sendCustomizedApp(appDef);
+      });
+            
+
+      function handleZipSelect(evt) {
+
+      function handleFile(f) {
+        expectedFiles = 0;
+        handledFiles = 0;
+        document.getElementById('btnSave').disabled = true;
+        document.getElementById('btnSaveFace').disabled = true;
+        document.getElementById('btnSaveZip').disabled = true;
+        document.getElementById('btnUpload').disabled = true;
+        JSZip.loadAsync(f).then(function(zip) {
+          
+                console.log("Zip loaded", zip);
+                result = "";
+                resultJson= {};
+                
+                var resourceFiles = [];
+                
+                var promise = zip.file("face.json").async("string").then((data)=>{
+                  console.log("face.json data", data);
+                  faceJson = parseFaceJson(data);
+                });
+                
+                if (isNativeFormat()){
+                  promise = promise.then(zip.file("info.json").async("string").then((data)=>{
+                    console.log("info.json data", data);
+                    infoJson = JSON.parse(data);
+                  }));
+                } else {
+                  infoJson = {
+                    "color": "3bit",
+                    "transparent": true
+                  };
+                  
+                }
+                
+                zip.folder("resources").forEach(function (relativePath, file){
+                  console.log("iterating over", relativePath);
+                  
+                  if (!file.dir){
+                    expectedFiles++;
+                    promise = promise.then(file.async("blob").then(function (blob) {
+                      var reader = new FileReader();
+                      console.log("Handling ", file.name, " with path ", relativePath);
+                      reader.path = relativePath;
+                      reader.onload = function(event) {
+                        var img = new Image();
+                        img.path = this.path;
+                        img.onload = imageLoaded;
+                        img.src = event.target.result;
+                      };  
+                      reader.readAsDataURL(blob);
+                    }));
+                  }
+                  
+                });
+          
+          
+        }, function (e) {
+          console.log("Error reading " + f.name + ": " + e.message);
+        });
+    }
+
+
+    console.log("Zip select event", evt);
+    var files = evt.target.files;
+    
+    if (files.length > 1){
+      alert("Only one file allowed");
+    }
+    
+    handleFile(files[0]);
+  }
+
+  function handleZipExport(){
+    rootZip.generateAsync({type:"base64"}).then(function (base64) {
+      var h = document.createElement('a');
+      h.href="data:application/zip;base64," + base64;
+      h.target = '_blank';
+      h.download = "watchface.zip";
+      h.click();
+    });
+  }
+
+     
+  document.getElementById("btnSaveFace").addEventListener("click", function() {
+    var h = document.createElement('a');
+    h.href = 'data:text/json;charset=utf-8,' + encodeURI(JSON.stringify(faceJson));    
+    h.target = '_blank';
+    h.download = "face.json";
+    h.click();
+  });
+      
+  document.getElementById('zipLoader').addEventListener('change', handleZipSelect, false);
+  document.getElementById('btnSaveZip').addEventListener('click', handleZipExport, false);
+  document.getElementById('btnSave').disabled = true;
+  document.getElementById('btnSaveFace').disabled = true;
+  document.getElementById('btnSaveZip').disabled = true;
+  document.getElementById('btnUpload').disabled = true;
+      
+   </script>
+
+  </body>
+</html>
diff --git a/apps/imageclock/demomode.js b/apps/imageclock/demomode.js
new file mode 100644
index 000000000..8c9d19195
--- /dev/null
+++ b/apps/imageclock/demomode.js
@@ -0,0 +1,29 @@
+var demostate = 0;
+function demoMode(){
+  lockedRedraw = 2000;
+  unlockedRedraw = 2000;
+  for (var c in multistates){
+    multistates[c] = ()=>{return ["on","off"][demostate%2];};
+    if (c == "WeatherTemperatureUnit") multistates[c] = ()=>{return ["celsius","fahrenheit"][demostate%2];};
+    if (c == "Notifications") multistates[c] = ()=>{return ["on","off","vibrate"][demostate%3];};
+  }
+  for (var c in numbers){
+    if (c.contains("Minute")) numbers[c] = ()=>{return Math.floor((Math.random() * 9) + 1);};
+    if (c.contains("Second")) numbers[c] = ()=>{return Math.floor((Math.random() * 9) + 1);};
+    if (c.contains("Hour")) numbers[c] = ()=>{return Math.floor((Math.random() * 9) + 1);};
+  }
+  for (var c in numbers){
+    if (c.contains("Ones")) numbers[c] = ()=>{return Math.floor((Math.random() * 9) + 1);};
+    if (c.contains("Tens")) numbers[c] = ()=>{return Math.floor((Math.random() * 9) + 1);};
+  }
+  numbers.Pulse = ()=>{return Math.floor((Math.random() * 60) + 40);};
+  numbers.Steps = ()=>{return Math.floor((Math.random() * 10000) + 10);};
+  numbers.Temperature = ()=>{return Math.floor((Math.random() * 15) + 10);};
+  numbers.Pressure = ()=>{return Math.floor((Math.random() * 1000) + 10);};
+  numbers.Altitude = ()=>{return Math.floor((Math.random() * 1000) + 10);};
+  numbers.WeatherCode = ()=>{return Math.floor((Math.random() * 800) + 100);};
+  numbers.WeatherTemperature = ()=>{return Math.floor((Math.random() * 10) + 0);};
+}
+demoMode();
+handleLock(false);
+setInterval(()=>{demostate++;},1000);
diff --git a/apps/imageclock/digitalretro.zip b/apps/imageclock/digitalretro.zip
new file mode 100644
index 000000000..96ab90b6d
Binary files /dev/null and b/apps/imageclock/digitalretro.zip differ
diff --git a/apps/imageclock/metadata.json b/apps/imageclock/metadata.json
new file mode 100644
index 000000000..a2594653e
--- /dev/null
+++ b/apps/imageclock/metadata.json
@@ -0,0 +1,19 @@
+{
+  "id": "imageclock",
+  "name": "Imageclock",
+  "shortName": "Imageclock",
+  "version": "0.07",
+  "type": "clock",
+  "description": "BETA!!! File formats still subject to change --- This app is a highly customizable watchface. To use it, you need to select a watchface. You can build the watchfaces yourself without programming anything. All you need to do is write some json and create image files.",
+  "icon": "app.png",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "custom": "custom.html",
+  "customConnect": false,
+  "readme": "README.md",
+  "storage": [
+    {"name":"imageclock.app.js","url":"app.js"},
+    {"name":"imageclock.settings.js","url":"settings.js"},
+    {"name":"imageclock.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/imageclock/settings.js b/apps/imageclock/settings.js
new file mode 100644
index 000000000..a86901b9e
--- /dev/null
+++ b/apps/imageclock/settings.js
@@ -0,0 +1,35 @@
+(function(back) {
+  var FILE = "imageclock.json";
+  
+  var settings = Object.assign({
+    stepsgoal: 10000,
+    perflog: false
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  E.showMenu({
+    '': { 'title': 'Imageclock' },
+    '< Back': back,
+    'Steps goal': {
+      value: settings.stepsgoal,
+      min: 0,
+      step: 500,
+      max: 50000,
+      onchange: v => {
+        settings.stepsgoal = v;
+        writeSettings();
+      }
+    },
+    'Performance log': {
+      value: !!settings.perflog,
+      format: v => settings.perflog ? "On" : "Off",
+      onchange: v => {
+        settings.perflog = v;
+        writeSettings();
+      }
+    }
+  });
+})
diff --git a/apps/imageclock/simpleanalog.zip b/apps/imageclock/simpleanalog.zip
new file mode 100644
index 000000000..1301be055
Binary files /dev/null and b/apps/imageclock/simpleanalog.zip differ
diff --git a/apps/invader/ChangeLog b/apps/invader/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/invader/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/invader/README.md b/apps/invader/README.md
new file mode 100644
index 000000000..7ed98defb
--- /dev/null
+++ b/apps/invader/README.md
@@ -0,0 +1,23 @@
+# App Name
+
+Invader 
+
+## Usage
+
+For fun! - I'm creating this demo to learn JavaScript with the Bangle.js 2
+
+## Features
+
+Shoot the Alien, you have three lives
+
+## Controls
+
+Touch the lower Left or Right hand sides of the screen to move turret left or right, tap upper Right hand part of screen to fire, tap upper Left hand part of screen to restart
+
+## Requests
+
+bkumanchik on Espruino Forums
+
+## Creator
+
+Brian Kumanchik 2022
diff --git a/apps/invader/app-icon.js b/apps/invader/app-icon.js
new file mode 100644
index 000000000..dc7003c84
--- /dev/null
+++ b/apps/invader/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwhHXAH4A/AH4A/AH4AYgAACC/4X/C/YbTFbYv/F/4rTAC4v/F/4vfC5YnPGaYv/F/4vLc7b3TF/4v/F/4v/F/4vTA5YAPE64v/F/4fTa55DXF/4v/AH4A/AH4A/AH4A/AHIA=="))
diff --git a/apps/invader/app.js b/apps/invader/app.js
new file mode 100644
index 000000000..89e7462f6
--- /dev/null
+++ b/apps/invader/app.js
@@ -0,0 +1,452 @@
+// Brian Kumanchik
+// Started 05-25-22
+// My Invader Demo, for Bangle.js 2, written JavaScript - using Espruino Web IDE
+
+
+// note: resolution is 176x176
+
+
+// to do:
+//   upload to official app page
+//   make invader clock
+
+
+
+// - variables -----------------------------------------
+// invader variables
+var inv_x             = 77;
+var inv_y             = 20;
+var i_anim_delay      = 10;     // invader animation (and move) delay
+var inv_frame         = 1;      // invader start animation frame
+var ix_speed          = 6;      // march speed
+var i_dir             = 1;      // 1 = right, 0 = left
+var been_hit          = false;  // invader hit state
+// - shoot variables
+var inv_shot_x        = -32;
+var inv_shot_y        = -32;
+var inv_fire_pause    = 30;
+var inv_fired         = false;  // invader fired state
+// - explode variables
+var been_hit          = false;  // invader hit state
+var bx                = -32;    // blast x
+var by                = -32;    // blast y
+var blast_delay       = 15;     // invader blast delay - pause after explosion
+var boom_play         = false;
+
+// turret variables
+var tur_x               = 77;
+var tur_y               = 148;
+var shot_fired          = false; // turret fired state
+var sx                  = -20;   // turret shot starting x - off screen
+var sy                  = -20;   // turret shot starting y - off screen
+var turret_been_hit     = false;
+var turret_blast_delay  = 25;    // keep blast active on screen for 60 frames
+var turret_exp_frame    = 1;     // turret explode start animation frame
+var turret_anim_delay   = 3;     // turret explode animation delay
+var explosion_play      = false;
+
+// misc variables
+var score               = 0;     // starting score
+var lives               = 3;     // starting lives
+var game_state          = 0;     // game state - 0 = game not started, 1 = game running, 3 = game over
+var ang                 = 0.1;
+var start_been_pressed  = false; // stops double press on restart
+var fire_been_pressed   = false; // stops auto fire
+
+// input(screen controller) variables
+var BTNL, BTNR, BTNF, BTNS; // button - left, right, fire, start
+var tap = {};
+// use tapping on screen for left, right, fire, start
+Bangle.on('drag',e=>tap=e);
+BTNL = { read : _=>tap.b && tap.x < 88 && tap.y > 88};
+BTNR = { read : _=>tap.b && tap.x > 88 && tap.y > 88};
+BTNF = { read : _=>tap.b && tap.x > 88 && tap.y < 88};
+BTNS = { read : _=>tap.b && tap.x < 88 && tap.y < 88};
+
+
+// - sprites -------------------------------------------
+// invader sprites
+var invader_a =
+  require("heatshrink").decompress(atob("hcIwkBiIBBAQoECCQQFBgEQAIMBEhUBDoYWDAYI="));
+var invader_b =
+  require("heatshrink").decompress(atob("hcIwkBiIBBAQMQAoQEBgISCAYUQAIQAEB4YEBEAgEDAYIA=="));
+var boom =
+  require("heatshrink").decompress(atob("hcJwkBiMQAIURgMQAgIKBAIICFAIMAAwIWBBAYSIEAgrDiA="));
+var inv_shot =
+  require("heatshrink").decompress(atob("gcFwkBiERiAABAYQ"));
+
+// turret sprites
+var turret =
+  require("heatshrink").decompress(atob("h8IwkBiIABAYYACgAHFiEABggADCAInFgITBAAgOPA=="));
+var tur_exp_a =
+  require("heatshrink").decompress(atob("h8IwkBiMRiACBAAwJEiAABBQgZCAAkAiAJBBoIUBgIABBgQACDIQ9ECQIA=="));
+var tur_exp_b =
+  require("heatshrink").decompress(atob("h8IwkBiIBBAAUBiADCiMQAwQFDCIYXEB4IABgMAEYQXBiEAAQIQBAoIABDAQUCAAIVBA"));
+var shot =
+  require("heatshrink").decompress(atob("gMDwkBAoIA=="));
+
+
+// function to move and animate invader
+function move_anim_inv() {
+  // invader anim code
+  i_anim_delay -= 1;
+  if ((i_anim_delay < 0) && !(been_hit)) {
+    i_anim_delay = 10;
+
+    inv_frame += 1;
+    if (inv_frame > 2) {
+      inv_frame = 1;
+    }
+
+    // move right
+    if (i_dir == 1){
+      inv_x += ix_speed;
+      if (inv_x >= 142) {
+        inv_y += 8; // step down
+        i_dir = -1;
+      }
+    }
+
+    // move left
+    if (i_dir < 1){
+      inv_x -= ix_speed;
+      if (inv_x <= 10) {
+        inv_y += 8; // step down
+        i_dir = 1;
+      }
+    }
+  }
+}
+
+
+// function to make invader fire
+function invader_fire() {
+  inv_fire_pause -= 1;
+
+  if (!(inv_fired)) { // so once invader shot is fired it doesn't follow the invader still
+    inv_shot_x = inv_x + 8;
+    inv_shot_y = inv_y + 18;
+  }
+
+  if (inv_fire_pause < 0) {
+    inv_fired = true;
+    inv_shot_y += 8;
+  }
+}
+
+
+// function to make turret explode (when hit) then start back in center
+function turret_hit() {
+  if (turret_been_hit) {
+    if (!(explosion_play)) {
+      //Bangle.buzz();
+      //Bangle.beep();
+    }
+
+    explosion_play = true;
+    turret_anim_delay -= 1;
+    turret_blast_delay -= 1;
+
+    if (turret_anim_delay < 0) {
+      turret_exp_frame += 1;
+      if (turret_exp_frame > 2) {
+        Bangle.buzz();
+        turret_exp_frame = 1;
+      }
+      turret_anim_delay = 3;
+    }
+
+    if (turret_blast_delay < 0) {
+      turret_blast_delay = 21;
+      turret_been_hit = false;
+      explosion_play = false;
+      tur_x = 77;   // reset turret x
+      tur_y = 148;  // reset turret y
+    }
+  }
+}
+
+
+// function to make invader explode (when hit) then randomly start somewhere else
+function invader_hit() {
+  if (been_hit) {
+    if (!(boom_play)) {
+      Bangle.buzz();
+      //Bangle.beep();
+    }
+
+    inv_shot_x = -32;      // hide shot
+    inv_shot_y = -32;      // hide shot
+    inv_fire_pause = 30;   // and reset pause
+
+    boom_play = true;
+    blast_delay -= 1;
+
+    if (blast_delay < 0) {
+      blast_delay = 15;
+      boom_play = false;
+      been_hit = false;
+      bx = -32;                         // move boom off screen (following invader)
+      by = -32;
+      // generate a random rounded number between 10 and 142;
+      inv_x = Math.floor(Math.random() * 142) + 10;
+      inv_y = 20;                       // move invader back up after being hit
+      i_dir = 1;                        // reset invader direction
+    }
+  }
+}
+
+
+// - setup stuff ---------------------------------------
+function gameStart() {
+  setInterval(onFrame, 50);
+}
+
+
+// - main loop -------------------------------------------------------------
+function onFrame() {
+
+  // game not started state (title screen) ***************************
+  if(game_state == 0) {    
+    g.clear();
+
+
+    if (!(BTNS.read())) {
+      start_been_pressed  = false; // stops double press on restart
+    }
+
+
+    // draw text during game over state
+    g.setFont("4x6", 4);  // set font and size x 2
+    g.setColor(0,1,0);    // set color (black)
+    g.drawString("INVADER", 33, 55);
+
+
+    // just animate invader
+    // invader anim code
+    i_anim_delay -= 1;
+    if(i_anim_delay < 0) {
+      i_anim_delay = 15;
+
+      inv_frame += 1;
+      if (inv_frame > 2) {
+        inv_frame = 1;
+      }
+    }
+
+
+    // draw sprites during game over state
+    // next 2 line for a rotating invader on the title screen
+    //ang += 0.1;
+    //g.drawImage(invader_a, 88, 98, {scale:4, rotate:ang});
+    if(inv_frame == 1) {
+      g.drawImage(invader_a, 88-22, 85, {scale:4});
+    }
+    else if(inv_frame == 2) {
+      g.drawImage(invader_b, 88-22, 85, {scale:4});
+    }
+
+    // reset stuff
+    if(BTNS.read() && !(start_been_pressed)) {
+      turret_been_hit  = false;
+      tur_x            = 77;       // reset turret to center of screen
+      tur_y            = 148;      // reset turret y
+      inv_x            = 77;       // reset invader to center of screen
+      inv_y            = 20;       // reset invader back to top
+      i_dir            = 1;        // reset invader direction
+      lives            = 3;        // reset lives
+      score            = 0;        // reset score
+      explosion_play   = false;
+      game_state       = 1;
+      turret_blast_delay  = 25;
+  }
+
+
+    g.flip();
+  }
+
+
+  // game over state *************************************************
+  if(game_state == 3) {
+    g.clear();
+
+    // draw text during game over state
+    g.setFont("4x6", 2);  // set font and size x 2
+    g.setColor(0,0,0);    // set color (black)
+    g.drawString("SCORE:" + score ,5, 5);
+    g.drawString("LIVES:" + lives ,117, 5);
+    g.drawString("GAME OVER", 52, 80);
+
+
+    // draw sprites during game over state
+    // - invader frame 2
+    g.drawImage(invader_b, inv_x, inv_y, {scale:2});
+    g.drawImage(tur_exp_b, tur_x, tur_y, {scale:2});
+    g.drawImage(inv_shot, inv_shot_x, inv_shot_y, {scale:2});
+
+
+    // reset stuff
+    if(BTNS.read()) {
+      //turret_been_hit  = false;
+      //tur_x            = 77;       // reset turret to center of screen
+      //tur_y            = 148;      // reset turret y
+      //inv_x            = 77;       // reset invader to center of screen
+      //inv_y            = 20;       // reset invader back to top
+      //i_dir            = 1;        // reset invader direction
+      //lives            = 3;        // reset lives
+      //score            = 0;        // reset score
+      //explosion_play   = false;
+      game_state       = 0;
+      start_been_pressed  = true;
+      //turret_blast_delay  = 25;
+    }
+
+
+    g.flip();
+  }
+
+
+  // not game over state (game running) ******************************
+  if(game_state == 1) {
+    Bangle.setLCDPower(1); // optional - this keeps the watch LCD lit up
+    g.clear();
+
+
+    if (!(BTNF.read())) {
+      fire_been_pressed  = false; // stops auto fire
+    }
+
+
+    // call function to move and animate invader
+    move_anim_inv();
+
+    // call function to make invader fire
+    invader_fire();
+
+
+    // check input (screen presses)
+    if(BTNL.read() && tur_x >= 12 && !(turret_been_hit)) {
+      tur_x -= 6;
+    }
+    else if(BTNR.read() && tur_x <= 140 && !(turret_been_hit)) {
+      tur_x += 6;
+    }
+    else if(BTNF.read() && !(turret_been_hit) && !(fire_been_pressed) && !(shot_fired)) {
+      shot_fired = true;
+      fire_been_pressed = true; // stops auto fire
+      sx=tur_x + 12;
+      sy=tur_y - 7;
+    }
+
+
+    // check for turret shot going off screen before allowing to fire again
+    if (shot_fired) {
+      sy -= 8;
+      if (sy < 22) {
+        shot_fired = false;
+        sx = -32;
+        sy = -32;
+      }
+    }
+
+
+    // check for invader shot going off screen before allowing to fire again
+    if (inv_shot_y > 150
+    ) {
+      inv_fired = false;
+      inv_shot_x = inv_x - 1;
+      inv_shot_y = inv_y + 7;
+      inv_fire_pause = 30;
+    }
+
+
+    // check for turret shot and invader collision
+    if ((sx >= inv_x) && (sx <= inv_x + 20) && (sy <= inv_y + 14)) {
+        sx = -32;
+        sy = -32;
+        been_hit = true;
+        score += 10;
+    }
+
+
+    // check for invader shot and turret collision
+    if ((inv_shot_x + 4) >= (tur_x) && (inv_shot_x) <= (tur_x + 24) && (inv_shot_y + 8) >= (tur_y + 6)) {
+      if (!(turret_been_hit)) {
+        lives -= 1;
+
+        if (lives == 0) {
+          game_state = 3;
+          Bangle.buzz();
+        }
+      turret_been_hit = true;
+      }
+    }
+
+
+    // - draw sprites ----------------------------------
+    // invader sprites
+    if(!(been_hit)) {
+      if(inv_frame == 1) {
+        // - invader frame 1
+        g.drawImage(invader_a, inv_x, inv_y, {scale:2});
+      }
+      else if(inv_frame == 2) {
+        // - invader frame 2
+        g.drawImage(invader_b, inv_x, inv_y, {scale:2});
+      }
+    }
+    else {
+      // - invader explosion
+      g.drawImage(boom, inv_x, inv_y, {scale:2});
+    }
+    // - invader shot
+    if (inv_fired) {
+      g.drawImage(inv_shot, inv_shot_x, inv_shot_y, {scale:2});
+    }
+    else {
+      g.drawImage(inv_shot, -32, -32, {scale:2}); 
+    }
+
+    // turret sprites
+    if(!(turret_been_hit)) {
+      // - undamaged turret
+      g.drawImage(turret, tur_x, tur_y, {scale:2});
+    }
+    else {
+      if(turret_exp_frame == 1) {
+        // - turret explosion frame 1
+        g.drawImage(tur_exp_a, tur_x, tur_y, {scale:2});
+      }
+      else if(turret_exp_frame == 2) {
+        // - turret explosion frame 2
+        g.drawImage(tur_exp_b, tur_x, tur_y, {scale:2});
+      }
+    }
+    // - turret shot
+    g.drawImage(shot, sx, sy, {scale:2});
+
+
+    // call function to make invader explode then randomly start somewhere else
+    invader_hit();
+
+
+    // call function to make turret explode (when hit) then start back in center
+    turret_hit();
+
+
+    // - draw text -------------------------------------
+    g.setFont("4x6", 2);  // set font and size x 2
+    g.setColor(0,0,0);    // set color (black)
+    g.drawString("SCORE:" + score ,5,5);
+    g.drawString("LIVES:" + lives ,117,5);
+
+
+    g.flip();
+  }
+
+} // end main loop ---------------------------------------------------------
+
+
+gameStart();
+
+
diff --git a/apps/invader/app.png b/apps/invader/app.png
new file mode 100644
index 000000000..3b9f82205
Binary files /dev/null and b/apps/invader/app.png differ
diff --git a/apps/invader/metadata.json b/apps/invader/metadata.json
new file mode 100644
index 000000000..bb74f5122
--- /dev/null
+++ b/apps/invader/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "invader",
+  "name": "Invader",
+  "shortName":"Invader",
+  "version":"0.11",
+  "description": "A Space Invader game-like demo - work in progress",
+  "icon": "app.png",
+  "screenshots" : [ { "url":"screenshot_0.png" }, { "url":"screenshot_1.png" }, { "url":"screenshot_2.png" } ],
+  "tags": "game",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"invader.app.js","url":"app.js"},
+    {"name":"invader.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/invader/screenshot.png b/apps/invader/screenshot.png
new file mode 100644
index 000000000..ae936f6c7
Binary files /dev/null and b/apps/invader/screenshot.png differ
diff --git a/apps/invader/screenshot_0.png b/apps/invader/screenshot_0.png
new file mode 100644
index 000000000..804f3e435
Binary files /dev/null and b/apps/invader/screenshot_0.png differ
diff --git a/apps/invader/screenshot_1.png b/apps/invader/screenshot_1.png
new file mode 100644
index 000000000..14164bc6e
Binary files /dev/null and b/apps/invader/screenshot_1.png differ
diff --git a/apps/invader/screenshot_2.png b/apps/invader/screenshot_2.png
new file mode 100644
index 000000000..5f6ade79c
Binary files /dev/null and b/apps/invader/screenshot_2.png differ
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index e622feb1f..9a8ac4008 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -19,4 +19,5 @@
 0.19: Alarms can not go bigger than 100.
 0.20: Use alarm for alarm functionality instead of own implementation.
 0.21: Add custom theming.
-0.22: Fix alarm and add build in function for step counting.
\ No newline at end of file
+0.22: Fix alarm and add build in function for step counting.
+0.23: Add warning for low flash memory
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 07ca51fd9..e81c0d6f3 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -147,8 +147,7 @@ var iconCharging =   {
   buffer : require("heatshrink").decompress(atob("23btugAwUBtoICARG0h048eODQYCJ6P/AAUCCJfbo4SDxYRLtEcuPHjlwgoRJ7RnIloUHoYjDAQfAExEAwUIkACEkSAIEYwCBhZKH6EIJI0CJRFHEY0BJRWBSgf//0AJRYSE4BKLj4SE8BKLv4RD/hK/JS2AXY0gXwRKG4cMmACCJQMAg8csEFJQsBAwfasEAm379u0gFbcBfHzgFBz1xMQZKBjY/D0E2+BOChu26yVEEYdww+cgAFCg+cgIfB6RKF4HbgEIkGChEAthfCJQ0eEAIjBBAMxk6GCJQtgtyVBwRKBAQMbHAJKGXIIFCgACBhl54qVG2E+EAJKBJoWAm0WJQ6SCXgdxFgMLJQvYjeAEAUwFIUitEtJQ14NwUHgEwKYZKGwOwNYX7XgWCg3CJQ5rB4MevPnAoPDJRJrCgEG/ECAoNsJRUwoEesIIBiJKI3CVDti/CJRKVDiJHBSo0YsOGjED8AjBcAcIgdhcAXAPIUAcAYIBcA4dBAQUG8BrBgBuCgOwcBEeXIK2BBAIFBgRqBGoYAChq8CcYUE4FbUYOACQsHzgjDgwFBCIImBAQsDtwYD7cAloRI22B86YBw5QBgoRJ7dAgYEDCJaeBJoMcsARMAQNoJIIRE6A"))
 };
 
-var iconNoBattery = {
-  text: "NO BAT",
+var iconWarning = {
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("kmSpIC/AWMyoQIFsmECJFJhMmA4QXByVICIwODAQ4RRFIQGD5JVLkIGDzJqMyAGDph8MiRKGyApEAoZKFyYIDQwMkSQNkQZABBhIIOOJRuEL5gRIAUKACVQMhmUSNYNDQYJTBBwYFByGTkOE5FJWYNMknCAQKYCiaSCpmGochDoSYBhMwTAZrChILBhmEzKPBF4ImBTAREBDoMmEwJVDoYjBycJFgWEJQRuLJQ1kmQCCjJlCBYbjCagaDBwyDBmBuBF4TjJAUQKINBChCDQxZBcZIIQF4NIgEAgKSDiQmEVQKMBoARBAAMCSQLLBVoxqKL4gaCChVCNwoRKOIo4CJIgABBoSMHpIRFgDdJOIJUBCAUJRgJuEAQb+DIIgRIAX4C/ASOQA"))
@@ -321,19 +320,21 @@ function drawState(){
 
   if(!isAlarmEnabled()){
     var bat = E.getBattery();
+    var flash = storage.getFree() / process.env.STORAGE;
     var current = new Date();
     var hours = current.getHours();
-    var iconImg =
-        Bangle.isCharging() ? iconCharging :
-        bat < 30 ? iconNoBattery :
-        Bangle.isGPSOn() ? iconSatellite :
-        hours % 4 == 0 ? iconSaturn :
-        hours % 4 == 1 ? iconMars :
-        hours % 4 == 2 ? iconMoon :
-        iconEarth;
-    g.drawImage(iconImg, 23, 118);
+    var iconMsg =
+        Bangle.isCharging() ? { icon: iconCharging, text: "STATUS" } :
+        bat < 30 ? { icon: iconWarning, text: "BAT" } :
+        flash < 0.1 ? { icon: iconWarning, text: "DISK" } :
+        Bangle.isGPSOn() ? { icon: iconSatellite, text: "STATUS" } :
+        hours % 4 == 0 ? { icon: iconSaturn, text: "STATUS" } :
+        hours % 4 == 1 ? { icon: iconMars, text: "STATUS" } :
+        hours % 4 == 2 ? { icon: iconMoon, text: "STATUS" } :
+        { icon: iconEarth, text: "STATUS" };
+    g.drawImage(iconMsg.icon, 23, 118);
     g.setColor(cWhite);
-    g.drawString("STATUS", 23+26, 108);
+    g.drawString(iconMsg.text, 23+26, 108);
   } else {
     // Alarm within symbol
     g.setColor(color2);
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index 40da1b37f..62a1c67db 100644
--- a/apps/lcars/metadata.json
+++ b/apps/lcars/metadata.json
@@ -3,7 +3,7 @@
   "name": "LCARS Clock",
   "shortName":"LCARS",
   "icon": "lcars.png",
-  "version":"0.22",
+  "version":"0.23",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "Library Computer Access Retrieval System (LCARS) clock.",
diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 53157f0d8..4b577e191 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -51,3 +51,5 @@
 0.36: Ensure a new message plus an almost immediate deletion of that message doesn't load the messages app (fix #1362)
 0.37: Now use the setUI 'back' icon in the top left rather than specific buttons/menu items
 0.38: Add telegram foss handling
+0.39: Set default color for message icons according to theme
+      Don't turn on the screen after unread timeout expires (#1873)
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 745f7d208..d4540b797 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -317,7 +317,7 @@ function showMessage(msgid) {
         {type:"txt", font:fontSmall, label:msg.src||/*LANG*/"Message", bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:2, halign:1 },
         title?{type:"txt", font:titleFont, label:title, bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:2 }:{},
       ]},
-      { type:"btn", src:require("messages").getMessageImage(msg), col:require("messages").getMessageImageCol(msg), pad: 3, cb:()=>{
+      { type:"btn", src:require("messages").getMessageImage(msg), col:require("messages").getMessageImageCol(msg, g.theme.fg2), pad: 3, cb:()=>{
         cancelReloadTimeout(); // don't auto-reload to clock now
         showMessageSettings(msg);
       }},
@@ -411,19 +411,17 @@ function cancelReloadTimeout() {
   unreadTimeout = undefined;
 }
 
-
 g.clear();
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
+
 setTimeout(() => {
-  var unreadTimeoutSecs = settings.unreadTimeout;
-  if (unreadTimeoutSecs===undefined) unreadTimeoutSecs=60;
-  if (unreadTimeoutSecs)
-    unreadTimeout = setTimeout(function() {
-      print("Message not seen - reloading");
-      load();
-    }, unreadTimeoutSecs*1000);
+  var unreadTimeoutMillis = (settings.unreadTimeout || 60) * 1000;
+  if (unreadTimeoutMillis) {
+    unreadTimeout = setTimeout(load, unreadTimeoutMillis);
+  }
   // 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});
-},10); // if checkMessages wants to 'load', do that
+  var newMusic = MESSAGES.some(m => m.id === "music" && m.new);
+  checkMessages({ clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1, openMusic: newMusic && settings.openMusic });
+}, 10); // if checkMessages wants to 'load', do that
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index fd09fdfe4..4bc9f59e4 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.38",
+  "version": "0.39",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messages/widget.js b/apps/messages/widget.js
index 4b368ffd6..ca02d4f1f 100644
--- a/apps/messages/widget.js
+++ b/apps/messages/widget.js
@@ -27,7 +27,6 @@ draw:function(recall) {
   if (quiet) WIDGETS["messages"].t -= 500000; // if quiet, set last time in the past so there is no buzzing
   WIDGETS["messages"].width=this.iconwidth;
   Bangle.drawWidgets();
-  Bangle.setLCDPower(1);// turns screen on
 },hide:function() {
   delete WIDGETS["messages"].t;
   delete WIDGETS["messages"].l;
diff --git a/apps/miclock2/ChangeLog b/apps/miclock2/ChangeLog
index 55c60accd..534332e63 100644
--- a/apps/miclock2/ChangeLog
+++ b/apps/miclock2/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Redraw only when seconds change
+0.03: Fix typo in redraw check
diff --git a/apps/miclock2/clock-mixed.js b/apps/miclock2/clock-mixed.js
index edc68959c..bb1537313 100644
--- a/apps/miclock2/clock-mixed.js
+++ b/apps/miclock2/clock-mixed.js
@@ -48,7 +48,7 @@ function setLineWidth(x1, y1, x2, y2, lw) {
 
 function drawMixedClock(force) {
   var date = new Date();
-  if ((force || Bangle.isLCDOn()) && buf.buffer && date.getSeconds() === lastDate.getSeconds()) {
+  if ((force || Bangle.isLCDOn()) && buf.buffer && date.getSeconds() !== lastDate.getSeconds()) {
     lastDate = date;
     var dateArray = date.toString().split(" ");
     var isEn = locale.name.startsWith("en");
diff --git a/apps/miclock2/metadata.json b/apps/miclock2/metadata.json
index e1481dbd2..094d0995a 100644
--- a/apps/miclock2/metadata.json
+++ b/apps/miclock2/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "miclock2",
   "name": "Mixed Clock 2",
-  "version": "0.02",
+  "version": "0.03",
   "description": "White color variant of the Mixed Clock with thicker clock hands for better readability in the bright sunlight, extra space under the clock for widgets and seconds in the digital clock.",
   "icon": "clock-mixed.png",
   "type": "clock",
diff --git a/apps/mylocation/ChangeLog b/apps/mylocation/ChangeLog
index 1239554f0..c14e64ba9 100644
--- a/apps/mylocation/ChangeLog
+++ b/apps/mylocation/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Fixed issue selecting Frankfurt not saved
 0.05: Fixed issue with back option
 0.06: renamed source files to match standard
+0.07: Move mylocation app into 'Settings -> Apps'
diff --git a/apps/mylocation/README.md b/apps/mylocation/README.md
index fd597397a..a6a16ce83 100644
--- a/apps/mylocation/README.md
+++ b/apps/mylocation/README.md
@@ -2,6 +2,8 @@
 
    *Sets and stores GPS lat and lon of your preferred city*
 
+To access, go to `Settings -> Apps -> My Location`
+
 * Select one of the preset Cities or setup through the GPS
 * Other Apps can read this information to do calculations based on location
 * When the City shows ??? it means the location has been set through the GPS
diff --git a/apps/mylocation/icon.js b/apps/mylocation/icon.js
deleted file mode 100644
index b79f5875f..000000000
--- a/apps/mylocation/icon.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("mEw4UA///gH4AYPO/QPDgNVqtADY/1BYNfBQ0PBQIAB+ALFmoLDrgLF6oLDq4KEgYKDBYPABYcNBYlVuAuIGAwuEAANUBYYKFHgg6Bq4ZCr4DBHgQLBvWq2te1WlBYZGBBYOr1Wq1qSDBYNqBIILDKgQLLgoLHqBqDBfJHLBZBrOgKPCBYiPCU4NaBYe1WYrABBQLCCfgYGCrwVBa4kAirvKNgIAErgLDKgIAEKQQ8EAAY6DBZhIDIww8GHQg8GHQgwGFwowEFwx5EOog8GHQ0AlWpBYNq1AKFWIILBAYOgBYbICytWAgQKCgTgDcwYXGAAgvGAAY8EEgYWGBgoVEA=="))
diff --git a/apps/mylocation/metadata.json b/apps/mylocation/metadata.json
index 16549b2ba..4ab9aa37e 100644
--- a/apps/mylocation/metadata.json
+++ b/apps/mylocation/metadata.json
@@ -2,16 +2,15 @@
   "name": "My Location",
   "shortName":"My Location",
   "icon": "app.png",
-  "type": "app",
+  "type": "settings",
   "screenshots": [{"url":"screenshot_1.png"}],
-  "version":"0.06",
+  "version":"0.07",
   "description": "Sets and stores the lat and long of your preferred City or it can be set from the GPS. mylocation.json can be used by other apps that need your main location lat and lon. See README",
   "readme": "README.md",
   "tags": "tool,utility",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "storage": [
-    {"name":"mylocation.app.js","url":"app.js"},
-    {"name":"mylocation.img","url":"icon.js","evaluate": true }
+    {"name":"mylocation.settings.js","url":"settings.js"}
   ],
   "data": [
     {"name":"mylocation.json"}
diff --git a/apps/mylocation/app.js b/apps/mylocation/settings.js
similarity index 73%
rename from apps/mylocation/app.js
rename to apps/mylocation/settings.js
index fd5c9cc6d..7033500fa 100644
--- a/apps/mylocation/app.js
+++ b/apps/mylocation/settings.js
@@ -1,5 +1,4 @@
-Bangle.loadWidgets();
-Bangle.drawWidgets();
+(function(back) {
 
 const SETTINGS_FILE = "mylocation.json";
 let settings;
@@ -18,7 +17,7 @@ function loadSettings() {
   }
 }
 
-function save() {
+function saveSettings() {
   settings = s;
   require('Storage').write(SETTINGS_FILE, settings);
 }
@@ -34,29 +33,29 @@ function setFromGPS() {
     //console.log("fix from GPS");
     s = {'lat': gps.lat, 'lon': gps.lon, 'location': '???' };
     Bangle.buzz(1500); // buzz on first position
-    Bangle.setGPSPower(0);
-    save();
+    Bangle.setGPSPower(0, "mylocation");
+    saveSettings();
 
     Bangle.setUI("updown", ()=>{ load(); });
-    E.showPrompt("Location has been saved from the GPS fix",{
-      title:"Location Saved",
-      buttons : {"OK":1}
+    E.showPrompt(/*LANG*/"Location has been saved from the GPS fix",{
+      title:/*LANG*/"Location Saved",
+      buttons : {/*LANG*/"OK":1}
     }).then(function(v) {
       load(); // load default clock
     });
   });
 
-  Bangle.setGPSPower(1);
-  E.showMessage("Waiting for GPS fix. Place watch in the open. Could take 10 minutes. Long press to abort", "GPS Running");
+  Bangle.setGPSPower(1, "mylocation");
+  E.showMessage(/*LANG*/"Waiting for GPS fix. Place watch in the open. Could take 10 minutes. Long press to abort", "GPS Running");
   Bangle.setUI("updown", undefined);
 }
 
 function showMainMenu() {
   //console.log("showMainMenu");
   const mainmenu = {
-    '': { 'title': 'My Location' },
-    '< Back': ()=>{ load(); },
-    'City': {
+    '': { 'title': /*LANG*/'My Location' },
+    '< Back': ()=>{ back(); },
+    /*LANG*/'City': {
       value: 0 | locations.indexOf(s.location),
       min: 0, max: locations.length - 1,
       format: v => locations[v],
@@ -65,14 +64,15 @@ function showMainMenu() {
           s.location = locations[v];
           s.lat = lats[v];
           s.lon = lons[v];
-          save();
+          saveSettings();
         }
       }
     },
-    'Set From GPS': ()=>{ setFromGPS(); }
+    /*LANG*/'Set From GPS': ()=>{ setFromGPS(); }
   };
   return E.showMenu(mainmenu);
 }
 
 loadSettings();
 showMainMenu();
+})
diff --git a/apps/pongclock/ChangeLog b/apps/pongclock/ChangeLog
new file mode 100644
index 000000000..7b83706bf
--- /dev/null
+++ b/apps/pongclock/ChangeLog
@@ -0,0 +1 @@
+0.01: First release
diff --git a/apps/pongclock/README.md b/apps/pongclock/README.md
new file mode 100644
index 000000000..894070b73
--- /dev/null
+++ b/apps/pongclock/README.md
@@ -0,0 +1,15 @@
+# Pong Clock
+
+A clock which is playing Pong while showing the current time as score
+* Settings
+  *  Show or hide widgets (auto detecting the used widgets areas)
+  *  Use inverted or standard theme colors for the play area
+  *  Optionally pause while locked (saving battery)
+* Loosely based on [https://codepen.io/Rabrennie/pen/WxNEoe](https://codepen.io/Rabrennie/pen/WxNEoe)
+
+![](screenshot.png)
+![](screenshot_settings.png)
+![](screenshot_invers_full.png)
+
+## Creator
+[@pidajo](https://github.com/pidajo)
diff --git a/apps/pongclock/app.js b/apps/pongclock/app.js
new file mode 100644
index 000000000..2a10bf6ed
--- /dev/null
+++ b/apps/pongclock/app.js
@@ -0,0 +1,310 @@
+class Ball {
+  constructor(collision) {
+    this.collision = collision;
+    this.w = 4;
+    this.h = this.w;
+    this.y = height / 2 - this.h / 2;
+    this.x = width / 2 - this.w / 2;
+    this.oldX = this.x;
+    this.oldY = this.y;
+    this.velX = 6;
+    this.velY = 3.5 + Math.random();
+  }
+
+  reset() {
+    this.y = height / 2 - this.h / 2;
+    this.x = width / 2 - this.w / 2;
+    this.velX = 6;
+    this.velY = 3.5 + Math.random();
+  }
+
+  checkCollision(that, isLeft) {
+    let test = false;
+    if (isLeft) {
+      test = this.x <= that.w + this.w && this.y > that.y && this.y < that.y + that.h;
+    } else {
+      test = this.x >= that.x + this.w && this.y > that.y && this.y < that.y + that.h;
+    }
+    if (test) {
+      this.velX = -this.velX;
+      this.velY = (3.5 + 2 * Math.random()) * this.velY / Math.abs(this.velY);
+
+      if (isLeft) {
+        right.follow = this;
+        left.follow = null;
+      } else {
+        left.follow = this;
+        right.follow = null;
+      }
+    }
+  }
+
+  move() {
+    if (this.velX > 0) {
+      this.checkCollision(right, false);
+    } else {
+      this.checkCollision(left, true);
+    }
+
+    this.x += this.velX;
+    this.y += this.velY;
+
+    if (this.y <= this.h) {
+      this.y = this.h;
+      this.velY = -this.velY;
+    }
+
+    if (this.y >= height - this.h) {
+      this.y = height - this.h;
+      this.velY = -this.velY;
+    }
+
+    if (this.x >= width) {
+      left.scored();
+      restart();
+    } else if (this.x < 0) {
+      right.scored();
+      restart();
+    }
+
+  }
+}
+
+class Paddle {
+  constructor(side) {
+    this.side = side;
+    this.w = 4; //15;
+    this.h = 30; //80;
+    this.y = height / 2 - this.h / 2;
+    this.follow = null;
+    this.target = height / 2 - this.h / 2;
+    this.score = 99;
+    this.hasLost = false;
+  }
+
+  reset() {
+    this.follow = null;
+    this.hasLost = false;
+    this.target = height / 2 - this.h / 2;
+    this.y = height / 2 - this.h / 2;
+    this.move();
+  }
+
+  scored() {
+    let d = new Date();
+    let value = 0;
+    if (this.side == "left") {
+      value = d.getHours();
+    } else {
+      value = d.getMinutes();
+    }
+    if (this.score < value) {
+      this.score++;
+    } else {
+      this.score = value;
+    }
+  }
+
+  move() {
+
+    if (this.follow && !this.hasLost) {
+      var dy = this.follow.y - this.y - this.h / 2;
+      this.y += dy / 2;
+    } else {
+      this.y += (this.target - this.y) / 10;
+    }
+    if (this.y < 0) {
+      this.y = 0;
+    }
+    if (this.y > height - this.h) {
+      this.y = height - this.h;
+    }
+  }
+}
+
+var updateTimeout = null;
+
+function update() {
+  var d = new Date();
+  var lastStep = Date.now();
+  left.move();
+  right.move();
+  if (d.getHours() != left.score) {
+    right.follow = null;
+    right.hasLost = true;
+  }
+  if (d.getMinutes() != right.score) {
+    left.follow = null;
+    left.hasLost = true;
+  }
+
+  ball.move();
+  redraw();
+  var nextStep = 40 - (Date.now() - lastStep);
+  //console.log(nextStep);
+  updateTimeout = setTimeout(update, nextStep > 0 ? nextStep : 0);
+  return lastStep;
+}
+
+function redraw() {
+  let fontHeight = width / 3.6;
+  let fontTop = top + height / 11;
+  let topHeight = top + height;
+  g.reset();
+
+  if (settings.isInvers) {
+    g.setColor(g.theme.bg);
+    g.setBgColor(g.theme.fg);
+  }
+
+  g.clearRect(0, top + left.oldY, left.w, top + left.oldY + left.h);
+  g.clearRect(width - right.w, top + right.oldY, width, top + right.oldY + right.h);
+  //g.clearRect(width / 2 - fontHeight * 1.4,  fontTop, width / 2 + fontHeight * 1.4, fontTop + fontHeight);
+  g.clearRect(ball.oldX - ball.w, top + ball.oldY - ball.h, ball.oldX + ball.w, top + ball.oldY + ball.h);
+
+  g.setFontVector(fontHeight);
+  /**/
+  g.setFontAlign(1, -1);
+  g.drawString(("0" + left.score).substr(-2), 5 * width / 11, fontTop, true);
+  g.setFontAlign(-1, -1);
+  g.drawString(("0" + right.score).substr(-2), 6 * width / 11, fontTop, true);
+  /**/
+
+  g.drawLine(width / 2, top, width / 2, topHeight);
+  g.fillRect(0, top + left.y, left.w, top + left.y + left.h);
+  left.oldY = left.y;
+  g.fillRect(width - right.w, top + right.y, width, top + right.y + right.h);
+  right.oldY = right.y;
+  g.fillCircle(ball.x, top + ball.y, ball.w);
+  ball.oldX = ball.x;
+  ball.oldY = ball.y;
+}
+
+function restart() {
+  g.reset();
+  if (settings.isInvers) {
+    g.setColor(g.theme.bg);
+    g.setBgColor(g.theme.fg);
+  }
+  g.clearRect(0, top, width, top + height);
+  ball.reset();
+  left.reset();
+  right.reset();
+  right.follow = ball;
+  left.move();
+  right.move();
+  if (settings.withWidgets) {
+    Bangle.drawWidgets();
+  }
+}
+
+function stop() {
+  if (updateTimeout) {
+    clearTimeout(updateTimeout);
+  }
+  updateTimeout = null;
+  if (pauseTimeout) {
+    clearTimeout(pauseTimeout);
+  }
+  pauseTimeout = null;
+}
+
+var pauseTimeout = null;
+
+function pause() {
+  stop();
+  left.scored();
+  right.scored();
+  redraw();
+  pauseTimeout = setTimeout(pause, Date.now() % 60000);
+}
+
+//load settings
+const SETTINGS_FILE = "pongclock.json";
+var settings = Object.assign({
+  // default values
+  withWidgets: true,
+  isInvers: false,
+  playLocked: true,
+}, require('Storage').readJSON(SETTINGS_FILE, true) || {});
+require('Storage').writeJSON(SETTINGS_FILE, settings);
+
+//make clock
+Bangle.setUI("clock");
+
+//setup play area
+var height = g.getHeight(),
+  width = g.getWidth();
+var top = 0;
+
+g.reset();
+g.clearRect(0, top, width, height);
+
+if (settings.withWidgets) {
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+  //console.log(WIDGETS);
+  if (global.WIDGETS) {
+    let bottom = 0;
+    for (var i in WIDGETS) {
+      var w = WIDGETS[i];
+      if (w.area) {
+        if (w.area.indexOf("t") >= 0) {
+          top = Bangle.appRect.y;
+        }
+        if (w.area.indexOf("b") >= 0) {
+          bottom = height - Bangle.appRect.y2;
+        }
+      }
+    }
+    height -= top + bottom;
+  }
+}
+
+if (settings.isInvers) {
+  g.setColor(g.theme.bg);
+  g.setBgColor(g.theme.fg);
+}
+g.clearRect(0, top, width, top + height);
+
+//setup game
+var left = new Paddle("left");
+var right = new Paddle("right");
+var ball = new Ball(true);
+
+left.x = 20;
+right.x = width - 20;
+
+left.scored();
+right.scored();
+
+Bangle.on("lock", (on) => {
+  //console.log(on);
+  if (!settings.playLocked) {
+    if (on) {
+      pause();
+    } else {
+      stop();
+      update();
+    }
+  }
+});
+
+//start clock
+restart();
+if (!settings.playLocked && Bangle.isLocked()) {
+  pause();
+} else {
+  update();
+}
+
+/*
+//local testing
+require("Storage").write("pongclock.info",{
+  "id":"pongclock",
+  "name":"Pong Clock",
+  "type":"clock",
+  "src":"pongclock.app.js",
+  "icon":"pongclock.img"
+});
+*/
diff --git a/apps/pongclock/metadata.json b/apps/pongclock/metadata.json
new file mode 100644
index 000000000..dbd044517
--- /dev/null
+++ b/apps/pongclock/metadata.json
@@ -0,0 +1,20 @@
+{ "id": "pongclock",
+  "name": "Pong Clock",
+  "shortName":"Pong Clock",
+  "icon": "pongclock.png",
+  "version":"0.01",
+  "description": "A Pong playing clock",
+  "tags": "",
+  "allow_emulator":true, 
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "readme":"README.md",
+  "screenshots" : [ { "url":"screenshot.png" }, { "url":"screenshot_settings.png" }, { "url":"screenshot_invers_full.png" } ],
+  "storage": [
+    {"name":"pongclock.app.js","url":"app.js"},
+    {"name":"pongclock.img","url":"pongclock-icon.js","evaluate":true},
+    {"name":"pongclock.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"pongclock.json"}
+  ]
+}
diff --git a/apps/pongclock/pongclock-icon.js b/apps/pongclock/pongclock-icon.js
new file mode 100644
index 000000000..22e472af4
--- /dev/null
+++ b/apps/pongclock/pongclock-icon.js
@@ -0,0 +1 @@
+atob("MDCEBAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAIiAAAAAAAAAAEAAAAAAAABP/EAE//yAAAAAAAD8wAAAT//IAAAAAAv//EA////IAAAAAAP8gAAH///8gAAAAAvP/EB/xA/MAIiAAAf8QAAL/ED8wAAAAAxD/EC8wAf8ALyAAAv8AAAPyAC/wAAAAAAD/ED/wAf8ALyAAD/MAAA/zAC8wAAAAAAD/EAAAAv8ALyAAH/EAAAAAAD8wAAAAAAD/EAAAA/IALyAAL/AAAAAAAP8gAAAAAAD/EAAAH/EALyAAPzD/IAAAAv8AAAAAAAD/EAAAPzAALyAA/yD/IAAAD/IAAAAAAAD/EAAB/xAALyAB/xD/IAAAL/AAAAAAAAD/EAAP8wAALyAC/wD/IAAB/yAAAAAAAAD/EAAv8QAAIiAP8wD/IAAD/wAAAAAAAAD/EAD/MAAAAAAf/zP/MwAf8gAAAA//AAD/EAL/AAAAAAAf////8wA/8AAAAA//AAD/EB/zAAAAIiACIiL/MgL/IAAAAA//AAD/EC////8ALyAAAAD/IAP////wAA//AAD/EC////8ALyAAAAD/IAP////wAA//AAAAAAAAAAAALyAAAAAAAAAAAAAAAA//AAAAAAAAAAAALyAAAAAAAAAAAAAAAA//AAAAAAAAAAAALyAAAAAAAAAAAAAAAA//AAAAAAAAAAAALyAAAAAAAAAAAAAAAA//AAAAAAAAAAAALyAAAAAAAAAAAAAAAA//AAAAAAAAAAAALyAAAAAAAAAAAAAAAA//AAAAAAAAAAAAIiAAAAAAAAAAAAAAAA//AAAAAAAAAAAAAAAAAAAAAAAAAAD/8A//AAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAIiAAAAAAAAAAAAD/8AAAAAAAASEAAAAALyAAAAAAAAAAAAD/8AAAAAAAP/8wAAAALyAAAAAAAAAAAAD/8AAAAAAB///xAAAALyAAAAAAAAAAAAD/8AAAAAAC///yAAAALyAAAAAAAAAAAAD/8AAAAAAB///xAAAALyAAAAAAAAAAAAD/8AAAAAAAP/8wAAAALyAAAAAAAAAAAAD/8AAAAAAAASEAAAAALyAAAAAAAAAAAAD/8AAAAAAAAAAAAAAALyAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAIiAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyAAAAAAAAAAAAAAAA==")
diff --git a/apps/pongclock/pongclock.png b/apps/pongclock/pongclock.png
new file mode 100644
index 000000000..78934d7c6
Binary files /dev/null and b/apps/pongclock/pongclock.png differ
diff --git a/apps/pongclock/screenshot.png b/apps/pongclock/screenshot.png
new file mode 100644
index 000000000..0750105f0
Binary files /dev/null and b/apps/pongclock/screenshot.png differ
diff --git a/apps/pongclock/screenshot_invers_full.png b/apps/pongclock/screenshot_invers_full.png
new file mode 100644
index 000000000..434e24872
Binary files /dev/null and b/apps/pongclock/screenshot_invers_full.png differ
diff --git a/apps/pongclock/screenshot_settings.png b/apps/pongclock/screenshot_settings.png
new file mode 100644
index 000000000..0b27286ea
Binary files /dev/null and b/apps/pongclock/screenshot_settings.png differ
diff --git a/apps/pongclock/settings.js b/apps/pongclock/settings.js
new file mode 100644
index 000000000..0d61d013d
--- /dev/null
+++ b/apps/pongclock/settings.js
@@ -0,0 +1,44 @@
+(function(back) {
+  var FILE = "pongclock.json";
+  // Load settings
+  var settings = Object.assign({
+    // default values
+    withWidgets: true,
+    isInvers: false,
+    playLocked: true,
+    }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  // Show the menu
+  E.showMenu({
+    "" : { "title" : "Pong Clock" },
+    "< Back" : () => back(),
+    'Widgets?': {
+      value: !!settings.withWidgets,  // !! converts undefined to false
+      format: v => v?"Show":"Hide",
+      onchange: v => {
+        settings.withWidgets = v;
+        writeSettings();
+      }
+    },
+    'Inverted?': {
+      value: !!settings.isInvers,  // !! converts undefined to false
+      format: v => v?"Yes":"No",
+      onchange: v => {
+        settings.isInvers = v;
+        writeSettings();
+      }
+    },
+    'On Lock?': {
+      value: !!settings.playLocked,  // !! converts undefined to false
+      format: v => v?"Play":"Pause",
+      onchange: v => {
+        settings.playLocked = v;
+        writeSettings();
+      }
+    }
+  });
+})/*(load)/**/
diff --git a/apps/rgb/ChangeLog b/apps/rgb/ChangeLog
new file mode 100644
index 000000000..a08433b7c
--- /dev/null
+++ b/apps/rgb/ChangeLog
@@ -0,0 +1 @@
+0.01: initial release
diff --git a/apps/rgb/README.md b/apps/rgb/README.md
new file mode 100644
index 000000000..5723f99c6
--- /dev/null
+++ b/apps/rgb/README.md
@@ -0,0 +1,16 @@
+rgb
+===
+
+A simple RGB color selector utility for the BangleJS2 smartwatch.
+
+Features a vector toggle widget and swipe interactivity.
+
+Author
+------
+
+Written by pancake in 2022
+
+Screenshots
+-----------
+![rgb app](screenshot.jpg)
+
diff --git a/apps/rgb/app-icon.js b/apps/rgb/app-icon.js
new file mode 100644
index 000000000..9919a4365
--- /dev/null
+++ b/apps/rgb/app-icon.js
@@ -0,0 +1 @@
+atob("MDCI/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/tfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX1/7+/v7+/v7+/v7+/tfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX1/7+/v7+/v7+/v7+/tfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX1/7+/v7+/v7+/tfX19fX1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANfX19fX1/7+/v7+/tfX19fX1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANfX19fX1/7+/v7+/tfX19fX1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANfX19fX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQUFBQAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQMDAwAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQMDAwAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHh4eHgUFBQUFBQMDAwAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHhISEgMDAwMDAwMDAwAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHhISEgMDAwMDAwMDAwAAANfX1/7+/v7+/tfX1wAAALS0tLS0tLS0tB4eHh4eHh4eHhISEgMDAwMDAwMDAwAAANfX1/7+/v7+/tfX1wAAALS0tGxsbGxsbBISEhISEhISEhISEgMDAwMDAwMDAwAAANfX1/7+/v7+/tfX1wAAALS0tGxsbGxsbBISEhISEhISEhISEgMDAwMDAwMDAwAAANfX1/7+/v7+/tfX1wAAALS0tGxsbGxsbBISEhISEhISEhISEgMDAwMDAwMDAwAAANfX1/7+/v7+/tfX19fX1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANfX19fX1/7+/v7+/tfX19fX1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANfX19fX1/7+/v7+/tfX19fX1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANfX19fX1/7+/v7+/v7+/tfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX1/7+/v7+/v7+/v7+/tfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX1/7+/v7+/v7+/v7+/tfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX1/7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/g==")
diff --git a/apps/rgb/app.js b/apps/rgb/app.js
new file mode 100644
index 000000000..aa18d93ae
--- /dev/null
+++ b/apps/rgb/app.js
@@ -0,0 +1,133 @@
+const rgb = [0, 0, 0];
+const w = g.getWidth();
+const h = g.getHeight();
+function drawToggle (value, x, y, options) {
+  if (!options) options = {};
+  if (!options.scale) options.scale = 1;
+  const h = (options.scale * 16);
+  const h2 = h / 2;
+  const w = (options.scale) * 32;
+
+  g.setColor(0.3, 0, 0.3);
+  g.fillCircle(x + h2, y + h2, h2 - 1);
+  g.fillCircle(x + w - h2, y + h2, h2 - 1);
+  g.fillRect(x + h2, y, x + w - h2, y + h);
+
+  y += 4;
+  g.setColor(0.6, 0.6, 0.6);
+  g.fillCircle(x + h2, y + h2 + 2, h2 - 1);
+  g.fillCircle(x + w - h2, y + h2 + 2, h2 - 1);
+  g.fillRect(x + h2, y + 2, x + w - h2, y + h + 1);
+
+  if (value) {
+    x += w - h;
+  }
+  g.setColor(0, 0.5, 0);
+  g.fillCircle(x + h2, y + h2 + 2, h2 - 1);
+  y -= 4;
+  if (colorMode) {
+    g.setColor(0, 1, 0);
+  } else {
+    g.setColor(0.5, 0.5, 0.5);
+  }
+  g.fillCircle(x + h2, y + h2 + 2, h2 - 1);
+
+  g.setColor(0, 0.8, 0);
+  g.fillCircle(x + h2 - 2, y + h2, h2 - 8);
+  if (colorMode) {
+    g.setColor(0, 1, 0);
+  } else {
+    g.setColor(0.5, 0.5, 0.5);
+  } g.fillCircle(x + h2 + 4, y + h2 + 4, h2 - 9);
+}
+
+function refresh () {
+  g.setBgColor(rgb[0] / 255, rgb[1] / 255, rgb[2] / 255);
+  g.clear();
+  g.setColor(1, 1, 1);
+  g.setFont12x20(1);
+  g.setColor(0, 0, 0);
+  let s = '#' + hex[(rgb[0] >> 4) & 0xf] + hex[rgb[0] & 0xf];
+  s += hex[(rgb[1] >> 4) & 0xf] + hex[rgb[1] & 0xf];
+  s += hex[(rgb[2] >> 4) & 0xf] + hex[rgb[2] & 0xf];
+  g.setColor(1, 0, 1);
+  g.fillRect(0, 0, w, 32);
+  g.setColor(0.2, 0, 1);
+  g.fillRect(0, 32, w, 33);
+  g.setColor(1, 1, 1);
+  g.drawString(s, 8, 8);
+  // drawToggle (colorMode, w - 8 - 32*(rgb[0]/50), 8 + 255- rgb[2], {scale:1 * rgb[0] / 50});
+  drawToggle(colorMode, w - 40, 4, { scale: 1.2 });
+
+  if (colorMode) {
+    g.setColor(1, 0, 0);
+    g.fillRect(0, h, w / 3, h - 32);
+    g.setColor(0, 1, 0);
+    g.fillRect(w / 3, h, w - (w / 3), h - 32);
+    g.setColor(0, 0, 1);
+    g.fillRect(w - (w / 3), h, w, h - 32);
+
+    g.setColor(0.5, 0, 0);
+    g.fillRect(0, h - 33, w / 3, h - 34);
+    g.setColor(0, 0.5, 0);
+    g.fillRect(w / 3, h - 33, w - (w / 3), h - 34);
+    g.setColor(0, 0, 0.5);
+    g.fillRect(w - (w / 3), h - 33, w, h - 34);
+  } else {
+    g.setColor(0.5, 0.5, 0.5);
+    g.fillRect(0, h, w, h - 32);
+    g.setColor(0.2, 0.2, 0.2);
+    g.fillRect(0, h - 33, w, h - 34);
+  }
+  // column lines
+  function f (x) {
+    const s = '' + (rgb[x] / 255);
+    return s.substring(0, 4);
+  }
+  g.setColor(1, 1, 1);
+  g.drawLine(w / 3, h, w / 3, h / 2);
+  g.drawLine(w - (w / 3), h, w - (w / 3), h / 2);
+  g.setFont6x15(2);
+  g.drawString(f(0), 8, h - 28);
+  g.drawString(f(1), 8 + (w / 3), h - 28);
+  g.drawString(f(2), 8 + (2 * w / 3), h - 28);
+}
+let k = -1;
+var colorMode = true;
+Bangle.on('touch', function (wat, tap) {
+  if (tap.x > w / 2 && tap.y < 32) {
+    colorMode = !colorMode;
+    refresh();
+  }
+});
+
+function deltaComponent (k, dy) {
+  rgb[k] -= dy;
+  if (rgb[k] > 255) {
+    rgb[k] = 255;
+  } else if (rgb[k] < 0) {
+    rgb[k] = 0;
+  }
+}
+Bangle.on("button", function() {
+  rgb[0] = rgb[1] = rgb[2] = 127;
+});
+Bangle.on('drag', function (tap, top) {
+  if (colorMode) {
+    if (tap.x < w / 3) {
+      k = 0;
+    } else if (tap.x > (w - (w / 3))) {
+      k = 2;
+    } else {
+      k = 1;
+    }
+    deltaComponent(k, tap.dy);
+  } else {
+    deltaComponent(0, tap.dy);
+    deltaComponent(1, tap.dy);
+    deltaComponent(2, tap.dy);
+  }
+  refresh();
+});
+refresh();
+
diff --git a/apps/rgb/app.png b/apps/rgb/app.png
new file mode 100644
index 000000000..e9210d2b6
Binary files /dev/null and b/apps/rgb/app.png differ
diff --git a/apps/rgb/metadata.json b/apps/rgb/metadata.json
new file mode 100644
index 000000000..7a47e65b9
--- /dev/null
+++ b/apps/rgb/metadata.json
@@ -0,0 +1,31 @@
+{
+  "id": "rgb",
+  "name": "rgb",
+  "shortName": "rgb",
+  "version": "0.01",
+  "type": "app",
+  "description": "RGB utility",
+  "icon": "app.png",
+  "allow_emulator": true,
+  "tags": "tools",
+  "supports": [
+    "BANGLEJS2"
+  ],
+  "readme": "README.md",
+  "storage": [
+    {
+      "name": "rgb.app.js",
+      "url": "app.js"
+    },
+    {
+      "name": "rgb.img",
+      "url": "app-icon.js",
+      "evaluate": true
+    }
+  ],
+  "screenshots": [
+    {
+      "url": "screenshot.png"
+    }
+  ]
+}
diff --git a/apps/rgb/screenshot.png b/apps/rgb/screenshot.png
new file mode 100644
index 000000000..1815cd492
Binary files /dev/null and b/apps/rgb/screenshot.png differ
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
index e003248a3..5728bf734 100644
--- a/apps/sched/ChangeLog
+++ b/apps/sched/ChangeLog
@@ -10,3 +10,6 @@
 0.09: Move some functions to new time_utils module
 0.10: Default to sched.js if custom js not found
 0.11: Fix default dow
+0.12: Update default buzz patterns to new values
+      Improve timer message using formatDuration
+      Fix wrong fallback for buzz pattern
diff --git a/apps/sched/lib.js b/apps/sched/lib.js
index 315e4e387..5089ed46c 100644
--- a/apps/sched/lib.js
+++ b/apps/sched/lib.js
@@ -106,8 +106,8 @@ exports.getSettings = function () {
       defaultRepeat: false,
       buzzCount: 10,
       buzzIntervalMillis: 3000, // 3 seconds
-      defaultAlarmPattern: "..",
-      defaultTimerPattern: ".."
+      defaultAlarmPattern: "::",
+      defaultTimerPattern: "::"
     },
     require("Storage").readJSON("sched.settings.json", true) || {}
   );
diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
index 76341a7ad..c8ed3acb8 100644
--- a/apps/sched/metadata.json
+++ b/apps/sched/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.11",
+  "version": "0.12",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",
diff --git a/apps/sched/sched.js b/apps/sched/sched.js
index f4d1bc9ad..012e8ed35 100644
--- a/apps/sched/sched.js
+++ b/apps/sched/sched.js
@@ -9,7 +9,7 @@ function showAlarm(alarm) {
   const settings = require("sched").getSettings();
 
   let msg = "";
-  msg += require("time_utils").formatTime(alarm.timer ? alarm.timer : alarm.t);
+  msg += alarm.timer ? require("time_utils").formatDuration(alarm.timer) : require("time_utils").formatTime(alarm.t);
   if (alarm.msg) {
     msg += "\n"+alarm.msg;
   } else {
@@ -50,7 +50,8 @@ function showAlarm(alarm) {
       Bangle.setLocked(false);
     }
 
-    require("buzz").pattern(alarm.vibrate === undefined ? ".." : alarm.vibrate).then(() => {
+    const pattern = alarm.vibrate || (alarm.timer ? settings.defaultTimerPattern : settings.defaultAlarmPattern);
+    require("buzz").pattern(pattern).then(() => {
       if (buzzCount--) {
         setTimeout(buzz, settings.buzzIntervalMillis);
       } else if (alarm.as) { // auto-snooze
diff --git a/apps/sched/settings.js b/apps/sched/settings.js
index 5ddb4dab2..a2b3a5241 100644
--- a/apps/sched/settings.js
+++ b/apps/sched/settings.js
@@ -29,7 +29,7 @@
       min: 5,
       max: 30,
       step: 5,
-      format: v => v + /*LANG*/" min",
+      format: v => v + /*LANG*/"m",
       onchange: v => {
         settings.defaultSnoozeMillis = v * 60000;
         require("sched").setSettings(settings);
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index eca2b7938..1513194fe 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -50,3 +50,6 @@
       UI improvements to Locale and Date & Time menu
 0.45: Add calibrate battery option
 0.46: Fix regression after making 'calibrate battery' only for Bangle.js 2
+0.47: Allow colors to be translated
+      Improve "Turn Off" user experience
+0.48: Allow reading custom themes from files
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 183290a85..17519730e 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.46",
+  "version": "0.48",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index 150251e7d..3bb9b4e22 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -221,7 +221,8 @@ function showThemeMenu() {
     Bangle.drawWidgets();
     m.draw();
   }
-  var m = E.showMenu({
+
+  var themesMenu = {
     '':{title:/*LANG*/'Theme'},
     '< Back': ()=>showSystemMenu(),
     /*LANG*/'Dark BW': ()=>{
@@ -239,9 +240,26 @@ function showThemeMenu() {
         fgH:cl("#000"), bgH:cl("#0ff"),
         dark:false
       });
-    },
-    /*LANG*/'Customize': ()=>showCustomThemeMenu(),
-  });
+    }
+  };
+
+  require("Storage").list(/^.*\.theme$/).forEach(
+    n => {
+      let newTheme = require("Storage").readJSON(n);
+      themesMenu[newTheme.name ? newTheme.name : n] = () => {
+        upd({
+        fg:cl(newTheme.fg), bg:cl(newTheme.bg),
+        fg2:cl(newTheme.fg2), bg2:cl(newTheme.bg2),
+        fgH:cl(newTheme.fgH), bgH:cl(newTheme.bgH),
+        dark:newTheme.dark
+      });
+      };
+    }
+  );
+
+  themesMenu[/*LANG*/'Customize'] = () => showCustomThemeMenu();
+
+  var m = E.showMenu(themesMenu);
 
   function showCustomThemeMenu() {
     function setT(t, v) {
@@ -252,22 +270,28 @@ function showThemeMenu() {
       }
       upd(th);
     }
-    let rgb = {
-      black: "#000", white: "#fff",
-      red: "#f00", green: "#0f0", blue: "#00f",
-      cyan: "#0ff", magenta: "#f0f", yellow: "#ff0",
-    };
-    if (!BANGLEJS2) Object.assign(rgb, {
+    let rgb = {};
+    rgb[/*LANG*/'black'] = "#000";
+    rgb[/*LANG*/'white'] = "#fff";
+    rgb[/*LANG*/'red'] = "#f00";
+    rgb[/*LANG*/'green'] = "#0f0";
+    rgb[/*LANG*/'blue'] = "#00f";
+    rgb[/*LANG*/'cyan'] = "#0ff";
+    rgb[/*LANG*/'magenta'] = "#f0f";
+    rgb[/*LANG*/'yellow'] = "#ff0";
+    if (!BANGLEJS2) {
       // these would cause dithering, which is not great for e.g. text
-      orange: "#ff7f00", purple: "#7f00ff", grey: "#7f7f7f",
-    });
+      rgb[/*LANG*/'orange'] = "#ff7f00";
+      rgb[/*LANG*/'purple'] = "#7f00ff";
+      rgb[/*LANG*/'grey'] = "#7f7f7f";
+    }
     let colors = [], names = [];
     for(const c in rgb) {
       names.push(c);
       colors.push(cl(rgb[c]));
     }
     let menu = {
-      '':{title:'Custom Theme'},
+      '':{title:/*LANG*/'Custom Theme'},
       "< Back": () => showThemeMenu()
     };
     const labels = {
@@ -569,7 +593,25 @@ function showUtilMenu() {
         } else showUtilMenu();
       });
     };
-  menu[/*LANG*/'Turn Off'] = ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() };
+  menu[/*LANG*/"Turn Off"] = () => {
+    E.showPrompt(/*LANG*/"Are you sure? Alarms and timers won't fire", {
+      title:/*LANG*/"Turn Off"
+    }).then((confirmed) => {
+      if (confirmed) {
+        E.showMessage(/*LANG*/"See you\nlater!", /*LANG*/"Goodbye");
+        setTimeout(() => {
+          // clear the screen so when the user will turn on the watch they'll see
+          // an empty screen instead of the latest displayed screen
+          E.showMessage();
+          g.clear(true);
+
+          Bangle.softOff ? Bangle.softOff() : Bangle.off();
+        }, 2500);
+      } else {
+        showUtilMenu();
+      }
+    });
+  };
 
   if (Bangle.factoryReset) {
     menu[/*LANG*/'Factory Reset'] = ()=>{
diff --git a/apps/speedalt2/README.md b/apps/speedalt2/README.md
index c124e0c00..a86f787cf 100644
--- a/apps/speedalt2/README.md
+++ b/apps/speedalt2/README.md
@@ -37,7 +37,7 @@ When the GPS obtains a fix the number of satellites is displayed as 'Sats:nn'. W
 
 ## Power Saving
 
-The The GPS Adv Sport app obeys the watch screen off timeouts as a power saving measure. Restore the screen as per any of the colck/watch apps. Use BTN2 to lock the screen on but doing this will use more battery.
+The The GPS Adv Sport app obeys the watch screen off timeouts as a power saving measure. Restore the screen as per any of the clock/watch apps. Use BTN2 to lock the screen on but doing this will use more battery.
 
 This app will work quite happily on its own but will use the [GPS Setup App](https://banglejs.com/apps/#gps%20setup) if it is installed. You may choose to use the GPS Setup App to gain significantly longer battery life while the GPS is on. Please read the Low Power GPS Setup App Readme to understand what this does.
 
@@ -65,7 +65,7 @@ The Droidscript script file is called : **GPS Adv Sports II.js**
 
 Start/Stop buttons tell the Bangle.js to start or stop sending BLE data packets to the Android device. While stopped the Bangle.js reverts to full power saving mode when the screen is asleep. 
 
-When runnig a blue 'led' will flash each time a data packet is recieved to refresh the android display. 
+When running a blue 'led' will flash each time a data packet is recieved to refresh the android display. 
 
 An orange 'led' will flash for each reconnection attempt if no data is received for 30 seconds. It will keep trying to reconnect so you can restart the Bangle, run another Bangle app or temprarily turn off bluetooth. The android mirror display will automatically reconnect when the GPS Adv Sports II app is running on the Bangle again. ( Designed to leave the Android device running as the display mirror in a sealed case all day while retaining the ability to do other functions on the Bangle.js and returning to the GPS Speed Alt II app. )
 
diff --git a/apps/terminalclock/ChangeLog b/apps/terminalclock/ChangeLog
index b752c829d..ce31583e9 100644
--- a/apps/terminalclock/ChangeLog
+++ b/apps/terminalclock/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Add Banglejs 1 compatibility
 0.04: Fix settings bug
 0.05: Add altitude display (only Bangle.js 2)
+0.06: Add power related settings to control the HR and pressure(altitude) sensor from the watchface
diff --git a/apps/terminalclock/README.md b/apps/terminalclock/README.md
index c7452397d..93967e8a7 100644
--- a/apps/terminalclock/README.md
+++ b/apps/terminalclock/README.md
@@ -8,3 +8,8 @@ It can display :
 - hrm
 - motion
 - steps
+
+
+"Power saving" setting control the HR and pressure (altitude) sensors. 
+If "Off" they will always be on. 
+If "On" the sensors will be turned on every "Power on interval" minutes for 45 secondes
diff --git a/apps/terminalclock/app.js b/apps/terminalclock/app.js
index 61861f745..7dc3bf1d1 100644
--- a/apps/terminalclock/app.js
+++ b/apps/terminalclock/app.js
@@ -3,15 +3,14 @@ var fontColor = g.theme.dark ? "#0f0" : "#000";
 var heartRate = 0;
 var altitude = -9001;
 
-// handling the differents versions of the Banglejs smartwatch
+// handling the differents versions of the Banglejs smartwatch screen sizes
 if (process.env.HWVERSION == 1){
   var paddingY = 3;
   var font6x8At4Size = 48;
   var font6x8At2Size = 27;
   var font6x8FirstTextSize = 6;
   var font6x8DefaultTextSize = 3;
-}
-else{
+} else{
   var paddingY = 2;
   var font6x8At4Size = 32;
   var font6x8At2Size = 18;
@@ -66,7 +65,7 @@ function drawDate(now, pos){
   drawLine(locale_date, pos);
 }
 
-function drawInput(now, pos){
+function drawInput(pos){
   clearField(pos);
   drawLine(">", pos);
 }
@@ -129,16 +128,52 @@ function draw(){
     drawStepCount(curPos);
     curPos++;
   }
-  drawInput(now, curPos);
+  drawInput(curPos);
 }
 
+function turnOnServices(){
+  if(settings.showHRM){
+    Bangle.setHRMPower(true, "terminalclock");
+  }
+  if(settings.showAltitude && process.env.HWVERSION != 1){
+    Bangle.setBarometerPower(true, "terminalclock");
+  }
+  if(settings.powerSaving){
+    setTimeout(function () {
+      turnOffServices();
+    }, 45000);
+  }
+}
+
+function turnOffServices(){
+  if(settings.showHRM){
+    Bangle.setHRMPower(false, "terminalclock");
+  }
+  if(settings.showAltitude && process.env.HWVERSION != 1){
+    Bangle.setBarometerPower(false, "terminalclock");
+  }
+}
+
+var unlockDrawIntervalID = -1;
+Bangle.on('lock', function(on){
+  if(!on){ // unclock
+    if(settings.powerSaving){
+      turnOnServices();
+    }
+    unlockDrawIntervalID = setInterval(draw, 1000); // every second
+  }
+  if(on && unlockDrawIntervalID != -1){ // lock
+    clearInterval(unlockDrawIntervalID);
+  }
+});
+
 Bangle.on('HRM',function(hrmInfo) {
   if(hrmInfo.confidence >= settings.HRMinConfidence)
     heartRate = hrmInfo.bpm;
 });
 
-var MEDIANLENGTH = 20;
-var avr = [], median;
+var MEDIANLENGTH = 20; // technical
+var avr = [], median; // technical
 Bangle.on('pressure', function(e) {
   while (avr.length>MEDIANLENGTH) avr.pop();
   avr.unshift(e.altitude);
@@ -161,18 +196,20 @@ var settings = Object.assign({
   showActivity: true,
   showStepCount: true,
   showAltitude: process.env.HWVERSION != 1 ? true : false,
+  powerSaving: true,
+  PowerOnInterval: 15,
 }, require('Storage').readJSON("terminalclock.json", true) || {});
 
-if(settings.showAltitude && process.env.HWVERSION != 1){
-  Bangle.setBarometerPower(true, "app");
+// turn the services before drawing anything
+turnOnServices();
+if(settings.powerSaving){
+  setInterval(turnOnServices, settings.PowerOnInterval*60000); // every PowerOnInterval min
 }
-
 // Show launcher when middle button pressed
 Bangle.setUI("clock");
-// Load widgets
+// Load and draw widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 // draw immediately at first
 draw();
-
-var secondInterval = setInterval(draw, 10000);
+setInterval(draw, 10000); // every 10 seconds
diff --git a/apps/terminalclock/metadata.json b/apps/terminalclock/metadata.json
index 7bc00bca4..9f76ed8f2 100644
--- a/apps/terminalclock/metadata.json
+++ b/apps/terminalclock/metadata.json
@@ -3,7 +3,7 @@
   "name": "Terminal Clock",
   "shortName":"Terminal Clock",
   "description": "A terminal cli like clock displaying multiple sensor data",
-  "version":"0.05",
+  "version":"0.06",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",
diff --git a/apps/terminalclock/settings.js b/apps/terminalclock/settings.js
index 4b09aad6a..bd860b491 100644
--- a/apps/terminalclock/settings.js
+++ b/apps/terminalclock/settings.js
@@ -8,6 +8,8 @@
     showHRM: true,
     showActivity: true,
     showStepCount: true,
+    powerSaving: true,
+    PowerOnInterval: 15,
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {
@@ -65,10 +67,29 @@
         settings.showStepCount = v;
         writeSettings();
       }
+    },
+    'Power saving': {
+      value: settings.powerSaving,
+      format: v => v?"On":"Off",
+      onchange: v => {
+        settings.powerSaving = v;
+        writeSettings();
+      }
+    },
+    'Power on interval': {
+      value: settings.PowerOnInterval,
+      min: 3, max: 60,
+      onchange: v => {
+        settings.PowerOnInterval = v;
+        writeSettings();
+      },
+      format: x => {
+          return x + " min";
+      }
     }
   }
   if (process.env.HWVERSION == 1) {
     delete menu['Show Altitude']
   }
   E.showMenu(menu);
-})
+})
\ No newline at end of file
diff --git a/apps/weather/readme.md b/apps/weather/readme.md
index 6d0ea04a5..b37d0b38e 100644
--- a/apps/weather/readme.md
+++ b/apps/weather/readme.md
@@ -11,6 +11,9 @@ You can view the full report through the app:
 1. Install [Gadgetbridge for Android](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/) on your phone.
 2. Set up [Gadgetbridge weather reporting](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Weather).
 
+If using the `Bangle.js Gadgetbridge` app on your phone (as opposed to the standard F-Droid `Gadgetbridge`) you need to set the package name
+to `com.espruino.gadgetbridge.banglejs` in the settings of the weather app (`settings -> gadgetbridge support -> package name`).
+
 ## Settings
 
 * Expiration timespan can be set after which the local weather data is considered as invalid
diff --git a/apps/widday/ChangeLog b/apps/widday/ChangeLog
new file mode 100644
index 000000000..7b83706bf
--- /dev/null
+++ b/apps/widday/ChangeLog
@@ -0,0 +1 @@
+0.01: First release
diff --git a/apps/widday/README.md b/apps/widday/README.md
new file mode 100644
index 000000000..61f48aa4c
--- /dev/null
+++ b/apps/widday/README.md
@@ -0,0 +1,9 @@
+# Day Widget
+
+Just shows the day of the current date, to save space in the widget area. The month and year should be known because they don't change that often. Just the number in maximum size for readability.
+
+![](screenshot.png)
+
+## Creator
+[@pidajo](https://github.com/pidajo)
+
diff --git a/apps/widday/app-icon.js b/apps/widday/app-icon.js
new file mode 100644
index 000000000..aa17aedc5
--- /dev/null
+++ b/apps/widday/app-icon.js
@@ -0,0 +1 @@
+atob("MDCEAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIBEREREREREREREREREREREREREREQIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////zMz////8zMzMzMzP////xIiIf///////czM////PMzMzMzMzP///xIiIf/////zzMzM////PMzMzMzMzP///xIiIf////PczMzM////PMzMzMzMzP///xIiIf////3MzMzM////8zMzMz3MzP///xIiIf////3MM8zM//////////zMw////xIiIf////0/88zM/////////zzMz////xIiIf//////88zM/////////8zM3////xIiIf//////88zM////////88zM/////xIiIf//////88zM/////////MzN/////xIiIf//////88zM////////PMzD/////xIiIf//////88zM////////3Mzf/////xIiIf//////88zM////////zMw//////xIiIf//////88zM///////9zMz//////xIiIf//////88zM///////8zMP//////xIiIf//////88zM//////88zM///////xIiIf//////88zM///////MzN///////xIiIf////8zM8zM//////PMzD///////xIiIf////3MzMzMzM3///3Mzf///////xIiIf////3MzMzMzM3//zzMw////////xIiIf////PMzMzMzM3//9zMz////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIf///////////////////////////xIiIBEREREREREREREREREREREREREREQIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIg==")
diff --git a/apps/widday/metadata.json b/apps/widday/metadata.json
new file mode 100644
index 000000000..82de23035
--- /dev/null
+++ b/apps/widday/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "widday",
+  "name": "Day Widget",
+  "shortName":"My Timer",
+  "icon": "widget.png",
+  "type": "widget",
+  "version":"0.01",
+  "description": "Just the day of the current date as widget",
+  "readme": "README.md",
+  "tags": "widget,say,date",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "screenshots" : [ { "url":"screenshot.png" } ],
+  "storage": [
+    {"name":"widday.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widday/screenshot.png b/apps/widday/screenshot.png
new file mode 100644
index 000000000..9a7a9f8cf
Binary files /dev/null and b/apps/widday/screenshot.png differ
diff --git a/apps/widday/widget.js b/apps/widday/widget.js
new file mode 100644
index 000000000..cdea76a29
--- /dev/null
+++ b/apps/widday/widget.js
@@ -0,0 +1,27 @@
+(() => {
+  var width = 32; // width of the widget
+
+  function draw() {
+    var date = new Date();
+    g.reset(); // reset the graphics context to defaults (color/font/etc)
+    g.setFontAlign(0,1); // center fonts    
+    //g.drawRect(this.x, this.y, this.x+width-1, this.y+23);  // check the bounds!    
+
+    var text = date.getDate();
+    g.setFont("Vector", 24);
+    g.drawString(text, this.x+width/2+1, this.y + 28);
+    //g.setColor(0, 0, 1);
+    //g.drawRect(this.x, this.y, this.x+width-2, this.y+1);
+  }
+
+  setInterval(function() {
+    WIDGETS["widday"].draw(WIDGETS["widdateday"]);
+  }, 10*60000); // update every 10 minutes
+
+  // add your widget
+  WIDGETS["widday"]={
+    area:"bl", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
+    width: width, // how wide is the widget? You can change this and call Bangle.drawWidgets() to re-layout
+    draw:draw // called to draw the widget
+  };
+})()
diff --git a/apps/widday/widget.png b/apps/widday/widget.png
new file mode 100644
index 000000000..462097871
Binary files /dev/null and b/apps/widday/widget.png differ
diff --git a/apps/widmp/ChangeLog b/apps/widmp/ChangeLog
index 02658296a..f0cd6bd8a 100644
--- a/apps/widmp/ChangeLog
+++ b/apps/widmp/ChangeLog
@@ -2,3 +2,5 @@
 0.02: Fix position and overdraw bugs
 0.03: Better memory usage, theme support
 0.04: Replace the 8 phases by a more exact drawing, see forum.espruino.com/conversations/371985
+0.05: Fixed the algorithm for calculating the moon's phase
+0.06: Darkmode, custom colours, and fix a bug with acting on mylocation changes
diff --git a/apps/widmp/metadata.json b/apps/widmp/metadata.json
index 94f05a426..b1e6a6c8c 100644
--- a/apps/widmp/metadata.json
+++ b/apps/widmp/metadata.json
@@ -1,13 +1,15 @@
 {
   "id": "widmp",
-  "name": "Moon Phase Widget",
-  "version": "0.04",
-  "description": "Display the current moon phase in blueish for both hemispheres. In the southern hemisphere the 'My Location' app is needed.",
+  "name": "Moon Phase",
+  "version": "0.06",
+  "description": "Display the current moon phase in blueish (in light mode) or white (in dark mode) for both hemispheres. In the southern hemisphere the 'My Location' app is needed.",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget,tools",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "storage": [
-    {"name":"widmp.wid.js","url":"widget.js"}
-  ]
+    {"name":"widmp.wid.js","url":"widget.js"},
+    {"name":"widmp.settings.js","url":"settings.js"}
+  ],
+  "data": [{"name":"widmp.json"}]
 }
diff --git a/apps/widmp/settings.js b/apps/widmp/settings.js
new file mode 100644
index 000000000..46c5d3609
--- /dev/null
+++ b/apps/widmp/settings.js
@@ -0,0 +1,73 @@
+(function(back) {
+
+  var settings = Object.assign({
+    default_colour: true,
+    red: 0,
+    green: 0,
+    blue: 0,
+  }, require('Storage').readJSON("widmp.json", true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON("widmp.json", settings);
+	if (WIDGETS["widmp"]) WIDGETS["widmp"].draw();
+  }
+  
+  function writeSettingsCustom() {
+    settings.default_colour = false;
+    mainmenu["Default"].value = false;
+    writeSettings();
+  }
+  
+  var mainmenu = {
+    "": {
+      "title": "Moon colour"
+    },
+    "< Back": () => back(),
+    "Default": {
+      value: (settings.default_colour !== undefined ? settings.default_colour : true),
+      format: v => v ? "Yes" : "No",
+      onchange: v => {
+        settings.default_colour = v;
+        writeSettings();
+      }
+    },
+    "Custom...": () => E.showMenu(custommenu)
+  };
+  
+  var custommenu = {
+    "": {
+      "title": "Custom colour..."
+    },
+    "< Back": () => E.showMenu(mainmenu),
+    "red": {
+      value: 0|settings.red,
+      min: 0,
+      max: 4,
+      onchange: v => {
+        settings.red = v;
+        writeSettingsCustom();
+      }
+    },
+    "green": {
+      value: 0|settings.green,
+      min: 0,
+      max: 4,
+      onchange: v => {
+        settings.green = v;
+        writeSettingsCustom();
+      }
+    },
+    "blue": {
+      value: 0|settings.blue,
+      min: 0,
+      max: 4,
+      onchange: v => {
+        settings.blue = v;
+        writeSettingsCustom();
+      }
+    }
+  };
+
+  E.showMenu(mainmenu);
+
+});
diff --git a/apps/widmp/widget.js b/apps/widmp/widget.js
index 6da572aab..22a7d6572 100644
--- a/apps/widmp/widget.js
+++ b/apps/widmp/widget.js
@@ -1,25 +1,27 @@
-WIDGETS["widmoon"] = { area: "tr", width: 24, draw: function() {
-  const CenterX = this.x + 12, CenterY = this.y + 12, Radius = 11;
-  var southernHemisphere = false; // when in southern hemisphere, use the "My Location" App
+(() => {
 
-  const simulate = false; // simulate one month in one minute
-  const updateR = 1000; // update every x ms in simulation
+  var lastCalculated = 0; // When we last calculated the phase
+  var phase = 0; // The last phase we calculated
+  var southernHemisphere = false; // when in southern hemisphere -- use the "My Location" App
 
-  function moonPhase() {
-    const d = Date();
-    var month = d.getMonth(), year = d.getFullYear(), day = d.getDate();
-    if (simulate) day = d.getSeconds() / 2 +1;
-    if (month < 3) {year--; month += 12;}
-    mproz = ((365.25 * year + 30.6 * ++month + day - 694039.09) /  29.5305882);
-    mproz = mproz - (mproz | 0);  // strip integral digits, result is between 0 and <1
-    if (simulate) console.log(mproz + "  " + day);
-    return (mproz);
+  // https://deirdreobyrne.github.io/calculating_moon_phases/
+  function moonPhase(millis) {
+    k = (millis - 946728000000) / 3155760000000;
+    mp = (8328.69142475915 * k) + 2.35555563685;
+    m =  (628.30195516723 * k) + 6.24006012726;
+    d =  (7771.37714483372 * k) + 5.19846652984;
+    t = d + (0.109764 * Math.sin (mp)) - (0.036652 * Math.sin(m)) + (0.022235 * Math.sin(d+d-mp)) + (0.011484 * Math.sin(d+d)) + (0.003735 * Math.sin(mp+mp)) + (0.00192 * Math.sin(d));
+    k = (1 - Math.cos(t))/2;
+    if (Math.sin(t) < 0) {
+      k = -k;
+    }
+    return (k); // Goes 0 -> 1 for waxing, and from -1 -> 0 for waning
   }
 
   function loadLocation() {
     // "mylocation.json" is created by the "My Location" app
     location = require("Storage").readJSON("mylocation.json",1)||{"lat":50.1236,"lon":8.6553,"location":"Frankfurt"};
-    if (location.lat < 0) southernHemisphere = true;
+    southernHemisphere = (location.lat < 0);
   }
 
   // code source: github.com/rozek/banglejs-2-activities/blob/main/README.md#drawmoonphase
@@ -38,26 +40,60 @@ WIDGETS["widmoon"] = { area: "tr", width: 24, draw: function() {
       g.drawLine(CenterX-leftFactor*y,CenterY+x, CenterX+rightFactor*y,CenterY+x);
     }
   }
+  
+  function setMoonColour(g) {
+    var settings = Object.assign({
+      default_colour: true,
+      red: 0,
+      green: 0,
+      blue: 0,
+    }, require('Storage').readJSON("widmp.json", true) || {});
+    if (settings.default_colour) {
+      if (g.theme.dark) {
+        g.setColor(0xffff); // white
+      } else {
+        // rrrrrggggggbbbbb
+        // 0000010000011111
+        g.setColor(0x41f); // blue-ish
+      }
+    } else {
+      g.setColor(settings.red/4, settings.green/4, settings.blue/4);
+    }
+  }
 
-  function updateWidget() {
+
+  function draw() {
+    const CenterX = this.x + 12, CenterY = this.y + 12, Radius = 11;
+
+    loadLocation();
     g.reset().setColor(g.theme.bg);
     g.fillRect(CenterX - Radius, CenterY - Radius, CenterX + Radius, CenterY + Radius);
-    g.setColor(0x41f);
 
-    mproz = moonPhase(); // mproz = 0..<1
+    millis = (new Date()).getTime();
+    if ((millis - lastCalculated) >= 7000000) { // if it's more than 7,000 sec since last calculation, re-calculate!
+      phase = moonPhase(millis);
+      lastCalculated = millis;
+    }
 
-    leftFactor = mproz * 4 - 1;
-    rightFactor = (1 - mproz) * 4 - 1;
-    if (mproz >= 0.5) leftFactor = 1; else rightFactor = 1;
+    if (phase < 0) { // waning - phase goes from -1 to 0
+      leftFactor = 1;
+      rightFactor = -1 - 2*phase;
+    } else { // waxing - phase goes from 0 to 1
+      rightFactor = 1;
+      leftFactor = -1 + 2*phase;
+    }
     if (true == southernHemisphere) {
       var tmp=leftFactor; leftFactor=rightFactor; rightFactor=tmp;
     }
 
+    setMoonColour(g);
     drawMoonPhase(CenterX,CenterY, Radius, leftFactor,rightFactor);
-
-    if (simulate) setTimeout(updateWidget, updateR);
   }
 
-  loadLocation();
-  updateWidget();
-} };
+  WIDGETS["widmp"] = {
+    area: "tr",
+    width: 24,
+    draw: draw
+  };
+
+})();
diff --git a/apps/widshipbell/metadata.json b/apps/widshipbell/metadata.json
new file mode 100644
index 000000000..c130b04ee
--- /dev/null
+++ b/apps/widshipbell/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "widshipbell",
+  "name": "Ship's bell Widget",
+  "shortName": "Ship's bell",
+  "version": "0.01",
+  "description": "A widget that buzzes according to a nautical bell, one strike at 04:30, two strikes at 05:00, up to eight strikes at 08:00 and so on.",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"widshipbell.wid.js","url":"widget.js"},
+    {"name":"widshipbell.settings.js","url":"settings.js"}
+  ],
+  "data": [{"name":"widshipbell.json"}]
+}
diff --git a/apps/widshipbell/settings.js b/apps/widshipbell/settings.js
new file mode 100644
index 000000000..bb47e9b20
--- /dev/null
+++ b/apps/widshipbell/settings.js
@@ -0,0 +1,27 @@
+(function(back) {
+  var FILE = "widshipbell.json";
+  // Load settings
+  var settings = Object.assign({
+    strength: 1,
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  // Show the menu
+  E.showMenu({
+    "" : { "title" : "Ship's bell" },
+    "< Back" : () => back(),
+    'Strength': {
+      value: settings.strength,
+      min: 0, max: 2,
+      format: v => ["Off", "Weak", "Strong"][v],
+      onchange: v => {
+        settings.strength = v;
+        writeSettings();
+      }
+    },
+  });
+})
+
diff --git a/apps/widshipbell/widget.js b/apps/widshipbell/widget.js
new file mode 100644
index 000000000..e37edb6fd
--- /dev/null
+++ b/apps/widshipbell/widget.js
@@ -0,0 +1,52 @@
+(() => {
+	const strength = Object.assign({
+		strength: 1,
+	}, require('Storage').readJSON("widshipbell.json", true) || {}).strength;
+
+	function replaceAll(target, search, replacement) {
+		return target.split(search).join(replacement);
+	}
+
+	function check() {
+		const now = new Date();
+		const currentMinute = now.getMinutes();
+		const currentSecond = now.getSeconds();
+		const etaMinute = 30-(currentMinute % 30);
+
+		if (etaMinute === 30 && currentSecond === 0) {
+			const strikeHour = now.getHours() % 4;
+			// buzz now
+			let pattern='';
+			if (strikeHour === 0 && currentMinute == 0) {
+				pattern = '.. .. .. ..';
+			} else if (strikeHour === 0 && currentMinute === 30) {
+				pattern = '.';
+			} else if (strikeHour === 1 && currentMinute === 0) {
+				pattern = '..';
+			} else if (strikeHour === 1 && currentMinute === 30) {
+				pattern = '.. .';
+			} else if (strikeHour === 2 && currentMinute === 0) {
+				pattern = '.. ..';
+			} else if (strikeHour === 2 && currentMinute === 30) {
+				pattern = '.. .. .';
+			} else if (strikeHour === 3 && currentMinute === 0) {
+				pattern = '.. .. ..';
+			} else if (strikeHour === 3 && currentMinute === 30) {
+				pattern = '.. .. .. .';
+			}
+			pattern = replaceAll(pattern, ' ', '    '); // 4x pause
+			pattern = replaceAll(pattern, '.', '. '); // pause between bells
+			if (strength === 2) { // strong selected
+				pattern = replaceAll(pattern, '.', ':');
+			}
+			require("buzz").pattern(pattern);
+		}
+
+		const etaSecond = etaMinute*60-currentSecond;
+		setTimeout(check, etaSecond*1000);
+	}
+
+	if (strength !== 0) {
+		check();
+	}
+})();
diff --git a/apps/widshipbell/widget.png b/apps/widshipbell/widget.png
new file mode 100644
index 000000000..891679f7d
Binary files /dev/null and b/apps/widshipbell/widget.png differ
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index 850b793f4..81c0f75ac 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -65,7 +65,7 @@ const APP_KEYS = [
 const STORAGE_KEYS = ['name', 'url', 'content', 'evaluate', 'noOverwite', 'supports'];
 const DATA_KEYS = ['name', 'wildcard', 'storageFile', 'url', 'content', 'evaluate'];
 const SUPPORTS_DEVICES = ["BANGLEJS","BANGLEJS2"]; // device IDs allowed for 'supports'
-const METADATA_TYPES = ["app","clock","widget","bootloader","RAM","launch","textinput","scheduler","notify","locale"]; // values allowed for "type" field
+const METADATA_TYPES = ["app","clock","widget","bootloader","RAM","launch","textinput","scheduler","notify","locale","settings"]; // values allowed for "type" field
 const FORBIDDEN_FILE_NAME_CHARS = /[,;]/; // used as separators in appid.info
 const VALID_DUPLICATES = [ '.tfmodel', '.tfnames' ];
 const GRANDFATHERED_ICONS = ["s7clk",  "snek", "astral", "alpinenav", "slomoclock", "arrow", "pebble", "rebble"];
@@ -140,7 +140,7 @@ apps.forEach((app,appIdx) => {
           ERROR(`App ${app.id} 'dependencies' must all be tagged 'type' or 'app' right now`);
         if (app.dependencies[dependency]=="type" && !METADATA_TYPES.includes(dependency))
           ERROR(`App ${app.id} 'type' dependency must be one of `+METADATA_TYPES);
-          
+
       });
     } else
       ERROR(`App ${app.id} 'dependencies' must be an object`);
diff --git a/core b/core
index 2054537a9..cdab12fcf 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 2054537a9958f9812ae2cad908b6597ff01e449d
+Subproject commit cdab12fcf85bc140e1f5c3f7b15218108c3f7d32
diff --git a/lang/de_DE.json b/lang/de_DE.json
index e0deef7fb..ef22b588f 100644
--- a/lang/de_DE.json
+++ b/lang/de_DE.json
@@ -20,11 +20,11 @@
         "On": "Ein",
         "Off": "Aus",
         "Ok": "OK",
-        "New Timer": "Neue Zeitschaltuhr",
+        "New Timer": "Neuer Kurzzeitwecker",
         "(repeat)": "(Wiederholung)",
         "music": "Musik",
-        "Keep Msgs": "Msgs behalten",
-        "circle count": "Kreiszahl",
+        "Keep Msgs": "Nachrichten behalten",
+        "circle count": "Anzahl Kreise",
         "Auto snooze": "Automatisches Schlummern",
         "week": "Woche",
         "Heartrate": "Herzfrequenz",
@@ -43,7 +43,7 @@
         "colorize icon": "Symbol einfärben",
         "min. confidence": "Mindestvertrauen",
         "maximum": "maximal",
-        "distance goal": "Fernziel",
+        "distance goal": "Entfernungsziel",
         "Circle": "Kreis",
         "Yes\ndefinitely": "Ja\ndefinitiv",
         "TAP right top/bottom": "TAP rechts oben/unten",
@@ -52,28 +52,29 @@
         "Mark Unread": "Ungelesen markieren",
         "Delete all messages": "Alle Nachrichten löschen",
         "Unread timer": "Ungelesener Timer",
-        "Quiet Mode": "Leiser Modus",
+        "Quiet Mode": "Stiller Modus",
         "Utils": "Werkzeuge",
         "Piezo": "Piezo",
         "LCD": "LCD",
-        "Record Run": "Rekordlauf",
+        "Record Run": "Lauf aufzeichnen",
         "Apps": "Apps",
         "Delete All Messages": "Alle Nachrichten löschen",
         "start&lap/reset, BTN1: EXIT": "Start&Runde/Zurücksetzen, BTN1: EXIT",
         "No Messages": "Keine Nachrichten",
         "Bluetooth": "Bluetooth",
-        "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:startlap 2:exit 3:reset",
+        "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:Rundenstart 2:Exit 3:Reset",
         "View Message": "Nachricht anzeigen",
         "Vector font size": "Vektor-Schriftgröße",
-        "Light BW": "Licht BW",
+        "Light BW": "Hell S/W",
         "BLE": "BLE",
         "Make Connectable": "Verbindbar machen",
         "Vibration": "Vibration",
-        "Foreground": "Vorderseite",
-        "Customize": "Anpassen",
+        "Foreground": "Vordergrund",
+        "Customize": "Individualisieren",
+        "Custom Theme": "Individueller Stil",
         "HID": "HID",
-        "Dark BW": "Dunkel BW",
-        "Passkey BETA": "Hauptschlüssel BETA",
+        "Dark BW": "Dunkel S/W",
+        "Passkey BETA": "Passwort BETA",
         "Show clocks": "Uhren anzeigen",
         "Font": "Schriftart",
         "Launcher Settings": "Launcher-Einstellungen",
@@ -82,30 +83,30 @@
         "Background 2": "Hintergrund 2",
         "Foreground 2": "Vordergrund 2",
         "Add Device": "Gerät hinzufügen",
-        "Highlight BG": "Hervorhebung BG",
+        "Highlight BG": "Hervorhebung HG",
         "Background": "Hintergrund",
-        "Highlight FG": "Highlight FG",
+        "Highlight FG": "Hervorhebung VG",
         "Wake on Touch": "Wecken bei Berührung",
         "Twist Timeout": "Twist Timeout",
         "Twist Max Y": "Twist Max Y",
-        "LCD Timeout": "LCD-Zeitüberschreitung",
+        "LCD Timeout": "LCD-Leuchtdauer",
         "LCD Brightness": "LCD-Helligkeit",
-        "Utilities": "Versorgungsunternehmen",
+        "Utilities": "Werkzeuge",
         "Log": "Protokoll",
-        "Compact Storage": "Kompakte Lagerung",
-        "Wake on BTN3": "Wake auf BTN3",
-        "Twist Threshold": "Schwellenwert verdrehen",
+        "Compact Storage": "Speicherwartung",
+        "Wake on BTN3": "Aufwachen auf BTN3",
+        "Twist Threshold": "Twist Schwellenwert",
         "Remove": "entfernen",
         "Connect device\nto add to\nwhitelist": "Gerät verbinden\nzum Hinzufügen zur\nWhitelist",
         "Debug Info": "Debug-Informationen",
         "Time Zone": "Zeitzone",
-        "Clock Style": "Uhr Stil",
-        "Wake on BTN2": "Wake auf BTN2",
-        "Wake on FaceUp": "Wake on FaceUp",
-        "Wake on BTN1": "Wake auf BTN1",
-        "Wake on Twist": "Wake on Twist",
-        "Connectable": "Anschließbar",
-        "Second": "Zweite",
+        "Clock Style": "Uhrenstil",
+        "Wake on BTN2": "Aufwecken mit BTN2",
+        "Wake on FaceUp": "Aufwecken mit Display oben",
+        "Wake on BTN1": "Aufwecken mit BTN1",
+        "Wake on Twist": "Aufwecken mit Twist",
+        "Connectable": "Erreichbar",
+        "Second": "Sekunde",
         "Minute": "Minute",
         "Turn Off": "Ausschalten",
         "No Clocks Found": "Keine Uhren gefunden",
@@ -114,10 +115,10 @@
         "Reset to Defaults": "Auf Standardwerte zurücksetzen",
         "Flattening battery - this can take hours.\nLong-press button to cancel": "Entladen der Batterie - dies kann Stunden dauern.\nLanger Tastendruck zum Abbrechen",
         "Reset Settings": "Einstellungen zurücksetzen",
-        "Rewrite Settings": "Einstellungen umschreiben",
-        "Compacting...\nTakes approx\n1 minute": "Verdichten...\nDauert ca.\n1 Minute",
-        "Stay Connectable": "Anschlussfähig bleiben",
-        "Storage": "Lagerung",
+        "Rewrite Settings": "Einstellungen neu schreiben",
+        "Compacting...\nTakes approx\n1 minute": "Speicherwartung...\nDauert ca.\n1 Minute",
+        "Stay Connectable": "Erreichbar bleiben",
+        "Storage": "Speicher",
         "This will remove everything": "Dadurch wird alles entfernt",
         "on": "auf",
         "TIMER": "TIMER",
@@ -126,9 +127,10 @@
         "Beep": "Piep",
         "Reset": "Zurücksetzen",
         "No app has settings": "Keine App hat Einstellungen",
+        "Day": "Tag",
         "Month": "Monat",
         "Reset All": "Alle zurücksetzen",
-        "Flatten Battery": "Batterie abflachen",
+        "Flatten Battery": "Batterie entladen",
         "Right": "Rechts",
         "Side": "Seite",
         "Left": "Links",
@@ -141,12 +143,12 @@
         "Vibrate": "Vibrieren",
         "Reset all widgets": "Alle Widgets zurücksetzen",
         "System": "System",
-        "Alerts": "Warnungen",
-        "Locale": "Schauplatz",
+        "Alerts": "Alarme",
+        "Locale": "Ort",
         "Whitelist": "Whitelist",
         "Select Clock": "Uhr auswählen",
-        "Disable": "Deaktivieren Sie",
-        "Timer": "Zeitschaltuhr",
+        "Disable": "Deaktivieren",
+        "Timer": "Kurzzeitwecker",
         "Error in settings": "Fehler in den Einstellungen",
         "Set Time": "Zeit einstellen",
         "ALARM": "ALARM",
@@ -164,7 +166,7 @@
         "Music": "Musik",
         "color": "Farbe",
         "off": "aus",
-        "Theme": "Thema",
+        "Theme": "Stil",
         "one": "eins",
         "two": "zwei",
         "three": "drei",
@@ -176,7 +178,22 @@
         "nine": "neun",
         "ten": "zehn",
         "eleven": "elf",
-        "twelve": "zwölf"
+        "twelve": "zwölf",
+        "Time Format": "Zeitformat",
+        "Start Week On": "Wochenbeginn",
+        "Date & Time": "Datum und Zeit",
+        "Calibrate Battery": "Akku kalibrieren",
+        "black": "Schwarz",
+        "white": "Weiß",
+        "red": "Rot",
+        "green": "Grün",
+        "blue": "Blau",
+        "yellow": "Gelb",
+        "magenta": "Magenta",
+        "cyan": "Cyan",
+        "orange": "Orange",
+        "purple": "Violett",
+        "grey": "Grau"
     },
     "alarm": {
         "//": "App-specific overrides",
@@ -189,7 +206,7 @@
         "ten past *$1": "zehn nach *$1",
         "quarter past *$1": "viertel nach *$1",
         "twenty past *$1": "zwanzig nach *$1",
-        "twenty five past *$1": "fünf for halb *$2",
+        "twenty five past *$1": "fünf vor halb *$2",
         "half past *$1": "halb *$2",
         "twenty five to *$2": "fünf nach halb *$2",
         "twenty to *$2": "zwanzig vor *$2",
diff --git a/lang/index.json b/lang/index.json
index 20ceaab92..474a530ab 100644
--- a/lang/index.json
+++ b/lang/index.json
@@ -12,6 +12,7 @@
   {"code":"tr_TR","name":"Turkish","url":"tr_TR.json"},
   {"code":"ru_RU","name":"Russian","url":"ru_RU.json", "disabled":"Characters not in ISO Latin codepage"},
   {"code":"pt_PT","name":"Portuguese","url":"pt_PT.json"},
+  {"code":"pt_BR","name":"Portuguese Brasil","url":"pt_BR.json"},
   {"code":"bg_BG","name":"Bulgarian","url":"bg_BG.json", "disabled":"Characters not in ISO Latin codepage"},
   {"code":"da_DA","name":"Danish","url":"da_DA.json"},
   {"code":"el_EL","name":"Greek","url":"el_EL.json", "disabled":"Characters not in ISO Latin codepage"},
@@ -23,5 +24,5 @@
   {"code":"sk_SK","name":"Slovak","url":"sk_SK.json"},
   {"code":"sl_SL","name":"Slovenian","url":"sl_SL.json"},
   {"code":"nn_NO","name":"Norwegian (Nynorsk)","url":"nn_NO.json"},
-  {"code":"hr_HR","name":"Croatian","url":"hr_HR.json"}  
+  {"code":"hr_HR","name":"Croatian","url":"hr_HR.json"}
 ]
diff --git a/lang/pt_BR.json b/lang/pt_BR.json
new file mode 100644
index 000000000..75849ddad
--- /dev/null
+++ b/lang/pt_BR.json
@@ -0,0 +1,167 @@
+{
+  "//": "Portuguese Brasil language translations",
+  "GLOBAL": {
+    "//": "Translations that apply for all apps",
+    "New Timer": "Novo Temporizador",
+    "New Alarm": "Novo Alarme",
+    "Auto snooze": "Soneca automática",
+    "week": "semana",
+    "circle 3": "círculo 3",
+    "(repeat)": "(repetir)",
+    "Save": "Salvar",
+    "Keep Msgs": "Manter Msgs",
+    "music": "música",
+    "circle 4": "círculo 4",
+    "circle 2": "círculo 2",
+    "circle count": "contagem em círculo",
+    "circle 1": "círculo 1",
+    "battery warn": "aviso de bateria",
+    "show widgets": "exibir widgets",
+    "data": "dados",
+    "heartrate": "frequência cardíaca",
+    "distance goal": "distancia de chegada",
+    "Circle": "Círculo",
+    "colorize icon": "colorir ícone",
+    "min. confidence": "min. confiança",
+    "minimum": "mínimo",
+    "maximum": "máximo",
+    "Heartrate": "Frequência Cardíaca",
+    "weather circle": "círculo meteorológico",
+    "step length": "comprimento do passo",
+    "valid period": "período válido",
+    "TAP right top/bottom": "TAP superior/inferior direita",
+    "Vector font size": "Tamanho de letra vectorial",
+    "Yes\ndefinitely": "Sim\ndefinitivamente",
+    "BTNs 1:startlap 2:exit 3:reset": "BTNs 1:startlap 2:exit 3:reset",
+    "STEPS": "ETAPAS",
+    "Font": "Fonte",
+    "Show clocks": "Mostrar relógios",
+    "App Source\nNot found": "Fonte do aplicativo\nNão encontrado",
+    "Mark Unread": "Marcar como não lido",
+    "View Message": "Ver Mensagem",
+    "start&lap/reset, BTN1: EXIT": "start&lap/reset, BTN1: SAÍDA",
+    "Launcher Settings": "Configurações do Launcher",
+    "Delete All Messages": "Apagar todas as mensagens",
+    "Delete all messages": "Apagar todas as mensagens",
+    "Utils": "Utils",
+    "LCD": "LCD",
+    "Apps": "Apps",
+    "Record Run": "Gravar Corrida",
+    "No Messages": "Sem Mensagens",
+    "Unread timer": "Temporizador não visto",
+    "Are you sure": "Tem certeza",
+    "Make Connectable": "Habilitar Conexão",
+    "Piezo": "Piezo",
+    "Bluetooth": "Bluetooth",
+    "BLE": "BLE",
+    "Programmable": "Programável",
+    "Vibration": "Vibração",
+    "Quiet Mode": "Modo Silencioso",
+    "Foreground": "Primeiro plano",
+    "Passkey BETA": "Senha BETA",
+    "HID": "HID",
+    "Light BW": "BW Leve",
+    "Foreground 2": "Primeiro plano 2",
+    "Dark BW": "BW Escuro",
+    "Background": "Plano de Fundo",
+    "Highlight FG": "Destaque FG",
+    "Customize": "Personalizar",
+    "Background 2": "Plano de Fundo 2",
+    "Wake on BTN3": "Acordar no BTN3",
+    "Wake on BTN2": "Acordar no BTN2",
+    "Highlight BG": "Destaque BG",
+    "LCD Timeout": "Tempo limite do LCD",
+    "Wake on FaceUp": "Acordar no FaceUp",
+    "Wake on BTN1": "Acordar no BTN1",
+    "Wake on Twist": "Acordar ao Balançar",
+    "Wake on Touch": "Acordar ao Tocar",
+    "Connect device\nto add to\nwhitelist": "Ligar dispositivo\npara adicionar a\nWhitelist",
+    "Remove": "Remover",
+    "Add Device": "Adicionar dispositivo",
+    "LCD Brightness": "Luminosidade do LCD",
+    "Twist Max Y": "Max Y do Balanço",
+    "Utilities": "Utilidades",
+    "Twist Threshold": "Limiar do Balanço",
+    "Time Zone": "Fuso horário",
+    "Twist Timeout": "Timeout do Balanço",
+    "Clock Style": "Estilo do Relógio",
+    "Debug Info": "Debug Infos",
+    "Log": "Logs",
+    "Storage": "Armazenamento",
+    "Rewrite Settings": "Re-escrever Configurações",
+    "Compacting...\nTakes approx\n1 minute": "Compactando...\nLeva aproximadamente\n1 minuto",
+    "Flatten Battery": "Drenar Bateria",
+    "Reset Settings": "Resetar Configurações",
+    "Compact Storage": "Armazenamento compacto",
+    "Stay Connectable": "Manter Conectavel",
+    "Turn Off": "Desativar",
+    "Connectable": "Conectável",
+    "This will remove everything": "Esta ação irá apagar tudo",
+    "Date": "Data",
+    "Month": "Mês",
+    "Second": "Segundo",
+    "Minute": "Minuto",
+    "Flattening battery - this can take hours.\nLong-press button to cancel": "Drenando Bateria - isto pode demorar horas.\nSegure o Botão para Cancelar",
+    "Reset to Defaults": "Resetar Dispositivo",
+    "Hour": "Hora",
+    "No Clocks Found": "Não encontramos nenhum Relogio",
+    "Right": "Confirmar",
+    "No app has settings": "Nenhum aplicativo possui configurações",
+    "App Settings": "Configurações do aplicativo",
+    "OFF": "DESLIGADO",
+    "Side": "Lado",
+    "Left": "Esquerda",
+    "Sort Order": "Ordem de classificação",
+    "Widgets": "Widgets",
+    "Invalid settings": "Configurações inválidas",
+    "Sleep Phase Alarm": "Alarme da Fase do Sono",
+    "Alarm": "Alarme",
+    "Minutes": "Minutos",
+    "TIMER": "TIMER",
+    "Hours": "Horário",
+    "on": "em",
+    "Reset All": "Resetar tudo",
+    "Repeat": "Repetir",
+    "Delete": "Deletar",
+    "Enabled": "Habilitado",
+    "Reset all widgets": "Redefinir todos os widgets",
+    "Reset": "Resetar",
+    "goal": "meta",
+    "Message": "Mensagem",
+    "Beep": "Bip",
+    "Vibrate": "Vibrar",
+    "System": "Sistema",
+    "Alerts": "Alertas",
+    "Locale": "Localização",
+    "Set Time": "Tempo Definido",
+    "Whitelist": "Whitelist",
+    "Select Clock": "Selecionar Relógio",
+    "BACK": "VOLTAR",
+    "Timer": "Temporizador",
+    "Error in settings": "Erro nas Configurações",
+    "Disable": "Desativar",
+    "Factory Reset": "Reset de Fábrica",
+    "Connected": "Conectado",
+    "ALARM": "ALARME",
+    "Sleep": "Dormir",
+    "Messages": "Mensagens",
+    "Hide": "Esconder",
+    "Show": "Mostrar",
+    "On": "Ativo",
+    "Ok": "Ok",
+    "No": "Não",
+    "Settings": "Configurações",
+    "steps": "passos",
+    "back": "voltar",
+    "Steps": "Passos",
+    "Year": "Ano",
+    "Yes": "Sim",
+    "Loading": "Carregando",
+    "Music": "Música",
+    "color": "cor",
+    "off": "desativado",
+    "Off": "Desativado",
+    "Theme": "Tema",
+    "Back": "Voltar"
+  }
+}
diff --git a/modules/ClockFace.js b/modules/ClockFace.js
index d6c3a2e66..f8dc33287 100644
--- a/modules/ClockFace.js
+++ b/modules/ClockFace.js
@@ -10,7 +10,8 @@ function ClockFace(options) {
       "precision",
       "init", "draw", "update",
       "pause", "resume",
-      "up", "down", "upDown"
+      "up", "down", "upDown",
+      "settingsFile",
     ].includes(k)) throw `Invalid ClockFace option: ${k}`;
   });
   if (!options.draw && !options.update) throw "ClockFace needs at least one of draw() or update() functions";
@@ -33,7 +34,18 @@ function ClockFace(options) {
   };
   if (options.upDown) this._upDown = options.upDown;
 
-  this.is12Hour = !!(require("Storage").readJSON("setting.json", 1) || {})["12hour"];
+  if (options.settingsFile) {
+    const settings = (require("Storage").readJSON(options.settingsFile, true) || {});
+    Object.keys(settings).forEach(k => {
+      this[k] = settings[k];
+    });
+  }
+  // these default to true
+  ["showDate", "loadWidgets"].forEach(k => {
+    if (this[k]===undefined) this[k] = true;
+  });
+  // use global 24/12-hour setting if not set by clock-settings
+  if (!('is12Hour' in this)) this.is12Hour = !!(require("Storage").readJSON("setting.json", true) || {})["12hour"];
 }
 
 ClockFace.prototype.tick = function() {
@@ -46,7 +58,7 @@ ClockFace.prototype.tick = function() {
   };
   if (!this._last) {
     g.clear(true);
-    Bangle.drawWidgets();
+    if (global.WIDGETS) Bangle.drawWidgets();
     g.reset();
     this.draw.apply(this, [time, {d: true, h: true, m: true, s: true}]);
   } else {
@@ -70,7 +82,7 @@ ClockFace.prototype.start = function() {
   .CLOCK is set by Bangle.setUI('clock') but we want to load widgets so we can check appRect and *then*
   call setUI. see #1864 */
   Bangle.CLOCK = 1; 
-  Bangle.loadWidgets();
+  if (this.loadWidgets) Bangle.loadWidgets();
   if (this.init) this.init.apply(this);
   if (this._upDown) Bangle.setUI("clockupdown", d=>this._upDown.apply(this,[d]));
   else Bangle.setUI("clock");
diff --git a/modules/ClockFace.md b/modules/ClockFace.md
index e760c3e74..6b59e68e7 100644
--- a/modules/ClockFace.md
+++ b/modules/ClockFace.md
@@ -85,6 +85,7 @@ var clock = new ClockFace({
       if (dir === -1) // Up
       else // (dir === 1): Down
     },
+    settingsFile: 'appid.settings.json', // optional, values from file will be applied to `this`
   });
 clock.start();
 
@@ -110,11 +111,51 @@ clock.start();
 
 ```
 
+
+SettingsFile
+------------
+If you use the `settingsFile` option, values from that file are loaded and set
+directly on the clock.
+
+For example:
+
+```json
+// example.settings.json:
+{
+  "showDate": false,
+  "foo": 123
+}
+```
+```js
+   var ClockFace = require("ClockFace");
+   var clock = new ClockFace({
+     draw: function(){/*...*/},
+     settingsFile: "example.settings.json",
+   });
+   // now
+   clock.showDate === false;
+   clock.foo === 123;
+   clock.loadWidgets === true; // default when not in settings file
+   clock.is12Hour === ??; // not in settings file: uses global setting
+   clock.start();
+
+```
+
 Properties
 ----------
 The following properties are automatically set on the clock:
 * `is12Hour`: `true` if the "Time Format" setting is set to "12h", `false` for "24h".
 * `paused`: `true` while the clock is paused.  (You don't need to check this inside your `draw()` code)
+* `showDate`: `true` (if not overridden through the settings file.)
+* `loadWidgets`: `true` (if not overridden through the settings file.)   
+   If set to `false` before calling `start()`, the clock won't call `Bangle.loadWidgets();` for you.
+   Best is to add a setting for this, but if you never want to load widgets, you could do this:
+   ```js
+   var ClockFace = require("ClockFace");
+   var clock = new ClockFace({draw: function(){/*...*/}});
+   clock.loadWidgets = false; // prevent loading of widgets
+   clock.start();
+   ```
 
 Inside the `draw()`/`update()` function you can access these using `this`:
 
diff --git a/modules/ClockFace_menu.js b/modules/ClockFace_menu.js
new file mode 100644
index 000000000..cd99ea39f
--- /dev/null
+++ b/modules/ClockFace_menu.js
@@ -0,0 +1,10 @@
+// boolean options, which default to true
+exports.showDate =
+exports.loadWidgets =
+  function(value, callback) {
+    if (value === undefined) value = true;
+    return {
+      value: !!value,
+      onchange: v=>callback(v),
+    };
+  };
diff --git a/modules/buzz.js b/modules/buzz.js
index 488d0228d..aed0e2e7b 100644
--- a/modules/buzz.js
+++ b/modules/buzz.js
@@ -1,14 +1,33 @@
-/* Call this with a pattern like '.-.', '.. .' or '..' to buzz that pattern
-out on the internal vibration motor. use buzz_menu to display a menu
-where the patterns can be chosen. */
+/**
+ * Buzz the passed `pattern` out on the internal vibration motor.
+ *
+ * A pattern is a sequence of `.`, `,`, `-`, `:`, `;` and `=` where
+ * - `.` is one short and weak vibration
+ * - `,` is one medium and weak vibration
+ * - `-` is one long and weak vibration
+ * - `:` is one short and strong vibration
+ * - `;` is one medium and strong vibration
+ * - `=` is one long and strong vibration
+ *
+ * You can use the `buzz_menu` module to display a menu where some common patterns can be chosen.
+ *
+ * @param {string} pattern A string like `.-.`, `..=`, `:.:`, `..`, etc.
+ * @returns a Promise
+ */
 exports.pattern = pattern => new Promise(resolve => {
-  function b() {
-    if (pattern=="") resolve();
+  function doBuzz() {
+    if (pattern == "") resolve();
     var c = pattern[0];
     pattern = pattern.substr(1);
-    if (c==".") Bangle.buzz().then(()=>setTimeout(b,100));
-    else if (c=="-") Bangle.buzz(500).then(()=>setTimeout(b,100));
-    else setTimeout(b,100);
+    const BUZZ_WEAK = 0.25, BUZZ_STRONG = 1;
+    const SHORT_MS = 100, MEDIUM_MS = 200, LONG_MS = 500;    
+    if (c == ".") Bangle.buzz(SHORT_MS, BUZZ_WEAK).then(() => setTimeout(doBuzz, 100));
+    else if (c == ",") Bangle.buzz(MEDIUM_MS, BUZZ_WEAK).then(() => setTimeout(doBuzz, 100));
+    else if (c == "-") Bangle.buzz(LONG_MS, BUZZ_WEAK).then(() => setTimeout(doBuzz, 100));
+    else if (c == ":") Bangle.buzz(SHORT_MS, BUZZ_STRONG).then(() => setTimeout(doBuzz, 100));
+    else if (c == ";") Bangle.buzz(MEDIUM_MS, BUZZ_STRONG).then(() => setTimeout(doBuzz, 100));
+    else if (c == "=") Bangle.buzz(LONG_MS, BUZZ_STRONG).then(() => setTimeout(doBuzz, 100));
+    else setTimeout(doBuzz, 100);
   }
-  b();
+  doBuzz();
 });
diff --git a/modules/buzz_menu.js b/modules/buzz_menu.js
index c5b41a997..7ca155a2c 100644
--- a/modules/buzz_menu.js
+++ b/modules/buzz_menu.js
@@ -1,14 +1,19 @@
-/* Display a menu to select from various vibration patterns for use with buzz.js */
-
-exports.pattern = function(value, callback) {
-  var vibPatterns = ["", ".", "..", "-", "--", "-.-", "---"];
+/**
+ * Display a menu to select from various common vibration patterns for use with buzz.js.
+ * 
+ * @param {string} value The pre-selected pattern
+ * @param {*} callback A function called with the user selected pattern
+ */
+exports.pattern = function (value, callback) {
+  var patterns = ["", ".", ":", "..", "::", ",", ";", ",,", ";;", "-", "=", "--", "==", "...", ":::", "---", ";;;", "==="];
   return {
-    value: Math.max(0,vibPatterns.indexOf(value)),
-    min: 0, max: vibPatterns.length-1,
-    format: v => vibPatterns[v]||/*LANG*/"Off",
+    value: Math.max(0, patterns.indexOf(value)),
+    min: 0,
+    max: patterns.length - 1,
+    format: v => patterns[v] || /*LANG*/"Off",
     onchange: v => {
-      require("buzz").pattern(vibPatterns[v]);
-      callback(vibPatterns[v]);
+      require("buzz").pattern(patterns[v]);
+      callback(patterns[v]);
     }
   };
 }
diff --git a/modules/exstats.js b/modules/exstats.js
index 63d94ec7b..461ae727f 100644
--- a/modules/exstats.js
+++ b/modules/exstats.js
@@ -128,10 +128,11 @@ function formatPace(speed, paceLength) {
 
 Bangle.on("GPS", function(fix) {
   if (!fix.fix) return; // only process actual fixes
-
-  if (!state.active) return;
   state.lastGPS = state.thisGPS;
   state.thisGPS = fix;
+  if (stats["altg"]) stats["altg"].emit("changed",stats["altg"]);
+  if (stats["speed"]) stats["speed"].emit("changed",stats["speed"]);
+  if (!state.active) return;
   if (state.lastGPS.fix)
     state.distance += calcDistance(state.lastGPS, fix);
   if (stats["dist"]) stats["dist"].emit("changed",stats["dist"]);
@@ -140,7 +141,6 @@ Bangle.on("GPS", function(fix) {
   if (!isNaN(fix.speed)) state.curSpeed = state.curSpeed*0.8 + fix.speed*0.2/3.6; // meters/sec
   if (stats["pacea"]) stats["pacea"].emit("changed",stats["pacea"]);
   if (stats["pacec"]) stats["pacec"].emit("changed",stats["pacec"]);
-  if (stats["speed"]) stats["speed"].emit("changed",stats["speed"]);
   if (state.notify.dist.increment > 0 && state.notify.dist.next <= state.distance) {
     stats["dist"].emit("notify",stats["dist"]);
     state.notify.dist.next = state.notify.dist.next + state.notify.dist.increment;
@@ -168,10 +168,21 @@ Bangle.on("HRM", function(h) {
     if (stats["bpm"]) stats["bpm"].emit("changed",stats["bpm"]);
   }
 });
+if (Bangle.setBarometerPower) Bangle.on("pressure", function(e) {
+  if (state.alt === undefined)
+    state.alt = e.altitude;
+  else
+    state.alt = state.alt*0.9 + e.altitude*0.1;
+  var i = Math.round(state.alt);
+  if (i!==state.alti) {
+    state.alti = i;
+    if (stats["altb"]) stats["altb"].emit("changed",stats["altb"]);
+  }
+});
 
 /** Get list of available statistic types */
 exports.getList = function() {
-  return [
+  var l = [
     {name: "Time", id:"time"},
     {name: "Distance", id:"dist"},
     {name: "Steps", id:"step"},
@@ -181,7 +192,10 @@ exports.getList = function() {
     {name: "Pace (curr)", id:"pacec"},
     {name: "Speed", id:"speed"},
     {name: "Cadence", id:"caden"},
+    {name: "Altitude (GPS)", id:"altg"}
   ];
+  if (Bangle.setBarometerPower) l.push({name: "Altitude (baro)", id:"altb"});
+  return l;
 };
 /** Instantiate the given list of statistic IDs (see comments at top)
  options = {
@@ -205,7 +219,7 @@ exports.getStats = function(statIDs, options) {
   options.notify.dist.increment = (options.notify && options.notify.dist && options.notify.dist.increment)||0;
   options.notify.step.increment = (options.notify && options.notify.step && options.notify.step.increment)||0;
   options.notify.time.increment = (options.notify && options.notify.time && options.notify.time.increment)||0;
-  var needGPS,needHRM;
+  var needGPS,needHRM,needBaro;
   // ======================
   if (statIDs.includes("time")) {
     stats["time"]={
@@ -276,10 +290,27 @@ exports.getStats = function(statIDs, options) {
       getString : function() { return state.stepsPerMin; },
     };
   }
+  if (statIDs.includes("altg")) {
+    needGPS = true;
+    stats["altg"]={
+      title : "Altitude",
+      getValue : function() { return state.thisGPS.alt; },
+      getString : function() { return (state.thisGPS.alt===undefined)?"-":Math.round(state.thisGPS.alt)+"m"; },
+    };
+  }
+  if (statIDs.includes("altb")) {
+    needBaro = true;
+    stats["altb"]={
+      title : "Altitude",
+      getValue : function() { return state.alt; },
+      getString : function() { return (state.alt===undefined)?"-":state.alti+"m"; },
+    };
+  }
   // ======================
   for (var i in stats) stats[i].id=i; // set up ID field
   if (needGPS) Bangle.setGPSPower(true,"exs");
   if (needHRM) Bangle.setHRMPower(true,"exs");
+  if (needBaro) Bangle.setBarometerPower(true,"exs");
   setInterval(function() { // run once a second....
     if (!state.active) return;
     // called once a second
@@ -315,6 +346,8 @@ exports.getStats = function(statIDs, options) {
     state.BPM = 0;
     state.BPMage = 0;
     state.maxBPM = 0;
+    state.alt = undefined; // barometer altitude (meters)
+    state.alti = 0; // integer ver of state.alt (to avoid repeated 'changed' notifications)
     state.notify = options.notify;
     if (options.notify.dist.increment > 0) {
       state.notify.dist.next = state.distance + options.notify.dist.increment;
diff --git a/modules/time_utils.js b/modules/time_utils.js
index 5ca153710..6a3ed6faf 100644
--- a/modules/time_utils.js
+++ b/modules/time_utils.js
@@ -55,7 +55,7 @@ exports.decodeTime = (millis) => {
  */
 exports.formatTime = (value) => {
   var time = safeTime(typeof value === "object" ? value : exports.decodeTime(value));
-  if (time.d != 0) throw "(d)ays not supported here";
+  if (time.d != 0) throw "days not supported here";
   if (time.h < 0 || time.h > 23) throw "Invalid value: must be 0 <= h <= 23";
   if (time.m < 0 || time.m > 59) throw "Invalid value: must be 0 <= m <= 59";
   return time.h + ":" + ("0" + time.m).substr(-2);
@@ -63,16 +63,19 @@ exports.formatTime = (value) => {
 
 /**
  * @param {object|int} value {d, h, m, s} object or milliseconds
- * @returns an human-readable duration string like "3d 1h 10m 45s"
+ * @param {boolean} compact `true` to remove all whitespaces between the values
+ * @returns an human-readable duration string like "3d 1h 10m 45s" (or "3d1h10m45s" if `compact` is `true`)
  */
-exports.formatDuration = (value) => {
+exports.formatDuration = (value, compact) => {
+  compact = compact || false;
   var duration = "";
   var time = safeTime(typeof value === "object" ? value : exports.decodeTime(value));
   if (time.d > 0) duration += time.d + "d ";
   if (time.h > 0) duration += time.h + "h ";
   if (time.m > 0) duration += time.m + "m ";
   if (time.s > 0) duration += time.s + "s"
-  return duration.trim();
+  duration = duration.trim()
+  return compact ? duration.replace(" ", "") : duration;
 }
 
 exports.getCurrentTimeMillis = () => {