diff --git a/apps.json b/apps.json
index 9436c9f6b..9191379d1 100644
--- a/apps.json
+++ b/apps.json
@@ -202,7 +202,7 @@
     "name": "Default Alarm",
     "shortName":"Alarms",
     "icon": "app.png",
-    "version":"0.11",
+    "version":"0.12",
     "description": "Set and respond to alarms",
     "tags": "tool,alarm,widget,b2",
     "storage": [
@@ -1184,7 +1184,7 @@
   { "id": "widpedom",
     "name": "Pedometer widget",
     "icon": "widget.png",
-    "version":"0.17",
+    "version":"0.18",
     "description": "Daily pedometer widget",
     "tags": "widget,b2",
     "type":"widget",
diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index 96e1490ab..4084a7d3f 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -9,3 +9,4 @@
 0.09: Add per alarm auto-snooze option
 0.10: Fix auto-snooze option (this stopped new alarms being added) (fix #506)
 0.11: Respect Quiet Mode
+0.12: Fix widget for bangle 2, now uses theme
diff --git a/apps/alarm/widget.js b/apps/alarm/widget.js
index dbe91b3dd..7b9a88bb9 100644
--- a/apps/alarm/widget.js
+++ b/apps/alarm/widget.js
@@ -5,7 +5,7 @@
   delete alarms;
   // add the widget
   WIDGETS["alarm"]={area:"tl",width:24,draw:function() {
-    g.setColor(-1);
+    g.setColor(g.theme.fg);
     g.drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
   }};
 })()
diff --git a/apps/widpedom/ChangeLog b/apps/widpedom/ChangeLog
index a5ed0eeb2..8844a7d44 100644
--- a/apps/widpedom/ChangeLog
+++ b/apps/widpedom/ChangeLog
@@ -14,3 +14,4 @@
 0.15: Settings option to hide the widget icon
 0.16: Settings option to show large digits in widget area
 0.17: Cope with 2v10+ firmware sometimes reporting >1 step
+0.18: Adjust widget width when displaying large text
diff --git a/apps/widpedom/widget.js b/apps/widpedom/widget.js
index 975112e02..fbc2a87bb 100644
--- a/apps/widpedom/widget.js
+++ b/apps/widpedom/widget.js
@@ -54,9 +54,9 @@
 
   // show the step count in the widget area in a readable sized font
   function draw_large(st) {
-    var width = 12 * st.length;
+    this.width = 12 * st.length + 3;
     g.reset();
-    g.clearRect(this.x, this.y, this.x + width, this.y + 16); // erase background
+    g.clearRect(this.x, this.y, this.x + this.width, this.y + 16); // erase background
     g.setColor(g.theme.fg);
     g.setFont("6x8",2);
     g.setFontAlign(-1, -1);