diff --git a/apps/sunmoonclk/ChangeLog b/apps/sunmoonclk/ChangeLog
new file mode 100644
index 00000000000..90161ac9850
--- /dev/null
+++ b/apps/sunmoonclk/ChangeLog
@@ -0,0 +1 @@
+0.01: Initial app
diff --git a/apps/sunmoonclk/app-icon.js b/apps/sunmoonclk/app-icon.js
new file mode 100644
index 00000000000..642553296fc
--- /dev/null
+++ b/apps/sunmoonclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("MDCDASSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSAAACSSSSSSSSSSSSSSSSSSAMP/+AAOSSSSSSSSSSSSSSSNtth////wCSSSSSSSSSSSSSdttth/////xySSSSSSSSSSSRttttsP////+ASSSSSSSSSSTtttttth/////+CSSSSSSSSSdtttttth//////wSSSSSSSSTtttttttsP/////+CSSSSSSSdtttttttsP//////wSSSSSSSNttttsBtth//+B//xySSSSSTttttth+Nth//x+P/+CSSSSSdttttsOB9th/+OBx//wSSSSSNttttsOB9tsP+OBx//xySSSTtttttsP/9tsP+P/x//+CSSSRtttttth+NtsP/x+P//+OSSSRttttttsBttsP/+B///+OSSSRtttttttttth///////+OSSSdtttttttttth////////wSSSNtttttttttsP////////xySSNttttttttth/////////xySSNttttttttth/////////xySSNtttttttttsAP///////xySSNttttttttttth///////xySSNttttttttttth///////xySSNttttttttttth///////xySSRttttttttttth//////+PySSRttttttttttth//////+OSSSRtttttthtttsP//x///+OSSSRttttttsNttsP/+P///+OSSSeNtttttsNttsP/+P///x+SSSSNttttthhttsP/xx///xySSSTxttttttsAAAAAP///+PySSSSRttttttttth//////x+SSSSSSNtttttttth//////xySSSSSSRtttttttsP/////+PySSSSSSSNttttttsP/////x+SSSSSSSSRtttttth/////+PySSSSSSSSSBttttsP////+B+SSSSSSSSSSeNttth/////x/ySSSSSSSSSSSQNtth////wPySSSSSSSSSSSSTwAMP//wAP+SSSSSSSSSSSSSST/wAAAP/+SSSSSSSSSSSSSSSSST///+SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSQ=="))
diff --git a/apps/sunmoonclk/app.js b/apps/sunmoonclk/app.js
new file mode 100644
index 00000000000..d34b6bde1df
--- /dev/null
+++ b/apps/sunmoonclk/app.js
@@ -0,0 +1,102 @@
+// Load fonts
+require("Font7x11Numeric7Seg").add(Graphics);
+// X/Y are the position of the bottom right of the HH:MM text - make it central!
+const X = g.getWidth()/2 + 45,
+      Y = g.getHeight()/2 + 40;
+
+function draw() {
+  // work out how to display the current time
+  var d = new Date();
+  var clock = require("locale").time(d, 1 /*omit seconds*/);
+  var seconds = d.getSeconds().toString().padStart(2,0);
+  var meridian = require("locale").meridian(d);
+ 
+  // Reset the state of the graphics library
+  g.reset();
+  // draw the current time (4x size 7 segment)
+  g.setFontAlign(1,1); // align bottom right
+  g.setFont("7x11Numeric7Seg:4");
+  g.drawString(clock, X, Y, true /*clear background*/);
+  // draw the meridian(am/pm) and seconds (2x size 7 segment)
+  g.setFontAlign(-1,1); // align bottom left
+  g.setFont("6x8:2");
+  g.drawString(meridian, X+4, Y-26, true /*clear background*/);
+  g.setFont("7x11Numeric7Seg:2");
+  g.drawString(seconds, X+2, Y, true /*clear background*/);
+  // draw the date, in a normal font
+  g.setFont("6x8", 2);
+  g.setFontAlign(0,-40); // align center bottom
+  // pad the date - this clears the background if the date were to change length
+  var dateStr = "    "+require("locale").date(d)+"    ";
+  g.drawString(dateStr, g.getWidth()/2, Y+15, true /*clear background*/);
+  
+   // Get current time
+  let now = new Date();
+  let h = now.getHours();
+  let m = now.getMinutes();
+  let timeStr = ("0" + h).slice(-2) + ":" + ("0" + m).slice(-2);
+
+  // Draw sun or moon icon
+  if (h >= 6 && h < 18) {
+    drawSun(g.getWidth()/2, g.getHeight()/2 - 38);
+  } else {
+    clearSun(g.getWidth()/2, g.getHeight()/2 - 38);
+    drawMoon(g.getWidth()/2, g.getHeight()/2 - 38);
+  }
+}
+
+function drawSun(x, y) {
+  g.setColor("#FF8C00"); // orange
+  g.fillCircle(x, y, 12);
+  for (let i = 0; i < 8; i++) {
+    let angle = i * Math.PI / 4;
+    g.drawLine(
+      x + Math.cos(angle) * 16,
+      y + Math.sin(angle) * 16,
+      x + Math.cos(angle) * 22,
+      y + Math.sin(angle) * 22
+    );
+  }
+}
+    function clearSun(x, y) {
+  g.setColor("#000000"); // black
+  g.fillCircle(x, y, 12);
+  for (let i = 0; i < 8; i++) {
+    let angle = i * Math.PI / 4;
+    g.drawLine(
+      x + Math.cos(angle) * 16,
+      y + Math.sin(angle) * 16,
+      x + Math.cos(angle) * 22,
+      y + Math.sin(angle) * 22
+    );
+  }
+}
+function drawMoon(x, y) {
+  g.setColor("#F5F5F5"); // white smoke
+  g.fillCircle(x, y, 12);
+  g.setColor(0, 0, 0); // mask for crescent
+  g.fillCircle(x + 5, y - 2, 12);
+}
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first
+draw();
+// now draw every second
+var secondInterval = setInterval(draw, 1000);
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (secondInterval) clearInterval(secondInterval);
+  secondInterval = undefined;
+  if (on) {
+    secondInterval = setInterval(draw, 1000);
+    draw(); // draw immediately
+  }
+});
+/* Show launcher when middle button pressed
+This should be done *before* Bangle.loadWidgets so that
+widgets know if they're being loaded into a clock app or not */
+Bangle.setUI("clock");
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
\ No newline at end of file
diff --git a/apps/sunmoonclk/metadata.json b/apps/sunmoonclk/metadata.json
new file mode 100644
index 00000000000..86bf405ecef
--- /dev/null
+++ b/apps/sunmoonclk/metadata.json
@@ -0,0 +1,22 @@
+{
+  "id": "sunmoonclk",
+  "name": "Sun and Moon Clock",
+  "version": "0.01",
+  "author": "ehartwork",
+  "description": "A basic clock with sun and moon images to represent day and night hours. Day is set from 6:00 AM to 5:59 PM and night is set from 6:00 PM to 5:59 AM.",
+  "icon": "sunmoonclk.png",
+  "screenshots": [{"url":"screenshot_sun.png"},
+                  {"url":"screenshot_moon.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"sunmoonclk.app.js","url":"app.js"},
+    {"name":"sunmoonclk.img","url":"app-icon.js","evaluate":true}
+  ]
+
+}
+
+
+
diff --git a/apps/sunmoonclk/screenshot_moon.png b/apps/sunmoonclk/screenshot_moon.png
new file mode 100644
index 00000000000..88b416af640
Binary files /dev/null and b/apps/sunmoonclk/screenshot_moon.png differ
diff --git a/apps/sunmoonclk/screenshot_sun.png b/apps/sunmoonclk/screenshot_sun.png
new file mode 100644
index 00000000000..e77e7e261fc
Binary files /dev/null and b/apps/sunmoonclk/screenshot_sun.png differ
diff --git a/apps/sunmoonclk/sunmoonclk.png b/apps/sunmoonclk/sunmoonclk.png
new file mode 100644
index 00000000000..32f1c237156
Binary files /dev/null and b/apps/sunmoonclk/sunmoonclk.png differ