Merge remote-tracking branch 'upstream/master'

2022-01-24 10:54:55 -05:00 · 2022-01-24 10:54:55 -05:00 · ecfc4b6fe2
parent bfc228e50c c061ed38af
commit ecfc4b6fe2
1216 changed files with 38239 additions and 7500 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,3 +9,4 @@ appdates.csv
 _config.yml
 tests/Layout/bin/tmp.*
 tests/Layout/testresult.bmp
+apps.local.json
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ and that it is not licensed in another way that would make this impossible.

 ## How does it work?

-* A list of apps is in `apps.json`
+* A list of apps is in `apps.json` (this is auto-generated from all the `apps/yourapp/metadata.json` using Jekyll or `bin/create_apps_json.sh`)
 * Each element references an app in `apps/<id>` which is uploaded
 * When it starts, BangleAppLoader checks the JSON and compares
 it with the files it sees in the watch's storage.
@ -53,10 +53,10 @@ easily distinguish between file types, we use the following:
 is limited to 28 char filenames and appends a file extension (eg `.js`) so please
 try and keep filenames short to avoid overflowing the buffer.
 * Create a folder called `apps/<id>`, lets assume `apps/myappid`
-* We'd recommend that you copy files from 'Example Applications' (below) as a base, or...
+* We'd recommend that you copy files from one of the Examples in `apps/_example_*` (see below), or...
 * `apps/myappid/app.png` should be a 48px icon
 * Use http://www.espruino.com/Image+Converter to create `apps/myappid/app-icon.js`, using a 1 bit, 4 bit or 8 bit Web Palette "Image String"
-* Create an entry in `apps.json` as follows:
+* Create/modify `apps/myappid/metadata.json` as follows:

 ```
 { "id": "myappid",
@ -116,8 +116,7 @@ and set it to `Load default application`.

 To make the process easier we've come up with some example applications that you can use as a base
 when creating your own. Just come up with a unique name (ideally lowercase, under 20 chars), copy `apps/_example_app`
-or `apps/_example_widget` to `apps/myappid`, and add `apps/_example_X/add_to_apps.json` to
-`apps.json`.
+or `apps/_example_widget` to `apps/myappid`, and edit `apps/myappid/metadata.json` accordingly.

 **Note:** the max filename length is 28 chars, so we suggest an app ID of under
 20 so that when `.app.js`/etc gets added to the end the filename isn't cropped.
@ -131,7 +130,7 @@ The app example is available in [`apps/_example_app`](apps/_example_app)

 Apps are listed in the Bangle.js menu, accessible from a clock app via the middle button.

-* `add_to_apps.json` - insert into `apps.json`, describes the app to bootloader and loader
+* `metadata.json` - describes the app to bootloader and loader
 * `app.png` - app icon - 48x48px
 * `app-icon.js` - JS version of the icon (made with http://www.espruino.com/Image+Converter) for use in Bangle.js's menu
 * `app.js` - app code
@ -144,11 +143,11 @@ Use the Espruino [image converter](https://www.espruino.com/Image+Converter) and

 Follow this steps to create a readable icon as image string.

-1. upload a png file
+1. upload a 48x48 png file - THE IMAGE SHOULD BE 48x48 OR LESS
 2. set _X_ Use Compression
 3. set _X_ Transparency (optional)
 4. set Diffusion: _flat_
-5. set Colours: _1 bit_, _4 bit_ or _8 bit Web Palette_
+5. set Colours: _1 bit_, any of the Optimised options, or _8 bit Web Palette_ are best
 6. set Output as: _Image String_

 Replace this line with the image converter output:
@ -157,6 +156,8 @@ Replace this line with the image converter output:
 require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="))
 ```

+**Do not add a trailing semicolon**
+
 You can also use this converter for creating images you like to draw with `g.drawImage()` with your app.

 Apps that need widgets can call `Bangle.loadWidgets()` **once** at startup to load
@ -167,17 +168,18 @@ has call to completely clear the screen. Widgets themselves will update as and w

 The widget example is available in [`apps/_example_widget`](apps/_example_widget)

-* `add_to_apps.json` - insert into `apps.json`, describes the widget to bootloader and loader
+* `metadata.json` - describes the widget to bootloader and loader
 * `widget.js` - widget code

 Widgets are just small bits of code that run whenever an app that supports them
 calls `Bangle.loadWidgets()`. If they want to display something in the 24px high
-widget bars at the top and bottom of the screen they can add themselves to
-the global `WIDGETS` array with:
+widget bar at the top of the screen they can add themselves to the global 
+`WIDGETS` array with:

 ```
 WIDGETS["mywidget"]={
-  area:"tl", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
+  area:"tl", // tl (top left), tr (top right)
+  sortorder:0, // (Optional) determines order of widgets in the same corner
  width: 24, // how wide is the widget? You can change this and call Bangle.drawWidgets() to re-layout
  draw:draw // called to draw the widget
 };
@ -202,7 +204,7 @@ and which gives information about the app for the Launcher.
     // if it's 'clock' then it'll be loaded by default at boot time
     // if this is 'bootloader' then it's code that is run at boot time, but is not in a menu  
  "version":"1.23",
-     // added by BangleApps loader on upload based on apps.json
+     // added by BangleApps loader on upload based on metadata.json
  "files:"file1,file2,file3",
     // added by BangleApps loader on upload - lists all files
     // that belong to the app so it can be deleted
@ -214,7 +216,7 @@ and which gives information about the app for the Launcher.
 }
 ```

-### `apps.json` format
+### `metadata.json` format

 ```
 { "id": "appid",              // 7 character app id
@ -293,9 +295,9 @@ and which gives information about the app for the Launcher.
 * storage is used to identify the app files and how to handle them
 * data is used to clean up files when the app is uninstalled

-### `apps.json`: `custom` element
+### `metadata.json`: `custom` element

-Apps that can be customised need to define a `custom` element in `apps.json`,
+Apps that can be customised need to define a `custom` element in `metadata.json`,
 which names an HTML file in that app's folder.

 When `custom` is defined, the 'upload' button is replaced by a customize
@ -303,7 +305,7 @@ button, and when clicked it opens the HTML page specified in an iframe.

 In that HTML file you're then responsible for handling a button
 press and calling `sendCustomizedApp` with your own customised
-version of what's in `apps.json`:
+version of what's in `metadata.json`:

 ```
 <html>
@ -335,9 +337,9 @@ for a clean example.
 and will never be loaded. This is so the app loader can tell if it's a JavaScript
 file based on the extension, and if so it can minify and pretokenise it.

-### `apps.json`: `interface` element
+### `metadata.json`: `interface` element

-Apps that create data that can be read back can define a `interface` element in `apps.json`,
+Apps that create data that can be read back can define a `interface` element in `metadata.json`,
 which names an HTML file in that app's folder.

 When `interface` is defined, a `Download from App` button is added to
@ -384,20 +386,24 @@ Example `settings.js`
 ```js
 // make sure to enclose the function in parentheses
 (function(back) {
-  function get(key, def) { return require('Settings').get('myappid', key, def); }
-  function set(key, value) { require('Settings').set('myappid', key, value); }
+  let settings = require('Storage').readJSON('myappid.json',1)||{};
+  if (typeof settings.monkeys !== "number") settings.monkeys = 12; // default value 
+  function save(key, value) {
+    settings[key] = value;
+    require('Storage').write('myappid.json', settings);
+  }
  const appMenu = {
    '': {'title': 'App Settings'},
    '< Back': back,
    'Monkeys': {
-      value: get('monkeys', 12),
-      onchange: (m) => set('monkeys', m)
+      value: settings.monkeys,
+      onchange: (m) => {save('monkeys', m)}
    }   
  };
  E.showMenu(appMenu)
 })
 ```
-In this example the app needs to add `myappid.settings.js` to `storage` in `apps.json`.   
+In this example the app needs to add `myappid.settings.js` to `storage` in `metadata.json`.   
 It should also add `myappid.json` to `data`, to make sure it is cleaned up when the app is uninstalled.
 ```json
  { "id": "myappid",
@ -457,16 +463,13 @@ The screen is parted in a widget and app area for lcd mode `direct`(default).
 | areas | as rectangle or point |
 | :-:| :-: |
 | Widget | (0,0,239,23) |
-| Widget bottom bar (optional) | (0,216,239,239) |
-| Apps | (0,24,239,239) (see below) |
+| Apps | (0,24,239,239) |
 | BTN1 | (230, 55)  |
 | BTN2 | (230, 140) |
 | BTN3 | (230, 210) |
 | BTN4 | (0,0,119, 239)|
 | BTN5 |  (120,0,239,239) |

- If there are widgets at the bottom of the screen, apps should actually keep the bottom 24px free, so should keep to the area (0,24,239,215)
-
 - Use `g.setFontAlign(0, 0, 3)` to draw rotated string to BTN1-BTN3 with `g.drawString()`.

 - For BTN4-5 the touch area is named
--- a/apps.json
+++ b/apps.json
--- a/apps/1button/metadata.json
+++ b/apps/1button/metadata.json
@ -0,0 +1,16 @@
+{
+  "id": "1button",
+  "name": "One-Button-Tracker",
+  "version": "0.01",
+  "description": "A widget that turns BTN1 into a tracker, records time of button press/release.",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "tool,quantifiedself,widget",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "interface": "interface.html",
+  "storage": [
+    {"name":"1button.wid.js","url":"widget.js"}
+  ],
+  "data": [{"name":"one_button_presses.csv","storageFile":true}]
+}
--- a/apps/93dub/ChangeLog
+++ b/apps/93dub/ChangeLog
@ -1,3 +1,6 @@
 0.01: Initial version for upload
 0.02: DiscoMinotaur's adjustments (removed battery and adjusted spacing)
 0.03: Code style cleanup
+0.04: Set 00:00 to 12:00 for 12 hour time
+0.05: Display time, even on Thursday
+0.06: Fix light theme issue, where widgets would end up on a light strip
--- a/apps/93dub/README.md
+++ b/apps/93dub/README.md
@ -5,7 +5,8 @@
 Uses many portions from Espruino documentation, example watchfaces, and the waveclk app. It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources and adapted for Bangle.js 2's screen. Time, date and the battery display works. It is not pixel perfect to the original.

 Contributors:
-Leer10
-Orviwan (original watchface and assets)
-Gordon Williams (Bangle.js, watchapps for reference code and documentation)
-DiscoMinotaur (adjustments)
+* Leer10
+* Orviwan (original watchface and assets)
+* Gordon Williams (Bangle.js, watchapps for reference code and documentation)
+* DiscoMinotaur (adjustments)
+* Ray Holder (minor 12 hour time rendering adjustment, fix Thursdays)
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@ -78,6 +78,9 @@ function draw(){
    } else {
      h = " " + h;
    }
+  } else if (h === 0) {
+    // display 12:00 instead of 00:00 for 12 hr mode
+    h = "12";
  }

  //draw separator
@ -90,7 +93,7 @@ function draw(){
  if (w == 1) {imgW = imgMon;}
  if (w == 2) {imgW = imgTue;}
  if (w == 3) {imgW = imgWed;}
-  if (w == 4) {imgW = imgThr;}
+  if (w == 4) {imgW = imgThu;}
  if (w == 5) {imgW = imgFri;}
  if (w == 6) {imgW = imgSat;}
  g.drawImage(imgW, 85, 63);
@ -119,7 +122,13 @@ function draw(){
  queueDraw();
 }

-
+/**
+ * This watch is mostly dark, it does not make sense to respect the
+ * light theme as you end up with a white strip at the top for the
+ * widgets and black watch. So set the colours to the dark theme.
+ *
+ */
+g.setTheme({bg:"#000",fg:"#fff",dark:true}).clear();
 draw();

 //the following section is also from waveclk
--- a/apps/93dub/metadata.json
+++ b/apps/93dub/metadata.json
@ -0,0 +1,17 @@
+{ "id": "93dub",
+ "name": "93 Dub",
+ "shortName":"93 Dub",
+ "icon": "93dub.png",
+ "screenshots": [{"url":"screenshot.png"}],
+ "version":"0.06",
+ "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
+ "tags": "clock",
+ "type": "clock",
+ "supports":["BANGLEJS2"],
+ "readme": "README.md",
+ "allow_emulator": true,
+ "storage": [
+   {"name":"93dub.app.js","url":"app.js"},
+   {"name":"93dub.img","url":"app-icon.js","evaluate":true}
+ ]
+}
--- a/apps/BLEcontroller/metadata.json
+++ b/apps/BLEcontroller/metadata.json
@ -0,0 +1,16 @@
+{
+  "id": "BLEcontroller",
+  "name": "BLE Customisable Controller with Joystick",
+  "shortName": "BLE Controller",
+  "version": "0.01",
+  "description": "A configurable controller for BLE devices and robots, with a basic four direction joystick. Designed to be easy to customise so you can add your own menus.",
+  "icon": "BLEcontroller.png",
+  "tags": "tool,bluetooth",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "allow_emulator": false,
+  "storage": [
+    {"name":"BLEcontroller.app.js","url":"app.js"},
+    {"name":"BLEcontroller.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/HRV/metadata.json
+++ b/apps/HRV/metadata.json
@ -0,0 +1,15 @@
+{
+  "id": "HRV",
+  "name": "Heart Rate Variability monitor",
+  "shortName": "HRV monitor",
+  "version": "0.04",
+  "description": "Heart Rate Variability monitor, see Readme for more info",
+  "icon": "hrv.png",
+  "tags": "",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"HRV.app.js","url":"app.js"},
+    {"name":"HRV.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/UI4swatch/metadata.json
+++ b/apps/UI4swatch/metadata.json
@ -0,0 +1,16 @@
+{
+  "id": "UI4swatch",
+  "name": "UI 4 swatch",
+  "shortName": "UI 4 swatch",
+  "version": "0.01",
+  "description": "A UI/UX for espruino smartwatches, displays dinamically calc. x,y coordinates.",
+  "icon": "app.png",
+  "tags": "Color,input,buttons,touch,UI",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "screenshots": [{"url":"UI4swatch_icon.png"},{"url":"UI4swatch_s1.png"}],
+  "storage": [
+    {"name":"UI4swatch.app.js","url":"app.js"},
+    {"name":"UI4swatch.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/_example_app/add_to_apps.json
+++ b/apps/_example_app/add_to_apps.json
@ -1,4 +1,3 @@
-// Create an entry in apps.json as follows:
 { "id": "7chname",
  "name": "My app's human readable name",
  "shortName":"Short Name",
--- a/apps/_example_widget/add_to_apps.json
+++ b/apps/_example_widget/add_to_apps.json
@ -1,4 +1,3 @@
-// Create an entry in apps.json as follows:
 { "id": "7chname",
  "name": "My widget's human readable name",
  "shortName":"Short Name",
--- a/apps/a_clock_timer/metadata.json
+++ b/apps/a_clock_timer/metadata.json
@ -0,0 +1,17 @@
+{
+  "id": "a_clock_timer",
+  "name": "A Clock with Timer",
+  "version": "0.01",
+  "description": "A Clock with Timer, Map and Time Zones",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": true,
+  "readme": "README.md",
+  "storage": [
+    {"name":"a_clock_timer.app.js","url":"app.js"},
+    {"name":"a_clock_timer.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/a_speech_timer/ChangeLog
+++ b/apps/a_speech_timer/ChangeLog
@ -0,0 +1,2 @@
+1.00: Release (2021/12/01)
+1.01: Grey font when timer is frozen (2021/12/04)
--- a/apps/a_speech_timer/README.md
+++ b/apps/a_speech_timer/README.md
@ -0,0 +1,16 @@
+# A Speech Timer
+
+* A timer designed to help keeping your speeches and presentations to time
+* Vibrates 1-2-3 times and changes screen color within the target time range.
+  *  Example for a 5 to 7 minutes speech: vibrates once at 5:00 (green), twice at 6:00 (yellow), thrice at 7:00 (red).
+* Use the buttons to start a timer
+* Swipe left or right to choose different target times
+* Touching the timer on the upper part of the screen locks (or unlocks) the buttons to prevent accidental changes
+
+![](screenshot0.png)
+![](screenshot1.png)
+![](screenshot2.png)
+![](screenshot3.png)
+
+## Creator
+[@alainsaas](https://github.com/alainsaas)
--- a/apps/a_speech_timer/app-icon.js
+++ b/apps/a_speech_timer/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgP//kAj//AAP5/+PApH7//PAonvAoXzAonj//nApHggEHAoWAgA5BAAJCCAoU/IYIFCv///w0CAonrv/HAoXLv+DAogLFgPeAoV+nlOAoV4/8+AoV79+eFIVzAof7u/v5xBCs4FL84FE//O74FBu4FB64FD73TAoNz/+eAoV5IIIFCvl8vwFCv8A/wFDO4IFFFIQFCGoSVFUIqtDh65D/1vYof+Y4LLDw7dD/0ndIYRCeoQFC/P/z/+i///oFBGoX8gEfAgI="))
--- a/apps/a_speech_timer/app.js
+++ b/apps/a_speech_timer/app.js
@ -0,0 +1,173 @@
+Graphics.prototype.setFontMichroma36 = function() {
+g.setFontCustom(atob("AAAAAAAAAAAAAAAAeAAAAAeAAAAAeAAAAAeAAAAAAAAAAAAAAAAAAAAAAAGAAAAA+AAAAD+AAAAP+AAAA/8AAAD/wAAAf/AAAB/4AAAH/gAAAf+AAAB/4AAAH/gAAAf+AAAAfwAAAAfAAAAAcAAAAAAAAAAAAAAAAAAAAAAAA///AAD///wAH///4AP///8APwAD+APAAAeAeAAAeAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAPAeAAAeAPAAAeAPwAD+AP///8AH///4AD///wAA///AAAAAAAAAAAAAAAAAAAAAEAAAAAOAAAAAfAAAAA+AAAAB8AAAAD8AAAAH4AAAAPwAAAAPgAAAAfAAAAAf///+Af///+Af///+Af///+AAAAAAAAAAAAAAAAAAAAAAAAAA/Af+AD/A/+AH/B/+AP/D/+APwD4eAPADweAfADweAeADweAeADweAeADweAeAHgeAeAHgeAeAHgeAeAHgeAeAHgeAeAHgeAeAHgeAeAHgeAeAHgeAeAHgeAeAPgeAeAPAeAeAPAeAeAPAeAeAPAeAfAPAeAPw/AeAP/+AeAH/+AeAD/8AeAB/wAOAAAAAAAAAAAAAAAAAAAAAAAAAB8APgAD8AP4AH8AP8AP8AP8APgAB+AfAAAeAeAAAeAeAAAPAeAAAPAeAAAPAeAAAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAPAeAeAeAfAeAeAPx/h+AP///+AH///8AD///4AB/h/gAAAAAAAAAAAAAAAAAAAAAAeAAAAA/AAAAA/AAAAB/AAAAD/AAAAH/AAAAPvAAAAPPAAAAfPAAAA+PAAAB8PAAAD4PAAADwPAAAHwPAAAPgPAAAfAPAAA+APAAA8APAAB8APAAD4APAAHwAPAAPgAPAAPAAPAAfAAPAAf///+Af///+Af///+Af///+AAAAPAAAAAPAAAAAPAAAAAPAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAf/8PgAf/8P4Af/8P8Af/8P8AeB4A+AeB4AeAeDwAeAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAPAeDwAfAeDwAeAeD4A+AeD+D+AeB//8AeB//4AeA//4AAAP/AAAAAAAAAAAAAAAAAAAAAAAAAAA///AAD///wAH///4AH///8AP4fB+APAeAeAfA8AeAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAfA8APAPA+AeAPgeAeAP8fh+AH8f/8AD8P/8AA8H/4AAAB/gAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAeAAAAAeAAAAAeAAAAAeAAAAAeAAACAeAAAGAeAAAOAeAAAeAeAAA+AeAAD+AeAAH8AeAAP4AeAAfwAeAA/gAeAB/AAeAD+AAeAP4AAeAfwAAeA/gAAeB/AAAeD+AAAeH8AAAefwAAAe/gAAAf/AAAAf+AAAAf8AAAAf4AAAAfgAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAMAAB+B/wAD/j/4AH/3/8AP///+AP//A+AfB+AeAeA+AeAeA+APAeA+APAeA+APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA8APAeA+APAeA+APAeA+APAeA+AOAeA+AeAPh/A+AP///+AP/3/8AH/3/8AB/D/wAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAD/4HAAH/8HwAP/+H4AP5/H8AfAfA8AeAPAeAeAPAeAeAPAeAeAHgfAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHgPAeAHAPAeAPAOAeAPAeAPAPAeAPwfB+AP///8AH///4AD///wAA///AAAAAAAAAAAAAAAAAAAAAAAAAAAB8DwAAB8HwAAB8HwAAB8DwAAAAAAAAAAAAA"), 46, atob("CBIkESMjJCMjIyMjCA=="), 36+(1<<8)+(1<<16));
+};
+
+Graphics.prototype.setFontMichroma16 = function(scale) {
+g.setFontCustom(atob("AAAAGAAYAAAAGAB4A/APwD4AeADgAAAAAAA/8H/4YBjAGMAcwBzAHMAcwBzAHMAYYBh/+D/wAAAAABgAOABwAGAA//h/+AAAAAA4+Hn4YZjhmMOYw5jDmMMYwxjDGOMYYxh/GD4YAAAAADBwcHhgGOAYwBzHHMccxxzHHMcc5xhnGH/4PfAAAAAAAOAB4APgB2AGYAxgHGA4YDBgYGD/+P/4AOAAYAAAAAD+cP547BjsGOwc7BzsHOwc7BzsHOwY7zjv+APgAAAAAD/wf/hmGOYYxhzGHMYcxhzGHOYYZhh3uDP4AeAAAEAA4ADgAOAI4DjgeODw4eDjgOcA7gD8APgA8AAAAAAAAAA58H/4bxjmGMYcxhzGHMYcxhzGHOYYbxh/+DnwAAAAADxgfnBnOOMYwxjDHMMcwxzDHMMY4xhjOH/4P/AAAAAABnAGcAAA"), 46, atob("BAgQCBAQEBAQEBAQBA=="), 16+(scale<<8)+(1<<16));
+};
+
+function timeToString(duration) {
+    var hrs = ~~(duration / 3600);
+    var mins = ~~((duration % 3600) / 60);
+    var secs = ~~duration % 60;
+    var ret = "";
+    if (hrs > 0) {
+        ret += "" + hrs + ":" + (mins < 10 ? "0" : "");
+    }
+    ret += "" + mins + ":" + (secs < 10 ? "0" : "");
+    ret += "" + secs;
+    return ret;
+}
+
+var newtimer_left_from = 60;
+var newtimer_left_to = 2*60;
+
+var newtimer_right_from = 5*60;
+var newtimer_right_to = 7*60;
+
+var current_from = 5*60;
+var current_mid = 6*60;
+var current_to = 7*60;
+var current_value = 0;
+
+var timerinterval;
+var istimeron = false;
+
+var islocked = false;
+
+function countDown() {
+  current_value++;
+  draw();
+
+  if (current_value == current_from) {
+    Bangle.buzz(500);
+  } else if (current_value == current_mid) {
+    Bangle.buzz(400).then(()=>{
+      return new Promise(resolve=>setTimeout(resolve, 800));
+    }).then(()=>{
+      return Bangle.buzz(500);
+    });
+  } else if (current_value == current_to) {
+    Bangle.buzz(300).then(()=>{
+      return new Promise(resolve=>setTimeout(resolve, 600));
+    }).then(()=>{
+      Bangle.buzz(300).then(()=>{
+        return new Promise(resolve=>setTimeout(resolve, 600));
+      }).then(()=>{
+        return Bangle.buzz(500);
+      });
+    });
+  }
+
+}
+
+Bangle.on('touch',(touchside, touchdata)=>{
+  if (!islocked && istimeron && touchdata.y > (100+10)) {
+    Bangle.buzz(40);
+    istimeron = false;
+    clearInterval(timerinterval);
+  } else if (touchdata.y > 24 && touchdata.y < (100-10)) {
+    Bangle.buzz(40);
+    islocked = !islocked;
+  } else if (!islocked && touchdata.y > (100+10) && touchdata.x > 88 + 10) {
+    Bangle.buzz(40);
+    current_from = newtimer_right_from;
+    current_to = newtimer_right_to;
+    current_mid = (current_from + current_to) / 2;
+    current_value = 0;
+    if (timerinterval) clearInterval(timerinterval);
+    timerinterval = setInterval(countDown, 1000);
+    istimeron = true;
+  } else if (!islocked && touchdata.y > (100+10) && touchdata.x < 88 - 10) {
+    Bangle.buzz(40);
+    current_from = newtimer_left_from;
+    current_to = newtimer_left_to;
+    current_mid = (current_from + current_to) / 2;
+    current_value = 0;
+    if (timerinterval) clearInterval(timerinterval);
+    timerinterval = setInterval(countDown, 1000);
+    istimeron = true;
+  }
+  showInstructions = false;
+  draw();
+});
+
+Bangle.on('swipe',(swiperight, swipedown)=>{
+  console.log(swiperight);
+  console.log(swipedown);
+
+  if (swiperight == -1) {
+    if (newtimer_left_from >= 60) {
+      newtimer_left_from += 60;
+      newtimer_left_to += 60;
+    } else { // special case for 0:30 to 1:00
+      newtimer_left_from = 60;
+      newtimer_left_to = 120;
+    }
+    newtimer_right_from += 60;
+    newtimer_right_to += 60;
+    draw();
+  } else if (swiperight == 1) {
+    if (newtimer_left_from > 60) {
+      newtimer_left_from -= 60;
+      newtimer_left_to -= 60;
+    } else { // special case for 0:30 to 1:00
+      newtimer_left_from = 30;
+      newtimer_left_to = 60;
+    }
+
+    if (newtimer_right_from > 120) {
+      newtimer_right_from -= 60;
+      newtimer_right_to -= 60;
+    }
+    draw();
+  }
+});
+
+var drawTimeout;
+var showInstructions = true;
+
+function draw() {
+  g.reset();
+  if (current_value >= current_to) { g.setBgColor("#F00"); }
+  else if (current_value >= current_mid) { g.setBgColor("#FF0"); }
+  else if (current_value >= current_from) { g.setBgColor("#8F8"); }
+  g.clearRect(0,24,176,176);
+
+  g.reset().setFontAlign(0, 0).setColor(istimeron ? "#000" : "#444");
+  g.setFont("Michroma36").drawString(timeToString(current_value), 88, 62);
+
+  g.reset().setFontAlign(0, 0);
+
+  g.setFont("HaxorNarrow7x17");
+  g.drawString(timeToString(current_from), 44, 62+26);
+  g.drawString(timeToString(current_mid), 88, 62+26);
+  g.drawString(timeToString(current_to), 132, 62+26);
+
+  if (current_value >= current_from) { g.drawRect(44-1,62+26+9,44+1,62+26+9+1); }
+  if (current_value >= current_mid) { g.drawRect(88-1,62+26+9,88+1,62+26+9+1); }
+  if (current_value >= current_to) { g.drawRect(132-1,62+26+9,132+1,62+26+9+1); }
+
+  if (showInstructions) {
+    g.setFont("6x8").drawString("Tapping timer locks buttons", 88, 100+5);
+    g.setFont("6x8").drawString("<= Swipe to change time =>", 88, 168);
+  }
+
+  g.setColor(islocked ? "#444" : "#000");
+  g.setFont("Michroma16");
+  g.drawString(timeToString(newtimer_left_from), 44, 138-9);
+  g.drawString(timeToString(newtimer_left_to), 44, 138+9);
+  g.drawString(timeToString(newtimer_right_from), 132, 138-9);
+  g.drawString(timeToString(newtimer_right_to), 132, 138+9);
+
+  g.drawRect(0+8,138-24, 88-9+1, 138+22+1);
+  g.drawRect(0+8,138-24, 88-9, 138+22);
+  g.drawRect(88+8,138-24, 176-10+1, 138+22+1);
+  g.drawRect(88+8,138-24, 176-10, 138+22);
+}
+
+require("FontHaxorNarrow7x17").add(Graphics);
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+draw();
--- a/apps/a_speech_timer/app.png
+++ b/apps/a_speech_timer/app.png
--- a/apps/a_speech_timer/metadata.json
+++ b/apps/a_speech_timer/metadata.json
@ -0,0 +1,16 @@
+{
+"id":"a_speech_timer",
+"name":"Speech Timer",
+"icon": "app.png",
+"version":"1.01",
+"description": "A timer designed to help keeping your speeches and presentations to time.",
+"tags": "tool,timer",
+"readme":"README.md",
+"supports":["BANGLEJS2"],
+"screenshots": [{"url":"screenshot1.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"}],
+"allow_emulator": true,
+"storage": [
+  {"name":"a_speech_timer.app.js","url":"app.js"},
+  {"name":"a_speech_timer.img","url":"app-icon.js","evaluate":true}
+]
+}
--- a/apps/a_speech_timer/screenshot0.png
+++ b/apps/a_speech_timer/screenshot0.png
--- a/apps/a_speech_timer/screenshot1.png
+++ b/apps/a_speech_timer/screenshot1.png
--- a/apps/a_speech_timer/screenshot2.png
+++ b/apps/a_speech_timer/screenshot2.png
--- a/apps/a_speech_timer/screenshot3.png
+++ b/apps/a_speech_timer/screenshot3.png
--- a/apps/about/ChangeLog
+++ b/apps/about/ChangeLog
@ -9,3 +9,4 @@
 0.09: Actual Bangle.js 1 pixels as of 13 Oct 2021
 0.10: Added separate Bangle.js 2 file with Bangle.js 2 kickstarter pixels (as of 28 Oct 2021)
 0.11: Bangle.js2: New pixels, btn1 to exit
+0.12: Actual pixels as of 29th Nov 2021
--- a/apps/about/app-bangle2.js
+++ b/apps/about/app-bangle2.js
--- a/apps/about/metadata.json
+++ b/apps/about/metadata.json
@ -0,0 +1,17 @@
+{
+  "id": "about",
+  "name": "About",
+  "version": "0.12",
+  "description": "Bangle.js About page - showing software version, stats, and a collaborative mural from the Bangle.js KickStarter backers",
+  "icon": "app.png",
+  "tags": "tool,system",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "screenshots": [{"url":"bangle1-about-screenshot.png"}],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"about.app.js","url":"app-bangle1.js","supports": ["BANGLEJS"]},
+    {"name":"about.app.js","url":"app-bangle2.js","supports": ["BANGLEJS2"]},
+    {"name":"about.img","url":"app-icon.js","evaluate":true}
+  ],
+  "sortorder": -4
+}
--- a/apps/ac_ac/Customizer.html
+++ b/apps/ac_ac/Customizer.html
@ -0,0 +1,890 @@
+<!DOCTYPE html>
+<html lang="en" style="width:100%; height:100%">
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+  <meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
+
+  <meta name="apple-mobile-web-app-capable"          content="yes"/>
+  <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
+  <meta name="format-detection"                      content="telephone=no">
+
+  <style type="text/css">
+    html {
+      text-size-adjust: 100%;
+      -moz-text-size-adjust: 100%;
+      -webkit-text-size-adjust: 100%;
+      -o-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+  </style>
+
+  <meta http-equiv="Content-Security-Policy"   content="
+    default-src 'self' 'unsafe-inline' 'unsafe-eval' file: https:;
+  ">
+  <meta http-equiv="X-Content-Security-Policy" content="
+    default-src 'self' 'unsafe-inline' 'unsafe-eval' file: https:;
+  ">
+
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+
+  <link rel="stylesheet" href="../../css/spectre.min.css">
+  <script src="../../core/lib/customize.js"></script>
+
+  <style>
+    body { background:white; color:black }
+
+    table.centered td {
+      text-align:center; vertical-align:top;
+    }
+
+    label.Preview {
+      display:inline-block; position:relative;
+    }
+    label.Preview > input[type="radio"] {
+      display:none; position:relative;
+      -webkit-appearance:none; -moz-appearance:none; appearance:none;
+      width:0px; height:0px;
+    }
+    label.Preview > input[type="radio"] + img {
+      display:inline-block; position:relative;
+      width:88px; height:88px;
+      margin:0px; padding:0px;
+      border:solid 3px white;
+      box-shadow:0px 0px 1px 1px lightgray;
+    }
+    label.Preview > input[type="radio"]:checked + img {
+      border:solid 3px red;
+    }
+
+
+    .ColorPatch {
+      display:inline-block; position:relative;
+      -webkit-appearance:none; -moz-appearance:none; appearance:none;
+      width:30px; height:30px; box-sizing:border-box;
+      border:solid 3px white;
+      margin:0px; padding:0px;
+      box-shadow:inset 0px 0px 1px 1px black;
+      vertical-align:top;
+    }
+    .ColorPatch:checked {
+      border:solid 3px red;
+    }
+
+
+    label.ColorPatch {
+      display:inline-block; position:relative;
+      width:70px;
+      border:none;
+      box-shadow:none;
+    }
+    label.ColorPatch > input[type="radio"] {
+      display:none; position:relative;
+      -webkit-appearance:none; -moz-appearance:none; appearance:none;
+      width:0px; height:0px;
+    }
+    label.ColorPatch > input[type="radio"] + span {
+      display:inline-block; position:absolute;
+      left:0px; top:0px; right:0px; bottom:0px;
+      margin:0px; padding:0px;
+      border:solid 3px white;
+      box-shadow:inset 0px 0px 1px 1px black;
+      font-size:16px; line-height:24px;
+      text-align:center;
+    }
+    label.ColorPatch > input[type="radio"]:checked + span {
+      border:solid 3px red;
+    }
+  </style>
+
+
+  <script>
+  $(function () {
+    let ClockSize, ClockSizeURL
+    let ClockFace, ClockFaceURL, ClockFaceNumerals, ClockFaceDots
+    let ClockHands, ClockHandsURL, SecondHand, FillColor
+    let ComplicationTL, ComplicationTLURL
+    let ComplicationT, ComplicationTURL
+    let ComplicationTR, ComplicationTRURL
+    let ComplicationL, ComplicationLURL
+    let ComplicationR, ComplicationRURL
+    let ComplicationBL, ComplicationBLURL
+    let ComplicationB, ComplicationBURL
+    let ComplicationBR, ComplicationBRURL
+    let Foreground, Background
+
+  /**** backupConfiguration ****/
+
+    function backupConfiguration () {
+      let Configuration = {
+        ClockSize, ClockSizeURL,
+        ClockFace, ClockFaceURL, ClockFaceNumerals, ClockFaceDots,
+        ClockHands, ClockHandsURL, SecondHand, FillColor,
+        ComplicationTL, ComplicationTLURL,
+        ComplicationT, ComplicationTURL,
+        ComplicationTR, ComplicationTRURL,
+        ComplicationL, ComplicationLURL,
+        ComplicationR, ComplicationRURL,
+        ComplicationBL, ComplicationBLURL,
+        ComplicationB, ComplicationBURL,
+        ComplicationBR, ComplicationBRURL,
+        Foreground, Background
+      }
+
+      try {
+        localStorage.setItem('ac_ac',JSON.stringify(Configuration))
+      } catch (Signal) {
+        console.error('could not backup clock configuration, reason',Signal)
+      }
+    }
+
+  /**** restoreConfiguration - warning: no input validations yet! ****/
+
+    function restoreConfiguration () {
+      let Configuration = {}
+        try {
+          Configuration = JSON.parse(localStorage.getItem('ac_ac') || '')
+        } catch (Signal) { /* nop */ }
+      for (let Key in Configuration) {
+        if (Configuration.hasOwnProperty(Key)) {
+          if ((Key == null) || (typeof Configuration[Key] !== 'string')) {
+            Configuration[Key] = ''
+          } else {
+            Configuration[Key] = Configuration[Key].trim()
+          }
+        }
+      }
+
+      $('input[name="clock-size"][value="' + Configuration.ClockSize + '"]').attr('checked','checked')
+      $('#clock-size-custom-url').val(Configuration.ClockSizeURL)
+
+      $('input[name="clock-face"][value="'          + Configuration.ClockFace         + '"]').attr('checked','checked')
+      $('input[name="clock-face-numerals"][value="' + Configuration.ClockFaceNumerals + '"]').attr('checked','checked')
+      $('input[name="clock-face-dots"][value="'     + Configuration.ClockFaceDots     + '"]').attr('checked','checked')
+      $('#clock-face-custom-url').val(Configuration.ClockFaceURL)
+
+      $('input[name="clock-hands"][value="' + Configuration.ClockHands + '"]').attr('checked','checked')
+      $('input[name="fill-color"][value="'  + Configuration.FillColor  + '"]').attr('checked','checked')
+      $('input[name="second-hand"][value="' + Configuration.SecondHand + '"]').attr('checked','checked')
+      $('#clock-hands-custom-url').val(Configuration.ClockHandsURL)
+
+      $('#complication-tl').val(Configuration.ComplicationTL)
+      $('#complication-tl-custom-url').val(Configuration.ComplicationTLURL)
+
+      $('#complication-t').val(Configuration.ComplicationT)
+      $('#complication-t-custom-url').val(Configuration.ComplicationTURL)
+
+      $('#complication-tr').val(Configuration.ComplicationTR)
+      $('#complication-tr-custom-url').val(Configuration.ComplicationTRURL)
+
+      $('#complication-l').val(Configuration.ComplicationL)
+      $('#complication-l-custom-url').val(Configuration.ComplicationLURL)
+
+      $('#complication-r').val(Configuration.ComplicationR)
+      $('#complication-r-custom-url').val(Configuration.ComplicationRURL)
+
+      $('#complication-bl').val(Configuration.ComplicationBL)
+      $('#complication-bl-custom-url').val(Configuration.ComplicationBLURL)
+
+      $('#complication-b').val(Configuration.ComplicationB)
+      $('#complication-b-custom-url').val(Configuration.ComplicationBURL)
+
+      $('#complication-br').val(Configuration.ComplicationBR)
+      $('#complication-br-custom-url').val(Configuration.ComplicationBRURL)
+
+      $('input[name="foreground"][value="' + Configuration.Foreground + '"]').attr('checked','checked')
+      $('input[name="background"][value="' + Configuration.Background + '"]').attr('checked','checked')
+    }
+    restoreConfiguration();
+
+  /**** retrieveInputs ****/
+
+    function retrieveInputs () {
+      ClockSize    = $('input[name="clock-size"]:checked').val()
+      ClockSizeURL = ($('#clock-size-custom-url').val() || '').trim()
+
+      ClockFace         = $('input[name="clock-face"]:checked').val()
+      ClockFaceNumerals = $('input[name="clock-face-numerals"]:checked').val()
+      ClockFaceDots     = $('input[name="clock-face-dots"]:checked').val()
+      ClockFaceURL      = ($('#clock-face-custom-url').val() || '').trim()
+
+      ClockHands    = $('input[name="clock-hands"]:checked').val()
+      FillColor     = $('input[name="fill-color"]:checked').val()
+      SecondHand    = $('input[name="second-hand"]:checked').val()
+      ClockHandsURL = ($('#clock-hands-custom-url').val() || '').trim()
+
+      ComplicationTL    = $('#complication-tl').val()
+      ComplicationTLURL = ($('#complication-tl-custom-url').val() || '').trim()
+
+      ComplicationT    = $('#complication-t').val()
+      ComplicationTURL = ($('#complication-t-custom-url').val() || '').trim()
+
+      ComplicationTR    = $('#complication-tr').val()
+      ComplicationTRURL = ($('#complication-tr-custom-url').val() || '').trim()
+
+      ComplicationL    = $('#complication-l').val()
+      ComplicationLURL = ($('#complication-l-custom-url').val() || '').trim()
+
+      ComplicationR    = $('#complication-r').val()
+      ComplicationRURL = ($('#complication-r-custom-url').val() || '').trim()
+
+      ComplicationBL    = $('#complication-bl').val()
+      ComplicationBLURL = ($('#complication-bl-custom-url').val() || '').trim()
+
+      ComplicationB    = $('#complication-b').val()
+      ComplicationBURL = ($('#complication-b-custom-url').val() || '').trim()
+
+      ComplicationBR    = $('#complication-br').val()
+      ComplicationBRURL = ($('#complication-br-custom-url').val() || '').trim()
+
+      Foreground = $('input[name="foreground"]:checked').val()
+      Background = $('input[name="background"]:checked').val()
+    }
+    retrieveInputs()
+
+  /**** validateInputs ****/
+
+    function validateInputs () {
+      function withError (Message) {
+        showMessage(Message)
+        $('#UploadButton').attr('disabled',true)
+      }
+
+      switch (true) {
+        case (ClockSize === 'custom') && (ClockSizeURL === ''):
+          return withError('please enter the URL of your custom "Clock Size Calculator"')
+
+        case (ClockFace === 'custom') && (ClockFaceURL === ''):
+          return withError('please enter the URL of your custom clock face')
+
+        case (ClockHands === 'custom') && (ClockHandsURL === ''):
+          return withError('please enter the URL of your custom clock hands')
+
+        case (ComplicationTL === 'custom') && (ComplicationTLURL === ''):
+          return withError('please enter the URL of your custom complication in the top-left corner')
+        case (ComplicationT === 'custom') && (ComplicationTURL === ''):
+          return withError('please enter the URL of your custom complication at the top edge')
+        case (ComplicationTR === 'custom') && (ComplicationTRURL === ''):
+          return withError('please enter the URL of your custom complication in the top-right corner')
+        case (ComplicationL === 'custom') && (ComplicationLURL === ''):
+          return withError('please enter the URL of your custom complication at the left edge')
+        case (ComplicationR === 'custom') && (ComplicationRURL === ''):
+          return withError('please enter the URL of your custom complication at the right edge')
+        case (ComplicationBL === 'custom') && (ComplicationBLURL === ''):
+          return withError('please enter the URL of your custom complication in the bottom-left corner')
+        case (ComplicationB === 'custom') && (ComplicationBURL === ''):
+          return withError('please enter the URL of your custom complication at the bottom edge')
+        case (ComplicationBR === 'custom') && (ComplicationBRURL === ''):
+          return withError('please enter the URL of your custom complication in the bottom-right corner')
+      }
+
+      hideMessage()
+      $('#UploadButton').removeAttr('disabled')
+    }
+
+  /**** hide/showMesssage ****/
+
+    function hideMessage () { $('#MessageView').hide() }
+
+    function showMessage (Message) {
+      $('#MessageView').text(Message).show()
+    }
+
+  /**** createAndUploadApp ****/
+
+    function createAndUploadApp () {
+      function WidgetsOnBackground () {
+        return (
+          ClockSize === 'smart'
+          ? "require('https://raw.githubusercontent.com/rozek/banglejs-2-widgets-on-background/main/drawWidgets.js');"
+          : ''
+        )
+      }
+
+      function chosenClockSize () {
+        switch (ClockSize) {
+          case 'simple': return "require('https://raw.githubusercontent.com/rozek/banglejs-2-simple-clock-size/main/ClockSize.js')"
+          case 'smart':  return "require('https://raw.githubusercontent.com/rozek/banglejs-2-smart-clock-size/main/ClockSize.js')"
+          case 'custom': return "require('" + ClockSizeURL + "')"
+        }
+      }
+
+      function chosenClockFace () {
+        switch (ClockFace) {
+          case 'none':            return "undefined"
+          case 'four-numbered':   return "require('https://raw.githubusercontent.com/rozek/banglejs-2-four-numbered-clock-face/main/ClockFace.js')"
+          case 'twelve-numbered': return "require('https://raw.githubusercontent.com/rozek/banglejs-2-twelve-numbered-clock-face/main/ClockFace.js')"
+          case 'rainbow':         return "require('https://raw.githubusercontent.com/rozek/banglejs-2-rainbow-clock-face/main/ClockFace.js')"
+          case 'custom':          return "require('" + ClockFaceURL + "')"
+        }
+      }
+
+      function chosenClockHands () {
+        switch (ClockHands) {
+          case 'simple':  return "require('https://raw.githubusercontent.com/rozek/banglejs-2-simpled-clock-hands/main/ClockHands.js')"
+          case 'rounded': return "require('https://raw.githubusercontent.com/rozek/banglejs-2-rounded-clock-hands/main/ClockHands.js')"
+          case 'hollow':  return "require('https://raw.githubusercontent.com/rozek/banglejs-2-hollow-clock-hands/main/ClockHands.js')"
+          case 'custom':  return "require('" + ClockHandsURL + "')"
+        }
+      }
+
+      function chosenComplication (Complication, customURL) {
+        switch (Complication) {
+          case 'none':          return "undefined"
+          case 'date':          return "require('https://raw.githubusercontent.com/rozek/banglejs-2-date-complication/main/Complication.js')"
+          case 'weekday':       return "require('https://raw.githubusercontent.com/rozek/banglejs-2-weekday-complication/main/Complication.js')"
+          case 'calendar-week': return "require('https://raw.githubusercontent.com/rozek/banglejs-2-calendar-week-complication/main/Complication.js')"
+          case 'moon-phase':    return "require('https://raw.githubusercontent.com/rozek/banglejs-2-moon-phase-complication/main/Complication.js')"
+          case 'custom':        return "require('" + customURL + "')"
+        }
+      }
+      function chosenComplicationAt (Position) {
+        switch (Position) {
+          case 'tl': return chosenComplication(ComplicationTL, ComplicationTLURL)
+          case 't':  return chosenComplication(ComplicationT,  ComplicationTURL)
+          case 'tr': return chosenComplication(ComplicationTR, ComplicationTRURL)
+          case 'l':  return chosenComplication(ComplicationL,  ComplicationLURL)
+          case 'r':  return chosenComplication(ComplicationR,  ComplicationRURL)
+          case 'bl': return chosenComplication(ComplicationBL, ComplicationBLURL)
+          case 'b':  return chosenComplication(ComplicationB,  ComplicationBURL)
+          case 'br': return chosenComplication(ComplicationBR, ComplicationBRURL)
+        }
+      }
+
+      function chosenColor (ColorChoice) {
+        return (ColorChoice === 'none' ? 'undefined' : "'" + ColorChoice + "'")
+      }
+
+      function chosenForeground () { return chosenColor(Foreground) }
+      function chosenBackground () { return chosenColor(Background) }
+      function chosenSecondHand () { return chosenColor(SecondHand) }
+      function chosenFillColor ()  { return chosenColor(FillColor) }
+
+      function chosenNumerals () { return (ClockFaceNumerals === 'roman' ? 'true' : 'false') }
+      function chosenDots ()     { return (ClockFaceDots === 'with-dots' ? 'true' : 'false') }
+
+      let AppSource = `
+${WidgetsOnBackground()}
+
+let Clockwork = require('https://raw.githubusercontent.com/rozek/banglejs-2-simple-clockwork/main/Clockwork.js');
+
+Clockwork.windUp({
+  size:      ${chosenClockSize()},
+  background:null,
+  face:      ${chosenClockFace()},
+  hands:     ${chosenClockHands()},
+  complications:{
+    tl:${chosenComplicationAt('tl')},
+    t: ${chosenComplicationAt('t')},
+    tr:${chosenComplicationAt('tr')},
+    l: ${chosenComplicationAt('l')},
+    r: ${chosenComplicationAt('r')},
+    bl:${chosenComplicationAt('bl')},
+    b: ${chosenComplicationAt('b')},
+    br:${chosenComplicationAt('br')},
+  }
+},{
+  Foreground:   ${chosenForeground()},
+  Background:   ${chosenBackground()},
+  Seconds:      ${chosenSecondHand()},
+  withDots:     ${chosenDots()},
+  romanNumerals:${chosenNumerals()},
+  FillColor:    ${chosenFillColor()}
+});
+`
+console.log('the configured AC-AC app looks as follows:')
+console.log(AppSource)
+
+      backupConfiguration()
+
+      sendCustomizedApp({
+        storage:[
+          {name:'ac_ac.app.js', url:'app.js', content:AppSource},
+        ]
+      })
+    }
+
+  /**** register event handlers ****/
+
+    function retrieveAndValidateInputs () {
+      retrieveInputs ()
+      validateInputs ()
+    }
+
+    $('input[type="radio"]').on('change',retrieveAndValidateInputs)
+    $('input[type="url"]').  on('input', retrieveAndValidateInputs)
+    $('select').             on('change',retrieveAndValidateInputs)
+    $('#UploadButton').on('click',createAndUploadApp)
+  })
+  </script>
+
+
+
+ </head>
+ <body>
+
+<p>
+  Please customize your analog clock for the Bangle.js 2 according to your needs.
+  When finished, click on "Upload" at the bottom of this form.
+</p><p>
+  (Pressing "Upload" will also backup your current configuration so that you
+  won't have to enter the same settings over and over again when you come back
+  to this page later)
+</p>
+
+  <h3>Clock Size Calculation</h3>
+
+<p>
+  Click on the desired clock size calculator (if you installed some widgets
+  on your Bangle.js 2, the smart one may produce larger clock faces than the
+  simple one):
+</p><p>
+  <table class="centered"><tbody>
+   <tr>
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-size" value="simple">
+         <img src="simpleClockSize.png"/>
+       </label><br>
+       simple
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-size" value="smart" checked>
+         <img src="smartClockSize.png"/>
+       </label><br>
+       smart
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-size" value="custom">
+         <img src="custom.png"/>
+       </label><br>
+       (custom)
+     </td>
+   </tr>
+  </tbody></table>
+</p><p>
+  If you prefer a "custom" clock size calculator, please enter the URL
+  of its JavaScript module below:
+</p><p>
+  custom URL: <input type="url" id="clock-size-custom-url" size="50">
+</p>
+
+  <h3>Clock Face</h3>
+
+<p>
+  Click on the desired clock face:
+</p><p>
+  <table class="centered"><tbody>
+   <tr>
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-face" value="none" checked>
+         <img src="none.png"/>
+       </label><br>
+       (none)
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-face" value="four-numbered">
+         <img src="fournumberedClockFace.png"/>
+       </label><br>
+       four-numbered
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-face" value="twelve-numbered">
+         <img src="twelvenumberedClockFace.png"/>
+       </label><br>
+       twelve-numbered
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-face" value="rainbow">
+         <img src="RainbowClockFace.png"/>
+       </label><br>
+       "rainbow"<br>colored
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-face" value="custom">
+         <img src="custom.png"/>
+       </label><br>
+       (custom)
+     </td>
+   </tr>
+  </tbody></table>
+</p><p>
+  If you prefer a "custom" clock face, please enter the URL
+  of its JavaScript module below:
+</p><p>
+  custom URL: <input type="url" id="clock-face-custom-url" size="50">
+</p><p>
+  Clock faces are drawn in the configured foreground and background colors
+  (you may select them at the end of this form)
+</p><p>
+  "Four-numbered" clock faces may draw indian-arabic or roman numerals. Which do you prefer?
+</p><p>
+  <input type="radio" name="clock-face-numerals" value="indian" checked> indian-arabic (3, 6, 9, 12)<br>
+  <input type="radio" name="clock-face-numerals" value="roman"> roman (III, VI, IX, XII)
+</p><p>
+  The "twelve-numbered" and "rainbow"-colored faces may be drawn with or without
+  dots marking the position of every minute. Which variant do you prefer?
+</p><p>
+  <input type="radio" name="clock-face-dots" value="without-dots" checked> without dots <br>
+  <input type="radio" name="clock-face-dots" value="with-dots"> with dots
+</p>
+
+  <h3>Clock Hands</h3>
+
+<p>
+  Click on the desired clock hands:
+</p><p>
+  <table class="centered"><tbody>
+   <tr>
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-hands" value="simple">
+         <img src="simpleClockHands.png"/>
+       </label><br>
+       simple
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-hands" value="rounded" checked>
+         <img src="roundedClockHands.png"/>
+       </label><br>
+       rounded
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-hands" value="hollow">
+         <img src="hollowClockHands.png"/>
+       </label><br>
+       hollow
+     </td>
+
+     <td>
+       <label class="Preview">
+         <input type="radio" name="clock-hands" value="custom">
+         <img src="custom.png"/>
+       </label><br>
+       (custom)
+     </td>
+   </tr>
+  </tbody></table>
+</p><p>
+  If you prefer "custom" clock hands, please enter the URL
+  of their JavaScript module below:
+</p><p>
+  custom URL: <input type="url" id="clock-hands-custom-url" size="50">
+</p><p>
+  Clock hands are drawn in the configured foreground and background colors
+  (you may select them at the end of this form)
+</p><p>
+  Hollow clock hands may optionally be filled with a given color. If you have
+  chosen hollow hands, please specify the desired fill mode and color below:
+</p><p>
+  <b>Hollow Hand Fill Color:</b>
+</p><p>
+  <label class="ColorPatch">
+    <input type="radio" name="fill-color" value="none" checked/>
+    <span>none</span>
+  </label>
+  <label class="ColorPatch">
+    <input type="radio" name="fill-color" value="Theme"/>
+    <span>themed</span>
+  </label>
+  <input type="radio" name="fill-color" value="#000000" class="ColorPatch" style="background:#000000"/>
+  <input type="radio" name="fill-color" value="#FF0000" class="ColorPatch" style="background:#FF0000"/>
+  <input type="radio" name="fill-color" value="#00FF00" class="ColorPatch" style="background:#00FF00"/>
+  <input type="radio" name="fill-color" value="#0000FF" class="ColorPatch" style="background:#0000FF"/>
+  <input type="radio" name="fill-color" value="#FFFF00" class="ColorPatch" style="background:#FFFF00"/>
+  <input type="radio" name="fill-color" value="#FF00FF" class="ColorPatch" style="background:#FF00FF"/>
+  <input type="radio" name="fill-color" value="#00FFFF" class="ColorPatch" style="background:#00FFFF"/>
+  <input type="radio" name="fill-color" value="#FFFFFF" class="ColorPatch" style="background:#FFFFFF"/>
+</p><p>
+  Additionally, all clock hands may be drawn with or without second hands.
+  If you want them to be drawn, please click on their desired color below
+  (or choose "themed" to use your Bangle's configured theme) - if not, just
+  select "none":
+</p><p>
+  <b>Second Hand Color:</b>
+</p><p>
+  <label class="ColorPatch">
+    <input type="radio" name="second-hand" value="none" checked/>
+    <span>none</span>
+  </label>
+  <label class="ColorPatch">
+    <input type="radio" name="second-hand" value="Theme"/>
+    <span>themed</span>
+  </label>
+  <input type="radio" name="second-hand" value="#000000" class="ColorPatch" style="background:#000000"/>
+  <input type="radio" name="second-hand" value="#FF0000" class="ColorPatch" style="background:#FF0000"/>
+  <input type="radio" name="second-hand" value="#00FF00" class="ColorPatch" style="background:#00FF00"/>
+  <input type="radio" name="second-hand" value="#0000FF" class="ColorPatch" style="background:#0000FF"/>
+  <input type="radio" name="second-hand" value="#FFFF00" class="ColorPatch" style="background:#FFFF00"/>
+  <input type="radio" name="second-hand" value="#FF00FF" class="ColorPatch" style="background:#FF00FF"/>
+  <input type="radio" name="second-hand" value="#00FFFF" class="ColorPatch" style="background:#00FFFF"/>
+  <input type="radio" name="second-hand" value="#FFFFFF" class="ColorPatch" style="background:#FFFFFF"/>
+</p>
+
+  <h3>Complications</h3>
+
+<p>
+  Complications are small displays for additional information. If you want
+  one or multiple complications to be added to your clock, you'll have to
+  specify which one to be loaded and where it should be placed.
+</p><p>
+  Up to 6 possible positions exist (top-left, top-right, left, right,
+  bottom-left and bottom-right). Alternatively, the positions "top-left" and
+  "top-right" may be traded for a slightly larger complication at position
+  "top" or "bottom-left" and "bottom-right" for one at the "bottom":
+</p>
+  <img src="smallPlaceholders.png" width="88" height="88"/>
+  <img src="largePlaceholders.png" width="88" height="88"/>
+<p>
+  <table><tbody>
+    <tr>
+      <td colspan="3"><b>top-left:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-tl">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-tl-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>top:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-t">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-t-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>top-right:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-tr">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-tr-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>left:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-l">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-l-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>right:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-r">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-r-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>bottom-left:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-bl">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-bl-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>bottom:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-b">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-b-custom-url" size="50"></td>
+    </tr>
+
+    <tr>
+      <td colspan="3"><b>bottom-right:</b></td>
+    </tr><tr>
+      <td> &nbsp; </td>
+      <td> Complication:</td>
+      <td>
+        <select id="complication-br">
+          <option value="none" selected>(none)</option>
+          <option value="date">         date</option>
+          <option value="weekday">      weekday</option>
+          <option value="calendar-week">calendar week</option>
+          <option value="moon-phase">   moon phase</option>
+          <option value="custom">       (custom)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>custom URL:</td>
+      <td><input type="url" id="complication-br-custom-url" size="50"></td>
+    </tr>
+  </tbody></table>
+</p>
+
+  <h3>Settings</h3>
+
+<p>
+  Color faces, hands and complications are often drawn using configurable
+  foreground and background colors.
+</p><p>
+  Here you may specify these colors. Click on a color to select it - or on
+  "themed" if you want the clock to use the currently configured theme on
+  your Bangle.js 2:
+</p><p>
+  <b>Background Color:</b>
+</p><p>
+  <label class="ColorPatch">
+    <input type="radio" name="background" value="Theme" checked/>
+    <span>themed</span>
+  </label>
+  <input type="radio" name="background" value="#000000" class="ColorPatch" style="background:#000000"/>
+  <input type="radio" name="background" value="#FF0000" class="ColorPatch" style="background:#FF0000"/>
+  <input type="radio" name="background" value="#00FF00" class="ColorPatch" style="background:#00FF00"/>
+  <input type="radio" name="background" value="#0000FF" class="ColorPatch" style="background:#0000FF"/>
+  <input type="radio" name="background" value="#FFFF00" class="ColorPatch" style="background:#FFFF00"/>
+  <input type="radio" name="background" value="#FF00FF" class="ColorPatch" style="background:#FF00FF"/>
+  <input type="radio" name="background" value="#00FFFF" class="ColorPatch" style="background:#00FFFF"/>
+  <input type="radio" name="background" value="#FFFFFF" class="ColorPatch" style="background:#FFFFFF"/>
+</p><p>
+  <b>Foreground Color:</b>
+</p><p>
+  <label class="ColorPatch">
+    <input type="radio" name="foreground" value="Theme" checked/>
+    <span>themed</span>
+  </label>
+  <input type="radio" name="foreground" value="#000000" class="ColorPatch" style="background:#000000"/>
+  <input type="radio" name="foreground" value="#FF0000" class="ColorPatch" style="background:#FF0000"/>
+  <input type="radio" name="foreground" value="#00FF00" class="ColorPatch" style="background:#00FF00"/>
+  <input type="radio" name="foreground" value="#0000FF" class="ColorPatch" style="background:#0000FF"/>
+  <input type="radio" name="foreground" value="#FFFF00" class="ColorPatch" style="background:#FFFF00"/>
+  <input type="radio" name="foreground" value="#FF00FF" class="ColorPatch" style="background:#FF00FF"/>
+  <input type="radio" name="foreground" value="#00FFFF" class="ColorPatch" style="background:#00FFFF"/>
+  <input type="radio" name="foreground" value="#FFFFFF" class="ColorPatch" style="background:#FFFFFF"/>
+</p><p>
+  When you are satisfied with your configuration, just click on "Upload" in
+  order to generate the specified clock and upload it to your Bangle.js 2:
+</p>
+  <p id="MessageView" style="display:none; color:red"></p>
+
+  <button id="UploadButton">Upload</button>
+</p><p>
+  This application is based on the author's
+  <a href="https://github.com/rozek/banglejs-2-analog-clock-construction-kit">Analog Clock Construction Kit (ACCK)</a>.
+  If you need a different "clockwork", clock size calculation or clock face,
+  or specific clock hands or complications, just follow the link to learn how to
+  implement your own clock parts.
+</p>
+ </body>
+</html>
+
--- a/apps/ac_ac/README.md
+++ b/apps/ac_ac/README.md
@ -0,0 +1,34 @@
+# AC-AC - A Configurable Analog Clock #
+
+This app implements an analog clock with various faces, hands and complications
+to choose from before uploading to a Bangle.js 2.
+
+It is based on the [Analog Clock Construction Kit (ACCK)](https://github.com/rozek/banglejs-2-analog-clock-construction-kit)
+and makes most of the currently implemented parts available with a few mouse
+clicks - just click on "Upload" and you will be directed to a web form where
+you compose your very own, personal analog clock.
+
+You currently have the choice between
+
+* 2 different clock sizes,
+* 4 different clock faces,
+* 3 different clock hands and
+* 4 different complications
+
+Alternatively, you may specify the GitHub URL of ACCK compatible modules for
+external clock sizes, faces, hands or complications.
+
+Additionally, you may use the currently configured global theme or configure
+your own colors for clock fore- and background and second hands.
+
+Consequently, even without external modules you already have the choice between
+102144 combinations!
+
+<!--
+  1 + (8 Fg colors * 7 Bg colors) * 2 sizes * 4(7) faces * 3(4) hands *
+  8 positions * 4 complications (w/o placeholder)
+-->
+
+## License ##
+
+[MIT License](LICENSE)
--- a/apps/ac_ac/RainbowClockFace.png
+++ b/apps/ac_ac/RainbowClockFace.png
--- a/apps/ac_ac/app-icon.js
+++ b/apps/ac_ac/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgn/ABH+AQPvBpIAI/n8/3f5/PCp/v9oHF7w1CABffGxAYMH4f9z/514YDCxW/O4gFBxwHD/ZEL7/9GgX8GwQLCBQQXH/uP/Hf/2N44IBAgIXJ7oaD/3v/3uAYIIB9wQGAA2+/iRG5oSIM4f+1nrPYgAB3aHIAC77QYYRoCAAP676ICABXYFIntDoPf3+PC5f+BoPOX4vPNBn7IogEB/eu3QXC9wNEAAeKBIP+dgbSCDYMwgEApQVEygPCeRH8iAWBAAMHPwXDgoRGAonACwYABgN5uMAC4q8GC4U0DQsAggRF9gXFgggB/2hC4kdVAQCBVAX7xwXCVAnGCwUadAeeDYfr7IhEAAf93e+A4gpB9yRB/mqcgndRgQAHzqRE1gEC/KoCjLZEsgCB9evO4gOC/RyEgqdC2KnFO4S/KgFYsC/Ga5EBs1AX5bXHgx1C2YXEnp7GCARgB4AfE64WCnawFCgf9VAK/G/3M7zWDz4PF/maXJIAD7D8EVAP85QXN3OP/42DfoQXN/wvE/ySGABa8FAC37AgepVwQ9E1SfBAAJIEAAnrBQ39xgwJ7pRHFQX+3QECCAbyG9bPDzwXC9QMBdgQXIAAf41wEC5pLCJJBcF9fZQ5IAGYYn81q7RJQwWC/wXM9/tA4veCxooDIAPv55PEABwpB97rDAAw"))
--- a/apps/ac_ac/app-icon.png
+++ b/apps/ac_ac/app-icon.png
--- a/apps/ac_ac/app-screenshot.png
+++ b/apps/ac_ac/app-screenshot.png
--- a/apps/ac_ac/app.js
+++ b/apps/ac_ac/app.js
@ -0,0 +1,2 @@
+let Clockwork = require('https://raw.githubusercontent.com/rozek/banglejs-2-simple-clockwork/main/Clockwork.js');
+Clockwork.windUp();
--- a/apps/ac_ac/custom.png
+++ b/apps/ac_ac/custom.png
--- a/apps/ac_ac/fournumberedClockFace.png
+++ b/apps/ac_ac/fournumberedClockFace.png
--- a/apps/ac_ac/hollowClockHands.png
+++ b/apps/ac_ac/hollowClockHands.png
--- a/apps/ac_ac/largePlaceholders.png
+++ b/apps/ac_ac/largePlaceholders.png
--- a/apps/ac_ac/metadata.json
+++ b/apps/ac_ac/metadata.json
@ -0,0 +1,18 @@
+{ "id": "ac_ac",
+  "name": "A Configurable Analog Clock",
+  "shortName":"Configurable Clock",
+  "version":"0.03",
+  "description": "AC-AC, a highly customizable analog clock with several clock faces, hands and complications to choose from",
+  "icon": "app-icon.png",
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS2"],
+  "allow_emulator": false,
+  "screenshots": [{"url":"app-screenshot.png"}],
+  "readme": "README.md",
+  "custom": "Customizer.html",
+  "storage": [
+    {"name":"ac_ac.app.js","url":"app.js"},
+    {"name":"ac_ac.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/ac_ac/none.png
+++ b/apps/ac_ac/none.png
--- a/apps/ac_ac/roundedClockHands.png
+++ b/apps/ac_ac/roundedClockHands.png
--- a/apps/ac_ac/simpleClockHands.png
+++ b/apps/ac_ac/simpleClockHands.png
--- a/apps/ac_ac/simpleClockSize.png
+++ b/apps/ac_ac/simpleClockSize.png
--- a/apps/ac_ac/smallPlaceholders.png
+++ b/apps/ac_ac/smallPlaceholders.png
--- a/apps/ac_ac/smartClockSize.png
+++ b/apps/ac_ac/smartClockSize.png
--- a/apps/ac_ac/twelvenumberedClockFace.png
+++ b/apps/ac_ac/twelvenumberedClockFace.png
--- a/apps/accelgraph/ChangeLog
+++ b/apps/accelgraph/ChangeLog
@ -0,0 +1 @@
+0.01: New App!
--- a/apps/accelgraph/app-icon.js
+++ b/apps/accelgraph/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4UA/4AB304ief85L/ABNVAAwKCgILHoALBgoLHqALOrVVr4BEBZIFBBYiaCAAPq2oLQEYlqF5VrBZWnBZWvBZNWz4LGBoQLHJ4O///6v/1BZHa/4LFLYOlr9pR49r1ILJ09qr4ZBBY2vrWdBY5PBq2uyoLIquqBY5bBKoZTFLYILJJ4STDBY77IJ4QLUJ4QLU1QAE0oLPqoAGBZ0BBY9ABYMABY4KCAH4AGA="))
--- a/apps/accelgraph/app.js
+++ b/apps/accelgraph/app.js
@ -0,0 +1,24 @@
+Bangle.loadWidgets();
+g.clear(1);
+Bangle.drawWidgets();
+var R = Bangle.appRect;
+
+var x = 0;
+var last;
+
+function getY(v) {
+  return (R.y+R.y2 + v*R.h/2)/2;
+}
+Bangle.on('accel', a => {
+  g.reset();
+  if (last) {
+    g.setColor("#f00").drawLine(x-1,getY(last.x),x,getY(a.x));
+    g.setColor("#0f0").drawLine(x-1,getY(last.y),x,getY(a.y));
+    g.setColor("#00f").drawLine(x-1,getY(last.z),x,getY(a.z));
+  }
+  last = a;x++;
+  if (x>=g.getWidth()) {
+    x = 1;
+    g.clearRect(R);
+  }
+});
--- a/apps/accelgraph/app.png
+++ b/apps/accelgraph/app.png
--- a/apps/accelgraph/metadata.json
+++ b/apps/accelgraph/metadata.json
@ -0,0 +1,14 @@
+{ "id": "accelgraph",
+  "name": "Accelerometer Graph",
+  "shortName":"Accel Graph",
+  "version":"0.01",
+  "description": "A simple app to draw a graph of data from the accelerometer on the screen",
+  "icon": "app.png",
+  "tags": "tool,debug",
+  "supports" : ["BANGLEJS","BANGLEJS2"],
+  "screenshots": [{"url":"screenshot.png"}],
+  "storage": [
+    {"name":"accelgraph.app.js","url":"app.js"},
+    {"name":"accelgraph.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/accelgraph/screenshot.png
+++ b/apps/accelgraph/screenshot.png
--- a/apps/accellog/metadata.json
+++ b/apps/accellog/metadata.json
@ -0,0 +1,17 @@
+{
+  "id": "accellog",
+  "name": "Acceleration Logger",
+  "shortName": "Accel Log",
+  "version": "0.03",
+  "description": "Logs XYZ acceleration data to a CSV file that can be downloaded to your PC",
+  "icon": "app.png",
+  "tags": "outdoor",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "interface": "interface.html",
+  "storage": [
+    {"name":"accellog.app.js","url":"app.js"},
+    {"name":"accellog.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"wildcard":"accellog.?.csv"}]
+}
--- a/apps/accelrec/metadata.json
+++ b/apps/accelrec/metadata.json
@ -0,0 +1,17 @@
+{
+  "id": "accelrec",
+  "name": "Acceleration Recorder",
+  "shortName": "Accel Rec",
+  "version": "0.02",
+  "description": "This app puts the Bangle's accelerometer into 100Hz mode and reads 2 seconds worth of data after movement starts. The data can then be exported back to the PC.",
+  "icon": "app.png",
+  "tags": "",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "interface": "interface.html",
+  "storage": [
+    {"name":"accelrec.app.js","url":"app.js"},
+    {"name":"accelrec.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"wildcard":"accelrec.?.csv"}]
+}
--- a/apps/aclock/metadata.json
+++ b/apps/aclock/metadata.json
@ -0,0 +1,16 @@
+{
+  "id": "aclock",
+  "name": "Analog Clock",
+  "version": "0.15",
+  "description": "An Analog Clock",
+  "icon": "clock-analog.png",
+  "screenshots": [{"url":"screenshot_analog.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"aclock.app.js","url":"clock-analog.js"},
+    {"name":"aclock.img","url":"clock-analog-icon.js","evaluate":true}
+  ]
+}
--- a/apps/acmaze/ChangeLog
+++ b/apps/acmaze/ChangeLog
@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Faster maze generation
--- a/apps/acmaze/README.md
+++ b/apps/acmaze/README.md
@ -0,0 +1,17 @@
+# AccelaMaze
+
+Tilt the watch to roll a ball through a maze.
+
+![Screenshot](screenshot.png)
+
+## Usage
+
+* Use the menu to select difficulty level (or exit).
+* Wait until the maze gets generated and a red ball appears.
+* Tilt the watch to get the ball into the green cell.
+
+At any time you can click the button to return to the menu.
+
+## Creator
+
+[Nimrod Kerrett](https://zzzen.com)
--- a/apps/acmaze/app-icon.js
+++ b/apps/acmaze/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwggaXh3M53/AA3yl4IHn//+EM5nMAoIX/C4RfCC4szmcxC4QFBAAUxC4UPAwIOB+YCCiMRkAFCkIGBAAQfBC4IUEAQhHIAAQX/C5EDmcyCgUTAoYXDR4kzC4UBPoKVB+YFFAQSPBiAKBiCnDGoZECABDUCa4YX/C5qPBQwoXGkczmC/FQYSSCVQSSCEwQOCC4hKFX4QXCd5YX/C4qMEmQXITAinDPoIADTwSPFkKMBX47RGI47XIC/4XCgZ9DQYYABmKYBmIXFkczmEBRIK/CQYQIBkECSoiSCA4MQa5pEFd6IX/RgMyC6H/QASVCRIS/EAQrXFJQoX/C6kDRQIXCiYFD+QFBmIUCkYFD+CJBiSPCRwIFFSoQFCiF3u9wI4gAO+wXW+IXygAAW"))
--- a/apps/acmaze/app.js
+++ b/apps/acmaze/app.js
@ -0,0 +1,295 @@
+const MARGIN = 25;
+const WALL_RIGHT = 1, WALL_DOWN = 2;
+const STATUS_GENERATING = 0, STATUS_PLAYING = 1,
+      STATUS_SOLVED = 2, STATUS_ABORTED = -1;
+
+function Maze(n) {
+  this.n = n;
+  this.status = STATUS_GENERATING;
+  this.wall_length = Math.floor((g.getHeight()-2*MARGIN)/n);
+  this.total_length = this.wall_length*n;
+  this.margin = Math.floor((g.getHeight()-this.total_length)/2);
+  this.ball_x = 0;
+  this.ball_y = 0;
+  this.clearScreen = function() {
+    g.clearRect(
+      0, this.margin,
+      g.getWidth(), this.margin+this.total_length
+    );
+  };
+  this.clearScreen();
+  g.setColor(g.theme.fg);
+  for (let i=0; i<=n; i++) {
+    g.drawRect(
+      this.margin, this.margin+i*this.wall_length,
+      g.getWidth()-this.margin, this.margin+i*this.wall_length
+    );
+    g.drawRect(
+      this.margin+i*this.wall_length, this.margin,
+      this.margin+i*this.wall_length, g.getHeight() - this.margin
+    );
+  }
+  this.walls = new Uint8Array(n*n);
+  this.groups = new Uint8Array(n*n);
+  for (let cell = 0; cell<n*n; cell++) {
+    this.walls[cell] = WALL_RIGHT|WALL_DOWN;
+    this.groups[cell] = cell;
+  }
+  // Candidates of walls to break when digging the maze.
+  // If candidate failed (breaking it would create a loop),
+  // it would never succeed, so no need to retry it.
+  let candidates_down = [],
+      candidates_right = [];
+  for (let r=0 ; r<n; r++) {
+    for (let c=0; c<n; c++) {
+      let cell = n*r+c;
+      if (r<(n-1)) { // Don't break wall down for bottom row.
+        candidates_down.push(cell);
+      }
+      if (c<(n-1)) { // Don't break wall right for rightmost column.
+        candidates_right.push(cell);
+      }
+    }
+  }
+  let from_group, to_group;
+  let ngroups = n*n;
+  while (--ngroups) {
+    // Abort if BTN1 pressed [grace period for menu]
+    // (for some reason setWatch() fails inside constructor)
+    if (ngroups<n*n-16 && digitalRead(BTN1)) {
+      aborting = true;
+      return;
+    }
+    from_group = to_group = -1;
+    while (from_group<0) {
+      let trying_down = false;
+      if (Math.random()<0.5 && candidates_down.length || !candidates_right.length) {
+        trying_down = true;
+      }
+      let candidates = trying_down ? candidates_down : candidates_right;
+          candidate_index = Math.floor(Math.random()*candidates.length),
+          cell = candidates.splice(candidate_index, 1)[0],
+          r = Math.floor(cell/n),
+          c = cell%n;
+      if (trying_down) { // try to break a wall down
+        if (this.groups[cell]!=this.groups[cell+n]) {
+          this.walls[cell] &= ~WALL_DOWN;
+          g.clearRect(
+              this.margin+c*this.wall_length+1,
+              this.margin+(r+1)*this.wall_length,
+              this.margin+(c+1)*this.wall_length-1,
+              this.margin+(r+1)*this.wall_length
+          );
+          g.flip(); // show progress.
+          from_group = this.groups[cell];
+          to_group = this.groups[cell+n];
+        }
+      } else { // try to break a wall right
+        if (this.groups[cell]!=this.groups[cell+1]) {
+          this.walls[cell] &= ~WALL_RIGHT;
+          g.clearRect(
+              this.margin+(c+1)*this.wall_length,
+              this.margin+r*this.wall_length+1,
+              this.margin+(c+1)*this.wall_length,
+              this.margin+(r+1)*this.wall_length-1
+          );
+          g.flip(); // show progress.
+          from_group = this.groups[cell];
+          to_group = this.groups[cell+1];
+        }
+      }
+    }
+    for (let cell = 0; cell<n*n; cell++) {
+      if (this.groups[cell]==from_group) {
+        this.groups[cell] = to_group;
+      }
+    }
+  }
+  this.clearScreen = function() {
+    g.clearRect(
+      0, MARGIN, g.getWidth(), g.getHeight()-MARGIN-1
+    );
+  };
+  this.clearCell = function(r, c) {
+    if (!r && !c) {
+      g.setColor("#ffff00");
+    } else if (r==this.n-1 && c==this.n-1) {
+      g.setColor("#00ff00");
+    } else {
+      g.setColor(g.theme.bg);
+    }
+    g.fillRect(
+      this.margin+this.wall_length*c+1,
+      this.margin+this.wall_length*r+1,
+      this.margin+this.wall_length*(c+1),
+      this.margin+this.wall_length*(r+1)
+    );
+    g.setColor(g.theme.fg);
+    if (this.walls[r*n+c]&WALL_RIGHT) {
+      g.fillRect(
+        this.margin+this.wall_length*(c+1),
+        this.margin+this.wall_length*r,
+        this.margin+this.wall_length*(c+1),
+        this.margin+this.wall_length*(r+1)
+      );
+    }
+    if (this.walls[r*n+c]&WALL_DOWN) {
+      g.fillRect(
+        this.margin+this.wall_length*c,
+        this.margin+this.wall_length*(r+1),
+        this.margin+this.wall_length*(c+1),
+        this.margin+this.wall_length*(r+1)
+      );
+    }
+  };
+  this.drawBall = function(x, y) {
+    g.setColor("#ff0000");
+    g.fillEllipse(
+      this.margin+x+1,
+      this.margin+y+1,
+      this.margin+x+this.wall_length-1,
+      this.margin+y+this.wall_length-1
+    );
+    g.setColor(g.theme.fg);
+  };
+  this.move = function(dx, dy) {
+    let next_x = this.ball_x,
+        next_y = this.ball_y,
+        ball_r = Math.floor(this.ball_y/this.wall_length),
+        ball_c = Math.floor(this.ball_x/this.wall_length);
+    if (this.ball_x%this.wall_length) {
+      if (dx) {
+        next_x += dx;
+      } else {
+        return false;
+      }
+    } else if (this.ball_y%this.wall_length) {
+      if (dy) {
+        next_y += dy;
+      } else {
+        return false;
+      }
+    } else { // exactly in a cell. Check walls
+      if (dy<0 && ball_r>0 && !(this.walls[n*(ball_r-1)+ball_c]&WALL_DOWN)) {
+        next_y--;
+      } else if (dy>0 && ball_r<(this.n-1) && !(this.walls[n*ball_r+ball_c]&WALL_DOWN)) {
+        next_y++;
+      } else if (dx<0 && ball_c>0 && !(this.walls[n*ball_r+ball_c-1]&WALL_RIGHT)) {
+        next_x--;
+      } else if (dx>0 && ball_c<(this.n-1) && !(this.walls[n*ball_r+ball_c]&WALL_RIGHT)) {
+        next_x++;
+      } else {
+        return false;
+      }
+    }
+    this.clearCell(ball_r, ball_c);
+    if (this.ball_x%this.wall_length) {
+      this.clearCell(ball_r, ball_c+1);
+    }
+    if (this.ball_y%this.wall_length) {
+      this.clearCell(ball_r+1, ball_c);
+    }
+    this.ball_x = next_x;
+    this.ball_y = next_y;
+    this.drawBall(this.ball_x, this.ball_y);
+    if (this.ball_x==(n-1)*this.wall_length && this.ball_y==(n-1)*this.wall_length) {
+      this.status = STATUS_SOLVED;
+    }
+    return true;
+  };
+  this.try_move_horizontally = function(accel_x) {
+    if (accel_x>0.15) {
+      return this.move(-1, 0);
+    } else if (accel_x<-0.15) {
+      return this.move(1, 0);
+    }
+    return false;
+  };
+  this.try_move_vertically = function(accel_y) {
+    if (accel_y<-0.15) {
+      return this.move(0,1);
+    } else if (accel_y>0.15) {
+      return this.move(0,-1);
+    }
+    return false;
+  };
+  this.tick = function() {
+    accel = Bangle.getAccel();
+    if (this.ball_x%this.wall_length) {
+      this.try_move_horizontally(accel.x);
+    } else if (this.ball_y%this.wall_length) {
+      this.try_move_vertically(accel.y);
+    } else {
+      if (Math.abs(accel.x)>Math.abs(accel.y)) { // prefer horizontally
+        if (!this.try_move_horizontally(accel.x)) {
+          this.try_move_vertically(accel.y);
+        }
+      } else { // prefer vertically
+        if (!this.try_move_vertically(accel.y)) {
+          this.try_move_horizontally(accel.x);
+        }
+      }
+    }
+  };
+  this.clearCell(0,0);
+  this.clearCell(n-1,n-1);
+  this.drawBall(0,0);
+  this.status = STATUS_PLAYING;
+}
+
+function timeToText(t) { // Courtesy of stopwatch app
+  let hrs = Math.floor(t/3600000);
+  let mins = Math.floor(t/60000)%60;
+  let secs = Math.floor(t/1000)%60;
+  let tnth = Math.floor(t/100)%10;
+  let text;
+
+  if (hrs === 0)
+    text = ("0"+mins).substr(-2) + ":" + ("0"+secs).substr(-2) + "." + tnth;
+  else
+    text = ("0"+hrs) + ":" + ("0"+mins).substr(-2) + ":" + ("0"+secs).substr(-2);
+  return text;
+}
+
+let aborting = false;
+let start_time = 0;
+let duration = 0;
+let maze=null;
+let mazeMenu = {
+  "": { "title": "Maze size", "selected": 1 },
+  "Easy (8x8)": function() { E.showMenu(); maze = new Maze(8); },
+  "Medium (10x10)": function() { E.showMenu(); maze = new Maze(10); },
+  "Hard (14x14)": function() { E.showMenu(); maze = new Maze(14); },
+  "< Exit": function() { setTimeout(load, 100); } // timeout voodoo prevents deadlock
+};
+
+g.clear(true);
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+Bangle.setLocked(false);
+Bangle.setLCDTimeout(0);
+E.showMenu(mazeMenu);
+let maze_interval = setInterval(
+  function() {
+    if (maze) {
+      if (digitalRead(BTN1) || maze.status==STATUS_ABORTED) {
+        maze = null;
+        start_time = duration = 0;
+        aborting = false;
+        setTimeout(function() {E.showMenu(mazeMenu); }, 100);
+        return;
+      }
+      if (!start_time) {
+        start_time = Date.now();
+      }
+      if (maze.status==STATUS_PLAYING) {
+        maze.tick();
+      }
+      if (maze.status==STATUS_SOLVED && !duration) {
+        duration = Date.now()-start_time;
+        g.setFontAlign(0,0).setColor(g.theme.fg);
+        g.setFont("Vector",18);
+        g.drawString(`Solved ${maze.n}X${maze.n} in\n ${timeToText(duration)} \nClick to play again`, g.getWidth()/2, g.getHeight()/2, true);
+      }
+    }
+  }, 25);
--- a/apps/acmaze/app.png
+++ b/apps/acmaze/app.png
--- a/apps/acmaze/metadata.json
+++ b/apps/acmaze/metadata.json
@ -0,0 +1,15 @@
+{ "id": "acmaze",
+  "name": "AccelaMaze",
+  "shortName":"AccelaMaze",
+  "version":"0.02",
+  "description": "Tilt the watch to roll a ball through a maze.",
+  "icon": "app.png",
+  "tags": "game",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "screenshots": [{"url":"screenshot.png"}],
+  "storage": [
+    {"name":"acmaze.app.js","url":"app.js"},
+    {"name":"acmaze.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/acmaze/screenshot.png
+++ b/apps/acmaze/screenshot.png
--- a/apps/activepedom/metadata.json
+++ b/apps/activepedom/metadata.json
@ -0,0 +1,18 @@
+{
+  "id": "activepedom",
+  "name": "Active Pedometer",
+  "shortName": "Active Pedometer",
+  "version": "0.09",
+  "description": "Pedometer that filters out arm movement and displays a step goal progress. Steps are saved to a daily file and can be viewed as graph.",
+  "icon": "app.png",
+  "tags": "outdoors,widget",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "screenshots": [{"url":"600.png"},{"url":"10600.png"},{"url":"1600.png"}],
+  "storage": [
+    {"name":"activepedom.wid.js","url":"widget.js"},
+    {"name":"activepedom.settings.js","url":"settings.js"},
+    {"name":"activepedom.img","url":"app-icon.js","evaluate":true},
+    {"name":"activepedom.app.js","url":"app.js"}
+  ]
+}
--- a/apps/alarm/alarm.js
+++ b/apps/alarm/alarm.js
@ -21,8 +21,8 @@ function showAlarm(alarm) {
  Bangle.loadWidgets();
  Bangle.drawWidgets();
  E.showPrompt(msg,{
-    title:alarm.timer ? "TIMER!" : "ALARM!",
-    buttons : {"Sleep":true,"Ok":false} // default is sleep so it'll come back in 10 mins
+    title:alarm.timer ? /*LANG*/"TIMER!" : /*LANG*/"ALARM!",
+    buttons : {/*LANG*/"Sleep":true,/*LANG*/"Ok":false} // default is sleep so it'll come back in 10 mins
  }).then(function(sleep) {
    buzzCount = 0;
    if (sleep) {
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@ -33,16 +33,16 @@ function getCurrentHr() {
 function showMainMenu() {
  const menu = {
    '': { 'title': 'Alarm/Timer' },
-    '< Back' : ()=>{load();},
-    'New Alarm': ()=>editAlarm(-1),
-    'New Timer': ()=>editTimer(-1)
+    /*LANG*/'< Back' : ()=>{load();},
+    /*LANG*/'New Alarm': ()=>editAlarm(-1),
+    /*LANG*/'New Timer': ()=>editTimer(-1)
  };
  alarms.forEach((alarm,idx)=>{
    if (alarm.timer) {
-      txt = "TIMER "+(alarm.on?"on  ":"off ")+formatMins(alarm.timer);
+      txt = /*LANG*/"TIMER "+(alarm.on?/*LANG*/"on  ":/*LANG*/"off ")+formatMins(alarm.timer);
    } else {
-      txt = "ALARM "+(alarm.on?"on  ":"off ")+formatTime(alarm.hr);
-      if (alarm.rp) txt += " (repeat)";
+      txt = /*LANG*/"ALARM "+(alarm.on?/*LANG*/"on  ":/*LANG*/"off ")+formatTime(alarm.hr);
+      if (alarm.rp) txt += /*LANG*/" (repeat)";
    }
    menu[txt] = function() {
      if (alarm.timer) editTimer(idx);
@ -70,27 +70,27 @@ function editAlarm(alarmIndex) {
    as = a.as;
  }
  const menu = {
-    '': { 'title': 'Alarm' },
-    '< Back' : showMainMenu,
-    'Hours': {
+    '': { 'title': /*LANG*/'Alarm' },
+    /*LANG*/'< Back' : showMainMenu,
+    /*LANG*/'Hours': {
      value: hrs,
      onchange: function(v){if (v<0)v=23;if (v>23)v=0;hrs=v;this.value=v;} // no arrow fn -> preserve 'this'
    },
-    'Minutes': {
+    /*LANG*/'Minutes': {
      value: mins,
      onchange: function(v){if (v<0)v=59;if (v>59)v=0;mins=v;this.value=v;} // no arrow fn -> preserve 'this'
    },
-    'Enabled': {
+    /*LANG*/'Enabled': {
      value: en,
      format: v=>v?"On":"Off",
      onchange: v=>en=v
    },
-    'Repeat': {
+    /*LANG*/'Repeat': {
      value: en,
      format: v=>v?"Yes":"No",
      onchange: v=>repeat=v
    },
-    'Auto snooze': {
+    /*LANG*/'Auto snooze': {
      value: as,
      format: v=>v?"Yes":"No",
      onchange: v=>as=v
@ -108,14 +108,14 @@ function editAlarm(alarmIndex) {
      last : day, rp : repeat, as: as
    };
  }
-  menu["> Save"] = function() {
+  menu[/*LANG*/"> Save"] = function() {
    if (newAlarm) alarms.push(getAlarm());
    else alarms[alarmIndex] = getAlarm();
    require("Storage").write("alarm.json",JSON.stringify(alarms));
    showMainMenu();
  };
  if (!newAlarm) {
-    menu["> Delete"] = function() {
+    menu[/*LANG*/"> Delete"] = function() {
      alarms.splice(alarmIndex,1);
      require("Storage").write("alarm.json",JSON.stringify(alarms));
      showMainMenu();
@ -136,18 +136,18 @@ function editTimer(alarmIndex) {
    en = a.on;
  }
  const menu = {
-    '': { 'title': 'Timer' },
-    'Hours': {
+    '': { 'title': /*LANG*/'Timer' },
+    /*LANG*/'Hours': {
      value: hrs,
      onchange: function(v){if (v<0)v=23;if (v>23)v=0;hrs=v;this.value=v;} // no arrow fn -> preserve 'this'
    },
-    'Minutes': {
+    /*LANG*/'Minutes': {
      value: mins,
      onchange: function(v){if (v<0)v=59;if (v>59)v=0;mins=v;this.value=v;} // no arrow fn -> preserve 'this'
    },
-    'Enabled': {
+    /*LANG*/'Enabled': {
      value: en,
-      format: v=>v?"On":"Off",
+      format: v=>v?/*LANG*/"On":/*LANG*/"Off",
      onchange: v=>en=v
    }
  };
--- a/apps/alarm/boot.js
+++ b/apps/alarm/boot.js
@ -7,7 +7,7 @@
    active = active.sort((a,b)=>(a.hr-b.hr)+(a.last-b.last)*24);
    var hr = time.getHours()+(time.getMinutes()/60)+(time.getSeconds()/3600);
    if (!require('Storage').read("alarm.js")) {
-      console.log("No alarm app!");
+      console.log(/*LANG*/"No alarm app!");
      require('Storage').write('alarm.json',"[]");
    } else {
      var t = 3600000*(active[0].hr-hr);
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@ -0,0 +1,18 @@
+{
+  "id": "alarm",
+  "name": "Default Alarm & Timer",
+  "shortName": "Alarms",
+  "version": "0.14",
+  "description": "Set and respond to alarms and timers",
+  "icon": "app.png",
+  "tags": "tool,alarm,widget",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"alarm.app.js","url":"app.js"},
+    {"name":"alarm.boot.js","url":"boot.js"},
+    {"name":"alarm.js","url":"alarm.js"},
+    {"name":"alarm.img","url":"app-icon.js","evaluate":true},
+    {"name":"alarm.wid.js","url":"widget.js"}
+  ],
+  "data": [{"name":"alarm.json"}]
+}
--- a/apps/alpinenav/metadata.json
+++ b/apps/alpinenav/metadata.json
@ -0,0 +1,14 @@
+{
+  "id": "alpinenav",
+  "name": "Alpine Nav",
+  "version": "0.01",
+  "description": "App that performs GPS monitoring to track and display position relative to a given origin in realtime",
+  "icon": "app-icon.png",
+  "tags": "outdoors,gps",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"alpinenav.app.js","url":"app.js"},
+    {"name":"alpinenav.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/analogimgclk/metadata.json
+++ b/apps/analogimgclk/metadata.json
@ -0,0 +1,16 @@
+{
+  "id": "analogimgclk",
+  "name": "Analog Clock (Image background)",
+  "shortName": "Analog Clock",
+  "version": "0.03",
+  "description": "An analog clock with an image background",
+  "icon": "app.png",
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS"],
+  "storage": [
+    {"name":"analogimgclk.app.js","url":"app.js"},
+    {"name":"analogimgclk.bg.img","url":"bg.img"},
+    {"name":"analogimgclk.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/andark/ChangeLog
+++ b/apps/andark/ChangeLog
@ -0,0 +1,4 @@
+0.01: Release
+0.02: Rename app
+0.03: Add type "clock"
+0.04: changed update cylce, when locked 
--- a/apps/andark/README.md
+++ b/apps/andark/README.md
@ -0,0 +1,10 @@
+# Analog Clock 
+
+## Features
+
+* second hand
+* date
+* battery percantage
+* no widgets
+
+![logo](andark_screen.png)
--- a/apps/andark/andark_icon.png
+++ b/apps/andark/andark_icon.png
--- a/apps/andark/andark_screen.png
+++ b/apps/andark/andark_screen.png
--- a/apps/andark/app.js
+++ b/apps/andark/app.js
@ -0,0 +1,125 @@
+const c={"x":g.getWidth()/2,"y":g.getHeight()/2};
+let zahlpos=[];
+let unlock = false;
+
+function zeiger(len,dia,tim){
+  const x =c.x+ Math.cos(tim)*len/2,
+        y =c.y + Math.sin(tim)*len/2,
+        d={"d":3,"x":dia/2*Math.cos(tim+Math.PI/2),"y":dia/2*Math.sin(tim+Math.PI/2)},
+        pol=[c.x-d.x,c.y-d.y,c.x+d.x,c.y+d.y,x+d.x,y+d.y,x-d.x,y-d.y];
+  return pol;
+
+}
+
+function draw(){
+  const d=new Date();
+  let m=d.getMinutes(), h=d.getHours(), s=d.getSeconds();
+  //draw black rectangle in the middle to clear screen from scale and hands
+  g.setColor(0,0,0);
+  g.fillRect(10,10,2*c.x-10,2*c.x-10);
+  g.setColor(1,1,1);
+
+  if(h>12){
+    h=h-12;
+  }
+  //calculates the position of the minute, second and hour hand
+  h=2*Math.PI/12*(h+m/60)-Math.PI/2;
+  //more accurate
+  //m=2*Math.PI/60*(m+s/60)-Math.PI/2;
+  m=2*Math.PI/60*(m)-Math.PI/2;
+
+  s=2*Math.PI/60*s-Math.PI/2;
+  g.setFontAlign(0,0);
+  g.setFont("Vector",10);
+  let dateStr = "    "+require("locale").date(d)+"    ";
+  g.drawString(dateStr, c.x, c.y+20, true);
+ // g.drawString(d.getDate(),1.4*c.x,c.y,true);
+  g.drawString(Math.round(E.getBattery()/5)*5+"%",c.x,c.y+40,true);
+  drawlet();
+  //g.setColor(1,0,0);
+  const hz = zeiger(100,5,h);
+  g.fillPoly(hz,true);
+ // g.setColor(1,1,1);
+  const minz = zeiger(150,5,m);
+  g.fillPoly(minz,true);
+  if (unlock){
+  const sekz = zeiger(150,2,s);
+  g.fillPoly(sekz,true);
+  }
+  g.fillCircle(c.x,c.y,4);
+
+
+
+}
+//draws the scale once the app is startet
+function drawScale(){
+  for(let i=-14;i<47;i++){
+    const win=i*2*Math.PI/60;
+    let d=2;
+    if(i%5==0){d=5;}
+    g.fillPoly(zeiger(300,d,win),true);
+    g.setColor(0,0,0);
+    g.fillRect(10,10,2*c.x-10,2*c.x-10);
+    g.setColor(1,1,1);
+  }
+}
+
+//draws the numbers on the screen
+
+function drawlet(){
+  g.setFont("Vector",20);
+  for(let i = 0;i<12;i++){
+     g.drawString(zahlpos[i][0],zahlpos[i][1],zahlpos[i][2]);
+  }
+}
+//calcultes the Position of the numbers when app starts and saves them in an array
+function setlet(){
+  let sk=1;
+  for(let i=-10;i<50;i+=5){
+     let win=i*2*Math.PI/60;
+     let xsk =c.x+2+Math.cos(win)*(c.x-10),
+         ysk =c.y+2+Math.sin(win)*(c.x-10);
+    if(sk==3){xsk-=10;}
+    if(sk==6){ysk-=10;}
+    if(sk==9){xsk+=10;}
+    if(sk==12){ysk+=10;}
+    if(sk==10){xsk+=3;}
+    zahlpos.push([sk,xsk,ysk]);
+    sk+=1;
+  }
+}
+setlet();
+// Clear the screen once, at startup
+g.setBgColor(0,0,0);
+g.clear();
+drawScale();
+draw();
+
+let secondInterval= setInterval(draw, 1000);
+// Stop updates when LCD is off, restart when on
+
+Bangle.on('lcdPower',on=>{
+  if (secondInterval) clearInterval(secondInterval);
+  secondInterval = undefined;
+  if (on) {
+      secondInterval = setInterval(draw, 1000);
+      draw(); // draw immediately
+  }else{
+  }
+});
+Bangle.on('lock',on=>{
+  if (secondInterval) clearInterval(secondInterval);
+  secondInterval = undefined;
+  if (!on) {
+      secondInterval = setInterval(draw, 1000);
+      unlock = true;
+      draw(); // draw immediately
+  }else{
+     secondInterval = setInterval(draw, 60000);
+     unlock = false;
+     draw();
+  }
+ });
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
--- a/apps/andark/app_icon.js
+++ b/apps/andark/app_icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgIEBoUAiAKCgUCBQUEColEAYUQhAmKCwgeCAAcCgEDjwEBkEAg8TBocNgYFDh8GAYMDxkPjEA8EAwkHJgIcBAoPfAoYWCBYYFIgfvAoX4FYRJEAp9gAomYNAOAArPwAogAC4AFiRoIFJLgIFJuADCg//Q4U//4FDj4FEAAV4Aoi0CSxBsCA=="))
--- a/apps/andark/metadata.json
+++ b/apps/andark/metadata.json
@ -0,0 +1,15 @@
+{ "id": "andark",
+  "name": "Analog Dark",
+  "shortName":"AnDark",
+  "version":"0.04",
+  "description": "analog clock face without disturbing widgets",
+  "icon": "andark_icon.png",
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"andark.app.js","url":"app.js"},
+    {"name":"andark.img","url":"app_icon.js","evaluate":true}
+  ]
+}
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@ -3,3 +3,5 @@
      Fix music control
 0.03: Handling of message actions (ok/clear)
 0.04: Android icon now goes to settings page with 'find phone'
+0.05: Fix handling of message actions
+0.06: Option to keep messages after a disconnect (default false) (fix #1186)
--- a/apps/android/README.md
+++ b/apps/android/README.md
@ -0,0 +1,48 @@
+# Android Integration
+
+This app allows your Bangle.js to receive notifications [from the Gadgetbridge app on Android](http://www.espruino.com/Gadgetbridge)
+
+See [this link](http://www.espruino.com/Gadgetbridge) for notes on how to install
+the Android app (and how it works).
+
+It requires the `Messages` app on Bangle.js (which should be automatically installed) to
+display any notifications that are received.
+
+## Settings
+
+You can access the settings menu either from the `Android` icon in the launcher,
+or from `App Settings` in the `Settings` menu.
+
+It contains:
+
+* `Connected` - shows whether there is an active Bluetooth connection or not
+* `Find Phone` - opens a submenu where you can activate the `Find Phone` functionality
+of Gadgetbridge - making your phone make noise so you can find it.
+* `Keep Msgs` - default is `Off`. When Gadgetbridge disconnects, should Bangle.js
+keep any messages it has received, or should it delete them?
+* `Messages` - launches the messages app, showing a list of messages
+
+## How it works
+
+Gadgetbridge on Android connects to Bangle.js, and sends commands over the
+BLE UART connection. These take the form of `GB({ ... JSON ... })\n` - so they
+call a global function called `GB` which then interprets the JSON.
+
+Responses are sent back to Gadgetbridge simply as one line of JSON.
+
+More info on message formats on http://www.espruino.com/Gadgetbridge
+
+## Testing
+
+Bangle.js can only hold one connection open at a time, so it's hard to see
+if there are any errors when handling Gadgetbridge messages.
+
+However you can:
+
+* Use the `Gadgetbridge Debug` app on Bangle.js to display/log the messages received from Gadgetbridge
+* Connect with the Web IDE and manually enter the Gadgetbridge messages on the left-hand side to
+execute them as if they came from Gadgetbridge, for instance:
+
+```
+GB({"t":"notify","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"})
+```
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@ -4,6 +4,7 @@
    Bluetooth.println(JSON.stringify(message));
  }

+  var settings = require("Storage").readJSON("android.settings.json",1)||{};
  var _GB = global.GB;
  global.GB = (event) => {
    // feed a copy to other handlers if there were any
@ -51,7 +52,8 @@
  // Battery monitor
  function sendBattery() { gbSend({ t: "status", bat: E.getBattery() }); }
  NRF.on("connect", () => setTimeout(sendBattery, 2000));
-  NRF.on("disconnect", () => require("messages").clearAll()); // remove all messages on disconnect
+  if (!settings.keep)
+    NRF.on("disconnect", () => require("messages").clearAll()); // remove all messages on disconnect
  setInterval(sendBattery, 10*60*1000);
  // Health tracking
  Bangle.on('health', health=>{
@ -65,7 +67,9 @@
  // Message response
  Bangle.messageResponse = (msg,response) => {
    if (msg.id=="call") return gbSend({ t: "call", n:response?"ACCEPT":"REJECT" });
-    if (isFinite(msg.id)) return gbSend({ t: "notify", n:response?"OPEN":"DISMISS" });
+    if (isFinite(msg.id)) return gbSend({ t: "notify", n:response?"OPEN":"DISMISS", id: msg.id });
    // error/warn here?
  };
+  // remove settings object so it's not taking up RAM
+  delete settings;
 })();
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@ -0,0 +1,20 @@
+{
+  "id": "android",
+  "name": "Android Integration",
+  "shortName": "Android",
+  "version": "0.06",
+  "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
+  "icon": "app.png",
+  "tags": "tool,system,messages,notifications,gadgetbridge",
+  "dependencies": {"messages":"app"},
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"android.app.js","url":"app.js"},
+    {"name":"android.settings.js","url":"settings.js"},
+    {"name":"android.img","url":"app-icon.js","evaluate":true},
+    {"name":"android.boot.js","url":"boot.js"}
+  ],
+  "data": [{"name":"android.settings.json"}],
+  "sortorder": -8
+}
--- a/apps/android/settings.js
+++ b/apps/android/settings.js
@ -2,17 +2,29 @@
  function gb(j) {
    Bluetooth.println(JSON.stringify(j));
  }
+  var settings = require("Storage").readJSON("android.settings.json",1)||{};
+  function updateSettings() {
+    require("Storage").writeJSON("android.settings.json", settings);
+  }
  var mainmenu = {
    "" : { "title" : "Android" },
    "< Back" : back,
-    "Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
+    /*LANG*/"Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
    "Find Phone" : () => E.showMenu({
        "" : { "title" : "Find Phone" },
        "< Back" : ()=>E.showMenu(mainmenu),
-        "On" : _=>gb({t:"findPhone",n:true}),
-        "Off" : _=>gb({t:"findPhone",n:false}),
+        /*LANG*/"On" : _=>gb({t:"findPhone",n:true}),
+        /*LANG*/"Off" : _=>gb({t:"findPhone",n:false}),
      }),
-    "Messages" : ()=>load("messages.app.js")
+    /*LANG*/"Keep Msgs" : {
+      value : !!settings.keep,
+      format : v=>v?/*LANG*/"Yes":/*LANG*/"No",
+      onchange: v => {
+        settings.keep = v;
+        updateSettings();
+      }
+    },
+    /*LANG*/"Messages" : ()=>load("messages.app.js")
  };
  E.showMenu(mainmenu);
 })
--- a/apps/animals/metadata.json
+++ b/apps/animals/metadata.json
@ -0,0 +1,21 @@
+{
+  "id": "animals",
+  "name": "Animals Game",
+  "version": "0.01",
+  "description": "Simple toddler's game - displays a different number of animals each time the screen is pressed",
+  "icon": "animals.png",
+  "tags": "game",
+  "supports": ["BANGLEJS"],
+  "storage": [
+    {"name":"animals.app.js","url":"animals.js"},
+    {"name":"animals.img","url":"animals-icon.js","evaluate":true},
+    {"name":"animals-snake.img","url":"animals-snake.js","evaluate":true},
+    {"name":"animals-duck.img","url":"animals-duck.js","evaluate":true},
+    {"name":"animals-swan.img","url":"animals-swan.js","evaluate":true},
+    {"name":"animals-fox.img","url":"animals-fox.js","evaluate":true},
+    {"name":"animals-camel.img","url":"animals-camel.js","evaluate":true},
+    {"name":"animals-pig.img","url":"animals-pig.js","evaluate":true},
+    {"name":"animals-sheep.img","url":"animals-sheep.js","evaluate":true},
+    {"name":"animals-mouse.img","url":"animals-mouse.js","evaluate":true}
+  ]
+}
--- a/apps/animclk/metadata.json
+++ b/apps/animclk/metadata.json
@ -0,0 +1,18 @@
+{
+  "id": "animclk",
+  "name": "Animated Clock",
+  "shortName": "Anim Clock",
+  "version": "0.03",
+  "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art",
+  "icon": "app.png",
+  "type": "clock",
+  "tags": "clock,animated",
+  "supports": ["BANGLEJS"],
+  "storage": [
+    {"name":"animclk.app.js","url":"app.js"},
+    {"name":"animclk.pixels1","url":"animclk.pixels1"},
+    {"name":"animclk.pixels2","url":"animclk.pixels2"},
+    {"name":"animclk.pal","url":"animclk.pal"},
+    {"name":"animclk.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/antonclk/ChangeLog
+++ b/apps/antonclk/ChangeLog
@ -1,3 +1,10 @@
 0.01: New App!
 0.02: Load widgets after setUI so widclk knows when to hide
 0.03: Clock now shows day of week under date.
+0.04: Clock can optionally show seconds, date optionally in ISO-8601 format, weekdays and uppercase configurable, too.
+0.05: Clock can optionally show ISO-8601 calendar weeknumber (default: Off)
+      when weekday name "Off": week #:<num>
+      when weekday name "On": weekday name is cut at 6th position and .#<week num> is added
+0.06: fixes #1271 - wrong settings name
+      when weekday name and calendar weeknumber are on then display is <weekday short> #<calweek>
+      week is buffered until date or timezone changes
--- a/apps/antonclk/README.md
+++ b/apps/antonclk/README.md
@ -0,0 +1,79 @@
+# Anton Clock - Large font digital watch with seconds and date
+
+Anton clock uses the "Anton" bold font to show the time in a clear, easily readable manner. On the Bangle.js 2, the time can be read easily even if the screen is locked and unlit.
+
+## Features
+
+The basic time representation only shows hours and minutes of the current time. However, Anton clock can show additional information:
+
+* Seconds can be shown, either always or only if the screen is unlocked.
+* To help easy recognition, the seconds can be coloured in blue on the Bangle.js 2.
+* Date can be shown in three different formats:
+    * ISO-8601: 2021-12-19
+    * short local format: 19/12/2021, 19.12.2021
+    * long local format: DEC 19 2021
+* Weekday can be shown (on seconds screen only instead of year)
+
+## Usage
+
+Install Anton clock through the Bangle.js app loader.
+Configure it through the default Bangle.js configuration mechanism
+(Settings app, "Apps" menu, "Anton clock" submenu).
+If you like it, make it your default watch face
+(Settings app, "System" menu, "Clock" submenu, select "Anton clock").
+
+## Configuration
+
+Anton clock is configured by the standard settings mechanism of Bangle.js's operating system:
+Open the "Settings" app, then the "Apps" submenu and below it the "Anton clock" menu.
+You configure Anton clock through several "on/off" switches in two menus.
+
+### The main menu
+
+The main menu contains several settings covering Anton clock in general.
+
+* **Seconds...** - Opens the submenu for configuring the presentation of the current time's seconds.
+* **Date** - Format of the date representation. Possible values are
+    * **Long** - "Long" date format in the current locale. Usually with the month as name, not number.
+    * **Short** - "Short" date format in the current locale. Usually with the month as number.
+    * **ISO8601** - Show the date in ISO-8601 format (YYYY-MM-DD), irrespective of the current locale.
+* **Show Weekday** - Weekday is shown in the time presentation without seconds.
+Weekday name depends on the current locale.
+If seconds are shown, the weekday is never shown as there is not enough space on the watch face.
+* **Show CalWeek** - Week-number (ISO-8601) is shown. (default: Off)
+If "Show Weekday" is "Off" displays the week-number as "week #<num>".
+If "Show Weekday" is "On" displays "weekday name short" with " #<num>" .
+If seconds are shown, the week number is never shown as there is not enough space on the watch face.
+* **Vector font** - Use the built-in vector font for dates and weekday.
+This can improve readability.
+Otherwise, a scaled version of the built-in 6x8 pixels font is used.
+
+### The "Seconds" submenu
+
+The "Seconds" submenu configures how (and if) seconds are shown on the "Anton" watch face.
+
+* **Show** - Configure when the seconds should be shown at all:
+    * **Never** - Seconds are never shown.
+In this case, hour and minute are a bit more centered on the screen and the clock will always only update every minute.
+This saves battery power.
+    * **Unlocked** - Seconds are shown if the display is unlocked.
+On locked displays, only hour, minutes, date and optionally the weekday are shown.
+_This option is highly recommended on the Bangle.js 2!_
+    * **Always** - Seconds are _always_ shown, irrespective of the display's unlock state.
+_Enabling this option increases power consumption as the watch face will update once per second instead of once per minute._
+* **With ":"** - If enabled, a colon ":" is prepended to the seconds.
+This resembles the usual time representation "hh:mm:ss", even though the seconds are printed on a separate line.
+* **Color** - If enabled, seconds are shown in blue instead of black.
+If the date is shown on the seconds screen, it is colored read instead of black.
+This make the visual orientation much easier on the watch face.
+* **Date** - It is possible to show the date together with the seconds:
+    * **No** - Date is _not_ shown in the seconds screen.
+In this case, the seconds are centered below hour and minute.
+    * **Year** - Date is shown with day, month, and year. If "Date" in the main settings is configured to _ISO8601_, this is used here, too. Otherwise, the short local format is used.
+    * **Weekday** - Date is shown with day, month, and weekday.
+
+The date is coloured in red if the "Coloured" option is chosen.
+
+## Compatibility
+
+Anton clock makes use of core Bangle.js 2 features (coloured display, display lock state). It also runs on the Bangle.js 1 but these features are not available there due to hardware restrictions.
--- a/apps/antonclk/app.js
+++ b/apps/antonclk/app.js
--- a/apps/antonclk/app.png
+++ b/apps/antonclk/app.png
--- a/apps/antonclk/metadata.json
+++ b/apps/antonclk/metadata.json
@ -0,0 +1,19 @@
+{
+  "id": "antonclk",
+  "name": "Anton Clock",
+  "version": "0.06",
+  "description": "A clock using the bold Anton font, optionally showing seconds and date in ISO-8601 format.",
+  "readme":"README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"antonclk.app.js","url":"app.js"},
+    {"name":"antonclk.settings.js","url":"settings.js"},
+    {"name":"antonclk.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"antonclk.json"}]
+}
--- a/apps/antonclk/screenshot.png
+++ b/apps/antonclk/screenshot.png
--- a/apps/antonclk/settings.js
+++ b/apps/antonclk/settings.js
@ -0,0 +1,107 @@
+// Settings menu for the enhanced Anton clock
+
+(function(back) {
+  var FILE = "antonclk.json";
+  // Load settings
+  var settings = Object.assign({
+    secondsOnUnlock: false,
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  // Helper method which uses int-based menu item for set of string values
+  function stringItems(startvalue, writer, values) {
+    return {
+      value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
+      format: v => values[v],
+      min: 0,
+      max: values.length - 1,
+      wrap: true,
+      step: 1,
+      onchange: v => {
+        writer(values[v]);
+        writeSettings();
+      }
+    };
+  }
+
+  // Helper method which breaks string set settings down to local settings object
+  function stringInSettings(name, values) {
+    return stringItems(settings[name], v => settings[name] = v, values);
+  }
+
+  var mainmenu = {
+    "": {
+      "title": "Anton clock"
+    },
+    "< Back": () => back(),
+    "Seconds...": () => E.showMenu(secmenu),
+    "Date": stringInSettings("dateOnMain", ["Short", "Long", "ISO8601"]),
+    "Show Weekday": {
+      value: (settings.weekDay !== undefined ? settings.weekDay : true),
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        settings.weekDay = v;
+        writeSettings();
+      }
+    },
+    "Show CalWeek": {
+      value: (settings.calWeek !== undefined ? settings.calWeek : false),
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        settings.calWeek = v;
+        writeSettings();
+      }
+    },
+    "Uppercase": {
+      value: (settings.upperCase !== undefined ? settings.upperCase : false),
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        settings.upperCase = v;
+        writeSettings();
+      }
+    },
+    "Vector font": {
+      value: (settings.vectorFont !== undefined ? settings.vectorFont : false),
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        settings.vectorFont = v;
+        writeSettings();
+      }
+    },
+  };
+
+  // Submenu
+  var secmenu = {
+    "": {
+      "title": "Show seconds..."
+    },
+    "< Back": () => E.showMenu(mainmenu),
+    "Show": stringInSettings("secondsMode", ["Never", "Unlocked", "Always"]),
+    "With \":\"": {
+      value: (settings.secondsWithColon !== undefined ? settings.secondsWithColon : false),
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        settings.secondsWithColon = v;
+        writeSettings();
+      }
+    },
+    "Color": {
+      value: (settings.secondsColoured !== undefined ? settings.secondsColoured : false),
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        settings.secondsColoured = v;
+        writeSettings();
+      }
+    },
+    "Date": stringInSettings("dateOnSecs", ["No", "Year", "Weekday"])
+  };
+
+  // Actually display the menu
+  E.showMenu(mainmenu);
+
+});
+
+// end of file
--- a/apps/arrow/metadata.json
+++ b/apps/arrow/metadata.json
@ -0,0 +1,15 @@
+{
+  "id": "arrow",
+  "name": "Arrow Compass",
+  "version": "0.05",
+  "description": "Moving arrow compass that points North, shows heading, with tilt correction. Based on jeffmer's Navigation Compass",
+  "icon": "arrow.png",
+  "type": "app",
+  "tags": "tool,outdoors",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"arrow.app.js","url":"app.js"},
+    {"name":"arrow.img","url":"icon.js","evaluate":true}
+  ]
+}
--- a/apps/assistedgps/ChangeLog
+++ b/apps/assistedgps/ChangeLog
@ -1 +1,3 @@
 0.01: New App!
+0.02: Update to work with Bangle.js 2
+0.03: Select GNSS systems to use for Bangle.js 2
--- a/apps/assistedgps/custom.html
+++ b/apps/assistedgps/custom.html
@ -8,34 +8,72 @@
    <p>GPS can take a long time (~5 minutes) to get an accurate position the first time it is used.
    AGPS uploads a few hints to the GPS receiver about satellite positions that allow it
    to get a faster, more accurate fix - however they are only valid for a short period of time.</p>
-    <p>You can upload data that covers a longer period of time, but the upload will take longer.</p>
-    <div class="form-group">
-      <label class="form-label">AGPS Validity time</label>
-      <label class="form-radio">
-        <input type="radio" name="agpsperiod" value="1d"><i class="form-icon"></i> 1 day (8kB)
-      </label>
-      <label class="form-radio">
-        <input type="radio" name="agpsperiod" value="2d" checked><i class="form-icon"></i> 2 days (14kB)
-      </label>
-      <label class="form-radio">
-        <input type="radio" name="agpsperiod" value="3d"><i class="form-icon"></i> 3 days (20kB)
-      </label>
-      <label class="form-radio">
-        <input type="radio" name="agpsperiod" value="1wk"><i class="form-icon"></i> 1 week (46kB)
-      </label>
+    <div id="banglejs1-info" style="display:none">
+      <p>You can upload data that covers a longer period of time, but the upload will take longer.</p>
+      <div class="form-group">
+        <label class="form-label">AGPS Validity time</label>
+        <label class="form-radio">
+          <input type="radio" name="agpsperiod" value="1d"><i class="form-icon"></i> 1 day (8kB)
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="agpsperiod" value="2d" checked><i class="form-icon"></i> 2 days (14kB)
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="agpsperiod" value="3d"><i class="form-icon"></i> 3 days (20kB)
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="agpsperiod" value="1wk"><i class="form-icon"></i> 1 week (46kB)
+        </label>
+      </div>
    </div>
-    <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
+    <div id="banglejs2-info" style="display:none">
+      <p>Using fewer GNSS systems may decrease the time to fix. (If unsure, select only GPS)</p>
+      <div class="form-group">
+        <label class="form-label">Select which GNSS system you want.</label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="1" checked><i class="form-icon"></i> GPS
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="2"><i class="form-icon"></i> BDS
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="3"><i class="form-icon"></i> GPS+BDS
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="4"><i class="form-icon"></i> GLONASS
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="5"><i class="form-icon"></i> GPS+GLONASS
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="6"><i class="form-icon"></i> BDS+GLONASS
+        </label>
+        <label class="form-radio">
+          <input type="radio" name="gnss_select" value="6"><i class="form-icon"></i> GPS+BDS+GLONASS
+        </label>
+      </div>
+    </div>
+    <p id="upload-wrap" style="display:none">Click <button id="upload" class="btn btn-primary">Upload</button></p>

    <script src="../../core/lib/customize.js"></script>

    <script>
+      var isB1; // is Bangle.js 1?
+      var isB2; // is Bangle.js 2?
+
      // When the 'upload' button is clicked...
      document.getElementById("upload").addEventListener("click", function() {
-        var radios = document.getElementsByName('agpsperiod');
-        var url = "https://www.espruino.com/agps/assistnow_1d.base64";
-        for (var i=0; i<radios.length; i++)
-          if (radios[i].checked)
-            url = "https://www.espruino.com/agps/assistnow_"+radios[i].value+".base64";
+        var url;
+        if (isB1) {
+          var radios = document.getElementsByName('agpsperiod');
+          url = "https://www.espruino.com/agps/assistnow_1d.base64";
+          for (var i=0; i<radios.length; i++)
+            if (radios[i].checked)
+              url = "https://www.espruino.com/agps/assistnow_"+radios[i].value+".base64";
+        }
+        if (isB2) {
+          url = "https://www.espruino.com/agps/casic.base64";
+        }
        console.log("Sending...");
        //var text = document.getElementById("agpsperiod").value;
        get(url, function(b64) {
@ -48,6 +86,8 @@
        });
      });

+// =================================================== Bangle.js 1 UBLOX
+
      function UBX_CMD(cmd) {
        var d = [0xB5,0x62]; // sync chars
        d = d.concat(cmd);
@ -79,13 +119,40 @@
        return UBX_CMD([].slice.call(a));
      }

+// =================================================== Bangle.js 2 CASIC
+
+    function CASIC_CHECKSUM(cmd) {
+      var cs = 0;
+      for (var i=1;i<cmd.length;i++)
+        cs = cs ^ cmd.charCodeAt(i);
+      return cmd+"*"+cs.toString(16).toUpperCase().padStart(2, '0');
+    }
+
+// ===================================================
+
      function jsFromBase64(b64) {
        var bin = atob(b64);
        var chunkSize = 128;
        var js = "\x10Bangle.setGPSPower(1);\n"; // turn GPS on
-        //js += `\x10Bangle.on('GPS-raw',function (d) { if (d.startsWith("\\xB5\\x62\\x05\\x01")) Terminal.println("GPS ACK"); else if (d.startsWith("\\xB5\\x62\\x05\\x00")) Terminal.println("GPS NACK"); })\n`;
-        //js += "\x10var t=getTime()+1;while(t>getTime());\n"; // wait 1 sec
-        js += `\x10Serial1.write(atob("${btoa(String.fromCharCode.apply(null,UBX_MGA_INI_TIME_UTC()))}"))\n`; // set GPS time
+        if (isB1) { // UBLOX
+          //js += `\x10Bangle.on('GPS-raw',function (d) { if (d.startsWith("\\xB5\\x62\\x05\\x01")) Terminal.println("GPS ACK"); else if (d.startsWith("\\xB5\\x62\\x05\\x00")) Terminal.println("GPS NACK"); })\n`;
+          //js += "\x10var t=getTime()+1;while(t>getTime());\n"; // wait 1 sec
+          js += `\x10Serial1.write(atob("${btoa(String.fromCharCode.apply(null,UBX_MGA_INI_TIME_UTC()))}"))\n`; // set GPS time
+        }
+        if (isB2) { // CASIC
+
+          // Select what GNSS System to use for decreased fix time.
+          var radios = document.getElementsByName('gnss_select');
+          var gnss_select="1";
+          for (var i=0; i<radios.length; i++)
+            if (radios[i].checked)
+              gnss_select=radios[i].value;
+          js += `\x10Serial1.println("${CASIC_CHECKSUM("$PCAS04,"+gnss_select)}")\n`; // set GNSS mode
+          // What about:
+          // NAV-TIMEUTC (0x01 0x10)
+          // NAV-PV (0x01 0x03)
+          // or AGPS.zip uses AID-INI (0x0B 0x01)
+        }

        for (var i=0;i<bin.length;i+=chunkSize) {
          var chunk = bin.substr(i,chunkSize);
@ -106,6 +173,15 @@
        oReq.send();
      }

+      // Called when we know what device we're using
+      function onInit(device) {
+        isB2 = (device && device.id=="BANGLEJS2");
+        isB1 = !isB2;
+        document.getElementById("banglejs1-info").style = isB1?"":"display:none";
+        document.getElementById("banglejs2-info").style = isB2?"":"display:none";
+        document.getElementById("upload-wrap").style = "";
+      }
+
    </script>
  </body>
 </html>
--- a/apps/assistedgps/metadata.json
+++ b/apps/assistedgps/metadata.json
@ -0,0 +1,13 @@
+{
+  "id": "assistedgps",
+  "name": "Assisted GPS Update (AGPS)",
+  "version": "0.03",
+  "description": "Downloads assisted GPS (AGPS) data to Bangle.js 1 or 2 for faster GPS startup and more accurate fixes. **No app will be installed**, this just uploads new data to the GPS chip.",
+  "icon": "app.png",
+  "type": "RAM",
+  "tags": "tool,outdoors,agps",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "custom": "custom.html",
+  "customConnect": true,
+  "storage": []
+}
--- a/apps/astral/metadata.json
+++ b/apps/astral/metadata.json
@ -0,0 +1,15 @@
+{
+  "id": "astral",
+  "name": "Astral Clock",
+  "version": "0.03",
+  "description": "Clock that calculates and displays Alt Az positions of all planets, Sun as well as several other astronomy targets (customizable) and current Moon phase. Coordinates are calculated by GPS & time and onscreen compass assists orienting. See Readme before using.",
+  "icon": "app-icon.png",
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"astral.app.js","url":"app.js"},
+    {"name":"astral.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/astrocalc/metadata.json
+++ b/apps/astrocalc/metadata.json
@ -0,0 +1,23 @@
+{
+  "id": "astrocalc",
+  "name": "Astrocalc",
+  "version": "0.02",
+  "description": "Calculates interesting information on the sun and moon cycles for the current day based on your location.",
+  "icon": "astrocalc.png",
+  "tags": "app,sun,moon,cycles,tool,outdoors",
+  "supports": ["BANGLEJS"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"astrocalc.app.js","url":"astrocalc-app.js"},
+    {"name":"suncalc.js","url":"suncalc.js"},
+    {"name":"astrocalc.img","url":"astrocalc-icon.js","evaluate":true},
+    {"name":"first-quarter.img","url":"first-quarter-icon.js","evaluate":true},
+    {"name":"last-quarter.img","url":"last-quarter-icon.js","evaluate":true},
+    {"name":"waning-crescent.img","url":"waning-crescent-icon.js","evaluate":true},
+    {"name":"waning-gibbous.img","url":"waning-gibbous-icon.js","evaluate":true},
+    {"name":"full.img","url":"full-icon.js","evaluate":true},
+    {"name":"new.img","url":"new-icon.js","evaluate":true},
+    {"name":"waxing-gibbous.img","url":"waxing-gibbous-icon.js","evaluate":true},
+    {"name":"waxing-crescent.img","url":"waxing-crescent-icon.js","evaluate":true}
+  ]
+}
--- a/apps/astroid/metadata.json
+++ b/apps/astroid/metadata.json
@ -0,0 +1,15 @@
+{
+  "id": "astroid",
+  "name": "Asteroids!",
+  "version": "0.03",
+  "description": "Retro asteroids game",
+  "icon": "asteroids.png",
+  "screenshots": [{"url":"screenshot_asteroids.png"}],
+  "tags": "game",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"astroid.app.js","url":"asteroids.js"},
+    {"name":"astroid.img","url":"asteroids-icon.js","evaluate":true}
+  ]
+}
--- a/apps/authentiwatch/ChangeLog
+++ b/apps/authentiwatch/ChangeLog
@ -1 +1,4 @@
 0.01: First release
+0.02: Fix JSON save format
+0.03: Add "Calculating" placeholder, update JSON save format
+0.04: Fix tapping at very bottom of list, exit on inactivity
--- a/apps/authentiwatch/README.md
+++ b/apps/authentiwatch/README.md
@ -1,5 +1,8 @@
 # Authentiwatch - 2FA Authenticator

+* GitHub: https://github.com/andrewgoz/Authentiwatch <-- Report bugs here
+* Bleeding edge AppLoader: https://andrewgoz.github.io/Authentiwatch/
+
 ## Supports

 * Google Authenticator compatible 2-factor authentication
--- a/apps/authentiwatch/app-icon.js
+++ b/apps/authentiwatch/app-icon.js
@ -1 +1 @@
-require("heatshrink").decompress(atob("mUywkBiIADCxoTFAAcQGBwY/DDQIKDBiMDDCgGCBI4YMGAIDFDCAFEBQwYLFgIYEGQgYMApoYJGAJjFMogYMSQgCDDBwDCY4oMEDBZgHHQQYQf4oYVBgwYQBogYPPYZpFDBKMEDAbdDCxT9IDYIFFABqSEAogySQYoWNFgrFDJZoQBJggYRBwhLGDBwyFDCZGEDCYAEDGrIMbwhnGDEpLGAwxlLFQgQDJiYoFDDAZDDCpMDMpQOCNxQYNBo4KKBpwYYBYJ8NeJgYkLBQY8UYQXVGQIwN"))
+require("heatshrink").decompress(atob("mEwxH+AH4AD64ADFlgAFF04INFz4LUF0QwjEBwv/FzwwgF/4v/F6nMAAWi1AFD5nOeEHPEweoFooAB5/X5wvdFwotG5nN6/WAoQuaEoguHSYPQLwIIDF8uo5ouB6AJEFzuiFwup5/WFwI6GL0esXYKMBHYy9j1WqfBSOhBIYKJF8gAKF/4v6cZAvhGDAuWSDAvXMCwuYF+AwUFzX+0XGGAgxKFrYuBAAQxEeg4tcF4oABBQnGAAgv/F6b5KXsIvIGAqNnF/69fX8ZeSF7btNR8IuOF75ePL8ouOd74NKF8IANF94wEF1QAXA"))
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`require("heatshrink").decompress(atob("mEwgP//kAj//AAP5/+PApH7//PAonvAoXzAonj//nApHggEHAoWAgA5BAAJCCAoU/IYIFCv///w0CAonrv/HAoXLv+DAogLFgPeAoV+nlOAoV4/8+AoV79+eFIVzAof7u/v5xBCs4FL84FE//O74FBu4FB64FD73TAoNz/+eAoV5IIIFCvl8vwFCv8A/wFDO4IFFFIQFCGoSVFUIqtDh65D/1vYof+Y4LLDw7dD/0ndIYRCeoQFC/P/z/+i///oFBGoX8gEfAgI="))`
				`@ -0,0 +1 @@`
				require("heatshrink").decompress(atob("mEwgn/ABH+AQPvBpIAI/n8/3f5/PCp/v9oHF7w1CABffGxAYMH4f9z/514YDCxW/O4gFBxwHD/ZEL7/9GgX8GwQLCBQQXH/uP/Hf/2N44IBAgIXJ7oaD/3v/3uAYIIB9wQGAA2+/iRG5oSIM4f+1nrPYgAB3aHIAC77QYYRoCAAP676ICABXYFIntDoPf3+PC5f+BoPOX4vPNBn7IogEB/eu3QXC9wNEAAeKBIP+dgbSCDYMwgEApQVEygPCeRH8iAWBAAMHPwXDgoRGAonACwYABgN5uMAC4q8GC4U0DQsAggRF9gXFgggB/2hC4kdVAQCBVAX7xwXCVAnGCwUadAeeDYfr7IhEAAf93e+A4gpB9yRB/mqcgndRgQAHzqRE1gEC/KoCjLZEsgCB9evO4gOC/RyEgqdC2KnFO4S/KgFYsC/Ga5EBs1AX5bXHgx1C2YXEnp7GCARgB4AfE64WCnawFCgf9VAK/G/3M7zWDz4PF/maXJIAD7D8EVAP85QXN3OP/42DfoQXN/wvE/ySGABa8FAC37AgepVwQ9E1SfBAAJIEAAnrBQ39xgwJ7pRHFQX+3QECCAbyG9bPDzwXC9QMBdgQXIAAf41wEC5pLCJJBcF9fZQ5IAGYYn81q7RJQwWC/wXM9/tA4veCxooDIAPv55PEABwpB97rDAAw"))