diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 960ba56b6..070121f2b 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -26,7 +26,7 @@ struct BusConfig {
   uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255};
   BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0) {
     rgbwOverride = (bool) GET_BIT(busType,7);
-    type = busType & 0x7F;  // bit 7 is hacked to include RGBW info (1=RGBW, 0=RGB)
+    type = busType & 0x7F;  // bit 7 may be/is hacked to include RGBW info (1=RGBW, 0=RGB)
     count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipAmount = skip;
     uint8_t nPins = 1;
     if (type > 47) nPins = 2;
@@ -93,6 +93,12 @@ class Bus {
     return _valid;
   }
 
+  static bool isRgbw(uint8_t type) {
+    if (type == TYPE_SK6812_RGBW || type == TYPE_TM1814) return true;
+    if (type > TYPE_ONOFF && type <= TYPE_ANALOG_5CH && type != TYPE_ANALOG_3CH) return true;
+    return false;
+  }
+
   bool reversed = false;
 
   protected:
@@ -119,7 +125,7 @@ class BusDigital : public Bus {
     reversed = bc.reversed;
     _skip = bc.skipAmount;    //sacrificial pixels
     _len = bc.count + _skip;
-    _rgbw = bc.rgbwOverride;  // RGBW override in bit 7
+    _rgbw = bc.rgbwOverride || Bus::isRgbw(type);  // RGBW override in bit 7
     _iType = PolyBus::getI(type, _pins, nr, _rgbw);
     if (_iType == I_NONE) return;
     _busPtr = PolyBus::create(_iType, _pins, _len);
@@ -440,10 +446,9 @@ class BusManager {
     return len;
   }
 
-  static bool isRgbw(uint8_t type) {
-    if (type == TYPE_SK6812_RGBW || type == TYPE_TM1814) return true;
-    if (type > TYPE_ONOFF && type <= TYPE_ANALOG_5CH && type != TYPE_ANALOG_3CH) return true;
-    return false;
+  // a workaround
+  static inline bool isRgbw(uint8_t type) {
+    return Bus::isRgbw(type);
   }
 
   private:
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 834deb1b7..d1fcf9fd9 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -127,8 +127,9 @@ void deserializeConfig() {
     uint8_t ledType = elm["type"] | TYPE_WS2812_RGB;
     bool reversed = elm["rev"];
     //RGBW mode is enabled if at least one of the strips is RGBW
-    if ((bool)elm[F("rgbw")]) SET_BIT(ledType,7); else UNSET_BIT(ledType,7);  // hack bit 7 to indicate RGBW (as an override if necessary)
-    strip.isRgbw |= (bool)elm[F("rgbw")]; //(strip.isRgbw || BusManager::isRgbw(ledType));
+//    if ((bool)elm[F("rgbw")]) SET_BIT(ledType,7); else UNSET_BIT(ledType,7);  // hack bit 7 to indicate RGBW (as an override if necessary)
+//    strip.isRgbw |= (bool)elm[F("rgbw")];
+    strip.isRgbw = (strip.isRgbw || Bus::isRgbw(ledType));
     s++;
     lC += length;
     BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst);
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 78182ea83..e91e15095 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -132,11 +132,11 @@
           d.getElementById("ls"+n).readOnly = !(type > 31 && type < 48);  // not analog
           d.getElementById("LC").readOnly = !(type > 31 && type < 48);    // not analog
           if (change) {
-            d.getElementById("ew"+n).checked = (type == 30 || type == 31 || type == 44 || type == 45); // RGBW checkbox, TYPE_xxxx values from const.h
+//            d.getElementById("ew"+n).checked = (type == 30 || type == 31 || type == 44 || type == 45); // RGBW checkbox, TYPE_xxxx values from const.h
             d.getElementById("ls"+n).value = n+1;
           }
-          d.getElementById("ew"+n).onclick = (type > 31 && type < 48) ? (function(){return false}) : (function(){});  // prevent change for analog
-          isRGBW |= d.getElementById("ew"+n).checked;
+//          d.getElementById("ew"+n).onclick = (type > 31 && type < 48) ? (function(){return false}) : (function(){});  // prevent change for analog
+//          isRGBW |= d.getElementById("ew"+n).checked;
           d.getElementById("dig"+n).style.display = (type > 31 && type < 48) ? "none":"inline";
           d.getElementById("psd"+n).innerHTML = (type > 31 && type < 48) ? "Index:":"Start:";
         }
@@ -255,8 +255,8 @@ Color Order:
 <div id="dig${i}" style="display:inline">
 Count: <input type="number" name="LC${i}" 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>
-&nbsp;RGBW: <input id="ew${i}" type="checkbox" name="EW${i}"><br>
 </div>`;
         f.insertAdjacentHTML("beforeend", cn);
       }
@@ -329,6 +329,7 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
     IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()"><span style="cursor: pointer;" onclick="off('IR')">&nbsp;&#215;</span><br>
     Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()"><span style="cursor: pointer;" onclick="off('RL')">&nbsp;&#215;</span><br>
     Active high <input type="checkbox" name="RM">
+    <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>
@@ -360,7 +361,7 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
 			<option value="2">Linear (never wrap)</option>
 			<option value="3">None (not recommended)</option>
 		</select><br>
-    Skip first LED: <input type="checkbox" name="SL"><br>
+    <!--Skip first LED: <input type="checkbox" name="SL"><br-->
     <span class="wc">
       Auto-calculate white channel from RGB:<br>
       <select name="AW">
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 4169d99c3..c73b45942 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -72,7 +72,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 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||"AX"==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||"AX"==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=d.getElementById("able").checked;d.Sf.LA.value=e?laprev:0,d.getElementById("abl").style.display=e?"inline":"none",d.getElementById("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,d.getElementById("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(d.getElementById("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:d.getElementById("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:d.getElementById("LAdis").style.display="inline"}d.getElementById("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;d.getElementById("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(B=0;B<a.length;B++)if("LT"==a[B].name.substring(0,2)){v=a[B].name.substring(2);var i=parseInt(a[B].value,10);d.getElementById("p0d"+v).innerHTML=i>49?"Data:":i>41?"Pins:":"Pin:",d.getElementById("p1d"+v).innerHTML=i>49?"Clk:":"";var l=d.getElementsByName("L1"+v)[0];for(t+=getMem(i,d.getElementsByName("LC"+v)[0].value,d.getElementsByName("L0"+v)[0].value),p=1;p<5;p++){(l=d.getElementsByName("L"+p+v)[0])&&(i>49&&1==p||i>41&&i<50&&p+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}d.getElementById("ls"+v).readOnly=!(i>31&&i<48),d.getElementById("LC").readOnly=!(i>31&&i<48),e&&(d.getElementById("ew"+v).checked=30==i||31==i||44==i||45==i,d.getElementById("ls"+v).value=v+1),d.getElementById("ew"+v).onclick=i>31&&i<48?function(){return!1}:function(){},n|=d.getElementById("ew"+v).checked,d.getElementById("dig"+v).style.display=i>31&&i<48?"none":"inline",d.getElementById("psd"+v).innerHTML=i>31&&i<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(B=0;B<s;B++)o[B].style.display=n?"inline":"none";var u=d.getElementsByTagName("input"),m=0,r=0;for(B=0;B<u.length;B++){var y=u[B].name.substring(0,2);if("LC"!=y||"LC"===u[B].name){if("L0"==y||"L1"==y)d.getElementsByName("LC"+u[B].name.substring(2))[0].max=maxPB}else{var v=u[B].name.substring(2),g=parseInt(u[B].value,10);d.getElementById("ls"+v).readOnly&&(d.getElementById("ls"+v).value=m),g&&(m+=g,g>r&&(r=g))}}if(d.getElementById("LC").readOnly&&(d.getElementsByName("LC")[0].value=m),d.activeElement==d.getElementsByName("LC")[0]){var B=d.getElementsByClassName("iST").length;1==B&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}d.getElementById("m0").innerHTML=t,bquot=t/maxM*100,d.getElementById("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,d.getElementById("ledwarning").style.display=m>maxPB||r>800||bquot>80?"inline":"none",d.getElementById("ledwarning").style.color=m>maxPB||r>maxPB||bquot>100?"red":"orange",d.getElementById("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>WARNING: Using over ${maxM}B!</b>)`:""):"800 LEDs per pin";var c=Math.ceil((100+m*laprev)/500)/2;c=c>5?Math.ceil(c):c;a="";var L=30==d.Sf.LAsel.value,f=255==d.Sf.LAsel.value;c<1.02&&!L&&!f?a="ESP 5V pin with 1A USB supply":(a+=L?"12V ":f?"WS2815 12V ":"5V ",a+=c,a+="A supply connected to LEDs");var E=Math.ceil((100+m*laprev)/1500)/2,b="(for most effects, ~";b+=E=E>5?Math.ceil(E):E,b+="A is enough)<br>",d.getElementById("psu").innerHTML=a,d.getElementById("psu2").innerHTML=f?"":b}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(d.getElementById("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var a=d.getElementById("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(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${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</div>\n&nbsp;RGBW: <input id="ew${t}" type="checkbox" name="EW${t}"><br>\n</div>`;a.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--t].remove(),--t),d.getElementById("+").style.display=t<maxB-1?"inline":"none",d.getElementById("-").style.display=t>0?"inline":"none",UI()}}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 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||"AX"==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||"AX"==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=d.getElementById("able").checked;d.Sf.LA.value=e?laprev:0,d.getElementById("abl").style.display=e?"inline":"none",d.getElementById("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,d.getElementById("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(d.getElementById("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:d.getElementById("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:d.getElementById("LAdis").style.display="inline"}d.getElementById("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=0;d.getElementById("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(g=0;g<t.length;g++)if("LT"==t[g].name.substring(0,2)){y=t[g].name.substring(2);var a=parseInt(t[g].value,10);d.getElementById("p0d"+y).innerHTML=a>49?"Data:":a>41?"Pins:":"Pin:",d.getElementById("p1d"+y).innerHTML=a>49?"Clk:":"";var i=d.getElementsByName("L1"+y)[0];for(n+=getMem(a,d.getElementsByName("LC"+y)[0].value,d.getElementsByName("L0"+y)[0].value),p=1;p<5;p++){(i=d.getElementsByName("L"+p+y)[0])&&(a>49&&1==p||a>41&&a<50&&p+40<a?(i.style.display="inline",i.required=!0):(i.style.display="none",i.required=!1,i.value=""))}d.getElementById("ls"+y).readOnly=!(a>31&&a<48),d.getElementById("LC").readOnly=!(a>31&&a<48),e&&(d.getElementById("ls"+y).value=y+1),d.getElementById("dig"+y).style.display=a>31&&a<48?"none":"inline",d.getElementById("psd"+y).innerHTML=a>31&&a<48?"Index:":"Start:"}var l=d.querySelectorAll(".wc"),o=l.length;for(g=0;g<o;g++)l[g].style.display="none";var s=d.getElementsByTagName("input"),u=0,m=0;for(g=0;g<s.length;g++){var r=s[g].name.substring(0,2);if("LC"!=r||"LC"===s[g].name){if("L0"==r||"L1"==r)d.getElementsByName("LC"+s[g].name.substring(2))[0].max=maxPB}else{var y=s[g].name.substring(2),v=parseInt(s[g].value,10);d.getElementById("ls"+y).readOnly&&(d.getElementById("ls"+y).value=u),v&&(u+=v,v>m&&(m=v))}}if(d.getElementById("LC").readOnly&&(d.getElementsByName("LC")[0].value=u),d.activeElement==d.getElementsByName("LC")[0]){var g=d.getElementsByClassName("iST").length;1==g&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}d.getElementById("m0").innerHTML=n,bquot=n/maxM*100,d.getElementById("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,d.getElementById("ledwarning").style.display=u>maxPB||m>800||bquot>80?"inline":"none",d.getElementById("ledwarning").style.color=u>maxPB||m>maxPB||bquot>100?"red":"orange",d.getElementById("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>WARNING: Using over ${maxM}B!</b>)`:""):"800 LEDs per pin";var L=Math.ceil((100+u*laprev)/500)/2;L=L>5?Math.ceil(L):L;t="";var B=30==d.Sf.LAsel.value,c=255==d.Sf.LAsel.value;L<1.02&&!B&&!c?t="ESP 5V pin with 1A USB supply":(t+=B?"12V ":c?"WS2815 12V ":"5V ",t+=L,t+="A supply connected to LEDs");var f=Math.ceil((100+u*laprev)/1500)/2,E="(for most effects, ~";E+=f=f>5?Math.ceil(f):f,E+="A is enough)<br>",d.getElementById("psu").innerHTML=t,d.getElementById("psu2").innerHTML=c?"":E}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(d.getElementById("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var a=d.getElementById("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(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${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),d.getElementById("+").style.display=t<maxB-1?"inline":"none",d.getElementById("-").style.display=t>0?"inline":"none",UI()}}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" 
@@ -114,11 +114,11 @@ name="BT" onchange="UI()"><span style="cursor:pointer" onclick='off("BT")'>
 onchange="UI()"><span style="cursor:pointer" onclick='off("IR")'>&nbsp;&#215;
 </span><br>Relay pin: <input type="number" min="-1" max="40" name="RL" 
 onchange="UI()"><span style="cursor:pointer" onclick='off("RL")'>&nbsp;&#215;
-</span><br>Active high <input type="checkbox" name="RM"><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>
+</span><br>Active high <input type="checkbox" name="RM"><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
@@ -134,8 +134,7 @@ required><br>Mode: <select name="TW"><option value="0">Wait and set</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>Skip first LED: 
-<input type="checkbox" name="SL"><br><span class="wc">
+<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>
diff --git a/wled00/presets.cpp b/wled00/presets.cpp
index a56c78308..09ae901f0 100644
--- a/wled00/presets.cpp
+++ b/wled00/presets.cpp
@@ -46,6 +46,15 @@ void savePreset(byte index, bool persist, const char* pname, JsonObject saveobj)
     DynamicJsonDocument lDoc(JSON_BUFFER_SIZE);
     sObj = lDoc.to<JsonObject>();
     if (pname) sObj["n"] = pname;
+
+    #ifdef ESP8266
+    // use rev:2 API if more than 12 segments on ESP8266
+    uint8_t tooMany = 0;
+    for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++;
+    if (tooMany>12)
+    #endif
+      sObj.remove("rev"); 
+
     DEBUGFS_PRINTLN(F("Save current state"));
     serializeState(sObj, true);
     currentPreset = index;
@@ -55,7 +64,15 @@ void savePreset(byte index, bool persist, const char* pname, JsonObject saveobj)
     DEBUGFS_PRINTLN(F("Reuse recv buffer"));
     sObj.remove(F("psave"));
     sObj.remove(F("v"));
-    sObj.remove("rev"); // TODO: use rev:2 if more than 12 segments on ESP8266
+
+    // the following is an UGLY construct that does the job
+    #ifdef ESP8266
+    // use rev:2 API if more than 12 segments on ESP8266
+    uint8_t tooMany = 0;
+    for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++;
+    if (tooMany>12)
+    #endif
+      sObj.remove("rev"); 
 
     if (!sObj["o"]) {
       DEBUGFS_PRINTLN(F("Save current state"));
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 72f008a12..6c696cb68 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -85,8 +85,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     strip.isRgbw = false;
 
-    uint8_t skip = request->hasArg(F("SL")) ? LED_SKIP_AMOUNT : 0;
-    uint8_t colorOrder, type;
+//    uint8_t skip = request->hasArg(F("SL")) ? LED_SKIP_AMOUNT : 0;
+    uint8_t colorOrder, type, skip;
     uint16_t length, start;
     uint8_t pins[5] = {255, 255, 255, 255, 255};
 
@@ -97,7 +97,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       char lt[4] = "LT"; lt[2] = 48+s; lt[3] = 0; //strip type
       char ls[4] = "LS"; ls[2] = 48+s; ls[3] = 0; //strip start LED
       char cv[4] = "CV"; cv[2] = 48+s; cv[3] = 0; //strip reverse
-      char ew[4] = "EW"; ew[2] = 48+s; ew[3] = 0; //strip RGBW override
+      char sl[4] = "SL"; sl[2] = 48+s; sl[3] = 0; //skip 1st LED
+//      char ew[4] = "EW"; ew[2] = 48+s; ew[3] = 0; //strip RGBW override
       if (!request->hasArg(lp)) {
         DEBUG_PRINTLN(F("No data.")); break;
       }
@@ -107,8 +108,10 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
         pins[i] = (request->arg(lp).length() > 0) ? request->arg(lp).toInt() : 255;
       }
       type = request->arg(lt).toInt();
-      if (request->hasArg(ew)) SET_BIT(type,7); else UNSET_BIT(type,7); // hack bit 7 to indicate RGBW (as a LED type override if necessary)
-      strip.isRgbw = strip.isRgbw || request->hasArg(ew);
+//      if (request->hasArg(ew)) SET_BIT(type,7); else UNSET_BIT(type,7); // hack bit 7 to indicate RGBW (as a LED type override if necessary)
+//      strip.isRgbw = strip.isRgbw || request->hasArg(ew);
+      strip.isRgbw = strip.isRgbw || Bus::isRgbw(type);
+      skip = request->hasArg(sl) ? LED_SKIP_AMOUNT : 0;
 
       colorOrder = request->arg(co).toInt();
       start = (request->hasArg(ls)) ? request->arg(ls).toInt() : t;
diff --git a/wled00/wled.h b/wled00/wled.h
index ff876c826..284cedbd8 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2104061
+#define VERSION 2104071
 
 //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 7d0caef30..f9c83062e 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -322,7 +322,7 @@ void getSettingsJS(byte subPage, char* dest)
 
     sappend('v',SET_F("LC"),ledCount);
 
-    bool skip = false;
+//    bool skip = false;
     for (uint8_t s=0; s < busses.getNumBusses(); s++) {
       Bus* bus = busses.getBus(s);
       char lp[4] = "L0"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
@@ -331,7 +331,8 @@ void getSettingsJS(byte subPage, char* dest)
       char lt[4] = "LT"; lt[2] = 48+s; lt[3] = 0; //strip type
       char ls[4] = "LS"; ls[2] = 48+s; ls[3] = 0; //strip start LED
       char cv[4] = "CV"; cv[2] = 48+s; cv[3] = 0; //strip reverse
-      char ew[4] = "EW"; ew[2] = 48+s; ew[3] = 0; //strip RGBW override
+      char sl[4] = "SL"; sl[2] = 48+s; sl[3] = 0; //skip 1st LED
+//      char ew[4] = "EW"; ew[2] = 48+s; ew[3] = 0; //strip RGBW override
       oappend(SET_F("addLEDs(1);"));
       uint8_t pins[5];
       uint8_t nPins = bus->getPins(pins);
@@ -344,8 +345,9 @@ void getSettingsJS(byte subPage, char* dest)
       sappend('v',co,bus->getColorOrder());
       sappend('v',ls,bus->getStart());
       sappend('c',cv,bus->reversed);
-      sappend('c',ew,bus->isRgbw());
-      if (!skip) skip = bus->skipFirstLed()>0;
+      sappend('c',sl,bus->skipFirstLed());
+//      sappend('c',ew,bus->isRgbw());
+//      if (!skip) skip = bus->skipFirstLed()>0;
     }
     sappend('v',SET_F("MA"),strip.ablMilliampsMax);
     sappend('v',SET_F("LA"),strip.milliampsPerLed);
@@ -373,7 +375,7 @@ void getSettingsJS(byte subPage, char* dest)
     sappend('v',SET_F("TL"),nightlightDelayMinsDefault);
     sappend('v',SET_F("TW"),nightlightMode);
     sappend('i',SET_F("PB"),strip.paletteBlend);
-    sappend('c',SET_F("SL"),skip);
+//    sappend('c',SET_F("SL"),skip);
     sappend('v',SET_F("RL"),rlyPin);
     sappend('c',SET_F("RM"),rlyMde);
     sappend('v',SET_F("BT"),btnPin);