diff --git a/usermods/deep_sleep/deep_sleep.cpp b/usermods/deep_sleep/deep_sleep.cpp
index cff40f86de..c110e562c6 100644
--- a/usermods/deep_sleep/deep_sleep.cpp
+++ b/usermods/deep_sleep/deep_sleep.cpp
@@ -89,28 +89,29 @@ class DeepSleepUsermod : public Usermod {
       int currentWeekday = weekdayMondayFirst(); // 1=Monday ... 7=Sunday
       int minDifference = INT_MAX;
 
-      for (uint8_t i = 0; i < 8; i++) {
-        // check if timer is enabled and date is in range, also wakes up if no macro is used
-        if ((timerWeekday[i] & 0x01) && isTodayInDateRange(((timerMonth[i] >> 4) & 0x0F), timerDay[i], timerMonth[i] & 0x0F, timerDayEnd[i])) {
+      for (size_t i = 0; i < timers.size(); i++) {
+        const Timer& t = timers[i];
+        // only regular enabled timers with valid date range can be used for wake scheduling
+        if (!t.isEnabled() || !t.isRegular()) continue;
+        if (!isTodayInDateRange(t.monthStart, t.dayStart, t.monthEnd, t.dayEnd)) continue;
 
-          // if timer is enabled (bit0 of timerWeekday) and date is in range, check all weekdays it is set for
-          for (int dayOffset = 0; dayOffset < 7; dayOffset++) {
-            int checkWeekday = ((currentWeekday + dayOffset) % 7); // 1-7, check all weekdays starting from today
-            if (checkWeekday == 0) {
-              checkWeekday = 7; // sunday is 7 not 0
-            }
+        // check all weekdays for the current timer, starting from today
+        for (int dayOffset = 0; dayOffset < 7; dayOffset++) {
+          int checkWeekday = (currentWeekday + dayOffset) % 7; // 1-7, check all weekdays starting from today
+          if (checkWeekday == 0) {
+            checkWeekday = 7; // sunday is 7 not 0
+          }
 
-            int targetHour = timerHours[i];
-            int targetMinute = timerMinutes[i];
-            if ((timerWeekday[i] >> (checkWeekday)) & 0x01) {
-              if (dayOffset == 0 && (targetHour < currentHour || (targetHour == currentHour && targetMinute <= currentMinute)))
-                continue; // skip if time has already passed today
+          int targetHour = t.hour;
+          int targetMinute = t.minute;
+          if ((t.weekdays >> checkWeekday) & 0x01) {
+            if (dayOffset == 0 && (targetHour < currentHour || (targetHour == currentHour && targetMinute <= currentMinute)))
+              continue; // skip if time has already passed today
 
-              int timeDifference = calculateTimeDifference(currentHour, currentMinute, targetHour + (dayOffset * 24), targetMinute);
-              if (timeDifference < minDifference) {
-                minDifference = timeDifference;
-                wakeupPreset = timerMacro[i];
-              }
+            int timeDifference = calculateTimeDifference(currentHour, currentMinute, targetHour + (dayOffset * 24), targetMinute);
+            if (timeDifference < minDifference) {
+              minDifference = timeDifference;
+              wakeupPreset = t.preset;
             }
           }
         }
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 4f131cab96..f628dfa557 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -689,37 +689,28 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(macroCountdown, cntdwn["macro"]);
   setCountdown();
 
-  JsonArray timers = tm["ins"];
-  uint8_t it = 0;
-  for (JsonObject timer : timers) {
-    if (it > 9) break;
-    if (it<8 && timer[F("hour")]==255) it=8;  // hour==255 -> sunrise/sunset
-    CJSON(timerHours[it], timer[F("hour")]);
-    CJSON(timerMinutes[it], timer["min"]);
-    CJSON(timerMacro[it], timer["macro"]);
-
-    byte dowPrev = timerWeekday[it];
-    //note: act is currently only 0 or 1.
-    //the reason we are not using bool is that the on-disk type in 0.11.0 was already int
-    int actPrev = timerWeekday[it] & 0x01;
-    CJSON(timerWeekday[it], timer[F("dow")]);
-    if (timerWeekday[it] != dowPrev) { //present in JSON
-      timerWeekday[it] <<= 1; //add active bit
-      int act = timer["en"] | actPrev;
-      if (act) timerWeekday[it]++;
-    }
-    if (it<8) {
-      JsonObject start = timer["start"];
-      byte startm = start["mon"];
-      if (startm) timerMonth[it] = (startm << 4);
-      CJSON(timerDay[it], start["day"]);
-      JsonObject end = timer["end"];
-      CJSON(timerDayEnd[it], end["day"]);
-      byte endm = end["mon"];
-      if (startm) timerMonth[it] += endm & 0x0F;
-      if (!(timerMonth[it] & 0x0F)) timerMonth[it] += 12; //default end month to 12
+  JsonArray timersArray = tm["ins"];
+  if (!timersArray.isNull()) {
+    clearTimers();
+    for (JsonObject timer : timersArray) {
+      uint8_t h = timer[F("hour")] | 0;
+      int8_t m = timer[F("min")] | 0;
+      uint8_t p = timer[F("macro")] | 0;
+      uint8_t dow = timer[F("dow")] | 127;
+      uint8_t wd = (dow << 1) | ((timer[F("en")] | 0) ? 1 : 0);
+      uint8_t ms = 1, me = 12, ds = 1, de = 31;
+      JsonObject start = timer[F("start")];
+      if (!start.isNull()) {
+        ms = start[F("mon")] | 1;
+        ds = start[F("day")] | 1;
+      }
+      JsonObject end = timer[F("end")];
+      if (!end.isNull()) {
+        me = end[F("mon")] | 12;
+        de = end[F("day")] | 31;
+      }
+      addTimer(p, h, m, wd, ms, me, ds, de);
     }
-    it++;
   }
 
   JsonObject ota = doc["ota"];
@@ -1216,23 +1207,21 @@ void serializeConfig(JsonObject root) {
   cntdwn["macro"] = macroCountdown;
 
   JsonArray timers_ins = timers.createNestedArray("ins");
-
-  for (unsigned i = 0; i < 10; i++) {
-    if (timerMacro[i] == 0 && timerHours[i] == 0 && timerMinutes[i] == 0) continue; // sunrise/sunset get saved always (timerHours=255)
-    JsonObject timers_ins0 = timers_ins.createNestedObject();
-    timers_ins0["en"] = (timerWeekday[i] & 0x01);
-    timers_ins0[F("hour")] = timerHours[i];
-    timers_ins0["min"] = timerMinutes[i];
-    timers_ins0["macro"] = timerMacro[i];
-    timers_ins0[F("dow")] = timerWeekday[i] >> 1;
-    if (i<8) {
-      JsonObject start = timers_ins0.createNestedObject("start");
-      start["mon"] = (timerMonth[i] >> 4) & 0xF;
-      start["day"] = timerDay[i];
-      JsonObject end = timers_ins0.createNestedObject("end");
-      end["mon"] = timerMonth[i] & 0xF;
-      end["day"] = timerDayEnd[i];
-    }
+  for (size_t i = 0; i < ::timers.size(); i++) {
+    const Timer& t = ::timers[i];
+    if (t.preset == 0 && t.hour == 0 && t.minute == 0) continue;
+    JsonObject ti = timers_ins.createNestedObject();
+    ti[F("en")] = t.isEnabled() ? 1 : 0;
+    ti[F("hour")] = t.hour;
+    ti[F("min")] = t.minute;
+    ti[F("macro")] = t.preset;
+    ti[F("dow")] = t.weekdays >> 1;
+    JsonObject start = ti.createNestedObject(F("start"));
+    start[F("mon")] = t.monthStart;
+    start[F("day")] = t.dayStart;
+    JsonObject end = ti.createNestedObject(F("end"));
+    end[F("mon")] = t.monthEnd;
+    end[F("day")] = t.dayEnd;
   }
 
   JsonObject ota = root.createNestedObject("ota");
diff --git a/wled00/const.h b/wled00/const.h
index e6abd2b5db..6311bfe509 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -59,6 +59,7 @@ constexpr size_t FIXED_PALETTE_COUNT = DYNAMIC_PALETTE_COUNT + FASTLED_PALETTE_C
   #define WLED_MAX_RMT_CHANNELS 0           // ESP8266 does not have RMT nor I2S
   #define WLED_MAX_I2S_CHANNELS 0
   #define WLED_MAX_ANALOG_CHANNELS 5
+  #define WLED_MAX_TIMERS 16                // reduced limit for ESP8266 due to memory constraints
   #define WLED_PLATFORM_ID 0         // used in UI to distinguish ESP types, needs a proper fix!
 #else
   #if !defined(LEDC_CHANNEL_MAX) || !defined(LEDC_SPEED_MODE_MAX)
@@ -86,6 +87,7 @@ constexpr size_t FIXED_PALETTE_COUNT = DYNAMIC_PALETTE_COUNT + FASTLED_PALETTE_C
     //#define WLED_MAX_ANALOG_CHANNELS 16
     #define WLED_PLATFORM_ID 4       // used in UI to distinguish ESP type in UI, needs a proper fix!
   #endif
+  #define WLED_MAX_TIMERS 64                // maximum number of timers
   #define WLED_MAX_DIGITAL_CHANNELS (WLED_MAX_RMT_CHANNELS + WLED_MAX_I2S_CHANNELS)
 #endif
 // WLED_MAX_BUSSES was used to define the size of busses[] array which is no longer needed
diff --git a/wled00/data/common.js b/wled00/data/common.js
index a6223daa7c..e12ddf2df6 100644
--- a/wled00/data/common.js
+++ b/wled00/data/common.js
@@ -90,7 +90,7 @@ function loadJS(FILE_URL, async = true, preGetV = undefined, postGetV = undefine
 	scE.setAttribute("type", "text/javascript");
 	scE.setAttribute("async", async);
 	d.body.appendChild(scE);
-	// success event 
+	// success event
 	scE.addEventListener("load", () => {
 		//console.log("File loaded");
 		if (preGetV) preGetV();
diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index b7848b862b..ab2c4a7fc0 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -8,6 +8,13 @@
 	<script>
 	var el=false;
 	var ms=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+	var timerCount = 0;
+	var maxTimers;
+	var presets = {};
+	var sortedPresetOptions = '';
+	const TIMER_SUNRISE = 255;
+	const TIMER_SUNSET = 254;
+	const TIMER_WEEKDAYS_ALL = 255;
 	// load common.js with retry on error
 	(function loadFiles() {
 		const l = document.createElement('script');
@@ -19,13 +26,63 @@
 
 	function S() {
 		getLoc();
+		populatePresets(true);
 		loadJS(getURL('/settings/s.js?p=5'), false, ()=>{BTa();}, ()=>{
 			updLatLon();
 			Cs();
-			FC();
-		});	// If we set async false, file is loaded and executed, then next statement is processed
+		});
 		if (loc) d.Sf.action = getURL('/settings/time');
 	}
+	function populatePresets(fromls) {
+		let json = null;
+		if (fromls) {
+			try {
+				json = JSON.parse(localStorage.getItem("wledP"));
+			} catch (e) {}
+		}
+
+		if (!json) {
+			showToast("Please visit the main UI first to load presets", true);
+			return;
+		}
+
+		onPresetsLoaded(json);
+	}
+	function onPresetsLoaded(json) {
+		presets = json;
+		delete presets["0"];
+		bSPO();
+		pMP();
+		rTOPO();
+		rBPO();
+	}
+	function bSPO() { // buildSortedPresetOptions
+		sortedPresetOptions = '';
+		for (var p of Object.entries(presets)) {
+			var id = p[0];
+			var name = p[1].n || ("Preset " + id);
+			sortedPresetOptions += `<option value="${id}">${id}: ${name}</option>`;
+		}
+	}
+	function sPSV(sel, value, attrName) { // setPresetSelectValue
+		var v = (value === undefined || value === null || value === "") ? "0" : String(value);
+		sel.setAttribute(attrName, v);
+		sel.value = v;
+		if (sel.value === "") sel.value = "0";
+	}
+	function rPS(sel, presetOpts, attrName) { // refreshPresetSelect
+		var currentVal = sel.value;
+		var initialVal = sel.getAttribute(attrName);
+		var val = currentVal;
+		if ((val === "" || val === "0") && initialVal !== null && initialVal !== "" && initialVal !== "0") {
+			val = initialVal;
+		}
+		if (val === "") val = "0";
+		sel.innerHTML = presetOpts;
+		sel.value = val;
+		if (sel.value === "" && initialVal !== null && initialVal !== "") sel.value = initialVal;
+		if (sel.value === "") sel.value = "0";
+	}
 	function expand(o,i)
 	{
 		var t = gId("WD"+i);
@@ -35,79 +92,189 @@
 	function Cs() { gId("cac").style.display=(gN("OL").checked)?"block":"none"; }
 	function BTa()
 	{
-		var ih="<thead><tr><th>En.</th><th>Hour</th><th>Minute</th><th>Preset</th><th></th></tr></thead>";
-		for (i=0;i<8;i++) {
-			ih+=`<tr><td><input name="W${i}" id="W${i}" type="hidden"><input id="W${i}0" type="checkbox"></td>
-<td><input name="H${i}" class="xs" type="number" min="0" max="24"></td>
-<td><input name="N${i}" class="xs" type="number" min="0" max="59"></td>
-<td><input name="T${i}" class="s" type="number" min="0" max="250"></td>
-<td><div id="CB${i}" onclick="expand(this,${i})" class="cal">&#128197;</div></td></tr>`;
-			ih+=`<tr><td colspan=5><div id="WD${i}" style="display:none;background-color:#444;"><hr>Run on weekdays`;
-			ih+=`<table><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>`
-			for (j=1;j<8;j++) ih+=`<td><input id="W${i}${j}" type="checkbox"></td>`;
-			ih+=`</tr></table>from <select name="M${i}">`;
-			for (j=0;j<12;j++) ih+=`<option value="${j+1}">${ms[j]}</option>`;
-			ih+=`</select><input name="D${i}" class="xs" type="number" min="1" max="31"></input> to <select name="P${i}">`;
-			for (j=0;j<12;j++) ih+=`<option value="${j+1}">${ms[j]}</option>`;
-			ih+=`</select><input name="E${i}" class="xs" type="number" min="1" max="31"></input>
-		<hr></div></td></tr>`;
-		}
-		ih+=`<tr><td><input name="W8" id="W8" type="hidden"><input id="W80" type="checkbox"></td>
-<td>Sunrise<input name="H8" value="255" type="hidden"></td>
-<td><input name="N8" class="xs" type="number" min="-59" max="59"></td>
-<td><input name="T8" class="s" type="number" min="0" max="250"></td>
-<td><div id="CB8" onclick="expand(this,8)" class="cal">&#128197;</div></td></tr><tr><td colspan=5>`;
-		ih+=`<div id="WD8" style="display:none;background-color:#444;"><hr><table><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>`;
-		for (j=1;j<8;j++) ih+=`<td><input id="W8${j}" type="checkbox"></td>`;
-		ih+="</tr></table><hr></div></td></tr>";
-		ih+=`<tr><td><input name="W9" id="W9" type="hidden"><input id="W90" type="checkbox"></td>
-<td>Sunset<input name="H9" value="255" type="hidden"></td>
-<td><input name="N9" class="xs" type="number" min="-59" max="59"></td>
-<td><input name="T9" class="s" type="number" min="0" max="250"></td>
-<td><div id="CB9" onclick="expand(this,9)" class="cal">&#128197;</div></td></tr><tr><td colspan=5>`;
-		ih+=`<div id="WD9" style="display:none;background-color:#444;"><hr><table><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>`;
-		for (j=1;j<8;j++) ih+=`<td><input id="W9${j}" type="checkbox"></td>`;
-		ih+="</tr></table><hr></div></td></tr>";
-		gId("TMT").innerHTML=ih;
-	}
-	function FC()
-	{
-		for(i=0;i<10;i++)
-		{
-			let wd = gId("W"+i).value;
-			for(j=0;j<8;j++) {
-				gId("W"+i+j).checked=wd>>j&1;
+		timerCount = 0;
+		gId("TMT").innerHTML = "<thead><tr><th>En.</th><th>Type</th><th>Hour</th><th>Minute</th><th></th></tr></thead>";
+	}
+	function addTimerRow(hour, minute, preset, weekdays, monthStart, dayStart, monthEnd, dayEnd) {
+		if (timerCount >= maxTimers) return;
+		var i = timerCount++;
+		var isSunrise = (hour === TIMER_SUNRISE);
+		var isSunset = (hour === TIMER_SUNSET);
+		var isSpecial = isSunrise || isSunset;
+		if (hour === undefined) hour = 0;
+		if (minute === undefined) minute = 0;
+		if (preset === undefined) preset = 0;
+		if (weekdays === undefined) weekdays = TIMER_WEEKDAYS_ALL;
+		if (monthStart === undefined) monthStart = 1;
+		if (dayStart === undefined) dayStart = 1;
+		if (monthEnd === undefined) monthEnd = 12;
+		if (dayEnd === undefined) dayEnd = 31;
+		var enabled = weekdays & 1;
+		var dow = weekdays >> 1;
+		var container = gId("TMT");
+		var hourVal = isSpecial ? 0 : hour;
+		var presetOpts = '<option value="0">Delete Timer</option>' + sortedPresetOptions;
+
+		var weekdayTable = '<table class="tw"><tr><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr><tr>';
+		for (j=1;j<8;j++) weekdayTable += `<td><input id="W${i}${j}" type="checkbox" ${(dow>>(j-1))&1?'checked':''}></td>`;
+		weekdayTable += '</tr></table>';
+
+		var dateRange = `<div id="DR${i}" class="tdr"><span class="tdf">from <select name="M${i}">`;
+		for (j=0;j<12;j++) dateRange += `<option value="${j+1}" ${monthStart==j+1?'selected':''}>${ms[j]}</option>`;
+		dateRange += `</select><input name="D${i}" class="xs" type="number" min="1" max="31" value="${dayStart}"></span><span class="tdf">to <select name="P${i}">`;
+		for (j=0;j<12;j++) dateRange += `<option value="${j+1}" ${monthEnd==j+1?'selected':''}>${ms[j]}</option>`;
+		dateRange += `</select><input name="E${i}" class="xs" type="number" min="1" max="31" value="${dayEnd}"></span></div>`;
+
+		var timerMain = `
+			<tr>
+				<td>
+					<input name="W${i}" id="W${i}" type="hidden">
+					<input id="W${i}0" type="checkbox" ${enabled ? "checked" : ""}>
+				</td><td>
+					<select id="TS${i}" class="s" onchange="TT(${i})">
+						<option value="0" ${!isSpecial ? "selected" : ""}>Regular</option>
+						<option value="${TIMER_SUNRISE}" ${isSunrise ? "selected" : ""}>Sunrise</option>
+						<option value="${TIMER_SUNSET}" ${isSunset ? "selected" : ""}>Sunset</option>
+					</select><br>
+				</td><td>
+					<input ${isSpecial ? "" : 'name="H'+i+'"'} id="H${i}" class="s" type="number" min="0" max="24" value="${hourVal}" ${isSpecial ? "disabled" : ""}>
+				</td>
+				<td><input name="N${i}" id="N${i}" class="l" type="number" min="${isSpecial ? -120 : 0}" max="${isSpecial ? 120 : 59}" value="${minute}"></td>
+				<td><div id="CB${i}" onclick="expand(this,${i})" class="cal">&#128197;</div></td>
+			</tr><tr>
+				<td colspan="5">
+					<select name="T${i}" id="T${i}" class="s">${presetOpts}</select>
+				</td>
+			</tr><tr><td colspan="5"><hr></td></tr>
+		`;
+
+		var timerExpanded = `
+			<tr>
+				<td colspan="5">
+					<div id="WD${i}" style="display:none;background-color:#444;">
+						<hr>Run on weekdays
+						${weekdayTable}
+						${dateRange}
+						<hr>
+					</div>
+				</td>
+			</tr>
+		`;
+
+		container.insertAdjacentHTML("beforeend", timerMain + timerExpanded);
+		var timerPresetSel = gId("T"+i);
+		sPSV(timerPresetSel, preset, "data-preset");
+	}
+	function TT(i) {
+		var sel = gId("TS"+i);
+		var hour = gId("H"+i);
+		var min = gId("N"+i);
+		var isSpecial = sel.value != 0;
+		hour.disabled = isSpecial;
+		if (isSpecial) {
+			// Save current hour value before switching to sunrise/sunset
+			hour.setAttribute("data-regular-hour", hour.value);
+			hour.removeAttribute("name");
+			min.min = -120;
+			min.max = 120;
+		} else {
+			// Restore saved hour value when switching back to regular
+			var savedHour = hour.getAttribute("data-regular-hour");
+			if (savedHour !== null && savedHour !== "") {
+				hour.value = savedHour;
 			}
-			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
+			hour.setAttribute("name", "H"+i);
+			min.min = 0;
+			min.max = 59;
+			if (min.value < 0 || min.value > 59) min.value = 0;
+		}
+	}
+	function pMP() { // populateMacroPresets
+		var presetOpts = '<option value="0">Default Action</option>' + sortedPresetOptions;
+		var fields = ['A0','A1','MC','MN'];
+		for (var f of fields) {
+			var inp = gN(f);
+			if (!inp) continue;
+			var val = inp.getAttribute("data-preset-value");
+			if (val === null || val === "") val = inp.value;
+			if (inp.tagName === "SELECT") {
+				sPSV(inp, val, "data-preset-value");
+				rPS(inp, presetOpts, "data-preset-value");
+			} else {
+				var sel = document.createElement('select');
+				sel.name = f;
+				sel.className = inp.className;
+				sel.required = inp.required;
+				sPSV(sel, val, "data-preset-value");
+				rPS(sel, presetOpts, "data-preset-value");
+				inp.parentNode.replaceChild(sel, inp);
 			}
 		}
 	}
+	function rTOPO() { // refreshTimerPresetOptions
+		var presetOpts = '<option value="0">Delete Timer</option>' + sortedPresetOptions;
+		for (var i=0; i<timerCount; i++) {
+			var sel = gId("T"+i);
+			if (!sel) continue;
+			rPS(sel, presetOpts, "data-preset");
+		}
+	}
+	function rBPO() { // refreshButtonPresetOptions
+		var presetOpts = '<option value="0">Default Action</option>' + sortedPresetOptions;
+		var container = gId("macros");
+		if (!container) return;
+		var sels = container.querySelectorAll('select[name^="MP"],select[name^="ML"],select[name^="MD"]');
+		for (var sel of sels) {
+			rPS(sel, presetOpts, "data-preset");
+		}
+	}
 	function Wd()
 	{
-		a = [0,0,0,0,0,0,0,0,0,0];
-		for (i=0; i<10; i++) {
-			m=1;
-			for(j=0;j<8;j++) { a[i]+=gId(("W"+i)+j).checked*m; m*=2;}
-			gId("W"+i).value=a[i];
+		for (i=0; i<timerCount; i++) {
+			var m=1, val=0;
+			for(j=0;j<8;j++) { val+=gId(("W"+i)+j).checked*m; m*=2;}
+			gId("W"+i).value=val;
+			var sel = gId("TS"+i);
+			var hour = gId("H"+i);
+			if (sel && sel.value != 0) {
+				// Re-add name attribute, remove disabled, and set value for sunrise/sunset before submission
+				hour.setAttribute("name", "H"+i);
+				hour.disabled = false;
+				hour.value = sel.value;
+			}
 		}
 		if (d.Sf.LTR.value==="S") { d.Sf.LT.value = -1*parseFloat(d.Sf.LT.value); }
 		if (d.Sf.LNR.value==="W") { d.Sf.LN.value = -1*parseFloat(d.Sf.LN.value); }
 	}
 	function addRow(i,p,l,d) {
-		var t = gId("macros");	// table
-		var rCnt = t.rows.length;   // get the number of rows.
-		var tr = t.insertRow(rCnt); // table row.
 		var b = String.fromCharCode((i<10?48:55)+i);
-		var td = document.createElement('td');          // TABLE DEFINITION.
-		td = tr.insertCell(0);
-		td.innerHTML = `Button ${i}:`;
-		td = tr.insertCell(1);
-		td.innerHTML = `<input name="MP${b}" type="number" class="s" min="0" max="250" value="${p}" required>`;
-		td = tr.insertCell(2);
-		td.innerHTML = `<input name="ML${b}" type="number" class="s" min="0" max="250" value="${l}" required>`;
-		td = tr.insertCell(3);
-		td.innerHTML = `<input name="MD${b}" type="number" class="s" min="0" max="250" value="${d}" required>`;
+		var presetOpts = '<option value="0">Default Action</option>' + sortedPresetOptions;
+		var buttonBlock = document.createElement('div');
+		buttonBlock.className = 'bb';
+		buttonBlock.innerHTML = `
+			<div class="bh">Button ${i}</div>
+			<div class="bs">
+				<div class="ba">
+					<label>Push/Switch</label>
+					<select name="MP${b}" class="s" required>${presetOpts}</select>
+				</div>
+				<div class="ba">
+					<label>Short (on→off)</label>
+					<select name="ML${b}" class="s" required>${presetOpts}</select>
+				</div>
+				<div class="ba">
+					<label>Long (off→on)</label>
+					<select name="MD${b}" class="s" required>${presetOpts}</select>
+				</div>
+			</div>
+			<hr style="width:100%;margin:8px 0 0 0;">
+		`;
+		var buttonSels = buttonBlock.querySelectorAll("select");
+		var buttonVals = [String(p), String(l), String(d)];
+		for (var si=0; si<buttonSels.length; si++) {
+			sPSV(buttonSels[si], buttonVals[si], "data-preset");
+		}
+		gId("macros").appendChild(buttonBlock);
 	}
 	function getLatLon() {
 		if (!el) {
@@ -206,24 +373,14 @@ <h3>Timer & Alexa Presets</h3>
 	</div>
 	<div class="sec">
 		<h3>Button Action Presets</h3>
-		<table style="margin: 0 auto;" id="macros">
-			<thead>
-				<tr>
-					<td>push<br>switch</td>
-					<td>short<br>on-&gt;off</td>
-					<td>long<br>off-&gt;on</td>
-					<td>double<br>N/A</td>
-				</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
+		<div id="macros"></div>
 		<a href="https://kno.wled.ge/features/macros/#analog-button" target="_blank">Analog Button setup</a>
 	</div>
 	<div class="sec">
 		<h3>Time-Controlled Presets</h3>
 		<div style="display: inline-block">
-		<table id="TMT" style="min-width:330px;"></table>
+			<table id="TMT" style="min-width:330px;"></table>
+			<button type="button" onclick="addTimerRow()">Add Timer</button>
 		</div>
 	</div>
 	<hr>
diff --git a/wled00/data/style.css b/wled00/data/style.css
index 69bc5aa96b..72a66653ad 100644
--- a/wled00/data/style.css
+++ b/wled00/data/style.css
@@ -99,9 +99,9 @@ input[type="text"],
 input[type="number"],
 input[type="password"],
 select {
-    font-size: medium;
-    margin: 2px;
-  }
+  font-size: medium;
+  margin: 2px;
+}
 input[type="number"] {
   width: 4em;
 }
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 84b6da9e61..25df29320d 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -219,6 +219,34 @@ void checkTimers();
 void calculateSunriseAndSunset();
 void setTimeFromAPI(uint32_t timein);
 
+const uint8_t TH_SUNRISE = 255;
+const uint8_t TH_SUNSET = 254;
+
+struct Timer {
+  uint8_t preset;
+  uint8_t hour;
+  int8_t minute;
+  uint8_t weekdays;
+  uint8_t monthStart;
+  uint8_t monthEnd;
+  uint8_t dayStart;
+  uint8_t dayEnd;
+  inline bool isEnabled() const { return (weekdays & 0x01) && (preset != 0); }
+  inline bool isSunrise() const { return hour == TH_SUNRISE; }
+  inline bool isSunset() const { return hour == TH_SUNSET; }
+  inline bool isRegular() const { return hour < TH_SUNSET; }
+  Timer() : preset(0), hour(0), minute(0), weekdays(255), monthStart(1), monthEnd(12), dayStart(1), dayEnd(31) {}
+  Timer(uint8_t p, uint8_t h, int8_t m, uint8_t wd, uint8_t ms = 1, uint8_t me = 12, uint8_t ds = 1, uint8_t de = 31)
+    : preset(p), hour(h), minute(m), weekdays(wd), monthStart(ms), monthEnd(me), dayStart(ds), dayEnd(de) {}
+};
+
+void addTimer(uint8_t preset, uint8_t hour, int8_t minute, uint8_t weekdays,
+              uint8_t monthStart = 1, uint8_t monthEnd = 12, uint8_t dayStart = 1, uint8_t dayEnd = 31);
+void removeTimer(size_t index);
+void clearTimers();
+size_t getTimerCount();
+void compactTimers();
+
 //overlay.cpp
 void handleOverlayDraw();
 // void _overlayAnalogCountdown();  // local function, only used in overlay.cpp
diff --git a/wled00/ntp.cpp b/wled00/ntp.cpp
index 8244961d75..0f9dc97845 100644
--- a/wled00/ntp.cpp
+++ b/wled00/ntp.cpp
@@ -241,7 +241,7 @@ static bool isValidNtpResponse(const byte* ntpPacket) {
   // if((ntpPacket[0] & 0b00111000) >> 3 < 0b100) return false; //reject Version < 4
   if((ntpPacket[0] & 0b00000111) != 0b100)      return false; //reject Mode != Server
   if((ntpPacket[1] < 1) || (ntpPacket[1] > 15)) return false; //reject invalid Stratum
-  if( ntpPacket[16] == 0 && ntpPacket[17] == 0 && 
+  if( ntpPacket[16] == 0 && ntpPacket[17] == 0 &&
       ntpPacket[18] == 0 && ntpPacket[19] == 0 &&
       ntpPacket[20] == 0 && ntpPacket[21] == 0 &&
       ntpPacket[22] == 0 && ntpPacket[23] == 0)               //reject ReferenceTimestamp == 0
@@ -383,53 +383,40 @@ bool isTodayInDateRange(byte monthStart, byte dayStart, byte monthEnd, byte dayE
 
 void checkTimers()
 {
-  if (lastTimerMinute != minute(localTime)) //only check once a new minute begins
-  {
+  if (lastTimerMinute != minute(localTime)) {
     lastTimerMinute = minute(localTime);
-
-    // re-calculate sunrise and sunset just after midnight
     if (!hour(localTime) && minute(localTime)==1) calculateSunriseAndSunset();
-
     DEBUG_PRINTF_P(PSTR("Local time: %02d:%02d\n"), hour(localTime), minute(localTime));
-    for (unsigned i = 0; i < 8; i++)
-    {
-      if (timerMacro[i] != 0
-          && (timerWeekday[i] & 0x01) //timer is enabled
-          && (timerHours[i] == hour(localTime) || timerHours[i] == 24) //if hour is set to 24, activate every hour
-          && timerMinutes[i] == minute(localTime)
-          && ((timerWeekday[i] >> weekdayMondayFirst()) & 0x01) //timer should activate at current day of week
-          && isTodayInDateRange(((timerMonth[i] >> 4) & 0x0F), timerDay[i], timerMonth[i] & 0x0F, timerDayEnd[i])
-         )
-      {
-        applyPreset(timerMacro[i]);
+    for (size_t i = 0; i < timers.size(); i++) {
+      const Timer& t = timers[i];
+      if (!t.isEnabled()) continue;
+      time_t tt = 0;
+      if (t.isSunrise()) {
+        if (!sunrise) continue;
+        tt = sunrise + t.minute * 60;
+      } else if (t.isSunset()) {
+        if (!sunset) continue;
+        tt = sunset + t.minute * 60;
+      } else {
+        struct tm tim = {};
+        tim.tm_year = year(localTime) - 1900;
+        tim.tm_mon = month(localTime) - 1;
+        tim.tm_mday = day(localTime);
+        tim.tm_hour = t.hour;
+        tim.tm_min = t.minute;
+        tim.tm_sec = 0;
+        tim.tm_isdst = -1;
+        tt = mktime(&tim);
       }
-    }
-    // sunrise macro
-    if (sunrise) {
-      time_t tmp = sunrise + timerMinutes[8]*60;  // NOTE: may not be ok
-      DEBUG_PRINTF_P(PSTR("Trigger time: %02d:%02d\n"), hour(tmp), minute(tmp));
-      if (timerMacro[8] != 0
-          && hour(tmp) == hour(localTime)
-          && minute(tmp) == minute(localTime)
-          && (timerWeekday[8] & 0x01) //timer is enabled
-          && ((timerWeekday[8] >> weekdayMondayFirst()) & 0x01)) //timer should activate at current day of week
-      {
-        applyPreset(timerMacro[8]);
-        DEBUG_PRINTF_P(PSTR("Sunrise macro %d triggered."),timerMacro[8]);
-      }
-    }
-    // sunset macro
-    if (sunset) {
-      time_t tmp = sunset + timerMinutes[9]*60;  // NOTE: may not be ok
-      DEBUG_PRINTF_P(PSTR("Trigger time: %02d:%02d\n"), hour(tmp), minute(tmp));
-      if (timerMacro[9] != 0
-          && hour(tmp) == hour(localTime)
-          && minute(tmp) == minute(localTime)
-          && (timerWeekday[9] & 0x01) //timer is enabled
-          && ((timerWeekday[9] >> weekdayMondayFirst()) & 0x01)) //timer should activate at current day of week
-      {
-        applyPreset(timerMacro[9]);
-        DEBUG_PRINTF_P(PSTR("Sunset macro %d triggered."),timerMacro[9]);
+      if ((hour(tt) == hour(localTime) && minute(tt) == minute(localTime)) || (t.hour == 24 && t.minute == minute(localTime))) {
+        if (!((t.weekdays >> weekdayMondayFirst()) & 0x01)) continue;
+        if (!isTodayInDateRange(t.monthStart, t.dayStart, t.monthEnd, t.dayEnd)) continue;
+        applyPreset(t.preset);
+        #ifdef WLED_DEBUG
+        if (t.isSunrise()) DEBUG_PRINTF_P(PSTR("Sunrise timer %d offset %d\n"), t.preset, t.minute);
+        else if (t.isSunset()) DEBUG_PRINTF_P(PSTR("Sunset timer %d offset %d\n"), t.preset, t.minute);
+        else DEBUG_PRINTF_P(PSTR("Timer %d: preset %d\n"), i, t.preset);
+        #endif
       }
     }
   }
@@ -488,7 +475,7 @@ static int getSunriseUTC(int year, int month, int day, float lat, float lon, boo
 	return UT*60;
 }
 
-#define SUNSET_MAX (24*60) // 1day = max expected absolute value for sun offset in minutes 
+#define SUNSET_MAX (24*60) // 1day = max expected absolute value for sun offset in minutes
 // calculate sunrise and sunset (if longitude and latitude are set)
 void calculateSunriseAndSunset() {
   if ((int)(longitude*10.) || (int)(latitude*10.)) {
@@ -557,4 +544,70 @@ void setTimeFromAPI(uint32_t timein) {
     calculateSunriseAndSunset();
   }
   if (presetsModifiedTime == 0) presetsModifiedTime = timein;
-}
\ No newline at end of file
+}
+
+void addTimer(uint8_t preset, uint8_t hour, int8_t minute, uint8_t weekdays,
+              uint8_t monthStart, uint8_t monthEnd, uint8_t dayStart, uint8_t dayEnd) {
+  if (hour > 24 && hour != TH_SUNSET && hour != TH_SUNRISE) {
+    DEBUG_PRINTLN(F("Timer: Invalid hour value"));
+    return;
+  }
+  if (hour == TH_SUNRISE || hour == TH_SUNSET) {
+    if (minute < -120 || minute > 120) {
+      DEBUG_PRINTLN(F("Timer: Clamping sunrise/sunset offset to [-120,120]"));
+      if (minute < -120) minute = -120;
+      else if (minute > 120) minute = 120;
+    }
+  } else {
+    if (minute < 0 || minute > 59) {
+      DEBUG_PRINTLN(F("Timer: Invalid minute value"));
+      return;
+    }
+  }
+  if ((monthStart != 0 && monthStart > 12) ||
+      (monthEnd != 0 && monthEnd > 12)) {
+    DEBUG_PRINTLN(F("Timer: Invalid month range"));
+    return;
+  }
+  if ((dayStart != 0 && dayStart > 31) ||
+      (dayEnd != 0 && dayEnd > 31)) {
+    DEBUG_PRINTLN(F("Timer: Invalid day range"));
+    return;
+  }
+  if (timers.size() >= WLED_MAX_TIMERS) {
+    DEBUG_PRINTLN(F("Timer: Maximum number of timers reached"));
+    return;
+  }
+  Timer t(preset, hour, minute, weekdays, monthStart, monthEnd, dayStart, dayEnd);
+  timers.push_back(t);
+  DEBUG_PRINTF("Timer added: preset=%d, hour=%d, minute=%d, count=%d\n", preset, hour, minute, timers.size());
+}
+
+void removeTimer(size_t index) {
+  if (index < timers.size()) {
+    timers.erase(timers.begin() + index);
+    DEBUG_PRINTF("Timer removed at index %d, count=%d\n", index, timers.size());
+  }
+}
+
+void clearTimers() {
+  timers.clear();
+  DEBUG_PRINTLN(F("All timers cleared"));
+}
+
+size_t getTimerCount() {
+  return timers.size();
+}
+
+void compactTimers() {
+  for (size_t i = 0; i < timers.size();) {
+    const Timer& t = timers[i];
+    if (t.preset == 0) {
+      timers.erase(timers.begin() + i);
+    } else {
+      ++i;
+    }
+  }
+  timers.shrink_to_fit();
+}
+
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 3c6c72b7b3..925f273aee 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -339,7 +339,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
             DEBUG_PRINTF_P(PSTR("PIN ALLOC error: GPIO%d for touch button #%d is not an touch pin!\n"), buttons[i].pin, i);
             PinManager::deallocatePin(buttons[i].pin, PinOwner::Button);
             buttons[i].type = BTN_TYPE_NONE;
-          }          
+          }
           #ifdef SOC_TOUCH_VERSION_2 // ESP32 S2 and S3 have a fucntion to check touch state but need to attach an interrupt to do so
           else touchAttachInterrupt(buttons[i].pin, touchButtonISR, touchThreshold << 4); // threshold on Touch V2 is much higher (1500 is a value given by Espressif example, I measured changes of over 5000)
           #endif
@@ -580,29 +580,46 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       ii++;
     }
 
-    char k[3]; k[2] = 0;
-    for (int i = 0; i<10; i++) {
-      k[1] = i+48;//ascii 0,1,2,3,...
-      k[0] = 'H'; //timer hours
-      timerHours[i] = request->arg(k).toInt();
-      k[0] = 'N'; //minutes
-      timerMinutes[i] = request->arg(k).toInt();
-      k[0] = 'T'; //macros
-      timerMacro[i] = request->arg(k).toInt();
-      k[0] = 'W'; //weekdays
-      timerWeekday[i] = request->arg(k).toInt();
-      if (i<8) {
-        k[0] = 'M'; //start month
-        timerMonth[i] = request->arg(k).toInt() & 0x0F;
-        timerMonth[i] <<= 4;
-        k[0] = 'P'; //end month
-        timerMonth[i] += (request->arg(k).toInt() & 0x0F);
-        k[0] = 'D'; //start day
-        timerDay[i] = request->arg(k).toInt();
-        k[0] = 'E'; //end day
-        timerDayEnd[i] = request->arg(k).toInt();
+    clearTimers();
+    char k[5]; k[4] = 0;
+    for (int ti = 0; ti < (int)WLED_MAX_TIMERS; ti++) {
+      if (ti < 10) {
+        k[1] = ti + 48;
+        k[2] = 0;
+      } else {
+        k[1] = '0' + (ti / 10);
+        k[2] = '0' + (ti % 10);
+        k[3] = 0;
       }
+      k[0] = 'T';
+      if (!request->hasArg(k)) continue;
+      uint8_t p = request->arg(k).toInt();
+      k[0] = 'H';
+      uint8_t h = request->arg(k).toInt();
+      k[0] = 'N';
+      int minuteVal = request->arg(k).toInt();
+      if (minuteVal < -120) minuteVal = -120;
+      if (minuteVal > 120) minuteVal = 120;
+      int8_t m = (int8_t)minuteVal;
+      k[0] = 'W';
+      uint8_t wd = request->arg(k).toInt();
+      uint8_t ms = 1, me = 12, ds = 1, de = 31;
+      k[0] = 'M';
+      ms = request->arg(k).toInt();
+      if (ms == 0) ms = 1;
+      k[0] = 'P';
+      me = request->arg(k).toInt();
+      if (me == 0) me = 12;
+      k[0] = 'D';
+      ds = request->arg(k).toInt();
+      if (ds == 0) ds = 1;
+      k[0] = 'E';
+      de = request->arg(k).toInt();
+      if (de == 0) de = 31;
+      addTimer(p, h, m, wd, ms, me, ds, de);
     }
+    compactTimers();
+
   }
 
   //SECURITY
@@ -987,7 +1004,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply)
 
   pos = req.indexOf(F("NP")); //advances to next preset in a playlist
   if (pos > 0) doAdvancePlaylist = true;
-  
+
   //set brightness
   updateVal(req.c_str(), "&A=", bri);
 
diff --git a/wled00/wled.h b/wled00/wled.h
index 21b340d94c..daedde448e 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -813,17 +813,8 @@ WLED_GLOBAL bool hueStoreAllowed _INIT(false), hueNewKey _INIT(false);
 WLED_GLOBAL unsigned long countdownTime _INIT(1514764800L);
 WLED_GLOBAL bool countdownOverTriggered _INIT(true);
 
-//timer
 WLED_GLOBAL byte lastTimerMinute  _INIT(0);
-WLED_GLOBAL byte timerHours[]     _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
-WLED_GLOBAL int8_t timerMinutes[] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
-WLED_GLOBAL byte timerMacro[]     _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
-//weekdays to activate on, bit pattern of arr elem: 0b11111111: sun,sat,fri,thu,wed,tue,mon,validity
-WLED_GLOBAL byte timerWeekday[]   _INIT_N(({ 254, 254, 254, 254, 254, 254, 254, 254, 254, 254 }));
-//upper 4 bits start, lower 4 bits end month (default 28: start month 1 and end month 12)
-WLED_GLOBAL byte timerMonth[]     _INIT_N(({28,28,28,28,28,28,28,28}));
-WLED_GLOBAL byte timerDay[]       _INIT_N(({1,1,1,1,1,1,1,1}));
-WLED_GLOBAL byte timerDayEnd[]		_INIT_N(({31,31,31,31,31,31,31,31}));
+WLED_GLOBAL std::vector<Timer> timers;
 WLED_GLOBAL bool doAdvancePlaylist _INIT(false);
 
 //improv
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 6200dab4d1..36b0a09ff9 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -603,20 +603,15 @@ void getSettingsJS(byte subPage, Print& settingsScript)
       settingsScript.printf_P(PSTR("addRow(%d,%d,%d,%d);"), ii++, button.macroButton, button.macroLongPress, button.macroDoublePress);
     }
 
-    char k[4];
-    k[2] = 0; //Time macros
-    for (int i = 0; i<10; i++)
-    {
-      k[1] = 48+i; //ascii 0,1,2,3
-      if (i<8) { k[0] = 'H'; printSetFormValue(settingsScript,k,timerHours[i]); }
-      k[0] = 'N'; printSetFormValue(settingsScript,k,timerMinutes[i]);
-      k[0] = 'T'; printSetFormValue(settingsScript,k,timerMacro[i]);
-      k[0] = 'W'; printSetFormValue(settingsScript,k,timerWeekday[i]);
-      if (i<8) {
-        k[0] = 'M'; printSetFormValue(settingsScript,k,(timerMonth[i] >> 4) & 0x0F);
-				k[0] = 'P'; printSetFormValue(settingsScript,k,timerMonth[i] & 0x0F);
-        k[0] = 'D'; printSetFormValue(settingsScript,k,timerDay[i]);
-				k[0] = 'E'; printSetFormValue(settingsScript,k,timerDayEnd[i]);
+    settingsScript.printf_P(PSTR("maxTimers=%d;"), WLED_MAX_TIMERS);
+    if (timers.empty()) {
+      settingsScript.print(F("addTimerRow();"));
+    } else {
+      for (size_t ti = 0; ti < timers.size(); ti++) {
+        const Timer& timer = timers[ti];
+        settingsScript.printf_P(PSTR("addTimerRow(%d,%d,%d,%d,%d,%d,%d,%d);"),
+                               timer.hour, timer.minute, timer.preset, timer.weekdays,
+                               timer.monthStart, timer.dayStart, timer.monthEnd, timer.dayEnd);
       }
     }
   }