diff --git a/apps/agenda/README.md b/apps/agenda/README.md
index 5141673c0..a546e0a89 100644
--- a/apps/agenda/README.md
+++ b/apps/agenda/README.md
@@ -1,3 +1,3 @@
-# Calendar
+# Agenda
 
 Basic agenda reading the events synchronised from GadgetBridge
diff --git a/apps/agenda/agenda-icon.js b/apps/agenda/agenda-icon.js
index ed6690033..891543955 100644
--- a/apps/agenda/agenda-icon.js
+++ b/apps/agenda/agenda-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwcCpMkyQC3wAIFgIRJn8JAoeQ/gRYwB0Bn57F/gCBHAgfCn8EDgdI/kSAoIR8oBkFgAFCCIysKCPM//4AKZAgR3/0Aj+Ag/ggP4gF/CPpr/Nf5r/NfYRhw4RL8IRDyEAABUJCIYC/AVI="))
\ No newline at end of file
+require("heatshrink").decompress(atob("mEwwg1yhGIxAPMBwIPFhH//GAC5n/C4oHBC5/IGwoXBHQQAKC4OIFAWOxHv9GO9wAKI4XoC4foEIIWLC4IABC4gIBFxnuE4IqBC4gARC4ZzNAAwXaxe7ACO4C625C4m4xIJBzAeCxGbCAOIFgQOBC4pOBxe4AYIPBAYQKCAYYXE3GL/ADBx/oxb3BC4X+xG4xwOBC4uP/YDB54MBf4Po3eM/4XBx/+C4pTBGIIkBLgOYAYIvB9GJBwI6BL45zCL4aCCL4h3GU64ALdYS1CI55bBAAgXFO4mMO4QDBDIO/////YxBU53IxIVB/GfDAWYa5wtC/GPAYWIL4wXBL4oSBC4jcBC4m4QIWYSwWIIQIAG/CnMMAIAC/JLCMIIvMIwZHFJAJfLC5yPHAYIRDAoy/KCIi7BMon4d4+Od4IXBxAZBEQLtB/+YxIXDL4SLCL4WPzAXCNgRFBLIKnKLIrcEI4gXNAAp3CxGZAAzCBC5KnCKAIAICxBlBC4IAJxG/C4/4wAXLhBgD/IcD3AXMGAIqDDgRGNGAoXDFxxhEI4W4FxwwCaoYWBFx4YDAAQWRAEQ"))
diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js
index 6bb757629..f39e31c75 100644
--- a/apps/agenda/agenda.js
+++ b/apps/agenda/agenda.js
@@ -8,7 +8,6 @@
     location,
     allDay: bool,
   }
-  the file on storage has the same content but is an object indexed by id
 */
 
 Bangle.loadWidgets();
@@ -24,30 +23,26 @@ var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2";
 var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4";
 
 //FIXME maybe write the end from GB already? Not durationInSeconds here (or do while receiving?)
-var cal;
-try { cal = require("Storage").readJSON("android.calendar.json"); } catch (e) {}
-if (!cal) //cal = {}; // first event
-    cal = { //FIXME test
-        1: {id: 1, title:"foo", timestamp: 1653577989371, durationInSeconds: 3000, location: "somewhere", description: "something very very long"},
-        2: {id: 2, title:"last", timestamp: 1653579989371, durationInSeconds: 3000, location: "somewhere"},
-        3: {id: 3, title:"bar", timestamp: 1653578989371, durationInSeconds: 3000, location: "somewhere"}
-    };
+var CALENDAR = require("Storage").readJSON("android.calendar.json",true)||[];
+
+CALENDAR=CALENDAR.sort((a,b)=>a.timestamp - b.timestamp)
 
 function getDate(timestamp) {
-    return new Date(timestamp*1000);
+  return new Date(timestamp*1000);
 }
 function formatDateLong(date, includeDay) {
-    if(includeDay)
-        return Locale.date(date)+" "+Locale.time(date,1);
-    return Locale.time(date,1);
+  if(includeDay)
+    return Locale.date(date)+" "+Locale.time(date,1);
+  return Locale.time(date,1);
 }
 function formatDateShort(date) {
-    return Locale.date(date).replace(/\d\d\d\d/,"")+Locale.time(date,1);
+  return Locale.date(date).replace(/\d\d\d\d/,"")+Locale.time(date,1);
 }
 
 var lines = [];
 function showEvent(ev) {
   var bodyFont = fontBig;
+  if(!ev) return;
   g.setFont(bodyFont);
   //var lines = [];
   if (ev.title) lines = g.wrapString(ev.title, g.getWidth()-10)
@@ -93,38 +88,40 @@ function showEvent(ev) {
   });
 }
 
-CALENDAR=Object.keys(cal)
-    .sort((a,b)=>cal[a].timestamp - cal[b].timestamp)
-    .map(k=>cal[k]); //make it an array
-
 function showList() {
-    E.showScroller({
-        h : 52,
-        c : Math.max(CALENDAR.length,3), // workaround for 2v10.219 firmware (min 3 not needed for 2v11)
-        draw : function(idx, r) {"ram"
-            var ev = CALENDAR[idx];
-            g.setColor(g.theme.fg);
-            g.clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
-            if (!ev) return;
-            var x = r.x+2, title = ev.title;
-            var body = formatDateShort(getDate(ev.timestamp))+"\n"+ev.location;
-            var m = ev.title+"\n"+ev.location, longBody=false;
-            if (title) g.setFontAlign(-1,-1).setFont(fontBig).drawString(title, x,r.y+2);
-            if (body) {
-                g.setFontAlign(-1,-1).setFont(fontMedium);
-                var l = g.wrapString(body, r.w-(x+14));
-                if (l.length>3) {
-                    l = l.slice(0,3);
-                    l[l.length-1]+="...";
-                }
-                longBody = l.length>2;
-                g.drawString(l.join("\n"), x+10,r.y+20);
-            }
-            //if (!longBody && msg.src) g.setFontAlign(1,1).setFont("6x8").drawString(msg.src, r.x+r.w-2, r.y+r.h-2);
-            g.setColor("#888").fillRect(r.x,r.y+r.h-1,r.x+r.w-1,r.y+r.h-1); // dividing line between items
-        },
-        select : idx => showEvent(CALENDAR[idx]),
-        back : () => load()
-    });
+  if(CALENDAR.length == 0) {
+    E.showMessage("No events");
+    return;
+  }
+  E.showScroller({
+    h : 52,
+    c : Math.max(CALENDAR.length,3), // workaround for 2v10.219 firmware (min 3 not needed for 2v11)
+    draw : function(idx, r) {"ram"
+      var ev = CALENDAR[idx];
+      g.setColor(g.theme.fg);
+      g.clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
+      if (!ev) return;
+      var isPast = ev.timestamp + ev.durationInSeconds < (new Date())/1000;
+      var x = r.x+2, title = ev.title;
+      var body = formatDateShort(getDate(ev.timestamp))+"\n"+ev.location;
+      var m = ev.title+"\n"+ev.location, longBody=false;
+      if (title) g.setFontAlign(-1,-1).setFont(fontBig)
+        .setColor(isPast ? "#888" : g.theme.fg).drawString(title, x,r.y+2);
+      if (body) {
+        g.setFontAlign(-1,-1).setFont(fontMedium).setColor(isPast ? "#888" : g.theme.fg);
+        var l = g.wrapString(body, r.w-(x+14));
+        if (l.length>3) {
+          l = l.slice(0,3);
+          l[l.length-1]+="...";
+        }
+        longBody = l.length>2;
+        g.drawString(l.join("\n"), x+10,r.y+20);
+      }
+      //if (!longBody && msg.src) g.setFontAlign(1,1).setFont("6x8").drawString(msg.src, r.x+r.w-2, r.y+r.h-2);
+      g.setColor("#888").fillRect(r.x,r.y+r.h-1,r.x+r.w-1,r.y+r.h-1); // dividing line between items
+    },
+    select : idx => showEvent(CALENDAR[idx]),
+    back : () => load()
+  });
 }
 showList();
diff --git a/apps/agenda/agenda.png b/apps/agenda/agenda.png
index ccbcce5ff..c850b0e5d 100644
Binary files a/apps/agenda/agenda.png and b/apps/agenda/agenda.png differ
diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json
index 6895bbc7c..0a9f6e44f 100644
--- a/apps/agenda/metadata.json
+++ b/apps/agenda/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "3.01",
+  "version": "2.01",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda.png"}],
diff --git a/apps/android/boot.js b/apps/android/boot.js
index 829c1b4b0..df21a5521 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -92,17 +92,13 @@
       },
       //TODO perhaps move those in a library (like messages), used also for viewing events?
       "calendar" : function() {
-        var cal;
-        try { cal = require("Storage").readJSON("android.calendar.json"); } catch (e) {}
-        if (!cal) cal = {}; // first event
-        cal[event.id] = event;
+        var cal = require("Storage").readJSON("android.calendar.json",true)||[];
+        cal.push(event);
         require("Storage").writeJSON("android.calendar.json", cal);
       },
       "calendar-" : function() {
-        var cal;
-        try { cal = require("Storage").readJSON("android.calendar.json"); } catch (e) {}
-        if (!cal) return; //nothing to remove
-        if (event.id in cal) delete cal[event.id];
+        var cal = require("Storage").readJSON("android.calendar.json",true)||return;
+        cal = cal.filter(e=>e.id!=event.id);
         require("Storage").writeJSON("android.calendar.json", cal);
       }
     };