diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm
index 0bff54b86..c87e75a55 100644
--- a/wled00/data/settings_sec.htm
+++ b/wled00/data/settings_sec.htm
@@ -2,6 +2,7 @@
 <html>
 <head>
 	<meta name="viewport" content="width=500">
+	<meta charset="utf-8">
 	<title>Misc Settings</title>
 	<script>
 		function H()
diff --git a/wled00/data/settings_sync.htm b/wled00/data/settings_sync.htm
index 87a934ad3..653689cab 100644
--- a/wled00/data/settings_sync.htm
+++ b/wled00/data/settings_sync.htm
@@ -99,7 +99,7 @@ Hue Bridge IP:<br>
 <input name="H3" type="number" min="0" max="255" ><br>
 <b>Press the pushlink button on the bridge, after that save this page!</b><br>
 (when first connecting)<br>
-Hue status: <span class="hms"> Disabled in this build </span><hr>
+Hue status: <span class="sip"> Disabled in this build </span><hr>
 <button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index ff2ce4807..c4064e76a 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -2,6 +2,7 @@
 <html>
 <head>
 	<meta name="viewport" content="width=500">
+	<meta charset="utf-8">
 	<title>Time Settings</title>
 	<script>
     var d=document;
@@ -207,7 +208,7 @@
 		<i>Use 0 for the default action instead of a macro</i><br>
 		Boot Macro: <input name="MB" type="number" min="0" max="16" required><br>
 		Alexa On/Off Macros: <input name="A0" type="number" min="0" max="16" required> <input name="A1" type="number" min="0" max="16" required><br>
-		Button Macro: <input name="MP" type="number" min="0" max="16" required> Long Press: <input name="ML" type="number" min="0" max="16" required><br>
+		Button Macro: <input name="MP" type="number" min="0" max="16" required> Long Press: <input name="MD" type="number" min="0" max="16" required><br>
 		Countdown-Over Macro: <input name="MC" type="number" min="0" max="16" required><br>
 		Timed-Light-Over Macro: <input name="MN" type="number" min="0" max="16" required><br>
 		Time-Controlled Macros:<br>
diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
index 62ef153de..fd1ee3197 100644
--- a/wled00/data/settings_wifi.htm
+++ b/wled00/data/settings_wifi.htm
@@ -103,6 +103,11 @@
     <option value="2">Always</option>
     <option value="3">Never (not recommended)</option></select><br>
 		AP IP: <span class="sip"> Not active </span><hr>
+		<h3>Experimental</h3>
+		Disable WiFi sleep: <input type="checkbox" name="WS"><br>
+		<i>Can help with connectivity issues.<br>
+		Do not enable if WiFi is working correctly, increases power consumption.</i>
+		<hr>
 		<button type="button" onclick="B()">Back</button><button type="submit">Save & Reboot</button>
 	</form>
 </body>
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index aa2f07349..9aec32edf 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -50,9 +50,12 @@ maxlength="63"><br>Access Point WiFi channel: <input name="AC" type="number"
 min="1" max="13" required><br>AP opens: <select name="AB"><option value="0">
 No connection after boot</option><option value="1">Disconnected</option><option 
 value="2">Always</option><option value="3">Never (not recommended)</option>
-</select><br>AP IP: <span class="sip">Not active</span><hr><button 
-type="button" onclick="B()">Back</button><button type="submit">Save & Reboot
-</button></form></body></html>)=====";
+</select><br>AP IP: <span class="sip">Not active</span><hr><h3>Experimental</h3>
+Disable WiFi sleep: <input type="checkbox" name="WS"><br><i>
+Can help with connectivity issues.<br>
+Do not enable if WiFi is working correctly, increases power consumption.</i><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">
+Save & Reboot</button></form></body></html>)=====";
 
 
 // Autogenerated from wled00/data/settings_leds.htm, do not edit!!
@@ -237,14 +240,14 @@ type="number" min="0" max="255"> . <input name="H1" type="number" min="0"
 max="255"> . <input name="H2" type="number" min="0" max="255"> . <input 
 name="H3" type="number" min="0" max="255"><br><b>
 Press the pushlink button on the bridge, after that save this page!</b><br>
-(when first connecting)<br>Hue status: <span class="hms">Disabled in this build
+(when first connecting)<br>Hue status: <span class="sip">Disabled in this build
 </span><hr><button type="button" onclick="B()">Back</button><button 
 type="submit">Save</button></form></body></html>)=====";
 
 
 // Autogenerated from wled00/data/settings_time.htm, do not edit!!
-const char PAGE_settings_time[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta name="viewport" content="width=500"><title>
-Time Settings</title><script>
+const char PAGE_settings_time[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta name="viewport" content="width=500"><meta 
+charset="utf-8"><title>Time Settings</title><script>
 var d=document;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#time-settings")}function B(){window.open("/settings","_self")}function S(){BTa(),GetV(),Cs(),FC()}function gId(t){return d.getElementById(t)}function Cs(){gId("cac").style.display="none",gId("coc").style.display="block",gId("ccc").style.display="none",gId("ca").selected&&(gId("cac").style.display="block"),gId("cc").selected&&(gId("coc").style.display="none",gId("ccc").style.display="block"),gId("cn").selected&&(gId("coc").style.display="none")}function BTa(){var t="<tr><th>Active</th><th>Hour</th><th>Minute</th><th>Macro</th><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr>";for(i=0;i<8;i++)for(t+='<tr><td><input name="W'+i+'" id="W'+i+'" type="number" style="display:none"><input id="W'+i+'0" type="checkbox"></td><td><input name="H'+i+'" type="number" min="0" max="24"></td><td><input name="N'+i+'" type="number" min="0" max="59"></td><td><input name="T'+i+'" type="number" min="0" max="16"></td>',j=1;j<8;j++)t+='<td><input id="W'+i+j+'" type="checkbox"></td>';gId("TMT").innerHTML=t}function FC(){for(j=0;j<8;j++)for(i=0;i<8;i++)gId("W"+i+j).checked=gId("W"+i).value>>j&1}function Wd(){for(a=[0,0,0,0,0,0,0,0],i=0;i<8;i++){for(m=1,j=0;j<8;j++)a[i]+=gId("W"+i+j).checked*m,m*=2;gId("W"+i).value=a[i]}}function GetV() {
 %CSS%%SCSS%</head><body onload="S()"><form id="form_s" name="Sf" method="post" 
 onsubmit="Wd()"><div class="helpB"><button type="button" onclick="H()">?
@@ -292,7 +295,7 @@ name="M11" maxlength="64"><br>12: <input name="M12" maxlength="64"><br>13:
 Alexa On/Off Macros: <input name="A0" type="number" min="0" max="16" required> 
 <input name="A1" type="number" min="0" max="16" required><br>Button Macro: 
 <input name="MP" type="number" min="0" max="16" required> Long Press: <input 
-name="ML" type="number" min="0" max="16" required><br>Countdown-Over Macro: 
+name="MD" type="number" min="0" max="16" required><br>Countdown-Over Macro: 
 <input name="MC" type="number" min="0" max="16" required><br>
 Timed-Light-Over Macro: <input name="MN" type="number" min="0" max="16" 
 required><br>Time-Controlled Macros:<br><div style="display:inline-block"><table
@@ -301,8 +304,8 @@ required><br>Time-Controlled Macros:<br><div style="display:inline-block"><table
 
 
 // Autogenerated from wled00/data/settings_sec.htm, do not edit!!
-const char PAGE_settings_sec[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta name="viewport" content="width=500"><title>
-Misc Settings</title><script>
+const char PAGE_settings_sec[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta name="viewport" content="width=500"><meta 
+charset="utf-8"><title>Misc Settings</title><script>
 function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#security-settings")}function B(){window.open("/settings","_self")}function U(){window.open("/update","_self")}function GetV() {var d=document;
 %CSS%%SCSS%</head><body onload="GetV()"><form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div><button 
