diff --git a/package-lock.json b/package-lock.json
index 85ee1df0f..e85857017 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "clean-css": "^5.3.3",
         "html-minifier-terser": "^7.2.0",
         "inliner": "^1.13.1",
-        "nodemon": "^3.0.2"
+        "nodemon": "^3.1.7"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
diff --git a/wled00/data/settings_2D.htm b/wled00/data/settings_2D.htm
index 2aec03682..e372b3e21 100644
--- a/wled00/data/settings_2D.htm
+++ b/wled00/data/settings_2D.htm
@@ -246,7 +246,7 @@ Y: <input name="P${i}Y" type="number" min="0" max="255" value="0" oninput="UI()"
 		<button type="button" onclick="B()">Back</button><button type="button" onclick="fS()">Save</button><hr>
 	</div>
 	<h2>2D setup</h2>
-	Strip or panel:&nbsp;
+	Strip or panel:
 	<select id="somp" name="SOMP" onchange="resetPanels();addPanels();UI();" >
 		<option value="0">1D Strip</option>
 		<option value="1">2D Matrix</option>
@@ -258,14 +258,14 @@ Y: <input name="P${i}Y" type="number" min="0" max="255" value="0" oninput="UI()"
 			Panel dimensions (WxH): <input name="PW" type="number" min="1" max="128" value="8"> x <input name="PH" type="number" min="1" max="128" value="8"><br>
 			Horizontal panels: <input name="MPH" type="number" min="1" max="8" value="1">
 			Vertical panels: <input name="MPV" type="number" min="1" max="8" value="1"><br>
-			1<sup>st</sup> panel:&nbsp;<select name="PB">
+			1<sup>st</sup> panel: <select name="PB">
 				<option value="0">Top</option>
 				<option value="1">Bottom</option>
 			</select><select name="PR">
 				<option value="0">Left</option>
 				<option value="1">Right</option>
 			</select><br>
-			Orientation:&nbsp;<select name="PV">
+			Orientation: <select name="PV">
 				<option value="0">Horizontal</option>
 				<option value="1">Vertical</option>
 			</select><br>
@@ -286,7 +286,7 @@ Y: <input name="P${i}Y" type="number" min="0" max="255" value="0" oninput="UI()"
 		<div id="MD"></div>
 		<canvas id="canvas"></canvas>
 		<div id="json" >Gap file: <input type="file" name="data" accept=".json"><button type="button" class="sml" onclick="uploadFile(d.Sf.data,'/2d-gaps.json')">Upload</button></div>
-		<i>Note: Gap file is a&nbsp;<b>.json</b>&nbsp;file containing an array with number of elements equal to the matrix size.<br>
+		<i>Note: Gap file is a <b>.json</b> file containing an array with number of elements equal to the matrix size.<br>
 			A value of -1 means that pixel at that position is missing, a value of 0 means never paint that pixel, and 1 means regular pixel.</i>
 	</div>
 	<hr>
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 0a28fda3f..6be5becd1 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -747,7 +747,7 @@ Swap: <select id="xw${s}" name="XW${s}">
 		<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 		</div>
 		<h2>LED &amp; Hardware setup</h2>
-		Total LEDs:&nbsp;<span id="lc">?</span> <span id="pc"></span><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>
@@ -776,7 +776,7 @@ Swap: <select id="xw${s}" name="XW${s}">
 		<hr class="sml">
 		<button type="button" id="+" onclick="addLEDs(1,false)">+</button>
 		<button type="button" id="-" onclick="addLEDs(-1,false)">-</button><br>
-		LED memory usage:&nbsp;<span id="m0">0</span> / <span id="m1">?</span> B<br>
+		LED memory usage: <span id="m0">0</span> / <span id="m1">?</span> B<br>
 		<div id="dbar" style="display:inline-block; width: 100px; height: 10px; border-radius: 20px;"></div><br>
 		<div id="ledwarning" class="warn" style="display: none;">
 			&#9888; You might run into stability or lag issues.<br>
@@ -837,7 +837,7 @@ Swap: <select id="xw${s}" name="XW${s}">
 		<h3>Timed light</h3>
 		Default duration: <input name="TL" type="number" class="m" min="1" max="255" required> min<br>
 		Default target brightness: <input name="TB" type="number" class="m" min="0" max="255" required><br>
-		Mode:&nbsp;
+		Mode:
 		<select name="TW">
 			<option value="0">Wait and set</option>
 			<option value="1">Fade</option>
@@ -863,7 +863,7 @@ Swap: <select id="xw${s}" name="XW${s}">
 			<i class="warn">WARNING: When using H-bridge for reverse polarity (2-wire) CCT LED strip<br><b>make sure this value is 0</b>.<br>(ESP32 variants only, ESP8266 does not support H-bridges)</i>
 		</div>
 		<h3>Advanced</h3>
-		Palette wrapping:&nbsp;
+		Palette wrapping:
 		<select name="PB">
 			<option value="0">Linear (wrap if moving)</option>
 			<option value="1">Linear (always wrap)</option>
diff --git a/wled00/data/settings_pin.htm b/wled00/data/settings_pin.htm
index fcb1e3ccb..22f94e379 100644
--- a/wled00/data/settings_pin.htm
+++ b/wled00/data/settings_pin.htm
@@ -11,20 +11,11 @@
 	<style>
 		@import url("style.css");
 	</style>
-	<script>
-		function checkNum(o) {
-			const specialkeys = ["Backspace", "Tab", "Enter", "Shift", "Control", "Alt", "Pause", "CapsLock", "Escape", "Space", "PageUp", "PageDown", "End", "Home", "ArrowLeft", "ArrowUp", "ArrowRight", "ArrowDown", "Insert", "Delete"];
-			// true if key is a number or a special key
-			if(event.key.match(/[0-9]/) || specialkeys.includes(event.key)) return true;
-			event.preventDefault();
-			return false;
-		}
-	</script>
 </head>
 <body onload="d.getElementsByName('PIN')[0].focus()">
 	<form id="form_s" name="Sf" method="post">
 		<h2>Please enter settings PIN code</h2>
-		<input type="password" name="PIN" size="4" maxlength="4" minlength="4" onkeydown="checkNum(this)" pattern="[0-9]*" inputmode="numeric" autofocus>
+		<input type="password" name="PIN" size="4" maxlength="4" minlength="4" pattern="[0-9]*" inputmode="numeric" autofocus>
 		<hr>
 		<button type="button" onclick="B()">Back</button><button type="submit">Submit</button>
 	</form>
diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm
index 6cc03e9eb..fa75882c0 100644
--- a/wled00/data/settings_sec.htm
+++ b/wled00/data/settings_sec.htm
@@ -72,8 +72,8 @@
 		<a href="https://github.com/Aircoookie/WLED/wiki/Contributors-and-credits" target="_blank">Contributors, dependencies and special thanks</a><br>
 		A huge thank you to everyone who helped me create WLED!<br><br>
 		(c) 2016-2024 Christian Schwinne <br>
-		<i>Licensed under the&nbsp;<a href="https://github.com/Aircoookie/WLED/blob/master/LICENSE" target="_blank">EUPL v1.2 license</a></i><br><br>
-		Server message:&nbsp;<span class="sip"> Response error! </span><hr>
+		<i>Licensed under the <a href="https://github.com/Aircoookie/WLED/blob/master/LICENSE" target="_blank">EUPL v1.2 license</a></i><br><br>
+		Server message: <span class="sip"> Response error! </span><hr>
 		<div id="toast"></div>
 		<button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 	</form>
diff --git a/wled00/data/settings_sync.htm b/wled00/data/settings_sync.htm
index 754605bf0..34b9fc6cd 100644
--- a/wled00/data/settings_sync.htm
+++ b/wled00/data/settings_sync.htm
@@ -118,7 +118,7 @@ Receive UDP realtime: <input type="checkbox" name="RD"><br>
 Use main segment only: <input type="checkbox" name="MO"><br>
 Respect LED Maps: <input type="checkbox" name="RLM"><br><br>
 <i>Network DMX input</i><br>
-Type:&nbsp;
+Type:
 <select name=DI onchange="SP(); adj();">
 <option value=5568>E1.31 (sACN)</option>
 <option value=6454>Art-Net</option>
@@ -127,12 +127,12 @@ Type:&nbsp;
 <div id=xp>Port: <input name="EP" type="number" min="1" max="65535" value="5568" class="d5" required><br></div>
 Multicast: <input type="checkbox" name="EM"><br>
 Start universe: <input name="EU" type="number" min="0" max="63999" required><br>
-<i>Reboot required.</i>&nbsp;Check out&nbsp;<a href="https://github.com/LedFx/LedFx" target="_blank">LedFx</a>!<br>
+<i>Reboot required.</i> Check out <a href="https://github.com/LedFx/LedFx" target="_blank">LedFx</a>!<br>
 Skip out-of-sequence packets: <input type="checkbox" name="ES"><br>
 DMX start address: <input name="DA" type="number" min="1" max="510" required><br>
 DMX segment spacing: <input name="XX" type="number" min="0" max="150" required><br>
 E1.31 port priority: <input name="PY" type="number" min="0" max="200" required><br>
-DMX mode:&nbsp;
+DMX mode:
 <select name=DM>
 <option value=0>Disabled</option>
 <option value=1>Single RGB</option>
@@ -185,7 +185,7 @@ Device Topic: <input type="text" name="MD" maxlength="32"><br>
 Group Topic: <input type="text" name="MG" maxlength="32"><br>
 Publish on button press: <input type="checkbox" name="BM"><br>
 Retain brightness & color messages: <input type="checkbox" name="RT"><br>
-<i>Reboot required to apply changes.&nbsp;</i><a href="https://kno.wled.ge/interfaces/mqtt/" target="_blank">MQTT info</a>
+<i>Reboot required to apply changes. </i><a href="https://kno.wled.ge/interfaces/mqtt/" target="_blank">MQTT info</a>
 </div>
 <h3>Philips Hue</h3>
 <div id="NoHue" class="hide">
@@ -209,7 +209,7 @@ Hue status: <span class="sip"> Disabled in this build </span>
 	<em class="warn">This firmware build does not support Serial interface.<br></em>
 </div>
 <div id="Serial">
-Baud rate:&nbsp;
+Baud rate:
 <select name=BD>
 <option value=1152>115200</option>
 <option value=2304>230400</option>
diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index 3a59b8cb3..df054f417 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -131,7 +131,7 @@
 		Get time from NTP server: <input type="checkbox" name="NT"><br>
 		<input type="text" name="NS" maxlength="32"><br>
 		Use 24h format: <input type="checkbox" name="CF"><br>
-		Time zone:&nbsp;
+		Time zone: 
 		<select name="TZ">
 			<option value="0" selected>GMT(UTC)</option>
 			<option value="1">GMT/BST</option>
@@ -160,8 +160,8 @@
 		</select><br>
 		UTC offset: <input name="UO" type="number" min="-65500" max="65500" required> seconds (max. 18 hours)<br>
 		Current local time is <span class="times">unknown</span>.<br>
-		Latitude:&nbsp;<select name="LTR"><option value="N">N</option><option value="S">S</option></select><input name="LT" type="number" class="xl" min="0" max="66.6" step="0.01"><br>
-		Longitude:&nbsp;<select name="LNR"><option value="E">E</option><option value="W">W</option></select><input name="LN" type="number" class="xl" min="0" max="180" step="0.01"><br>
+		Latitude: <select name="LTR"><option value="N">N</option><option value="S">S</option></select><input name="LT" type="number" class="xl" min="0" max="66.6" step="0.01"><br>
+		Longitude: <select name="LNR"><option value="E">E</option><option value="W">W</option></select><input name="LN" type="number" class="xl" min="0" max="180" step="0.01"><br>
 		<button type="button" id="locbtn" onclick="getLatLon()">Get location</button>
 		<div><i>(opens new tab, only works in browser)</i></div>
 		<div id="sun" class="times"></div>
diff --git a/wled00/data/settings_um.htm b/wled00/data/settings_um.htm
index 9c53d560d..c2f0ffbf2 100644
--- a/wled00/data/settings_um.htm
+++ b/wled00/data/settings_um.htm
@@ -283,14 +283,14 @@
 		<h2>Usermod Setup</h2>
 		Global I<sup>2</sup>C GPIOs (HW)<br>
 		<i class="warn">(change requires reboot!)</i><br>
-		SDA:&nbsp;<input type="number" min="-1" max="48" name="SDA" onchange="check(this,'if')" class="s" placeholder="SDA">
-		SCL:&nbsp;<input type="number" min="-1" max="48" name="SCL" onchange="check(this,'if')" class="s" placeholder="SCL">
+		SDA:<input type="number" min="-1" max="48" name="SDA" onchange="check(this,'if')" class="s" placeholder="SDA">
+		SCL:<input type="number" min="-1" max="48" name="SCL" onchange="check(this,'if')" class="s" placeholder="SCL">
 		<hr class="sml">
 		Global SPI GPIOs (HW)<br>
 		<i class="warn">(only changable on ESP32, change requires reboot!)</i><br>
-		MOSI:&nbsp;<input type="number" min="-1" max="48" name="MOSI" onchange="check(this,'if')" class="s" placeholder="MOSI">
-		MISO:&nbsp;<input type="number" min="-1" max="48" name="MISO" onchange="check(this,'if')" class="s" placeholder="MISO">
-		SCLK:&nbsp;<input type="number" min="-1" max="48" name="SCLK" onchange="check(this,'if')" class="s" placeholder="SCLK">
+		MOSI:<input type="number" min="-1" max="48" name="MOSI" onchange="check(this,'if')" class="s" placeholder="MOSI">
+		MISO:<input type="number" min="-1" max="48" name="MISO" onchange="check(this,'if')" class="s" placeholder="MISO">
+		SCLK:<input type="number" min="-1" max="48" name="SCLK" onchange="check(this,'if')" class="s" placeholder="SCLK">
 		<hr class="sml">
 		Reboot after save? <input type="checkbox" name="RBT"><br>
 		<div id="um">Loading settings...</div>
diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
index 3b840f509..30b6600ae 100644
--- a/wled00/data/settings_wifi.htm
+++ b/wled00/data/settings_wifi.htm
@@ -166,7 +166,7 @@ Static subnet mask:<br>
 		Hide AP name: <input type="checkbox" name="AH"><br>
 		AP password (leave empty for open):<br> <input type="password" name="AP" maxlength="63" pattern="(.{8,63})|()" title="Empty or min. 8 characters"><br>
 		Access Point WiFi channel: <input name="AC" type="number" class="xs" min="1" max="13" required><br>
-		AP opens:&nbsp;
+		AP opens:
 		<select name="AB">
 			<option value="0">No connection after boot</option>
 			<option value="1">Disconnected</option>
@@ -174,13 +174,13 @@ Static subnet mask:<br>
 			<option value="3">Never (not recommended)</option>
 			<option value="4">Temporary (no connection after boot)</option>
 		</select><br>
-		AP IP:&nbsp;<span class="sip"> Not active </span><br>
+		AP IP: <span class="sip"> Not active </span><br>
 		<h3>Experimental</h3>
 		Force 802.11g mode (ESP8266 only): <input type="checkbox" name="FG"><br>
 		Disable WiFi sleep: <input type="checkbox" name="WS"><br>
 		<i>Can help with connectivity issues and Audioreactive sync.<br>
 		Disabling WiFi sleep increases power consumption.</i><br>
-		<div id="tx">TX power:&nbsp;<select name="TX">
+		<div id="tx">TX power: <select name="TX">
 			<option value="78">19.5 dBm</option>
 			<option value="76">19 dBm</option>
 			<option value="74">18.5 dBm</option>
@@ -205,7 +205,7 @@ Static subnet mask:<br>
 			<i>Listen for events over ESP-NOW<br>
 			Keep disabled if not using a remote or wireless sync, increases power consumption.<br></i>
 			Paired Remote MAC: <input type="text" name="RMAC" minlength="12" maxlength="12"><br>
-			Last device seen:&nbsp;<span class="rlid" onclick="d.Sf.RMAC.value=this.textContent;" style="cursor:pointer;">None</span> <br>
+			Last device seen: <span class="rlid" onclick="d.Sf.RMAC.value=this.textContent;" style="cursor:pointer;">None</span> <br>
 		</div>
 
 		<div id="ethd">
diff --git a/wled00/data/style.css b/wled00/data/style.css
index b6cb0f9e6..42e49d304 100644
--- a/wled00/data/style.css
+++ b/wled00/data/style.css
@@ -44,6 +44,9 @@ button.sml {
   min-width: 40px;
   margin: 0 0 0 10px;
 }
+span:before, b:before, b:after, i:after{
+	content: "\00A0";
+}
 #scan {
   margin-top: -10px;
 }
diff --git a/wled00/data/update.htm b/wled00/data/update.htm
index 791a76f6b..b68645a52 100644
--- a/wled00/data/update.htm
+++ b/wled00/data/update.htm
@@ -16,7 +16,7 @@
 <body onload="GetV()">
 	<h2>WLED Software Update</h2>
 	<form method='POST' action='./update' id='uf' enctype='multipart/form-data' onsubmit="U()">
-		Installed version:&nbsp;<span class="sip">##VERSION##</span><br>
+		Installed version: <span class="sip">##VERSION##</span><br>
 		Download the latest binary:&nbsp;<a href="https://github.com/Aircoookie/WLED/releases" target="_blank" 
 		style="vertical-align: text-bottom; display: inline-flex;">
 		<img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a><br>