diff --git a/apps.json b/apps.json
index 940176014..f1fe08cf4 100644
--- a/apps.json
+++ b/apps.json
@@ -2095,12 +2095,13 @@
     "id": "devstopwatch",
     "name": "Dev Stopwatch",
     "shortName": "Dev Stopwatch",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Stopwatch with 5 laps supported (cyclically replaced)",
     "icon": "app.png",
     "tags": "stopwatch,chrono,timer,chronometer",
     "supports": ["BANGLEJS","BANGLEJS2"],
-    "screenshots": [{"url":"bangle1-dev-stopwatch-screenshot.png"}],
+    "screenshots": [{"url":"bangle1-dev-stopwatch-screenshot.png"},{"url":"bangle2-dev-stopwatch-screenshot.png"}],
+    "readme": "README.md",
     "allow_emulator": true,
     "storage": [
       {"name":"devstopwatch.app.js","url":"app.js"},
diff --git a/apps/devstopwatch/ChangeLog b/apps/devstopwatch/ChangeLog
index e2b392fe9..7e90e061e 100644
--- a/apps/devstopwatch/ChangeLog
+++ b/apps/devstopwatch/ChangeLog
@@ -1,3 +1,8 @@
 0.01: App created
 0.02: Persist state to storage to enable stopwatch to continue in the background
 0.03: Modified to use setUI, theme and different screens
+0.04: *bugfix* stopwatch broken with v0.03 setUI
+      realigned quick n dirty screen positions
+      help adjusted to fit bangle1 & bangle2 screen-size with widgets
+      fixed bangle2 colors for chrono and last lap highlight
+      added screen for bangle2 and a small README
\ No newline at end of file
diff --git a/apps/devstopwatch/README.md b/apps/devstopwatch/README.md
new file mode 100644
index 000000000..02a13151f
--- /dev/null
+++ b/apps/devstopwatch/README.md
@@ -0,0 +1,18 @@
+# dev stop watch
+
+stores state at kill
+
+## Bangle 1
+![](bangle1-dev-stopwatch-screenshot.png)
+
+* BTN1: start/lap
+* BTN2: launcher
+* BTN3: reset
+
+## Bangle 2
+![](bangle2-dev-stopwatch-screenshot.png)
+
+* TAP top right: start/lap
+* TAP bottom right: reset
+* Use BTN to get to launcher
+
diff --git a/apps/devstopwatch/app.js b/apps/devstopwatch/app.js
index 83bb693a9..d2a4b1117 100644
--- a/apps/devstopwatch/app.js
+++ b/apps/devstopwatch/app.js
@@ -3,11 +3,11 @@ const EMPTY_H = '00:00:000';
 const MAX_LAPS = 6;
 const XY_CENTER = g.getWidth() / 2;
 const big = g.getWidth()>200;
-const Y_CHRONO = 40;
-const Y_HEADER = big?80:60;
-const Y_LAPS = big?125:90;
+const Y_CHRONO = big?40:30;
+const Y_HEADER = big?95:65;
+const Y_LAPS = big?125:80;
 const H_LAPS = big?15:8;
-const Y_BTN3 = big?225:165;
+const Y_HELP = big?225:135;
 const FONT = '6x8';
 const CHRONO = '/* C H R O N O */';
 
@@ -27,18 +27,17 @@ var state = require("Storage").readJSON("devstopwatch.state.json",1) || {
 
 // Show launcher when button pressed
 Bangle.setUI("clockupdown", btn=>{
-  if (btn==0) {
-  reset = false;
-
-  if (state.started) {
-    changeLap();
-  } else {
-    if (!reset) {
-      chronoInterval = setInterval(chronometer, 10);
-    }
+  switch (btn) {
+    case -1:
+      if (state.started) {
+        changeLap();
+      } else {
+        chronoInterval = setInterval(chronometer, 10);
+      }
+      break;
+    case 1: resetChrono(); break;
+    default: Bangle.showLauncher(); break; //launcher handeled by ROM
   }
-}
-  if (btn==1) resetChrono();
 });
 
 function resetChrono() {
@@ -105,6 +104,7 @@ function printChrono() {
 
   var print = '';
 
+  g.setColor(g.theme.fg);
   g.setFont(FONT, big?2:1);
   print = CHRONO;
   g.drawString(print, XY_CENTER, Y_CHRONO, true);
@@ -124,7 +124,8 @@ function printChrono() {
     let suffix = ' ';
     if (state.currentLapIndex === i) {
       let suffix = '*';
-      g.setColor("#f70");
+      if (process.env.HWVERSION==2) g.setColor("#0ee");
+      else g.setColor("#f70");
     }
 
     const lapLine = `L${i - 1} ${state.laps[i]} ${suffix}\n`;
@@ -133,8 +134,17 @@ function printChrono() {
 
   g.setColor(g.theme.fg);
   g.setFont(FONT, 1);
-  print = 'Press 3 to reset';
-  g.drawString(print, XY_CENTER, Y_BTN3, true);
+  //help for model 2 or 1
+  if (process.env.HWVERSION==2) {
+    print = /*LANG*/'TAP right top/bottom';
+    g.drawString(print, XY_CENTER, Y_HELP, true);
+    print = /*LANG*/'start&lap/reset, BTN1: EXIT';
+    g.drawString(print, XY_CENTER, Y_HELP+10, true);
+  }
+  else {
+    print = /*LANG*/'BTNs 1:startlap 2:exit 3:reset';
+    g.drawString(print, XY_CENTER, Y_HELP, true);
+  }
 
   g.flip();
 }
diff --git a/apps/devstopwatch/bangle1-dev-stopwatch-screenshot.png b/apps/devstopwatch/bangle1-dev-stopwatch-screenshot.png
index b668794b1..8a9c9b46e 100644
Binary files a/apps/devstopwatch/bangle1-dev-stopwatch-screenshot.png and b/apps/devstopwatch/bangle1-dev-stopwatch-screenshot.png differ
diff --git a/apps/devstopwatch/bangle2-dev-stopwatch-screenshot.png b/apps/devstopwatch/bangle2-dev-stopwatch-screenshot.png
new file mode 100644
index 000000000..a01c0c261
Binary files /dev/null and b/apps/devstopwatch/bangle2-dev-stopwatch-screenshot.png differ