diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index d5f9a0ef0..65992c6f2 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -80,7 +80,6 @@
     }
     //returns mem usage
     function getMem(type, len, p0) {
-      //len = parseInt(len);
       if (type < 32) {
         if (maxM < 10000 && p0==3) {    //8266 DMA uses 5x the mem
           if (type > 29) return len*20; //RGBW
@@ -280,7 +279,7 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
       var c = gId("btns").innerHTML;
       var bt = "BT" + i;
       var be = "BE" + i;
-      c += `Button ${i} pin: <input type="number" min="-1" max="40" name="${bt}" onchange="UI()" value="${p}">`;
+      c += `Button ${i} pin: <input type="number" min="-1" max="40" name="${bt}" onchange="UI()" style="width:35px" value="${p}">&nbsp;`;
       c += `<select name="${be}">`
       c += `<option value="0" ${t==0?"selected":""}>Disabled</option>`;
       c += `<option value="2" ${t==2?"selected":""}>Pushbutton</option>`;
@@ -349,7 +348,7 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
     </div><hr style="width:260px">
     <div id="btns"></div>
     Touch threshold: <input type="number" min="0" max="100" name="TT" required><br>
-    IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()"><select name="IT">
+    IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()" style="width:35px">&nbsp;<select name="IT">
     <option value="0">Remote disabled</option>
     <option value="1">24-key RGB</option>
     <option value="2">24-key with CT</option>
@@ -358,10 +357,9 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
     <option value="5">21-key RGB</option>
     <option value="6">6-key black</option>
     <option value="7">9-key red</option>
-    <option value="8">JSON remote</option>
     </select><span style="cursor: pointer;" onclick="off('IR')">&nbsp;&#215;</span><br>
     <a href="https://github.com/Aircoookie/WLED/wiki/Infrared-Control" target="_blank">IR info</a><br>
-    Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()"> invert <input type="checkbox" name="RM"><span style="cursor: pointer;" onclick="off('RL')">&nbsp;&#215;</span><br>
+    Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()" style="width:35px"> Invert <input type="checkbox" name="RM"><span style="cursor: pointer;" onclick="off('RL')">&nbsp;&#215;</span><br>
     <hr style="width:260px">
 		<h3>Defaults</h3>
 		Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index c03f115a0..b9a396777 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -178,15 +178,7 @@
 			<tbody>
 			</tbody>
 		</table>
-		<div>For analog button set <i>duble</i> to:
-			<ul>
-				<li>250=global brightness</li>
-				<li>249=effect speed</li>
-				<li>248=effect intensity</li>
-				<li>247=palette</li>
-				<li>0..32=segment X opacity</li>
-			</ul>
-		</div>
+		<a href="https://github.com/Aircoookie/WLED/wiki/Macros#analog-button" target="_blank">Analog Button setup</a>
 		<h3>Time-controlled presets</h3>
     <div style="display: inline-block">
     <table id="TMT">
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 6b76ff796..ac3a44bbd 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -73,7 +73,7 @@ Do not enable if WiFi is working correctly, increases power consumption.</i><div
 // Autogenerated from wled00/data/settings_leds.htm, do not edit!!
 const char PAGE_settings_leds[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta 
 name="viewport" content="width=500"><title>LED Settings</title><script>
-var d=document,laprev=55,maxB=1,maxM=5e3,maxPB=4096,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function gId(e){return d.getElementById(e)}function off(e){d.getElementsByName(e)[0].value=-1}function bLimits(e,n,t){maxB=e,maxM=t,maxPB=n}function pinsOK(){var e=d.getElementsByTagName("input");for(i=0;i<e.length;i++){var n=e[i].name.substring(0,2);if(("L0"==n||"L1"==n||"L2"==n||"L3"==n||"L4"==n||"RL"==n||"BT"==n||"IR"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert(`Sorry, pins ${JSON.stringify(d.um_p)} can't be used.`),e[i].value="",e[i].focus(),!1;if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),e[i].value="",e[i].focus(),!1;for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"L2"==t||"L3"==t||"L4"==t||"RL"==t||"BT"==t||"IR"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert(`Pin conflict between ${n}/${t}!`),e[j].value="",e[j].focus(),!1}}}return!0}function trySubmit(e){if(e.preventDefault(),!pinsOK())return e.stopPropagation(),!1;if(bquot>100){var n="Too many LEDs for me to handle!";maxM<1e4&&(n+="\n\rConsider using an ESP32."),alert(n)}d.Sf.checkValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=gId("able").checked;d.Sf.LA.value=e?laprev:0,gId("abl").style.display=e?"inline":"none",gId("psu2").style.display=e?"inline":"none",d.Sf.LA.value>0&&setABL()}function enLA(){var e=d.Sf.LAsel.value;d.Sf.LA.value=e,gId("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(gId("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:gId("able").checked=!1,enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;case 255:d.Sf.LAsel.value=255;break;default:gId("LAdis").style.display="inline"}gId("m1").innerHTML=maxM,d.getElementsByName("Sf")[0].addEventListener("submit",trySubmit),UI()}function getMem(e,n,t){return e<32?maxM<1e4&&3==t?e>29?20*n:15*n:maxM>=1e4?e>29?8*n:6*n:e>29?4*n:3*n:e>31&&e<48?5:44==e||45==e?4*n:3*n}function UI(e=!1){var n=!1,t=0;gId("ampwarning").style.display=d.Sf.MA.value>7200?"inline":"none",255==d.Sf.LA.value?laprev=12:d.Sf.LA.value>0&&(laprev=d.Sf.LA.value);var a=d.getElementsByTagName("select");for(u=0;u<a.length;u++)if("LT"==a[u].name.substring(0,2)){c=a[u].name.substring(2);var i=parseInt(a[u].value,10);gId("p0d"+c).innerHTML=i>49?"Data:":i>41?"Pins:":"Pin:",gId("p1d"+c).innerHTML=i>49?"Clk:":"";var l=d.getElementsByName("L1"+c)[0];for(t+=getMem(i,d.getElementsByName("LC"+c)[0].value,d.getElementsByName("L0"+c)[0].value),g=1;g<5;g++){(l=d.getElementsByName("L"+g+c)[0])&&(i>49&&1==g||i>41&&i<50&&g+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}(30==i||31==i||i>40&&i<46&&43!=i)&&(n=!0),gId("dig"+c).style.display=i>31&&i<48?"none":"inline",gId("psd"+c).innerHTML=i>31&&i<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(u=0;u<s;u++)o[u].style.display=n?"inline":"none";if(d.activeElement==d.getElementsByName("LC")[0]){var u=d.getElementsByClassName("iST").length;1==u&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}var r=d.getElementsByTagName("input"),p=0,m=0;for(u=0;u<r.length;u++){var v=r[u].name.substring(0,2);if("LC"!=v||"LC"===r[u].name){if("L0"==v||"L1"==v)d.getElementsByName("LC"+r[u].name.substring(2))[0].max=maxPB;if(("L0"==v||"L1"==v||"L2"==v||"L3"==v||"L4"==v||"RL"==v||"BT"==v||"IR"==v)&&""!=r[u].value&&"-1"!=r[u].value){var g=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)g.push(d.um_p[k]);for(j=0;j<r.length;j++)if(u!=j){var L=r[j].name.substring(0,2);"L0"!=L&&"L1"!=L&&"L2"!=L&&"L3"!=L&&"L4"!=L&&"RL"!=L&&"BT"!=L&&"IR"!=L||""!=r[j].value&&"-1"!=r[j].value&&g.push(parseInt(r[j].value,10))}g.some(e=>e==parseInt(r[u].value,10))?r[u].style.color="red":r[u].style.color="#fff"}}else{var c=r[u].name.substring(2),f=parseInt(r[u].value,10);gId("ls"+c).readOnly&&(gId("ls"+c).value=p),f&&(p+=f,f>m&&(m=f))}}gId("m0").innerHTML=t,bquot=t/maxM*100,gId("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,gId("ledwarning").style.display=p>maxPB||m>800||bquot>80?"inline":"none",gId("ledwarning").style.color=p>maxPB||m>maxPB||bquot>100?"red":"orange",gId("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>WARNING: Using over ${maxM}B!</b>)`:""):"800 LEDs per pin";var y=Math.ceil((100+p*laprev)/500)/2;y=y>5?Math.ceil(y):y;a="";var b=30==d.Sf.LAsel.value,B=255==d.Sf.LAsel.value;y<1.02&&!b&&!B?a="ESP 5V pin with 1A USB supply":(a+=b?"12V ":B?"WS2815 12V ":"5V ",a+=y,a+="A supply connected to LEDs");var I=Math.ceil((100+p*laprev)/1500)/2,h="(for most effects, ~";h+=I=I>5?Math.ceil(I):I,h+="A is enough)<br>",gId("psu").innerHTML=a,gId("psu2").innerHTML=B?"":h}function lastEnd(e){return e<1?0:(v=parseInt(d.getElementsByName("LS"+(e-1))[0].value)+parseInt(d.getElementsByName("LC"+(e-1))[0].value),isNaN(v)?0:v)}function addLEDs(e){if(e>1)return maxB=e,void(gId("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var a=gId("mLC");if(1==e){var i=`<div class="iST">\n${t>0?'<hr style="width:260px">':""}\n${t+1}:\n<select name="LT${t}" onchange="UI()">\n<option value="22">WS281x</option>\n<option value="30">SK6812 RGBW</option>\n<option value="31">TM1814</option>\n<option value="24">400kHz</option>\n<option value="50">WS2801</option>\n<option value="51">APA102</option>\n<option value="52">LPD8806</option>\n<option value="53">P9813</option>\n<option value="41">PWM White</option>\n<option value="42">PWM WWCW</option>\n<option value="43">PWM RGB</option>\n<option value="44">PWM RGBW</option>\n<option value="45">PWM RGBWC</option>\n</select>&nbsp;\nColor Order:\n<select name="CO${t}">\n<option value="0">GRB</option>\n<option value="1">RGB</option>\n<option value="2">BRG</option>\n<option value="3">RBG</option>\n<option value="4">BGR</option>\n<option value="5">GBR</option>\n</select><br>\n<span id="p0d${t}">Pin:</span> <input type="number" name="L0${t}" min="0" max="40" required style="width:35px" onchange="UI()"/>\n<span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<br>\n<span id="psd${t}">Start:</span> <input type="number" name="LS${t}" id="ls${t}" min="0" max="8191" value="${lastEnd(t)}" required />&nbsp;\n<div id="dig${t}" style="display:inline">\nCount: <input type="number" name="LC${t}" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>\nReverse (rotated 180°): <input type="checkbox" name="CV${t}">\n&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${t}" type="checkbox" name="SL${t}"><br>\n</div>\n</div>`;a.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--t].remove(),--t),gId("+").style.display=t<maxB-1?"inline":"none",gId("-").style.display=t>0?"inline":"none",UI()}}function addBtn(e,n,t){var a=gId("btns").innerHTML,i="BT"+e;a+=`Button ${e} pin: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" value="${n}">`,a+=`<select name="${"BE"+e}">`,a+=`<option value="0" ${0==t?"selected":""}>Disabled</option>`,a+=`<option value="2" ${2==t?"selected":""}>Pushbutton</option>`,a+=`<option value="2" ${3==t?"selected":""}>Push inverted</option>`,a+=`<option value="4" ${4==t?"selected":""}>Switch</option>`,a+=`<option value="5" ${4==t?"selected":""}>Switch inverted</option>`,a+=`<option value="6" ${6==t?"selected":""}>Touch</option>`,a+=`<option value="7" ${7==t?"selected":""}>Analog</option>`,a+="</select>",a+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=a}function GetV() {var d=document;
+var d=document,laprev=55,maxB=1,maxM=5e3,maxPB=4096,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function gId(e){return d.getElementById(e)}function off(e){d.getElementsByName(e)[0].value=-1}function bLimits(e,n,t){maxB=e,maxM=t,maxPB=n}function pinsOK(){var e=d.getElementsByTagName("input");for(i=0;i<e.length;i++){var n=e[i].name.substring(0,2);if(("L0"==n||"L1"==n||"L2"==n||"L3"==n||"L4"==n||"RL"==n||"BT"==n||"IR"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert(`Sorry, pins ${JSON.stringify(d.um_p)} can't be used.`),e[i].value="",e[i].focus(),!1;if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),e[i].value="",e[i].focus(),!1;for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"L2"==t||"L3"==t||"L4"==t||"RL"==t||"BT"==t||"IR"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert(`Pin conflict between ${n}/${t}!`),e[j].value="",e[j].focus(),!1}}}return!0}function trySubmit(e){if(e.preventDefault(),!pinsOK())return e.stopPropagation(),!1;if(bquot>100){var n="Too many LEDs for me to handle!";maxM<1e4&&(n+="\n\rConsider using an ESP32."),alert(n)}d.Sf.checkValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=gId("able").checked;d.Sf.LA.value=e?laprev:0,gId("abl").style.display=e?"inline":"none",gId("psu2").style.display=e?"inline":"none",d.Sf.LA.value>0&&setABL()}function enLA(){var e=d.Sf.LAsel.value;d.Sf.LA.value=e,gId("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(gId("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:gId("able").checked=!1,enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;case 255:d.Sf.LAsel.value=255;break;default:gId("LAdis").style.display="inline"}gId("m1").innerHTML=maxM,d.getElementsByName("Sf")[0].addEventListener("submit",trySubmit),UI()}function getMem(e,n,t){return e<32?maxM<1e4&&3==t?e>29?20*n:15*n:maxM>=1e4?e>29?8*n:6*n:e>29?4*n:3*n:e>31&&e<48?5:44==e||45==e?4*n:3*n}function UI(e=!1){var n=!1,t=0;gId("ampwarning").style.display=d.Sf.MA.value>7200?"inline":"none",255==d.Sf.LA.value?laprev=12:d.Sf.LA.value>0&&(laprev=d.Sf.LA.value);var a=d.getElementsByTagName("select");for(u=0;u<a.length;u++)if("LT"==a[u].name.substring(0,2)){c=a[u].name.substring(2);var i=parseInt(a[u].value,10);gId("p0d"+c).innerHTML=i>49?"Data:":i>41?"Pins:":"Pin:",gId("p1d"+c).innerHTML=i>49?"Clk:":"";var l=d.getElementsByName("L1"+c)[0];for(t+=getMem(i,d.getElementsByName("LC"+c)[0].value,d.getElementsByName("L0"+c)[0].value),g=1;g<5;g++){(l=d.getElementsByName("L"+g+c)[0])&&(i>49&&1==g||i>41&&i<50&&g+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}(30==i||31==i||i>40&&i<46&&43!=i)&&(n=!0),gId("dig"+c).style.display=i>31&&i<48?"none":"inline",gId("psd"+c).innerHTML=i>31&&i<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(u=0;u<s;u++)o[u].style.display=n?"inline":"none";if(d.activeElement==d.getElementsByName("LC")[0]){var u=d.getElementsByClassName("iST").length;1==u&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}var p=d.getElementsByTagName("input"),r=0,m=0;for(u=0;u<p.length;u++){var v=p[u].name.substring(0,2);if("LC"!=v||"LC"===p[u].name){if("L0"==v||"L1"==v)d.getElementsByName("LC"+p[u].name.substring(2))[0].max=maxPB;if(("L0"==v||"L1"==v||"L2"==v||"L3"==v||"L4"==v||"RL"==v||"BT"==v||"IR"==v)&&""!=p[u].value&&"-1"!=p[u].value){var g=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)g.push(d.um_p[k]);for(j=0;j<p.length;j++)if(u!=j){var L=p[j].name.substring(0,2);"L0"!=L&&"L1"!=L&&"L2"!=L&&"L3"!=L&&"L4"!=L&&"RL"!=L&&"BT"!=L&&"IR"!=L||""!=p[j].value&&"-1"!=p[j].value&&g.push(parseInt(p[j].value,10))}g.some(e=>e==parseInt(p[u].value,10))?p[u].style.color="red":p[u].style.color="#fff"}}else{var c=p[u].name.substring(2),y=parseInt(p[u].value,10);gId("ls"+c).readOnly&&(gId("ls"+c).value=r),y&&(r+=y,y>m&&(m=y))}}gId("m0").innerHTML=t,bquot=t/maxM*100,gId("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,gId("ledwarning").style.display=r>maxPB||m>800||bquot>80?"inline":"none",gId("ledwarning").style.color=r>maxPB||m>maxPB||bquot>100?"red":"orange",gId("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>WARNING: Using over ${maxM}B!</b>)`:""):"800 LEDs per pin";var f=Math.ceil((100+r*laprev)/500)/2;f=f>5?Math.ceil(f):f;a="";var b=30==d.Sf.LAsel.value,B=255==d.Sf.LAsel.value;f<1.02&&!b&&!B?a="ESP 5V pin with 1A USB supply":(a+=b?"12V ":B?"WS2815 12V ":"5V ",a+=f,a+="A supply connected to LEDs");var I=Math.ceil((100+r*laprev)/1500)/2,h="(for most effects, ~";h+=I=I>5?Math.ceil(I):I,h+="A is enough)<br>",gId("psu").innerHTML=a,gId("psu2").innerHTML=B?"":h}function lastEnd(e){return e<1?0:(v=parseInt(d.getElementsByName("LS"+(e-1))[0].value)+parseInt(d.getElementsByName("LC"+(e-1))[0].value),isNaN(v)?0:v)}function addLEDs(e){if(e>1)return maxB=e,void(gId("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var a=gId("mLC");if(1==e){var i=`<div class="iST">\n${t>0?'<hr style="width:260px">':""}\n${t+1}:\n<select name="LT${t}" onchange="UI()">\n<option value="22">WS281x</option>\n<option value="30">SK6812 RGBW</option>\n<option value="31">TM1814</option>\n<option value="24">400kHz</option>\n<option value="50">WS2801</option>\n<option value="51">APA102</option>\n<option value="52">LPD8806</option>\n<option value="53">P9813</option>\n<option value="41">PWM White</option>\n<option value="42">PWM WWCW</option>\n<option value="43">PWM RGB</option>\n<option value="44">PWM RGBW</option>\n<option value="45">PWM RGBWC</option>\n</select>&nbsp;\nColor Order:\n<select name="CO${t}">\n<option value="0">GRB</option>\n<option value="1">RGB</option>\n<option value="2">BRG</option>\n<option value="3">RBG</option>\n<option value="4">BGR</option>\n<option value="5">GBR</option>\n</select><br>\n<span id="p0d${t}">Pin:</span> <input type="number" name="L0${t}" min="0" max="40" required style="width:35px" onchange="UI()"/>\n<span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<br>\n<span id="psd${t}">Start:</span> <input type="number" name="LS${t}" id="ls${t}" min="0" max="8191" value="${lastEnd(t)}" required />&nbsp;\n<div id="dig${t}" style="display:inline">\nCount: <input type="number" name="LC${t}" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>\nReverse (rotated 180°): <input type="checkbox" name="CV${t}">\n&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${t}" type="checkbox" name="SL${t}"><br>\n</div>\n</div>`;a.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--t].remove(),--t),gId("+").style.display=t<maxB-1?"inline":"none",gId("-").style.display=t>0?"inline":"none",UI()}}function addBtn(e,n,t){var a=gId("btns").innerHTML,i="BT"+e;a+=`Button ${e} pin: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" style="width:35px" value="${n}">&nbsp;`,a+=`<select name="${"BE"+e}">`,a+=`<option value="0" ${0==t?"selected":""}>Disabled</option>`,a+=`<option value="2" ${2==t?"selected":""}>Pushbutton</option>`,a+=`<option value="2" ${3==t?"selected":""}>Push inverted</option>`,a+=`<option value="4" ${4==t?"selected":""}>Switch</option>`,a+=`<option value="5" ${4==t?"selected":""}>Switch inverted</option>`,a+=`<option value="6" ${6==t?"selected":""}>Touch</option>`,a+=`<option value="7" ${7==t?"selected":""}>Analog</option>`,a+="</select>",a+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=a}function GetV() {var d=document;
 %CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post"><div class="helpB"><button type="button" 
 onclick="H()">?</button></div><button type="button" onclick="B()">Back</button>
@@ -112,43 +112,42 @@ style="display:inline-block;width:100px;height:10px;border-radius:20px"></div>
 id="wreason">800 LEDs per pin</span> for the best experience!<br></div><hr 
 style="width:260px"><div id="btns"></div>Touch threshold: <input type="number" 
 min="0" max="100" name="TT" required><br>IR pin: <input type="number" min="-1" 
-max="40" name="IR" onchange="UI()"><select name="IT"><option value="0">
-Remote disabled</option><option value="1">24-key RGB</option><option value="2">
-24-key with CT</option><option value="3">40-key blue</option><option value="4">
-44-key RGB</option><option value="5">21-key RGB</option><option value="6">
-6-key black</option><option value="7">9-key red</option><option value="8">
-JSON remote</option></select><span style="cursor:pointer" onclick='off("IR")'>
-&nbsp;&#215;</span><br><a 
-href="https://github.com/Aircoookie/WLED/wiki/Infrared-Control" target="_blank">
-IR info</a><br>Relay pin: <input type="number" min="-1" max="40" name="RL" 
-onchange="UI()"> invert <input type="checkbox" name="RM"><span 
-style="cursor:pointer" onclick='off("RL")'>&nbsp;&#215;</span><br><hr 
-style="width:260px"><h3>Defaults</h3>Turn LEDs on after power up/reset: <input 
-type="checkbox" name="BO"><br>Default brightness: <input name="CA" 
-type="number" min="0" max="255" required> (0-255)<br><br>Apply preset <input 
-name="BP" type="number" min="0" max="250" required> at boot (0 uses defaults)
-<br>- <i>or</i> -<br>Set current preset cycle setting as boot default: <input 
-type="checkbox" name="PC"><br><br>Use Gamma correction for color: <input 
-type="checkbox" name="GC"> (strongly recommended)<br>
-Use Gamma correction for brightness: <input type="checkbox" name="GB">
- (not recommended)<br><br>Brightness factor: <input name="BF" type="number" 
-min="1" max="255" required> %<h3>Transitions</h3>Crossfade: <input 
-type="checkbox" name="TF"><br>Transition Time: <input name="TD" maxlength="5" 
-size="2"> ms<br>Enable Palette transitions: <input type="checkbox" name="PF">
-<h3>Timed light</h3>Default Duration: <input name="TL" type="number" min="1" 
-max="255" required> min<br>Default Target brightness: <input name="TB" 
-type="number" min="0" max="255" required><br>Mode: <select name="TW"><option 
-value="0">Wait and set</option><option value="1">Fade</option><option value="2">
-Fade Color</option><option value="3">Sunrise</option></select><h3>Advanced</h3>
-Palette blending: <select name="PB"><option value="0">Linear (wrap if moving)
-</option><option value="1">Linear (always wrap)</option><option value="2">
-Linear (never wrap)</option><option value="3">None (not recommended)</option>
-</select><br><span class="wc">Auto-calculate white channel from RGB:<br><select 
-name="AW"><option value="0">None</option><option value="1">Brighter</option>
-<option value="2">Accurate</option><option value="3">Dual</option><option 
-value="4">Legacy</option></select><br></span><hr><button type="button" 
-onclick="B()">Back</button><button type="submit">Save</button></form></body>
-</html>)=====";
+max="40" name="IR" onchange="UI()" style="width:35px">&nbsp;<select name="IT">
+<option value="0">Remote disabled</option><option value="1">24-key RGB</option>
+<option value="2">24-key with CT</option><option value="3">40-key blue</option>
+<option value="4">44-key RGB</option><option value="5">21-key RGB</option>
+<option value="6">6-key black</option><option value="7">9-key red</option>
+</select><span style="cursor:pointer" onclick='off("IR")'>&nbsp;&#215;</span>
+<br><a href="https://github.com/Aircoookie/WLED/wiki/Infrared-Control" 
+target="_blank">IR info</a><br>Relay pin: <input type="number" min="-1" 
+max="40" name="RL" onchange="UI()" style="width:35px"> Invert <input 
+type="checkbox" name="RM"><span style="cursor:pointer" onclick='off("RL")'>
+&nbsp;&#215;</span><br><hr style="width:260px"><h3>Defaults</h3>
+Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
+Default brightness: <input name="CA" type="number" min="0" max="255" required>
+ (0-255)<br><br>Apply preset <input name="BP" type="number" min="0" max="250" 
+required> at boot (0 uses defaults)<br>- <i>or</i> -<br>
+Set current preset cycle setting as boot default: <input type="checkbox" 
+name="PC"><br><br>Use Gamma correction for color: <input type="checkbox" 
+name="GC"> (strongly recommended)<br>Use Gamma correction for brightness: <input
+ type="checkbox" name="GB"> (not recommended)<br><br>Brightness factor: <input 
+name="BF" type="number" min="1" max="255" required> %<h3>Transitions</h3>
+Crossfade: <input type="checkbox" name="TF"><br>Transition Time: <input 
+name="TD" maxlength="5" size="2"> ms<br>Enable Palette transitions: <input 
+type="checkbox" name="PF"><h3>Timed light</h3>Default Duration: <input 
+name="TL" type="number" min="1" max="255" required> min<br>
+Default Target brightness: <input name="TB" type="number" min="0" max="255" 
+required><br>Mode: <select name="TW"><option value="0">Wait and set</option>
+<option value="1">Fade</option><option value="2">Fade Color</option><option 
+value="3">Sunrise</option></select><h3>Advanced</h3>Palette blending: <select 
+name="PB"><option value="0">Linear (wrap if moving)</option><option value="1">
+Linear (always wrap)</option><option value="2">Linear (never wrap)</option>
+<option value="3">None (not recommended)</option></select><br><span class="wc">
+Auto-calculate white channel from RGB:<br><select name="AW"><option value="0">
+None</option><option value="1">Brighter</option><option value="2">Accurate
+</option><option value="3">Dual</option><option value="4">Legacy</option>
+</select><br></span><hr><button type="button" onclick="B()">Back</button><button
+ type="submit">Save</button></form></body></html>)=====";
 
 
 #ifdef WLED_ENABLE_DMX
@@ -349,10 +348,9 @@ name="MC" type="number" min="0" max="250" required><br>
 Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250" 
 required><br><h3>Button actions</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>
-For analog button set <i>duble</i> to:<ul><li>250=global brightness</li><li>
-249=effect speed</li><li>248=effect intensity</li><li>247=palette</li><li>
-0..32=segment X opacity</li></ul></div><h3>Time-controlled presets</h3><div 
+off-&gt;on</td><td>double<br>N/A</td></tr></thead><tbody></tbody></table><a 
+href="https://github.com/Aircoookie/WLED/wiki/Macros#analog-button" 
+target="_blank">Analog Button setup</a><h3>Time-controlled presets</h3><div 
 style="display:inline-block"><table id="TMT"></table></div><hr><button 
 type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form></body></html>)=====";
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 62cced6b6..708008d81 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -279,7 +279,7 @@ void WLED::loop()
     DEBUG_PRINT(F("Runtime: "));       DEBUG_PRINTLN(millis());
     DEBUG_PRINT(F("Unix time: "));     DEBUG_PRINTLN(now());
     DEBUG_PRINT(F("Free heap: "));     DEBUG_PRINTLN(ESP.getFreeHeap());
-    #ifdef ARDUINO_ARCH_ESP32
+    #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)
     if (psramFound()) {
       DEBUG_PRINT(F("Total PSRAM: "));    DEBUG_PRINT(ESP.getPsramSize()/1024); DEBUG_PRINTLN("kB");
       DEBUG_PRINT(F("Free PSRAM: "));     DEBUG_PRINT(ESP.getFreePsram()/1024); DEBUG_PRINTLN("kB");
@@ -328,7 +328,7 @@ void WLED::setup()
   DEBUG_PRINTLN(ESP.getFreeHeap());
   registerUsermods();
 
-  #ifdef ARDUINO_ARCH_ESP32
+  #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)
     if (psramFound()) {
       pinManager.allocatePin(16); // GPIO16 reserved for SPI RAM
       pinManager.allocatePin(17); // GPIO17 reserved for SPI RAM
@@ -360,18 +360,11 @@ void WLED::setup()
 
   DEBUG_PRINTLN(F("Reading config"));
   deserializeConfigFromFS();
-/*
+
 #if STATUSLED
-  bool lStatusLed = false;
-  for (uint8_t i=0; i<strip.numStrips; i++) {
-    if (strip.getStripPin(i)==STATUSLED) {
-      lStatusLed = true;
-      break;
-    }
-  }
-  if (!lStatusLed) pinMode(STATUSLED, OUTPUT);
+  if (!pinManager.isPinAllocated(STATUSLED)) pinMode(STATUSLED, OUTPUT);
 #endif
-*/
+
   DEBUG_PRINTLN(F("Initializing strip"));
   beginStrip();
 
@@ -385,14 +378,11 @@ void WLED::setup()
   WiFi.onEvent(WiFiEvent);
   #endif
 
-#ifdef WLED_ENABLE_ADALIGHT // reserve GPIO3 (RX) pin for ADALight
+  #ifdef WLED_ENABLE_ADALIGHT
   if (!pinManager.isPinAllocated(3)) {
     Serial.println(F("Ada"));
-    pinManager.allocatePin(3,false);
-  } else {
-    DEBUG_PRINTLN(F("ADALight disabled due to GPIO3 being used."));
   }
-#endif
+  #endif
 
   // generate module IDs
   escapedMac = WiFi.macAddress();
@@ -714,13 +704,8 @@ void WLED::handleConnection()
 
 void WLED::handleStatusLED()
 {
-/*
   #if STATUSLED
-  for (uint8_t s=0; s<strip.numStrips; s++) {
-    if (strip.getStripPin(s)==STATUSLED) {
-      return; // pin used for strip
-    }
-  }
+  if (pinManager.isPinAllocated(STATUSLED)) return; //lower priority if something else uses the same pin
 
   ledStatusType = WLED_CONNECTED ? 0 : 2;
   if (mqttEnabled && ledStatusType != 2) // Wi-Fi takes presendence over MQTT
@@ -740,5 +725,4 @@ void WLED::handleStatusLED()
 
   }
   #endif
-*/
 }
diff --git a/wled00/wled.h b/wled00/wled.h
index 9b469fad1..381e613c6 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -118,7 +118,7 @@
 // The following is a construct to enable code to compile without it.
 // There is a code thet will still not use PSRAM though:
 //    AsyncJsonResponse is a derived class that implements DynamicJsonDocument (AsyncJson-v6.h)
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)
 struct PSRAM_Allocator {
   void* allocate(size_t size) {
     if (psramFound()) return ps_malloc(size); // use PSRAM if it exists
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 79d5c6194..fcc729d7d 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -286,30 +286,11 @@ void getSettingsJS(byte subPage, char* dest)
       #ifdef WLED_ENABLE_DMX
         oappend(SET_F(",2")); // DMX hardcoded pin
       #endif
-      #ifdef WLED_ENABLE_ADALIGHT
-      // inform settings page that pin 3 is used by ADALights if not aleready used by strip (previous setup)
-      // NOTE: this will prohibit pin 3 use on new installs
-      {
-        bool pin3used = false;
-        for (uint8_t s=0; s < busses.getNumBusses(); s++) {
-          Bus* bus = busses.getBus(s);
-          uint8_t pins[5];
-          uint8_t nPins = bus->getPins(pins);
-          for (uint8_t i = 0; i < nPins; i++) {
-            if (pins[i] == 3) {
-              pin3used = true;
-              break;
-            }
-          }
-          if (pin3used) break;
-        }
-        if (!pin3used && pinManager.isPinAllocated(3)) oappend(SET_F(",3")); // ADALight (RX) pin
-      }
-      #endif
+      //Adalight / Serial in requires pin 3 to be unused. However, Serial input can not be prevented by WLED
       #ifdef WLED_DEBUG
         oappend(SET_F(",1")); // debug output (TX) pin
       #endif
-      #ifdef ARDUINO_ARCH_ESP32
+      #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)
         if (psramFound()) oappend(SET_F(",16,17")); // GPIO16 & GPIO17 reserved for SPI RAM
       #endif
       //TODO: add reservations for Ethernet shield pins
