diff --git a/html/locales/de.json b/html/locales/de.json
index 3cadd21f..af3513dc 100644
--- a/html/locales/de.json
+++ b/html/locales/de.json
@@ -44,6 +44,8 @@
 			"offsetpause": "Pausen-LEDs zentrieren",
 			"huestart": "Farbton-Start (Playlist-Fortschritt)",
 			"hueend": "Farbton-Ende (Playlist-Fortschritt)",
+			"hueatmo": "Farbton-Atmolight",
+			"satatmo": "Sättigung-Atmolight",
 			"dimmablestates": "Dimmbare Stufen",
 			"reverserotation": "Drehrichtung umkehren",
 			"offset": "Offset Start-LED"
@@ -219,6 +221,7 @@
 					"150": "Aktiviere FTP",
 					"151": "IP-Adresse ansagen",
 					"152": "Uhrzeit ansagen",
+					"153": "Ambient Light umschalten",
 					"0": "Lösche Zuordnung",
 					"170": "Play/Pause",
 					"171": "Vorheriger Titel",
@@ -239,7 +242,7 @@
 			}
 		}
 	},
-		"mqtt": {
+	"mqtt": {
 		"title": "MQTT-Einstellungen",
 		"enable": "MQTT aktivieren",
 		"clientId": {
@@ -344,7 +347,8 @@
 		"neopixel": {
 			"title": "Neopixel (Helligkeit)",
 			"restart": "Nach dem Einschalten",
-			"nightmode": "Im Nachtmodus"
+			"nightmode": "Im Nachtmodus",
+			"atmomode": "Im Atmolight-Modus"
 		},
 		"sleep": {
 			"title": "Deep Sleep",
diff --git a/html/locales/en.json b/html/locales/en.json
index 1c466e47..693cfd80 100644
--- a/html/locales/en.json
+++ b/html/locales/en.json
@@ -44,6 +44,8 @@
 			"offsetpause": "Center pause LEDs",
 			"huestart": "Hue-Start for playlist progress",
 			"hueend": "Hue-End for playlist progress",
+			"hueatmo": "Hue-Atmolight",
+			"satatmo": "Saturaion-Atmolight",
 			"dimmablestates": "Dimmable steps",
 			"reverserotation": "Reverse direction of rotation",
 			"offset": "Offset start LED"
@@ -219,6 +221,7 @@
 					"150": "Enable FTP",
 					"151": "Announce IP-Address",
 					"152": "Announce current time",
+					"153": "Toggle Ambient Light",
 					"0": "Remove assignment",
 					"170": "Toggle Play/Pause",
 					"171": "Previous track",
@@ -344,7 +347,8 @@
 		"neopixel": {
 			"title": "Neopixel (brightness)",
 			"restart": "After restart",
-			"nightmode": "For nightmode"
+			"nightmode": "For nightmode",
+			"atmomode": "For Atmolight-mode"
 		},
 		"sleep": {
 			"title": "Deep Sleep",
diff --git a/html/locales/fr.json b/html/locales/fr.json
index 0f8301e4..99e87cdd 100644
--- a/html/locales/fr.json
+++ b/html/locales/fr.json
@@ -44,6 +44,8 @@
 			"offsetpause": "LED pause centre",
 			"huestart": "Début de la couleur",
 			"hueend": "Fin de la couleur",
+			"hueatmo": "Couleur d'ambiance",
+			"satatmo": "Saturation d'ambiance",
 			"dimmablestates": "Étapes à gradation",
 			"reverserotation": "Inversion du sens de rotation",
 			"offset": "Début de l'offset LED"
@@ -219,6 +221,7 @@
 					"150": "Activer FTP",
 					"151": "Annoncer l'adresse IP",
 					"152": "Annoncer l'heure actuelle",
+					"153": "Basculement de la lumière ambiante",
 					"0": "Supprimer l'assignation",
 					"170": "Basculer Lecture/Pause",
 					"171": "Piste précédente",
@@ -344,7 +347,8 @@
 		"neopixel": {
 			"title": "Neopixel (luminosité)",
 			"restart": "Après le redémarrage",
-			"nightmode": "Pour le mode nuit"
+			"nightmode": "Pour le mode nuit",
+			"atmomode": "Pour le mode ambiance"
 		},
 		"sleep": {
 			"title": "Veille profonde",
diff --git a/html/management.html b/html/management.html
index 3d80b02b..0a590ed5 100644
--- a/html/management.html
+++ b/html/management.html
@@ -89,6 +89,10 @@
 			opacity: 0;
 		}
 
+		.sat-slider .slider-track {
+			background: linear-gradient(to right in hsl, #000, #fff);
+		}
+
 		legend.scheduler-border {
 			width: inherit;
 			/* Or auto */
@@ -966,7 +970,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 								<a href="#" class="link-secondary" data-bs-toggle="popover"
 									data-i18n="[data-bs-content]general.options.volumeCurveExp" tabindex="0"><i
 										class="fas fa-circle-question"></i></a>
-							</div>
+							</div>	
 						</fieldset>
 					</div>
 					<div class="col-md-12 mb-4" id="neopixelConfig" data-visible="false">
@@ -1001,6 +1005,21 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 									<i class="fas fa-sun fa-2x .icon-pos"></i>
 								</div>
 							</div>
+							<br>
+							<label for="atmoBrightness" data-i18n="[prepend]general.neopixel.atmomode">:</label>
+							<div class="slider-container">
+								<div class="float-end" style="padding-left: 30px">
+									<i class="far fa-sun fa-2x .icon-pos"></i>
+								</div>
+								<div class="slider-container-inner">
+									<input data-provide="slider" type="number" data-slider-min="0" data-slider-max="255" 
+										min="0" max="255" class="form-control" id="atmoBrightness"
+										name="atmoBrightness" data-slider-value="" value="" required>
+								</div>
+								<div class="float-end" style="padding-left: 10px">
+									<i class="fas fa-sun fa-2x .icon-pos"></i>
+								</div>
+							</div>
 						</fieldset>
 					</div>
 					<div class="col-md-12 mb-4">
@@ -1123,95 +1142,107 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 						data-bs-target="#settingsExConfigContainer" aria-expanded="false"
 						aria-controls="settingsExConfigContainer" data-i18n="showhide"></button><br><br>
 					<span class="collapse" id="settingsExConfigContainer">
-						<div class="col-md-12 mb-4" id="rotaryConfig" style="display:none">
-							<fieldset>
-								<legend class="w-auto" data-i18n="settingsex.rotary.title"></legend><br>
-								<input type="checkbox" id="rotaryReverse" name="rotaryReverse" value="false">&nbsp;
-								<label for="rotaryReverse" data-i18n="settingsex.rotary.reverse"></label>
-							</fieldset>
-						</div>
-						<div class="col-md-12 mb-4" id="settingsExConfig">
-							<fieldset>
-								<legend class="w-auto" data-i18n="settingsex.led.title"></legend><br>
-								<label for="led_numIndicator" data-i18n="settingsex.led.numindicator"></label>: <br>
+					<div class="col-md-12 mb-4" id="rotaryConfig" style="display:none">
+						<fieldset>
+							<legend class="w-auto" data-i18n="settingsex.rotary.title"></legend><br>
+							<input type="checkbox" id="rotaryReverse" name="rotaryReverse" value="false">&nbsp;
+							<label for="rotaryReverse" data-i18n="settingsex.rotary.reverse"></label>
+						</fieldset>
+					</div>
+					<div class="col-md-12 mb-4" id="settingsExConfig">
+						<fieldset>
+							<legend class="w-auto" data-i18n="settingsex.led.title"></legend><br>
+							<label for="led_numIndicator" data-i18n="settingsex.led.numindicator"></label>: <br>
 								<input type="number" class="form-control" id="led_numIndicator" name="led_numIndicator"
 									min="0" max="128"><br>
-								<label for="led_numControl" data-i18n="settingsex.led.numcontrol"></label>: <br>
+							<label for="led_numControl" data-i18n="settingsex.led.numcontrol"></label>: <br>
 								<input type="number" class="form-control" id="led_numControl" name="led_numcontrol"
 									min="0" max="128" onChange="listControlColors(Number(this.value), null)"><br>
-								<div id="controlColorList" class="mb-2 d-none"></div>
-								<div id="controlColorTemp" class="pb-2 d-none">
+							<div id="controlColorList" class="mb-2 d-none"></div>
+							<div id="controlColorTemp" class="pb-2 d-none">
 									<span data-i18n="settingsex.led.controlled"></span>&nbsp;<span
 										class="ledNumber"></span>:&nbsp;<input type="color" value="#ffffff">
-								</div>
-								<label for="led_idleDots" data-i18n="settingsex.led.numidledots"></label>: <br>
+							</div>
+							<label for="led_idleDots" data-i18n="settingsex.led.numidledots"></label>: <br>
 								<input type="number" class="form-control" id="led_idleDots" name="led_idleDots" min="0"
 									max="128"><br>
-								<label for="led_hueStart" data-i18n="settingsex.led.huestart"></label>: <br>
-								<div class="hue-slider">
+							<label for="led_hueStart" data-i18n="settingsex.led.huestart"></label>: <br>
+							<div class="hue-slider">
 									<input id="led_hueStart" type="number" data-provide="slider" data-slider-min="-1"
 										data-slider-max="255" min="-1" max="255" class="form-control"
 										name="led_hueStart" data-slider-value="-1" value="-1">
-								</div>
-								<label for="led_hueEnd" data-i18n="settingsex.led.hueend"></label>: <br>
-								<div class="hue-slider">
+							</div>							
+							<label for="led_hueEnd" data-i18n="settingsex.led.hueend"></label>: <br>
+							<div class="hue-slider">
 									<input id="led_hueEnd" type="number" data-provide="slider" data-slider-min="-1"
 										data-slider-max="255" min="-1" max="255" class="form-control" name="led_hueEnd"
 										data-slider-value="-1" value="-1">
-								</div>
-								<label for="led_dimStates" data-i18n="settingsex.led.dimmablestates"></label>: <br>
-								<input type="number" class="form-control" id="led_dimStates" name="led_dimStates"><br>
-								<label for="led_offsetStart" data-i18n="settingsex.led.offset"></label>: <br>
+							</div>
+							<label for="led_hueAtmo" data-i18n="settingsex.led.hueatmo"></label>: <br>
+							<div class="hue-slider">
+									<input id="led_hueAtmo" type="number" data-provide="slider" data-slider-min="-1" 
+										data-slider-max="255" min="-1" max="255" class="form-control" name="led_hueAtmo"
+										data-slider-value="-1" value="-1">
+							</div>
+							<label for="led_satAtmo" data-i18n="settingsex.led.satatmo"></label>: <br>
+							<div class="sat-slider">
+									<input id="led_satAtmo" type="number" data-provide="slider" data-slider-min="-1"
+										data-slider-max="255" min="-1" max="255" class="form-control" name="led_satAtmo"
+										data-slider-value="-1" value="-1">
+							</div>
+							<label for="led_dimStates" data-i18n="settingsex.led.dimmablestates"></label>: <br>
+							<input type="number" class="form-control" id="led_dimStates" name="led_dimStates"><br>
+							<label for="led_offsetStart" data-i18n="settingsex.led.offset"></label>: <br>
 								<input type="number" class="form-control" id="led_offsetStart"
 									name="led_offsetStart"><br>
-								<input type="checkbox" id="led_offsetPause" name="led_offsetPause" value="false">&nbsp;
-								<label for="led_offsetPause" data-i18n="settingsex.led.offsetpause"></label><br>
+							<input type="checkbox" id="led_offsetPause" name="led_offsetPause" value="false">&nbsp;
+							<label for="led_offsetPause" data-i18n="settingsex.led.offsetpause"></label><br>
 								<input type="checkbox" id="led_reverseRotation" name="led_reverseRotation"
 									value="false">&nbsp;
 								<label for="led_reverseRotation"
 									data-i18n="settingsex.led.reverserotation"></label><br><br>
-							</fieldset>
-							<fieldset>
-								<legend class="w-auto" data-i18n="settingsex.buttons.title"></legend><br>
-								<legend class="fs-5" data-i18n="settingsex.buttons.button0"></legend>
+						</fieldset>
+						<fieldset>
+							<legend class="w-auto" data-i18n="settingsex.buttons.title"></legend><br>
+							<legend class="fs-5" data-i18n="settingsex.buttons.button0"></legend>
 								<label for="cmdselect_short_0"
 									data-i18n="settingsex.buttons.short"></label>:&nbsp;<select id="cmdselect_short_0"
 									class="form-control form-select"></select><br>
 								<label for="cmdselect_long_0" data-i18n="settingsex.buttons.long"></label>:&nbsp;<select
 									id="cmdselect_long_0" class="form-control form-select"></select><br><br>
-								<legend class="fs-5" data-i18n="settingsex.buttons.button1"></legend>
+							<legend class="fs-5" data-i18n="settingsex.buttons.button1"></legend>
 								<label for="cmdselect_short_1"
 									data-i18n="settingsex.buttons.short"></label>:&nbsp;<select id="cmdselect_short_1"
 									class="form-control form-select"></select><br>
 								<label for="cmdselect_long_1" data-i18n="settingsex.buttons.long"></label>:&nbsp;<select
 									id="cmdselect_long_1" class="form-control form-select"></select><br><br>
-								<legend class="fs-5" data-i18n="settingsex.buttons.button2"></legend>
+							<legend class="fs-5" data-i18n="settingsex.buttons.button2"></legend>
 								<label for="cmdselect_short_2"
 									data-i18n="settingsex.buttons.short"></label>:&nbsp;<select id="cmdselect_short_2"
 									class="form-control form-select"></select><br>
 								<label for="cmdselect_long_2" data-i18n="settingsex.buttons.long"></label>:&nbsp;<select
 									id="cmdselect_long_2" class="form-control form-select"></select><br><br>
-								<legend class="fs-5" data-i18n="settingsex.buttons.button3"></legend>
+							<legend class="fs-5" data-i18n="settingsex.buttons.button3"></legend>
 								<label for="cmdselect_short_3"
 									data-i18n="settingsex.buttons.short"></label>:&nbsp;<select id="cmdselect_short_3"
 									class="form-control form-select"></select><br>
 								<label for="cmdselect_long_3" data-i18n="settingsex.buttons.long"></label>:&nbsp;<select
 									id="cmdselect_long_3" class="form-control form-select"></select><br><br>
-								<legend class="fs-5" data-i18n="settingsex.buttons.button4"></legend>
+							<legend class="fs-5" data-i18n="settingsex.buttons.button4"></legend>
 								<label for="cmdselect_short_4"
 									data-i18n="settingsex.buttons.short"></label>:&nbsp;<select id="cmdselect_short_4"
 									class="form-control form-select"></select><br>
 								<label for="cmdselect_long_4" data-i18n="settingsex.buttons.long"></label>:&nbsp;<select
 									id="cmdselect_long_4" class="form-control form-select"></select><br><br>
-								<legend class="fs-5" data-i18n="settingsex.buttons.button5"></legend>
+							<legend class="fs-5" data-i18n="settingsex.buttons.button5"></legend>
 								<label for="cmdselect_short_5"
 									data-i18n="settingsex.buttons.short"></label>:&nbsp;<select id="cmdselect_short_5"
 									class="form-control form-select"></select><br>
 								<label for="cmdselect_long_5" data-i18n="settingsex.buttons.long"></label>:&nbsp;<select
 									id="cmdselect_long_5" class="form-control form-select"></select><br><br>
-							</fieldset>
-							<fieldset>
-								<legend class="w-auto" data-i18n="settingsex.multibuttons.title"></legend><br>
+						</fieldset>
+						<fieldset>
+							<legend class="w-auto" data-i18n="settingsex.multibuttons.title"></legend><br>
 								<label for="cmdselect_multi_01"
 									data-i18n="settingsex.multibuttons.01"></label>:&nbsp;<select
 									id="cmdselect_multi_01" class="form-control form-select"></select><br>
@@ -1257,8 +1288,8 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 								<label for="cmdselect_multi_45"
 									data-i18n="settingsex.multibuttons.45"></label>:&nbsp;<select
 									id="cmdselect_multi_45" class="form-control form-select"></select><br>
-							</fieldset>
-						</div>
+						</fieldset>
+					</div>
 					</span>
 					<div class="text-center">
 						<button type="reset" class="btn btn-warning" data-i18n="reset"
@@ -2186,7 +2217,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 		function getHexColor(number) {
 			return "#" + ('000000' + ((number) >>> 0).toString(16)).slice(-6);
 		}
-
+		
 		// list the LED control colors
 		function listControlColors(numControlColor, data) {
 			console.log(data);
@@ -2225,7 +2256,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 				$('#playMono').prop('checked', genSettings.playMono);
 				$('#savePlayPosShutdown').prop('checked', genSettings.savePosShutdown);
 				$('#savePlayPosRfidChange').prop('checked', genSettings.savePosRfidChge);
-				$('#playLastRfidOnReboot').prop('checked', genSettings.playLastRfidOnReboot);
+				$('#playLastRfidOnReboot').prop('checked', genSettings.playLastRfidOnReboot);				
 				$('#pauseIfRfidRemoved').prop('checked', genSettings.pauseIfRfidRemoved);
 				$('#dontAcceptRfidTwice').prop('checked', genSettings.dontAcceptRfidTwice);
 				$('#dontAcceptRfidTwice').prop('disabled', genSettings.pauseIfRfidRemoved);
@@ -2268,16 +2299,19 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 				document.getElementById('neopixelConfig').setAttribute('data-visible', true);
 				$('#initBrightness').bootstrapSlider('setValue', ledSettings.initBrightness);
 				$('#nightBrightness').bootstrapSlider('setValue', ledSettings.nightBrightness);
+				$('#atmoBrightness').bootstrapSlider('setValue', ledSettings.atmoBrightness);
 				document.getElementById('led_numIndicator').value = ledSettings.numIndicator;
 				document.getElementById('led_numControl').value = ledSettings.numControl;
 				listControlColors(ledSettings.numControl, ledSettings.controlColors);
 				document.getElementById('led_idleDots').value = ledSettings.numIdleDots;
 				$('#led_hueStart').bootstrapSlider('setValue', ledSettings.hueStart);
 				$('#led_hueEnd').bootstrapSlider('setValue', ledSettings.hueEnd);
+				$('#led_hueAtmo').bootstrapSlider('setValue', ledSettings.hueAtmo);
+				$('#led_satAtmo').bootstrapSlider('setValue', ledSettings.satAtmo);
 				document.getElementById('led_dimStates').value = ledSettings.dimStates;
 				$('#led_offsetPause').prop('checked', ledSettings.offsetPause);
 				$('#led_reverseRotation').prop('checked', ledSettings.reverseRot);
-				document.getElementById('led_offsetStart').value = ledSettings.offsetStart;
+				document.getElementById('led_offsetStart').value = ledSettings.offsetStart;				
 			}
 			// playlist
 			let playlistSettings = settings.playlist;
@@ -2579,7 +2613,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 		}
 
 		function hexColorToInt(input) {
-			return parseInt(input.replace(/^#([\da-f])([\da-f])([\da-f])$/i, '#$1$1$2$2$3$3').substring(1), 16);
+  			return parseInt(input.replace(/^#([\da-f])([\da-f])([\da-f])$/i, '#$1$1$2$2$3$3').substring(1), 16);
 		};
 
 		function genSettings(clickedId) {
@@ -2603,12 +2637,15 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 				"led": {
 					initBrightness: Number($('#initBrightness').val()),
 					nightBrightness: Number($('#nightBrightness').val()),
+					atmoBrightness: Number($('#atmoBrightness').val()),
 					numIndicator: Number(document.getElementById("led_numIndicator").value),
 					numControl: Number(document.getElementById("led_numControl").value),
 					controlColors: [],
 					numIdleDots: Number(document.getElementById("led_idleDots").value),
 					hueStart: Number($('#led_hueStart').val()),
 					hueEnd: Number($('#led_hueEnd').val()),
+					hueAtmo: Number($('#led_hueAtmo').val()),
+					satAtmo: Number($('#led_satAtmo').val()),
 					dimStates: Number(document.getElementById("led_dimStates").value),
 					offsetPause: $('#led_offsetPause').prop('checked'),
 					reverseRot: $('#led_reverseRotation').prop('checked'),
@@ -2652,7 +2689,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 					multi34: Number(document.getElementById("cmdselect_multi_34").value),
 					multi35: Number(document.getElementById("cmdselect_multi_35").value),
 					multi45: Number(document.getElementById("cmdselect_multi_45").value),
-				},
+				},			
 				"rotary": {
 					reverse: $('#rotaryReverse').prop('checked')
 				}
@@ -2662,7 +2699,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 				var element = document.getElementById('controlColor' + i);
 				if (element) {
 					myObj.led.controlColors.push(hexColorToInt(element.value));
-				}
+				} 
 			}
 			console.log(myObj);
 			var myJSON = JSON.stringify(myObj);
@@ -3142,7 +3179,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 				opt.value = value;
 				opt.setAttribute('data-i18n', "files.rfid.mod.cmd." + value);
 				selectelement.appendChild(opt);
-				return opt;
+				return opt; 
 			}
 
 			/* Replaces a dom element and copies id and classes from the original */
@@ -3158,7 +3195,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 			const cmdElem = document.createElement('select');
 			const cmdNothing = addOption(cmdElem, 0);
 			cmdNothing.setAttribute('data-i18n', "settingsex.buttons.noaction");
-			const cmds = [170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 199, 150, 151, 152, 120, 100, 101, 102, 103, 104, 105, 106, 107, 110, 111];
+			const cmds = [170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 199, 150, 151, 152, 153, 120, 100, 101, 102, 103, 104, 105, 106, 107, 110, 111];
 			for (const cmd of cmds) {
 				addOption(cmdElem, cmd);
 			}
@@ -3168,7 +3205,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 
 			/* The <select /> that houses all commands for the modification selectors */
 			const modElem = document.createElement('select');
-			const mods = [100, 179, 101, 102, 103, 104, 105, 106, 110, 111, 120, 130, 140, 141, 142, 150, 151, 152, 0, 170, 171, 172, 173, 174, 180, 181];
+			const mods = [100, 179, 101, 102, 103, 104, 105, 106, 110, 111, 120, 130, 140, 141, 142, 150, 151, 152, 153, 0, 170, 171, 172, 173, 174, 180, 181];
 			for (const mod of mods) {
 				addOption(modElem, mod);
 			}
@@ -3182,4 +3219,4 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 	</script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/platformio.ini b/platformio.ini
index 3977b701..5b339837 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -30,11 +30,12 @@ extra_scripts =
     pre:updateSdkConfig.py
     pre:processHtml.py
 lib_deps =
-	https://github.com/schreibfaul1/ESP32-audioI2S.git#e008d56 ; v3.2.0 (15.05.2025)
+	https://github.com/schreibfaul1/ESP32-audioI2S.git#0443b0d ; v3.3.2
 	https://github.com/madhephaestus/ESP32Encoder.git#2c986e0
-	https://github.com/peterus/ESP-FTP-Server-Lib#554959f
-	https://github.com/FastLED/FastLED.git#3b63b17 ; v3.9.7
-	https://github.com/ESP32Async/ESPAsyncWebServer#1baee81 ; v3.7.7
+	https://github.com/peterus/ESP-FTP-Server-Lib.git#554959f
+	; https://github.com/FastLED/FastLED.git#971beb6 ; v3.10.0
+	https://github.com/Joe91/FastLED.git#82f7308 ;  v3.10.0 + spi-workaround
+	https://github.com/ESP32Async/ESPAsyncWebServer.git#1baee81 ; v3.7.7
 	https://github.com/bblanchon/ArduinoJson.git#3252013 ; v7.4.1
 	https://github.com/pschatzmann/arduino-audio-tools.git#c19fbd6 ; v1.0.2
 	https://github.com/pschatzmann/ESP32-A2DP.git#8faaafa ; v1.8.7
@@ -43,7 +44,7 @@ lib_deps =
 	https://github.com/tueddy/rfid.git#caa3e6d ; avoid warnings, fork from https://github.com/miguelbalboa/rfid.git#0ff12a1
 	https://github.com/tuniii/LogRingBuffer.git#89d7d3e
 	https://github.com/tueddy/PN5180-Library.git#e6449a9 ;v2.3.5
-	https://github.com/SZenglein/Arduino-MAX17055_Driver#75cdfcf
+	https://github.com/SZenglein/Arduino-MAX17055_Driver.git#75cdfcf
 	https://github.com/tueddy/natsort.git#ebbf660 ; avoid warnings, fork from https://github.com/sourcefrog/natsort.git#cdd8df9
 
 board_build.embed_txtfiles =
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index 57e4ad1e..26918f14 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -5,6 +5,8 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_AUTOSTART_ARDUINO=y
+CONFIG_ARDUINO_EVENT_RUN_CORE0=y
+CONFIG_ARDUINO_SERIAL_EVENT_RUN_CORE0=y
 CONFIG_ARDUHAL_ESP_LOG=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
@@ -78,7 +80,6 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_CAMELLIA_C=y
 CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED=y
 CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=y
-CONFIG_MQTT_USE_CORE_1=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
diff --git a/src/AudioPlayer.cpp b/src/AudioPlayer.cpp
index 29d980e4..ff9726fa 100644
--- a/src/AudioPlayer.cpp
+++ b/src/AudioPlayer.cpp
@@ -32,8 +32,6 @@
 #define AUDIOPLAYER_VOLUME_INIT 3u
 
 playProps gPlayProperties;
-TaskHandle_t AudioTaskHandle;
-// uint32_t cnt123 = 0;
 
 // Playlist
 static playlistSortMode AudioPlayer_PlaylistSortMode = AUDIOPLAYER_PLAYLIST_SORT_MODE_DEFAULT;
@@ -46,8 +44,8 @@ static uint8_t AudioPlayer_MinVolume = AUDIOPLAYER_VOLUME_MIN;
 static uint8_t AudioPlayer_InitVolume = AUDIOPLAYER_VOLUME_INIT;
 
 // current playtime
-uint32_t AudioPlayer_CurrentTime;
-uint32_t AudioPlayer_FileDuration;
+uint32_t AudioPlayer_CurrentTime = 0;
+uint32_t AudioPlayer_FileDuration = 0;
 
 // Playtime stats
 time_t playTimeSecTotal = 0;
@@ -62,7 +60,28 @@ static uint32_t AudioPlayer_HeadphoneLastDetectionTimestamp = 0u;
 static uint8_t AudioPlayer_MaxVolumeHeadphone = 11u; // Maximum volume that can be adjusted in headphone-mode (default; can be changed later via GUI)
 #endif
 
-static void AudioPlayer_Task(void *parameter);
+// dummy class to allocate audio object in PSRAM if available
+class AudioCustom : public Audio {
+public:
+	void *operator new(size_t size) {
+		return psramFound() ? ps_malloc(size) : malloc(size);
+	}
+};
+
+Audio *audio = nullptr;
+
+// new old varibles
+constexpr uint32_t playbackTimeout = 2000;
+uint32_t playbackTimeoutStart = millis();
+uint8_t currentVolume;
+BaseType_t trackQStatus = pdFAIL;
+uint8_t trackCommand = NO_ACTION;
+bool audioReturnCode;
+uint32_t AudioPlayer_LastPlaytimeStatsTimestamp = 0u;
+Playlist *newPlayList = nullptr;
+bool newPlayListAvailable = false;
+bool audio_active = false;
+
 static void AudioPlayer_HeadphoneVolumeManager(void);
 static std::optional<Playlist *> AudioPlayer_ReturnPlaylistFromWebstream(const char *_webUrl);
 static bool AudioPlayer_ArrSortHelper_strcmp(const char *a, const char *b);
@@ -73,7 +92,21 @@ static void AudioPlayer_RandomizePlaylist(Playlist *playlist);
 static size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const char *_track, const uint32_t _playPosition, const uint8_t _playMode, const uint16_t _trackLastPlayed, const uint16_t _numberOfTracks);
 static void AudioPlayer_ClearCover(void);
 
+void Audio_TaskPause(void) {
+	bool audio_active = false;
+}
+void Audio_TaskResume(void) {
+	bool audio_active = true;
+}
+
 void AudioPlayer_Init(void) {
+	// create audio object
+#ifdef BOARD_HAS_PSRAM
+	audio = new AudioCustom();
+#else
+	static Audio audioAsStatic; // Don't use heap as it's needed for other stuff :-)
+	audio = &audioAsStatic;
+#endif
 	// load playtime total from NVS
 	playTimeSecTotal = gPrefsSettings.getULong("playTimeTotal", 0);
 
@@ -162,18 +195,23 @@ void AudioPlayer_Init(void) {
 		gPlayProperties.dontAcceptRfidTwice = false;
 	}
 
-	// Don't start audio-task in BT-speaker mode!
-	if ((System_GetOperationMode() == OPMODE_NORMAL) || (System_GetOperationMode() == OPMODE_BLUETOOTH_SOURCE)) {
-		xTaskCreatePinnedToCore(
-			AudioPlayer_Task, /* Function to implement the task */
-			"mp3play", /* Name of the task */
-			6000, /* Stack size in words */
-			NULL, /* Task input parameter */
-			2 | portPRIVILEGE_BIT, /* Priority of the task */
-			&AudioTaskHandle, /* Task handle. */
-			1 /* Core where the task should run */
-		);
-	}
+#ifdef I2S_COMM_FMT_LSB_ENABLE
+	audio->setI2SCommFMT_LSB(true);
+#endif
+
+	AudioPlayer_CurrentVolume = AudioPlayer_GetInitVolume();
+	audio->setPinout(I2S_BCLK, I2S_LRC, I2S_DOUT);
+	audio->setVolumeSteps(AUDIOPLAYER_VOLUME_MAX);
+	audio->setVolume(AudioPlayer_CurrentVolume, gPrefsSettings.getUChar("volumeCurve", 0));
+	audio->forceMono(gPlayProperties.currentPlayMono);
+	audio->setTone(
+		gPrefsSettings.getChar("gainLowPass", 0),
+		gPrefsSettings.getChar("gainBandPass", 0),
+		gPrefsSettings.getChar("gainHighPass", 0));
+
+	audio->setAudioTaskCore(1);
+
+	audio_active = true;
 }
 
 void AudioPlayer_Exit(void) {
@@ -183,7 +221,7 @@ void AudioPlayer_Exit(void) {
 	gPrefsSettings.putULong("playTimeTotal", playTimeSecTotal);
 	// Make sure last playposition for audiobook is saved when playback is active while shutdown was initiated
 	if (gPrefsSettings.getBool("savePosShutdown", false) && !gPlayProperties.pausePlay && (gPlayProperties.playMode == AUDIOBOOK || gPlayProperties.playMode == AUDIOBOOK_LOOP)) {
-		AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
+		AudioPlayer_SetTrackControl(PAUSEPLAY);
 		while (!gPlayProperties.pausePlay) { // Make sure to wait until playback is paused in order to be sure that playposition saved in NVS
 			vTaskDelay(portTICK_PERIOD_MS * 100u);
 		}
@@ -193,12 +231,19 @@ void AudioPlayer_Exit(void) {
 static uint32_t lastPlayingTimestamp = 0;
 
 void AudioPlayer_Cyclic(void) {
+	if (!audio_active) {
+		return;
+	}
+
 	AudioPlayer_HeadphoneVolumeManager();
 	if ((millis() - lastPlayingTimestamp >= 1000) && gPlayProperties.playMode != NO_PLAYLIST && gPlayProperties.playMode != BUSY && !gPlayProperties.pausePlay) {
 		// audio is playing, update the playtime since start
 		lastPlayingTimestamp = millis();
 		playTimeSecSinceStart += 1;
 	}
+
+	// Actual loop stuff
+	AudioPlayer_Loop();
 }
 
 // Wrapper-function to reverse detection of connected headphones.
@@ -357,7 +402,7 @@ void AudioPlayer_HeadphoneVolumeManager(void) {
 			AudioPlayer_MaxVolume = AudioPlayer_MaxVolumeHeadphone;
 			gPlayProperties.newPlayMono = false; // Always stereo for headphones
 			if (AudioPlayer_GetCurrentVolume() > AudioPlayer_MaxVolume) {
-				AudioPlayer_VolumeToQueueSender(AudioPlayer_MaxVolume, true); // Lower volume for headphone if headphone's maxvolume is exceeded by volume set in speaker-mode
+				AudioPlayer_SetVolume(AudioPlayer_MaxVolume, true); // Lower volume for headphone if headphone's maxvolume is exceeded by volume set in speaker-mode
 			}
 
 	#ifdef GPIO_PA_EN
@@ -374,562 +419,495 @@ void AudioPlayer_HeadphoneVolumeManager(void) {
 #endif
 }
 
-class AudioCustom : public Audio {
-public:
-	void *operator new(size_t size) {
-		return psramFound() ? ps_malloc(size) : malloc(size);
-	}
-};
-
 // Function to play music as task
-void AudioPlayer_Task(void *parameter) {
-#ifdef BOARD_HAS_PSRAM
-	AudioCustom *audio = new AudioCustom();
-#else
-	static Audio audioAsStatic; // Don't use heap as it's needed for other stuff :-)
-	Audio *audio = &audioAsStatic;
-#endif
-
-#ifdef I2S_COMM_FMT_LSB_ENABLE
-	audio->setI2SCommFMT_LSB(true);
-#endif
+void AudioPlayer_Loop() {
+	// Update playtime stats every 250 ms
+	if ((millis() - AudioPlayer_LastPlaytimeStatsTimestamp) > 250) {
+		AudioPlayer_LastPlaytimeStatsTimestamp = millis();
+		// Update current playtime and duration
+		AudioPlayer_CurrentTime = audio->getAudioCurrentTime();
+		AudioPlayer_FileDuration = audio->getAudioFileDuration();
+		// Calculate relative position in file (for trackprogress neopixel & web-ui)
+		uint32_t fileSize = audio->getFileSize();
+		gPlayProperties.audioFileSize = fileSize;
+		if (!gPlayProperties.playlistFinished && fileSize > 0) {
+			// for local files and web files with known size
+			if (!gPlayProperties.pausePlay && (gPlayProperties.seekmode != SEEK_POS_PERCENT)) { // To progress necessary when paused
+				uint32_t audioDataStartPos = audio->getAudioDataStartPos();
+				gPlayProperties.currentRelPos = ((double) (audio->getFilePos() - audioDataStartPos - audio->inBufferFilled()) / (fileSize - audioDataStartPos)) * 100;
+			}
+		} else {
+			if (gPlayProperties.isWebstream && (audio->inBufferSize() > 0)) {
+				// calc current fillbuffer percent for webstream with unknown size/end
+				gPlayProperties.currentRelPos = (double) (audio->inBufferFilled() / (double) audio->inBufferSize()) * 100;
+			} else {
+				gPlayProperties.currentRelPos = 0;
+			}
+		}
+	}
 
-	constexpr uint32_t playbackTimeout = 2000;
-	uint32_t playbackTimeoutStart = millis();
+	if (newPlayListAvailable || gPlayProperties.trackFinished || trackCommand != NO_ACTION) {
+		if (newPlayListAvailable) {
+			newPlayListAvailable = false;
+			audio->stopSong();
 
-	AudioPlayer_CurrentVolume = AudioPlayer_GetInitVolume();
-	audio->setPinout(I2S_BCLK, I2S_LRC, I2S_DOUT);
-	audio->setVolumeSteps(AUDIOPLAYER_VOLUME_MAX);
-	audio->setVolume(AudioPlayer_CurrentVolume, gPrefsSettings.getUChar("volumeCurve", 0));
-	audio->forceMono(gPlayProperties.currentPlayMono);
-	int8_t currentEqualizer[3] = {gPrefsSettings.getChar("gainLowPass", 0), gPrefsSettings.getChar("gainBandPass", 0), gPrefsSettings.getChar("gainHighPass", 0)};
-	audio->setTone(currentEqualizer[0], currentEqualizer[1], currentEqualizer[2]);
-
-	uint8_t currentVolume;
-	BaseType_t trackQStatus = pdFAIL;
-	uint8_t trackCommand = NO_ACTION;
-	bool audioReturnCode;
-	AudioPlayer_CurrentTime = 0;
-	AudioPlayer_FileDuration = 0;
-	uint32_t AudioPlayer_LastPlaytimeStatsTimestamp = 0u;
-
-	for (;;) {
-		/*
-		if (cnt123++ % 100 == 0) {
-			Log_Printf(LOGLEVEL_DEBUG, "%u", uxTaskGetStackHighWaterMark(NULL));
-		}
-		*/
-		if (xQueueReceive(gVolumeQueue, &currentVolume, 0) == pdPASS) {
-			Log_Printf(LOGLEVEL_INFO, newLoudnessReceivedQueue, currentVolume);
-			audio->setVolume(currentVolume, gPrefsSettings.getUChar("volumeCurve", 0));
-			Web_SendWebsocketData(0, WebsocketCodeType::Volume);
+			// destroy the old playlist and assign the new
+			freePlaylist(gPlayProperties.playlist);
+			gPlayProperties.playlist = newPlayList;
+			Log_Printf(LOGLEVEL_NOTICE, newPlaylistReceived, gPlayProperties.playlist->size());
+			Log_Printf(LOGLEVEL_DEBUG, "Free heap: %u", ESP.getFreeHeap());
+			playbackTimeoutStart = millis();
+			gPlayProperties.pausePlay = false;
+			gPlayProperties.trackFinished = false;
+			gPlayProperties.playlistFinished = false;
 #ifdef MQTT_ENABLE
-			publishMqtt(topicLoudnessState, static_cast<uint32_t>(currentVolume), false);
+			publishMqtt(topicPlaymodeState, static_cast<uint32_t>(gPlayProperties.playMode), false);
+			publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
 #endif
-		}
-
-		if (xQueueReceive(gEqualizerQueue, &currentEqualizer, 0) == pdPASS) {
-			Log_Printf(LOGLEVEL_DEBUG, newEqualizerReceivedQueue, currentEqualizer[0], currentEqualizer[1], currentEqualizer[2]);
-			audio->setTone(currentEqualizer[0], currentEqualizer[1], currentEqualizer[2]);
-		}
 
-		if (xQueueReceive(gTrackControlQueue, &trackCommand, 0) == pdPASS) {
-			Log_Printf(LOGLEVEL_INFO, newCntrlReceivedQueue, trackCommand);
+			// If we're in audiobook-mode and apply a modification-card, we don't
+			// want to save lastPlayPosition for the mod-card but for the card that holds the playlist
+			if (strlen(gCurrentRfidTagId) > 0) {
+				strncpy(gPlayProperties.playRfidTag, gCurrentRfidTagId, sizeof(gPlayProperties.playRfidTag) / sizeof(gPlayProperties.playRfidTag[0]));
+			}
 		}
-
-		// Update playtime stats every 250 ms
-		if ((millis() - AudioPlayer_LastPlaytimeStatsTimestamp) > 250) {
-			AudioPlayer_LastPlaytimeStatsTimestamp = millis();
-			// Update current playtime and duration
-			AudioPlayer_CurrentTime = audio->getAudioCurrentTime();
-			AudioPlayer_FileDuration = audio->getAudioFileDuration();
-			// Calculate relative position in file (for trackprogress neopixel & web-ui)
-			uint32_t fileSize = audio->getFileSize();
-			gPlayProperties.audioFileSize = fileSize;
-			if (!gPlayProperties.playlistFinished && fileSize > 0) {
-				// for local files and web files with known size
-				if (!gPlayProperties.pausePlay && (gPlayProperties.seekmode != SEEK_POS_PERCENT)) { // To progress necessary when paused
-					uint32_t audioDataStartPos = audio->getAudioDataStartPos();
-					gPlayProperties.currentRelPos = ((double) (audio->getFilePos() - audioDataStartPos - audio->inBufferFilled()) / (fileSize - audioDataStartPos)) * 100;
+		if (gPlayProperties.trackFinished) {
+			gPlayProperties.trackFinished = false;
+			if (gPlayProperties.playMode == NO_PLAYLIST || gPlayProperties.playlist == nullptr) {
+				gPlayProperties.playlistFinished = true;
+				return;
+			}
+			if (gPlayProperties.saveLastPlayPosition) { // Don't save for AUDIOBOOK_LOOP because not necessary
+				if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
+					// Only save if there's another track, otherwise it will be saved at end of playlist anyway
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber + 1, gPlayProperties.playlist->size());
 				}
+			}
+			if (gPlayProperties.sleepAfterCurrentTrack) { // Go to sleep if "sleep after track" was requested
+				gPlayProperties.playlistFinished = true;
+				gPlayProperties.playMode = NO_PLAYLIST;
+				System_RequestSleep();
+				return; // TODO-> check if this is necessary or if we need a flag here
+			}
+			if (!gPlayProperties.repeatCurrentTrack) { // If endless-loop requested, track-number will not be incremented
+				gPlayProperties.currentTrackNumber++;
 			} else {
-				if (gPlayProperties.isWebstream && (audio->inBufferSize() > 0)) {
-					// calc current fillbuffer percent for webstream with unknown size/end
-					gPlayProperties.currentRelPos = (double) (audio->inBufferFilled() / (double) audio->inBufferSize()) * 100;
-				} else {
-					gPlayProperties.currentRelPos = 0;
-				}
+				Log_Println(repeatTrackDueToPlaymode, LOGLEVEL_INFO);
+				Led_Indicate(LedIndicatorType::Rewind);
 			}
 		}
 
-		Playlist *newPlaylist;
-		trackQStatus = xQueueReceive(gTrackQueue, &newPlaylist, 0);
-		if (trackQStatus == pdPASS || gPlayProperties.trackFinished || trackCommand != NO_ACTION) {
-			if (trackQStatus == pdPASS) {
+		if (gPlayProperties.playlistFinished && trackCommand != NO_ACTION) {
+			if (gPlayProperties.playMode != BUSY) { // Prevents from staying in mode BUSY forever when error occured (e.g. directory empty that should be played)
+				Log_Println(noPlaymodeChangeIfIdle, LOGLEVEL_NOTICE);
+				trackCommand = NO_ACTION;
+				System_IndicateError();
+				return;
+			}
+		}
+		/* Check if track-control was called
+		   (stop, start, next track, prev. track, last track, first track...) */
+		switch (trackCommand) {
+			case STOP:
 				audio->stopSong();
+				trackCommand = NO_ACTION;
+				Log_Println(cmndStop, LOGLEVEL_INFO);
+				gPlayProperties.pausePlay = true;
+				gPlayProperties.playlistFinished = true;
+				gPlayProperties.playMode = NO_PLAYLIST;
+				Audio_setTitle(noPlaylist);
+				AudioPlayer_ClearCover();
+				return;
 
-				// destroy the old playlist and assign the new
-				freePlaylist(gPlayProperties.playlist);
-				gPlayProperties.playlist = newPlaylist;
-				Log_Printf(LOGLEVEL_NOTICE, newPlaylistReceived, gPlayProperties.playlist->size());
-				Log_Printf(LOGLEVEL_DEBUG, "Free heap: %u", ESP.getFreeHeap());
-				playbackTimeoutStart = millis();
-				gPlayProperties.pausePlay = false;
-				gPlayProperties.trackFinished = false;
-				gPlayProperties.playlistFinished = false;
-#ifdef MQTT_ENABLE
-				publishMqtt(topicPlaymodeState, static_cast<uint32_t>(gPlayProperties.playMode), false);
-				publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
-#endif
-
-				// If we're in audiobook-mode and apply a modification-card, we don't
-				// want to save lastPlayPosition for the mod-card but for the card that holds the playlist
-				if (strlen(gCurrentRfidTagId) > 0) {
-					strncpy(gPlayProperties.playRfidTag, gCurrentRfidTagId, sizeof(gPlayProperties.playRfidTag) / sizeof(gPlayProperties.playRfidTag[0]));
-				}
-			}
-			if (gPlayProperties.trackFinished) {
-				gPlayProperties.trackFinished = false;
-				if (gPlayProperties.playMode == NO_PLAYLIST || gPlayProperties.playlist == nullptr) {
-					gPlayProperties.playlistFinished = true;
-					continue;
-				}
-				if (gPlayProperties.saveLastPlayPosition) { // Don't save for AUDIOBOOK_LOOP because not necessary
-					if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
-						// Only save if there's another track, otherwise it will be saved at end of playlist anyway
-						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber + 1, gPlayProperties.playlist->size());
-					}
-				}
-				if (gPlayProperties.sleepAfterCurrentTrack) { // Go to sleep if "sleep after track" was requested
-					gPlayProperties.playlistFinished = true;
-					gPlayProperties.playMode = NO_PLAYLIST;
-					System_RequestSleep();
-					break;
-				}
-				if (!gPlayProperties.repeatCurrentTrack) { // If endless-loop requested, track-number will not be incremented
-					gPlayProperties.currentTrackNumber++;
+			case PAUSEPLAY:
+				trackCommand = NO_ACTION;
+				audio->pauseResume();
+				if (gPlayProperties.pausePlay) {
+					Log_Println(cmndResumeFromPause, LOGLEVEL_INFO);
 				} else {
-					Log_Println(repeatTrackDueToPlaymode, LOGLEVEL_INFO);
-					Led_Indicate(LedIndicatorType::Rewind);
+					Log_Println(cmndPause, LOGLEVEL_INFO);
 				}
-			}
-
-			if (gPlayProperties.playlistFinished && trackCommand != NO_ACTION) {
-				if (gPlayProperties.playMode != BUSY) { // Prevents from staying in mode BUSY forever when error occured (e.g. directory empty that should be played)
-					Log_Println(noPlaymodeChangeIfIdle, LOGLEVEL_NOTICE);
-					trackCommand = NO_ACTION;
-					System_IndicateError();
-					continue;
+				if (gPlayProperties.saveLastPlayPosition && !gPlayProperties.pausePlay) {
+					Log_Printf(LOGLEVEL_INFO, trackPausedAtPos, audio->getFilePos(), audio->getFilePos() - audio->inBufferFilled());
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), audio->getFilePos() - audio->inBufferFilled(), gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
 				}
-			}
-			/* Check if track-control was called
-			   (stop, start, next track, prev. track, last track, first track...) */
-			switch (trackCommand) {
-				case STOP:
-					audio->stopSong();
-					trackCommand = NO_ACTION;
-					Log_Println(cmndStop, LOGLEVEL_INFO);
-					gPlayProperties.pausePlay = true;
-					gPlayProperties.playlistFinished = true;
-					gPlayProperties.playMode = NO_PLAYLIST;
-					Audio_setTitle(noPlaylist);
-					AudioPlayer_ClearCover();
-					continue;
+				gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
+				Web_SendWebsocketData(0, WebsocketCodeType::TrackInfo);
+				return;
 
-				case PAUSEPLAY:
-					trackCommand = NO_ACTION;
+			case NEXTTRACK:
+				trackCommand = NO_ACTION;
+				if (gPlayProperties.pausePlay) {
 					audio->pauseResume();
-					if (gPlayProperties.pausePlay) {
-						Log_Println(cmndResumeFromPause, LOGLEVEL_INFO);
+					gPlayProperties.pausePlay = false;
+				}
+				if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
+					gPlayProperties.repeatCurrentTrack = false;
+#ifdef MQTT_ENABLE
+					publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
+#endif
+				}
+				// Allow next track if current track played in playlist isn't the last track.
+				// Exception: loop-playlist is active. In this case playback restarts at the first track of the playlist.
+				if ((gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) || gPlayProperties.repeatPlaylist) {
+					if ((gPlayProperties.currentTrackNumber + 1 >= gPlayProperties.playlist->size()) && gPlayProperties.repeatPlaylist) {
+						gPlayProperties.currentTrackNumber = 0;
 					} else {
-						Log_Println(cmndPause, LOGLEVEL_INFO);
+						gPlayProperties.currentTrackNumber++;
 					}
-					if (gPlayProperties.saveLastPlayPosition && !gPlayProperties.pausePlay) {
-						Log_Printf(LOGLEVEL_INFO, trackPausedAtPos, audio->getFilePos(), audio->getFilePos() - audio->inBufferFilled());
-						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), audio->getFilePos() - audio->inBufferFilled(), gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+					if (gPlayProperties.saveLastPlayPosition) {
+						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+						Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 					}
-					gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
-					Web_SendWebsocketData(0, WebsocketCodeType::TrackInfo);
-					continue;
-
-				case NEXTTRACK:
-					trackCommand = NO_ACTION;
-					if (gPlayProperties.pausePlay) {
-						audio->pauseResume();
-						gPlayProperties.pausePlay = false;
+					Log_Println(cmndNextTrack, LOGLEVEL_INFO);
+					if (!gPlayProperties.playlistFinished) {
+						audio->stopSong();
 					}
-					if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
-						gPlayProperties.repeatCurrentTrack = false;
+				} else {
+					Log_Println(lastTrackAlreadyActive, LOGLEVEL_NOTICE);
+					System_IndicateError();
+					return;
+				}
+				break;
+
+			case PREVIOUSTRACK:
+				trackCommand = NO_ACTION;
+				if (gPlayProperties.pausePlay) {
+					audio->pauseResume();
+					gPlayProperties.pausePlay = false;
+				}
+				if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
+					gPlayProperties.repeatCurrentTrack = false;
 #ifdef MQTT_ENABLE
-						publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
+					publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
 #endif
+				}
+				if (gPlayProperties.playMode == WEBSTREAM) {
+					Log_Println(trackChangeWebstream, LOGLEVEL_INFO);
+					System_IndicateError();
+					return;
+				} else if (gPlayProperties.playMode == LOCAL_M3U) {
+					Log_Println(cmndPrevTrack, LOGLEVEL_INFO);
+					if (gPlayProperties.currentTrackNumber > 0) {
+						gPlayProperties.currentTrackNumber--;
+					} else {
+						System_IndicateError();
+						return;
 					}
-					// Allow next track if current track played in playlist isn't the last track.
-					// Exception: loop-playlist is active. In this case playback restarts at the first track of the playlist.
-					if ((gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) || gPlayProperties.repeatPlaylist) {
-						if ((gPlayProperties.currentTrackNumber + 1 >= gPlayProperties.playlist->size()) && gPlayProperties.repeatPlaylist) {
-							gPlayProperties.currentTrackNumber = 0;
-						} else {
-							gPlayProperties.currentTrackNumber++;
+				} else {
+					if (gPlayProperties.currentTrackNumber > 0 || gPlayProperties.repeatPlaylist) {
+						if (audio->getAudioCurrentTime() < 5) { // play previous track when current track time is small, else play current track again
+							if (gPlayProperties.currentTrackNumber == 0 && gPlayProperties.repeatPlaylist) {
+								gPlayProperties.currentTrackNumber = gPlayProperties.playlist->size() - 1; // Go back to last track in loop-mode when first track is played
+							} else {
+								gPlayProperties.currentTrackNumber--;
+							}
 						}
+
 						if (gPlayProperties.saveLastPlayPosition) {
 							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
 							Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 						}
-						Log_Println(cmndNextTrack, LOGLEVEL_INFO);
+
+						Log_Println(cmndPrevTrack, LOGLEVEL_INFO);
 						if (!gPlayProperties.playlistFinished) {
 							audio->stopSong();
 						}
 					} else {
-						Log_Println(lastTrackAlreadyActive, LOGLEVEL_NOTICE);
-						System_IndicateError();
-						continue;
-					}
-					break;
-
-				case PREVIOUSTRACK:
-					trackCommand = NO_ACTION;
-					if (gPlayProperties.pausePlay) {
-						audio->pauseResume();
-						gPlayProperties.pausePlay = false;
-					}
-					if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
-						gPlayProperties.repeatCurrentTrack = false;
-#ifdef MQTT_ENABLE
-						publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
-#endif
-					}
-					if (gPlayProperties.playMode == WEBSTREAM) {
-						Log_Println(trackChangeWebstream, LOGLEVEL_INFO);
-						System_IndicateError();
-						continue;
-					} else if (gPlayProperties.playMode == LOCAL_M3U) {
-						Log_Println(cmndPrevTrack, LOGLEVEL_INFO);
-						if (gPlayProperties.currentTrackNumber > 0) {
-							gPlayProperties.currentTrackNumber--;
-						} else {
-							System_IndicateError();
-							continue;
+						if (gPlayProperties.saveLastPlayPosition) {
+							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
 						}
-					} else {
-						if (gPlayProperties.currentTrackNumber > 0 || gPlayProperties.repeatPlaylist) {
-							if (audio->getAudioCurrentTime() < 5) { // play previous track when current track time is small, else play current track again
-								if (gPlayProperties.currentTrackNumber == 0 && gPlayProperties.repeatPlaylist) {
-									gPlayProperties.currentTrackNumber = gPlayProperties.playlist->size() - 1; // Go back to last track in loop-mode when first track is played
-								} else {
-									gPlayProperties.currentTrackNumber--;
-								}
-							}
-
-							if (gPlayProperties.saveLastPlayPosition) {
-								AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
-								Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
-							}
-
-							Log_Println(cmndPrevTrack, LOGLEVEL_INFO);
-							if (!gPlayProperties.playlistFinished) {
-								audio->stopSong();
-							}
-						} else {
-							if (gPlayProperties.saveLastPlayPosition) {
-								AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
-							}
-							audio->stopSong();
-							Led_Indicate(LedIndicatorType::Rewind);
-							audioReturnCode = audio->connecttoFS(gFSystem, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
-							// consider track as finished, when audio lib call was not successful
-							if (!audioReturnCode) {
-								System_IndicateError();
-								gPlayProperties.trackFinished = true;
-								continue;
-							}
-							Log_Println(trackStart, LOGLEVEL_INFO);
-							continue;
+						audio->stopSong();
+						Led_Indicate(LedIndicatorType::Rewind);
+						audioReturnCode = audio->connecttoFS(gFSystem, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
+						// consider track as finished, when audio lib call was not successful
+						if (!audioReturnCode) {
+							System_IndicateError();
+							gPlayProperties.trackFinished = true;
+							return;
 						}
+						Log_Println(trackStart, LOGLEVEL_INFO);
+						return;
 					}
-					break;
-				case FIRSTTRACK:
-					trackCommand = NO_ACTION;
-					if (gPlayProperties.pausePlay) {
-						audio->pauseResume();
-						gPlayProperties.pausePlay = false;
-					}
-					gPlayProperties.currentTrackNumber = 0;
+				}
+				break;
+			case FIRSTTRACK:
+				trackCommand = NO_ACTION;
+				if (gPlayProperties.pausePlay) {
+					audio->pauseResume();
+					gPlayProperties.pausePlay = false;
+				}
+				gPlayProperties.currentTrackNumber = 0;
+				if (gPlayProperties.saveLastPlayPosition) {
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+					Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
+				}
+				Log_Println(cmndFirstTrack, LOGLEVEL_INFO);
+				if (!gPlayProperties.playlistFinished) {
+					audio->stopSong();
+				}
+				break;
+
+			case LASTTRACK:
+				trackCommand = NO_ACTION;
+				if (gPlayProperties.pausePlay) {
+					audio->pauseResume();
+					gPlayProperties.pausePlay = false;
+				}
+				if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
+					gPlayProperties.currentTrackNumber = gPlayProperties.playlist->size() - 1;
 					if (gPlayProperties.saveLastPlayPosition) {
 						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
 						Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 					}
-					Log_Println(cmndFirstTrack, LOGLEVEL_INFO);
+					Log_Println(cmndLastTrack, LOGLEVEL_INFO);
 					if (!gPlayProperties.playlistFinished) {
 						audio->stopSong();
 					}
-					break;
+				} else {
+					Log_Println(lastTrackAlreadyActive, LOGLEVEL_NOTICE);
+					System_IndicateError();
+					return;
+				}
+				break;
 
-				case LASTTRACK:
-					trackCommand = NO_ACTION;
-					if (gPlayProperties.pausePlay) {
-						audio->pauseResume();
-						gPlayProperties.pausePlay = false;
-					}
-					if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
-						gPlayProperties.currentTrackNumber = gPlayProperties.playlist->size() - 1;
-						if (gPlayProperties.saveLastPlayPosition) {
-							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
-							Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
-						}
-						Log_Println(cmndLastTrack, LOGLEVEL_INFO);
-						if (!gPlayProperties.playlistFinished) {
-							audio->stopSong();
-						}
-					} else {
-						Log_Println(lastTrackAlreadyActive, LOGLEVEL_NOTICE);
-						System_IndicateError();
-						continue;
-					}
-					break;
+			case 0:
+				break;
 
-				case 0:
-					break;
+			default:
+				trackCommand = NO_ACTION;
+				Log_Println(cmndDoesNotExist, LOGLEVEL_NOTICE);
+				System_IndicateError();
+				return;
+		}
 
-				default:
-					trackCommand = NO_ACTION;
-					Log_Println(cmndDoesNotExist, LOGLEVEL_NOTICE);
-					System_IndicateError();
-					continue;
+		if (gPlayProperties.playUntilTrackNumber == gPlayProperties.currentTrackNumber && gPlayProperties.playUntilTrackNumber > 0) {
+			if (gPlayProperties.saveLastPlayPosition) {
+				AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, 0, gPlayProperties.playlist->size());
 			}
+			gPlayProperties.playlistFinished = true;
+			gPlayProperties.playMode = NO_PLAYLIST;
+			System_RequestSleep();
+			return;
+		}
 
-			if (gPlayProperties.playUntilTrackNumber == gPlayProperties.currentTrackNumber && gPlayProperties.playUntilTrackNumber > 0) {
+		if (gPlayProperties.currentTrackNumber >= gPlayProperties.playlist->size()) { // Check if last element of playlist is already reached
+			Log_Println(endOfPlaylistReached, LOGLEVEL_NOTICE);
+			if (!gPlayProperties.repeatPlaylist) {
 				if (gPlayProperties.saveLastPlayPosition) {
-					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, 0, gPlayProperties.playlist->size());
+					// Set back to first track
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(0), 0, gPlayProperties.playMode, 0, gPlayProperties.playlist->size());
 				}
 				gPlayProperties.playlistFinished = true;
 				gPlayProperties.playMode = NO_PLAYLIST;
-				System_RequestSleep();
-				continue;
-			}
-
-			if (gPlayProperties.currentTrackNumber >= gPlayProperties.playlist->size()) { // Check if last element of playlist is already reached
-				Log_Println(endOfPlaylistReached, LOGLEVEL_NOTICE);
-				if (!gPlayProperties.repeatPlaylist) {
-					if (gPlayProperties.saveLastPlayPosition) {
-						// Set back to first track
-						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(0), 0, gPlayProperties.playMode, 0, gPlayProperties.playlist->size());
-					}
-					gPlayProperties.playlistFinished = true;
-					gPlayProperties.playMode = NO_PLAYLIST;
-					Audio_setTitle(noPlaylist);
-					AudioPlayer_ClearCover();
+				Audio_setTitle(noPlaylist);
+				AudioPlayer_ClearCover();
 #ifdef MQTT_ENABLE
-					publishMqtt(topicPlaymodeState, static_cast<uint32_t>(gPlayProperties.playMode), false);
+				publishMqtt(topicPlaymodeState, static_cast<uint32_t>(gPlayProperties.playMode), false);
 #endif
-					gPlayProperties.currentTrackNumber = 0;
-					if (gPlayProperties.sleepAfterPlaylist) {
-						System_RequestSleep();
-					}
-					continue;
-				} else { // Check if sleep after current track/playlist was requested
-					if (gPlayProperties.sleepAfterPlaylist || gPlayProperties.sleepAfterCurrentTrack) {
-						gPlayProperties.playlistFinished = true;
-						gPlayProperties.playMode = NO_PLAYLIST;
-						System_RequestSleep();
-						continue;
-					} // Repeat playlist; set current track number back to 0
-					Log_Println(repeatPlaylistDueToPlaymode, LOGLEVEL_NOTICE);
-					gPlayProperties.currentTrackNumber = 0;
-					if (gPlayProperties.saveLastPlayPosition) {
-						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(0), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
-					}
+				gPlayProperties.currentTrackNumber = 0;
+				if (gPlayProperties.sleepAfterPlaylist) {
+					System_RequestSleep();
 				}
-			}
-
-			if (!strncmp("http", gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 4)) {
-				gPlayProperties.isWebstream = true;
-			} else {
-				gPlayProperties.isWebstream = false;
-			}
-			gPlayProperties.currentRelPos = 0;
-			audioReturnCode = false;
-
-			if (gPlayProperties.playMode == WEBSTREAM || (gPlayProperties.playMode == LOCAL_M3U && gPlayProperties.isWebstream)) { // Webstream
-				audioReturnCode = audio->connecttohost(gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
-				gPlayProperties.playlistFinished = false;
-				gTriedToConnectToHost = true;
-			} else if (gPlayProperties.playMode != WEBSTREAM && !gPlayProperties.isWebstream) {
-				// Files from SD
-				if (!gFSystem.exists(gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber))) { // Check first if file/folder exists
-					Log_Printf(LOGLEVEL_ERROR, dirOrFileDoesNotExist, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
-					gPlayProperties.trackFinished = true;
-					continue;
-				} else {
-					audioReturnCode = audio->connecttoFS(gFSystem, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
-					// consider track as finished, when audio lib call was not successful
+				return;
+			} else { // Check if sleep after current track/playlist was requested
+				if (gPlayProperties.sleepAfterPlaylist || gPlayProperties.sleepAfterCurrentTrack) {
+					gPlayProperties.playlistFinished = true;
+					gPlayProperties.playMode = NO_PLAYLIST;
+					System_RequestSleep();
+					return;
+				} // Repeat playlist; set current track number back to 0
+				Log_Println(repeatPlaylistDueToPlaymode, LOGLEVEL_NOTICE);
+				gPlayProperties.currentTrackNumber = 0;
+				if (gPlayProperties.saveLastPlayPosition) {
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(0), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
 				}
 			}
+		}
 
-			if (!audioReturnCode) {
-				System_IndicateError();
+		if (!strncmp("http", gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 4)) {
+			gPlayProperties.isWebstream = true;
+		} else {
+			gPlayProperties.isWebstream = false;
+		}
+		gPlayProperties.currentRelPos = 0;
+		audioReturnCode = false;
+
+		if (gPlayProperties.playMode == WEBSTREAM || (gPlayProperties.playMode == LOCAL_M3U && gPlayProperties.isWebstream)) { // Webstream
+			audioReturnCode = audio->connecttohost(gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
+			gPlayProperties.playlistFinished = false;
+			gTriedToConnectToHost = true;
+		} else if (gPlayProperties.playMode != WEBSTREAM && !gPlayProperties.isWebstream) {
+			// Files from SD
+			if (!gFSystem.exists(gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber))) { // Check first if file/folder exists
+				Log_Printf(LOGLEVEL_ERROR, dirOrFileDoesNotExist, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
 				gPlayProperties.trackFinished = true;
-				continue;
+				return;
 			} else {
-				if (gPlayProperties.currentTrackNumber) {
-					Led_Indicate(LedIndicatorType::PlaylistProgress);
-				}
-				if (gPlayProperties.startAtFilePos > 0) {
-					audio->setFilePos(gPlayProperties.startAtFilePos);
-					Log_Printf(LOGLEVEL_NOTICE, trackStartatPos, gPlayProperties.startAtFilePos);
-					gPlayProperties.startAtFilePos = 0;
-				}
-				const char *title = gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber);
-				if (gPlayProperties.isWebstream) {
-					title = "Webradio";
-				}
-				if (gPlayProperties.playlist->size() > 1) {
-					Audio_setTitle("(%u/%u): %s", gPlayProperties.currentTrackNumber + 1, gPlayProperties.playlist->size(), title);
-				} else {
-					Audio_setTitle("%s", title);
-				}
-				AudioPlayer_ClearCover();
-				Log_Printf(LOGLEVEL_NOTICE, currentlyPlaying, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), (gPlayProperties.currentTrackNumber + 1), gPlayProperties.playlist->size());
-				gPlayProperties.playlistFinished = false;
+				audioReturnCode = audio->connecttoFS(gFSystem, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber));
+				// consider track as finished, when audio lib call was not successful
 			}
 		}
 
-		// Handle seekmodes
-		if (gPlayProperties.seekmode != SEEK_NORMAL) {
-			if (gPlayProperties.seekmode == SEEK_FORWARDS) {
-				if (audio->setTimeOffset(jumpOffset)) {
-					Log_Printf(LOGLEVEL_NOTICE, secondsJumpForward, jumpOffset);
-				} else {
-					System_IndicateError();
-				}
-			} else if (gPlayProperties.seekmode == SEEK_BACKWARDS) {
-				if (audio->setTimeOffset(-(jumpOffset))) {
-					Log_Printf(LOGLEVEL_NOTICE, secondsJumpBackward, jumpOffset);
-				} else {
-					System_IndicateError();
-				}
-			} else if ((gPlayProperties.seekmode == SEEK_POS_PERCENT) && (gPlayProperties.currentRelPos > 0) && (gPlayProperties.currentRelPos < 100)) {
-				uint32_t newFilePos = uint32_t((double) audio->getAudioDataStartPos() * (1 - gPlayProperties.currentRelPos / 100) + (gPlayProperties.currentRelPos / 100) * audio->getFileSize());
-				if (audio->setFilePos(newFilePos)) {
-					Log_Printf(LOGLEVEL_NOTICE, JumpToPosition, newFilePos, audio->getFileSize());
-				} else {
-					System_IndicateError();
-				}
+		if (!audioReturnCode) {
+			System_IndicateError();
+			gPlayProperties.trackFinished = true;
+			return;
+		} else {
+			if (gPlayProperties.currentTrackNumber) {
+				Led_Indicate(LedIndicatorType::PlaylistProgress);
 			}
-			gPlayProperties.seekmode = SEEK_NORMAL;
-		}
-
-		// Handle IP-announcement
-		if (gPlayProperties.tellMode == TTS_IP_ADDRESS) {
-			gPlayProperties.tellMode = TTS_NONE;
-			String ipText = Wlan_GetIpAddress();
-			bool speechOk;
-			// make IP as text (replace thousand separator with locale text)
-			switch (LANGUAGE) {
-				case DE:
-					ipText.replace(".", "Punkt");
-					speechOk = audio->connecttospeech(ipText.c_str(), "de");
-					break;
-				case FR:
-					ipText.replace(".", "point");
-					speechOk = audio->connecttospeech(ipText.c_str(), "fr");
-					break;
-				default:
-					ipText.replace(".", "point");
-					speechOk = audio->connecttospeech(ipText.c_str(), "en");
+			if (gPlayProperties.startAtFilePos > 0) {
+				audio->setFilePos(gPlayProperties.startAtFilePos);
+				Log_Printf(LOGLEVEL_NOTICE, trackStartatPos, gPlayProperties.startAtFilePos);
+				gPlayProperties.startAtFilePos = 0;
 			}
-			if (!speechOk) {
-				System_IndicateError();
+			const char *title = gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber);
+			if (gPlayProperties.isWebstream) {
+				title = "Webradio";
+			}
+			if (gPlayProperties.playlist->size() > 1) {
+				Audio_setTitle("(%u/%u): %s", gPlayProperties.currentTrackNumber + 1, gPlayProperties.playlist->size(), title);
+			} else {
+				Audio_setTitle("%s", title);
 			}
+			AudioPlayer_ClearCover();
+			Log_Printf(LOGLEVEL_NOTICE, currentlyPlaying, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), (gPlayProperties.currentTrackNumber + 1), gPlayProperties.playlist->size());
+			gPlayProperties.playlistFinished = false;
 		}
+	}
 
-		// Handle time-announcement
-		if (gPlayProperties.tellMode == TTS_CURRENT_TIME) {
-			gPlayProperties.tellMode = TTS_NONE;
-			struct tm timeinfo;
-			getLocalTime(&timeinfo);
-			static char timeStringBuff[64];
-			bool speechOk;
-#if (LANGUAGE == DE)
-			snprintf(timeStringBuff, sizeof(timeStringBuff), "Es ist %02d:%02d Uhr", timeinfo.tm_hour, timeinfo.tm_min);
-			speechOk = audio->connecttospeech(timeStringBuff, "de");
-#else
-			if (timeinfo.tm_hour > 12) {
-				snprintf(timeStringBuff, sizeof(timeStringBuff), "It is %02d:%02d PM", timeinfo.tm_hour - 12, timeinfo.tm_min);
+	// Handle seekmodes
+	if (gPlayProperties.seekmode != SEEK_NORMAL) {
+		if (gPlayProperties.seekmode == SEEK_FORWARDS) {
+			if (audio->setTimeOffset(jumpOffset)) {
+				Log_Printf(LOGLEVEL_NOTICE, secondsJumpForward, jumpOffset);
 			} else {
-				snprintf(timeStringBuff, sizeof(timeStringBuff), "It is %02d:%02d AM", timeinfo.tm_hour, timeinfo.tm_min);
+				System_IndicateError();
 			}
-			speechOk = audio->connecttospeech(timeStringBuff, "en");
-#endif
-			if (!speechOk) {
+		} else if (gPlayProperties.seekmode == SEEK_BACKWARDS) {
+			if (audio->setTimeOffset(-(jumpOffset))) {
+				Log_Printf(LOGLEVEL_NOTICE, secondsJumpBackward, jumpOffset);
+			} else {
 				System_IndicateError();
 			}
-		}
-
-		// If speech is over, go back to predefined state
-		if (!gPlayProperties.currentSpeechActive && gPlayProperties.lastSpeechActive) {
-			gPlayProperties.lastSpeechActive = false;
-			if (gPlayProperties.playMode != NO_PLAYLIST) {
-				xQueueSend(gRfidCardQueue, gPlayProperties.playRfidTag, 0); // Re-inject previous RFID-ID in order to continue playback
+		} else if ((gPlayProperties.seekmode == SEEK_POS_PERCENT) && (gPlayProperties.currentRelPos > 0) && (gPlayProperties.currentRelPos < 100)) {
+			uint32_t newFilePos = uint32_t((double) audio->getAudioDataStartPos() * (1 - gPlayProperties.currentRelPos / 100) + (gPlayProperties.currentRelPos / 100) * audio->getFileSize());
+			if (audio->setFilePos(newFilePos)) {
+				Log_Printf(LOGLEVEL_NOTICE, JumpToPosition, newFilePos, audio->getFileSize());
+			} else {
+				System_IndicateError();
 			}
 		}
+		gPlayProperties.seekmode = SEEK_NORMAL;
+	}
 
-		// Handle if mono/stereo should be changed (e.g. if plugging headphones)
-		if (gPlayProperties.newPlayMono != gPlayProperties.currentPlayMono) {
-			gPlayProperties.currentPlayMono = gPlayProperties.newPlayMono;
-			audio->forceMono(gPlayProperties.currentPlayMono);
-			if (gPlayProperties.currentPlayMono) {
-				Log_Println(newPlayModeMono, LOGLEVEL_NOTICE);
-			} else {
-				Log_Println(newPlayModeStereo, LOGLEVEL_NOTICE);
-			}
-			audio->setTone(gPlayProperties.gainLowPass, gPlayProperties.gainBandPass, gPlayProperties.gainHighPass);
+	// Handle IP-announcement
+	if (gPlayProperties.tellMode == TTS_IP_ADDRESS) {
+		gPlayProperties.tellMode = TTS_NONE;
+		String ipText = Wlan_GetIpAddress();
+		bool speechOk;
+		// make IP as text (replace thousand separator with locale text)
+		switch (LANGUAGE) {
+			case DE:
+				ipText.replace(".", "Punkt");
+				speechOk = audio->connecttospeech(ipText.c_str(), "de");
+				break;
+			case FR:
+				ipText.replace(".", "point");
+				speechOk = audio->connecttospeech(ipText.c_str(), "fr");
+				break;
+			default:
+				ipText.replace(".", "point");
+				speechOk = audio->connecttospeech(ipText.c_str(), "en");
+		}
+		if (!speechOk) {
+			System_IndicateError();
 		}
+	}
 
-		audio->loop();
-		if (gPlayProperties.playlistFinished || gPlayProperties.pausePlay) {
-			if (!gPlayProperties.currentSpeechActive) {
-				vTaskDelay(portTICK_PERIOD_MS * 10); // Waste some time if playlist is not active
-			}
+	// Handle time-announcement
+	if (gPlayProperties.tellMode == TTS_CURRENT_TIME) {
+		gPlayProperties.tellMode = TTS_NONE;
+		struct tm timeinfo;
+		getLocalTime(&timeinfo);
+		static char timeStringBuff[64];
+		bool speechOk;
+#if (LANGUAGE == DE)
+		snprintf(timeStringBuff, sizeof(timeStringBuff), "Es ist %02d:%02d Uhr", timeinfo.tm_hour, timeinfo.tm_min);
+		speechOk = audio->connecttospeech(timeStringBuff, "de");
+#else
+		if (timeinfo.tm_hour > 12) {
+			snprintf(timeStringBuff, sizeof(timeStringBuff), "It is %02d:%02d PM", timeinfo.tm_hour - 12, timeinfo.tm_min);
 		} else {
-			System_UpdateActivityTimer(); // Refresh if playlist is active so uC will not fall asleep due to reaching inactivity-time
+			snprintf(timeStringBuff, sizeof(timeStringBuff), "It is %02d:%02d AM", timeinfo.tm_hour, timeinfo.tm_min);
+		}
+		speechOk = audio->connecttospeech(timeStringBuff, "en");
+#endif
+		if (!speechOk) {
+			System_IndicateError();
 		}
+	}
 
-		if (audio->isRunning()) {
-			playbackTimeoutStart = millis();
+	// If speech is over, go back to predefined state
+	if (!gPlayProperties.currentSpeechActive && gPlayProperties.lastSpeechActive) {
+		gPlayProperties.lastSpeechActive = false;
+		if (gPlayProperties.playMode != NO_PLAYLIST) {
+			xQueueSend(gRfidCardQueue, gPlayProperties.playRfidTag, 0); // Re-inject previous RFID-ID in order to continue playback
 		}
+	}
 
-		// If error occured: move to the next track in the playlist
-		const bool activeMode = (gPlayProperties.playMode != NO_PLAYLIST && gPlayProperties.playMode != BUSY);
-		const bool noAudio = (!audio->isRunning() && !gPlayProperties.pausePlay);
-		const bool timeout = ((millis() - playbackTimeoutStart) > playbackTimeout);
-		if (activeMode) {
-			// we check for timeout
-			if (noAudio && timeout) {
-				// Audio playback timed out, move on to the next
-				System_IndicateError();
-				gPlayProperties.trackFinished = true;
-				playbackTimeoutStart = millis();
-			}
+	// Handle if mono/stereo should be changed (e.g. if plugging headphones)
+	if (gPlayProperties.newPlayMono != gPlayProperties.currentPlayMono) {
+		gPlayProperties.currentPlayMono = gPlayProperties.newPlayMono;
+		audio->forceMono(gPlayProperties.currentPlayMono);
+		if (gPlayProperties.currentPlayMono) {
+			Log_Println(newPlayModeMono, LOGLEVEL_NOTICE);
 		} else {
-			// we are idle, update timeout so that we do not get a spurious error when launching into a playlist
+			Log_Println(newPlayModeStereo, LOGLEVEL_NOTICE);
+		}
+		audio->setTone(gPlayProperties.gainLowPass, gPlayProperties.gainBandPass, gPlayProperties.gainHighPass);
+	}
+
+	audio->loop(); // Call audio-loop function to process incoming data
+
+	if (gPlayProperties.playlistFinished || gPlayProperties.pausePlay) {
+	} else {
+		System_UpdateActivityTimer(); // Refresh if playlist is active so uC will not fall asleep due to reaching inactivity-time
+	}
+
+	if (audio->isRunning()) {
+		playbackTimeoutStart = millis();
+	}
+
+	// If error occured: move to the next track in the playlist
+	const bool activeMode = (gPlayProperties.playMode != NO_PLAYLIST && gPlayProperties.playMode != BUSY);
+	const bool noAudio = (!audio->isRunning() && !gPlayProperties.pausePlay);
+	const bool timeout = ((millis() - playbackTimeoutStart) > playbackTimeout);
+	if (activeMode) {
+		// we check for timeout
+		if (noAudio && timeout) {
+			// Audio playback timed out, move on to the next
+			System_IndicateError();
+			gPlayProperties.trackFinished = true;
 			playbackTimeoutStart = millis();
 		}
-		vTaskDelay(portTICK_PERIOD_MS * 1);
-
-		if (gPlayProperties.dontAcceptRfidTwice) {
-			static uint8_t resetOnNextIdle = false;
-			if (gPlayProperties.playlistFinished || gPlayProperties.playMode == NO_PLAYLIST) {
-				if (resetOnNextIdle) {
-					Rfid_ResetOldRfid();
-					resetOnNextIdle = false;
-				}
-			} else {
-				resetOnNextIdle = true;
+	} else {
+		// we are idle, update timeout so that we do not get a spurious error when launching into a playlist
+		playbackTimeoutStart = millis();
+	}
+
+	if (gPlayProperties.dontAcceptRfidTwice) {
+		static uint8_t resetOnNextIdle = false;
+		if (gPlayProperties.playlistFinished || gPlayProperties.playMode == NO_PLAYLIST) {
+			if (resetOnNextIdle) {
+				Rfid_ResetOldRfid();
+				resetOnNextIdle = false;
 			}
+		} else {
+			resetOnNextIdle = true;
 		}
 	}
-	vTaskDelete(NULL);
 }
 
 // Returns current repeat-mode (mix of repeat current track and current playlist)
@@ -947,7 +925,7 @@ uint8_t AudioPlayer_GetRepeatMode(void) {
 
 // Adds new volume-entry to volume-queue
 // If volume is changed via webgui or MQTT, it's necessary to re-adjust current value of rotary-encoder.
-void AudioPlayer_VolumeToQueueSender(const int32_t _newVolume, bool reAdjustRotary) {
+void AudioPlayer_SetVolume(const int32_t _newVolume, bool reAdjustRotary) {
 	uint32_t _volume;
 	int32_t _volumeBuf = AudioPlayer_GetCurrentVolume();
 
@@ -964,15 +942,20 @@ void AudioPlayer_VolumeToQueueSender(const int32_t _newVolume, bool reAdjustRota
 		if (reAdjustRotary) {
 			RotaryEncoder_Readjust();
 		}
-		xQueueSend(gVolumeQueue, &_volume, 0);
+
+		Log_Printf(LOGLEVEL_INFO, newLoudnessReceivedQueue, _volume);
+		audio->setVolume(_volume, gPrefsSettings.getUChar("volumeCurve", 0));
+		Web_SendWebsocketData(0, WebsocketCodeType::Volume);
+#ifdef MQTT_ENABLE
+		publishMqtt(topicLoudnessState, static_cast<uint32_t>(_volume), false);
+#endif
 		AudioPlayer_PauseOnMinVolume(_volumeBuf, _newVolume);
 	}
 }
 
 // Adds equalizer settings low, band and high pass and readjusts the equalizer
-void AudioPlayer_EqualizerToQueueSender(const int8_t gainLowPass, const int8_t gainBandPass, const int8_t gainHighPass) {
-	int8_t _equalizer[3] = {gainLowPass, gainBandPass, gainHighPass};
-	xQueueSend(gEqualizerQueue, &_equalizer, 0);
+void AudioPlayer_SetEqualizer(const int8_t gainLowPass, const int8_t gainBandPass, const int8_t gainHighPass) {
+	audio->setTone(gainLowPass, gainBandPass, gainHighPass);
 }
 
 // Pauses playback if playback is active and volume is changes from minVolume+1 to minVolume (usually 0)
@@ -997,10 +980,10 @@ void AudioPlayer_PauseOnMinVolume(const uint8_t oldVolume, const uint8_t newVolu
 
 // Receives de-serialized RFID-data (from NVS) and dispatches playlists for the given
 // playmode to the track-queue.
-void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _lastPlayPos, const uint32_t _playMode, const uint16_t _trackLastPlayed) {
+void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPos, const uint32_t _playMode, const uint16_t _trackLastPlayed) {
 	// Make sure last playposition for audiobook is saved when new RFID-tag is applied
 	if (gPlayProperties.SavePlayPosRfidChange && !gPlayProperties.pausePlay && (gPlayProperties.playMode == AUDIOBOOK || gPlayProperties.playMode == AUDIOBOOK_LOOP)) {
-		AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
+		AudioPlayer_SetTrackControl(PAUSEPLAY);
 		while (!gPlayProperties.pausePlay) { // Make sure to wait until playback is paused in order to be sure that playposition saved in NVS
 			vTaskDelay(portTICK_PERIOD_MS * 100u);
 		}
@@ -1032,7 +1015,7 @@ void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _l
 		Log_Println(errorOccured, LOGLEVEL_ERROR);
 		System_IndicateError();
 		if (gPlayProperties.playMode != NO_PLAYLIST) {
-			AudioPlayer_TrackControlToQueueSender(STOP);
+			AudioPlayer_SetTrackControl(STOP);
 		}
 		return;
 	}
@@ -1043,7 +1026,7 @@ void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _l
 		Log_Println(noMp3FilesInDir, LOGLEVEL_NOTICE);
 		System_IndicateError();
 		if (!gPlayProperties.pausePlay) {
-			AudioPlayer_TrackControlToQueueSender(STOP);
+			AudioPlayer_SetTrackControl(STOP);
 			while (!gPlayProperties.pausePlay) {
 				vTaskDelay(portTICK_PERIOD_MS * 10u);
 			}
@@ -1159,7 +1142,8 @@ void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _l
 
 	if (!error) {
 		gPlayProperties.playMode = _playMode;
-		xQueueSend(gTrackQueue, &list, 0);
+		newPlayListAvailable = true;
+		newPlayList = list;
 		return;
 	}
 
@@ -1230,8 +1214,8 @@ std::optional<Playlist *> AudioPlayer_ReturnPlaylistFromWebstream(const char *_w
 }
 
 // Adds new control-command to control-queue
-void AudioPlayer_TrackControlToQueueSender(const uint8_t trackCommand) {
-	xQueueSend(gTrackControlQueue, &trackCommand, 0);
+void AudioPlayer_SetTrackControl(const uint8_t new_trackCommand) {
+	trackCommand = new_trackCommand;
 }
 
 // Knuth-Fisher-Yates-algorithm to randomize playlist
diff --git a/src/AudioPlayer.h b/src/AudioPlayer.h
index 7f0b0e24..045c7190 100644
--- a/src/AudioPlayer.h
+++ b/src/AudioPlayer.h
@@ -53,14 +53,18 @@ typedef struct { // Bit field
 
 extern playProps gPlayProperties;
 
+void Audio_TaskPause(void);
+void Audio_TaskResume(void);
+
 void AudioPlayer_Init(void);
 void AudioPlayer_Exit(void);
 void AudioPlayer_Cyclic(void);
+void AudioPlayer_Loop(void);
 uint8_t AudioPlayer_GetRepeatMode(void);
-void AudioPlayer_VolumeToQueueSender(const int32_t _newVolume, bool reAdjustRotary);
-void AudioPlayer_EqualizerToQueueSender(const int8_t gainLowPass, const int8_t gainBandPass, const int8_t gainHighPass);
-void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _lastPlayPos, const uint32_t _playMode, const uint16_t _trackLastPlayed);
-void AudioPlayer_TrackControlToQueueSender(const uint8_t trackCommand);
+void AudioPlayer_SetVolume(const int32_t _newVolume, bool reAdjustRotary);
+void AudioPlayer_SetEqualizer(const int8_t gainLowPass, const int8_t gainBandPass, const int8_t gainHighPass);
+void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPos, const uint32_t _playMode, const uint16_t _trackLastPlayed);
+void AudioPlayer_SetTrackControl(const uint8_t trackCommand);
 void AudioPlayer_PauseOnMinVolume(const uint8_t oldVolume, const uint8_t newVolume);
 
 playlistSortMode AudioPlayer_GetPlaylistSortMode(void);
diff --git a/src/Bluetooth.cpp b/src/Bluetooth.cpp
index 72a87a52..083df4ad 100644
--- a/src/Bluetooth.cpp
+++ b/src/Bluetooth.cpp
@@ -11,10 +11,10 @@
 #include <AudioPlayer.h>
 
 #ifdef BLUETOOTH_ENABLE
-	#include "esp_bt.h"
 	#include "BluetoothA2DPCommon.h"
 	#include "BluetoothA2DPSink.h"
 	#include "BluetoothA2DPSource.h"
+	#include "esp_bt.h"
 	#if (defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 3))
 		#include "ESP_I2S.h"
 I2SClass i2s;
@@ -77,17 +77,17 @@ void button_handler(uint8_t id, bool isReleased) {
 			case 68:
 				// 70=pause, 68=resume
 				Log_Printf(LOGLEVEL_DEBUG, "Bluetooth button id %u (pause/resume) is released.", id);
-				AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
+				AudioPlayer_SetTrackControl(PAUSEPLAY);
 				break;
 			case 75:
 				// 75=next
 				Log_Printf(LOGLEVEL_DEBUG, "Bluetooth button id %u (next track) is released.", id);
-				AudioPlayer_TrackControlToQueueSender(NEXTTRACK);
+				AudioPlayer_SetTrackControl(NEXTTRACK);
 				break;
 			case 76:
 				// 76=previous
 				Log_Printf(LOGLEVEL_DEBUG, "Bluetooth button id %u (previous track) is released.", id);
-				AudioPlayer_TrackControlToQueueSender(PREVIOUSTRACK);
+				AudioPlayer_SetTrackControl(PREVIOUSTRACK);
 				break;
 			default:
 				// unknown/unsupported button id
@@ -201,7 +201,7 @@ void Bluetooth_VolumeChanged(int _newVolume) {
 	_volume = map(_newVolume, 0, 0x7F, BLUETOOTHPLAYER_VOLUME_MIN, BLUETOOTHPLAYER_VOLUME_MAX);
 	if (AudioPlayer_GetCurrentVolume() != _volume) {
 		Log_Printf(LOGLEVEL_INFO, "Bluetooth => volume changed:  %d !", _volume);
-		AudioPlayer_VolumeToQueueSender(_volume, true);
+		AudioPlayer_SetVolume(_volume, true);
 	}
 #endif
 }
@@ -227,7 +227,7 @@ void Bluetooth_Init(void) {
 			.bck_io_num = I2S_BCLK,
 			.ws_io_num = I2S_LRC,
 			.data_out_num = I2S_DOUT,
-			.data_in_num = I2S_PIN_NO_CHANGE
+			.data_in_num = I2S_PIN_NO_CHANGE,
 		};
 		a2dp_sink->set_pin_config(pin_config);
 	#endif
diff --git a/src/Cmd.cpp b/src/Cmd.cpp
index b7e46b34..6d11a194 100644
--- a/src/Cmd.cpp
+++ b/src/Cmd.cpp
@@ -187,6 +187,11 @@ void Cmd_Action(const uint16_t mod) {
 			break;
 		}
 
+		case CMD_TOGGLE_AMBIENT_LIGHT: {
+			Led_ToggleAmbientLight();
+			break;
+		}
+
 		case CMD_TOGGLE_WIFI_STATUS: {
 			System_SetOperationMode(OPMODE_NORMAL); // escape from BT-mode, WiFi cannot coexist with BT and can cause a crash
 			Wlan_ToggleEnable();
@@ -276,7 +281,7 @@ void Cmd_Action(const uint16_t mod) {
 
 		case CMD_PLAYPAUSE: {
 			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
-				AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
+				AudioPlayer_SetTrackControl(PAUSEPLAY);
 			} else {
 				Bluetooth_PlayPauseTrack();
 			}
@@ -285,7 +290,7 @@ void Cmd_Action(const uint16_t mod) {
 
 		case CMD_PREVTRACK: {
 			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
-				AudioPlayer_TrackControlToQueueSender(PREVIOUSTRACK);
+				AudioPlayer_SetTrackControl(PREVIOUSTRACK);
 			} else {
 				Bluetooth_PreviousTrack();
 			}
@@ -294,7 +299,7 @@ void Cmd_Action(const uint16_t mod) {
 
 		case CMD_NEXTTRACK: {
 			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
-				AudioPlayer_TrackControlToQueueSender(NEXTTRACK);
+				AudioPlayer_SetTrackControl(NEXTTRACK);
 			} else {
 				Bluetooth_NextTrack();
 			}
@@ -302,23 +307,23 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_FIRSTTRACK: {
-			AudioPlayer_TrackControlToQueueSender(FIRSTTRACK);
+			AudioPlayer_SetTrackControl(FIRSTTRACK);
 			break;
 		}
 
 		case CMD_LASTTRACK: {
-			AudioPlayer_TrackControlToQueueSender(LASTTRACK);
+			AudioPlayer_SetTrackControl(LASTTRACK);
 			break;
 		}
 
 		case CMD_VOLUMEINIT: {
-			AudioPlayer_VolumeToQueueSender(AudioPlayer_GetInitVolume(), true);
+			AudioPlayer_SetVolume(AudioPlayer_GetInitVolume(), true);
 			break;
 		}
 
 		case CMD_VOLUMEUP: {
 			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
-				AudioPlayer_VolumeToQueueSender(AudioPlayer_GetCurrentVolume() + 1, true);
+				AudioPlayer_SetVolume(AudioPlayer_GetCurrentVolume() + 1, true);
 			} else {
 				Bluetooth_SetVolume(AudioPlayer_GetCurrentVolume() + 1, true);
 			}
@@ -327,7 +332,7 @@ void Cmd_Action(const uint16_t mod) {
 
 		case CMD_VOLUMEDOWN: {
 			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
-				AudioPlayer_VolumeToQueueSender(AudioPlayer_GetCurrentVolume() - 1, true);
+				AudioPlayer_SetVolume(AudioPlayer_GetCurrentVolume() - 1, true);
 			} else {
 				Bluetooth_SetVolume(AudioPlayer_GetCurrentVolume() - 1, true);
 			}
@@ -364,7 +369,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_STOP: {
-			AudioPlayer_TrackControlToQueueSender(STOP);
+			AudioPlayer_SetTrackControl(STOP);
 			break;
 		}
 
diff --git a/src/Led.cpp b/src/Led.cpp
index d71770a1..33e27532 100644
--- a/src/Led.cpp
+++ b/src/Led.cpp
@@ -18,8 +18,6 @@
 #include <esp_task_wdt.h>
 
 #ifdef NEOPIXEL_ENABLE
-	#include <FastLED.h>
-
 	#define LED_INDICATOR_SET(indicator)	((Led_Indicators) |= (1u << ((uint8_t) indicator)))
 	#define LED_INDICATOR_IS_SET(indicator) (((Led_Indicators) & (1u << ((uint8_t) indicator))) > 0u)
 	#define LED_INDICATOR_CLEAR(indicator)	((Led_Indicators) &= ~(1u << ((uint8_t) indicator)))
@@ -83,6 +81,19 @@ bool Led_LoadSettings(LedSettings &settings) {
 		Log_Println(wroteNmBrightnessToNvs, LOGLEVEL_ERROR);
 	}
 
+	// Get Atmo LED-brightness from NVS
+	uint8_t nvsALedBrightness = gPrefsSettings.getUChar("aLedBrightness", 255);
+	if (nvsALedBrightness != 255) {
+		settings.Led_AmbientBrightness = nvsALedBrightness;
+		if (settings.Led_AmbientLight) {
+			settings.Led_Brightness = nvsALedBrightness;
+		}
+		Log_Printf(LOGLEVEL_INFO, "restored ambient brightnes : %d", nvsALedBrightness); // TODO-> other message
+	} else {
+		gPrefsSettings.putUChar("aLedBrightness", settings.Led_AmbientBrightness);
+		Log_Println("wrote settings of ambient to nvs", LOGLEVEL_ERROR); // TODO-> other message
+	}
+
 	// Get the number of indicator LEDs from NVS
 	settings.numIndicatorLeds = gPrefsSettings.getUChar("numIndicator", NUM_INDICATOR_LEDS);
 
@@ -102,9 +113,12 @@ bool Led_LoadSettings(LedSettings &settings) {
 	// get dimmableStates from NVS
 	settings.dimmableStates = gPrefsSettings.getUChar("dimStates", DIMMABLE_STATES);
 
-	// get hui start/end from NVS
+	// get hue start/end from NVS
 	settings.progressHueStart = gPrefsSettings.getShort("hueStart", PROGRESS_HUE_START);
 	settings.progressHueEnd = gPrefsSettings.getShort("hueEnd", PROGRESS_HUE_END);
+	// get atmo light from NVS
+	settings.atmoHue = gPrefsSettings.getShort("hueAtmo", PROGRESS_HUE_START);
+	settings.atmoSaturation = gPrefsSettings.getShort("satAtmo", PROGRESS_HUE_END);
 
 	// get reverse rotation from NVS
 	#ifdef NEOPIXEL_REVERSE_ROTATION
@@ -154,11 +168,11 @@ void Led_Init(void) {
 	xTaskCreatePinnedToCore(
 		Led_Task, /* Function to implement the task */
 		"Led_Task", /* Name of the task */
-		2048, /* Stack size in words */
+		3072, /* Stack size in words */
 		NULL, /* Task input parameter */
 		1, /* Priority of the task */
 		&Led_TaskHandle, /* Task handle. */
-		1 /* Core where the task should run */
+		0 /* Core where the task should run */
 	);
 #endif
 }
@@ -266,6 +280,40 @@ void Led_ToggleNightmode() {
 #endif
 }
 
+void Led_SetAmbientLight(bool enabled) {
+#ifdef NEOPIXEL_ENABLE
+	if (gLedSettings.Led_AmbientLight == enabled) {
+		// we don't need to do anything
+		return;
+	}
+
+	if (enabled) {
+		gLedSettings.Led_AmbientLight = true;
+		Led_savedBrightness = gLedSettings.Led_Brightness;
+		Led_SetBrightness(gLedSettings.Led_AmbientBrightness);
+		gPrefsSettings.putBool("atmoActive", true);
+	} else {
+		gLedSettings.Led_AmbientLight = false;
+		Led_SetBrightness(Led_savedBrightness);
+		gPrefsSettings.putBool("atmoActive", false);
+	}
+#endif
+}
+
+bool Led_GetAmbientLight() {
+#ifdef NEOPIXEL_ENABLE
+	return gLedSettings.Led_AmbientLight;
+#else
+	return false;
+#endif
+}
+
+void Led_ToggleAmbientLight() {
+#ifdef NEOPIXEL_ENABLE
+	Led_SetAmbientLight(!gLedSettings.Led_AmbientLight);
+#endif
+}
+
 // Calculates physical address for a virtual LED address. This handles reversing the rotation direction of the ring and shifting the starting LED
 #ifdef NEOPIXEL_ENABLE
 uint8_t Led_Address(uint8_t number) {
@@ -359,6 +407,7 @@ static void Led_Task(void *parameter) {
 	FastLED.addLeds<CHIPSET, LED_PIN, COLOR_ORDER>(leds, numIndicatorLeds + numControlLeds).setCorrection(TypicalSMD5050);
 	FastLED.setBrightness(gLedSettings.Led_Brightness);
 	FastLED.setDither(DISABLE_DITHER);
+	FastLED.setMaxRefreshRate(200); // limit LED refresh rate to 200Hz (less likely to cause flickering)
 
 	LedAnimationType activeAnimation = LedAnimationType::NoNewAnimation;
 	LedAnimationType nextAnimation = LedAnimationType::NoNewAnimation;
@@ -454,89 +503,108 @@ static void Led_Task(void *parameter) {
 			lastLedBrightness = gLedSettings.Led_Brightness;
 		}
 
-		// when there is no delay anymore we have to animate something
-		if (animationTimer <= 0) {
-			AnimationReturnType ret;
-			// animate the current animation
-			switch (activeAnimation) {
-				case LedAnimationType::Boot:
-					ret = Animation_Boot(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Shutdown:
-					ret = Animation_Shutdown(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Error:
-					ret = Animation_Error(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Ok:
-					ret = Animation_Ok(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Volume:
-					ret = Animation_Volume(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::VoltageWarning:
-					ret = Animation_VoltageWarning(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::BatteryMeasurement:
-					ret = Animation_BatteryMeasurement(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Rewind:
-					ret = Animation_Rewind(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Playlist:
-					ret = Animation_PlaylistProgress(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Idle:
-					ret = Animation_Idle(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Busy:
-					ret = Animation_Busy(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Speech:
-					ret = Animation_Speech(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Pause:
-					ret = Animation_Pause(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Progress:
-					ret = Animation_Progress(startNewAnimation, *indicator);
-					break;
-
-				case LedAnimationType::Webstream:
-					ret = Animation_Webstream(startNewAnimation, *indicator);
-					break;
-
-				default:
-					*indicator = CRGB::Black;
+		if (!gLedSettings.Led_AmbientLight || (activeAnimation == LedAnimationType::Shutdown)) {
+
+			// when there is no delay anymore we have to animate something
+			if (animationTimer <= 0) {
+				AnimationReturnType ret;
+				// animate the current animation
+				switch (activeAnimation) {
+					case LedAnimationType::Boot:
+						ret = Animation_Boot(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Shutdown:
+						ret = Animation_Shutdown(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Error:
+						ret = Animation_Error(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Ok:
+						ret = Animation_Ok(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Volume:
+						ret = Animation_Volume(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::VoltageWarning:
+						ret = Animation_VoltageWarning(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::BatteryMeasurement:
+						ret = Animation_BatteryMeasurement(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Rewind:
+						ret = Animation_Rewind(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Playlist:
+						ret = Animation_PlaylistProgress(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Idle:
+						ret = Animation_Idle(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Busy:
+						ret = Animation_Busy(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Speech:
+						ret = Animation_Speech(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Pause:
+						ret = Animation_Pause(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Progress:
+						ret = Animation_Progress(startNewAnimation, *indicator);
+						break;
+
+					case LedAnimationType::Webstream:
+						ret = Animation_Webstream(startNewAnimation, *indicator);
+						break;
+
+					default:
+						*indicator = CRGB::Black;
+						FastLED.show();
+						ret.animationActive = false;
+						ret.animationDelay = 50;
+						break;
+				}
+				// apply delay and state from animation
+				animationActive = ret.animationActive;
+				animationTimer = ret.animationDelay;
+				if (ret.animationRefresh) {
 					FastLED.show();
-					ret.animationActive = false;
-					ret.animationDelay = 50;
-					break;
+				}
 			}
-			// apply delay and state from animation
-			animationActive = ret.animationActive;
-			animationTimer = ret.animationDelay;
-			if (ret.animationRefresh) {
-				FastLED.show();
+		} else {
+			// ambient light mode
+			*indicator = CRGB::Black;
+			if (gLedSettings.numIndicatorLeds == 1) {
+				leds[0].setHSV(gLedSettings.atmoHue, gLedSettings.atmoSaturation, 255);
+			} else {
+				for (uint8_t i = 0; i < gLedSettings.numIndicatorLeds; i++) {
+					leds[i].setHSV(gLedSettings.atmoHue, gLedSettings.atmoSaturation, 255);
+				}
 			}
+			FastLED.show();
+			activeAnimation = LedAnimationType::NoNewAnimation;
+			animationActive = false;
+			animationTimer = 0;
 		}
-
 		// get the time to wait and delay the task
 		if ((animationTimer > 0) && (animationTimer < taskDelay)) {
 			taskDelay = animationTimer;
+			if (taskDelay < 5) {
+				taskDelay = 5; // minimum delay
+			}
 		}
 		animationTimer -= taskDelay;
 		vTaskDelay(portTICK_PERIOD_MS * taskDelay);
diff --git a/src/Led.h b/src/Led.h
index 07b5dd04..56019097 100644
--- a/src/Led.h
+++ b/src/Led.h
@@ -62,6 +62,14 @@ struct AnimationReturnType {
 	#define LED_INITIAL_BRIGHTNESS		 16u
 	#define LED_INITIAL_NIGHT_BRIGHTNESS 2u
 
+// #define FASTLED_WS2812_T1 350 // original 250 - changed
+// #define FASTLED_WS2812_T2 700 // original 625 - changed
+// #define FASTLED_WS2812_T3 150 // original 375 - changed
+
+	#define FASTLED_ESP32_USE_CLOCKLESS_SPI 1
+
+	#include <FastLED.h>
+
 struct LedSettings {
 	uint8_t numIndicatorLeds = NUM_INDICATOR_LEDS;
 	uint8_t numControlLeds = NUM_CONTROL_LEDS;
@@ -70,14 +78,18 @@ struct LedSettings {
 	bool offsetLedPause = OFFSET_PAUSE_LEDS;
 	int16_t progressHueStart = PROGRESS_HUE_START;
 	int16_t progressHueEnd = PROGRESS_HUE_END;
+	int16_t atmoHue = ATMO_HUE;
+	int16_t atmoSaturation = ATMO_SATURATION;
 	uint8_t dimmableStates = DIMMABLE_STATES;
 	bool neopixelReverseRotation;
 	uint8_t ledOffset;
 	bool Led_Pause = false; // Used to pause Neopixel-signalisation (while NVS-writes as this leads to exceptions; don't know why)
 	bool Led_NightMode = false;
+	bool Led_AmbientLight = false;
 	uint8_t Led_InitialBrightness = LED_INITIAL_BRIGHTNESS;
 	uint8_t Led_Brightness = LED_INITIAL_BRIGHTNESS;
 	uint8_t Led_NightBrightness = LED_INITIAL_NIGHT_BRIGHTNESS;
+	uint8_t Led_AmbientBrightness = LED_INITIAL_BRIGHTNESS;
 };
 #endif
 
@@ -95,3 +107,6 @@ void Led_TaskResume(void);
 void Led_SetNightmode(bool enabled);
 bool Led_GetNightmode();
 void Led_ToggleNightmode();
+void Led_SetAmbientLight(bool enabled);
+bool Led_GetAmbientLight();
+void Led_ToggleAmbientLight();
diff --git a/src/Mqtt.cpp b/src/Mqtt.cpp
index 9e168558..ae0a0ed4 100644
--- a/src/Mqtt.cpp
+++ b/src/Mqtt.cpp
@@ -123,7 +123,7 @@ void Mqtt_Init() {
 
 		mqtt_client = esp_mqtt_client_init(&mqtt_cfg);
 		esp_mqtt_client_register_event(mqtt_client, esp_mqtt_event_id_t::MQTT_EVENT_ANY, mqtt_event_handler, NULL);
-		esp_mqtt_client_start(mqtt_client);
+
 		// don't start the task yet, wait for WiFi to be connected
 	}
 #else
@@ -133,7 +133,13 @@ void Mqtt_Init() {
 
 void Mqtt_OnWifiConnected(void) {
 #ifdef MQTT_ENABLE
-	esp_mqtt_client_reconnect(mqtt_client);
+	static bool mqtt_started = false;
+	if (!mqtt_started) {
+		esp_mqtt_client_start(mqtt_client);
+		mqtt_started = true;
+	} else {
+		esp_mqtt_client_reconnect(mqtt_client);
+	}
 #endif
 }
 
@@ -225,6 +231,9 @@ void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event
 			// Sleep-Timer-subscription
 			esp_mqtt_client_subscribe(client, topicSleepTimerCmnd, qos);
 
+			// Ambient-Light-subscription
+			esp_mqtt_client_subscribe(client, topicAmbientLightCmnd, qos);
+
 			// Next/previous/stop/play-track-subscription
 			esp_mqtt_client_subscribe(client, topicTrackControlCmnd, qos);
 
@@ -314,7 +323,7 @@ void Mqtt_ClientCallback(const char *topic_buf, uint32_t topic_length, const cha
 	// Loudness to change?
 	else if (topic_str == topicLoudnessCmnd) {
 		unsigned long vol = toNumber<uint32_t>(payload_str);
-		AudioPlayer_VolumeToQueueSender(vol, true);
+		AudioPlayer_SetVolume(vol, true);
 	}
 	// Modify sleep-timer?
 	else if (topic_str == topicSleepTimerCmnd) {
@@ -377,10 +386,18 @@ void Mqtt_ClientCallback(const char *topic_buf, uint32_t topic_length, const cha
 		gPlayProperties.sleepAfterPlaylist = false;
 		gPlayProperties.sleepAfterCurrentTrack = false;
 	}
+	// Ambient Light
+	else if (topic_str == topicAmbientLightCmnd) {
+		if (payload_str == "OFF" || payload_str == "0") {
+			Led_SetAmbientLight(false);
+		} else if (payload_str == "ON" || payload_str == "1") {
+			Led_SetAmbientLight(true);
+		}
+	}
 	// Track-control (pause/play, stop, first, last, next, previous)
 	else if (topic_str == topicTrackControlCmnd) {
 		uint8_t controlCommand = toNumber<uint8_t>(payload_str);
-		AudioPlayer_TrackControlToQueueSender(controlCommand);
+		AudioPlayer_SetTrackControl(controlCommand);
 	}
 
 	// Check if controls should be locked
diff --git a/src/Queues.cpp b/src/Queues.cpp
index 1be5c4e2..14352570 100644
--- a/src/Queues.cpp
+++ b/src/Queues.cpp
@@ -5,40 +5,17 @@
 #include "Playlist.h"
 #include "Rfid.h"
 
-QueueHandle_t gVolumeQueue;
-QueueHandle_t gTrackQueue;
-QueueHandle_t gTrackControlQueue;
 QueueHandle_t gRfidCardQueue;
-QueueHandle_t gEqualizerQueue;
 QueueHandle_t gLedQueue;
 
 void Queues_Init(void) {
 	// Create queues
-	gVolumeQueue = xQueueCreate(1, sizeof(int));
-	if (gVolumeQueue == NULL) {
-		Log_Printf(LOGLEVEL_ERROR, unableToCreateQueue, "Volume");
-	}
 
 	gRfidCardQueue = xQueueCreate(1, cardIdStringSize);
 	if (gRfidCardQueue == NULL) {
 		Log_Printf(LOGLEVEL_ERROR, unableToCreateQueue, "Rfid");
 	}
 
-	gTrackControlQueue = xQueueCreate(1, sizeof(uint8_t));
-	if (gTrackControlQueue == NULL) {
-		Log_Printf(LOGLEVEL_ERROR, unableToCreateQueue, "Track-control");
-	}
-
-	gTrackQueue = xQueueCreate(1, sizeof(Playlist *));
-	if (gTrackQueue == NULL) {
-		Log_Printf(LOGLEVEL_ERROR, unableToCreateQueue, "Playlist");
-	}
-
-	gEqualizerQueue = xQueueCreate(1, sizeof(int8_t[3]));
-	if (gEqualizerQueue == NULL) {
-		Log_Printf(LOGLEVEL_ERROR, unableToCreateQueue, "Equalizer");
-	}
-
 	gLedQueue = xQueueCreate(1, sizeof(uint8_t));
 	if (gLedQueue == NULL) {
 		Log_Printf(LOGLEVEL_ERROR, unableToCreateQueue, "Led");
diff --git a/src/Queues.h b/src/Queues.h
index 68565f43..c6597621 100644
--- a/src/Queues.h
+++ b/src/Queues.h
@@ -1,10 +1,6 @@
 #pragma once
 
-extern QueueHandle_t gVolumeQueue;
-extern QueueHandle_t gTrackQueue;
-extern QueueHandle_t gTrackControlQueue;
 extern QueueHandle_t gRfidCardQueue;
-extern QueueHandle_t gEqualizerQueue;
 extern QueueHandle_t gLedQueue;
 
 void Queues_Init(void);
diff --git a/src/RfidCommon.cpp b/src/RfidCommon.cpp
index d19861c3..6c7efbde 100644
--- a/src/RfidCommon.cpp
+++ b/src/RfidCommon.cpp
@@ -95,7 +95,7 @@ void Rfid_PreferenceLookupHandler(void) {
 				}
 	#endif
 
-				AudioPlayer_TrackQueueDispatcher(_file, _lastPlayPos, _playMode, _trackLastPlayed);
+				AudioPlayer_SetPlaylist(_file, _lastPlayPos, _playMode, _trackLastPlayed);
 			}
 		}
 	}
diff --git a/src/RfidMfrc522.cpp b/src/RfidMfrc522.cpp
index b62a57ec..bb7bfa04 100644
--- a/src/RfidMfrc522.cpp
+++ b/src/RfidMfrc522.cpp
@@ -59,7 +59,7 @@ void Rfid_Init(void) {
 		NULL, /* Task input parameter */
 		2 | portPRIVILEGE_BIT, /* Priority of the task */
 		&rfidTaskHandle, /* Task handle. */
-		1 /* Core where the task should run */
+		0 /* Core where the task should run */
 	);
 	#endif
 }
@@ -131,7 +131,7 @@ void Rfid_Task(void *parameter) {
 				} else {
 					// If pause-button was pressed while card was not applied, playback could be active. If so: don't pause when card is reapplied again as the desired functionality would be reversed in this case.
 					if (gPlayProperties.pausePlay && System_GetOperationMode() != OPMODE_BLUETOOTH_SINK) {
-						AudioPlayer_TrackControlToQueueSender(PAUSEPLAY); // ... play/pause instead (but not for BT)
+						AudioPlayer_SetTrackControl(PAUSEPLAY); // ... play/pause instead (but not for BT)
 					}
 				}
 				memcpy(lastValidcardId, mfrc522.uid.uidByte, cardIdSize);
@@ -170,7 +170,7 @@ void Rfid_Task(void *parameter) {
 
 				Log_Println(rfidTagRemoved, LOGLEVEL_NOTICE);
 				if (!gPlayProperties.pausePlay && System_GetOperationMode() != OPMODE_BLUETOOTH_SINK) {
-					AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
+					AudioPlayer_SetTrackControl(PAUSEPLAY);
 					Log_Println(rfidTagReapplied, LOGLEVEL_NOTICE);
 				}
 				mfrc522.PICC_HaltA();
diff --git a/src/RfidPn5180.cpp b/src/RfidPn5180.cpp
index 310527f7..5005fa1c 100644
--- a/src/RfidPn5180.cpp
+++ b/src/RfidPn5180.cpp
@@ -94,7 +94,7 @@ void Rfid_Init(void) {
 	xTaskCreatePinnedToCore(
 		Rfid_Task, /* Function to implement the task */
 		"rfid", /* Name of the task */
-		2176, /* Stack size in words */
+		3072, /* Stack size in words */
 		NULL, /* Task input parameter */
 		2 | portPRIVILEGE_BIT, /* Priority of the task */
 		&rfidTaskHandle, /* Task handle. */
@@ -225,7 +225,7 @@ void Rfid_Task(void *parameter) {
 
 		if (gPlayProperties.pauseIfRfidRemoved) {
 			if (!cardAppliedCurrentRun && cardAppliedLastRun && !gPlayProperties.pausePlay && System_GetOperationMode() != OPMODE_BLUETOOTH_SINK) { // Card removed => pause
-				AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
+				AudioPlayer_SetTrackControl(PAUSEPLAY);
 				Log_Println(rfidTagRemoved, LOGLEVEL_NOTICE);
 			}
 			cardAppliedLastRun = cardAppliedCurrentRun;
@@ -283,7 +283,7 @@ void Rfid_Task(void *parameter) {
 				} else {
 					// If pause-button was pressed while card was not applied, playback could be active. If so: don't pause when card is reapplied again as the desired functionality would be reversed in this case.
 					if (gPlayProperties.pausePlay && System_GetOperationMode() != OPMODE_BLUETOOTH_SINK) {
-						AudioPlayer_TrackControlToQueueSender(PAUSEPLAY); // ... play/pause instead
+						AudioPlayer_SetTrackControl(PAUSEPLAY); // ... play/pause instead
 						Log_Println(rfidTagReapplied, LOGLEVEL_NOTICE);
 					}
 				}
diff --git a/src/RotaryEncoder.cpp b/src/RotaryEncoder.cpp
index 618ea6db..da6321d6 100644
--- a/src/RotaryEncoder.cpp
+++ b/src/RotaryEncoder.cpp
@@ -60,7 +60,7 @@ void RotaryEncoder_Cyclic(void) {
 		// just reset the encoder here, so we get a new delta next time
 		encoder.clearCount();
 		auto currentVol = AudioPlayer_GetCurrentVolume();
-		AudioPlayer_VolumeToQueueSender(currentVol + (encoderValue / 2), false);
+		AudioPlayer_SetVolume(currentVol + (encoderValue / 2), false);
 		return;
 	}
 #endif
diff --git a/src/System.h b/src/System.h
index be9f1952..96fdda08 100644
--- a/src/System.h
+++ b/src/System.h
@@ -3,7 +3,6 @@
 
 extern Preferences gPrefsRfid;
 extern Preferences gPrefsSettings;
-extern TaskHandle_t AudioTaskHandle;
 
 void System_Init_LPCD(void);
 void System_Init(void);
diff --git a/src/Web.cpp b/src/Web.cpp
index 28907b03..7a781351 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -11,9 +11,6 @@
 #include "Common.h"
 #include "ESPAsyncWebServer.h"
 #include "EnumUtils.h"
-#ifdef NEOPIXEL_ENABLE
-	#include <FastLED.h>
-#endif
 #include "Ftp.h"
 #include "HTMLbinary.h"
 #include "HallEffectSensor.h"
@@ -445,8 +442,8 @@ void webserverStart(void) {
 
 				if (!index) {
 					// pause some tasks to get more free CPU time for the upload
-					vTaskSuspend(AudioTaskHandle);
-					Led_TaskPause();
+					Audio_TaskPause();
+					// Led_TaskPause();
 					Rfid_TaskPause();
 					Update.begin();
 					Log_Println(fwStart, LOGLEVEL_NOTICE);
@@ -458,8 +455,8 @@ void webserverStart(void) {
 				if (final) {
 					Update.end(true);
 					// resume the paused tasks
-					Led_TaskResume();
-					vTaskResume(AudioTaskHandle);
+					// Led_TaskResume();
+					Audio_TaskResume();
 					Rfid_TaskResume();
 					Log_Println(fwEnd, LOGLEVEL_NOTICE);
 					if (Update.hasError()) {
@@ -682,7 +679,7 @@ bool JSONToSettings(JsonObject doc) {
 			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "equalizer");
 			return false;
 		} else {
-			AudioPlayer_EqualizerToQueueSender(_gainLowPass, _gainBandPass, _gainHighPass);
+			AudioPlayer_SetEqualizer(_gainLowPass, _gainBandPass, _gainHighPass);
 		}
 	}
 	if (doc["wifi"].is<JsonObject>()) {
@@ -702,12 +699,15 @@ bool JSONToSettings(JsonObject doc) {
 		JsonObject ledObj = doc["led"];
 		bool success = (gPrefsSettings.putUChar("iLedBrightness", ledObj["initBrightness"].as<uint8_t>()) != 0);
 		success = success && (gPrefsSettings.putUChar("nLedBrightness", ledObj["nightBrightness"].as<uint8_t>()) != 0);
+		success = success && (gPrefsSettings.putUChar("aLedBrightness", ledObj["atmoBrightness"].as<uint8_t>()) != 0);
 		success = success && (gPrefsSettings.putUChar("numIndicator", ledObj["numIndicator"].as<uint8_t>()) != 0);
 		success = success && (gPrefsSettings.putUChar("numControl", ledObj["numControl"].as<uint8_t>()) != 0);
 		success = success && (gPrefsSettings.putUChar("numIdleDots", ledObj["numIdleDots"].as<uint8_t>()) != 0);
 		success = success && (gPrefsSettings.putBool("offsetPause", ledObj["offsetPause"].as<bool>()) != 0);
 		success = success && (gPrefsSettings.putShort("hueStart", ledObj["hueStart"].as<int16_t>()) != 0);
 		success = success && (gPrefsSettings.putShort("hueEnd", ledObj["hueEnd"].as<int16_t>()) != 0);
+		success = success && (gPrefsSettings.putShort("hueAtmo", ledObj["hueAtmo"].as<int16_t>()) != 0);
+		success = success && (gPrefsSettings.putShort("satAtmo", ledObj["satAtmo"].as<int16_t>()) != 0);
 		success = success && (gPrefsSettings.putUChar("dimStates", ledObj["dimStates"].as<uint8_t>()) != 0);
 		success = success && (gPrefsSettings.putBool("ledReverseRot", ledObj["reverseRot"].as<bool>()) != 0);
 		success = success && (gPrefsSettings.putUChar("ledOffset", ledObj["offsetStart"].as<uint8_t>()) != 0);
@@ -867,7 +867,7 @@ bool JSONToSettings(JsonObject doc) {
 		snprintf(rfidString, sizeof(rfidString) / sizeof(rfidString[0]), "%s%s%s0%s%u%s0", stringDelimiter, _fileOrUrlAscii, stringDelimiter, stringDelimiter, _playMode, stringDelimiter);
 		gPrefsRfid.putString(_rfidIdAssinId, rfidString);
 		if (gPlayProperties.dontAcceptRfidTwice) {
-			Rfid_ResetOldRfid(); // Set old rfid-id to crap in order to allow to re-apply a new assigned rfid-tag exactly once
+		Rfid_ResetOldRfid(); // Set old rfid-id to crap in order to allow to re-apply a new assigned rfid-tag exactly once
 		}
 
 		String s = gPrefsRfid.getString(_rfidIdAssinId, "-1");
@@ -886,7 +886,7 @@ bool JSONToSettings(JsonObject doc) {
 		const JsonObject controlsObj = doc["controls"].as<JsonObject>();
 		if (controlsObj["set_volume"].is<uint8_t>()) {
 			uint8_t new_vol = controlsObj["set_volume"].as<uint8_t>();
-			AudioPlayer_VolumeToQueueSender(new_vol, true);
+			AudioPlayer_SetVolume(new_vol, true);
 		}
 		if (controlsObj["action"].is<uint8_t>()) {
 			uint8_t cmd = controlsObj["action"].as<uint8_t>();
@@ -971,6 +971,7 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		JsonObject ledObj = obj["led"].to<JsonObject>();
 		ledObj["initBrightness"].set(gPrefsSettings.getUChar("iLedBrightness", 0));
 		ledObj["nightBrightness"].set(gPrefsSettings.getUChar("nLedBrightness", 0));
+		ledObj["atmoBrightness"].set(gPrefsSettings.getUChar("aLedBrightness", 0));
 		ledObj["numIndicator"].set(gPrefsSettings.getUChar("numIndicator", NUM_INDICATOR_LEDS));
 		uint8_t numControlLeds = gPrefsSettings.getUChar("numControl", NUM_CONTROL_LEDS);
 		ledObj["numControl"].set(numControlLeds);
@@ -993,6 +994,8 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		ledObj["offsetPause"].set(gPrefsSettings.getBool("offsetPause", OFFSET_PAUSE_LEDS));
 		ledObj["hueStart"].set(gPrefsSettings.getShort("hueStart", PROGRESS_HUE_START));
 		ledObj["hueEnd"].set(gPrefsSettings.getShort("hueEnd", PROGRESS_HUE_END));
+		ledObj["hueAtmo"].set(gPrefsSettings.getShort("hueAtmo", ATMO_HUE));
+		ledObj["satAtmo"].set(gPrefsSettings.getShort("satAtmo", ATMO_SATURATION));
 		ledObj["dimStates"].set(gPrefsSettings.getUChar("dimStates", DIMMABLE_STATES));
 		ledObj["reverseRot"].set(gPrefsSettings.getBool("ledReverseRot", false));
 		ledObj["offsetStart"].set(gPrefsSettings.getUChar("ledOffset", 0));
@@ -1080,12 +1083,15 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		JsonObject ledSettings = defaultsObj["led"].to<JsonObject>();
 		ledSettings["initBrightness"].set(16u); // LED_INITIAL_BRIGHTNESS
 		ledSettings["nightBrightness"].set(2u); // LED_INITIAL_NIGHT_BRIGHTNESS
+		ledSettings["atmoBrightness"].set(30u); // LED_INITIAL_NIGHT_BRIGHTNESS
 		ledSettings["numIndicator"].set(NUM_INDICATOR_LEDS); // NUM_INDICATOR_LEDS
 		ledSettings["numControl"].set(NUM_CONTROL_LEDS); // NUM_CONTROL_LEDS
 		ledSettings["numIdleDots"].set(NUM_LEDS_IDLE_DOTS); // NUM_LEDS_IDLE_DOTS
 		ledSettings["offsetPause"].set(OFFSET_PAUSE_LEDS); // OFFSET_PAUSE_LEDS
 		ledSettings["hueStart"].set(PROGRESS_HUE_START); // PROGRESS_HUE_START
 		ledSettings["hueEnd"].set(PROGRESS_HUE_END); // PROGRESS_HUE_END
+		ledSettings["hueAtmo"].set(ATMO_HUE);
+		ledSettings["satAtmo"].set(ATMO_SATURATION);
 		ledSettings["dimStates"].set(DIMMABLE_STATES); // DIMMABLE_STATES
 	#ifdef NEOPIXEL_REVERSE_ROTATION
 		ledSettings["reverseRot"].set(true);
@@ -1642,8 +1648,8 @@ void explorerHandleFileStorageTask(void *parameter) {
 	uploadFile.setBufferSize(chunk_size);
 
 	// pause some tasks to get more free CPU time for the upload
-	vTaskSuspend(AudioTaskHandle);
-	Led_TaskPause();
+	Audio_TaskPause();
+	// Led_TaskPause();
 	Rfid_TaskPause();
 
 	for (;;) {
@@ -1680,8 +1686,8 @@ void explorerHandleFileStorageTask(void *parameter) {
 				Log_Println(webTxCanceled, LOGLEVEL_ERROR);
 				free(parameter);
 				// resume the paused tasks
-				Led_TaskResume();
-				vTaskResume(AudioTaskHandle);
+				// Led_TaskResume();
+				Audio_TaskResume();
 				Rfid_TaskResume();
 				// destroy double buffer memory, since the upload was interrupted
 				destroyDoubleBuffer();
@@ -1695,8 +1701,8 @@ void explorerHandleFileStorageTask(void *parameter) {
 	}
 	free(parameter);
 	// resume the paused tasks
-	Led_TaskResume();
-	vTaskResume(AudioTaskHandle);
+	// Led_TaskResume();
+	Audio_TaskResume();
 	Rfid_TaskResume();
 	// send signal to upload function to terminate
 	xSemaphoreGive(explorerFileUploadFinished);
@@ -1924,9 +1930,9 @@ void explorerHandleAudioRequest(AsyncWebServerRequest *request) {
 
 		playMode = atoi(playModeString.c_str());
 		if (gPlayProperties.dontAcceptRfidTwice) {
-			Rfid_ResetOldRfid();
+		Rfid_ResetOldRfid();
 		}
-		AudioPlayer_TrackQueueDispatcher(filePath, 0, playMode, 0);
+		AudioPlayer_SetPlaylist(filePath, 0, playMode, 0);
 	} else {
 		Log_Println("AUDIO: No path variable set", LOGLEVEL_ERROR);
 	}
diff --git a/src/Wlan.cpp b/src/Wlan.cpp
index 76802121..ce971b4f 100644
--- a/src/Wlan.cpp
+++ b/src/Wlan.cpp
@@ -777,7 +777,7 @@ void writeWifiStatusToNVS(bool wifiStatus) {
 	} else {
 		Log_Println(wifiDisabledMsg, LOGLEVEL_NOTICE);
 		if (gPlayProperties.isWebstream) {
-			AudioPlayer_TrackControlToQueueSender(STOP);
+			AudioPlayer_SetTrackControl(STOP);
 		}
 	}
 
diff --git a/src/main.cpp b/src/main.cpp
index 4bca7c2f..d1590728 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -231,13 +231,9 @@ void loop() {
 		Ftp_Cyclic();
 		RotaryEncoder_Cyclic();
 	}
-	vTaskDelay(portTICK_PERIOD_MS * 1u);
 	AudioPlayer_Cyclic();
-	vTaskDelay(portTICK_PERIOD_MS * 1u);
 	Battery_Cyclic();
-	// Port_Cyclic(); // called by button (controlled via hw-timer)
 	Button_Cyclic();
-	vTaskDelay(portTICK_PERIOD_MS * 1u);
 	System_Cyclic();
 	Rfid_PreferenceLookupHandler();
 
@@ -254,9 +250,10 @@ void loop() {
 	}
 
 	IrReceiver_Cyclic();
-	vTaskDelay(portTICK_PERIOD_MS * 2u);
 
 #ifdef HALLEFFECT_SENSOR_ENABLE
 	gHallEffectSensor.cyclic();
 #endif
+
+	vTaskDelay(portTICK_PERIOD_MS * 6u);
 }
diff --git a/src/settings.h b/src/settings.h
index f1c0b5a8..184bb108 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -218,6 +218,8 @@
 		#define OFFSET_PAUSE_LEDS		false		// if true the pause-leds are centered in the mid of the LED-Strip
 		#define PROGRESS_HUE_START		85          	// Start and end hue of mulitple-LED progress indicator. Hue ranges from basically 0 - 255, but you can also set numbers outside this range to get the desired effect (e.g. 85-215 will go from green to purple via blue, 341-215 start and end at exactly the same color but go from green to purple via yellow and red)
 		#define PROGRESS_HUE_END		-1
+		#define ATMO_HUE				10
+		#define ATMO_SATURATION			180
 		#define DIMMABLE_STATES			50		// Number of dimmed values between two full LEDs (https://forum.espuino.de/t/led-verbesserungen-rework/1739)
 		//#define LED_OFFSET 0 // shifts the starting LED in the original direction of the neopixel ring
 	#endif
@@ -274,6 +276,7 @@
 		constexpr const char topicLoudnessState[] = "State/ESPuino/Loudness";
 		constexpr const char topicSleepTimerCmnd[] = "Cmnd/ESPuino/SleepTimer";
 		constexpr const char topicSleepTimerState[] = "State/ESPuino/SleepTimer";
+		constexpr const char topicAmbientLightCmnd[] = "Cmnd/ESPuinoB/AmbientLight";
 		constexpr const char topicState[] = "State/ESPuino/State";
 		constexpr const char topicCurrentIPv4IP[] = "State/ESPuino/IPv4";
 		constexpr const char topicLockControlsCmnd[] ="Cmnd/ESPuino/LockControls";
diff --git a/src/values.h b/src/values.h
index b4b29827..f3fc7939 100644
--- a/src/values.h
+++ b/src/values.h
@@ -52,6 +52,7 @@
 #define CMD_ENABLE_FTP_SERVER			 150 // Enables FTP-server
 #define CMD_TELL_IP_ADDRESS				 151 // Command: ESPuino announces its IP-address via speech
 #define CMD_TELL_CURRENT_TIME			 152 // Command: ESPuino announces current time via speech
+#define CMD_TOGGLE_AMBIENT_LIGHT		 153 // Command: ESPuino announces current time via speech
 
 #define CMD_PLAYPAUSE	   170 // Command: play/pause
 #define CMD_PREVTRACK	   171 // Command: previous track