diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index b36f27e0e..a6ba78ef8 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -37,7 +37,7 @@ struct BusConfig {
     type = busType; count = len; start = pstart;
     colorOrder = pcolorOrder; reversed = rev; skipAmount = skip;
     uint8_t nPins = 1;
-    if (type >= 10 && type <= 15) nPins = 4;
+    if (type >= 10 && type <= 15) nPins = 4; //virtual network bus. 4 "pins" store IP address
     else if (type > 47) nPins = 2;
     else if (type > 40 && type < 46) nPins = NUM_PWM_PINS(type);
     for (uint8_t i = 0; i < nPins; i++) pins[i] = ppins[i];
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 063f59d95..232680f24 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=500">
 	<title>LED Settings</title>
 	<script>
-    var d=document,laprev=55,maxB=1,maxM=5000,maxPB=4096,bquot=0; //maximum bytes for LED allocation: 5kB for 8266, 32kB for 32
+    var d=document,laprev=55,maxB=1,maxM=4000,maxPB=4096,maxL=1333,maxLbquot=0; //maximum bytes for LED allocation: 4kB for 8266, 32kB for 32
 		function H()
 		{
 			window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");
@@ -28,8 +28,8 @@
       x.style.animation = 'none';
       timeout = setTimeout(function(){ x.className = x.className.replace("show", ""); }, 2900);
     }
-    function bLimits(b,p,m) {
-      maxB = b; maxM = m; maxPB = p;
+    function bLimits(b,p,m,l) {
+      maxB = b; maxM = m; maxPB = p; maxL = l;
     }
     function pinsOK() {
       var LCs = d.getElementsByTagName("input");
@@ -160,7 +160,6 @@
             }
           }
           if (change) {
-            gId("ls"+n).value = n+1;  // set LED start
             if (t > 31 && t < 48) d.getElementsByName("LC"+n)[0].value = 1; // for sanity change analog count just to 1 LED
           }
           isRGBW |= (t == 30 || t == 31 || (t > 40 && t < 46 && t != 43)); // RGBW checkbox, TYPE_xxxx values from const.h
@@ -180,15 +179,21 @@
 			}
       // check for pin conflicts
       var LCs = d.getElementsByTagName("input");
-      var sLC = 0, maxLC = 0;
+      var sLC = 0, sPC = 0, maxLC = 0;
       for (i=0; i<LCs.length; i++) {
         var nm = LCs[i].name.substring(0,2);  // field name
         var n  = LCs[i].name.substring(2);    // bus number
-        // do we have a led count field but not total led count
-        if (nm=="LC" && LCs[i].name !== "LC") {
+        // do we have a led count field
+        if (nm=="LC") {
           var c=parseInt(LCs[i].value,10);
-          gId("ls"+n).value=sLC; // update led start field
-          if(c){sLC+=c;if(c>maxLC)maxLC=c;} // increase led count
+          //gId("ls"+n).value=sLC; // update led start field (TODO except if it has been manually changed)
+          if(c){
+            var s = parseInt(gId("ls"+n).value);
+            if (s+c > sLC) sLC = s+c;
+            if(c>maxLC)maxLC=c;
+            var t = parseInt(d.getElementsByName("LT"+n)[0].value, 10); // LED type SELECT
+            if (t>16) sPC+=c; //virtual out busses do not count towards physical LEDs
+          } // increase led count
           continue;
         }
         // do we have led pins for digital leds
@@ -196,7 +201,7 @@
           var lc=d.getElementsByName("LC"+n)[0];
           lc.max=maxPB; // update max led count value
         }
-        // ignore IP address
+        // ignore IP address (stored in pins for virtual busses)
         if (nm=="L0" || nm=="L1" || nm=="L2" || nm=="L3") {
           var t = parseInt(d.getElementsByName("LT"+n)[0].value, 10); // LED type SELECT
           if (t<16) {
@@ -230,22 +235,18 @@
           }
       }
       // update total led count
-      if (gId("LC").readOnly) d.getElementsByName("LC")[0].value = sLC;
-      // if we are changing total led count update led count for 1st strip
-      if (d.activeElement == d.getElementsByName("LC")[0]) {
-        var o = d.getElementsByClassName("iST");
-        var i = o.length;
-        if (i == 1) d.getElementsByName("LC0")[0].value = d.getElementsByName("LC")[0].value;
-      }
+      gId("lc").textContent = sLC;
+      gId("pc").textContent = (sLC == sPC) ? "":"(" + sPC + " physical)";
+
       // memory usage and warnings
       gId('m0').innerHTML = memu;
       bquot = memu / 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 = (sLC > maxPB || maxLC > 800 || bquot > 80) ? 'inline':'none';
       gId('ledwarning').style.color = (sLC > maxPB || maxLC > 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";
+      gId('wreason').innerHTML = (bquot > 80) ? "80% of max. LED memory" +(bquot>100 ? ` (<b>ERROR: Using over ${maxM}B!</b>)` : "") : "800 LEDs per output";
       // calculate power
-      var val = Math.ceil((100 + sLC * laprev)/500)/2;
+      var val = Math.ceil((100 + sPC * laprev)/500)/2;
 			val = (val > 5) ? Math.ceil(val) : val;
 			var s = "";
       var is12V = (d.Sf.LAsel.value == 30);
@@ -259,7 +260,7 @@
 				s += val;
 				s += "A supply connected to LEDs";
 			}
-      var val2 = Math.ceil((100 + sLC * laprev)/1500)/2;
+      var val2 = Math.ceil((100 + sPC * laprev)/1500)/2;
       val2 = (val2 > 5) ? Math.ceil(val2) : val2;
       var s2 = "(for most effects, ~";
       s2 += val2;
@@ -319,15 +320,15 @@ ${i+1}:
 <option value="5">GBR</option>
 </select></div>
 <br>
-<span id="p0d${i}">GPIO:</span><input type="number" name="L0${i}" min="0" max="33" required class="xs" onchange="UI()"/>
+<span id="psd${i}">Start:</span> <input type="number" name="LS${i}" id="ls${i}" class="l" min="0" max="8191" value="${lastEnd(i)}" onchange="UI()" required />&nbsp;
+<div id="dig${i}c" style="display:inline">Length: <input type="number" name="LC${i}" class="l" min="1" max="${maxPB}" value="1" required oninput="UI()" /></div>
+<br>
+<span id="p0d${i}">GPIO:</span> <input type="number" name="L0${i}" min="0" max="33" required class="xs" onchange="UI()"/>
 <span id="p1d${i}"></span><input type="number" name="L1${i}" min="0" max="33" class="xs" onchange="UI()"/>
 <span id="p2d${i}"></span><input type="number" name="L2${i}" min="0" max="33" class="xs" onchange="UI()"/>
 <span id="p3d${i}"></span><input type="number" name="L3${i}" min="0" max="33" class="xs" onchange="UI()"/>
 <span id="p4d${i}"></span><input type="number" name="L4${i}" min="0" max="33" class="xs" 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)}" disabled readonly required />&nbsp;
-<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>
 <div id="dig${i}r" style="display:inline"><span id="rev${i}">Reversed</span>: <input type="checkbox" name="CV${i}"></div>&nbsp;
 <div id="dig${i}s" style="display:inline">Skip 1<sup>st</sup> LED: <input id="sl${i}" type="checkbox" name="SL${i}"></div>
 <br>
@@ -348,7 +349,7 @@ ${i+1}:
       var bt = "BT" + i;
       var be = "BE" + i;
       c += `Button ${i} GPIO: <input type="number" min="-1" max="40" name="${bt}" onchange="UI()" class="xs" value="${p}">`;
-      c += `<select name="${be}">`
+      c += `&nbsp;<select name="${be}">`
       c += `<option value="0" ${t==0?"selected":""}>Disabled</option>`;
       c += `<option value="2" ${t==2?"selected":""}>Pushbutton</option>`;
       c += `<option value="3" ${t==3?"selected":""}>Push inverted</option>`;
@@ -375,7 +376,7 @@ ${i+1}:
 		function GetV()
 		{
       //values injected by server while sending HTML
-      //maxM=5000;maxPB=1536;d.um_p=[1,6,7,8,9,10,11];addLEDs(3);d.Sf.LC.value=250;addLEDs(1);d.Sf.L00.value=2;d.Sf.L10.value=0;d.Sf.LC0.value=250;d.Sf.LT0.value=22;d.Sf.CO0.value=0;d.Sf.LS0.value=0;d.Sf.LS0.checked=0;d.Sf.MA.value=5400;d.Sf.LA.value=55;d.getElementsByClassName("pow")[0].innerHTML="350mA";d.Sf.CA.value=40;d.Sf.AW.value=3;d.Sf.BO.checked=0;d.Sf.BP.value=3;d.Sf.GB.checked=0;d.Sf.GC.checked=1;d.Sf.TF.checked=1;d.Sf.TD.value=700;d.Sf.PF.checked=0;d.Sf.BF.value=64;d.Sf.TB.value=0;d.Sf.TL.value=60;d.Sf.TW.value=1;d.Sf.PB.selectedIndex=0;d.Sf.RL.value=12;d.Sf.RM.checked=0;addBtn(0,0,2);addBtn(1,3,4);addBtn(2,-1,0);d.Sf.IR.value=-1;
+      //d.um_p=[6,7,8,9,10,11];bLimits(3,4096,4000,1664);d.Sf.MS.checked=0;addLEDs(1);d.Sf.L00.value=2;d.Sf.LC0.value=29;d.Sf.LT0.value=22;d.Sf.CO0.value=0;d.Sf.LS0.value=12;d.Sf.CV0.checked=0;d.Sf.SL0.checked=0;d.Sf.MA.value=850;d.Sf.LA.value=0;d.Sf.CA.value=56;d.Sf.AW.value=3;d.Sf.BO.checked=1;d.Sf.BP.value=80;d.Sf.GB.checked=0;d.Sf.GC.checked=1;d.Sf.TF.checked=1;d.Sf.TD.value=700;d.Sf.PF.checked=0;d.Sf.BF.value=100;d.Sf.TB.value=0;d.Sf.TL.value=60;d.Sf.TW.value=0;d.Sf.PB.selectedIndex=0;d.Sf.RL.value=12;d.Sf.RM.checked=1;addBtn(0,0,0);addBtn(1,-1,0);d.Sf.TT.value=32;d.Sf.IR.value=-1;d.Sf.IT.value=0;
     }
 	</script>
 	<style>
@@ -387,7 +388,7 @@ ${i+1}:
 		<div class="helpB"><button type="button" onclick="H()">?</button></div>
 		<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
     <h2>LED &amp; Hardware setup</h2>
-    Total LED count: <input name="LC" id="LC" type="number" min="1" max="8192" oninput="UI()" disabled required readonly><br>
+    Total LEDs: <span id="lc">?</span> <span id="pc"></span><br>
     <i>Recommended power supply for brightest white:</i><br>
     <b><span id="psu">?</span></b><br>
     <span id="psu2"><br></span>
@@ -425,10 +426,10 @@ ${i+1}:
     <div id="dbar" style="display:inline-block; width: 100px; height: 10px; border-radius: 20px;"></div><br>
     <div id="ledwarning" style="color: orange; display: none;">
       &#9888; You might run into stability or lag issues.<br>
-      Use less than <span id="wreason">800 LEDs per pin</span> for the best experience!<br>
+      Use less than <span id="wreason">800 LEDs per output</span> for the best experience!<br>
     </div>
-    <hr style="width:260px">
     Make a segment for each output: <input type="checkbox" name="MS"> <br>
+    <!--Custom bus start indices: <input type="checkbox" id="cs"> <br>-->
     <hr style="width:260px">
     <div id="btns"></div>
     Touch threshold: <input type="number" class="s" min="0" max="100" name="TT" required><br>
@@ -446,7 +447,7 @@ ${i+1}:
     <div id="json" style="display:none;">JSON file: <input type="file" name="data" accept=".json"> <input type="button" value="Upload" onclick="uploadFile('/ir.json');"><br></div>
     <div id="toast"></div>
     <a href="https://github.com/Aircoookie/WLED/wiki/Infrared-Control" target="_blank">IR info</a><br>
-    Relay GPIO: <input type="number" min="-1" max="33" name="RL" onchange="UI()" class="xs"> invert <input type="checkbox" name="RM"><span style="cursor: pointer;" onclick="off('RL')">&nbsp;&#215;</span><br>
+    Relay GPIO: <input type="number" min="-1" max="33" name="RL" onchange="UI()" class="xs"> 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/html_settings.h b/wled00/html_settings.h
index ac271896b..735b14719 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -77,13 +77,12 @@ 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 t=gId("toast");t.innerHTML=e,t.className=n?"error":"show",clearTimeout(timeout),t.style.animation="none",timeout=setTimeout((function(){t.className=t.className.replace("show","")}),2900)}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){var t=e[i].name.substring(2);if(parseInt(d.getElementsByName("LT"+t)[0].value,10)<16)continue}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){if("L"===a.substring(0,1)){var s=e[j].name.substring(2);if(parseInt(d.getElementsByName("LT"+s)[0].value,10)<16)continue}if(""!=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,t){return e>=10&&e<=12?6*n:e>15&&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(y=0;y<a.length;y++)if("LT"==a[y].name.substring(0,2)){var i=a[y].name.substring(2),s=parseInt(a[y].value,10);gId("p0d"+i).innerHTML=s>=10&&s<=15?"IP address:":s>49?"Data GPIO:":s>41?"GPIOs:":"GPIO:",gId("p1d"+i).innerHTML=s>49?"Clk GPIO:":"";var l=d.getElementsByName("L1"+i)[0];for(t+=getMem(s,d.getElementsByName("LC"+i)[0].value,d.getElementsByName("L0"+i)[0].value),c=1;c<5;c++){(l=d.getElementsByName("L"+c+i)[0])&&(s>=10&&s<=15&&c<4||s>49&&1==c||s>41&&s<50&&c+40<s?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}e&&(gId("ls"+i).value=i+1,s>31&&s<48&&(d.getElementsByName("LC"+i)[0].value=1)),n|=30==s||31==s||s>40&&s<46&&43!=s,gId("co"+i).style.display=s<16||41==s||42==s?"none":"inline",gId("dig"+i+"c").style.display=s>40&&s<48?"none":"inline",gId("dig"+i+"r").style.display=s<16?"none":"inline",gId("dig"+i+"s").style.display=s<16||s>40&&s<48?"none":"inline",gId("rev"+i).innerHTML=s>40&&s<48?"Inverted":"Reverse (rotated 180°)",gId("psd"+i).innerHTML=s>40&&s<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),u=o.length;for(y=0;y<u;y++)o[y].style.display=n?"inline":"none";var r=d.getElementsByTagName("input"),p=0,m=0;for(y=0;y<r.length;y++){var v=r[y].name.substring(0,2);i=r[y].name.substring(2);if("LC"!=v||"LC"===r[y].name){if("L0"==v||"L1"==v)d.getElementsByName("LC"+i)[0].max=maxPB;if("L0"==v||"L1"==v||"L2"==v||"L3"==v){if((s=parseInt(d.getElementsByName("LT"+i)[0].value,10))<16){r[y].max=255,r[y].min=0;continue}r[y].max=33,r[y].min=-1}if(("L0"==v||"L1"==v||"L2"==v||"L3"==v||"L4"==v||"RL"==v||"BT"==v||"IR"==v)&&""!=r[y].value&&"-1"!=r[y].value){var c=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)c.push(d.um_p[k]);for(j=0;j<r.length;j++)if(y!=j){var g=r[j].name.substring(0,2);if("L0"==g||"L1"==g||"L2"==g||"L3"==g||"L4"==g||"RL"==g||"BT"==g||"IR"==g){if("L"===g.substring(0,1)){var L=r[j].name.substring(2);if(parseInt(d.getElementsByName("LT"+L)[0].value,10)<16)continue}""!=r[j].value&&"-1"!=r[j].value&&c.push(parseInt(r[j].value,10))}}c.some(e=>e==parseInt(r[y].value,10))?r[y].style.color="red":r[y].style.color=parseInt(r[y].value,10)>33?"orange":"#fff"}}else{var f=parseInt(r[y].value,10);gId("ls"+i).value=p,f&&(p+=f,f>m&&(m=f))}}if(gId("LC").readOnly&&(d.getElementsByName("LC")[0].value=p),d.activeElement==d.getElementsByName("LC")[0]){var y=d.getElementsByClassName("iST").length;1==y&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}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 GPIO";var I=Math.ceil((100+p*laprev)/500)/2;I=I>5?Math.ceil(I):I;a="";var b=30==d.Sf.LAsel.value,B=255==d.Sf.LAsel.value;I<1.02&&!b&&!B?a="ESP 5V pin with 1A USB supply":(a+=b?"12V ":B?"WS2815 12V ":"5V ",a+=I,a+="A supply connected to LEDs");var S=Math.ceil((100+p*laprev)/1500)/2,h="(for most effects, ~";h+=S=S>5?Math.ceil(S):S,h+="A is enough)<br>",gId("psu").innerHTML=a,gId("psu2").innerHTML=B?"":h,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"),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<hr style="width:260px">\n${t+1}:\n<select name="LT${t}" onchange="UI(true)">\n<option value="22" selected>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<option value="10">DDP RGB (network)</option>\n\x3c!--option value="11">E1.31 RGB (network)</option--\x3e\n\x3c!--option value="12">ArtNet RGB (network)</option--\x3e\n</select>&nbsp;\n<div id="co${t}" style="display:inline">Color 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></div>\n<br>\n<span id="p0d${t}">GPIO:</span><input type="number" name="L0${t}" min="0" max="33" required class="xs" onchange="UI()"/>\n<span id="p1d${t}"></span><input type="number" name="L1${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<br>\n<span id="psd${t}">Start:</span> <input type="number" name="LS${t}" id="ls${t}" class="l" min="0" max="8191" value="${lastEnd(t)}" disabled readonly required />&nbsp;\n<div id="dig${t}c" style="display:inline">Count: <input type="number" name="LC${t}" class="l" min="0" max="${maxPB}" value="1" required oninput="UI()" /></div>\n<br>\n<div id="dig${t}r" style="display:inline"><span id="rev${t}">Reversed</span>: <input type="checkbox" name="CV${t}"></div>&nbsp;\n<div id="dig${t}s" style="display:inline">Skip 1<sup>st</sup> LED: <input id="sl${t}" type="checkbox" name="SL${t}"></div>\n<br>\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} GPIO: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" class="xs" 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="3" ${3==t?"selected":""}>Push inverted</option>`,a+=`<option value="4" ${4==t?"selected":""}>Switch</option>`,a+=`<option value="5" ${5==t?"selected":""}>PIR sensor</option>`,a+=`<option value="6" ${6==t?"selected":""}>Touch</option>`,a+=`<option value="7" ${7==t?"selected":""}>Analog</option>`,a+=`<option value="8" ${8==t?"selected":""}>Analog inverted</option>`,a+="</select>",a+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=a}function uploadFile(e){var n=new XMLHttpRequest;n.addEventListener("load",(function(){showToast(this.responseText,this.status>=400)})),n.addEventListener("error",(function(e){showToast(e.stack,!0)})),n.open("POST","/upload");var t=new FormData;return t.append("data",d.Sf.data.files[0],e),n.send(t),d.Sf.data.value="",!1}function GetV() {var d=document;
+var timeout,d=document,laprev=55,maxB=1,maxM=4e3,maxPB=4096,maxL=1333,maxLbquot=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 t=gId("toast");t.innerHTML=e,t.className=n?"error":"show",clearTimeout(timeout),t.style.animation="none",timeout=setTimeout((function(){t.className=t.className.replace("show","")}),2900)}function bLimits(e,n,t,i){maxB=e,maxM=t,maxPB=n,maxL=i}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){var t=e[i].name.substring(2);if(parseInt(d.getElementsByName("LT"+t)[0].value,10)<16)continue}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){if("L"===a.substring(0,1)){var s=e[j].name.substring(2);if(parseInt(d.getElementsByName("LT"+s)[0].value,10)<16)continue}if(""!=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,t){return e>=10&&e<=12?6*n:e>15&&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(i=0;i<a.length;i++)if("LT"==a[i].name.substring(0,2)){var s=a[i].name.substring(2),o=parseInt(a[i].value,10);gId("p0d"+s).innerHTML=o>=10&&o<=15?"IP address:":o>49?"Data GPIO:":o>41?"GPIOs:":"GPIO:",gId("p1d"+s).innerHTML=o>49?"Clk GPIO:":"";var l=d.getElementsByName("L1"+s)[0];for(t+=getMem(o,d.getElementsByName("LC"+s)[0].value,d.getElementsByName("L0"+s)[0].value),L=1;L<5;L++){(l=d.getElementsByName("L"+L+s)[0])&&(o>=10&&o<=15&&L<4||o>49&&1==L||o>41&&o<50&&L+40<o?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}e&&o>31&&o<48&&(d.getElementsByName("LC"+s)[0].value=1),n|=30==o||31==o||o>40&&o<46&&43!=o,gId("co"+s).style.display=o<16||41==o||42==o?"none":"inline",gId("dig"+s+"c").style.display=o>40&&o<48?"none":"inline",gId("dig"+s+"r").style.display=o<16?"none":"inline",gId("dig"+s+"s").style.display=o<16||o>40&&o<48?"none":"inline",gId("rev"+s).innerHTML=o>40&&o<48?"Inverted":"Reverse (rotated 180°)",gId("psd"+s).innerHTML=o>40&&o<48?"Index:":"Start:"}var r=d.querySelectorAll(".wc"),u=r.length;for(i=0;i<u;i++)r[i].style.display=n?"inline":"none";var p=d.getElementsByTagName("input"),m=0,v=0,c=0;for(i=0;i<p.length;i++){var g=p[i].name.substring(0,2);s=p[i].name.substring(2);if("LC"!=g){if("L0"==g||"L1"==g)d.getElementsByName("LC"+s)[0].max=maxPB;if("L0"==g||"L1"==g||"L2"==g||"L3"==g){if((o=parseInt(d.getElementsByName("LT"+s)[0].value,10))<16){p[i].max=255,p[i].min=0;continue}p[i].max=33,p[i].min=-1}if(("L0"==g||"L1"==g||"L2"==g||"L3"==g||"L4"==g||"RL"==g||"BT"==g||"IR"==g)&&""!=p[i].value&&"-1"!=p[i].value){var L=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)L.push(d.um_p[k]);for(j=0;j<p.length;j++)if(i!=j){var f=p[j].name.substring(0,2);if("L0"==f||"L1"==f||"L2"==f||"L3"==f||"L4"==f||"RL"==f||"BT"==f||"IR"==f){if("L"===f.substring(0,1)){var y=p[j].name.substring(2);if(parseInt(d.getElementsByName("LT"+y)[0].value,10)<16)continue}""!=p[j].value&&"-1"!=p[j].value&&L.push(parseInt(p[j].value,10))}}L.some(e=>e==parseInt(p[i].value,10))?p[i].style.color="red":p[i].style.color=parseInt(p[i].value,10)>33?"orange":"#fff"}}else{var I=parseInt(p[i].value,10);I&&((a=parseInt(gId("ls"+s).value))+I>m&&(m=a+I),I>c&&(c=I),(o=parseInt(d.getElementsByName("LT"+s)[0].value,10))>16&&(v+=I))}}gId("lc").textContent=m,gId("pc").textContent=m==v?"":"("+v+" physical)",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=m>maxPB||c>800||bquot>80?"inline":"none",gId("ledwarning").style.color=m>maxPB||c>maxPB||bquot>100?"red":"orange",gId("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>ERROR: Using over ${maxM}B!</b>)`:""):"800 LEDs per output";var b=Math.ceil((100+v*laprev)/500)/2;b=b>5?Math.ceil(b):b;a="";var B=30==d.Sf.LAsel.value,x=255==d.Sf.LAsel.value;b<1.02&&!B&&!x?a="ESP 5V pin with 1A USB supply":(a+=B?"12V ":x?"WS2815 12V ":"5V ",a+=b,a+="A supply connected to LEDs");var h=Math.ceil((100+v*laprev)/1500)/2,S="(for most effects, ~";S+=h=h>5?Math.ceil(h):h,S+="A is enough)<br>",gId("psu").innerHTML=a,gId("psu2").innerHTML=x?"":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"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var i=gId("mLC");if(1==e){var a=`<div class="iST">\n<hr style="width:260px">\n${t+1}:\n<select name="LT${t}" onchange="UI(true)">\n<option value="22" selected>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<option value="10">DDP RGB (network)</option>\n\x3c!--option value="11">E1.31 RGB (network)</option--\x3e\n\x3c!--option value="12">ArtNet RGB (network)</option--\x3e\n</select>&nbsp;\n<div id="co${t}" style="display:inline">Color 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></div>\n<br>\n<span id="psd${t}">Start:</span> <input type="number" name="LS${t}" id="ls${t}" class="l" min="0" max="8191" value="${lastEnd(t)}" onchange="UI()" required />&nbsp;\n<div id="dig${t}c" style="display:inline">Length: <input type="number" name="LC${t}" class="l" min="1" max="${maxPB}" value="1" required oninput="UI()" /></div>\n<br>\n<span id="p0d${t}">GPIO:</span> <input type="number" name="L0${t}" min="0" max="33" required class="xs" onchange="UI()"/>\n<span id="p1d${t}"></span><input type="number" name="L1${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="33" class="xs" onchange="UI()"/>\n<br>\n<div id="dig${t}r" style="display:inline"><span id="rev${t}">Reversed</span>: <input type="checkbox" name="CV${t}"></div>&nbsp;\n<div id="dig${t}s" style="display:inline">Skip 1<sup>st</sup> LED: <input id="sl${t}" type="checkbox" name="SL${t}"></div>\n<br>\n</div>`;i.insertAdjacentHTML("beforeend",a)}-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 i=gId("btns").innerHTML,a="BT"+e;i+=`Button ${e} GPIO: <input type="number" min="-1" max="40" name="${a}" onchange="UI()" class="xs" value="${n}">`,i+=`&nbsp;<select name="${"BE"+e}">`,i+=`<option value="0" ${0==t?"selected":""}>Disabled</option>`,i+=`<option value="2" ${2==t?"selected":""}>Pushbutton</option>`,i+=`<option value="3" ${3==t?"selected":""}>Push inverted</option>`,i+=`<option value="4" ${4==t?"selected":""}>Switch</option>`,i+=`<option value="5" ${5==t?"selected":""}>PIR sensor</option>`,i+=`<option value="6" ${6==t?"selected":""}>Touch</option>`,i+=`<option value="7" ${7==t?"selected":""}>Analog</option>`,i+=`<option value="8" ${8==t?"selected":""}>Analog inverted</option>`,i+="</select>",i+=`<span style="cursor: pointer;" onclick="off('${a}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=i}function uploadFile(e){var n=new XMLHttpRequest;n.addEventListener("load",(function(){showToast(this.responseText,this.status>=400)})),n.addEventListener("error",(function(e){showToast(e.stack,!0)})),n.open("POST","/upload");var t=new FormData;return t.append("data",d.Sf.data.files[0],e),n.send(t),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="helpB"><button type="button" 
 onclick="H()">?</button></div><button type="button" onclick="B()">Back</button>
 <button type="submit">Save</button><hr><h2>LED &amp; Hardware setup</h2>
-Total LED count: <input name="LC" id="LC" type="number" min="1" max="8192" 
-oninput="UI()" disabled="disabled" required readonly="readonly"><br><i>
+Total LEDs: <span id="lc">?</span> <span id="pc"></span><br><i>
 Recommended power supply for brightest white:</i><br><b><span id="psu">?</span>
 </b><br><span id="psu2"><br></span><br>Enable automatic brightness limiter: 
 <input type="checkbox" name="ABen" onchange="enABL()" id="able"><br><div 
@@ -115,23 +114,23 @@ id="dbar"
 style="display:inline-block;width:100px;height:10px;border-radius:20px"></div>
 <br><div id="ledwarning" style="color:orange;display:none">
 &#9888; You might run into stability or lag issues.<br>Use less than <span 
-id="wreason">800 LEDs per pin</span> for the best experience!<br></div><hr 
-style="width:260px">Make a segment for each output: <input type="checkbox" 
-name="MS"><br><hr style="width:260px"><div id="btns"></div>Touch threshold: 
-<input type="number" class="s" min="0" max="100" name="TT" required><br>
-IR GPIO: <input type="number" min="-1" max="40" name="IR" onchange="UI()" 
-class="xs"><select name="IT" onchange="UI()"><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><div id="json" style="display:none">JSON file: <input type="file" 
-name="data" accept=".json"> <input type="button" value="Upload" 
+id="wreason">800 LEDs per output</span> for the best experience!<br></div>
+Make a segment for each output: <input type="checkbox" name="MS"><br><hr 
+style="width:260px"><div id="btns"></div>Touch threshold: <input type="number" 
+class="s" min="0" max="100" name="TT" required><br>IR GPIO: <input 
+type="number" min="-1" max="40" name="IR" onchange="UI()" class="xs"><select 
+name="IT" onchange="UI()"><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><div 
+id="json" style="display:none">JSON file: <input type="file" name="data" 
+accept=".json"> <input type="button" value="Upload" 
 onclick='uploadFile("/ir.json")'><br></div><div id="toast"></div><a 
 href="https://github.com/Aircoookie/WLED/wiki/Infrared-Control" target="_blank">
 IR info</a><br>Relay GPIO: <input type="number" min="-1" max="33" name="RL" 
-onchange="UI()" class="xs"> invert <input type="checkbox" name="RM"><span 
+onchange="UI()" class="xs"> 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" 
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 93f34b323..70439a38f 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -128,12 +128,12 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
       if (busConfigs[s] != nullptr) delete busConfigs[s];
       busConfigs[s] = new BusConfig(type, pins, start, length, colorOrder, request->hasArg(cv), skip);
+      if (!doInitBusses) ledCount = 1;
       doInitBusses = true;
+      uint16_t totalNew = start + length;
+      if (totalNew > ledCount && totalNew <= MAX_LEDS) ledCount = totalNew; //total is end of last bus (where start + len is max.)
     }
 
-    t = request->arg(F("LC")).toInt();
-    if (t > 0 && t <= MAX_LEDS) ledCount = t;
-
     // upate other pins
     int hw_ir_pin = request->arg(F("IR")).toInt();
     if (pinManager.allocatePin(hw_ir_pin,false, PinOwner::IR)) {
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 7cb70fb57..95e56d4dd 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -365,14 +365,10 @@ void getSettingsJS(byte subPage, char* dest)
     oappend(SET_F("bLimits("));
     oappend(itoa(WLED_MAX_BUSSES,nS,10));  oappend(",");
     oappend(itoa(MAX_LEDS_PER_BUS,nS,10)); oappend(",");
-    oappend(itoa(MAX_LED_MEMORY,nS,10));
+    oappend(itoa(MAX_LED_MEMORY,nS,10)); oappend(",");
+    oappend(itoa(MAX_LEDS,nS,10)); oappend(",");
     oappend(SET_F(");"));
 
-    oappend(SET_F("d.Sf.LC.max=")); //TODO Formula for max LEDs on ESP8266 depending on types. 500 DMA or 1500 UART (about 4kB mem usage)
-    oappendi(MAX_LEDS);
-    oappend(";");
-
-    sappend('v',SET_F("LC"),ledCount);
     sappend('c',SET_F("MS"),autoSegments);
 
     for (uint8_t s=0; s < busses.getNumBusses(); s++) {