diff --git a/apps/calclock/ChangeLog b/apps/calclock/ChangeLog
new file mode 100644
index 000000000..faffda176
--- /dev/null
+++ b/apps/calclock/ChangeLog
@@ -0,0 +1,2 @@
+0.01: Initial version
+0.02: More compact rendering & app icon
diff --git a/apps/calclock/README.md b/apps/calclock/README.md
new file mode 100644
index 000000000..2b4e93a0c
--- /dev/null
+++ b/apps/calclock/README.md
@@ -0,0 +1,9 @@
+# Calendar Clock - Your day at a glance
+
+This clock shows a chronological view of your current and future events.
+It uses events synced from Gadgetbridge to achieve this.
+
+The current time and date is highlighted in cyan.
+
+## Screenshot
+![](screenshot.png)
diff --git a/apps/calclock/calclock-icon.js b/apps/calclock/calclock-icon.js
new file mode 100644
index 000000000..9d5514d80
--- /dev/null
+++ b/apps/calclock/calclock-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwgpm5gAB4AVRhgWCAAQWWDCARC/4ACJR4uB54WDAAP8DBotFGIgXLFwv4GAouQC4gwMLooXF/gXJOowXGJBIXBCIgXQxgXLMAIXXMAmIC5OIx4XJhH/wAXIxnIC78IxGIHoIABI44MBC4wQBEQIDB5gXGPAJgEC6IxBC5oABC4wwDa4YTCxAWD5nPDAzvGFYgAB5AXWJBK+GcAq5CGBIuBC5X4GBIJBdoQXB/GIx4CDPJAuEC5JoCDAgWBFwYXJxCBIFwYXKYwoACCwZ3IPQoWIC5YABGYIABCwpHKAQYMBCwwX/C5QAMC8R3/R/4XNhAXNwAXHgGIABgWIAFwA=="))
diff --git a/apps/calclock/calclock.js b/apps/calclock/calclock.js
new file mode 100644
index 000000000..202e3ac20
--- /dev/null
+++ b/apps/calclock/calclock.js
@@ -0,0 +1,119 @@
+var calendar = [];
+var current = [];
+var next = [];
+
+function updateCalendar() {
+  calendar = require("Storage").readJSON("android.calendar.json",true)||[];
+  calendar = calendar.filter(e => isActive(e) || getTime() <= e.timestamp);
+  calendar.sort((a,b) => a.timestamp - b.timestamp);
+
+  current = calendar.filter(isActive);
+  next = calendar.filter(e=>!isActive(e));
+}
+
+function isActive(event) {
+  var timeActive = getTime() - event.timestamp;
+  return timeActive >= 0 && timeActive <= event.durationInSeconds;
+}
+function zp(str) {
+  return ("0"+str).substr(-2);
+}
+
+function drawEventHeader(event, y) {
+  g.setFont("Vector", 24);
+
+  var time = isActive(event) ? new Date() : new Date(event.timestamp * 1000);
+  var timeStr = zp(time.getHours()) + ":" + zp(time.getMinutes());
+  g.drawString(timeStr, 5, y);
+  y += 24;
+
+  g.setFont("12x20", 1);
+  if (isActive(event)) {
+    g.drawString(zp(time.getDate())+". " + require("locale").month(time,1),15*timeStr.length,y-21);
+  } else {
+    var offset = 0-time.getTimezoneOffset()/1440;
+    var days = Math.floor((time.getTime()/1000)/86400+offset)-Math.floor(getTime()/86400+offset);
+    if(days > 0) {
+      var daysStr = days===1?/*LANG*/"tomorrow":/*LANG*/"in "+days+/*LANG*/" days";
+      g.drawString(daysStr,15*timeStr.length,y-21);
+    }
+  }
+  return y;
+}
+
+function drawEventBody(event, y) {
+  g.setFont("12x20", 1);
+  var lines = g.wrapString(event.title, g.getWidth()-10);
+  if (lines.length > 2) {
+    lines = lines.slice(0,2);
+    lines[1] = lines[1].slice(0,-3)+"...";
+  }
+  g.drawString(lines.join('\n'), 5, y);
+  y+=20 * lines.length;
+  if(event.location) {
+    g.drawImage(atob("DBSBAA8D/H/nDuB+B+B+B3Dn/j/B+A8A8AYAYAYAAAAAAA=="),5,y);
+    g.drawString(event.location, 20, y);
+    y+=20;
+  }
+  y+=5;
+  return y;
+}
+
+function drawEvent(event, y) {
+  y = drawEventHeader(event, y);
+  y = drawEventBody(event, y);
+  return y;
+}
+
+var curEventHeight = 0;
+
+function drawCurrentEvents(y) {
+  g.setColor("#0ff");
+  g.clearRect(5, y, g.getWidth() - 5, y + curEventHeight);
+  curEventHeight = y;
+
+  if(current.length === 0) {
+    y = drawEvent({timestamp: getTime(), durationInSeconds: 100}, y);
+  } else {
+    y = drawEventHeader(current[0], y);
+    for (var e of current) {
+      y = drawEventBody(e, y);
+    }
+  }
+  curEventHeight = y - curEventHeight;
+  return y;
+}
+
+function drawFutureEvents(y) {
+  g.setColor(g.theme.fg);
+  for (var e of next) {
+    y = drawEvent(e, y);
+    if(y>g.getHeight())break;
+  }
+  return y;
+}
+
+function fullRedraw() {
+  g.clearRect(5,24,g.getWidth()-5,g.getHeight());
+  updateCalendar();
+  var y = 30;
+  y = drawCurrentEvents(y);
+  drawFutureEvents(y);
+}
+
+function redraw() {
+  g.reset();
+  if (current.find(e=>!isActive(e)) || next.find(isActive)) {
+    fullRedraw();
+  } else {
+    drawCurrentEvents(30);
+  }
+}
+
+g.clear();
+fullRedraw();
+var minuteInterval = setInterval(redraw, 60 * 1000);
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+Bangle.setUI("clock");
diff --git a/apps/calclock/calclock.png b/apps/calclock/calclock.png
new file mode 100644
index 000000000..5f953c1ee
Binary files /dev/null and b/apps/calclock/calclock.png differ
diff --git a/apps/calclock/location.png b/apps/calclock/location.png
new file mode 100644
index 000000000..619e55775
Binary files /dev/null and b/apps/calclock/location.png differ
diff --git a/apps/calclock/metadata.json b/apps/calclock/metadata.json
new file mode 100644
index 000000000..f87ee18be
--- /dev/null
+++ b/apps/calclock/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "calclock",
+  "name": "Calendar Clock",
+  "shortName": "CalClock",
+  "version": "0.02",
+  "description": "Show the current and upcoming events synchronized from Gadgetbridge",
+  "icon": "calclock.png",
+  "type": "clock",
+  "tags": "clock agenda",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"calclock.app.js","url":"calclock.js"},
+    {"name":"calclock.img","url":"calclock-icon.js","evaluate":true}
+  ],
+  "screenshots": [{"url":"screenshot.png"}]
+}
diff --git a/apps/calclock/screenshot.png b/apps/calclock/screenshot.png
new file mode 100644
index 000000000..4ab503f2b
Binary files /dev/null and b/apps/calclock/screenshot.png differ