diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index e88bcbbe84..6a690bac05 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -103,6 +103,11 @@
 			if ((wd&254) != 254 || (i<8 && (gN("M"+i).value != 1 || gN("D"+i).value != 1 || gN("P"+i).value != 12 || gN("E"+i).value != 31))) {
 				expand(gId("CB"+i),i); //expand macros with custom DOW or date range set
 			}
+			if (gId("cd").selected)
+			{
+				gId("coc").style.display="none";
+				gId("ccc").style.display="none";
+			}
 		}
 	}
 	function Wd()
@@ -205,6 +210,7 @@ <h3>Clock</h3>
 			<option value="1" id="ca">Analog Clock</option>
 			<option value="2">Single Digit Clock</option>
 			<option value="3" id="cc">Cronixie Clock</option>
+			<option value="4" id="cd">Digital Clock</option>
 		</select><br>
 		<div id="coc">
 		First LED: <input name="O1" type="number" min="0" max="255" required> Last LED: <input name="O2" type="number" min="0" max="255" required><br>
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 02ee5d149e..5d970e1991 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -358,7 +358,8 @@ Keep at 115200 to use Improv. Some boards may not support high rates.</i><hr>
 // Autogenerated from wled00/data/settings_time.htm, do not edit!!
 const char PAGE_settings_time[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta name="viewport" content="width=500">
 <meta charset="utf-8"><title>Time Settings</title><script>
-var d=document,el=!1,ms=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],cals='style="font-size:27px;margin-top:-6px;cursor:pointer"';function H(){window.open("https://kno.wled.ge/features/settings/#time-settings")}function B(){window.open("/settings","_self")}function S(){BTa(),GetV(),updLoc(),Cs(),FC()}function gId(t){return d.getElementById(t)}function gN(t){return d.getElementsByName(t)[0]}function expand(t,e){var n=gId("WD"+e);n.style.display="none"!==n.style.display?"none":"",t.innerHTML="none"===n.style.display?"&#128197;":"&#x2715;"}function Cs(){gId("cac").style.display="none",gId("coc").style.display="block",gId("ccc").style.display="none",gId("ca").selected&&(gId("cac").style.display="block"),gId("cc").selected&&(gId("coc").style.display="none",gId("ccc").style.display="block"),gId("cn").selected&&(gId("coc").style.display="none")}function BTa(){var t="<tr><th>En.</th><th>Hour</th><th>Minute</th><th>Preset</th><th></th></tr>";for(i=0;i<8;i++){for(t+=`<tr><td><input name="W${i}" id="W${i}" type="hidden"><input id="W${i}0" type="checkbox"></td>\n<td><input name="H${i}" class="xs" type="number" min="0" max="24"></td>\n<td><input name="N${i}" class="xs" type="number" min="0" max="59"></td>\n<td><input name="T${i}" class="s" type="number" min="0" max="250"></td>\n<td><div id="CB${i}" onclick="expand(this,${i})" ${cals}>&#128467;</div></td></tr>`,t+=`<tr><td colspan=5><div id="WD${i}" style="display:none;">Run on weekdays`,t+='<table style="width:100%%;"><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>',j=1;j<8;j++)t+=`<td><input id="W${i}${j}" type="checkbox"></td>`;for(t+=`</tr></table>from\n<select name="M${i}">`,j=0;j<12;j++)t+=`<option value="${j+1}">${ms[j]}</option>`;for(t+=`</select><input name="D${i}" class="xs" type="number" min="1" max="31"></input> to\n<select name="P${i}">`,j=0;j<12;j++)t+=`<option value="${j+1}">${ms[j]}</option>`;t+=`</select><input name="E${i}" class="xs" type="number" min="1" max="31"></input>\n\t\t<hr></div></td></tr>`}for(t+=`<tr><td><input name="W8" id="W8" type="hidden"><input id="W80" type="checkbox"></td>\n<td>Sunrise<input name="H8" value="255" type="hidden"></td>\n<td><input name="N8" class="xs" type="number" min="-59" max="59"></td>\n<td><input name="T8" class="s" type="number" min="0" max="250"></td>\n<td><div id="CB8" onclick="expand(this,8)" ${cals}>&#128467;</div></td></tr><tr><td colspan=5>`,t+='<div id="WD8"style="display:none;"><table style="width:100%%;"><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>',j=1;j<8;j++)t+=`<td><input id="W8${j}" type="checkbox"></td>`;for(t+="</tr></table><hr></div></td></tr>",t+=`<tr><td><input name="W9" id="W9" type="hidden"><input id="W90" type="checkbox"></td>\n<td>Sunset<input name="H9" value="255" type="hidden"></td>\n<td><input name="N9" class="xs" type="number" min="-59" max="59"></td>\n<td><input name="T9" class="s" type="number" min="0" max="250"></td>\n<td><div id="CB9" onclick="expand(this,9)" ${cals}>&#128467;</div></td></tr><tr><td colspan=5>`,t+='<div id="WD9" style="display:none;"><table style="width:100%%;"><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>',j=1;j<8;j++)t+=`<td><input id="W9${j}" type="checkbox"></td>`;t+="</tr></table><hr></div></td></tr>",gId("TMT").innerHTML=t}function FC(){for(i=0;i<10;i++){let t=gId("W"+i).value;for(j=0;j<8;j++)gId("W"+i+j).checked=t>>j&1;(254!=(254&t)||i<8&&(1!=gN("M"+i).value||1!=gN("D"+i).value||12!=gN("P"+i).value||31!=gN("E"+i).value))&&expand(gId("CB"+i),i)}}function Wd(){for(a=[0,0,0,0,0,0,0,0,0,0],i=0;i<10;i++){for(m=1,j=0;j<8;j++)a[i]+=gId("W"+i+j).checked*m,m*=2;gId("W"+i).value=a[i]}"S"===d.Sf.LTR.value&&(d.Sf.LT.value=-1*parseFloat(d.Sf.LT.value)),"W"===d.Sf.LNR.value&&(d.Sf.LN.value=-1*parseFloat(d.Sf.LN.value))}function addRow(t,e,n,i){var d=gId("macros"),a=d.rows.length,l=d.insertRow(a),s=String.fromCharCode((t<10?48:55)+t);document.createElement("td");l.insertCell(0).innerHTML=`Button ${t}:`,l.insertCell(1).innerHTML=`<input name="MP${s}" type="number" class="s" min="0" max="250" value="${e}" required>`,l.insertCell(2).innerHTML=`<input name="ML${s}" type="number" class="s" min="0" max="250" value="${n}" required>`,l.insertCell(3).innerHTML=`<input name="MD${s}" type="number" class="s" min="0" max="250" value="${i}" required>`}function getLoc(){el||(window.addEventListener("message",t=>{"https://locate.wled.me"===t.origin&&t.data instanceof Object&&(d.Sf.LT.value=t.data.lat,d.Sf.LN.value=t.data.lon,updLoc())},!1),el=!0),window.open("https://locate.wled.me","_blank")}function updLoc(t){parseFloat(d.Sf.LT.value)<0?(d.Sf.LTR.value="S",d.Sf.LT.value=-1*parseFloat(d.Sf.LT.value)):d.Sf.LTR.value="N",parseFloat(d.Sf.LN.value)<0?(d.Sf.LNR.value="W",d.Sf.LN.value=-1*parseFloat(d.Sf.LN.value)):d.Sf.LNR.value="E"}function GetV() {
+var d=document;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#time-settings")}function B(){window.open("/settings","_self")}function S(){BTa(),GetV(),Cs(),FC()}function gId(t){return d.getElementById(t)}function Cs(){gId("cac").style.display="none",gId("coc").style.display="block",gId("ccc").style.display="none",gId("ca").selected&&(gId("cac").style.display="block"),gId("cc").selected&&(gId("coc").style.display="none",gId("ccc").style.display="block"),gId("cn").selected&&(gId("coc").style.display="none")}function BTa(){var t="<tr><th>Active</th><th>Hour</th><th>Minute</th><th>Preset</th><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr>";for(i=0;i<8;i++)for(t+='<tr><td><input name="W'+i+'" id="W'+i+'" type="number" style="display:none"><input id="W'+i+'0" type="checkbox"></td><td><input name="H'+i+'" type="number" min="0" max="24"></td><td><input name="N'+i+'" type="number" min="0" max="59"></td><td><input name="T'+i+'" type="number" min="0" max="250"></td>',j=1;j<8;j++)t+='<td><input id="W'+i+j+'" type="checkbox"></td>';gId("TMT").innerHTML=t}function FC(){for(j=0;j<8;j++)for(i=0;i<8;i++)gId("W"+i+j).checked=gId("W"+i).value>>j&1}function Wd(){for(a=[0,0,0,0,0,0,0,0],i=0;i<8;i++){for(m=1,j=0;j<8;j++)a[i]+=gId("W"+i+j).checked*m,m*=2;gId("W"+i).value=a[i]}}function GetV() {
+ype="number" class="s" min="0" max="250" value="${e}" required>`,l.insertCell(2).innerHTML=`<input name="ML${s}" type="number" class="s" min="0" max="250" value="${n}" required>`,l.insertCell(3).innerHTML=`<input name="MD${s}" type="number" class="s" min="0" max="250" value="${i}" required>`}function getLoc(){el||(window.addEventListener("message",t=>{"https://locate.wled.me"===t.origin&&t.data instanceof Object&&(d.Sf.LT.value=t.data.lat,d.Sf.LN.value=t.data.lon,updLoc())},!1),el=!0),window.open("https://locate.wled.me","_blank")}function updLoc(t){parseFloat(d.Sf.LT.value)<0?(d.Sf.LTR.value="S",d.Sf.LT.value=-1*parseFloat(d.Sf.LT.value)):d.Sf.LTR.value="N",parseFloat(d.Sf.LN.value)<0?(d.Sf.LNR.value="W",d.Sf.LN.value=-1*parseFloat(d.Sf.LN.value)):d.Sf.LNR.value="E"}function GetV() {
 %CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post" onsubmit="Wd()"><div class="helpB"><button 
 type="button" onclick="H()">?</button></div><button type="button" onclick="B()">
@@ -389,7 +390,8 @@ type="button" id="locbtn" onclick="getLoc()">Get location</button><div><i>
 </div><h3>Clock</h3>Clock Overlay: <select name="OL" onchange="Cs()"><option 
 value="0" id="cn" selected="selected">None</option><option value="1" id="ca">
 Analog Clock</option><option value="2">Single Digit Clock</option><option 
-value="3" id="cc">Cronixie Clock</option></select><br><div id="coc">First LED: 
+value="3" id="cc">Cronixie Clock</option><option value="4" id="cd">Digital Clock
+</option></select><br><div id="coc">First LED: 
 <input name="O1" type="number" min="0" max="255" required> Last LED: <input 
 name="O2" type="number" min="0" max="255" required><br><div id="cac">12h LED: 
 <input name="OM" type="number" min="0" max="255" required><br>Show 5min marks: 
diff --git a/wled00/overlay.cpp b/wled00/overlay.cpp
index 2c63149526..a6a6d8d583 100644
--- a/wled00/overlay.cpp
+++ b/wled00/overlay.cpp
@@ -28,6 +28,98 @@ void handleOverlays()
   }
 }
 
+/**
+ * Write the encoded number into the led strip at the specified position.
+ * In this case we rely on the regular effect funtion to have enabled/colored the leds according to it's own rules.
+ * Here we simply disable the leds that are supposed to be dark, leading to a number display that animates according to the selected effect.
+ */
+void drawNumberDigitalClock(bool i0, bool i1, bool i2, bool i3, bool i4, bool i5, bool i6, int pos)
+{
+  pos = pos * 7;
+  if (pos > 7)
+  {
+    pos = pos + 2;
+  }
+  if (!i0)
+  {
+    strip.setPixelColor(pos, 0x000000);
+  }
+
+  if (!i1)
+  {
+    strip.setPixelColor(pos + 1, 0x000000);
+  }
+
+  if (!i2)
+  {
+    strip.setPixelColor(pos + 2, 0x000000);
+  }
+  if (!i3)
+  {
+    strip.setPixelColor(pos + 3, 0x000000);
+  }
+  if (!i4)
+  {
+    strip.setPixelColor(pos + 4, 0x000000);
+  }
+  if (!i5)
+  {
+    strip.setPixelColor(pos + 5, 0x000000);
+  }
+  if (!i6)
+  {
+    strip.setPixelColor(pos + 6, 0x000000);
+  }
+}
+/**
+ * Encode a single digit into a 7-segment sequence.
+ */
+void writeDigitDigitalClock(int num, int pos)
+{
+  switch (num)
+  {
+  case 0:
+    drawNumberDigitalClock(false, true, true, true, true, true, true, pos);
+    break;
+  case 1:
+    drawNumberDigitalClock(false, true, false, false, false, false, true, pos);
+    break;
+  case 2:
+    drawNumberDigitalClock(true, true, true, false, true, true, false, pos);
+    break;
+  case 3:
+    drawNumberDigitalClock(true, true, true, false, false, true, true, pos);
+    break;
+  case 4:
+    drawNumberDigitalClock(true, true, false, true, false, false, true, pos);
+    break;
+  case 5:
+    drawNumberDigitalClock(true, false, true, true, false, true, true, pos);
+    break;
+  case 6:
+    drawNumberDigitalClock(true, false, true, true, true, true, true, pos);
+    break;
+  case 7:
+    drawNumberDigitalClock(false, true, true, false, false, false, true, pos);
+    break;
+  case 8:
+    drawNumberDigitalClock(true, true, true, true, true, true, true, pos);
+    break;
+  case 9:
+    drawNumberDigitalClock(true, true, true, true, false, true, true, pos);
+    break;
+  }
+}
+
+void _overlayDigitalClock()
+{
+  // hours
+  writeDigitDigitalClock(hour(localTime) / 10, 0);
+  writeDigitDigitalClock(hour(localTime) - ((hour(localTime) / 10) * 10), 1);
+  // minutes
+  writeDigitDigitalClock(minute(localTime) / 10, 2);
+  writeDigitDigitalClock(minute(localTime) - ((minute(localTime) / 10) * 10), 3);
+}
 
 void _overlayAnalogClock()
 {
@@ -119,6 +211,7 @@ void handleOverlayDraw() {
   {
     case 1: _overlayAnalogClock(); break;
     case 3: _drawOverlayCronixie(); break;
+    case 4: _overlayDigitalClock(); break;
   }
 }
 
