diff --git a/usermods/multi_relay/usermod_multi_relay.h b/usermods/multi_relay/usermod_multi_relay.h
index 52fbd7f9..c3d55d66 100644
--- a/usermods/multi_relay/usermod_multi_relay.h
+++ b/usermods/multi_relay/usermod_multi_relay.h
@@ -317,15 +317,15 @@ class MultiRelay : public Usermod {
      * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
      * Values in the state object may be modified by connected clients
      */
-    void addToJsonState(JsonObject &root) {
-    }
+    //void addToJsonState(JsonObject &root) {
+    //}
 
     /**
      * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
      * Values in the state object may be modified by connected clients
      */
-    void readFromJsonState(JsonObject &root) {
-    }
+    //void readFromJsonState(JsonObject &root) {
+    //}
 
     /**
      * provide the changeable values
@@ -335,11 +335,12 @@ class MultiRelay : public Usermod {
 
       top[FPSTR(_enabled)] = enabled;
       for (uint8_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
-        String parName = FPSTR(_relay_str); parName += "-"; parName += i; parName += "-";
-        top[parName+"pin"]              = _relay[i].pin;
-        top[parName+FPSTR(_activeHigh)] = _relay[i].mode;
-        top[parName+FPSTR(_delay_str)]  = _relay[i].delay;
-        top[parName+FPSTR(_external)]   = _relay[i].external;
+        String parName = FPSTR(_relay_str); parName += '-'; parName += i;
+        JsonObject relay = top.createNestedObject(parName);
+        relay["pin"]              = _relay[i].pin;
+        relay[FPSTR(_activeHigh)] = _relay[i].mode;
+        relay[FPSTR(_delay_str)]  = _relay[i].delay;
+        relay[FPSTR(_external)]   = _relay[i].external;
       }
       DEBUG_PRINTLN(F("MultiRelay config saved."));
     }
@@ -363,13 +364,19 @@ class MultiRelay : public Usermod {
       enabled = top[FPSTR(_enabled)] | enabled;
 
       for (uint8_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
-        String parName = FPSTR(_relay_str); parName += "-"; parName += i; parName += "-";
+        String parName = FPSTR(_relay_str); parName += '-'; parName += i;
         oldPin[i]          = _relay[i].pin;
+        _relay[i].pin      = top[parName]["pin"] | _relay[i].pin;
+        _relay[i].mode     = top[parName][FPSTR(_activeHigh)] | _relay[i].mode;
+        _relay[i].external = top[parName][FPSTR(_external)]   | _relay[i].external;
+        _relay[i].delay    = top[parName][FPSTR(_delay_str)]  | _relay[i].delay;
+        // begin backwards compatibility (beta) remove when 0.13 is released
+        parName += '-';
         _relay[i].pin      = top[parName+"pin"] | _relay[i].pin;
-//        _relay[i].pin      = min(39,max(-1,(int)_relay[i].pin)); // bounds checking
         _relay[i].mode     = top[parName+FPSTR(_activeHigh)] | _relay[i].mode;
         _relay[i].external = top[parName+FPSTR(_external)]   | _relay[i].external;
         _relay[i].delay    = top[parName+FPSTR(_delay_str)]  | _relay[i].delay;
+        // end compatibility
         _relay[i].delay    = min(600,max(0,abs((int)_relay[i].delay))); // bounds checking max 10min
       }
 
@@ -397,7 +404,7 @@ class MultiRelay : public Usermod {
         DEBUG_PRINTLN(F(" config (re)loaded."));
       }
       // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
-      return true;
+      return !top[F("relay-0")]["pin"].isNull();
     }
 
     /**
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index a8a8c2e7..110fed77 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -147,15 +147,20 @@
             }
           }
           if (change) {
+//            // blazoncek experimental extension
 //            gId("ew"+n).checked = (type == 30 || type == 31 || type == 44 || type == 45); // RGBW checkbox, TYPE_xxxx values from const.h
             gId("ls"+n).value = n+1;  // set LED start
             if (type > 31 && type < 48) d.getElementsByName("LC"+n)[0].value = 1; // for sanity change analog count just to 1 LED
           }
+//          // blazoncek experimental extension
 //          gId("ew"+n).onclick = (type > 31 && type < 48) ? (function(){return false}) : (function(){});  // prevent change for analog
 //          isRGBW |= gId("ew"+n).checked;
           isRGBW |= (type == 30 || type == 31 || (type > 40 && type < 46 && type != 43)); // RGBW checkbox, TYPE_xxxx values from const.h
-          gId("dig"+n).style.display = (type > 31 && type < 48) ? "none":"inline";  // hide reverse, skip 1st & count for analog
-          gId("psd"+n).innerHTML = (type > 31 && type < 48) ? "Index:":"Start:";    // change analog start description
+          gId("co"+n).style.display = (type == 41 || type == 42) ? "none":"inline";  // hide color order for PWM W & WW/CW
+          gId("dig"+n+"c").style.display = (type > 40 && type < 48) ? "none":"inline";  // hide skip 1st & count for analog
+          gId("dig"+n+"s").style.display = (type > 40 && type < 48) ? "none":"inline";  // hide skip 1st & count for analog
+          gId("rev"+n).innerHTML = (type > 40 && type < 48) ? "Inverted":"Reverse (rotated 180°)";  // change reverse text for analog
+          gId("psd"+n).innerHTML = (type > 40 && type < 48) ? "Index:":"Start:";    // change analog start description
         }
       }
       // display white channel calculation method
@@ -274,7 +279,7 @@ ${i+1}:
 <option value="44">PWM RGBW</option>
 <option value="45">PWM RGBWC</option>
 </select>&nbsp;
-Color Order:
+<div id="co${i}" style="display:inline">Color Order:
 <select name="CO${i}">
 <option value="0">GRB</option>
 <option value="1">RGB</option>
@@ -282,7 +287,7 @@ Color Order:
 <option value="3">RBG</option>
 <option value="4">BGR</option>
 <option value="5">GBR</option>
-</select><br>
+</select></div><br>
 <span id="p0d${i}">GPIO:</span><input type="number" name="L0${i}" min="0" max="33" required class="s" onchange="UI()"/>
 <span id="p1d${i}"></span><input type="number" name="L1${i}" min="0" max="33" class="s" onchange="UI()"/>
 <span id="p2d${i}"></span><input type="number" name="L2${i}" min="0" max="33" class="s" onchange="UI()"/>
@@ -290,11 +295,9 @@ Color Order:
 <span id="p4d${i}"></span><input type="number" name="L4${i}" min="0" max="33" class="s" onchange="UI()"/>
 <br>
 <span id="psd${i}">Start:</span> <input type="number" name="LS${i}" id="ls${i}" class="l" min="0" max="8191" value="${lastEnd(i)}" readonly required />&nbsp;
-<div id="dig${i}" style="display:inline">
-Count: <input type="number" name="LC${i}" class="l" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>
-Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
-&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${i}" type="checkbox" name="SL${i}"><br>
-</div>
+<div id="dig${i}c" style="display:inline">Count: <input type="number" name="LC${i}" class="l" min="0" max="${maxPB}" value="1" required oninput="UI()" /></div><br>
+<span id="rev${i}">Reverse (rotated 180°)</span>: <input type="checkbox" name="CV${i}">
+<div id="dig${i}s" style="display:inline">&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${i}" type="checkbox" name="SL${i}"></div><br>
 </div>`;
         f.insertAdjacentHTML("beforeend", cn);
       }
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 322a6c4d..1b267892 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -77,7 +77,7 @@ onclick="B()">Back</button><button type="submit">Save & Connect</button></form>
 // 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 timeout,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 showToast(e,n=!1){var a=gId("toast");a.innerHTML=e,a.className=n?"error":"show",clearTimeout(timeout),a.style.animation="none",timeout=setTimeout((function(){a.className=a.className.replace("show","")}),2900)}function bLimits(e,n,a){maxB=e,maxM=a,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;if("IR"!=n&&"BT"!=n&&e[i].value>33)return alert("Sorry, pins >33 are input only."),e[i].value="",e[i].focus(),!1;for(j=i+1;j<e.length;j++){var a=e[j].name.substring(0,2);if(("L0"==a||"L1"==a||"L2"==a||"L3"==a||"L4"==a||"RL"==a||"BT"==a||"IR"==a)&&""!=e[j].value&&e[i].value==e[j].value)return alert(`Pin conflict between ${e[i].name}/${e[j].name}!`),e[j].value="",e[j].focus(),!1}}}return!0}function trySubmit(e){if(d.Sf.data.value="",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,a){return e<32?maxM<1e4&&3==a?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,a=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 t=d.getElementsByTagName("select");for(f=0;f<t.length;f++)if("LT"==t[f].name.substring(0,2)){g=t[f].name.substring(2);var i=parseInt(t[f].value,10);gId("p0d"+g).innerHTML=i>49?"Data GPIO:":i>41?"GPIOs:":"GPIO:",gId("p1d"+g).innerHTML=i>49?"Clk GPIO:":"";var l=d.getElementsByName("L1"+g)[0];for(a+=getMem(i,d.getElementsByName("LC"+g)[0].value,d.getElementsByName("L0"+g)[0].value),v=1;v<5;v++){(l=d.getElementsByName("L"+v+g)[0])&&(i>49&&1==v||i>41&&i<50&&v+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}e&&(gId("ls"+g).value=g+1,i>31&&i<48&&(d.getElementsByName("LC"+g)[0].value=1)),n|=30==i||31==i||i>40&&i<46&&43!=i,gId("dig"+g).style.display=i>31&&i<48?"none":"inline",gId("psd"+g).innerHTML=i>31&&i<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(f=0;f<s;f++)o[f].style.display=n?"inline":"none";var u=d.getElementsByTagName("input"),r=0,p=0;for(f=0;f<u.length;f++){var m=u[f].name.substring(0,2);if("LC"!=m||"LC"===u[f].name){if("L0"==m||"L1"==m)d.getElementsByName("LC"+u[f].name.substring(2))[0].max=maxPB;if(("L0"==m||"L1"==m||"L2"==m||"L3"==m||"L4"==m||"RL"==m||"BT"==m||"IR"==m)&&""!=u[f].value&&"-1"!=u[f].value){var v=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)v.push(d.um_p[k]);for(j=0;j<u.length;j++)if(f!=j){var c=u[j].name.substring(0,2);"L0"!=c&&"L1"!=c&&"L2"!=c&&"L3"!=c&&"L4"!=c&&"RL"!=c&&"BT"!=c&&"IR"!=c||""!=u[j].value&&"-1"!=u[j].value&&v.push(parseInt(u[j].value,10))}v.some(e=>e==parseInt(u[f].value,10))?u[f].style.color="red":u[f].style.color=parseInt(u[f].value,10)>33?"orange":"#fff"}}else{var g=u[f].name.substring(2),L=parseInt(u[f].value,10);gId("ls"+g).value=r,L&&(r+=L,L>p&&(p=L))}}if(gId("LC").readOnly&&(d.getElementsByName("LC")[0].value=r),d.activeElement==d.getElementsByName("LC")[0]){var f=d.getElementsByClassName("iST").length;1==f&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}gId("m0").innerHTML=a,bquot=a/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||p>800||bquot>80?"inline":"none",gId("ledwarning").style.color=r>maxPB||p>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 GPIO";var y=Math.ceil((100+r*laprev)/500)/2;y=y>5?Math.ceil(y):y;t="";var I=30==d.Sf.LAsel.value,b=255==d.Sf.LAsel.value;y<1.02&&!I&&!b?t="ESP 5V pin with 1A USB supply":(t+=I?"12V ":b?"WS2815 12V ":"5V ",t+=y,t+="A supply connected to LEDs");var B=Math.ceil((100+r*laprev)/1500)/2,S="(for most effects, ~";S+=B=B>5?Math.ceil(B):B,S+="A is enough)<br>",gId("psu").innerHTML=t,gId("psu2").innerHTML=b?"":S,gId("json").style.display=8==d.Sf.IT.value?"":"none"}function lastEnd(e){if(e<1)return 0;v=parseInt(d.getElementsByName("LS"+(e-1))[0].value)+parseInt(d.getElementsByName("LC"+(e-1))[0].value);var n=parseInt(d.getElementsByName("LT"+(e-1))[0].value);return n>31&&n<48&&(v=1),isNaN(v)?0:v}function addLEDs(e){if(e>1)return maxB=e,void(gId("+").style.display="inline");var n=d.getElementsByClassName("iST"),a=n.length;if(!(1==e&&a>=maxB||-1==e&&0==a)){var t=gId("mLC");if(1==e){var i=`<div class="iST">\n${a>0?'<hr style="width:260px">':""}\n${a+1}:\n<select name="LT${a}" onchange="UI(true)">\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${a}">\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${a}">GPIO:</span><input type="number" name="L0${a}" min="0" max="33" required class="s" onchange="UI()"/>\n<span id="p1d${a}"></span><input type="number" name="L1${a}" min="0" max="33" class="s" onchange="UI()"/>\n<span id="p2d${a}"></span><input type="number" name="L2${a}" min="0" max="33" class="s" onchange="UI()"/>\n<span id="p3d${a}"></span><input type="number" name="L3${a}" min="0" max="33" class="s" onchange="UI()"/>\n<span id="p4d${a}"></span><input type="number" name="L4${a}" min="0" max="33" class="s" onchange="UI()"/>\n<br>\n<span id="psd${a}">Start:</span> <input type="number" name="LS${a}" id="ls${a}" class="l" min="0" max="8191" value="${lastEnd(a)}" readonly required />&nbsp;\n<div id="dig${a}" style="display:inline">\nCount: <input type="number" name="LC${a}" class="l" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>\nReverse (rotated 180°): <input type="checkbox" name="CV${a}">\n&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${a}" type="checkbox" name="SL${a}"><br>\n</div>\n</div>`;t.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--a].remove(),--a),gId("+").style.display=a<maxB-1?"inline":"none",gId("-").style.display=a>0?"inline":"none",UI()}}function addBtn(e,n,a){var t=gId("btns").innerHTML,i="BT"+e;t+=`Button ${e} GPIO: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" class="s" value="${n}">`,t+=`<select name="${"BE"+e}">`,t+=`<option value="0" ${0==a?"selected":""}>Disabled</option>`,t+=`<option value="2" ${2==a?"selected":""}>Pushbutton</option>`,t+=`<option value="3" ${3==a?"selected":""}>Push inverted</option>`,t+=`<option value="4" ${4==a?"selected":""}>Switch</option>`,t+=`<option value="5" ${5==a?"selected":""}>PIR sensor</option>`,t+=`<option value="6" ${6==a?"selected":""}>Touch</option>`,t+=`<option value="7" ${7==a?"selected":""}>Analog</option>`,t+=`<option value="8" ${8==a?"selected":""}>Analog inverted</option>`,t+="</select>",t+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=t}function uploadFile(e){var n=new XMLHttpRequest;n.addEventListener("load",(function(){showToast(this.responseText)})),n.addEventListener("error",(function(e){showToast(e.stack,!0)})),n.open("POST","/upload");var a=new FormData;return a.append("data",d.Sf.data.files[0],e),n.send(a),d.Sf.data.value="",!1}function GetV() {var d=document;
+var timeout,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 showToast(e,n=!1){var a=gId("toast");a.innerHTML=e,a.className=n?"error":"show",clearTimeout(timeout),a.style.animation="none",timeout=setTimeout((function(){a.className=a.className.replace("show","")}),2900)}function bLimits(e,n,a){maxB=e,maxM=a,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;if("IR"!=n&&"BT"!=n&&e[i].value>33)return alert("Sorry, pins >33 are input only."),e[i].value="",e[i].focus(),!1;for(j=i+1;j<e.length;j++){var a=e[j].name.substring(0,2);if(("L0"==a||"L1"==a||"L2"==a||"L3"==a||"L4"==a||"RL"==a||"BT"==a||"IR"==a)&&""!=e[j].value&&e[i].value==e[j].value)return alert(`Pin conflict between ${e[i].name}/${e[j].name}!`),e[j].value="",e[j].focus(),!1}}}return!0}function trySubmit(e){if(d.Sf.data.value="",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,a){return e<32?maxM<1e4&&3==a?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,a=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 t=d.getElementsByTagName("select");for(f=0;f<t.length;f++)if("LT"==t[f].name.substring(0,2)){g=t[f].name.substring(2);var i=parseInt(t[f].value,10);gId("p0d"+g).innerHTML=i>49?"Data GPIO:":i>41?"GPIOs:":"GPIO:",gId("p1d"+g).innerHTML=i>49?"Clk GPIO:":"";var l=d.getElementsByName("L1"+g)[0];for(a+=getMem(i,d.getElementsByName("LC"+g)[0].value,d.getElementsByName("L0"+g)[0].value),v=1;v<5;v++){(l=d.getElementsByName("L"+v+g)[0])&&(i>49&&1==v||i>41&&i<50&&v+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}e&&(gId("ls"+g).value=g+1,i>31&&i<48&&(d.getElementsByName("LC"+g)[0].value=1)),n|=30==i||31==i||i>40&&i<46&&43!=i,gId("co"+g).style.display=41==i||42==i?"none":"inline",gId("dig"+g+"c").style.display=i>40&&i<48?"none":"inline",gId("dig"+g+"s").style.display=i>40&&i<48?"none":"inline",gId("rev"+g).innerHTML=i>40&&i<48?"Inverted":"Reverse (rotated 180°)",gId("psd"+g).innerHTML=i>40&&i<48?"Index:":"Start:"}var s=d.querySelectorAll(".wc"),o=s.length;for(f=0;f<o;f++)s[f].style.display=n?"inline":"none";var u=d.getElementsByTagName("input"),r=0,p=0;for(f=0;f<u.length;f++){var m=u[f].name.substring(0,2);if("LC"!=m||"LC"===u[f].name){if("L0"==m||"L1"==m)d.getElementsByName("LC"+u[f].name.substring(2))[0].max=maxPB;if(("L0"==m||"L1"==m||"L2"==m||"L3"==m||"L4"==m||"RL"==m||"BT"==m||"IR"==m)&&""!=u[f].value&&"-1"!=u[f].value){var v=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)v.push(d.um_p[k]);for(j=0;j<u.length;j++)if(f!=j){var c=u[j].name.substring(0,2);"L0"!=c&&"L1"!=c&&"L2"!=c&&"L3"!=c&&"L4"!=c&&"RL"!=c&&"BT"!=c&&"IR"!=c||""!=u[j].value&&"-1"!=u[j].value&&v.push(parseInt(u[j].value,10))}v.some(e=>e==parseInt(u[f].value,10))?u[f].style.color="red":u[f].style.color=parseInt(u[f].value,10)>33?"orange":"#fff"}}else{var g=u[f].name.substring(2),L=parseInt(u[f].value,10);gId("ls"+g).value=r,L&&(r+=L,L>p&&(p=L))}}if(gId("LC").readOnly&&(d.getElementsByName("LC")[0].value=r),d.activeElement==d.getElementsByName("LC")[0]){var f=d.getElementsByClassName("iST").length;1==f&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}gId("m0").innerHTML=a,bquot=a/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||p>800||bquot>80?"inline":"none",gId("ledwarning").style.color=r>maxPB||p>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 GPIO";var y=Math.ceil((100+r*laprev)/500)/2;y=y>5?Math.ceil(y):y;t="";var I=30==d.Sf.LAsel.value,b=255==d.Sf.LAsel.value;y<1.02&&!I&&!b?t="ESP 5V pin with 1A USB supply":(t+=I?"12V ":b?"WS2815 12V ":"5V ",t+=y,t+="A supply connected to LEDs");var B=Math.ceil((100+r*laprev)/1500)/2,S="(for most effects, ~";S+=B=B>5?Math.ceil(B):B,S+="A is enough)<br>",gId("psu").innerHTML=t,gId("psu2").innerHTML=b?"":S,gId("json").style.display=8==d.Sf.IT.value?"":"none"}function lastEnd(e){if(e<1)return 0;v=parseInt(d.getElementsByName("LS"+(e-1))[0].value)+parseInt(d.getElementsByName("LC"+(e-1))[0].value);var n=parseInt(d.getElementsByName("LT"+(e-1))[0].value);return n>31&&n<48&&(v=1),isNaN(v)?0:v}function addLEDs(e){if(e>1)return maxB=e,void(gId("+").style.display="inline");var n=d.getElementsByClassName("iST"),a=n.length;if(!(1==e&&a>=maxB||-1==e&&0==a)){var t=gId("mLC");if(1==e){var i=`<div class="iST">\n${a>0?'<hr style="width:260px">':""}\n${a+1}:\n<select name="LT${a}" onchange="UI(true)">\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;\n<div id="co${a}" style="display:inline">Color Order:\n<select name="CO${a}">\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></div><br>\n<span id="p0d${a}">GPIO:</span><input type="number" name="L0${a}" min="0" max="33" required class="s" onchange="UI()"/>\n<span id="p1d${a}"></span><input type="number" name="L1${a}" min="0" max="33" class="s" onchange="UI()"/>\n<span id="p2d${a}"></span><input type="number" name="L2${a}" min="0" max="33" class="s" onchange="UI()"/>\n<span id="p3d${a}"></span><input type="number" name="L3${a}" min="0" max="33" class="s" onchange="UI()"/>\n<span id="p4d${a}"></span><input type="number" name="L4${a}" min="0" max="33" class="s" onchange="UI()"/>\n<br>\n<span id="psd${a}">Start:</span> <input type="number" name="LS${a}" id="ls${a}" class="l" min="0" max="8191" value="${lastEnd(a)}" readonly required />&nbsp;\n<div id="dig${a}c" style="display:inline">Count: <input type="number" name="LC${a}" class="l" min="0" max="${maxPB}" value="1" required oninput="UI()" /></div><br>\n<span id="rev${a}">Reverse (rotated 180°)</span>: <input type="checkbox" name="CV${a}">\n<div id="dig${a}s" style="display:inline">&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${a}" type="checkbox" name="SL${a}"></div><br>\n</div>`;t.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--a].remove(),--a),gId("+").style.display=a<maxB-1?"inline":"none",gId("-").style.display=a>0?"inline":"none",UI()}}function addBtn(e,n,a){var t=gId("btns").innerHTML,i="BT"+e;t+=`Button ${e} GPIO: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" class="s" value="${n}">`,t+=`<select name="${"BE"+e}">`,t+=`<option value="0" ${0==a?"selected":""}>Disabled</option>`,t+=`<option value="2" ${2==a?"selected":""}>Pushbutton</option>`,t+=`<option value="3" ${3==a?"selected":""}>Push inverted</option>`,t+=`<option value="4" ${4==a?"selected":""}>Switch</option>`,t+=`<option value="5" ${5==a?"selected":""}>PIR sensor</option>`,t+=`<option value="6" ${6==a?"selected":""}>Touch</option>`,t+=`<option value="7" ${7==a?"selected":""}>Analog</option>`,t+=`<option value="8" ${8==a?"selected":""}>Analog inverted</option>`,t+="</select>",t+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=t}function uploadFile(e){var n=new XMLHttpRequest;n.addEventListener("load",(function(){showToast(this.responseText)})),n.addEventListener("error",(function(e){showToast(e.stack,!0)})),n.open("POST","/upload");var a=new FormData;return a.append("data",d.Sf.data.files[0],e),n.send(a),d.Sf.data.value="",!1}function GetV() {var d=document;
 %CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post"><div class="toprow"><div class="helpB">
 <button type="button" onclick="H()">?</button></div><button type="button" 
diff --git a/wled00/wled.h b/wled00/wled.h
index c319357b..1e1d2db1 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2109182
+#define VERSION 2109191
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index e16d1cbf..09931c7b 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -179,6 +179,52 @@ void sappends(char stype, const char* key, char* val)
   }
 }
 
+void extractPin(JsonObject &obj, const char *key) {
+  if (obj[key].is<JsonArray>()) {
+    JsonArray pins = obj[key].as<JsonArray>();
+    for (JsonVariant pv : pins) {
+      if (pv.as<int>() > -1) { oappend(","); oappendi(pv.as<int>()); }
+    }
+  } else {
+    if (obj[key].as<int>() > -1) { oappend(","); oappendi(obj[key].as<int>()); }
+  }
+}
+
+// oappens used pins by recursively scanning JsonObject
+void fillUMPins(JsonObject &mods)
+{
+  for (JsonPair kv : mods) {
+    // kv.key() is usermod name or subobject key
+    // kv.value() is object itself
+    JsonObject obj = kv.value();
+    if (!obj.isNull()) {
+      // element is an JsonObject
+      if (!obj["pin"].isNull()) {
+        extractPin(obj, "pin");
+      } else {
+        // scan keys (just one level deep as is possible with usermods)
+        for (JsonPair so : obj) {
+          const char *key = so.key().c_str();
+          if (strstr(key, "pin")) {
+            // we found a key containing "pin" substring
+            if (strlen(strstr(key, "pin")) == 3) {
+              // and it is at the end, we found another pin
+              extractPin(obj, key);
+              continue;
+            }
+          }
+          if (!obj[so.key()].is<JsonObject>()) continue;
+          JsonObject subObj = obj[so.key()];
+          if (!subObj["pin"].isNull()) {
+            // get pins from subobject
+            extractPin(subObj, "pin");
+          }
+        }
+      }
+    }
+  }
+}
+
 
 //get values for settings form in javascript
 void getSettingsJS(byte subPage, char* dest)
@@ -268,22 +314,7 @@ void getSettingsJS(byte subPage, char* dest)
     usermods.addToConfig(mods);
     oappend(SET_F("d.um_p=[6,7,8,9,10,11"));
     if (!mods.isNull()) {
-      for (JsonPair kv : mods) {
-        if (!kv.value().isNull()) {
-          // element is an JsonObject
-          JsonObject obj = kv.value();
-          if (obj["pin"] != nullptr) {
-            if (obj["pin"].is<JsonArray>()) {
-              JsonArray pins = obj["pin"].as<JsonArray>();
-              for (JsonVariant pv : pins) {
-                if (pv.as<int>() > -1) { oappend(","); oappendi(pv.as<int>()); }
-              }
-            } else {
-              if (obj["pin"].as<int>() > -1) { oappend(","); oappendi(obj["pin"].as<int>()); }
-            }
-          }
-        }
-      }
+      fillUMPins(mods);
       #ifdef WLED_ENABLE_DMX
         oappend(SET_F(",2")); // DMX hardcoded pin
       #endif