diff --git a/apps/boldclk/ChangeLog b/apps/boldclk/ChangeLog
index 0d02bf644..f5d1af878 100644
--- a/apps/boldclk/ChangeLog
+++ b/apps/boldclk/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Tweak for more efficient rendering, and firmware 2v06
+0.04: Work with themes, smaller screens
diff --git a/apps/boldclk/bold_clock.js b/apps/boldclk/bold_clock.js
index b7eaa8968..191b6ec4f 100644
--- a/apps/boldclk/bold_clock.js
+++ b/apps/boldclk/bold_clock.js
@@ -12,9 +12,9 @@ var minute_hand = {
 //g.fillRect(0,24,239,239); // Apps area
 let intervalRef = null;
 const p180 = Math.PI/180;
-const clock_center = {x:Math.floor((240-1)/2), y:24+Math.floor((239-24)/2)};
+const clock_center = {x:Math.floor((g.getWidth()-1)/2), y:24+Math.floor((g.getHeight()-25)/2)};
 // ={ x: 119, y: 131 }
-const radius = Math.floor((239-24+1)/2); // =108
+const radius = Math.floor((g.getWidth()-24+1)/2); // =108
 
 let tick0 = Graphics.createArrayBuffer(30,8,1,{msb:true});
 tick0.fillRect(0,0,tick0.getWidth()-1, tick0.getHeight()-1);
@@ -60,18 +60,15 @@ function hour_angle(date){
 function draw_clock(){
   //console.log("draw_clock");
   let date = new Date();
-  //g.clear();
-  g.setBgColor(0,0,0);
-  g.setColor(0,0,0);
-  g.fillRect(0,24,239,239); // clear app area
-  g.setColor(1,1,1);
+  g.reset();
+  g.clearRect(0,24,239,239); // clear app area
 
   // draw cross lines for testing
   // g.setColor(1,0,0);
   // g.drawLine(clock_center.x - radius, clock_center.y, clock_center.x + radius, clock_center.y);
   // g.drawLine(clock_center.x, clock_center.y - radius, clock_center.x, clock_center.y + radius);
 
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
   let ticks = [0, 90, 180, 270];
   ticks.forEach((item)=>{
     let agl = item+180;
@@ -87,13 +84,13 @@ function draw_clock(){
   let minute_agl = minute_angle(date);
   g.drawImage(hour_hand, hour_pos_x(hour_agl), hour_pos_y(hour_agl), {rotate:hour_agl*p180}); //
   g.drawImage(minute_hand, minute_pos_x(minute_agl), minute_pos_y(minute_agl), {rotate:minute_agl*p180}); //
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
   g.fillCircle(clock_center.x, clock_center.y, 6);
-  g.setColor(0,0,0);
+  g.setColor(g.theme.bg);
   g.fillCircle(clock_center.x, clock_center.y, 3);
 
   // draw minute ticks. Takes long time to draw!
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
   for (var i=0; i<60; i++){
     let agl = i*6+180;
     g.drawImage(tick1.asImage(), rotate_around_x(big_wheel_x(i*6), agl, tick1), rotate_around_y(big_wheel_y(i*6), agl, tick1), {rotate:agl*p180});
@@ -141,5 +138,5 @@ g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 startTimers();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");
diff --git a/apps/clock2x3/ChangeLog b/apps/clock2x3/ChangeLog
index 88876affa..ef8057d6e 100644
--- a/apps/clock2x3/ChangeLog
+++ b/apps/clock2x3/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Added 'reset' so we don't get the font color from widgets
 0.04: Changed name from clck3x2 to clock2x3
+0.05: Use setUI, work with smaller screens and themes
diff --git a/apps/clock2x3/clock2x3-app.js b/apps/clock2x3/clock2x3-app.js
index 4caec28cb..bfe6a9ea8 100644
--- a/apps/clock2x3/clock2x3-app.js
+++ b/apps/clock2x3/clock2x3-app.js
@@ -1,8 +1,10 @@
+
+const big = g.getWidth()>200;
 const ox=10; // x offset
-const oy=80;
-const pw=20; // pixel width
-const ps=5; // pixel spacing
-const ds=10; // digit spacing
+const oy=big ? 80 : 70;
+const pw=big ? 20 : 14; // pixel width
+const ps=big ? 5 : 3; // pixel spacing
+const ds=big ? 10 : 8; // digit spacing
 const ms=20; // middle space
 
 const x00=ox; // digit 0, pixel 0, x position
@@ -90,7 +92,7 @@ Bangle.on('lcdPower', function(on){
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 drawTime();
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});