diff --git a/apps/barwatch/app.js b/apps/barwatch/app.js
index ff43bad44..d6b759706 100644
--- a/apps/barwatch/app.js
+++ b/apps/barwatch/app.js
@@ -13,24 +13,22 @@ function queueDraw() {
 
 function draw() {
   g.reset();
-  g.setBgColor(0, 1, 1);
+
+  if(g.theme.dark){
+    g.setColor(1,1,1);
+  }else{
+    g.setColor(0,0,0);
+  }
 
   // work out how to display the current time
   var d = new Date();
   var h = d.getHours(), m = d.getMinutes();
-  //h = 13;
-  //m = 59;
-
-  var battery = E.getBattery() / 100;
-  g.setColor(1-battery,0+battery,0);
-  //console.log(battery);
-  g.setColor(1,1,1);
 
+  // hour bars
   var bx_offset = 10, by_offset = 35;
   var b_width = 8, b_height = 60;
   var b_space = 5;
 
-  // hour bars
   for(var i=0; i<h; i++){
     if(i > 11){
       by_offset = 105;
@@ -75,6 +73,5 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
-
+Bangle.setUI("clock");
 Bangle.drawWidgets();
-Bangle.setUI("clock");
\ No newline at end of file
diff --git a/apps/barwatch/metadata.json b/apps/barwatch/metadata.json
index f0e3b87ab..adcd44107 100644
--- a/apps/barwatch/metadata.json
+++ b/apps/barwatch/metadata.json
@@ -5,7 +5,7 @@
   "version":"0.01",
   "description": "A watch that displays the time using bars. One bar for each hour.",
   "readme": "README.md",
-  "icon": "barwatch.png",
+  "icon": "screenshot.png",
   "tags": "clock",
   "type": "clock",
   "allow_emulator":true,
diff --git a/apps/barwatch/barwatch.png b/apps/barwatch/screenshot.png
similarity index 100%
rename from apps/barwatch/barwatch.png
rename to apps/barwatch/screenshot.png