diff --git a/README.md b/README.md
index 76231186..794b3d64 100644
--- a/README.md
+++ b/README.md
@@ -294,6 +294,8 @@ modification:
   stream to your ESPuino via BT.
 - Toggle Bluetooth source (enable/disable) => restarts ESPuino immediately. In this mode your
   ESPuino can stream via BT to an external device.
+- Toggle through the different modes (Normal => BT-Sink => BT-Source => Normal)
+- Speech output of IP-address or current time
 
 > :information_source: All sleep modes do dimming (Neopixel) automatically because it's supposed to
   be used in the evening when going to bed. Well, at least that's my children's indication :-)
diff --git a/REST-API.yaml b/REST-API.yaml
new file mode 100644
index 00000000..6da4d402
--- /dev/null
+++ b/REST-API.yaml
@@ -0,0 +1,515 @@
+openapi: 3.0.0
+info:
+  title: ESPuino API
+  version: 1.0.5
+  description: API for the ESPuino, a DIY Smart Speaker project. ESPuino is a DIY Smart Speaker that uses software-based audio decoding, supports various music sources, and offers a user-friendly web interface. It simplifies audio processing and enhances user feedback with Neopixel rings.
+
+servers:
+  - url: http://espuino.local/
+    description: Development ESPuino
+
+paths:
+  /explorer:
+    get:
+      summary: List the contents of a directory.
+      description: Get a list of files and directories in the specified path.
+      parameters:
+        - in: query
+          name: path
+          schema:
+            type: string
+            default: "/"
+          description: Path to the directory to be listed.
+      responses:
+        '200':
+          description: Directory content successfully listed.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    isDir:
+                      type: boolean
+                      description: True if item is a directory.
+    post:
+      summary: Upload a file to a directory.
+      description: Upload a file to the specified directory.
+      parameters:
+        - in: query
+          name: path
+          schema:
+            type: string
+          description: Directory path to upload the file.
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                file:
+                  type: string
+                  format: binary
+      responses:
+        '200':
+          description: File successfully uploaded.
+    delete:
+      summary: Delete a file or directory.
+      description: Delete a file or directory in the specified path.
+      parameters:
+        - in: query
+          name: path
+          schema:
+            type: string
+          description: Path to the file or directory to be deleted.
+      responses:
+        '200':
+          description: File or directory successfully deleted.
+    put:
+      summary: Create a new directory.
+      description: Create a new directory in the specified path.
+      parameters:
+        - in: query
+          name: path
+          schema:
+            type: string
+          description: Path for the new directory to be created.
+      responses:
+        '200':
+          description: Directory successfully created.
+    patch:
+      summary: Rename a file.
+      description: Rename a file from the source path to the destination path.
+      parameters:
+        - in: query
+          name: srcpath
+          schema:
+            type: string
+          description: Current path of the file to be renamed.
+        - in: query
+          name: dstpath
+          schema:
+            type: string
+          description: New path for the file.
+      responses:
+        '200':
+          description: File successfully renamed.
+  /exploreraudio:
+    post:
+      summary: Play an audio file.
+      description: Play an audio file specified by the path.
+      parameters:
+        - in: query
+          name: path
+          schema:
+            type: string
+          description: Path to the audio file or directory.
+        - in: query
+          name: playmode
+          schema:
+            type: string
+          description: Play mode for audio.
+      responses:
+        '200':
+          description: Successful audio play.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+  /explorerdownload:
+    get:
+      summary: Download a file.
+      description: Download a file specified by the path.
+      parameters:
+        - in: query
+          name: path
+          schema:
+            type: string
+          description: Path of the file to download.
+      responses:
+        '200':
+          description: Successful download.
+  /savedSSIDs:
+    get:
+      summary: Get a list of saved networks.
+      description: Get a list of saved Wi-Fi networks.
+      responses:
+        '200':
+          description: Successful response with saved networks.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+    post:
+      summary: Save a new network.
+      description: Save a new Wi-Fi network.
+      requestBody:
+        description: Network details to save.
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                SSID:
+                  type: string
+                pwd:
+                  type: string
+                static:
+                  type: boolean
+                static_addr:
+                  type: string
+                static_gateway:
+                  type: string
+                static_subnet:
+                  type: string
+                static_dns1:
+                  type: string
+                static_dns2:
+                  type: string
+              required:
+                - SSID
+                - pwd
+      responses:
+        '200':
+          description: Successful network save.
+    delete:
+      summary: Delete a saved network.
+      description: Delete a saved Wi-Fi network by SSID.
+      parameters:
+        - in: query
+          name: ssid
+          schema:
+            type: string
+          description: SSID of the network to delete.
+      responses:
+        '200':
+          description: Successful network deletion.
+  /activeSSID:
+    get:
+      summary: Get the current active network name.
+      description: Get the SSID of the currently active network.
+      responses:
+        '200':
+          description: Successful response with active network name.
+          content:
+            application/json:
+              schema:
+                type: string
+  /wificonfig:
+    get:
+      summary: Get current common Wi-Fi configuration.
+      description: Get the current common Wi-Fi configuration settings.
+      responses:
+        '200':
+          description: Successful response with Wi-Fi configuration.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  hostname:
+                    type: string
+                  ScanWiFiOnStart:
+                    type: boolean
+    post:
+      summary: Save current common Wi-Fi configuration.
+      description: Save the current common Wi-Fi configuration settings.
+      requestBody:
+        description: Common Wi-Fi configuration to save.
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                hostname:
+                  type: string
+                ScanWiFiOnStart:
+                  type: boolean
+              required:
+                - hostname
+                - ScanWiFiOnStart
+      responses:
+        '200':
+          description: Successful Wi-Fi configuration save.
+  /settings:
+    get:
+      summary: Get common settings.
+      description: Get common settings, optionally for a specific section.
+      parameters:
+        - in: query
+          name: section
+          schema:
+            type: string
+          description: Optional section to retrieve specific settings.
+      responses:
+        '200':
+          description: Successful response with common settings.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  # Include your common settings properties here.
+    post:
+      summary: Save settings.
+      description: Save common settings.
+      requestBody:
+        description: Settings to save.
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                general:
+                  type: object
+                  # Include all general settings properties here
+                defaults:
+                  type: object
+                  # Include all defaults settings properties here
+                wifi:
+                  type: object
+                  # Include all Wi-Fi settings properties here
+                led:
+                  type: object
+                  # Include all LED settings properties here
+                battery:
+                  type: object
+                  # Include all battery settings properties here
+                ftp:
+                  type: object
+                  # Include all FTP settings properties here
+                mqtt:
+                  type: object
+                  # Include all MQTT settings properties here
+                bluetooth:
+                  type: object
+                  # Include all Bluetooth settings properties here
+              required:
+                - general
+      responses:
+        '200':
+          description: Successful settings save.
+  /rfid:
+    get:
+      summary: List all saved RFID-tag assignments with details.
+      description: Get a list of saved RFID-tag assignments with details. Optionally, provide an ID to list only a single assignment.
+      parameters:
+        - in: query
+          name: id
+          schema:
+            type: string
+          description: Optional ID to list only a single assignment.
+      responses:
+        '200':
+          description: Successful response with RFID-tag assignments.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    # Include your RFID-tag assignment properties here.
+    post:
+      summary: Save or overwrite RFID-tag assignment.
+      description: Save a new RFID-tag assignment or overwrite an existing one.
+      requestBody:
+        description: RFID-tag assignment details to save.
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                id:
+                  type: string
+                fileOrUrl:
+                  type: string
+                modId:
+                  type: string
+                playMode:
+                  type: string
+              required:
+                - id
+                - fileOrUrl
+      responses:
+        '200':
+          description: Successful RFID-tag assignment save.
+    delete:
+      summary: Delete an RFID-tag assignment.
+      description: Delete an RFID-tag assignment by providing its ID.
+      parameters:
+        - in: query
+          name: id
+          schema:
+            type: string
+          description: ID of the RFID-tag assignment to delete.
+      responses:
+        '200':
+          description: Successful RFID-tag assignment deletion.
+  /rfid/ids-only:
+    get:
+      summary: Get an array of RFID tag ID names.
+      description: Returns an array of RFID tag IDs without additional details.
+      responses:
+        '200':
+          description: Successful response with RFID tag IDs.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+
+  /cover:
+    get:
+      summary: Get album cover image.
+      description: Handle album cover image requests and serve the current cover art image.
+      responses:
+        '200':
+          description: Successful response with album cover image.
+          content:
+            image/jpeg:
+              schema:
+                type: string
+                format: binary
+
+  /info:
+    get:
+      summary: Get common information.
+      description: Returns a JSON object with common information about ESPuino.
+      responses:
+        '200':
+          description: Successful response with common information.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  # Include your common information properties here.
+
+  /log:
+    get:
+      summary: Get current log.
+      description: Returns the current log as text.
+      responses:
+        '200':
+          description: Successful response with log text.
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /stats:
+    get:
+      summary: Get task runtime information.
+      description: Returns an HTML webpage with task runtime information.
+      responses:
+        '200':
+          description: Successful response with task runtime information.
+          content:
+            text/html:
+              schema:
+                type: string
+
+  /debug:
+    get:
+      summary: Get debug information.
+      description: Returns task runtime and debug information as JSON.
+      responses:
+        '200':
+          description: Successful response with debug information.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  # Include your debug information properties here.
+
+  /upload:
+    post:
+      summary: Upload NVS backup.
+      description: Uploads a NVS backup file.
+      responses:
+        '200':
+          description: Successful response for NVS backup upload.
+
+  /update:
+    post:
+      summary: Upload new firmware.
+      description: Uploads new firmware to ESPuino.
+      responses:
+        '200':
+          description: Successful response for firmware update.
+
+  /restart:
+    post:
+      summary: Restart ESPuino.
+      description: Performs a restart of ESPuino. No parameters required.
+      responses:
+        '200':
+          description: Successful response for ESPuino restart.
+
+  /shutdown:
+    post:
+      summary: Shutdown ESPuino.
+      description: Performs a shutdown (deep-sleep) of ESPuino. No parameters required.
+      responses:
+        '200':
+          description: Successful response for ESPuino shutdown.
+
+  /rfidnvserase:
+    post:
+      summary: Erase RFID assignments from NVS.
+      description: Erases all RFID assignments from NVS.
+      responses:
+        '200':
+          description: Successful response for RFID assignments erasure.
+
+  /wifiscan:
+    get:
+      summary: Get nearby WiFi networks.
+      description: Get a list of available nearby WiFi networks. The first request will return 0 results unless you start the scan from somewhere else (loop/setup). Do not request more often than 3-5 seconds!
+      responses:
+        '200':
+          description: Successful response with nearby WiFi networks.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+
+  /trackprogress:
+    get:
+      summary: Get current track progress.
+      description: Get current track progress, time, and duration.
+      responses:
+        '200':
+          description: Successful response with track progress information.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  # Include your track progress information properties here.
+
+  /inithalleffectsensor:
+    get:
+      summary: Initialize Hall Effect Sensor Value.
+      description: Initializes the Hall Effect Sensor Value.
+      responses:
+        '200':
+          description: Successful response for initializing Hall Effect Sensor Value.
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 5e66ddc7..bbfa9459 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,49 @@
 
 ## DEV-branch
 
-* more to come...
+* 14.01.2024: Modify CMD_DIMM_LEDS_NIGHTMODE to toggle night light mode (#287), thanks to @laszloh !
+* 11.01.2024: More free heap on boards with PSRAM (CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL)
+* 10.01.2024: LPCD for ISO-15693 cards
+* 05.01.2024: REST-API specification, thanks to @pauel !
+* 02.01.2024: Partly revert: Fix webstream playlist abort when track fails (#285), thanks to @sfields !
+* 02.01.2024: Show critical voltage slider only if SHUTDOWN_ON_BAT_CRITICAL defined
+* 29.12.2023: Show station logo in Web-UI (if available)
+* 29.12.2023: /rfid endpoint: List all assigned nvs entries (#280)
+* 29.12.2023: Enhanced capabilities for task runtime debugging
+* 28.12.2023: Bugfix 1: DONT_ACCEPT_SAME_RFID_TWICE_ENABLE and web frontend, thanks to @sfields !
+* 28.12.2023: Add configuration for critical (shutoff) voltage in Web-UI, thanks to @SZenglein ! 
+* 28.12.2023: New official PlatformIO package 6.5.0 (Arduino 2.0.14, ESP-IDF 4.4.6)
+* 28.12.2023: Improve port expander handling (#283), thanks to @r-schmidt !
+* 23.12.2023: Update audio library, avoid waiting in i2s_channel_write() to have more time in other tasks #636
+* 22.12.2023: Web-UI: Preselection of root folder after load to avoid nasty warning when uploading files
+* 17.12.2023: Update audio library, fixes click-noise seeking in file 
+* 13.12.2023: Immediately go to sleep if battery is critical (#274), thanks to @SZenglein ! 
+* 12.12.2023: Long press behaviour, execute cmd directly after longpress-time (#279), thanks to @Joe91 ! 
+* 12.12.2023: Fix false-positive error (Audio playback timeout)
+* 10.12.2023: Distribute vTaskDelay() in main loop to avoid rare audio dropouts
+* 10.12.2023: Fix wrong states on PE output pins (and SD-card failure on restart) #278, thanks to @36b6fp6s ! 
+* 09.12.2023: Fix webstream playlist abort when track fails (#276), thanks to @laszloh !
+* 07.12.2023: Show RC522 firmware version at startup, same as PN5180
+* 04.12.2023: fix stuttering sound with some WAV & MP3 files, thanks to @wolle !
+* 04.12.2023: change trackprogress communication from websocket to http to improve stability
+* 04.12.2023: Remove some convertAsciiToUtf8() #272 
+* 30.11.2023: Fix a nullptr access after trying to replay an invalid filename (#271), thanks to Olaf!
+* 29.11.2023: Updated audio library to play more MP3s, faster track change & delivery of the cover image
+* 25.11.2023: Save some cpu time in audio task by only updating the playtime statistics every 250ms
+* 22.11.2023: Web-UI: Search for files feature #268 
+* 21.11.2023: New command CMD_TOGGLE_MODE to switch Normal => BT-Sink => BT-Source
+* 21.11.2023: Bugfix: Some commands e.g. Play/Pause did not work in BT-Source mode
+* 21.11.2023: Faster pairing animation in BT-Source mode to better distinguish between the two BT modes
+* 19.11.2023: Give audiotask a higher task priority, fixes crackling sound
+* 19.11.2023: bugfix_same_rfid_twice init #262, see Github comments 
+* 17.11.2023: Show track progress, current playtime & duration in web-ui (#267)
+* 16.11.2023: Fix delay with getLocalTime()
+* 14.11.2023: Multi Wlan improvements (#266), thanks to @laszloh !
+* 13.11.2023: Update third party libraries
+* 08.11.2023: Fix HTML syntax errors, found with static code analysis tool "HtmlHint"
+* 08.11.2023: Better logging for boards without PSRAM, fewer logs when compiling with NO_SDCARD
+* 07.11.2023: Set timezone after startup, thanks to @Joe91 !
+
 
 ## Version 2 (07.11.2023)
 
diff --git a/html/accesspoint.html b/html/accesspoint.html
index 30f3a82c..53abc00c 100644
--- a/html/accesspoint.html
+++ b/html/accesspoint.html
@@ -85,9 +85,9 @@ <h1 data-i18n="wifi.title">WiFi-configuration</h1>
 			<label for="hostname" data-i18n="wifi.hostname.title">Hostname</label>:<br>
 			<input type="text" id="hostname" name="hostname" value="espuino" pattern="^[0-9a-zA-Z][0-9a-zA-Z\\-]{0,30}[0-9a-zA-Z]" required><br><br>
 
-			<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value=false>
+			<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value="false">
 			<label for="scan_wifi_on_start" data-i18n="wifi.scan.enabled">Start with best WiFi</label><br><br>
-			<input type="checkbox" id="static_enabled" name="static_enabled" value=false>
+			<input type="checkbox" id="static_enabled" name="static_enabled" value="false">
 			<label for="static_enabled" data-i18n="wifi.static.enabled">Static IP</label>
 			
 			<div id="wifi_static_div" style="display:none">
diff --git a/html/locales/de.json b/html/locales/de.json
index 12fda531..57b1b190 100644
--- a/html/locales/de.json
+++ b/html/locales/de.json
@@ -15,7 +15,8 @@
     "toast": {
         "rfidDetect": "RFID Tag mit {{rfidId}} erkannt.",
         "success": "Aktion erfolgreich ausgeführt.",
-        "conlost": "Die Verbindung zum ESPuino ist unterbrochen! Bitte Seite neu laden."
+        "conlost": "Die Verbindung zum ESPuino ist unterbrochen! Bitte Seite neu laden.",
+        "dropout": "Langsamer Stream, Aussetzer möglich."
     },
     "nav": {
         "control": "Steuerung",
@@ -96,10 +97,13 @@
             "title": "Ordner",
             "desc": "Einen Ordner samt Inhalt (und allen Unterordnern) hochladen"
         },
+        "search": {
+            "placeholder": "Dateien suchen.."
+        },
         "upload": {
             "title": "Upload",
             "desc": "Upload starten",
-            "selectFolder": "Wähle den Ordner für den Upload!",
+            "selectFolder": "Wähle den Zielordner für den Upload!",
             "selectFile": "Wähle eine Datei zum Hochladen!",
             "success": "Upload erfolgreich ({{elapsed}}, {{speed}} KB/s)",
             "error": "Upload fehlgeschlagen",
@@ -159,6 +163,7 @@
                     "130":"Aktiviere/deaktiviere WLAN",
                     "140":"Bluetooth-Lautsprecher aktivieren/deaktivieren",
                     "141":"Bluetooth-Kopfhörer aktivieren/deaktivieren",
+                    "142":"Wechsle Modus (Normal => BT-Lautsprecher => BT-Kopfhörer)",
                     "150":"Aktiviere FTP",
                     "151":"IP-Adresse ansagen",
                     "152":"Uhrzeit ansagen",
@@ -261,6 +266,7 @@
             "desc": "Status über Neopixel anzeigen",
             "lowWarning": "Unter dieser Spannung wird eine Warnung angezeigt",
             "lowCritical": "Eine LED leuchtet bei dieser Spannung",
+            "criticalShutoff": "Unter dieser Spannung schaltet der ESPuino ab.",
             "high": "Alle LEDs leuchten bei dieser Spannung",
             "measureInterval": "Zeitabstand der Messung (in Minuten)"
         }
diff --git a/html/locales/en.json b/html/locales/en.json
index fbfcfb23..ddef5af9 100644
--- a/html/locales/en.json
+++ b/html/locales/en.json
@@ -15,7 +15,8 @@
     "toast": {
         "rfidDetect": "RFID-tag {{rfidId}} detected.",
         "success": "Action performed successfully.",
-        "conlost": "Connection to ESPuino broken! Please reload website."
+        "conlost": "Connection to ESPuino broken! Please reload website.",
+        "dropout": "slow stream, dropouts are possible."
     },
     "nav": {
         "control": "Control",
@@ -96,6 +97,9 @@
             "title": "Directory",
             "desc": "Upload directory with all files and subdirectories"
         },
+        "search": {
+            "placeholder": "Search files.."
+        },
         "upload": {
             "title": "Upload",
             "desc": "Start Upload",
@@ -159,6 +163,7 @@
                     "130":"Toggle WiFi",
                     "140":"Toggle Bluetooth Speaker",
                     "141":"Toggle Bluetooth Headphones",
+                    "142":"Toggle Mode (Normal => BT-Speaker => Bluetooth Headphone)",
                     "150":"Enable FTP",
                     "151":"Announce IP-Address",
                     "152":"Announce current time",
@@ -261,6 +266,7 @@
             "desc": "Show voltage-status via Neopixel",
             "lowWarning": "Show warning below this threshold",
             "lowCritical": "Lowest voltage, that is indicated by one LED",
+            "criticalShutoff": "Below this voltage, ESPuino turns off.",
             "high": "Voltage, that is indicated by all LEDs",
             "measureInterval": "Interval between measurements (in minutes)"
         }
diff --git a/html/management.html b/html/management.html
index a093a8e3..ed5317da 100644
--- a/html/management.html
+++ b/html/management.html
@@ -7,7 +7,7 @@
 	<link rel="preconnect" href="https://cdnjs.cloudflare.com">
 	<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/css/bootstrap.min.css">
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css"/>
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.16/themes/default/style.min.css"/>
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"/>
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css"/>
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/11.0.2/css/bootstrap-slider.min.css" />
@@ -15,14 +15,19 @@
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/js/bootstrap.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.16/jstree.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/11.0.2/bootstrap-slider.min.js"></script>
     
-    <script src="/js/i18next.min.js"></script>
-    <script src="/js/i18nextHttpBackend.min.js"></script>
-    <script src="/js/loc_i18next.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/23.7.11/i18next.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next-http-backend/2.4.2/i18nextHttpBackend.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/loc-i18next@0.1.6/dist/umd/loc-i18next.min.js"></script>
 	<style type="text/css">
+		.jstree-default .jstree-search {
+			font-style: italic;
+			color:  #007bff; /* change searchresult theme-color to bootstrap blue */
+			font-weight: bold;
+		}
 		.filetree {
 			border: 1px solid black;
 			height: 200px;
@@ -113,6 +118,10 @@
 			width: 100%;
 		}
 
+		.progress-sm {
+  			height: 0.4rem!important;
+		}
+
 		#SubTabContent.tab-content {
 			display: flex;
 		}
@@ -255,7 +264,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		<div class="container nav nav-tabs" id="nav-tab" role="tablist">
 			<a class="nav-item nav-link" id="nav-control-tab" data-toggle="tab" href="#nav-control" role="tab" aria-controls="nav-control" aria-selected="false"><i class="fas fa-gamepad"></i><span class=".d-sm-none .d-md-block" data-i18n="nav.control">Control</span></a>
 			<a class="nav-item nav-link active" id="nav-rfid-tab" data-toggle="tab" href="#nav-rfid" role="tab" aria-controls="nav-rfid" aria-selected="true"><i class="fas fa-dot-circle"></i><span data-i18n="nav.rfid">RFID</span></a>
-			<a class="nav-item nav-link" id="nav-wifi-tab" data-toggle="tab" href="#nav-wifi" role="tab" aria-controls="nav-wifi" aria-selected="false"><i class="fas fa-wifi"></i><span class=".d-sm-none .d-md-block"><span data-i18n="nav.wifi">WiFi</span></a>
+			<a class="nav-item nav-link" id="nav-wifi-tab" data-toggle="tab" href="#nav-wifi" role="tab" aria-controls="nav-wifi" aria-selected="false"><i class="fas fa-wifi"></i><span class=".d-sm-none .d-md-block"><span data-i18n="nav.wifi">WiFi</span></span></a>
 			<a class="nav-item nav-link" id="nav-mqtt-tab" data-visible="false" data-toggle="tab" href="#nav-mqtt" role="tab" aria-controls="nav-mqtt" aria-selected="false"><i class="fas fa-network-wired"></i><span data-i18n="nav.mqtt">MQTT</span></a>
 			<a class="nav-item nav-link" id="nav-ftp-tab" data-visible="false" data-toggle="tab" href="#nav-ftp" role="tab" aria-controls="nav-ftp" aria-selected="false"><i class="fas fa-folder"></i><span data-i18n="nav.ftp">FTP</span></a>
 			<a class="nav-item nav-link" id="nav-bt-tab" data-visible="false" data-toggle="tab" href="#nav-bt" role="tab" aria-controls="nav-bt" aria-selected="false"><i class="fab fa-bluetooth"></i><span data-i18n="nav.bluetooth">Bluetooth</span></a>
@@ -275,7 +284,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 						<label for="hostname" data-i18n="[prepend]wifi.hostname.title">:</label>
 						<input type="text" class="form-control" id="hostname" data-i18n="[placeholder]wifi.hostname.placeholder" name="hostname"
 							value="" pattern="^[0-9a-zA-Z][0-9a-zA-Z\-]{0,30}[0-9a-zA-Z]" required><br>
-						<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value=false>
+						<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value="false">
 						<label for="scan_wifi_on_start" data-i18n="wifi.scan.enabled">Start with best WiFi</label><br><br>
 					</div>
 					<br>
@@ -295,7 +304,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 						<label for="pwd" data-i18n="[prepend]wifi.password.title">:</label>
 						<input type="password" class="form-control" id="pwd" name="pwd" data-i18n="[placeholder]wifi.password.placeholder" required><br>
 
-						<input type="checkbox" id="static_enabled" name="static_enabled" value=false>
+						<input type="checkbox" id="static_enabled" name="static_enabled" value="false">
 						<label for="static_enabled" data-i18n="[prepend]wifi.static.enabled">:</label>
 						<div id="wifi_static_div" style="display:none">
 							<label for="static_addr" data-i18n="[prepend]wifi.static.addr">:</label>
@@ -355,8 +364,8 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 						<button type="button" class="btn btn-default btn-lg" onclick="sendControl(177)" data-i18n="[title]control.voldown">
 							<span class="fas fa-volume-down"></span>
 						</button>
-						</i><input data-provide="slider" type="number" data-slider-min="1" data-slider-max="21" min="1" max="21" class="form-control" id="setVolume"
-							data-slider-value="" value="" onchange="sendVolume(this.value)">
+							<input data-provide="slider" type="number" data-slider-min="1" data-slider-max="21" min="1" max="21" class="form-control" id="setVolume"
+								data-slider-value="" value="" onchange="sendVolume(this.value)">
 						<button type="button" class="btn btn-default btn-lg" onclick="sendControl(176)" data-i18n="[title]control.volup">
 							<span class="fas fa-volume-up"></span>
 						</button>
@@ -365,6 +374,11 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 				<div class="form-group col-md-12">
 					<legend data-i18n="control.current"></legend>
 					<div id="track"></div>
+					<div></div>
+					<div id="trackProgressDiv" class="progress progress-sm">
+						<div id="trackProgress" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+					</div>
+					<div id="playtime"> </div>
 				</div>
 				<br/>
 				<div class="form-group col-md-12">
@@ -388,6 +402,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 							<option value="130" data-i18n="files.rfid.mod.cmd.130"></option>
 							<option value="140" data-i18n="files.rfid.mod.cmd.140"></option>
 							<option value="141" data-i18n="files.rfid.mod.cmd.141"></option>
+							<option value="142" data-i18n="files.rfid.mod.cmd.142"></option>
 							<option value="150" data-i18n="files.rfid.mod.cmd.150"></option>
 							<option value="151" data-i18n="files.rfid.mod.cmd.151"></option>
 							<option value="152" data-i18n="files.rfid.mod.cmd.152"></option>
@@ -414,7 +429,15 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 				<div id="filebrowser">
 					<div class="filetree demo" id="explorerTree"></div>
 				</div>
+				<div class="input-group input-focus">
+					<div class="input-group-prepend">
+					  <span class="input-group-text bg-white"><i class="fas fa-search"></i></span>
+					</div>
+					<input type="search" id="filetreesearch" data-i18n="[placeholder]files.search.placeholder" class="form-control border-left-0" onsearch="searchFiles($(this).val())" onkeyup="searchFiles($(this).val())">
+				</div>
 				<div>
+				<br>
+				<legend id="filesupload" data-i18n="files.upload.title">Files</legend>
 					<form id="explorerUploadForm" method="POST" enctype="multipart/form-data" action="/explorer">
 						<div class="input-group">
 							<span class="form-control" id="uploaded_file_text"></span>&nbsp
@@ -437,14 +460,14 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		</div>
 		<div class="container" id="rfidMusicTags">
 			<fieldset>
-				<legend id="rfidMusicTagsAssignment"" data-i18n="files.rfid.title">RFID-Assignments</legend>
+				<legend id="rfidMusicTagsAssignment" data-i18n="files.rfid.title">RFID-Assignments</legend>
 			<form action="#rfidMusicTags" method="POST" onsubmit="rfidAssign('rfidMusicTags'); return false">
 				<div class="form-group col-md-12">
 					<label for="rfidIdMusic" data-i18n="files.rfid.idNumber">RFID-number (12 digits)</label>
 					<input type="text" class="form-control" id="rfidIdMusic" maxlength="12" pattern="[0-9]{12}"
 						   placeholder="" name="rfidIdMusic" required>
 					<br>
-					<ul class="nav nav-tabs" id="SubTab" role="tablist" aria-labelledby="rfidMusicTagsAssignment">>
+					<ul class="nav nav-tabs" id="SubTab" role="tablist" aria-labelledby="rfidMusicTagsAssignment">
 						<li class="nav-item" role="tab" aria-labelledby="rfid-music-tab">
 							<a class="nav-link active" id="rfid-music-tab" title="Music" data-toggle="tab" href="#rfidmusic" role="tab"><i class="fas fa-music"></i> <span data-i18n="files.rfid.music">Music</span></a>
 						</li>
@@ -494,6 +517,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 								<option value="130" data-i18n="files.rfid.mod.cmd.130"></option>
 								<option value="140" data-i18n="files.rfid.mod.cmd.140"></option>
 								<option value="141" data-i18n="files.rfid.mod.cmd.141"></option>
+								<option value="142" data-i18n="files.rfid.mod.cmd.142"></option>
 								<option value="150" data-i18n="files.rfid.mod.cmd.150"></option>
 								<option value="151" data-i18n="files.rfid.mod.cmd.151"></option>
 								<option value="152" data-i18n="files.rfid.mod.cmd.152"></option>
@@ -700,8 +724,16 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 								<i class="fas fa-battery-quarter fa-2x .icon-pos"></i><input data-provide="slider" data-slider-step="0.1"  data-slider-min="2.0" data-slider-max="5.0" min="2.0" max="5.0" type="text" class="form-control" id="voltageIndicatorHigh" name="voltageIndicatorHigh"
 						   data-slider-value=""  value="" pattern="^\d{1,2}(\.\d{1,3})?" required> <i class="fas fa-battery-three-quarters fa-2x .icon-pos" fa-2x .icon-pos></i>
 						</div>
-
 						<br>
+					<div id="criticalVoltageSection" data-visible="false">
+					<label for="criticalVoltage" data-i18n="[prepend]general.battery.criticalShutoff">:</label>
+						<div class="text-center">
+							<i class="fas fa-battery-quarter fa-2x .icon-pos"></i><input data-provide="slider" data-slider-step="0.1"  data-slider-min="2.0" data-slider-max="5.0" min="2.0" max="5.0" type="text" class="form-control" id="criticalVoltage" name="criticalVoltage"
+						   data-slider-value=""  value="" pattern="^\d{1,2}(\.\d{1,3})?" required> <i class="fas fa-battery-three-quarters fa-2x .icon-pos" fa-2x .icon-pos></i>
+						</div>
+						<br>
+					</div>
+						
 					<label for="voltageCheckInterval" data-i18n="[prepend]general.battery.measureInterval">:</label>
 						<div class="text-center"><i class="fas fa-hourglass-start fa-2x .icon-pos"></i>
 							<input data-provide="slider" data-slider-min="1" data-slider-max="60" type="number" min="1" max="60" class="form-control" id="voltageCheckInterval"
@@ -775,21 +807,31 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 <script type="text/javascript">
 	var DEBUG = false;
 	var lastIdclicked = '';
+	var ActiveTab = 'nav-rfid-tab';
 	var ActiveSubTab = 'rfid-music-tab';
 	var host = $(location).attr('hostname');
 	var language = navigator.language || navigator.userLanguage;
 	var localize;
 
 	/* show active / selected tab */
+	$('#nav-tab.nav-tabs a').on('shown.bs.tab', function (e) {
+		ActiveTab = $(e.target).attr('id');
+		console.log ("ActiveTab: " + ActiveTab);
+		if (ActiveTab == 'nav-control-tab') {
+			getTrackProgress();
+		}
+	});
+
+	/* show active / selected subtab */
 	$('#SubTab.nav-tabs a').on('shown.bs.tab', function (e) {
 		ActiveSubTab = $(e.target).attr('id');
-		console.log ( ActiveSubTab);
+		console.log ("ActiveSubTab: " + ActiveSubTab);
 		if (ActiveSubTab == 'rfid-music-tab') {
 			document.getElementById("fileOrUrl").required = true;
 		} else {
 			document.getElementById("fileOrUrl").required = false;
 		}
-});
+	});
 
 	if (DEBUG) {
 		host = "192.168.178.114";
@@ -853,6 +895,21 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		}
 	});
 
+	document.getElementById('trackProgressDiv').addEventListener('click', function (e) {
+		var bounds = this.getBoundingClientRect();
+    	var max = bounds.width;
+    	var pos = e.pageX - bounds.left; 
+    	var percent = Math.round(pos / max * 100); 
+    	console.log('track progress percentage:', percent);
+		var myObj = {
+			"trackProgress": {
+				posPercent: percent
+			}
+		};
+		var myJSON = JSON.stringify(myObj);
+		socket.send(myJSON);
+ 	});
+
 	function postRendering(event, data) {
 		Object.keys(data.instance._model.data).forEach(function (key, index) {
 
@@ -1298,7 +1355,8 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 						"themes" : { "stripes" : true },
 						'data' : {	text: '/',
 									state: {
-										opened: true
+										opened: true,
+										selected: true
 									},
 									type: 'folder',
 									children: [],
@@ -1327,7 +1385,11 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 							'icon': "fa fa-folder"
 						}
 					},
-				plugins: ["contextmenu", "themes", "types"],
+				plugins: ["contextmenu", "themes", "types", "search"],
+                "search": {
+                    "case_sensitive": false,
+                    "show_only_matches": true
+                },
 				contextmenu: {
 					items: function(nodeId) {
 						var ref = $('#explorerTree').jstree(true);
@@ -1459,6 +1521,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 
 		socket.onopen = function () {
 			setInterval(ping, 15000);
+			setInterval(getTrackProgress, 1000);
 			// clear old socket messages
     		socket.sendBuffer = [];
 			socket.send('{"settings":{"settings":"settings"}}');	// request settings
@@ -1493,6 +1556,9 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 			  if (socketMsg.status == "ok") {
 				  toastr.success(i18next.t("toast.success"));
 			  }
+			  if (socketMsg.status == "dropout") {
+				  toastr.warning(i18next.t("toast.dropout"));
+			  }
 		  } if ("pong" in socketMsg) {
 			if (socketMsg.pong == 'pong') {
 				  pong();
@@ -1501,7 +1567,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 				volumeSlider.setValue(parseInt(socketMsg.volume));
 			} if ("trackinfo" in socketMsg) {
 				document.getElementById('track').innerHTML = socketMsg.trackinfo.name;
-
+				setTrackProgress(socketMsg.trackinfo);
 				var btnTrackPlayPause = document.getElementById('nav-btn-play');
 				if (socketMsg.trackinfo.pausePlay) {
 					btnTrackPlayPause.innerHTML = '<i id="ico-play-pause" class="fas fa-lg fa-play"></i>';
@@ -1527,6 +1593,8 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 					btnTrackLast.classList.remove("disabled");
 					btnTrackNext.classList.remove("disabled");
 				}
+			} if ("trackProgress" in socketMsg) {
+				setTrackProgress(socketMsg.trackProgress);
 			} if ("coverimg" in socketMsg) {
 				document.getElementById('coverimg').src = "/cover?" + new Date().getTime();
 			} if ("settings" in socketMsg) {
@@ -1566,6 +1634,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 			$('#voltageIndicatorLow').bootstrapSlider('setValue', defSettings.indicatorLow);
 			$('#voltageIndicatorHigh').bootstrapSlider('setValue', defSettings.indicatorHi);
 			$('#voltageCheckInterval').bootstrapSlider('setValue', defSettings.voltageCheckInterval);
+			$('#criticalVoltage').bootstrapSlider('setValue', defSettings.criticalVoltage);
 		}
 		// wifi
 		let wifiSettings = settings.wifi;
@@ -1592,6 +1661,12 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 			$('#warningLowVoltage').bootstrapSlider('setValue', batSettings.warnLowVoltage);
 			$('#voltageIndicatorLow').bootstrapSlider('setValue', batSettings.indicatorLow);
 			$('#voltageIndicatorHigh').bootstrapSlider('setValue', batSettings.indicatorHi);
+			if (batSettings.criticalVoltage) {
+				document.getElementById('criticalVoltageSection').setAttribute('data-visible', true);
+				$('#criticalVoltage').bootstrapSlider('setValue', batSettings.criticalVoltage);
+			} else {
+				document.getElementById('criticalVoltageSection').setAttribute('data-visible', false);
+			}
 			$('#voltageCheckInterval').bootstrapSlider('setValue', batSettings.voltageCheckInterval);
 		}
 		// ftp
@@ -1820,6 +1895,37 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		clearTimeout(tm);
 	}
 
+	async function getTrackProgress() {
+		if (ActiveTab !== 'nav-control-tab') {
+			return;
+		};
+		// use http request here, websocket comminication seems to be unstable with many messages
+		let data = await (await fetch("/trackprogress")).json();
+		if (data && data.trackProgress) {
+			// console.log(data.trackProgress);
+			setTrackProgress(data.trackProgress);
+		} else {
+			console.log("failed to fetch trackprogress: " + data);
+		}
+		return;
+	}
+
+	function setTrackProgress(msg) {
+		// console.log(msg);
+		$("#trackProgress").css('width', msg.posPercent + "%");
+		if (msg.duration > 0) {
+			document.getElementById('playtime').innerHTML = secondsToTime(msg.time) + " / " + secondsToTime(msg.duration);
+		} else {
+			if (msg.time > 0) {
+				document.getElementById('playtime').innerHTML = secondsToTime(msg.time);
+			} else {
+				document.getElementById('playtime').innerHTML = "-- / --";
+			}
+		}
+	}
+
+
+
 	function genSettings(clickedId) {
 		lastIdclicked = clickedId;
 		var myObj = {
@@ -1835,6 +1941,7 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 				warnLowVoltage: document.getElementById('warningLowVoltage').value,
 				indicatorLow: document.getElementById('voltageIndicatorLow').value,
 				indicatorHi: document.getElementById('voltageIndicatorHigh').value,
+				criticalVoltage: document.getElementById('criticalVoltage').value,
 				voltageCheckInterval: document.getElementById('voltageCheckInterval').value
 			}
 		};
@@ -1977,6 +2084,10 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		await rebuildSSIDList();
 	}
 
+	function searchFiles(searchText) {
+		$('#explorerTree').jstree('search', searchText);
+	}
+
 	function sendControl(cmd) {
 		var myObj = {
 			"controls": {
@@ -2016,6 +2127,14 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		}
 	}
 
+	function secondsToTime(seconds) {
+		if (seconds < 3600) {
+			return new Date(seconds * 1000).toISOString().substring(14, 19);
+		} else {
+			return new Date(seconds * 1000).toISOString().slice(11, 19);
+		}
+	}
+
 	function secondsToDate(seconds) {
 		if (seconds == 0) {
 			return "--";
@@ -2060,7 +2179,9 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 		content += i18next.t("systeminfo.hardware", { hwmodel: info.hardware.model, hwrevision: info.hardware.revision, hwfreq: info.hardware.freq }) + "\n";
 		content += i18next.t("systeminfo.freeheap", { freeheap: info.memory.freeHeap }) + "\n";
 		content += i18next.t("systeminfo.largestfreeblock", { largestfreeblock: info.memory.largestFreeBlock }) + "\n";
-		content += i18next.t("systeminfo.freepsram", { freepsram: info.memory.freePSRam }) + "\n";
+		if (info.memory.freePSRam) {
+			content += i18next.t("systeminfo.freepsram", { freepsram: info.memory.freePSRam }) + "\n";
+		}
 		content += i18next.t("systeminfo.currentip", { currentip: info.wifi.ip }) + "\n";
 		content += i18next.t("systeminfo.rssi", { rssi: info.wifi.rssi }) + "\n";
 		content += i18next.t("systeminfo.audiotimetotal", { firststart: secondsToDate(info.audio.firstStart), audiotimetotal: timestampToDuration(info.audio.playtimeTotal, false)})+ "\n";
@@ -2123,7 +2244,6 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 			shutdownDevice();
 		}); 
 		
-		console.log(parseInt(document.getElementById('warningLowVoltage').value));
 		$(function () {
 			$('[data-toggle="tooltip"]').tooltip();
 		});
diff --git a/platformio.ini b/platformio.ini
index 69aa6e62..054c182d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,7 +16,7 @@ default_envs = lolin_d32_pro_sdmmc_pe
 board_build.flash_mode = qio
 board_build.bootloader = dio
 board_build.partitions = custom_4mb_noota.csv
-platform = espressif32@^6.4.0
+platform = espressif32@^6.5.0
 ;platform = espressif32
 ;platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
 ;framework = arduino
@@ -31,15 +31,15 @@ extra_scripts =
     pre:updateSdkConfig.py
     pre:processHtml.py
 lib_deps =
-	https://github.com/schreibfaul1/ESP32-audioI2S.git#2ef8cf7
-	https://github.com/madhephaestus/ESP32Encoder.git#61aef9c
+	https://github.com/schreibfaul1/ESP32-audioI2S.git#17f0e04 ;10.01.2024
+	https://github.com/madhephaestus/ESP32Encoder.git#e59e460
 	https://github.com/knolleary/pubsubclient.git#2d228f2
 	https://github.com/peterus/ESP-FTP-Server-Lib#554959f
 	https://github.com/tueddy/FastLED.git#3.6.0_IRAM ;save some IRAM to compile with all features (https://github.com/FastLED/FastLED.git@3.6.0)
 	https://github.com/me-no-dev/ESPAsyncWebServer.git#1d46269
 	https://github.com/me-no-dev/AsyncTCP.git#ca8ac5f
-	https://github.com/bblanchon/ArduinoJson.git#3e1be98
-	https://github.com/pschatzmann/ESP32-A2DP.git#10db711
+	https://github.com/bblanchon/ArduinoJson.git#40ee05c
+	https://github.com/pschatzmann/ESP32-A2DP.git#96d37bc
 	https://github.com/Arduino-IRremote/Arduino-IRremote.git#ed94895
 	https://github.com/kkloesener/MFRC522_I2C.git#121a27e
 	https://github.com/miguelbalboa/rfid.git#ba72b92
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index dd04cb6e..d8c7e420 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -34,7 +34,7 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_SPEED_80M=y
 # CONFIG_SPIRAM_BOOT_INIT is not set
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
 CONFIG_ESP32_ULP_COPROC_ENABLED=y
diff --git a/src/AudioPlayer.cpp b/src/AudioPlayer.cpp
index 888fe944..0a7ff590 100644
--- a/src/AudioPlayer.cpp
+++ b/src/AudioPlayer.cpp
@@ -39,10 +39,17 @@ static uint8_t AudioPlayer_MaxVolumeSpeaker = AUDIOPLAYER_VOLUME_MAX;
 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;
+
 // Playtime stats
 time_t playTimeSecTotal = 0;
 time_t playTimeSecSinceStart = 0;
 
+// current station logo url
+static String AudioPlayer_StationLogoUrl;
+
 #ifdef HEADPHONE_ADJUST_ENABLE
 static bool AudioPlayer_HeadphoneLastDetectionState;
 static uint32_t AudioPlayer_HeadphoneLastDetectionTimestamp = 0u;
@@ -117,6 +124,7 @@ void AudioPlayer_Init(void) {
 	// clear title and cover image
 	gPlayProperties.title[0] = '\0';
 	gPlayProperties.coverFilePos = 0;
+	AudioPlayer_StationLogoUrl = "";
 
 	// Don't start audio-task in BT-speaker mode!
 	if ((System_GetOperationMode() == OPMODE_NORMAL) || (System_GetOperationMode() == OPMODE_BLUETOOTH_SOURCE)) {
@@ -217,13 +225,23 @@ time_t AudioPlayer_GetPlayTimeSinceStart(void) {
 	return (playTimeSecSinceStart * 1000);
 }
 
+uint32_t AudioPlayer_GetCurrentTime(void) {
+	return AudioPlayer_CurrentTime;
+}
+
+uint32_t AudioPlayer_GetFileDuration(void) {
+	return AudioPlayer_FileDuration;
+}
+
+String AudioPlayer_GetStationLogoUrl(void) {
+	return AudioPlayer_StationLogoUrl;
+}
+
 void Audio_setTitle(const char *format, ...) {
-	char buf[256];
 	va_list args;
 	va_start(args, format);
-	vsnprintf(buf, sizeof(buf) / sizeof(buf[0]), format, args);
+	vsnprintf(gPlayProperties.title, sizeof(gPlayProperties.title) / sizeof(gPlayProperties.title[0]), format, args);
 	va_end(args);
-	convertAsciiToUtf8(buf, gPlayProperties.title);
 
 	// notify web ui and mqtt
 	Web_SendWebsocketData(0, 30);
@@ -337,7 +355,9 @@ void AudioPlayer_Task(void *parameter) {
 	audio->setI2SCommFMT_LSB(true);
 #endif
 
-	uint8_t settleCount = 0;
+	constexpr uint32_t playbackTimeout = 2000;
+	uint32_t playbackTimeoutStart = millis();
+
 	AudioPlayer_CurrentVolume = AudioPlayer_GetInitVolume();
 	audio->setPinout(I2S_BCLK, I2S_LRC, I2S_DOUT);
 	audio->setVolume(AudioPlayer_CurrentVolume, VOLUMECURVE);
@@ -350,6 +370,9 @@ void AudioPlayer_Task(void *parameter) {
 	static BaseType_t trackQStatus;
 	static uint8_t trackCommand = NO_ACTION;
 	bool audioReturnCode;
+	AudioPlayer_CurrentTime = 0;
+	AudioPlayer_FileDuration = 0;
+	static uint32_t AudioPlayer_LastPlaytimeStatsTimestamp = 0u;
 
 	for (;;) {
 		/*
@@ -370,15 +393,37 @@ void AudioPlayer_Task(void *parameter) {
 			Log_Printf(LOGLEVEL_INFO, newCntrlReceivedQueue, trackCommand);
 		}
 
+		// 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)
+			if (!gPlayProperties.playlistFinished && !gPlayProperties.isWebstream) {
+				if (!gPlayProperties.pausePlay && (gPlayProperties.seekmode != SEEK_POS_PERCENT) && (audio->getFileSize() > 0)) { // To progress necessary when paused
+					gPlayProperties.currentRelPos = ((double) (audio->getFilePos() - audio->inBufferFilled()) / (double) audio->getFileSize()) * 100;
+				}
+			} else {
+				// calc current fillbuffer percent for webstream
+				if (gPlayProperties.isWebstream && (audio->inBufferSize() > 0)) {
+					gPlayProperties.currentRelPos = (double) (audio->inBufferFilled() / (double) audio->inBufferSize()) * 100;
+				} else {
+					gPlayProperties.currentRelPos = 0;
+				}
+			}
+		}
+
 		trackQStatus = xQueueReceive(gTrackQueue, &gPlayProperties.playlist, 0);
 		if (trackQStatus == pdPASS || gPlayProperties.trackFinished || trackCommand != NO_ACTION) {
 			if (trackQStatus == pdPASS) {
-				if (gPlayProperties.pausePlay) {
-					gPlayProperties.pausePlay = false;
-				}
 				audio->stopSong();
 				Log_Printf(LOGLEVEL_NOTICE, newPlaylistReceived, gPlayProperties.numberOfTracks);
 				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, gPlayProperties.playMode, false);
@@ -393,7 +438,7 @@ void AudioPlayer_Task(void *parameter) {
 			}
 			if (gPlayProperties.trackFinished) {
 				gPlayProperties.trackFinished = false;
-				if (gPlayProperties.playMode == NO_PLAYLIST) {
+				if (gPlayProperties.playMode == NO_PLAYLIST || gPlayProperties.playlist == nullptr) {
 					gPlayProperties.playlistFinished = true;
 					continue;
 				}
@@ -404,6 +449,8 @@ void AudioPlayer_Task(void *parameter) {
 					}
 				}
 				if (gPlayProperties.sleepAfterCurrentTrack) { // Go to sleep if "sleep after track" was requested
+					gPlayProperties.playlistFinished = true;
+					gPlayProperties.playMode = NO_PLAYLIST;
 					System_RequestSleep();
 					break;
 				}
@@ -678,8 +725,8 @@ void AudioPlayer_Task(void *parameter) {
 				}
 				if (gPlayProperties.startAtFilePos > 0) {
 					audio->setFilePos(gPlayProperties.startAtFilePos);
+					Log_Printf(LOGLEVEL_NOTICE, trackStartatPos, gPlayProperties.startAtFilePos);
 					gPlayProperties.startAtFilePos = 0;
-					Log_Printf(LOGLEVEL_NOTICE, trackStartatPos, audio->getFilePos());
 				}
 				if (gPlayProperties.isWebstream) {
 					if (gPlayProperties.numberOfTracks > 1) {
@@ -714,6 +761,13 @@ void AudioPlayer_Task(void *parameter) {
 				} else {
 					System_IndicateError();
 				}
+			} else if ((gPlayProperties.seekmode == SEEK_POS_PERCENT) && (gPlayProperties.currentRelPos > 0) && (gPlayProperties.currentRelPos < 100)) {
+				uint32_t newFilePos = uint32_t((double) (gPlayProperties.currentRelPos / 100) * audio->getFileSize());
+				if (audio->setFilePos(newFilePos)) {
+					Log_Printf(LOGLEVEL_NOTICE, JumpToPosition, newFilePos, audio->getFileSize());
+				} else {
+					System_IndicateError();
+				}
 			}
 			gPlayProperties.seekmode = SEEK_NORMAL;
 		}
@@ -779,17 +833,6 @@ void AudioPlayer_Task(void *parameter) {
 			}
 		}
 
-		// Calculate relative position in file (for neopixel) for SD-card-mode
-		if (!gPlayProperties.playlistFinished && !gPlayProperties.isWebstream) {
-			if (millis() % 20 == 0) { // Keep it simple
-				if (!gPlayProperties.pausePlay && (audio->getFileSize() > 0)) { // To progress necessary when paused
-					gPlayProperties.currentRelPos = ((double) (audio->getFilePos() - audio->inBufferFilled()) / (double) audio->getFileSize()) * 100;
-				}
-			}
-		} else {
-			gPlayProperties.currentRelPos = 0;
-		}
-
 		audio->loop();
 		if (gPlayProperties.playlistFinished || gPlayProperties.pausePlay) {
 			if (!gPlayProperties.currentSpeechActive) {
@@ -800,16 +843,24 @@ void AudioPlayer_Task(void *parameter) {
 		}
 
 		if (audio->isRunning()) {
-			settleCount = 0;
+			playbackTimeoutStart = millis();
 		}
 
-		// If error occured: remove playlist from ESPuino
-		if (gPlayProperties.playMode != NO_PLAYLIST && gPlayProperties.playMode != BUSY && !audio->isRunning() && !gPlayProperties.pausePlay) {
-			if (settleCount++ == 50) { // Hack to give audio some time to settle down after playlist was generated
-				gPlayProperties.playlistFinished = true;
-				gPlayProperties.playMode = NO_PLAYLIST;
-				settleCount = 0;
+		// 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();
 			}
+		} else {
+			// we are idle, update timeout so that we do not get a spurious error when launching into a playlist
+			playbackTimeoutStart = millis();
 		}
 		if ((System_GetOperationMode() == OPMODE_BLUETOOTH_SOURCE) && audio->isRunning()) {
 			// do not delay here, audio task is time critical in BT-Source mode
@@ -986,7 +1037,7 @@ void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _l
 			gPlayProperties.sleepAfterCurrentTrack = true;
 			gPlayProperties.playUntilTrackNumber = 0;
 			gPlayProperties.numberOfTracks = 1; // Limit number to 1 even there are more entries in the playlist
-			Led_ResetToNightBrightness();
+			Led_SetNightmode(true);
 			Log_Println(modeSingleTrackRandom, LOGLEVEL_NOTICE);
 			AudioPlayer_RandomizePlaylist(musicFiles, gPlayProperties.numberOfTracks);
 			xQueueSend(gTrackQueue, &(musicFiles), 0);
@@ -1084,7 +1135,7 @@ size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const char *_tra
 	if (_numberOfTracks > 1) {
 		const char s = '/';
 		const char *last = strrchr(_track, s);
-		char *first = strchr(_track, s);
+		const char *first = strchr(_track, s);
 		unsigned long substr = last - first + 1;
 		if (substr <= sizeof(trackBuf) / sizeof(trackBuf[0])) {
 			snprintf(trackBuf, substr, _track); // save substring basename(_track)
@@ -1159,6 +1210,7 @@ void AudioPlayer_SortPlaylist(char **arr, int n) {
 // Clear cover send notification
 void AudioPlayer_ClearCover(void) {
 	gPlayProperties.coverFilePos = 0;
+	AudioPlayer_StationLogoUrl = "";
 	// websocket and mqtt notify cover image has changed
 	Web_SendWebsocketData(0, 40);
 #ifdef MQTT_ENABLE
@@ -1169,6 +1221,10 @@ void AudioPlayer_ClearCover(void) {
 // Some mp3-lib-stuff (slightly changed from default)
 void audio_info(const char *info) {
 	Log_Printf(LOGLEVEL_INFO, "info        : %s", info);
+	if (startsWith((char *) info, "slow stream, dropouts")) {
+		// websocket notify for slow stream
+		Web_SendWebsocketData(0, 3);
+	}
 }
 
 void audio_id3data(const char *info) { // id3 metadata
@@ -1220,6 +1276,21 @@ void audio_commercial(const char *info) { // duration in sec
 
 void audio_icyurl(const char *info) { // homepage
 	Log_Printf(LOGLEVEL_INFO, "icyurl      : %s", info);
+	if ((String(info) != "") && (AudioPlayer_StationLogoUrl == "")) {
+		// has station homepage, get favicon url
+		AudioPlayer_StationLogoUrl = "https://www.google.com/s2/favicons?sz=256&domain_url=" + String(info);
+		// websocket and mqtt notify station logo has changed
+		Web_SendWebsocketData(0, 40);
+	}
+}
+
+void audio_icylogo(const char *info) { // logo
+	Log_Printf(LOGLEVEL_INFO, "icylogo      : %s", info);
+	if (String(info) != "") {
+		AudioPlayer_StationLogoUrl = info;
+		// websocket and mqtt notify station logo has changed
+		Web_SendWebsocketData(0, 40);
+	}
 }
 
 void audio_lasthost(const char *info) { // stream URL played
diff --git a/src/AudioPlayer.h b/src/AudioPlayer.h
index 7fcb8870..836129a6 100644
--- a/src/AudioPlayer.h
+++ b/src/AudioPlayer.h
@@ -56,3 +56,6 @@ bool Audio_Detect_Mode_HP(bool _state);
 void Audio_setTitle(const char *format, ...);
 time_t AudioPlayer_GetPlayTimeSinceStart(void);
 time_t AudioPlayer_GetPlayTimeAllTime(void);
+uint32_t AudioPlayer_GetCurrentTime(void);
+uint32_t AudioPlayer_GetFileDuration(void);
+String AudioPlayer_GetStationLogoUrl(void);
diff --git a/src/Battery.cpp b/src/Battery.cpp
index 0d9c7066..5f69df5c 100644
--- a/src/Battery.cpp
+++ b/src/Battery.cpp
@@ -29,8 +29,14 @@ void Battery_Init(void) {
 		Battery_LogStatus();
 
 		Log_Println(batteryCriticalMsg, LOGLEVEL_NOTICE);
+		// turn off peripheral power just to be sure, even if it should not yet have been turned on
+		Power_PeripheralOff();
 		// Power down and enter deepsleep
-		System_RequestSleep();
+		// Don't call System_RequestSleep() here: If the battery is critial, we want to avoid as much init work as possible
+		// and also any blinking lights or sounds. The goal is to just stay off.
+		// Additionally, LPCD will not be enabled. This is intentional to avoid battery drain.
+		delay(200);
+		esp_deep_sleep_start();
 	}
 	#endif
 }
diff --git a/src/Bluetooth.cpp b/src/Bluetooth.cpp
index f45bdba2..31676d3c 100644
--- a/src/Bluetooth.cpp
+++ b/src/Bluetooth.cpp
@@ -39,7 +39,7 @@ const char *getType() {
 #ifdef BLUETOOTH_ENABLE
 // for esp_a2d_connection_state_t see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/bluetooth/esp_a2dp.html#_CPPv426esp_a2d_connection_state_t
 void connection_state_changed(esp_a2d_connection_state_t state, void *ptr) {
-	Log_Printf(LOGLEVEL_INFO, "Bluetooth %s => connection state: %s", getType(), ((BluetoothA2DPCommon *) ptr)->to_str(state));
+	Log_Printf(LOGLEVEL_INFO, "Bluetooth %s => connection state: %s (Free heap: %u Bytes)", getType(), ((BluetoothA2DPCommon *) ptr)->to_str(state), ESP.getFreeHeap());
 	if (System_GetOperationMode() == OPMODE_BLUETOOTH_SINK) {
 		// for Neopixel (indicator LEDs) use the webstream mode
 		gPlayProperties.isWebstream = false;
@@ -52,7 +52,7 @@ void connection_state_changed(esp_a2d_connection_state_t state, void *ptr) {
 #ifdef BLUETOOTH_ENABLE
 // for esp_a2d_audio_state_t see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/bluetooth/esp_a2dp.html#_CPPv421esp_a2d_audio_state_t
 void audio_state_changed(esp_a2d_audio_state_t state, void *ptr) {
-	Log_Printf(LOGLEVEL_INFO, "Bluetooth %s => audio state: %s", getType(), ((BluetoothA2DPCommon *) ptr)->to_str(state));
+	Log_Printf(LOGLEVEL_INFO, "Bluetooth %s => audio state: %s (Free heap: %u Bytes)", getType(), ((BluetoothA2DPCommon *) ptr)->to_str(state), ESP.getFreeHeap());
 	if (System_GetOperationMode() == OPMODE_BLUETOOTH_SINK) {
 		// set play/pause status
 		gPlayProperties.pausePlay = (state != ESP_A2D_AUDIO_STATE_STARTED);
diff --git a/src/Button.cpp b/src/Button.cpp
index 7680a991..49469c24 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -268,6 +268,7 @@ void Button_DoButtonActions(void) {
 		gButtons[5].isPressed = false;
 		Cmd_Action(BUTTON_MULTI_45);
 	} else {
+		unsigned long currentTimestamp = millis();
 		for (uint8_t i = 0; i <= 5; i++) {
 			if (gButtons[i].isPressed) {
 				uint8_t Cmd_Short = 0;
@@ -305,20 +306,19 @@ void Button_DoButtonActions(void) {
 						break;
 				}
 
-				if (gButtons[i].lastReleasedTimestamp > gButtons[i].lastPressedTimestamp) {
+				if (gButtons[i].lastReleasedTimestamp > gButtons[i].lastPressedTimestamp) { // short action
 					if (gButtons[i].lastReleasedTimestamp - gButtons[i].lastPressedTimestamp < intervalToLongPress) {
 						Cmd_Action(Cmd_Short);
 					} else {
-						// if not volume buttons than start action after button release
-						if (Cmd_Long != CMD_VOLUMEUP && Cmd_Long != CMD_VOLUMEDOWN) {
+						// sleep-mode should only be triggered on release, otherwise it will wake it up directly again
+						if (Cmd_Long == CMD_SLEEPMODE) {
 							Cmd_Action(Cmd_Long);
 						}
 					}
 
 					gButtons[i].isPressed = false;
-				} else if (Cmd_Long == CMD_VOLUMEUP || Cmd_Long == CMD_VOLUMEDOWN) {
-					unsigned long currentTimestamp = millis();
 
+				} else if (Cmd_Long == CMD_VOLUMEUP || Cmd_Long == CMD_VOLUMEDOWN) { // volume-buttons
 					// only start action if intervalToLongPress has been reached
 					if (currentTimestamp - gButtons[i].lastPressedTimestamp > intervalToLongPress) {
 
@@ -332,6 +332,13 @@ void Button_DoButtonActions(void) {
 
 						gLongPressTime = remainder;
 					}
+
+				} else if (Cmd_Long != CMD_SLEEPMODE) { // long action, if not sleep-mode
+					// start action if intervalToLongPress has been reached
+					if ((currentTimestamp - gButtons[i].lastPressedTimestamp) > intervalToLongPress) {
+						gButtons[i].isPressed = false;
+						Cmd_Action(Cmd_Long);
+					}
 				}
 			}
 		}
diff --git a/src/Cmd.cpp b/src/Cmd.cpp
index 85b48485..23e27049 100644
--- a/src/Cmd.cpp
+++ b/src/Cmd.cpp
@@ -13,6 +13,22 @@
 #include "System.h"
 #include "Wlan.h"
 
+static void Cmd_HandleSleepAction(bool enable, const char *enLogMsg, const char *enMqttMsg) {
+	Led_SetNightmode(enable);
+	if (enable) {
+		Log_Println(enLogMsg, LOGLEVEL_INFO);
+#ifdef MQTT_ENABLE
+		publishMqtt(topicSleepTimerState, enMqttMsg, false);
+#endif
+	} else {
+		System_DisableSleepTimer();
+		Log_Println(modificatorSleepd, LOGLEVEL_INFO);
+#ifdef MQTT_ENABLE
+		publishMqtt(topicSleepTimerState, "0", false);
+#endif
+	}
+}
+
 void Cmd_Action(const uint16_t mod) {
 	switch (mod) {
 		case CMD_LOCK_BUTTONS_MOD: { // Locks/unlocks all buttons
@@ -81,27 +97,9 @@ void Cmd_Action(const uint16_t mod) {
 
 			gPlayProperties.sleepAfterPlaylist = false;
 			gPlayProperties.playUntilTrackNumber = 0;
+			gPlayProperties.sleepAfterCurrentTrack = !gPlayProperties.sleepAfterCurrentTrack;
 
-			if (gPlayProperties.sleepAfterCurrentTrack) {
-				gPlayProperties.sleepAfterCurrentTrack = false;
-				Log_Println(modificatorSleepAtEOTd, LOGLEVEL_NOTICE);
-#ifdef MQTT_ENABLE
-				publishMqtt(topicSleepTimerState, "0", false);
-#endif
-				Led_ResetToInitialBrightness();
-			} else {
-				System_DisableSleepTimer();
-				gPlayProperties.sleepAfterCurrentTrack = true;
-				Log_Println(modificatorSleepAtEOT, LOGLEVEL_NOTICE);
-#ifdef MQTT_ENABLE
-				publishMqtt(topicSleepTimerState, "EOT", false);
-#endif
-				Led_ResetToNightBrightness();
-			}
-
-#ifdef MQTT_ENABLE
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
-#endif
+			Cmd_HandleSleepAction(gPlayProperties.sleepAfterCurrentTrack, modificatorSleepAtEOT, "EOT");
 			System_IndicateOk();
 			break;
 		}
@@ -112,28 +110,11 @@ void Cmd_Action(const uint16_t mod) {
 				System_IndicateError();
 				return;
 			}
-			if (gPlayProperties.sleepAfterPlaylist) {
-				System_DisableSleepTimer();
-				gPlayProperties.sleepAfterPlaylist = false;
-#ifdef MQTT_ENABLE
-				publishMqtt(topicSleepTimerState, "0", false);
-#endif
-				Led_ResetToInitialBrightness();
-				Log_Println(modificatorSleepAtEOPd, LOGLEVEL_NOTICE);
-			} else {
-				gPlayProperties.sleepAfterPlaylist = true;
-				Led_ResetToNightBrightness();
-				Log_Println(modificatorSleepAtEOP, LOGLEVEL_NOTICE);
-#ifdef MQTT_ENABLE
-				publishMqtt(topicSleepTimerState, "EOP", false);
-#endif
-			}
-
 			gPlayProperties.sleepAfterCurrentTrack = false;
 			gPlayProperties.playUntilTrackNumber = 0;
-#ifdef MQTT_ENABLE
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
-#endif
+			gPlayProperties.sleepAfterPlaylist = !gPlayProperties.sleepAfterPlaylist;
+
+			Cmd_HandleSleepAction(gPlayProperties.sleepAfterCurrentTrack, modificatorSleepAtEOP, "EOP");
 			System_IndicateOk();
 			break;
 		}
@@ -147,36 +128,16 @@ void Cmd_Action(const uint16_t mod) {
 
 			gPlayProperties.sleepAfterCurrentTrack = false;
 			gPlayProperties.sleepAfterPlaylist = false;
-			System_DisableSleepTimer();
+			gPlayProperties.sleepAfter5Tracks = !gPlayProperties.sleepAfter5Tracks;
 
 			if (gPlayProperties.sleepAfter5Tracks) {
-				gPlayProperties.sleepAfter5Tracks = false;
-				gPlayProperties.playUntilTrackNumber = 0;
-#ifdef MQTT_ENABLE
-				publishMqtt(topicSleepTimerState, "0", false);
-#endif
-				Led_ResetToInitialBrightness();
-				Log_Println(modificatorSleepd, LOGLEVEL_NOTICE);
-			} else {
-				gPlayProperties.sleepAfter5Tracks = true;
-				if (gPlayProperties.currentTrackNumber + 5 > gPlayProperties.numberOfTracks) { // If currentTrack + 5 exceeds number of tracks in playlist, sleep after end of playlist
-					gPlayProperties.sleepAfterPlaylist = true;
-#ifdef MQTT_ENABLE
-					publishMqtt(topicSleepTimerState, "EOP", false);
-#endif
-				} else {
-					gPlayProperties.playUntilTrackNumber = gPlayProperties.currentTrackNumber + 5;
-#ifdef MQTT_ENABLE
-					publishMqtt(topicSleepTimerState, "EO5T", false);
-#endif
+				if (gPlayProperties.currentTrackNumber + 5 > gPlayProperties.numberOfTracks) {
+					// execute a sleep after end of playlist
+					Cmd_Action(CMD_SLEEP_AFTER_END_OF_PLAYLIST);
+					break;
 				}
-				Led_ResetToNightBrightness();
-				Log_Println(sleepTimerEO5, LOGLEVEL_NOTICE);
 			}
-
-#ifdef MQTT_ENABLE
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
-#endif
+			Cmd_HandleSleepAction(gPlayProperties.sleepAfter5Tracks, sleepTimerEO5, "EO5T");
 			System_IndicateOk();
 			break;
 		}
@@ -220,11 +181,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_DIMM_LEDS_NIGHTMODE: {
-#ifdef MQTT_ENABLE
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
-#endif
-			Log_Println(ledsDimmedToNightmode, LOGLEVEL_INFO);
-			Led_ResetToNightBrightness();
+			Led_ToggleNightmode();
 			System_IndicateOk();
 			break;
 		}
@@ -261,6 +218,21 @@ void Cmd_Action(const uint16_t mod) {
 			}
 			break;
 		}
+		case CMD_TOGGLE_MODE: {
+			if (System_GetOperationModeFromNvs() == OPMODE_NORMAL) {
+				System_IndicateOk();
+				System_SetOperationMode(OPMODE_BLUETOOTH_SINK);
+			} else if (System_GetOperationModeFromNvs() == OPMODE_BLUETOOTH_SINK) {
+				System_IndicateOk();
+				System_SetOperationMode(OPMODE_BLUETOOTH_SOURCE);
+			} else if (System_GetOperationModeFromNvs() == OPMODE_BLUETOOTH_SOURCE) {
+				System_IndicateOk();
+				System_SetOperationMode(OPMODE_NORMAL);
+			} else {
+				System_IndicateError();
+			}
+			break;
+		}
 #endif
 
 #ifdef FTP_ENABLE
@@ -302,7 +274,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_PLAYPAUSE: {
-			if (OPMODE_NORMAL == System_GetOperationMode()) {
+			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
 				AudioPlayer_TrackControlToQueueSender(PAUSEPLAY);
 			} else {
 				Bluetooth_PlayPauseTrack();
@@ -311,7 +283,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_PREVTRACK: {
-			if (OPMODE_NORMAL == System_GetOperationMode()) {
+			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
 				AudioPlayer_TrackControlToQueueSender(PREVIOUSTRACK);
 			} else {
 				Bluetooth_PreviousTrack();
@@ -320,7 +292,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_NEXTTRACK: {
-			if (OPMODE_NORMAL == System_GetOperationMode()) {
+			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
 				AudioPlayer_TrackControlToQueueSender(NEXTTRACK);
 			} else {
 				Bluetooth_NextTrack();
@@ -344,7 +316,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_VOLUMEUP: {
-			if (OPMODE_NORMAL == System_GetOperationMode()) {
+			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
 				AudioPlayer_VolumeToQueueSender(AudioPlayer_GetCurrentVolume() + 1, true);
 			} else {
 				Bluetooth_SetVolume(AudioPlayer_GetCurrentVolume() + 1, true);
@@ -353,7 +325,7 @@ void Cmd_Action(const uint16_t mod) {
 		}
 
 		case CMD_VOLUMEDOWN: {
-			if (OPMODE_NORMAL == System_GetOperationMode()) {
+			if ((OPMODE_NORMAL == System_GetOperationMode()) || (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode())) {
 				AudioPlayer_VolumeToQueueSender(AudioPlayer_GetCurrentVolume() - 1, true);
 			} else {
 				Bluetooth_SetVolume(AudioPlayer_GetCurrentVolume() - 1, true);
@@ -395,12 +367,10 @@ void Cmd_Action(const uint16_t mod) {
 			break;
 		}
 
-#ifdef ENABLE_ESPUINO_DEBUG
 		case PRINT_TASK_STATS: {
 			System_esp_print_tasks();
 			break;
 		}
-#endif
 
 		default: {
 			Log_Printf(LOGLEVEL_ERROR, modificatorDoesNotExist, mod);
diff --git a/src/Led.cpp b/src/Led.cpp
index f46f55cd..ba83eb9d 100644
--- a/src/Led.cpp
+++ b/src/Led.cpp
@@ -8,6 +8,7 @@
 #include "Bluetooth.h"
 #include "Button.h"
 #include "Log.h"
+#include "Mqtt.h"
 #include "Port.h"
 #include "System.h"
 #include "Wlan.h"
@@ -45,6 +46,9 @@ static bool Led_Pause = false; // Used to pause Neopixel-signalisation (while NV
 static uint8_t Led_InitialBrightness = LED_INITIAL_BRIGHTNESS;
 static uint8_t Led_Brightness = LED_INITIAL_BRIGHTNESS;
 static uint8_t Led_NightBrightness = LED_INITIAL_NIGHT_BRIGHTNESS;
+static bool Led_NightMode = false;
+static uint8_t Led_savedBrightness;
+
 constexpr uint8_t Led_IdleDotDistance = NUM_INDICATOR_LEDS / NUM_LEDS_IDLE_DOTS;
 
 static CRGBArray<NUM_INDICATOR_LEDS + NUM_CONTROL_LEDS> leds;
@@ -170,9 +174,40 @@ void Led_SetBrightness(uint8_t value) {
 	#ifdef BUTTONS_LED
 	Port_Write(BUTTONS_LED, value <= Led_NightBrightness ? LOW : HIGH, false);
 	#endif
+
+	#ifdef MQTT_ENABLE
+	publishMqtt(topicLedBrightnessState, Led_Brightness, false);
+	#endif
 #endif
 }
 
+void Led_SetNightmode(bool enabled) {
+	if (Led_NightMode == enabled) {
+		// we don't need to do anything
+		return;
+	}
+
+	const char *msg = ledsBrightnessRestored;
+	uint8_t newValue = Led_savedBrightness;
+	if (enabled) {
+		// we are switching to night mode
+		Led_savedBrightness = Led_Brightness;
+		msg = ledsDimmedToNightmode;
+		newValue = Led_NightBrightness;
+	}
+	Led_NightMode = enabled;
+	Led_SetBrightness(newValue);
+	Log_Println(msg, LOGLEVEL_INFO);
+}
+
+bool Led_GetNightmode() {
+	return Led_NightMode;
+}
+
+void Led_ToggleNightmode() {
+	Led_SetNightmode(!Led_NightMode);
+}
+
 // 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) {
@@ -743,7 +778,12 @@ AnimationReturnType Animation_Idle(const bool startNewAnimation, CRGBSet &leds)
 		CRGB::HTMLColorCode idleColor = Led_GetIdleColor();
 		leds = CRGB::Black;
 		Led_DrawIdleDots(leds, ledIndex, idleColor);
-		animationDelay = 50 * 10;
+		if (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode()) {
+			// animate a bit faster in BT-Source to distinguish between the bluetooth modes
+			animationDelay = 30 * 10;
+		} else {
+			animationDelay = 50 * 10;
+		}
 		ledIndex++;
 	} else {
 		animationActive = false;
@@ -929,7 +969,6 @@ AnimationReturnType Animation_PlaylistProgress(const bool startNewAnimation, CRG
 	static bool animationActive = false; // signals if the animation is currently active
 	int32_t animationDelay = 0;
 	// static variables for animation
-	static LedPlaylistProgressStates animationState = LedPlaylistProgressStates::Done; // Statemachine-variable of this animation
 	static uint32_t animationCounter = 0; // counter-variable to loop through leds or to wait
 	static uint32_t staticLastBarLenghtPlaylist = 0; // variable to remember the last length of the progress-bar (for connecting animations)
 	static uint32_t staticLastTrack = 0; // variable to remember the last track (for connecting animations)
@@ -939,6 +978,7 @@ AnimationReturnType Animation_PlaylistProgress(const bool startNewAnimation, CRG
 			const uint32_t ledValue = std::clamp<uint32_t>(map(gPlayProperties.currentTrackNumber, 0, gPlayProperties.numberOfTracks - 1, 0, leds.size() * DIMMABLE_STATES), 0, leds.size() * DIMMABLE_STATES);
 			const uint8_t fullLeds = ledValue / DIMMABLE_STATES;
 			const uint8_t lastLed = ledValue % DIMMABLE_STATES;
+			static LedPlaylistProgressStates animationState = LedPlaylistProgressStates::Done; // Statemachine-variable of this animation
 
 			if (LED_INDICATOR_IS_SET(LedIndicatorType::PlaylistProgress)) {
 				LED_INDICATOR_CLEAR(LedIndicatorType::PlaylistProgress);
@@ -1052,7 +1092,7 @@ AnimationReturnType Animation_BatteryMeasurement(const bool startNewAnimation, C
 	LED_INDICATOR_CLEAR(LedIndicatorType::Voltage);
 
 	if (startNewAnimation) {
-	#ifdef MEASURE_BATTERY_VOLTAGE
+	#ifdef BATTERY_MEASURE_ENABLE
 		float batteryLevel = Battery_EstimateLevel();
 	#else
 		float batteryLevel = 1.0f;
diff --git a/src/Led.h b/src/Led.h
index e36ef20a..4ba41036 100644
--- a/src/Led.h
+++ b/src/Led.h
@@ -68,3 +68,7 @@ uint8_t Led_GetBrightness(void);
 void Led_SetBrightness(uint8_t value);
 void Led_TaskPause(void);
 void Led_TaskResume(void);
+
+void Led_SetNightmode(bool enabled);
+bool Led_GetNightmode();
+void Led_ToggleNightmode();
diff --git a/src/LogMessages_DE.cpp b/src/LogMessages_DE.cpp
index 21582b56..05154fe5 100644
--- a/src/LogMessages_DE.cpp
+++ b/src/LogMessages_DE.cpp
@@ -90,11 +90,10 @@ const char modificatorSleepTimer60[] = "Modifikator: Sleep-Timer per RFID aktivi
 const char modificatorSleepTimer120[] = "Modifikator: Sleep-Timer per RFID aktiviert (2 Stunden).";
 const char ledsDimmedToNightmode[] = "LEDs wurden auf Nachtmodus gedimmt.";
 const char ledsDimmedToInitialValue[] = "LEDs wurden auf initiale Helligkeit gedimmt.";
+const char ledsBrightnessRestored[] = "LED Helligkeit wieder hergestellt.";
 const char modificatorNotallowedWhenIdle[] = "Modifikator kann bei nicht aktivierter Playlist nicht angewendet werden.";
 const char modificatorSleepAtEOT[] = "Modifikator: Sleep-Timer am Ende des Titels aktiviert.";
-const char modificatorSleepAtEOTd[] = "Modifikator: Sleep-Timer am Ende des Titels deaktiviert.";
 const char modificatorSleepAtEOP[] = "Modifikator: Sleep-Timer am Ende der Playlist aktiviert.";
-const char modificatorSleepAtEOPd[] = "Modifikator: Sleep-Timer am Ende der Playlist deaktiviert.";
 const char modificatorAllTrackAlphSortedLoop[] = "Modifikator: Alle Titel (alphabetisch sortiert) in Endlosschleife.";
 const char modificatorAllTrackRandomLoop[] = "Modifikator: Alle Titel (zufällige Reihenfolge) in Endlosschleife.";
 const char modificatorCurTrackLoop[] = "Modifikator: Aktueller Titel in Endlosschleife.";
@@ -190,7 +189,7 @@ const char ftpServerStarted[] = "FTP-Server gestartet";
 const char freeHeapAfterSetup[] = "Freier Heap-Speicher nach Setup-Routine";
 const char tryStaticIpConfig[] = "Statische IP-Konfiguration wird durchgeführt...";
 const char staticIPConfigFailed[] = "Statische IP-Konfiguration fehlgeschlagen";
-const char wakeUpRfidNoIso14443[] = "ESP32 wurde vom Kartenleser aus dem Deepsleep aufgeweckt. Allerdings wurde keine ISO-14443-Karte gefunden. Gehe zurück in den Deepsleep...";
+const char wakeUpRfidNoCard[] = "ESP32 wurde vom Kartenleser aus dem Deepsleep aufgeweckt. Allerdings wurde keine Karte gefunden. Gehe zurück in den Deepsleep...";
 const char lowPowerCardSuccess[] = "Kartenerkennung via 'low power' erfolgreich durchgeführt";
 const char rememberLastVolume[] = "Lautstärke vor dem letzten Shutdown wird wiederhergestellt. Dies überschreibt die Einstellung der initialen Lautstärke aus der GUI.";
 const char unableToStartFtpServer[] = "Der FTP-Server konnte nicht gestartet werden. Entweder weil er ist bereits gestartet oder kein WLAN verfügbar ist.";
@@ -216,6 +215,7 @@ const char noPlaylist[] = "Keine Playlist aktiv.";
 const char rfidTagRemoved[] = "RFID-Karte wurde entfernt";
 const char rfidTagReapplied[] = "RFID-Karte erneut aufgelegt";
 const char ftpEnableTooLate[] = "FTP kann nur innerhalb der ersten 30s aktiviert werden. Kinderschutz :-)";
+const char dateTimeRTC[] = "Datum/Uhrzeit (Interne RTC): %02d.%02d.%4d, %02d:%02d:%02d";
 const char syncingViaNtp[] = "Synchronisiere Uhrzeit via NTP...";
 const char ntpGotTime[] = "Datum/Uhrzeit empfangen von NTP-Server: %02d.%02d.%4d, %02d:%02d:%02d";
 const char ntpFailed[] = "NTP: Datum/Uhrzeit (noch) nicht verfügbar";
@@ -225,17 +225,20 @@ const char paOff[] = "Lautsprecher ausgeschaltet";
 const char hpOn[] = "Kopfhörer eingeschaltet";
 const char hpOff[] = "Kopfhörer ausgeschaltet";
 const char webTxCanceled[] = "Der Webtransfer wurde aufgrund von Inaktivität beendet.";
+const char webSaveSettingsError[] = "Einstellungen konnten nicht gespeichert werden für '%s'";
 const char tryToPickRandomDir[] = "Versuche ein zufälliges Unterverzeichnis zu finden aus: %s";
 const char pickedRandomDir[] = "Zufällig ausgewähltes Unterverzeichnis: %s";
 const char wrongWakeUpGpio[] = "Der gewählte GPIO ist nicht vom Typ RTC und unterstützt daher das Aufwecken des ESP32 nicht! (GPIO: %u)";
 const char currentlyPlaying[] = "'%s' wird abgespielt (%d von %d)";
 const char secondsJumpForward[] = "%d Sekunden nach vorne gesprungen";
 const char secondsJumpBackward[] = "%d Sekunden zurück gesprungen";
+const char JumpToPosition[] = "Sprung zu Position %u/%u";
 const char wroteLastTrackToNvs[] = "Schreibe '%s' in NVS für RFID-Card-ID %s mit Abspielmodus %d und letzter Track %u";
 const char wifiConnectionInProgress[] = "Versuche mit WLAN '%s' zu verbinden...";
 const char wifiConnectionSuccess[] = "Verbunden mit WLAN '%s' (Signalstärke: %d dBm, Kanal: %d, MAC-Adresse: %s)";
 const char wifiCurrentIp[] = "Aktuelle IP: %s";
 const char jsonErrorMsg[] = "deserializeJson() fehlgeschlagen: %s";
+const char jsonbufferOverflow[] = "JSON-Puffer zu klein für Daten";
 const char wifiDeleteNetwork[] = "Lösche gespeichertes WLAN %s";
 const char wifiNetworkLoaded[] = "SSID %d von NVS geladen: %s";
 const char wifiTooManyNetworks[] = "Anzahl der WLAN-Netze in NVS ist %d, aber es sind maximal %d erlaubt.";
diff --git a/src/LogMessages_EN.cpp b/src/LogMessages_EN.cpp
index c8db6dab..eb60e2d7 100644
--- a/src/LogMessages_EN.cpp
+++ b/src/LogMessages_EN.cpp
@@ -90,11 +90,10 @@ const char modificatorSleepTimer60[] = "Modificator: sleep-Timer enabled via RFI
 const char modificatorSleepTimer120[] = "Modificator: sleep-Timer enabled via RFID (2 hours).";
 const char ledsDimmedToNightmode[] = "Dimmed LEDs to nightmode.";
 const char ledsDimmedToInitialValue[] = "Dimmed LEDs to initial value.";
+const char ledsBrightnessRestored[] = "LED brightness restored.";
 const char modificatorNotallowedWhenIdle[] = "Modificator cannot be applied while playlist is inactive.";
 const char modificatorSleepAtEOT[] = "Modificator: adjusted sleep-timer to after end of current track.";
-const char modificatorSleepAtEOTd[] = "Modificator: disabled sleep-timer after end of current track.";
 const char modificatorSleepAtEOP[] = "Modificator: adjusted sleep-timer to after end of playlist.";
-const char modificatorSleepAtEOPd[] = "Modificator: disabled sleep-timer after end of playlist.";
 const char modificatorAllTrackAlphSortedLoop[] = "Modificator: adjusted to all tracks (in alph. order) as infinite loop.";
 const char modificatorAllTrackRandomLoop[] = "Modificator: adjusted to all tracks (in random order) as infinite loop.";
 const char modificatorCurTrackLoop[] = "Modificator: adjusted to current track as infinite loop.";
@@ -190,7 +189,7 @@ const char freeHeapAfterSetup[] = "Free heap after setup";
 const char ftpServerStarted[] = "FTP-Server started";
 const char tryStaticIpConfig[] = "Performing IP-configuration...";
 const char staticIPConfigFailed[] = "IP-configuration failed";
-const char wakeUpRfidNoIso14443[] = "Wakeup caused by low power card-detection. RF-field changed but no ISO-14443 card on reader was found. So I'll return back to sleep now...";
+const char wakeUpRfidNoCard[] = "Wakeup caused by low power card-detection. RF-field changed but no card on reader was found. So I'll return back to sleep now...";
 const char lowPowerCardSuccess[] = "Switch to low power card-detection: success";
 const char rememberLastVolume[] = "Restored volume used before last shutdown. This overwrites the initial volume configured via webgui.";
 const char unableToStartFtpServer[] = "FTP-server cannot be started. This is because FTP-service is already active or because WiFi is unavailable.";
@@ -216,6 +215,7 @@ const char noPlaylist[] = "No active playlist.";
 const char rfidTagRemoved[] = "RFID-tag removed";
 const char rfidTagReapplied[] = "RFID-tag reapplied";
 const char ftpEnableTooLate[] = "FTP can only be enabled within the first 30s after ESPuino-start. Child-protection :-)";
+const char dateTimeRTC[] = "Date/time (Internal RTC)): %02d.%02d.%4d, %02d:%02d:%02d";
 const char syncingViaNtp[] = "Getting current time via NTP...";
 const char ntpGotTime[] = "Received date/time from NTP server: %02d.%02d.%4d, %02d:%02d:%02d";
 const char ntpFailed[] = "Failed to obtain NTP time";
@@ -225,17 +225,20 @@ const char paOff[] = "Loudspeaker off";
 const char hpOn[] = "Headphones on";
 const char hpOff[] = "Headphones off";
 const char webTxCanceled[] = "Webtransfer canceled due to inactivity-timer.";
+const char webSaveSettingsError[] = "Failed to save settings for '%s'";
 const char tryToPickRandomDir[] = "Try to pick randon subdirectory out of: %s";
 const char pickedRandomDir[] = "Randomly picked subdirectory: %s";
 const char wrongWakeUpGpio[] = "GPIO choosen as wakeup-pin isn't of type RTC and that reason for can't wake up ESP32! (GPIO: %u)";
 const char currentlyPlaying[] = "'%s' is being played (%d of %d)";
 const char secondsJumpForward[] = "Jumped %d seconds forwards";
 const char secondsJumpBackward[] = "Jumped %d seconds backward";
+const char JumpToPosition[] = "Jumped to position %u/%u";
 const char wroteLastTrackToNvs[] = "Write '%s' to NVS for RFID-Card-ID %s with playmode %d and last track %u";
 const char wifiConnectionInProgress[] = "Try to connect to WiFi with SSID '%s'...";
 const char wifiConnectionSuccess[] = "Connected with WiFi '%s' (signal strength: %d dBm, channel: %d, BSSID: %s)";
 const char wifiCurrentIp[] = "Current IP: %s";
 const char jsonErrorMsg[] = "deserializeJson() failed: %s";
+const char jsonbufferOverflow[] = "JSON buffer too small for data";
 const char wifiDeleteNetwork[] = "Deleting saved WiFi %s";
 const char wifiNetworkLoaded[] = "Loaded SSID %d from NVS: %s";
 const char wifiTooManyNetworks[] = "Number of networks in NVS is %d, but that's more than the allowed %d";
diff --git a/src/Mqtt.cpp b/src/Mqtt.cpp
index 17161ac3..16148f8e 100644
--- a/src/Mqtt.cpp
+++ b/src/Mqtt.cpp
@@ -320,8 +320,7 @@ void Mqtt_ClientCallback(const char *topic, const byte *payload, uint32_t length
 			gPlayProperties.sleepAfterPlaylist = true;
 			Log_Println(sleepTimerEOP, LOGLEVEL_NOTICE);
 			publishMqtt(topicSleepTimerState, "EOP", false);
-			Led_ResetToNightBrightness();
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
+			Led_SetNightmode(true);
 			System_IndicateOk();
 			free(receivedString);
 			return;
@@ -329,8 +328,7 @@ void Mqtt_ClientCallback(const char *topic, const byte *payload, uint32_t length
 			gPlayProperties.sleepAfterCurrentTrack = true;
 			Log_Println(sleepTimerEOT, LOGLEVEL_NOTICE);
 			publishMqtt(topicSleepTimerState, "EOT", false);
-			Led_ResetToNightBrightness();
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
+			Led_SetNightmode(true);
 			System_IndicateOk();
 			free(receivedString);
 			return;
@@ -342,8 +340,7 @@ void Mqtt_ClientCallback(const char *topic, const byte *payload, uint32_t length
 			}
 			Log_Println(sleepTimerEO5, LOGLEVEL_NOTICE);
 			publishMqtt(topicSleepTimerState, "EO5T", false);
-			Led_ResetToNightBrightness();
-			publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
+			Led_SetNightmode(true);
 			System_IndicateOk();
 			free(receivedString);
 			return;
@@ -352,8 +349,8 @@ void Mqtt_ClientCallback(const char *topic, const byte *payload, uint32_t length
 				System_DisableSleepTimer();
 				Log_Println(sleepTimerStop, LOGLEVEL_NOTICE);
 				System_IndicateOk();
+				Led_SetNightmode(false);
 				publishMqtt(topicSleepState, 0, false);
-				publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
 				gPlayProperties.sleepAfterPlaylist = false;
 				gPlayProperties.sleepAfterCurrentTrack = false;
 				gPlayProperties.playUntilTrackNumber = 0;
@@ -447,7 +444,6 @@ void Mqtt_ClientCallback(const char *topic, const byte *payload, uint32_t length
 	// Check if LEDs should be dimmed
 	else if (strcmp_P(topic, topicLedBrightnessCmnd) == 0) {
 		Led_SetBrightness(strtoul(receivedString, NULL, 10));
-		publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
 	}
 
 	// Requested something that isn't specified?
diff --git a/src/Port.cpp b/src/Port.cpp
index 2536bdf7..7535f119 100644
--- a/src/Port.cpp
+++ b/src/Port.cpp
@@ -20,7 +20,7 @@
 extern TwoWire i2cBusTwo;
 
 uint8_t Port_ExpanderPortsInputChannelStatus[2];
-static uint8_t Port_ExpanderPortsOutputChannelStatus[2] = {255, 255}; // Stores current configuration of output-channels locally
+static uint8_t Port_ExpanderPortsOutputChannelStatus[2]; // Stores current configuration of output-channels locally
 void Port_ExpanderHandler(void);
 uint8_t Port_ChannelToBit(const uint8_t _channel);
 void Port_WriteInitMaskForOutputChannels(void);
@@ -30,7 +30,6 @@ void Port_Test(void);
 		#define PE_INTERRUPT_PIN_ENABLE
 void IRAM_ATTR PORT_ExpanderISR(void);
 bool Port_AllowReadFromPortExpander = false;
-bool Port_AllowInitReadFromPortExpander = true;
 	#endif
 #endif
 
@@ -38,14 +37,18 @@ void Port_Init(void) {
 #ifdef PORT_EXPANDER_ENABLE
 	Port_Test();
 	Port_WriteInitMaskForOutputChannels();
-	Port_ExpanderHandler();
 #endif
 
 #ifdef PE_INTERRUPT_PIN_ENABLE
 	pinMode(PE_INTERRUPT_PIN, INPUT_PULLUP);
-	attachInterrupt(PE_INTERRUPT_PIN, PORT_ExpanderISR, FALLING);
+	// ISR gets enabled in Port_ExpanderHandler()
 	Log_Println(portExpanderInterruptEnabled, LOGLEVEL_NOTICE);
 #endif
+
+#ifdef PORT_EXPANDER_ENABLE
+	Port_AllowReadFromPortExpander = true;
+	Port_ExpanderHandler();
+#endif
 }
 
 void Port_Cyclic(void) {
@@ -192,7 +195,17 @@ void Port_WriteInitMaskForOutputChannels(void) {
 	const uint8_t portBaseValueBitMask = 255;
 	const uint8_t portsToWrite = 2;
 	uint8_t OutputBitMaskInOutAsPerPort[portsToWrite] = {portBaseValueBitMask, portBaseValueBitMask}; // 255 => all channels set to input; [0]: port0, [1]: port1
-	uint8_t OutputBitMaskLowHighAsPerPort[portsToWrite] = {0x00, 0x00}; // Bit configured as 0 for an output-channels means: logic LOW
+
+	// init status cache with values from HW
+	i2cBusTwo.beginTransmission(expanderI2cAddress);
+	i2cBusTwo.write(0x02); // Pointer to first output-register
+	i2cBusTwo.endTransmission(false);
+	i2cBusTwo.requestFrom(expanderI2cAddress, static_cast<size_t>(portsToWrite), true); // ...and read the contents
+	if (i2cBusTwo.available() == portsToWrite) {
+		for (uint8_t i = 0; i < portsToWrite; i++) {
+			Port_ExpanderPortsOutputChannelStatus[i] = i2cBusTwo.read();
+		}
+	}
 
 	#ifdef GPIO_PA_EN // Set as output to enable/disable amp for loudspeaker
 	if (GPIO_PA_EN >= 100 && GPIO_PA_EN <= 107) {
@@ -230,6 +243,10 @@ void Port_WriteInitMaskForOutputChannels(void) {
 
 	// Only change port-config if necessary (at least bitmask changed from base-default for one port)
 	if ((OutputBitMaskInOutAsPerPort[0] != portBaseValueBitMask) || (OutputBitMaskInOutAsPerPort[1] != portBaseValueBitMask)) {
+		// all outputs to LOW
+		Port_ExpanderPortsOutputChannelStatus[0] &= OutputBitMaskInOutAsPerPort[0];
+		Port_ExpanderPortsOutputChannelStatus[1] &= OutputBitMaskInOutAsPerPort[1];
+
 		i2cBusTwo.beginTransmission(expanderI2cAddress);
 		i2cBusTwo.write(0x06); // Pointer to configuration of input/output
 		for (uint8_t i = 0; i < portsToWrite; i++) {
@@ -241,8 +258,7 @@ void Port_WriteInitMaskForOutputChannels(void) {
 		// Write low/high-config to all output-channels. Channels that are configured as input are silently/automatically ignored by PCA9555
 		i2cBusTwo.beginTransmission(expanderI2cAddress);
 		i2cBusTwo.write(0x02); // Pointer to configuration of output-channels (high/low)
-		i2cBusTwo.write(OutputBitMaskLowHighAsPerPort[0]); // port0
-		i2cBusTwo.write(OutputBitMaskLowHighAsPerPort[1]); // port1
+		i2cBusTwo.write(Port_ExpanderPortsOutputChannelStatus, static_cast<size_t>(portsToWrite));
 		i2cBusTwo.endTransmission();
 	}
 }
@@ -324,57 +340,80 @@ void Port_MakeSomeChannelsOutputForShutdown(void) {
 // Reads input-registers from port-expander and writes output into global cache-array
 // Datasheet: https://www.nxp.com/docs/en/data-sheet/PCA9555.pdf
 void Port_ExpanderHandler(void) {
-	static bool verifyChangeOfInputRegister[2] = {false, false}; // Used to debounce once in case of register-change
-	static uint8_t inputRegisterBuffer[2];
+	static uint32_t inputChanged = 0; // Used to debounce once in case of register-change
+	static uint32_t inputPrev = 0;
 
 	// If interrupt-handling is active, only read port-expander's registers if interrupt was fired
+	// or the next time if there was a change
 	#ifdef PE_INTERRUPT_PIN_ENABLE
-	if (!Port_AllowReadFromPortExpander && !Port_AllowInitReadFromPortExpander && !verifyChangeOfInputRegister[0] && !verifyChangeOfInputRegister[1]) {
-		return;
-	} else if (Port_AllowInitReadFromPortExpander) {
-		Port_AllowInitReadFromPortExpander = false;
-	} else if (Port_AllowReadFromPortExpander || Port_AllowInitReadFromPortExpander) {
+	if (Port_AllowReadFromPortExpander) {
 		Port_AllowReadFromPortExpander = false;
+	} else if (!inputChanged) {
+		return;
 	}
 	#endif
 
-	for (uint8_t i = 0; i < 2; i++) {
-		i2cBusTwo.beginTransmission(expanderI2cAddress);
-		i2cBusTwo.write(0x00 + i); // Pointer to input-register...
-		uint8_t error = i2cBusTwo.endTransmission();
-		if (error != 0) {
-			Log_Printf(LOGLEVEL_ERROR, "Error in endTransmission(): %d", error);
-			return;
+	i2cBusTwo.beginTransmission(expanderI2cAddress);
+	i2cBusTwo.write(0x00); // Pointer to input-register...
+	uint8_t error = i2cBusTwo.endTransmission(false);
+	if (error != 0) {
+		Log_Printf(LOGLEVEL_ERROR, "Error in endTransmission(): %d", error);
+		i2cBusTwo.endTransmission(true);
+
+	#ifdef PE_INTERRUPT_PIN_ENABLE
+		Port_AllowReadFromPortExpander = true;
+	#endif
+
+		return;
+	}
+	i2cBusTwo.requestFrom(expanderI2cAddress, 2u); // ...and read its bytes
+
+	if (i2cBusTwo.available() == 2) {
+		uint32_t inputCurr = 0;
+		for (uint8_t i = 0; i < 2; i++) {
+			inputCurr |= i2cBusTwo.read() << 8 * i; // Cache current readout
 		}
-		i2cBusTwo.requestFrom(expanderI2cAddress, 1u); // ...and read its byte
-
-		if (i2cBusTwo.available()) {
-			inputRegisterBuffer[i] = i2cBusTwo.read(); // Cache current readout
-			// Check if input-register changed. If so, don't use the value immediately
-			// but wait another cycle instead (=> rudimentary debounce).
-			// Added because there've been "ghost"-events occasionally with Arduino2 (https://forum.espuino.de/t/aktueller-stand-esp32-arduino-2/1389/55)
-			if (inputRegisterBuffer[i] != Port_ExpanderPortsInputChannelStatus[i] && millis() >= 10000 && !verifyChangeOfInputRegister[i]) {
-				verifyChangeOfInputRegister[i] = true;
-				// Serial.println("Verify set!");
-			} else {
-				verifyChangeOfInputRegister[i] = false;
-				Port_ExpanderPortsInputChannelStatus[i] = inputRegisterBuffer[i];
-			}
+
+		// Check if input-register changed. If so, don't use the changed bits immediately
+		// but wait another cycle instead (=> rudimentary debounce).
+		// Added because there've been "ghost"-events occasionally with Arduino2 (https://forum.espuino.de/t/aktueller-stand-esp32-arduino-2/1389/55)
+		inputChanged = inputPrev ^ inputCurr;
+
+		uint32_t inputStable = 0;
+		for (uint8_t i = 0; i < 2; i++) {
+			inputStable |= Port_ExpanderPortsInputChannelStatus[i] << 8 * i;
+		}
+
+		// update bits that were stable since the last run
+		inputStable &= inputChanged;
+		inputStable |= (~inputChanged & inputCurr);
+
+		for (uint8_t i = 0; i < 2; i++) {
+			Port_ExpanderPortsInputChannelStatus[i] = (inputStable >> 8 * i) & 0xff;
 			// Serial.printf("%u Debug: PE-Port: %u  Status: %u\n", millis(), i, Port_ExpanderPortsInputChannelStatus[i]);
 		}
+
+		inputPrev = inputCurr;
 	}
+
+	#ifdef PE_INTERRUPT_PIN_ENABLE
+	// input is stable; go back to interrupt mode
+	if (!inputChanged) {
+		attachInterrupt(digitalPinToInterrupt(PE_INTERRUPT_PIN), PORT_ExpanderISR, ONLOW);
+	}
+	#endif
 }
 
 // Make sure ports are read finally at shutdown in order to clear any active IRQs that could cause re-wakeup immediately
 void Port_Exit(void) {
 	Port_MakeSomeChannelsOutputForShutdown();
-	for (uint8_t i = 0; i < 2; i++) {
-		i2cBusTwo.beginTransmission(expanderI2cAddress);
-		i2cBusTwo.write(0x00 + i); // Pointer to input-register...
-		i2cBusTwo.endTransmission();
-		i2cBusTwo.requestFrom(expanderI2cAddress, 1u); // ...and read its byte
+	i2cBusTwo.beginTransmission(expanderI2cAddress);
+	i2cBusTwo.write(0x00); // Pointer to input-registers...
+	i2cBusTwo.endTransmission();
+	i2cBusTwo.requestFrom(expanderI2cAddress, 2u); // ...and read its bytes
 
-		if (i2cBusTwo.available()) {
+	if (i2cBusTwo.available() == 2) {
+		for (uint8_t i = 0; i < 2; i++) {
 			Port_ExpanderPortsInputChannelStatus[i] = i2cBusTwo.read();
 		}
 	}
@@ -393,7 +432,14 @@ void Port_Test(void) {
 
 	#ifdef PE_INTERRUPT_PIN_ENABLE
 void IRAM_ATTR PORT_ExpanderISR(void) {
-	Port_AllowReadFromPortExpander = true;
+	// check if the interrupt pin is actually low and only if it is
+	// trigger the handler (there are a lot of false calls to this ISR
+	// where the interrupt pin isn't low...)
+	Port_AllowReadFromPortExpander = !digitalRead(PE_INTERRUPT_PIN);
+	// until the interrupt is handled we don't need any more ISR calls
+	if (Port_AllowReadFromPortExpander) {
+		detachInterrupt(digitalPinToInterrupt(PE_INTERRUPT_PIN));
+	}
 }
 	#endif
 #endif
diff --git a/src/RfidCommon.cpp b/src/RfidCommon.cpp
index 0cf9e473..3ab279a3 100644
--- a/src/RfidCommon.cpp
+++ b/src/RfidCommon.cpp
@@ -46,9 +46,6 @@ void Rfid_PreferenceLookupHandler(void) {
 		if (!s.compareTo("-1")) {
 			Log_Println(rfidTagUnknownInNvs, LOGLEVEL_ERROR);
 			System_IndicateError();
-	#ifdef DONT_ACCEPT_SAME_RFID_TWICE_ENABLE
-			strncpy(gOldRfidTagId, gCurrentRfidTagId, cardIdStringSize - 1); // Even if not found in NVS: accept it as card last applied
-	#endif
 			// allow to escape from bluetooth mode with an unknown card, switch back to normal mode
 			System_SetOperationMode(OPMODE_NORMAL);
 			return;
diff --git a/src/RfidMfrc522.cpp b/src/RfidMfrc522.cpp
index f59e3144..83e98dbf 100644
--- a/src/RfidMfrc522.cpp
+++ b/src/RfidMfrc522.cpp
@@ -43,6 +43,11 @@ void Rfid_Init(void) {
 	// Init RC522 Card-Reader
 	#if defined(RFID_READER_TYPE_MFRC522_I2C) || defined(RFID_READER_TYPE_MFRC522_SPI)
 	mfrc522.PCD_Init();
+	delay(10);
+	// Get the MFRC522 firmware version, should be 0x91 or 0x92
+	byte firmwareVersion = mfrc522.PCD_ReadRegister(MFRC522::VersionReg);
+	Log_Printf(LOGLEVEL_DEBUG, "RC522 firmware version=%#lx", firmwareVersion);
+
 	mfrc522.PCD_SetAntennaGain(rfidGain);
 	delay(50);
 	Log_Println(rfidScannerReady, LOGLEVEL_DEBUG);
@@ -74,7 +79,6 @@ void Rfid_Task(void *parameter) {
 		String cardIdString;
 	#ifdef PAUSE_WHEN_RFID_REMOVED
 		byte lastValidcardId[cardIdSize];
-		bool cardAppliedCurrentRun = false;
 		bool sameCardReapplied = false;
 	#endif
 		if ((millis() - Rfid_LastRfidCheckTimestamp) >= RFID_SCAN_INTERVAL) {
@@ -91,9 +95,6 @@ void Rfid_Task(void *parameter) {
 			if (!mfrc522.PICC_ReadCardSerial()) {
 				continue;
 			}
-	#ifdef PAUSE_WHEN_RFID_REMOVED
-			cardAppliedCurrentRun = true;
-	#endif
 
 	#ifndef PAUSE_WHEN_RFID_REMOVED
 			mfrc522.PICC_HaltA();
@@ -180,7 +181,6 @@ void Rfid_Task(void *parameter) {
 			}
 			mfrc522.PICC_HaltA();
 			mfrc522.PCD_StopCrypto1();
-			cardAppliedCurrentRun = false;
 	#endif
 		}
 	}
diff --git a/src/RfidPn5180.cpp b/src/RfidPn5180.cpp
index a5df7932..5122df3a 100644
--- a/src/RfidPn5180.cpp
+++ b/src/RfidPn5180.cpp
@@ -73,6 +73,7 @@ void Rfid_Init(void) {
 		i2cBusTwo.begin(ext_IIC_DATA, ext_IIC_CLK);
 		delay(50);
 		Port_Init();
+		Port_Cyclic();
 		uint8_t irqState = Port_Read(RFID_IRQ);
 		if (irqState == LOW) {
 			Log_Println("Wakeup caused by low power card-detection on port-expander", LOGLEVEL_NOTICE);
@@ -391,7 +392,18 @@ void Rfid_WakeupCheck(void) {
 	nfc14443.reset();
 	// enable RF field
 	nfc14443.setupRF();
-	if (!nfc14443.isCardPresent()) {
+	// 1.check for ISO-14443 card present
+	bool isCardPresent = nfc14443.isCardPresent();
+	if (!isCardPresent) {
+		// 2.check for ISO-15693 card present
+		static PN5180ISO15693 nfc15693(RFID_CS, RFID_BUSY, RFID_RST);
+		nfc15693.begin();
+		nfc15693.setupRF();
+		uint8_t uid[10];
+		isCardPresent = nfc15693.getInventory(uid) == ISO15693_EC_OK;
+	}
+	if (!isCardPresent) {
+		// no card found, go back to deep sleep
 		nfc14443.reset();
 		uint16_t wakeupCounterInMs = 0x3FF; //  needs to be in the range of 0x0 - 0xA82. max wake-up time is 2960 ms.
 		if (nfc14443.switchToLPCD(wakeupCounterInMs)) {
@@ -409,7 +421,7 @@ void Rfid_WakeupCheck(void) {
 			gpio_hold_en(gpio_num_t(RFID_CS)); // CS/NSS
 			gpio_hold_en(gpio_num_t(RFID_RST)); // RST
 			gpio_deep_sleep_hold_en();
-			Log_Println(wakeUpRfidNoIso14443, LOGLEVEL_ERROR);
+			Log_Println(wakeUpRfidNoCard, LOGLEVEL_ERROR);
 			esp_deep_sleep_start();
 		} else {
 			Log_Println("switchToLPCD failed", LOGLEVEL_ERROR);
diff --git a/src/SdCard.cpp b/src/SdCard.cpp
index e6b1e1f3..b8595fbc 100644
--- a/src/SdCard.cpp
+++ b/src/SdCard.cpp
@@ -255,7 +255,7 @@ char **SdCard_ReturnPlaylist(const char *fileName, const uint32_t _playMode) {
 
 	// Parse m3u-playlist and create linear-playlist out of it
 	if (_playMode == LOCAL_M3U) {
-		if (fileOrDirectory && !fileOrDirectory.isDirectory() && fileOrDirectory.size() > 0) {
+		if (!fileOrDirectory.isDirectory() && fileOrDirectory.size() > 0) {
 			enablePlaylistFromM3u = true;
 			uint16_t allocCount = 1;
 			uint16_t allocSize = psramInit() ? 65535 : 1024; // There's enough PSRAM. So we don't have to care...
diff --git a/src/System.cpp b/src/System.cpp
index a37b6711..3d18fe5d 100644
--- a/src/System.cpp
+++ b/src/System.cpp
@@ -74,14 +74,14 @@ bool System_SetSleepTimer(uint8_t minutes) {
 	if (System_SleepTimerStartTimestamp && (System_SleepTimer == minutes)) {
 		System_SleepTimerStartTimestamp = 0u;
 		System_SleepTimer = 0u;
-		Led_ResetToInitialBrightness();
+		Led_SetNightmode(false);
 		Log_Println(modificatorSleepd, LOGLEVEL_NOTICE);
 	} else {
 		System_SleepTimerStartTimestamp = millis();
 		System_SleepTimer = minutes;
 		sleepTimerEnabled = true;
 
-		Led_ResetToNightBrightness();
+		Led_SetNightmode(true);
 		if (minutes == 15) {
 			Log_Println(modificatorSleepTimer15, LOGLEVEL_NOTICE);
 		} else if (minutes == 30) {
@@ -95,7 +95,6 @@ bool System_SetSleepTimer(uint8_t minutes) {
 
 #ifdef MQTT_ENABLE
 	publishMqtt(topicSleepTimerState, System_GetSleepTimer(), false);
-	publishMqtt(topicLedBrightnessState, Led_GetBrightness(), false);
 #endif
 
 	return sleepTimerEnabled;
@@ -103,7 +102,7 @@ bool System_SetSleepTimer(uint8_t minutes) {
 
 void System_DisableSleepTimer(void) {
 	System_SleepTimerStartTimestamp = 0u;
-	Led_ResetToInitialBrightness();
+	Led_SetNightmode(false);
 }
 
 bool System_IsSleepTimerEnabled(void) {
@@ -263,11 +262,13 @@ void System_ShowWakeUpReason() {
 	}
 }
 
-#ifdef ENABLE_ESPUINO_DEBUG
 void System_esp_print_tasks(void) {
+#ifdef CONFIG_FREERTOS_USE_TRACE_FACILITY
 	char *pbuffer = (char *) calloc(2048, 1);
 	vTaskGetRunTimeStats(pbuffer);
 	Serial.printf("=====\n%s\n=====", pbuffer);
 	free(pbuffer);
-}
+#else
+	Serial.println("Enable CONFIG_FREERTOS_USE_TRACE_FACILITY to use vTaskGetRunTimeStats()!");
 #endif
+}
diff --git a/src/Web.cpp b/src/Web.cpp
index 4ee59a4d..0f404d76 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -63,6 +63,7 @@ static void explorerHandleDeleteRequest(AsyncWebServerRequest *request);
 static void explorerHandleCreateRequest(AsyncWebServerRequest *request);
 static void explorerHandleRenameRequest(AsyncWebServerRequest *request);
 static void explorerHandleAudioRequest(AsyncWebServerRequest *request);
+static void handleTrackProgressRequest(AsyncWebServerRequest *request);
 static void handleGetSavedSSIDs(AsyncWebServerRequest *request);
 static void handlePostSavedSSIDs(AsyncWebServerRequest *request, JsonVariant &json);
 static void handleDeleteSavedSSIDs(AsyncWebServerRequest *request);
@@ -77,6 +78,7 @@ static void handleDeleteRFIDRequest(AsyncWebServerRequest *request);
 static void handleGetInfo(AsyncWebServerRequest *request);
 static void handleGetSettings(AsyncWebServerRequest *request);
 static void handlePostSettings(AsyncWebServerRequest *request, JsonVariant &json);
+static void handleDebugRequest(AsyncWebServerRequest *request);
 
 static void onWebsocketEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
 static void settingsToJSON(JsonObject obj, const String section);
@@ -282,11 +284,16 @@ static void handleWiFiScanRequest(AsyncWebServerRequest *request) {
 	json = String();
 }
 
+unsigned long lastCleanupClientsTimestamp;
+
 void Web_Cyclic(void) {
 	webserverStart();
-	ws.cleanupClients();
+	if ((millis() - lastCleanupClientsTimestamp) > 1000u) {
+		// cleanup closed/deserted websocket clients once per second
+		lastCleanupClientsTimestamp = millis();
+		ws.cleanupClients();
+	}
 }
-
 // handle not found
 void notFound(AsyncWebServerRequest *request) {
 	Log_Printf(LOGLEVEL_ERROR, "%s not found, redirect to startpage", request->url().c_str());
@@ -316,12 +323,17 @@ void webserverStart(void) {
 			} else {
 				if (WiFi.getMode() == WIFI_STA) {
 					// serve management.html in station-mode
+#ifdef NO_SDCARD
+					response = request->beginResponse_P(200, "text/html", (const uint8_t *) management_BIN, sizeof(management_BIN));
+					response->addHeader("Content-Encoding", "gzip");
+#else
 					if (gFSystem.exists("/.html/index.htm")) {
-						response = request->beginResponse(gFSystem, "/.html/index.htm", String(), false);
+						response = request->beginResponse(gFSystem, "/.html/index.htm", "text/html", false);
 					} else {
 						response = request->beginResponse_P(200, "text/html", (const uint8_t *) management_BIN, sizeof(management_BIN));
 						response->addHeader("Content-Encoding", "gzip");
 					}
+#endif
 				} else {
 					// serve accesspoint.html in AP-mode
 					response = request->beginResponse_P(200, "text/html", (const uint8_t *) accesspoint_BIN, sizeof(accesspoint_BIN));
@@ -415,13 +427,21 @@ void webserverStart(void) {
 			AsyncResponseStream *response = request->beginResponseStream("text/html");
 			response->println("<!DOCTYPE html><html><head> <meta charset='utf-8'><title>ESPuino runtime stats</title>");
 			response->println("<meta http-equiv='refresh' content='2'>"); // refresh page every 2 seconds
-			response->println("</head><body>Tasklist:<div class='text'><pre>");
+			response->print("</head><body>");
+			// show memory usage
+			response->println("Memory:<div class='text'><pre>");
+			response->println("Free heap: " + String(ESP.getFreeHeap()));
+			response->println("Largest free block: " + String(ESP.getMaxAllocHeap()));
+			response->println("</pre></div><br>");
 			// show tasklist
+			response->println("Tasklist:<div class='text'><pre>");
+			response->println("Taskname\tState\tPrio\tStack\tNum\tCore");
 			char *pbuffer = (char *) calloc(2048, 1);
 			vTaskList(pbuffer);
 			response->println(pbuffer);
 			response->println("</pre></div><br><br>Runtime statistics:<div class='text'><pre>");
-			// show vTaskGetRunTimeStats()
+			response->println("Taskname\tRuntime\tPercentage");
+			// show runtime stats
 			vTaskGetRunTimeStats(pbuffer);
 			response->println(pbuffer);
 			response->println("</pre></div></body></html>");
@@ -430,6 +450,8 @@ void webserverStart(void) {
 			request->send(response);
 		});
 #endif
+		// debug info
+		wServer.on("/debug", HTTP_GET, handleDebugRequest);
 
 		// erase all RFID-assignments from NVS
 		wServer.on("/rfidnvserase", HTTP_POST, [](AsyncWebServerRequest *request) {
@@ -446,6 +468,7 @@ void webserverStart(void) {
 
 		// RFID
 		wServer.on("/rfid", HTTP_GET, handleGetRFIDRequest);
+		wServer.addRewrite(new OneParamRewrite("/rfid/ids-only", "/rfid?ids-only=true"));
 		wServer.addHandler(new AsyncCallbackJsonWebHandler("/rfid", handlePostRFIDRequest));
 		wServer.addRewrite(new OneParamRewrite("/rfid/{id}", "/rfid?id={id}"));
 		wServer.on("/rfid", HTTP_DELETE, handleDeleteRFIDRequest);
@@ -472,6 +495,8 @@ void webserverStart(void) {
 
 		wServer.on("/exploreraudio", HTTP_POST, explorerHandleAudioRequest);
 
+		wServer.on("/trackprogress", HTTP_GET, handleTrackProgressRequest);
+
 		wServer.on("/savedSSIDs", HTTP_GET, handleGetSavedSSIDs);
 		wServer.addHandler(new AsyncCallbackJsonWebHandler("/savedSSIDs", handlePostSavedSSIDs));
 
@@ -487,6 +512,7 @@ void webserverStart(void) {
 
 		// ESPuino logo
 		wServer.on("/logo", HTTP_GET, [](AsyncWebServerRequest *request) {
+#ifndef NO_SDCARD
 			Log_Println("logo request", LOGLEVEL_DEBUG);
 			if (gFSystem.exists("/.html/logo.png")) {
 				request->send(gFSystem, "/.html/logo.png", "image/png");
@@ -496,14 +522,17 @@ void webserverStart(void) {
 				request->send(gFSystem, "/.html/logo.svg", "image/svg+xml");
 				return;
 			};
+#endif
 			request->redirect("https://www.espuino.de/Espuino.webp");
 		});
 		// ESPuino favicon
 		wServer.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request) {
+#ifndef NO_SDCARD
 			if (gFSystem.exists("/.html/favicon.ico")) {
 				request->send(gFSystem, "/.html/favicon.png", "image/x-icon");
 				return;
 			};
+#endif
 			request->redirect("https://espuino.de/espuino/favicon.ico");
 		});
 		// ESPuino settings
@@ -545,33 +574,33 @@ bool JSONToSettings(JsonObject doc) {
 	if (doc.containsKey("general")) {
 		// general settings
 		if (gPrefsSettings.putUInt("initVolume", doc["general"]["initVolume"].as<uint8_t>()) == 0 || gPrefsSettings.putUInt("maxVolumeSp", doc["general"]["maxVolumeSp"].as<uint8_t>()) == 0 || gPrefsSettings.putUInt("maxVolumeHp", doc["general"]["maxVolumeHp"].as<uint8_t>()) == 0 || gPrefsSettings.putUInt("mInactiviyT", doc["general"]["sleepInactivity"].as<uint8_t>()) == 0) {
-			Log_Println("Failed to save general settings", LOGLEVEL_ERROR);
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "general");
 			return false;
 		}
 	}
 	if (doc.containsKey("wifi")) {
 		// WiFi settings
-		static String hostName = doc["wifi"]["hostname"];
+		String hostName = doc["wifi"]["hostname"];
 		if (!Wlan_ValidateHostname(hostName)) {
 			Log_Println("Invalid hostname", LOGLEVEL_ERROR);
 			return false;
 		}
 		if (((!Wlan_SetHostname(hostName)) || gPrefsSettings.putBool("ScanWiFiOnStart", doc["wifi"]["scanOnStart"].as<bool>()) == 0)) {
-			Log_Println("Failed to save wifi settings", LOGLEVEL_ERROR);
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "wifi");
 			return false;
 		}
 	}
 	if (doc.containsKey("led")) {
 		// Neopixel settings
 		if (gPrefsSettings.putUChar("iLedBrightness", doc["led"]["initBrightness"].as<uint8_t>()) == 0 || gPrefsSettings.putUChar("nLedBrightness", doc["led"]["nightBrightness"].as<uint8_t>()) == 0) {
-			Log_Println("Failed to save LED settings", LOGLEVEL_ERROR);
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "led");
 			return false;
 		}
 	}
 	if (doc.containsKey("battery")) {
 		// Battery settings
-		if (gPrefsSettings.putFloat("wLowVoltage", doc["battery"]["warnLowVoltage"].as<float>()) == 0 || gPrefsSettings.putFloat("vIndicatorLow", doc["battery"]["indicatorLow"].as<float>()) == 0 || gPrefsSettings.putFloat("vIndicatorHigh", doc["battery"]["indicatorHi"].as<float>()) == 0 || gPrefsSettings.putUInt("vCheckIntv", doc["battery"]["voltageCheckInterval"].as<uint8_t>()) == 0) {
-			Log_Println("Failed to save battery settings", LOGLEVEL_ERROR);
+		if (gPrefsSettings.putFloat("wLowVoltage", doc["battery"]["warnLowVoltage"].as<float>()) == 0 || gPrefsSettings.putFloat("vIndicatorLow", doc["battery"]["indicatorLow"].as<float>()) == 0 || gPrefsSettings.putFloat("vIndicatorHigh", doc["battery"]["indicatorHi"].as<float>()) == 0 || gPrefsSettings.putFloat("wCritVoltage", doc["battery"]["criticalVoltage"].as<float>()) == 0 || gPrefsSettings.putUInt("vCheckIntv", doc["battery"]["voltageCheckInterval"].as<uint8_t>()) == 0) {
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "battery");
 			return false;
 		}
 		Battery_Init();
@@ -584,7 +613,7 @@ bool JSONToSettings(JsonObject doc) {
 		gPrefsSettings.putString("ftppassword", (String) _ftpPwd);
 		// Check if settings were written successfully
 		if (!(String(_ftpUser).equals(gPrefsSettings.getString("ftpuser", "-1")) || String(_ftpPwd).equals(gPrefsSettings.getString("ftppassword", "-1")))) {
-			Log_Println("Failed to save ftp settings", LOGLEVEL_ERROR);
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "ftp");
 			return false;
 		}
 	} else if (doc.containsKey("ftpStatus")) {
@@ -609,7 +638,7 @@ bool JSONToSettings(JsonObject doc) {
 		gPrefsSettings.putUInt("mqttPort", _mqttPort);
 
 		if ((gPrefsSettings.getUChar("enableMQTT", 99) != _mqttEnable) || (!String(_mqttServer).equals(gPrefsSettings.getString("mqttServer", "-1")))) {
-			Log_Println("Failed to save mqtt settings", LOGLEVEL_ERROR);
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "mqtt");
 			return false;
 		}
 	}
@@ -621,7 +650,7 @@ bool JSONToSettings(JsonObject doc) {
 		gPrefsSettings.putString("btPinCode", (String) btPinCode);
 		// Check if settings were written successfully
 		if (gPrefsSettings.getString("btDeviceName", "") != _btDeviceName || gPrefsSettings.getString("btPinCode", "") != btPinCode) {
-			Log_Println("Failed to save bluetooth settings", LOGLEVEL_ERROR);
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "bluetooth");
 			return false;
 		}
 	} else if (doc.containsKey("rfidMod")) {
@@ -687,6 +716,12 @@ bool JSONToSettings(JsonObject doc) {
 		Web_SendWebsocketData(0, 60);
 	} else if (doc.containsKey("ssids")) {
 		Web_SendWebsocketData(0, 70);
+	} else if (doc.containsKey("trackProgress")) {
+		if (doc["trackProgress"].containsKey("posPercent")) {
+			gPlayProperties.seekmode = SEEK_POS_PERCENT;
+			gPlayProperties.currentRelPos = doc["trackProgress"]["posPercent"].as<uint8_t>();
+		}
+		Web_SendWebsocketData(0, 80);
 	}
 
 	return true;
@@ -717,15 +752,11 @@ static void settingsToJSON(JsonObject obj, const String section) {
 	if (section == "ssids") {
 		// saved SSID's
 		JsonObject ssidsObj = obj.createNestedObject("ssids");
-		static String ssids[10];
-
 		JsonArray ssidArr = ssidsObj.createNestedArray("savedSSIDs");
-		size_t len = Wlan_GetSSIDs(ssids, 10);
-		if (len > 0) {
-			for (int i = 0; i < len; i++) {
-				ssidArr.add(ssids[i]);
-			}
-		}
+		Wlan_GetSavedNetworks([ssidArr](const WiFiSettings &network) {
+			ssidArr.add(network.ssid);
+		});
+
 		// active SSID
 		if (Wlan_IsConnected()) {
 			ssidsObj["active"] = Wlan_GetCurrentSSID();
@@ -739,13 +770,19 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		ledObj["nightBrightness"].set(gPrefsSettings.getUChar("nLedBrightness", 0));
 	}
 #endif
-#ifdef MEASURE_BATTERY_VOLTAGE
+#ifdef BATTERY_MEASURE_ENABLE
 	if ((section == "") || (section == "battery")) {
 		// battery settings
 		JsonObject batteryObj = obj.createNestedObject("battery");
+	#ifdef MEASURE_BATTERY_VOLTAGE
 		batteryObj["warnLowVoltage"].set(gPrefsSettings.getFloat("wLowVoltage", s_warningLowVoltage));
 		batteryObj["indicatorLow"].set(gPrefsSettings.getFloat("vIndicatorLow", s_voltageIndicatorLow));
 		batteryObj["indicatorHi"].set(gPrefsSettings.getFloat("vIndicatorHigh", s_voltageIndicatorHigh));
+		#ifdef SHUTDOWN_ON_BAT_CRITICAL
+		batteryObj["criticalVoltage"].set(gPrefsSettings.getFloat("wCritVoltage", s_warningCriticalVoltage));
+		#endif
+	#endif
+
 		batteryObj["voltageCheckInterval"].set(gPrefsSettings.getUInt("vCheckIntv", s_batteryCheckInterval));
 	}
 #endif
@@ -760,10 +797,15 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		defaultsObj["initBrightness"].set(16u); // LED_INITIAL_BRIGHTNESS
 		defaultsObj["nightBrightness"].set(2u); // LED_INITIAL_NIGHT_BRIGHTNESS
 #endif
-#ifdef MEASURE_BATTERY_VOLTAGE
+#ifdef BATTERY_MEASURE_ENABLE
+	#ifdef MEASURE_BATTERY_VOLTAGE
 		defaultsObj["warnLowVoltage"].set(s_warningLowVoltage);
 		defaultsObj["indicatorLow"].set(s_voltageIndicatorLow);
 		defaultsObj["indicatorHi"].set(s_voltageIndicatorHigh);
+		#ifdef SHUTDOWN_ON_BAT_CRITICAL
+		defaultsObj["criticalVoltage"].set(s_warningCriticalVoltage);
+		#endif
+	#endif
 		defaultsObj["voltageCheckInterval"].set(s_batteryCheckInterval);
 #endif
 	}
@@ -845,7 +887,7 @@ void handleGetInfo(AsyncWebServerRequest *request) {
 		JsonObject memoryObj = infoObj.createNestedObject("memory");
 		memoryObj["freeHeap"] = ESP.getFreeHeap();
 		memoryObj["largestFreeBlock"] = (uint32_t) heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
-		if (psramInit()) {
+		if (psramFound()) {
 			memoryObj["freePSRam"] = ESP.getFreePsram();
 		}
 	}
@@ -887,6 +929,10 @@ void handleGetInfo(AsyncWebServerRequest *request) {
 
 	String serializedJsonString;
 	serializeJson(infoObj, serializedJsonString);
+	if (doc.overflowed()) {
+		// JSON buffer too small for data
+		Log_Println(jsonbufferOverflow, LOGLEVEL_ERROR);
+	}
 	request->send(200, "application/json; charset=utf-8", serializedJsonString);
 	System_UpdateActivityTimer();
 }
@@ -900,14 +946,18 @@ void handleGetSettings(AsyncWebServerRequest *request) {
 		section = request->getParam("section")->value();
 	}
 #ifdef BOARD_HAS_PSRAM
-	SpiRamJsonDocument doc(8192);
+	SpiRamJsonDocument doc(2048);
 #else
-	StaticJsonDocument<8192> doc;
+	StaticJsonDocument<2048> doc;
 #endif
 	JsonObject settingsObj = doc.createNestedObject("settings");
 	settingsToJSON(settingsObj, section);
 	String serializedJsonString;
 	serializeJson(settingsObj, serializedJsonString);
+	if (doc.overflowed()) {
+		// JSON buffer too small for data
+		Log_Println(jsonbufferOverflow, LOGLEVEL_ERROR);
+	}
 	request->send(200, "application/json; charset=utf-8", serializedJsonString);
 }
 
@@ -922,6 +972,53 @@ void handlePostSettings(AsyncWebServerRequest *request, JsonVariant &json) {
 	}
 }
 
+// handle debug request
+// returns memory and task runtime information as JSON
+void handleDebugRequest(AsyncWebServerRequest *request) {
+
+#ifdef BOARD_HAS_PSRAM
+	SpiRamJsonDocument doc(1000);
+#else
+	StaticJsonDocument<1000> doc;
+#endif
+
+	JsonObject infoObj = doc.createNestedObject("info");
+#ifdef CONFIG_FREERTOS_USE_TRACE_FACILITY
+	// task runtime info
+	TaskStatus_t task_status_arr[20];
+	uint32_t pulTotalRunTime;
+	uint32_t taskNum = uxTaskGetNumberOfTasks();
+
+	Log_Printf(LOGLEVEL_DEBUG, "number of tasks: %u", taskNum);
+
+	uxTaskGetSystemState(task_status_arr, 20, &pulTotalRunTime);
+
+	JsonObject tasksObj = infoObj.createNestedObject("tasks");
+	tasksObj["taskCount"] = taskNum;
+	tasksObj["totalRunTime"] = pulTotalRunTime;
+	JsonArray tasksList = tasksObj.createNestedArray("tasksList");
+
+	for (int i = 0; i < taskNum; i++) {
+		JsonObject taskObj = tasksList.createNestedObject();
+
+		float ulStatsAsPercentage = 100.f * ((float) task_status_arr[i].ulRunTimeCounter / (float) pulTotalRunTime);
+
+		taskObj["name"] = task_status_arr[i].pcTaskName;
+		taskObj["runtimeCounter"] = task_status_arr[i].ulRunTimeCounter;
+		taskObj["core"] = task_status_arr[i].xCoreID;
+		taskObj["runtimePercentage"] = ulStatsAsPercentage;
+		taskObj["stackHighWaterMark"] = task_status_arr[i].usStackHighWaterMark;
+	}
+#endif
+	String serializedJsonString;
+	serializeJson(infoObj, serializedJsonString);
+	if (doc.overflowed()) {
+		// JSON buffer too small for data
+		Log_Println(jsonbufferOverflow, LOGLEVEL_ERROR);
+	}
+	request->send(200, "application/json; charset=utf-8", serializedJsonString);
+}
+
 // Takes inputs from webgui, parses JSON and saves values in NVS
 // If operation was successful (NVS-write is verified) true is returned
 bool processJsonRequest(char *_serialJson) {
@@ -948,8 +1045,25 @@ bool processJsonRequest(char *_serialJson) {
 // Sends JSON-answers via websocket
 void Web_SendWebsocketData(uint32_t client, uint8_t code) {
 	if (!webserverStarted) {
+		// webserver not yet started
+		return;
+	}
+	if (ws.count() == 0) {
+		// we do not have any webclient connected
 		return;
 	}
+	// check if we can send message to the client(s)
+	if (client == 0) {
+		if (!ws.availableForWriteAll()) {
+			Log_Println("Websocket: Cannot send data (Too many messages queued)!", LOGLEVEL_ERROR);
+			return;
+		}
+	} else {
+		if (!ws.availableForWrite(client)) {
+			Log_Printf(LOGLEVEL_ERROR, "Websocket: Cannot send data to client %d (Too many messages queued)!", client);
+			return;
+		}
+	}
 	char *jBuf = (char *) x_calloc(1024, sizeof(char));
 	StaticJsonDocument<1024> doc;
 	JsonObject object = doc.to<JsonObject>();
@@ -958,6 +1072,8 @@ void Web_SendWebsocketData(uint32_t client, uint8_t code) {
 		object["status"] = "ok";
 	} else if (code == 2) {
 		object["status"] = "error";
+	} else if (code == 3) {
+		object["status"] = "dropout";
 	} else if (code == 10) {
 		object["rfidId"] = gCurrentRfidTagId;
 	} else if (code == 20) {
@@ -972,6 +1088,8 @@ void Web_SendWebsocketData(uint32_t client, uint8_t code) {
 		entry["numberOfTracks"] = gPlayProperties.numberOfTracks;
 		entry["volume"] = AudioPlayer_GetCurrentVolume();
 		entry["name"] = gPlayProperties.title;
+		entry["posPercent"] = gPlayProperties.currentRelPos;
+		entry["playMode"] = gPlayProperties.playMode;
 	} else if (code == 40) {
 		object["coverimg"] = "coverimg";
 	} else if (code == 50) {
@@ -982,9 +1100,18 @@ void Web_SendWebsocketData(uint32_t client, uint8_t code) {
 	} else if (code == 70) {
 		JsonObject entry = object.createNestedObject("settings");
 		settingsToJSON(entry, "ssids");
+	} else if (code == 80) {
+		JsonObject entry = object.createNestedObject("trackProgress");
+		entry["posPercent"] = gPlayProperties.currentRelPos;
+		entry["time"] = AudioPlayer_GetCurrentTime();
+		entry["duration"] = AudioPlayer_GetFileDuration();
 	};
 
 	serializeJson(doc, jBuf, 1024);
+	if (doc.overflowed()) {
+		// JSON buffer too small for data
+		Log_Println(jsonbufferOverflow, LOGLEVEL_ERROR);
+	}
 
 	if (client == 0) {
 		ws.printfAll(jBuf);
@@ -1019,7 +1146,7 @@ void onWebsocketEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsE
 			// Serial.printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT) ? "text" : "binary", info->len);
 
 			if (processJsonRequest((char *) data)) {
-				if (data && (strncmp((char *) data, "getTrack", 8))) { // Don't send back ok-feedback if track's name is requested in background
+				if (data && (strncmp((char *) data, "track", 5))) { // Don't send back ok-feedback if track's name is requested in background
 					Web_SendWebsocketData(client->id(), 1);
 				}
 			}
@@ -1244,6 +1371,10 @@ void explorerHandleFileStorageTask(void *parameter) {
 // Sends a list of the content of a directory as JSON file
 // requires a GET parameter path for the directory
 void explorerHandleListRequest(AsyncWebServerRequest *request) {
+#ifdef NO_SDCARD
+	request->send(200, "application/json; charset=utf-8", "[]"); // maybe better to send 404 here?
+	return;
+#endif
 #ifdef BOARD_HAS_PSRAM
 	SpiRamJsonDocument jsonBuffer(65636);
 #else
@@ -1251,11 +1382,11 @@ void explorerHandleListRequest(AsyncWebServerRequest *request) {
 #endif
 
 	String serializedJsonString;
-	char filePath[MAX_FILEPATH_LENTGH];
 	JsonArray obj = jsonBuffer.createNestedArray();
 	File root;
 	if (request->hasParam("path")) {
 		AsyncWebParameter *param;
+		char filePath[MAX_FILEPATH_LENTGH];
 		param = request->getParam("path");
 		convertFilenameToAscii(param->value(), filePath);
 		root = gFSystem.open(filePath);
@@ -1277,12 +1408,9 @@ void explorerHandleListRequest(AsyncWebServerRequest *request) {
 	String MyfileName = root.getNextFileName(&isDir);
 	while (MyfileName != "") {
 		// ignore hidden folders, e.g. MacOS spotlight files
-		if (!startsWith(MyfileName.c_str(), (char *) "/.")) {
+		if (!MyfileName.startsWith("/.")) {
 			JsonObject entry = obj.createNestedObject();
-			convertAsciiToUtf8(MyfileName.c_str(), filePath);
-			std::string path = filePath;
-			std::string fileName = path.substr(path.find_last_of("/") + 1);
-			entry["name"] = fileName;
+			entry["name"] = MyfileName.substring(MyfileName.lastIndexOf('/') + 1);
 			if (isDir) {
 				entry["dir"].set(true);
 			}
@@ -1292,6 +1420,10 @@ void explorerHandleListRequest(AsyncWebServerRequest *request) {
 	root.close();
 
 	serializeJson(obj, serializedJsonString);
+	if (jsonBuffer.overflowed()) {
+		// JSON buffer too small for data
+		Log_Println(jsonbufferOverflow, LOGLEVEL_ERROR);
+	}
 	request->send(200, "application/json; charset=utf-8", serializedJsonString);
 }
 
@@ -1467,6 +1599,9 @@ void explorerHandleAudioRequest(AsyncWebServerRequest *request) {
 		playModeString = param->value();
 
 		playMode = atoi(playModeString.c_str());
+#ifdef DONT_ACCEPT_SAME_RFID_TWICE_ENABLE
+		Rfid_ResetOldRfid();
+#endif
 		AudioPlayer_TrackQueueDispatcher(filePath, 0, playMode, 0);
 	} else {
 		Log_Println("AUDIO: No path variable set", LOGLEVEL_ERROR);
@@ -1475,15 +1610,22 @@ void explorerHandleAudioRequest(AsyncWebServerRequest *request) {
 	request->send(200);
 }
 
+// Handles track progress requests
+void handleTrackProgressRequest(AsyncWebServerRequest *request) {
+	String json = "{\"trackProgress\":{";
+	json += "\"posPercent\":" + String(gPlayProperties.currentRelPos);
+	json += ",\"time\":" + String(AudioPlayer_GetCurrentTime());
+	json += ",\"duration\":" + String(AudioPlayer_GetFileDuration());
+	json += "}}";
+	request->send(200, "application/json", json);
+}
+
 void handleGetSavedSSIDs(AsyncWebServerRequest *request) {
 	AsyncJsonResponse *response = new AsyncJsonResponse(true);
 	JsonArray json_ssids = response->getRoot();
-	static String ssids[10];
-
-	size_t len = Wlan_GetSSIDs(ssids, 10);
-	for (int i = 0; i < len; i++) {
-		json_ssids.add(ssids[i]);
-	}
+	Wlan_GetSavedNetworks([json_ssids](const WiFiSettings &network) {
+		json_ssids.add(network.ssid);
+	});
 
 	response->setLength();
 	request->send(response);
@@ -1627,41 +1769,93 @@ static bool tagIdToJSON(const String tagId, JsonObject entry) {
 	return true;
 }
 
-// callback for writing a NVS entry to JSON
-bool DumpNvsToJSONCallback(const char *key, void *data) {
-	JsonArray *myArr = (JsonArray *) data;
-	JsonObject obj = myArr->createNestedObject();
-	return tagIdToJSON(key, obj);
+// callback for writing a NVS entry to list
+bool DumpNvsToArrayCallback(const char *key, void *data) {
+	std::vector<String> *keys = (std::vector<String> *) data;
+	keys->push_back(key);
+	return true;
+}
+
+static String tagIdToJsonStr(const char *key, const bool nameOnly) {
+	if (nameOnly) {
+		return "\"" + String(key) + "\"";
+	} else {
+		StaticJsonDocument<512> doc;
+		JsonObject entry = doc.createNestedObject(key);
+		if (!tagIdToJSON(key, entry)) {
+			return "";
+		}
+		String serializedJsonString;
+		serializeJson(entry, serializedJsonString);
+		return serializedJsonString;
+	}
 }
 
+// Handles rfid-assignments requests (GET)
+// /rfid returns an array of tag-ids and details. Optional GET param "id" to list only a single assignment.
+// /rfid/ids-only returns an array of tag-id keys
 static void handleGetRFIDRequest(AsyncWebServerRequest *request) {
+
 	String tagId = "";
+
 	if (request->hasParam("id")) {
 		tagId = request->getParam("id")->value();
 	}
-	if (tagId == "") {
-		// return all RFID assignments
-		AsyncJsonResponse *response = new AsyncJsonResponse(true, 8192);
-		JsonArray Arr = response->getRoot();
-		if (listNVSKeys("rfidTags", &Arr, DumpNvsToJSONCallback)) {
-			response->setLength();
-			request->send(response);
-		} else {
-			request->send(500, "error reading entries from NVS");
-		}
-	} else {
-		if (gPrefsRfid.isKey(tagId.c_str())) {
-			// return single RFID assignment
-			AsyncJsonResponse *response = new AsyncJsonResponse(false);
-			JsonObject obj = response->getRoot();
-			tagIdToJSON(tagId, obj);
-			response->setLength();
-			request->send(response);
-		} else {
-			// RFID assignment not found
-			request->send(404);
-		}
+
+	if ((tagId != "") && gPrefsRfid.isKey(tagId.c_str())) {
+		// return single RFID entry with details
+		String json = tagIdToJsonStr(tagId.c_str(), false);
+		request->send(200, "application/json", json);
+		return;
+	}
+	// get tag details or just an array of id's
+	bool idsOnly = request->hasParam("ids-only");
+
+	std::vector<String> nvsKeys {};
+	static size_t nvsIndex;
+	nvsKeys.clear();
+	// Dumps all RFID-keys from NVS into key array
+	listNVSKeys("rfidTags", &nvsKeys, DumpNvsToArrayCallback);
+	if (nvsKeys.size() == 0) {
+		// no entries
+		request->send(200, "application/json", "[]");
+		return;
 	}
+	// construct chunked repsonse
+	nvsIndex = 0;
+	AsyncWebServerResponse *response = request->beginChunkedResponse("application/json",
+		[nvsKeys = std::move(nvsKeys), idsOnly](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+			maxLen = maxLen >> 1; // some sort of bug with actual size available, reduce the len
+			size_t len = 0;
+			String json;
+
+			if (nvsIndex == 0) {
+				// start, write first tag
+				json = tagIdToJsonStr(nvsKeys[nvsIndex].c_str(), idsOnly);
+				if (json.length() >= maxLen) {
+					Log_Println("/rfid: Buffer too small", LOGLEVEL_ERROR);
+					return len;
+				}
+				len += snprintf(((char *) buffer), maxLen - len, "[%s", json.c_str());
+				nvsIndex++;
+			}
+			while (nvsIndex < nvsKeys.size()) {
+				// write tags as long we have enough room
+				json = tagIdToJsonStr(nvsKeys[nvsIndex].c_str(), idsOnly);
+				if ((len + json.length()) >= maxLen) {
+					break;
+				}
+				len += snprintf(((char *) buffer + len), maxLen - len, ",%s", json.c_str());
+				nvsIndex++;
+			}
+			if (nvsIndex == nvsKeys.size()) {
+				// finish
+				len += snprintf(((char *) buffer + len), maxLen - len, "]");
+				nvsIndex++;
+			}
+			return len;
+		});
+	request->send(response);
 }
 
 static void handlePostRFIDRequest(AsyncWebServerRequest *request, JsonVariant &json) {
@@ -1719,8 +1913,10 @@ static void handleDeleteRFIDRequest(AsyncWebServerRequest *request) {
 		return;
 	}
 	if (gPrefsRfid.isKey(tagId.c_str())) {
-		// stop playback, tag to delete might be in use
-		Cmd_Action(CMD_STOP);
+		if (tagId.equals(gCurrentRfidTagId)) {
+			// stop playback, tag to delete is in use
+			Cmd_Action(CMD_STOP);
+		}
 		if (gPrefsRfid.remove(tagId.c_str())) {
 			Log_Printf(LOGLEVEL_INFO, "/rfid (DELETE): tag %s removed successfuly", tagId);
 			request->send(200, "text/plain; charset=utf-8", tagId + " removed successfuly");
@@ -1838,19 +2034,26 @@ void Web_DumpSdToNvs(const char *_filename) {
 static void handleCoverImageRequest(AsyncWebServerRequest *request) {
 
 	if (!gPlayProperties.coverFilePos) {
-		// empty image:
-		// request->send(200, "image/svg+xml", "<?xml version=\"1.0\"?><svg xmlns=\"http://www.w3.org/2000/svg\"/>");
-		if (gPlayProperties.playMode == WEBSTREAM) {
-			// no cover -> send placeholder icon for webstream (fa-soundcloud)
-			Log_Println("no cover image for webstream", LOGLEVEL_NOTICE);
-			request->send(200, "image/svg+xml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"2304\" height=\"1792\" viewBox=\"0 0 2304 1792\" transform=\"scale (0.6)\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M784 1372l16-241-16-523q-1-10-7.5-17t-16.5-7q-9 0-16 7t-7 17l-14 523 14 241q1 10 7.5 16.5t15.5 6.5q22 0 24-23zm296-29l11-211-12-586q0-16-13-24-8-5-16-5t-16 5q-13 8-13 24l-1 6-10 579q0 1 11 236v1q0 10 6 17 9 11 23 11 11 0 20-9 9-7 9-20zm-1045-340l20 128-20 126q-2 9-9 9t-9-9l-17-126 17-128q2-9 9-9t9 9zm86-79l26 207-26 203q-2 9-10 9-9 0-9-10l-23-202 23-207q0-9 9-9 8 0 10 9zm280 453zm-188-491l25 245-25 237q0 11-11 11-10 0-12-11l-21-237 21-245q2-12 12-12 11 0 11 12zm94-7l23 252-23 244q-2 13-14 13-13 0-13-13l-21-244 21-252q0-13 13-13 12 0 14 13zm94 18l21 234-21 246q-2 16-16 16-6 0-10.5-4.5t-4.5-11.5l-20-246 20-234q0-6 4.5-10.5t10.5-4.5q14 0 16 15zm383 475zm-289-621l21 380-21 246q0 7-5 12.5t-12 5.5q-16 0-18-18l-18-246 18-380q2-18 18-18 7 0 12 5.5t5 12.5zm94-86l19 468-19 244q0 8-5.5 13.5t-13.5 5.5q-18 0-20-19l-16-244 16-468q2-19 20-19 8 0 13.5 5.5t5.5 13.5zm98-40l18 506-18 242q-2 21-22 21-19 0-21-21l-16-242 16-506q0-9 6.5-15.5t14.5-6.5q9 0 15 6.5t7 15.5zm392 742zm-198-746l15 510-15 239q0 10-7.5 17.5t-17.5 7.5-17-7-8-18l-14-239 14-510q0-11 7.5-18t17.5-7 17.5 7 7.5 18zm99 19l14 492-14 236q0 11-8 19t-19 8-19-8-9-19l-12-236 12-492q1-12 9-20t19-8 18.5 8 8.5 20zm212 492l-14 231q0 13-9 22t-22 9-22-9-10-22l-6-114-6-117 12-636v-3q2-15 12-24 9-7 20-7 8 0 15 5 14 8 16 26zm1112-19q0 117-83 199.5t-200 82.5h-786q-13-2-22-11t-9-22v-899q0-23 28-33 85-34 181-34 195 0 338 131.5t160 323.5q53-22 110-22 117 0 200 83t83 201z\"/></svg>");
-		} else {
-			// no cover -> send placeholder icon for playing music from SD-card (fa-music)
-			if (gPlayProperties.playMode != NO_PLAYLIST) {
-				Log_Println("no cover image for SD-card audio", LOGLEVEL_DEBUG);
+		String stationLogoUrl = AudioPlayer_GetStationLogoUrl();
+		if (stationLogoUrl != "") {
+			// serve station logo
+			Log_Printf(LOGLEVEL_NOTICE, "serve station logo: '%s'", stationLogoUrl.c_str());
+			request->redirect(stationLogoUrl);
+			return;
+		} else
+			// empty image:
+			// request->send(200, "image/svg+xml", "<?xml version=\"1.0\"?><svg xmlns=\"http://www.w3.org/2000/svg\"/>");
+			if (gPlayProperties.playMode == WEBSTREAM || (gPlayProperties.playMode == LOCAL_M3U && gPlayProperties.isWebstream)) {
+				// no cover -> send placeholder icon for webstream (fa-soundcloud)
+				Log_Println("no cover image for webstream", LOGLEVEL_NOTICE);
+				request->send(200, "image/svg+xml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"2304\" height=\"1792\" viewBox=\"0 0 2304 1792\" transform=\"scale (0.6)\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M784 1372l16-241-16-523q-1-10-7.5-17t-16.5-7q-9 0-16 7t-7 17l-14 523 14 241q1 10 7.5 16.5t15.5 6.5q22 0 24-23zm296-29l11-211-12-586q0-16-13-24-8-5-16-5t-16 5q-13 8-13 24l-1 6-10 579q0 1 11 236v1q0 10 6 17 9 11 23 11 11 0 20-9 9-7 9-20zm-1045-340l20 128-20 126q-2 9-9 9t-9-9l-17-126 17-128q2-9 9-9t9 9zm86-79l26 207-26 203q-2 9-10 9-9 0-9-10l-23-202 23-207q0-9 9-9 8 0 10 9zm280 453zm-188-491l25 245-25 237q0 11-11 11-10 0-12-11l-21-237 21-245q2-12 12-12 11 0 11 12zm94-7l23 252-23 244q-2 13-14 13-13 0-13-13l-21-244 21-252q0-13 13-13 12 0 14 13zm94 18l21 234-21 246q-2 16-16 16-6 0-10.5-4.5t-4.5-11.5l-20-246 20-234q0-6 4.5-10.5t10.5-4.5q14 0 16 15zm383 475zm-289-621l21 380-21 246q0 7-5 12.5t-12 5.5q-16 0-18-18l-18-246 18-380q2-18 18-18 7 0 12 5.5t5 12.5zm94-86l19 468-19 244q0 8-5.5 13.5t-13.5 5.5q-18 0-20-19l-16-244 16-468q2-19 20-19 8 0 13.5 5.5t5.5 13.5zm98-40l18 506-18 242q-2 21-22 21-19 0-21-21l-16-242 16-506q0-9 6.5-15.5t14.5-6.5q9 0 15 6.5t7 15.5zm392 742zm-198-746l15 510-15 239q0 10-7.5 17.5t-17.5 7.5-17-7-8-18l-14-239 14-510q0-11 7.5-18t17.5-7 17.5 7 7.5 18zm99 19l14 492-14 236q0 11-8 19t-19 8-19-8-9-19l-12-236 12-492q1-12 9-20t19-8 18.5 8 8.5 20zm212 492l-14 231q0 13-9 22t-22 9-22-9-10-22l-6-114-6-117 12-636v-3q2-15 12-24 9-7 20-7 8 0 15 5 14 8 16 26zm1112-19q0 117-83 199.5t-200 82.5h-786q-13-2-22-11t-9-22v-899q0-23 28-33 85-34 181-34 195 0 338 131.5t160 323.5q53-22 110-22 117 0 200 83t83 201z\"/></svg>");
+			} else {
+				// no cover -> send placeholder icon for playing music from SD-card (fa-music)
+				if (gPlayProperties.playMode != NO_PLAYLIST) {
+					Log_Println("no cover image for SD-card audio", LOGLEVEL_DEBUG);
+				}
+				request->send(200, "image/svg+xml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"1792\" height=\"1792\" viewBox=\"0 0 1792 1792\" transform=\"scale (0.6)\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M1664 224v1120q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-537l-768 237v709q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-967q0-31 19-56.5t49-35.5l832-256q12-4 28-4 40 0 68 28t28 68z\"/></svg>");
 			}
-			request->send(200, "image/svg+xml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"1792\" height=\"1792\" viewBox=\"0 0 1792 1792\" transform=\"scale (0.6)\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M1664 224v1120q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-537l-768 237v709q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-967q0-31 19-56.5t49-35.5l832-256q12-4 28-4 40 0 68 28t28 68z\"/></svg>");
-		}
 		return;
 	}
 	char *coverFileName = *(gPlayProperties.playlist + gPlayProperties.currentTrackNumber);
@@ -1885,13 +2088,14 @@ static void handleCoverImageRequest(AsyncWebServerRequest *request) {
 
 	int imageSize = gPlayProperties.coverFileSize;
 	AsyncWebServerResponse *response = request->beginChunkedResponse(mimeType, [coverFile, imageSize](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+		// some kind of webserver bug with actual size available, reduce the len
 		if (maxLen > 1024) {
 			maxLen = 1024;
 		}
-
 		File file = coverFile; // local copy of file pointer
 		size_t leftToWrite = imageSize - index;
 		if (!leftToWrite) {
+			file.close();
 			return 0; // end of transfer
 		}
 		size_t willWrite = (leftToWrite > maxLen) ? maxLen : leftToWrite;
diff --git a/src/Wlan.cpp b/src/Wlan.cpp
index 53919cfa..76cfbe7e 100644
--- a/src/Wlan.cpp
+++ b/src/Wlan.cpp
@@ -315,8 +315,8 @@ void handleWifiStateConnectionSuccess() {
 
 	// get current time and date
 	Log_Println(syncingViaNtp, LOGLEVEL_NOTICE);
-	// Smooth time updating (non blocking)
-	sntp_set_sync_mode(SNTP_SYNC_MODE_SMOOTH);
+	// Updates system time immediately upon receiving a response from the SNTP server
+	sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED);
 	// set notification call-back function
 	sntp_set_time_sync_notification_cb(ntpTimeAvailable);
 	// start NTP request with timezone
@@ -507,17 +507,10 @@ uint8_t Wlan_NumSavedNetworks() {
 	return numKnownNetworks;
 }
 
-// write saved ssids into the passed array.
-size_t Wlan_GetSSIDs(String *ssids, size_t max_len) {
-	if (numKnownNetworks > max_len) {
-		return 0;
-	}
-
+void Wlan_GetSavedNetworks(std::function<void(const WiFiSettings &)> handler) {
 	for (uint8_t i = 0; i < numKnownNetworks; i++) {
-		ssids[i] = knownNetworks[i].ssid;
+		handler(knownNetworks[i]);
 	}
-
-	return numKnownNetworks;
 }
 
 const String Wlan_GetCurrentSSID() {
@@ -620,5 +613,5 @@ void writeWifiStatusToNVS(bool wifiStatus) {
 }
 
 bool Wlan_IsConnected(void) {
-	return (WiFi.status() == WL_CONNECTED);
+	return (wifiState == WIFI_STATE_CONNECTED);
 }
diff --git a/src/Wlan.h b/src/Wlan.h
index ac148107..9c38c49e 100644
--- a/src/Wlan.h
+++ b/src/Wlan.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <functional>
+
 // be very careful changing this struct, as it is used for NVS storage and will corrupt existing entries
 struct WiFiSettings {
 	char ssid[33];
@@ -16,7 +18,7 @@ void Wlan_Init(void);
 void Wlan_Cyclic(void);
 bool Wlan_AddNetworkSettings(WiFiSettings);
 uint8_t Wlan_NumSavedNetworks();
-size_t Wlan_GetSSIDs(String *, size_t);
+void Wlan_GetSavedNetworks(std::function<void(const WiFiSettings &)>);
 const String Wlan_GetCurrentSSID();
 const String Wlan_GetHostname();
 bool Wlan_DeleteNetwork(String);
diff --git a/src/logmessages.h b/src/logmessages.h
index 299c355c..643e3082 100644
--- a/src/logmessages.h
+++ b/src/logmessages.h
@@ -86,11 +86,10 @@ extern const char modificatorSleepTimer60[];
 extern const char modificatorSleepTimer120[];
 extern const char ledsDimmedToNightmode[];
 extern const char ledsDimmedToInitialValue[];
+extern const char ledsBrightnessRestored[];
 extern const char modificatorNotallowedWhenIdle[];
 extern const char modificatorSleepAtEOT[];
-extern const char modificatorSleepAtEOTd[];
 extern const char modificatorSleepAtEOP[];
-extern const char modificatorSleepAtEOPd[];
 extern const char modificatorAllTrackAlphSortedLoop[];
 extern const char modificatorAllTrackRandomLoop[];
 extern const char modificatorCurTrackLoop[];
@@ -189,7 +188,7 @@ extern const char ftpServerStarted[];
 extern const char freeHeapAfterSetup[];
 extern const char tryStaticIpConfig[];
 extern const char staticIPConfigFailed[];
-extern const char wakeUpRfidNoIso14443[];
+extern const char wakeUpRfidNoCard[];
 extern const char lowPowerCardSuccess[];
 extern const char rememberLastVolume[];
 extern const char unableToStartFtpServer[];
@@ -216,6 +215,7 @@ extern const char rfidTagReapplied[];
 extern const char unableToTellIpAddress[];
 extern const char unableToTellTime[];
 extern const char ftpEnableTooLate[];
+extern const char dateTimeRTC[];
 extern const char syncingViaNtp[];
 extern const char ntpGotTime[];
 extern const char ntpFailed[];
@@ -225,17 +225,20 @@ extern const char paOff[];
 extern const char hpOn[];
 extern const char hpOff[];
 extern const char webTxCanceled[];
+extern const char webSaveSettingsError[];
 extern const char tryToPickRandomDir[];
 extern const char pickedRandomDir[];
 extern const char wrongWakeUpGpio[];
 extern const char currentlyPlaying[];
 extern const char secondsJumpForward[];
 extern const char secondsJumpBackward[];
+extern const char JumpToPosition[];
 extern const char wroteLastTrackToNvs[];
 extern const char wifiConnectionInProgress[];
 extern const char wifiConnectionSuccess[];
 extern const char wifiCurrentIp[];
 extern const char jsonErrorMsg[];
+extern const char jsonbufferOverflow[];
 extern const char wifiDeleteNetwork[];
 extern const char wifiNetworkLoaded[];
 extern const char wifiTooManyNetworks[];
diff --git a/src/main.cpp b/src/main.cpp
index 6c2cb2a1..3a6e35be 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -216,8 +216,23 @@ void setup() {
 	Led_Indicate(LedIndicatorType::BootComplete);
 
 	Log_Printf(LOGLEVEL_DEBUG, "%s: %u", freeHeapAfterSetup, ESP.getFreeHeap());
-	Log_Printf(LOGLEVEL_DEBUG, "PSRAM: %u bytes", ESP.getPsramSize());
+	if (psramFound()) {
+		Log_Printf(LOGLEVEL_DEBUG, "PSRAM: %u bytes", ESP.getPsramSize());
+	} else {
+		Log_Println("PSRAM: --", LOGLEVEL_DEBUG);
+	}
 	Log_Printf(LOGLEVEL_DEBUG, "Flash-size: %u bytes", ESP.getFlashChipSize());
+
+	// setup timezone & show internal RTC date/time if available
+	setenv("TZ", timeZone, 1);
+	tzset();
+	struct tm timeinfo;
+	if (getLocalTime(&timeinfo, 5)) {
+		static char timeStringBuff[255];
+		snprintf(timeStringBuff, sizeof(timeStringBuff), dateTimeRTC, timeinfo.tm_mday, timeinfo.tm_mon + 1, timeinfo.tm_year + 1900, timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec);
+		Log_Println(timeStringBuff, LOGLEVEL_DEBUG);
+	}
+
 	if (Wlan_IsConnected()) {
 		Log_Printf(LOGLEVEL_DEBUG, "RSSI: %d dBm", Wlan_GetRssi());
 	}
@@ -243,11 +258,13 @@ void loop() {
 		RotaryEncoder_Cyclic();
 		Mqtt_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();
 
@@ -257,7 +274,7 @@ void loop() {
 #endif
 
 	IrReceiver_Cyclic();
-	vTaskDelay(portTICK_PERIOD_MS * 5u);
+	vTaskDelay(portTICK_PERIOD_MS * 2u);
 
 #ifdef HALLEFFECT_SENSOR_ENABLE
 	gHallEffectSensor.cyclic();
diff --git a/src/revision.h b/src/revision.h
index 1d7701c7..8aceec82 100644
--- a/src/revision.h
+++ b/src/revision.h
@@ -1,4 +1,4 @@
 #pragma once
 
 #include "gitrevision.h"
-constexpr const char softwareRevision[] = "Software-revision: 20231104-1";
+constexpr const char softwareRevision[] = "Software-revision: 20240117-1-DEV";
diff --git a/src/settings-override.h.sample b/src/settings-override.h.sample
index 8b1d2a8b..78e511f7 100644
--- a/src/settings-override.h.sample
+++ b/src/settings-override.h.sample
@@ -6,283 +6,317 @@
         #include "values.h"
 
     //######################### INFOS ####################################
-    // This is the general configfile for ESPuino-configuration.
-
-    //################## HARDWARE-PLATFORM ###############################
-    /* Make sure to also edit the configfile, that is specific for your platform.
-    If in doubts (your develboard is not listed) use HAL 1
-    1: Wemos Lolin32                        => settings-lolin32.h
-    2: ESP32-A1S Audiokit                   => settings-espa1s.h
-    3: Wemos Lolin D32                      => settings-lolin_D32.h
-    4: Wemos Lolin D32 pro                  => settings-lolin_D32_pro.h
-    5: Lilygo T8 (V1.7)                     => settings-ttgo_t8.h
-    6: ESPuino complete                     => settings-complete.h
-    7: Lolin D32 pro SDMMC Port-Expander    => settings-lolin_d32_pro_sdmmc_pe.h
-    8: AZDelivery ESP32 NodeMCU             => settings-azdelivery_sdmmc.h
-    9: Lolin D32 SDMMC Port-Expander        => settings-lolin_d32_sdmmc_pe.h
-    99: custom                              => settings-custom.h
-    more to come...
-    */
-    #ifndef HAL             // Will be set by platformio.ini. If using Arduino-IDE you have to set HAL according your needs!
-        #define HAL 1       // HAL 1 = LoLin32, 2 = ESP32-A1S-AudioKit, 3 = Lolin D32, 4 = Lolin D32 pro; ... 99 = custom
-    #endif
-
-
-    //########################## MODULES #################################
-    //#define PORT_EXPANDER_ENABLE          // When enabled, buttons can be connected via port-expander PCA9555 (https://forum.espuino.de/t/einsatz-des-port-expanders-pca9555/306)
-    //#define I2S_COMM_FMT_LSB_ENABLE       // Enables FMT instead of MSB for I2S-communication-format. Used e.g. by PT2811. Don't enable for MAX98357a, AC101 or PCM5102A)
-    #define MDNS_ENABLE                     // When enabled, you don't have to handle with ESPuino's IP-address. If hostname is set to "ESPuino", you can reach it via ESPuino.local
-    //#define MQTT_ENABLE                     // Make sure to configure mqtt-server and (optionally) username+pwd
-    #define FTP_ENABLE                      // Enables FTP-server; DON'T FORGET TO ACTIVATE AFTER BOOT BY PRESSING PAUSE + NEXT-BUTTONS (IN PARALLEL)!
-    #define NEOPIXEL_ENABLE                 // Don't forget configuration of NUM_LEDS if enabled
-    //#define NEOPIXEL_REVERSE_ROTATION     // Some Neopixels are adressed/soldered counter-clockwise. This can be configured here.
-    #define LANGUAGE DE                     // DE = deutsch; EN = english
-    //#define STATIC_IP_ENABLE              // DEPRECATED: Enables static IP-configuration (change static ip-section accordingly)
-    #define HEADPHONE_ADJUST_ENABLE       // Used to adjust (lower) volume for optional headphone-pcb (refer maxVolumeSpeaker / maxVolumeHeadphone) and to enable stereo (if PLAY_MONO_SPEAKER is set)
-    #define PLAY_MONO_SPEAKER               // If only one speaker is used enabling mono should make sense. Please note: headphones is always stereo (if HEADPHONE_ADJUST_ENABLE is active)
-    #define SHUTDOWN_IF_SD_BOOT_FAILS       // Will put ESP to deepsleep if boot fails due to SD. Really recommend this if there's in battery-mode no other way to restart ESP! Interval adjustable via deepsleepTimeAfterBootFails.
-    #define MEASURE_BATTERY_VOLTAGE         // Enables battery-measurement via GPIO (ADC) and voltage-divider
-    //#define MEASURE_BATTERY_MAX17055      // Enables battery-measurement via external fuel gauge (MAX17055)
-    //#define SHUTDOWN_ON_BAT_CRITICAL      // Whether to turn off on critical battery-level (only used if MEASURE_BATTERY_XXX is active)
-    //#define PLAY_LAST_RFID_AFTER_REBOOT   // When restarting ESPuino, the last RFID that was active before, is recalled and played
-    //#define USE_LAST_VOLUME_AFTER_REBOOT  // Remembers the volume used at last shutdown after reboot
-    #define USEROTARY_ENABLE                // If rotary-encoder is used (don't forget to review WAKEUP_BUTTON if you disable this feature!)
-    #define BLUETOOTH_ENABLE                // If enabled and bluetooth-mode is active, you can stream to your ESPuino via bluetooth (a2dp-sink).
-    //#define IR_CONTROL_ENABLE             // Enables remote control (https://forum.espuino.de/t/neues-feature-fernsteuerung-per-infrarot-fernbedienung/265)
-    //#define PAUSE_WHEN_RFID_REMOVED       // Playback starts when card is applied and pauses automatically, when card is removed (https://forum.espuino.de/t/neues-feature-pausieren-wenn-rfid-karte-entfernt-wurde/541)
-    //#define DONT_ACCEPT_SAME_RFID_TWICE   // RFID-reader doesn't accept the same RFID-tag twice in a row (unless it's a modification-card or RFID-tag is unknown in NVS). Flag will be ignored silently if PAUSE_WHEN_RFID_REMOVED is active. (https://forum.espuino.de/t/neues-feature-dont-accept-same-rfid-twice/1247)
-    //#define SAVE_PLAYPOS_BEFORE_SHUTDOWN  // When playback is active and mode audiobook was selected, last play-position is saved automatically when shutdown is initiated
-    //#define SAVE_PLAYPOS_WHEN_RFID_CHANGE // When playback is active and mode audiobook was selected, last play-position is saved automatically for old playlist when new RFID-tag is applied
-
-
-    //################## select SD card mode #############################
-    #define SD_MMC_1BIT_MODE              // run SD card in SD-MMC 1Bit mode (using GPIOs 15 + 14 + 2 is mandatory!)
-    //#define SINGLE_SPI_ENABLE             // If only one SPI-instance should be used instead of two (not yet working!)
-
-
-    //################## select RFID reader ##############################
-    #define RFID_READER_TYPE_MFRC522_SPI    // use MFRC522 via SPI
-    //#define RFID_READER_TYPE_MFRC522_I2C  // use MFRC522 via I2C
-    //#define RFID_READER_TYPE_PN5180       // use PN5180 via SPI
-
-    #ifdef RFID_READER_TYPE_MFRC522_I2C
-        #define MFRC522_ADDR 0x28           // default I2C-address of MFRC522
-    #endif
-
-    #ifdef RFID_READER_TYPE_PN5180
-        //#define PN5180_ENABLE_LPCD        // Wakes up ESPuino if RFID-tag was applied while deepsleep is active. Only ISO-14443-tags are supported for wakeup!
-    #endif
-
-    #if defined(RFID_READER_TYPE_MFRC522_I2C) || defined(RFID_READER_TYPE_MFRC522_SPI)
-        constexpr uint8_t rfidGain = 0x07 << 4;      // Sensitivity of RC522. For possible values see reference: https://forum.espuino.de/uploads/default/original/1X/9de5f8d35cbc123c1378cad1beceb3f51035cec0.png
-    #endif
-
-
-    //############# Port-expander-configuration ######################
-    #ifdef PORT_EXPANDER_ENABLE
-        constexpr uint8_t expanderI2cAddress = 0x20;  // I2C-address of PCA9555 (0x20 is true if PCA's pins A0+A1+A2 are pulled to GND)
-    #endif
-
-    //################## BUTTON-Layout ##################################
-    /* German documentation: https://forum.espuino.de/t/das-dynamische-button-layout/224
-    Please note the following numbers as you need to know them in order to define actions for buttons.
-    Even if you don't use all of them, their numbers won't change
-        0: NEXT_BUTTON
-        1: PREVIOUS_BUTTON
-        2: PAUSEPLAY_BUTTON
-        3: ROTARYENCODER_BUTTON
-        4: BUTTON_4
-        5: BUTTON_5
-
-    Don't forget to enable/configure those buttons you want to use in your develboard-specific config (e.g. settings-custom.h)
-
-    Single-buttons [can be long or short] (examples):
-        BUTTON_0_SHORT => Button 0 (NEXT_BUTTON) pressed shortly
-        BUTTON_3_SHORT => Button 3 (ROTARYENCODER_BUTTON) pressed shortly
-        BUTTON_4_LONG => Button 4 (BUTTON_4) pressed long
-
-    Multi-buttons [short only] (examples):
-        BUTTON_MULTI_01 => Buttons 0+1 (NEXT_BUTTON + PREVIOUS_BUTTON) pressed in parallel
-        BUTTON_MULTI_12 => Buttons 1+2 (PREV_BUTTON + PAUSEPLAY_BUTTON) pressed in parallel
-
-    Actions:
-        To all of those buttons, an action can be assigned freely.
-        Please have a look at values.h to look up actions available (>=100 can be used)
-        If you don't want to assign an action or you don't use a given button: CMD_NOTHING has to be set
-    */
-    // *****BUTTON*****        *****ACTION*****
-    #define BUTTON_0_SHORT    CMD_NEXTTRACK
-    #define BUTTON_1_SHORT    CMD_PREVTRACK
-    #define BUTTON_2_SHORT    CMD_PLAYPAUSE
-    #define BUTTON_3_SHORT    CMD_MEASUREBATTERY
-    #define BUTTON_4_SHORT    CMD_SEEK_BACKWARDS
-    #define BUTTON_5_SHORT    CMD_SEEK_FORWARDS
-
-    #define BUTTON_0_LONG     CMD_LASTTRACK
-    #define BUTTON_1_LONG     CMD_FIRSTTRACK
-    #define BUTTON_2_LONG     CMD_PLAYPAUSE
-    #define BUTTON_3_LONG     CMD_SLEEPMODE
-    #define BUTTON_4_LONG     CMD_NOTHING
-    #define BUTTON_5_LONG     CMD_NOTHING
-
-    #define BUTTON_MULTI_01   CMD_NOTHING   //CMD_TOGGLE_WIFI_STATUS (disabled now to prevent children from unwanted WiFi-disable)
-    #define BUTTON_MULTI_02   CMD_ENABLE_FTP_SERVER
-    #define BUTTON_MULTI_03   CMD_NOTHING
-    #define BUTTON_MULTI_04   CMD_NOTHING
-    #define BUTTON_MULTI_05   CMD_NOTHING
-    #define BUTTON_MULTI_12   CMD_TELL_IP_ADDRESS
-    #define BUTTON_MULTI_13   CMD_NOTHING
-    #define BUTTON_MULTI_14   CMD_NOTHING
-    #define BUTTON_MULTI_15   CMD_NOTHING
-    #define BUTTON_MULTI_23   CMD_NOTHING
-    #define BUTTON_MULTI_24   CMD_NOTHING
-    #define BUTTON_MULTI_25   CMD_NOTHING
-    #define BUTTON_MULTI_34   CMD_NOTHING
-    #define BUTTON_MULTI_35   CMD_NOTHING
-    #define BUTTON_MULTI_45   CMD_NOTHING
-
-    //#################### Various settings ##############################
-
-    // Serial-logging-configuration
-    #define SERIAL_LOGLEVEL LOGLEVEL_DEBUG              // Current loglevel for serial console
+	// This is the general configfile for ESPuino-configuration.
+
+	//################## HARDWARE-PLATFORM ###############################
+	/* Make sure to also edit the configfile, that is specific for your platform.
+	If in doubts (your develboard is not listed) use HAL 1
+	1: Wemos Lolin32                        => settings-lolin32.h
+	2: ESP32-A1S Audiokit                   => settings-espa1s.h
+	3: Wemos Lolin D32                      => settings-lolin_D32.h
+	4: Wemos Lolin D32 pro                  => settings-lolin_D32_pro.h
+	5: Lilygo T8 (V1.7)                     => settings-ttgo_t8.h
+	6: ESPuino complete                     => settings-complete.h
+	7: Lolin D32 pro SDMMC Port-Expander    => settings-lolin_d32_pro_sdmmc_pe.h
+	8: AZDelivery ESP32 NodeMCU             => settings-azdelivery_sdmmc.h
+	9: Lolin D32 SDMMC Port-Expander        => settings-lolin_d32_sdmmc_pe.h
+	99: custom                              => settings-custom.h
+	more to come...
+	*/
+	#ifndef HAL             // Will be set by platformio.ini. If using Arduino-IDE you have to set HAL according your needs!
+		#define HAL 1       // HAL 1 = LoLin32, 2 = ESP32-A1S-AudioKit, 3 = Lolin D32, 4 = Lolin D32 pro; ... 99 = custom
+	#endif
+
+
+	//########################## MODULES #################################
+	//#define PORT_EXPANDER_ENABLE          // When enabled, buttons can be connected via port-expander PCA9555 (https://forum.espuino.de/t/einsatz-des-port-expanders-pca9555/306)
+	//#define I2S_COMM_FMT_LSB_ENABLE       // Enables FMT instead of MSB for I2S-communication-format. Used e.g. by PT2811. Don't enable for MAX98357a, AC101 or PCM5102A)
+	#define MDNS_ENABLE                     // When enabled, you don't have to handle with ESPuino's IP-address. If hostname is set to "ESPuino", you can reach it via ESPuino.local
+	//#define MQTT_ENABLE                   // Make sure to configure mqtt-server and (optionally) username+pwd
+	#define FTP_ENABLE                      // Enables FTP-server; DON'T FORGET TO ACTIVATE AFTER BOOT BY PRESSING PAUSE + NEXT-BUTTONS (IN PARALLEL)!
+	#define NEOPIXEL_ENABLE                 // Don't forget configuration of NUM_LEDS if enabled
+	//#define NEOPIXEL_REVERSE_ROTATION     // Some Neopixels are adressed/soldered counter-clockwise. This can be configured here.
+	#define LANGUAGE DE                     // DE = deutsch; EN = english
+	//#define STATIC_IP_ENABLE              // DEPRECATED: Enables static IP-configuration (change static ip-section accordingly)
+	#define HEADPHONE_ADJUST_ENABLE         // Used to adjust (lower) volume for optional headphone-pcb (refer maxVolumeSpeaker / maxVolumeHeadphone) and to enable stereo (if PLAY_MONO_SPEAKER is set)
+	//#define PLAY_MONO_SPEAKER             // If only one speaker is used enabling mono should make sense. Please note: headphones is always stereo (if HEADPHONE_ADJUST_ENABLE is active)
+	#define SHUTDOWN_IF_SD_BOOT_FAILS       // Will put ESP to deepsleep if boot fails due to SD. Really recommend this if there's in battery-mode no other way to restart ESP! Interval adjustable via deepsleepTimeAfterBootFails.
+	#define MEASURE_BATTERY_VOLTAGE         // Enables battery-measurement via GPIO (ADC) and voltage-divider
+	//#define MEASURE_BATTERY_MAX17055      // Enables battery-measurement via external fuel gauge (MAX17055)
+	//#define SHUTDOWN_ON_BAT_CRITICAL      // Whether to turn off on critical battery-level (only used if MEASURE_BATTERY_XXX is active)
+	//#define PLAY_LAST_RFID_AFTER_REBOOT   // When restarting ESPuino, the last RFID that was active before, is recalled and played
+	//#define USE_LAST_VOLUME_AFTER_REBOOT  // Remembers the volume used at last shutdown after reboot
+	#define USEROTARY_ENABLE                // If rotary-encoder is used (don't forget to review WAKEUP_BUTTON if you disable this feature!)
+	#define BLUETOOTH_ENABLE                // If enabled and bluetooth-mode is active, you can stream to your ESPuino or to a headset via bluetooth (a2dp-sink & a2dp-source). Note: This feature consumes a lot of resources and the available flash/ram might not be sufficient.
+	//#define IR_CONTROL_ENABLE             // Enables remote control (https://forum.espuino.de/t/neues-feature-fernsteuerung-per-infrarot-fernbedienung/265)
+	//#define PAUSE_WHEN_RFID_REMOVED       // Playback starts when card is applied and pauses automatically, when card is removed (https://forum.espuino.de/t/neues-feature-pausieren-wenn-rfid-karte-entfernt-wurde/541)
+	//#define PAUSE_ON_MIN_VOLUME           // When playback is active and volume is changed to zero, playback is paused automatically. Playback is continued if volume reaches 1. (https://forum.espuino.de/t/neues-feature-pausieren-wenn-rfid-karte-entfernt-wurde/541)
+	//#define DONT_ACCEPT_SAME_RFID_TWICE   // RFID-reader doesn't accept the same RFID-tag twice in a row (unless it's a modification-card or RFID-tag is unknown in NVS). Flag will be ignored silently if PAUSE_WHEN_RFID_REMOVED is active. (https://forum.espuino.de/t/neues-feature-dont-accept-same-rfid-twice/1247)
+	//#define SAVE_PLAYPOS_BEFORE_SHUTDOWN  // When playback is active and mode audiobook was selected, last play-position is saved automatically when shutdown is initiated
+	//#define SAVE_PLAYPOS_WHEN_RFID_CHANGE // When playback is active and mode audiobook was selected, last play-position is saved automatically for old playlist when new RFID-tag is applied
+	//#define HALLEFFECT_SENSOR_ENABLE      // Support for hallsensor. For fine-tuning please adjust HallEffectSensor.h Please note: only user-support provided (https://forum.espuino.de/t/magnetische-hockey-tags/1449/35)
+	#define VOLUMECURVE 0 					// 0=square, 1=logarithmic (1 is more flatten at lower volume)
+
+	//################## set PAUSE_WHEN_RFID_REMOVED behaviour #############################
+	#ifdef PAUSE_WHEN_RFID_REMOVED
+		#define ACCEPT_SAME_RFID_AFTER_TRACK_END           // Accepts same RFID after playback has ended (https://forum.espuino.de/t/neues-feature-pausieren-wenn-rfid-karte-entfernt-wurde/541/2)
+	#endif
+
+	//################## select SD card mode #############################
+	#define SD_MMC_1BIT_MODE              // run SD card in SD-MMC 1Bit mode (using GPIOs 15 + 14 + 2 is mandatory!)
+	//#define SINGLE_SPI_ENABLE             // If only one SPI-instance should be used instead of two (not yet working!)
+	//#define NO_SDCARD                     // enable to start without any SD card, e.g. for a webplayer only. SD card Settings above will be ignored
+
+
+	//################## select RFID reader ##############################
+	#define RFID_READER_TYPE_MFRC522_SPI    // use MFRC522 via SPI
+	//#define RFID_READER_TYPE_MFRC522_I2C  // use MFRC522 via I2C
+	//#define RFID_READER_TYPE_PN5180       // use PN5180 via SPI
+
+	#ifdef RFID_READER_TYPE_MFRC522_I2C
+		#define MFRC522_ADDR 0x28           // default I2C-address of MFRC522
+	#endif
+
+	#ifdef RFID_READER_TYPE_PN5180
+		//#define PN5180_ENABLE_LPCD        // Wakes up ESPuino if RFID-tag was applied while deepsleep is active. Only ISO-14443-tags are supported for wakeup!
+	#endif
+
+	#if defined(RFID_READER_TYPE_MFRC522_I2C) || defined(RFID_READER_TYPE_MFRC522_SPI)
+		constexpr uint8_t rfidGain = 0x07 << 4;      // Sensitivity of RC522. For possible values see reference: https://forum.espuino.de/uploads/default/original/1X/9de5f8d35cbc123c1378cad1beceb3f51035cec0.png
+	#endif
+
+
+	//############# Port-expander-configuration ######################
+	#ifdef PORT_EXPANDER_ENABLE
+		constexpr uint8_t expanderI2cAddress = 0x20;  // I2C-address of PCA9555 (0x20 is true if PCA's pins A0+A1+A2 are pulled to GND)
+	#endif
+
+	//################## BUTTON-Layout ##################################
+	/* German documentation: https://forum.espuino.de/t/das-dynamische-button-layout/224
+	Please note the following numbers as you need to know them in order to define actions for buttons.
+	Even if you don't use all of them, their numbers won't change
+		0: NEXT_BUTTON
+		1: PREVIOUS_BUTTON
+		2: PAUSEPLAY_BUTTON
+		3: ROTARYENCODER_BUTTON
+		4: BUTTON_4
+		5: BUTTON_5
+
+	Don't forget to enable/configure those buttons you want to use in your develboard-specific config (e.g. settings-custom.h)
+
+	Single-buttons [can be long or short] (examples):
+		BUTTON_0_SHORT => Button 0 (NEXT_BUTTON) pressed shortly
+		BUTTON_3_SHORT => Button 3 (ROTARYENCODER_BUTTON) pressed shortly
+		BUTTON_4_LONG => Button 4 (BUTTON_4) pressed long
+
+	Multi-buttons [short only] (examples):
+		BUTTON_MULTI_01 => Buttons 0+1 (NEXT_BUTTON + PREVIOUS_BUTTON) pressed in parallel
+		BUTTON_MULTI_12 => Buttons 1+2 (PREV_BUTTON + PAUSEPLAY_BUTTON) pressed in parallel
+
+	Actions:
+		To all of those buttons, an action can be assigned freely.
+		Please have a look at values.h to look up actions available (>=100 can be used)
+		If you don't want to assign an action or you don't use a given button: CMD_NOTHING has to be set
+	*/
+	// *****BUTTON*****        *****ACTION*****
+	#define BUTTON_0_SHORT    CMD_NEXTTRACK
+	#define BUTTON_1_SHORT    CMD_PREVTRACK
+	#define BUTTON_2_SHORT    CMD_PLAYPAUSE
+	#define BUTTON_3_SHORT    CMD_MEASUREBATTERY
+	#define BUTTON_4_SHORT    CMD_SEEK_BACKWARDS
+	#define BUTTON_5_SHORT    CMD_SEEK_FORWARDS
+
+	#define BUTTON_0_LONG     CMD_LASTTRACK
+	#define BUTTON_1_LONG     CMD_FIRSTTRACK
+	#define BUTTON_2_LONG     CMD_PLAYPAUSE
+	#define BUTTON_3_LONG     CMD_SLEEPMODE
+	#define BUTTON_4_LONG     CMD_VOLUMEUP
+	#define BUTTON_5_LONG     CMD_VOLUMEDOWN
+
+	#define BUTTON_MULTI_01   CMD_NOTHING   //CMD_TOGGLE_WIFI_STATUS (disabled now to prevent children from unwanted WiFi-disable)
+	#define BUTTON_MULTI_02   CMD_ENABLE_FTP_SERVER
+	#define BUTTON_MULTI_03   CMD_NOTHING
+	#define BUTTON_MULTI_04   CMD_NOTHING
+	#define BUTTON_MULTI_05   CMD_NOTHING
+	#define BUTTON_MULTI_12   CMD_TELL_IP_ADDRESS
+	#define BUTTON_MULTI_13   CMD_NOTHING
+	#define BUTTON_MULTI_14   CMD_NOTHING
+	#define BUTTON_MULTI_15   CMD_NOTHING
+	#define BUTTON_MULTI_23   CMD_NOTHING
+	#define BUTTON_MULTI_24   CMD_NOTHING
+	#define BUTTON_MULTI_25   CMD_NOTHING
+	#define BUTTON_MULTI_34   CMD_NOTHING
+	#define BUTTON_MULTI_35   CMD_NOTHING
+	#define BUTTON_MULTI_45   CMD_NOTHING
+
+	//#################### Various settings ##############################
+
+	// Serial-logging-configuration
+	#define SERIAL_LOGLEVEL LOGLEVEL_DEBUG              // Current loglevel for serial console
 
     // DEPRECATED: This is now done using dynamic network configuration.
     //              If left, it is used for the automatic migration exactly once
-    // Static ip-configuration
-    #ifdef STATIC_IP_ENABLE
-        #define LOCAL_IP   192,168,2,100                // ESPuino's IP
-        #define GATEWAY_IP 192,168,2,1                  // IP of the gateway/router
-        #define SUBNET_IP  255,255,255,0                // Netmask of your network (/24 => 255.255.255.0)
-        #define DNS_IP     192,168,2,1                  // DNS-server of your network; in private networks it's usually the gatewy's IP
-    #endif
-
-    // Buttons (better leave unchanged if in doubts :-))
-    constexpr uint8_t buttonDebounceInterval = 50;                // Interval in ms to software-debounce buttons
-    constexpr uint16_t intervalToLongPress = 700;                 // Interval in ms to distinguish between short and long press of previous/next-button
-
-    // RFID-RC522
-    #define RFID_SCAN_INTERVAL 100                      // Interval-time in ms (how often is RFID read?)
-
-    // Automatic restart
-    #ifdef SHUTDOWN_IF_SD_BOOT_FAILS
-        constexpr uint32_t deepsleepTimeAfterBootFails = 20;      // Automatic restart takes place if boot was not successful after this period (in seconds)
-    #endif
-
-    // FTP
-    // Nothing to be configured here...
-    // Default user/password is esp32/esp32 but can be changed via webgui
-
-    // ESPuino will create a WiFi if joing existing WiFi was not possible. Name can be configured here.
-    constexpr const char accessPointNetworkSSID[] = "ESPuino";     // Access-point's SSID
-
-    // Bluetooth
-    constexpr const char nameBluetoothSinkDevice[] = "ESPuino";        // Name of your ESPuino as Bluetooth-device
-
-    // Where to store the backup-file for NVS-records
-    constexpr const char backupFile[] = "/backup.txt"; // File is written every time a (new) RFID-assignment via GUI is done
-
-    //#################### Settings for optional Modules##############################
-    // (optinal) Neopixel
-    #ifdef NEOPIXEL_ENABLE
-        #define NUM_LEDS                    24          // number of LEDs
-        #define CHIPSET                     WS2812B     // type of Neopixel
-        #define COLOR_ORDER                 GRB
-    #endif
-
-    #if defined(MEASURE_BATTERY_VOLTAGE) || defined(MEASURE_BATTERY_MAX17055)
-        #define BATTERY_MEASURE_ENABLE                 // Don't change. Set automatically if any method of battery monitoring is selected.
-        constexpr uint8_t s_batteryCheckInterval = 10; // How often battery is measured (in minutes) (can be changed via GUI!)
-    #endif
-
-    #ifdef MEASURE_BATTERY_VOLTAGE
-        // (optional) Default-voltages for battery-monitoring via Neopixel; can be changed later via WebGUI
-        constexpr float s_warningLowVoltage = 3.4;                      // If battery-voltage is <= this value, a cyclic warning will be indicated by Neopixel (can be changed via GUI!)
-        constexpr float s_warningCriticalVoltage = 3.1;                 // If battery-voltage is <= this value, assume battery near-empty. Set to 0V to disable.
-        constexpr float s_voltageIndicatorLow = 3.0;                    // Lower range for Neopixel-voltage-indication (0 leds) (can be changed via GUI!)
-        constexpr float s_voltageIndicatorHigh = 4.2;                   // Upper range for Neopixel-voltage-indication (all leds) (can be changed via GUI!)
-    #endif
-
-    #ifdef MEASURE_BATTERY_MAX17055
-        constexpr float s_batteryLow = 15.0;            // low percentage
-        constexpr float s_batteryCritical = 5.0;        // critical percentage
-
-        constexpr uint16_t s_batteryCapacity = 6000;    // design cap of battery (mAh)
-        constexpr uint16_t s_emptyVoltage = 300;        // empty voltage in 10mV
-        constexpr uint16_t s_recoveryVoltage = 360;     // recovery voltage in 10mV
-        constexpr uint8_t  s_batteryChemistry = 0x60;   // 0 = Li-Ion, 0x20 = NCR, 0x60 = LiFePO4
-        constexpr float s_resistSensor = 0.01;          // current sense resistor, currently non-default values might lead to problems
-        constexpr bool s_vCharge = false;                   // true if charge voltage is greater than 4.275V
-    #endif
-
-    // enable I2C if necessary
-    #if defined(RFID_READER_TYPE_MFRC522_I2C) || defined(PORT_EXPANDER_ENABLE) || defined(MEASURE_BATTERY_MAX17055)
-        #define I2C_2_ENABLE
-    #endif
-
-    // (optinal) Headphone-detection (leave unchanged if in doubts...)
-    #ifdef HEADPHONE_ADJUST_ENABLE
-        constexpr uint16_t headphoneLastDetectionDebounce = 1000; // Debounce-interval in ms when plugging in headphone
-    #endif
-
-    // Seekmode-configuration
-    constexpr uint8_t jumpOffset = 30;                            // Offset in seconds to jump for commands CMD_SEEK_FORWARDS / CMD_SEEK_BACKWARDS
-
-    // (optional) Topics for MQTT
-    #ifdef MQTT_ENABLE
-        constexpr uint16_t mqttRetryInterval = 60;                // Try to reconnect to MQTT-server every (n) seconds if connection is broken
-        constexpr uint8_t mqttMaxRetriesPerInterval = 1;          // Number of retries per time-interval (mqttRetryInterval). mqttRetryInterval 60 / mqttMaxRetriesPerInterval 1 => once every 60s
-        #define DEVICE_HOSTNAME "ESP32-ESPuino"         // Name that is used for MQTT
-        constexpr const char topicSleepCmnd[] = "Cmnd/ESPuino/Sleep";
-        constexpr const char topicSleepState[] = "State/ESPuino/Sleep";
-        constexpr const char topicRfidCmnd[] = "Cmnd/ESPuino/Rfid";
-        constexpr const char topicRfidState[] = "State/ESPuino/Rfid";
-        constexpr const char topicTrackState[] = "State/ESPuino/Track";
-        constexpr const char topicTrackControlCmnd[] = "Cmnd/ESPuino/TrackControl";
-        constexpr const char topicCoverChangedState[] = "State/ESPuino/CoverChanged";
-        constexpr const char topicLoudnessCmnd[] = "Cmnd/ESPuino/Loudness";
-        constexpr const char topicLoudnessState[] = "State/ESPuino/Loudness";
-        constexpr const char topicSleepTimerCmnd[] = "Cmnd/ESPuino/SleepTimer";
-        constexpr const char topicSleepTimerState[] = "State/ESPuino/SleepTimer";
-        constexpr const char topicState[] = "State/ESPuino/State";
-        constexpr const char topicCurrentIPv4IP[] = "State/ESPuino/IPv4";
-        constexpr const char topicLockControlsCmnd[] ="Cmnd/ESPuino/LockControls";
-        constexpr const char topicLockControlsState[] ="State/ESPuino/LockControls";
-        constexpr const char topicPlaymodeState[] = "State/ESPuino/Playmode";
-        constexpr const char topicRepeatModeCmnd[] = "Cmnd/ESPuino/RepeatMode";
-        constexpr const char topicRepeatModeState[] = "State/ESPuino/RepeatMode";
-        constexpr const char topicLedBrightnessCmnd[] = "Cmnd/ESPuino/LedBrightness";
-        constexpr const char topicLedBrightnessState[] = "State/ESPuino/LedBrightness";
-        constexpr const char topicWiFiRssiState[] = "State/ESPuino/WifiRssi";
-        constexpr const char topicSRevisionState[] = "State/ESPuino/SoftwareRevision";
-        #ifdef BATTERY_MEASURE_ENABLE
-            constexpr const char topicBatteryVoltage[] = "State/ESPuino/Voltage";
-            constexpr const char topicBatterySOC[]     = "State/ESPuino/Battery";
-        #endif
-    #endif
-
-    // !!! MAKE SURE TO EDIT PLATFORM SPECIFIC settings-****.h !!!
-    #if (HAL == 1)
-        #include "settings-lolin32.h"                       // Contains all user-relevant settings for Wemos Lolin32
-    #elif (HAL == 2)
-        #include "settings-espa1s.h"                        // Contains all user-relevant settings for ESP32-A1S Audiokit
-    #elif (HAL == 3)
-        #include "settings-lolin_d32.h"                     // Contains all user-relevant settings for Wemos Lolin D32
-    #elif (HAL == 4)
-        #include "settings-lolin_d32_pro.h"                 // Contains all user-relevant settings for Wemos Lolin D32 pro
-    #elif (HAL == 5)
-        #include "settings-ttgo_t8.h"                       // Contains all user-relevant settings for Lilygo TTGO T8 1.7
-    #elif (HAL == 6)
-        #include "settings-complete.h"                      // Contains all user-relevant settings for ESPuino complete
-    #elif (HAL == 7)
-        #include "settings-lolin_d32_pro_sdmmc_pe.h"        // Pre-configured settings for ESPuino Lolin D32 pro with SDMMC + port-expander (https://forum.espuino.de/t/espuino-minid32pro-lolin-d32-pro-mit-sd-mmc-und-port-expander-smd/866)
-    #elif (HAL == 8)
-        #include "settings-azdelivery_sdmmc.h"              // Pre-configured settings for AZ Delivery ESP32 NodeMCU / Devkit C (https://forum.espuino.de/t/az-delivery-esp32-nodemcu-devkit-c-mit-sd-mmc-und-pn5180-als-rfid-leser/634)
-    #elif (HAL == 9)
-        #include "settings-lolin_d32_sdmmc_pe.h"            // Pre-configured settings for Lolin D32 (non-pro) with SDMMC + port-expander (https://forum.espuino.de/t/espuino-minid32-pro-lolin-d32-pro-mit-sd-mmc-und-port-expander-smd/866)
-    #elif (HAL == 99)
-        #include "settings-custom.h"                        // Contains all user-relevant settings custom-board
-    #endif
-
-    //#define ENABLE_ESPUINO_DEBUG                            // Needs modification of platformio.ini (https://forum.espuino.de/t/rfid-mit-oder-ohne-task/353/21); better don't enable unless you know what you're doing :-)
-    #endif //settings_override
+	// Static ip-configuration
+	#ifdef STATIC_IP_ENABLE
+		#define LOCAL_IP   192,168,2,100                // ESPuino's IP
+		#define GATEWAY_IP 192,168,2,1                  // IP of the gateway/router
+		#define SUBNET_IP  255,255,255,0                // Netmask of your network (/24 => 255.255.255.0)
+		#define DNS_IP     192,168,2,1                  // DNS-server of your network; in private networks it's usually the gatewy's IP
+	#endif
+
+	// Buttons (better leave unchanged if in doubts :-))
+	constexpr uint8_t buttonDebounceInterval = 50;                // Interval in ms to software-debounce buttons
+	constexpr uint16_t intervalToLongPress = 700;                 // Interval in ms to distinguish between short and long press of buttons
+
+	// Buttons active state: Default 0 for active LOW, 1 for active HIGH e.g. for TTP223 Capacitive Touch Switch Button (FinnBox)
+	#define BUTTON_0_ACTIVE_STATE 0
+	#define BUTTON_1_ACTIVE_STATE 0
+	#define BUTTON_2_ACTIVE_STATE 0
+	#define BUTTON_3_ACTIVE_STATE 0
+	#define BUTTON_4_ACTIVE_STATE 0
+	#define BUTTON_5_ACTIVE_STATE 0
+
+	//#define CONTROLS_LOCKED_BY_DEFAULT			// If set the controls are locked at boot
+	#define INCLUDE_ROTARY_IN_CONTROLS_LOCK			// If set the rotary encoder is locked if controls are locked
+
+	// RFID-RC522
+	#define RFID_SCAN_INTERVAL 100                      // Interval-time in ms (how often is RFID read?)
+
+	// Automatic restart
+	#ifdef SHUTDOWN_IF_SD_BOOT_FAILS
+		constexpr uint32_t deepsleepTimeAfterBootFails = 20;      // Automatic restart takes place if boot was not successful after this period (in seconds)
+	#endif
+
+	// FTP
+	// Nothing to be configured here...
+	// Default user/password is esp32/esp32 but can be changed via webgui
+
+	// timezone
+	// see list of valid timezones: https://github.com/nayarsystems/posix_tz_db/blob/master/zones.csv
+	// example for Europe/Berlin:	"CET-1CEST,M3.5.0,M10.5.0/3"
+	// example for America/Toronto:	"EST5EDT,M3.2.0,M11.1.0"
+	constexpr const char timeZone[] = "CET-1CEST,M3.5.0,M10.5.0/3"; // Europe/Berlin
+
+	// ESPuino will create a WiFi if joing existing WiFi was not possible. Name and password can be configured here.
+	constexpr const char accessPointNetworkSSID[] = "ESPuino";     // Access-point's SSID
+	constexpr const char accessPointNetworkPassword[] = "";        // Access-point's Password, at least 8 characters! Set to an empty string to spawn an open WiFi.
+
+	// Bluetooth
+	constexpr const char nameBluetoothSinkDevice[] = "ESPuino";        // Name of your ESPuino as Bluetooth-device
+
+	// Where to store the backup-file for NVS-records
+	constexpr const char backupFile[] = "/backup.txt"; // File is written every time a (new) RFID-assignment via GUI is done
+
+	//#################### Settings for optional Modules##############################
+	// (optinal) Neopixel
+	#ifdef NEOPIXEL_ENABLE
+		#define NUM_INDICATOR_LEDS		24          	// number of Neopixel LEDs (formerly NUM_LEDS)
+		#define NUM_CONTROL_LEDS		0		// optional control leds (https://forum.espuino.de/t/statische-ws2812-leds/1703)
+                #define CONTROL_LEDS_COLORS		{}		// Colors for the control LEDs. Make sure it lists at least NUM_CONTROL_LEDS colors, e.g. for three control LEDs define: CONTROL_LEDS_COLORS {CRGB::Yellow, CRGB::Blue, 0xFFFFFF} (predefined colors: http://fastled.io/docs/3.1/struct_c_r_g_b.html)
+		#define CHIPSET					WS2812B     	// type of Neopixel
+		#define COLOR_ORDER				GRB
+		#define NUM_LEDS_IDLE_DOTS		4           	// count of LEDs, which are shown when Idle
+		#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 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
+
+	#if defined(MEASURE_BATTERY_VOLTAGE) || defined(MEASURE_BATTERY_MAX17055)
+		#define BATTERY_MEASURE_ENABLE                 // Don't change. Set automatically if any method of battery monitoring is selected.
+		constexpr uint8_t s_batteryCheckInterval = 10; // How often battery is measured (in minutes) (can be changed via GUI!)
+	#endif
+
+	#ifdef MEASURE_BATTERY_VOLTAGE
+		// (optional) Default-voltages for battery-monitoring via Neopixel; can be changed later via WebGUI
+		constexpr float s_warningLowVoltage = 3.4;                      // If battery-voltage is <= this value, a cyclic warning will be indicated by Neopixel (can be changed via GUI!)
+		constexpr float s_warningCriticalVoltage = 3.1;                 // If battery-voltage is <= this value, assume battery near-empty. Set to 0V to disable.
+		constexpr float s_voltageIndicatorLow = 3.0;                    // Lower range for Neopixel-voltage-indication (0 leds) (can be changed via GUI!)
+		constexpr float s_voltageIndicatorHigh = 4.2;                   // Upper range for Neopixel-voltage-indication (all leds) (can be changed via GUI!)
+	#endif
+
+	#ifdef MEASURE_BATTERY_MAX17055
+		constexpr float s_batteryLow = 15.0;            // low percentage
+		constexpr float s_batteryCritical = 5.0;        // critical percentage
+
+		constexpr uint16_t s_batteryCapacity = 6000;    // design cap of battery (mAh)
+		constexpr uint16_t s_emptyVoltage = 300;        // empty voltage in 10mV
+		constexpr uint16_t s_recoveryVoltage = 360;     // recovery voltage in 10mV
+		constexpr uint8_t  s_batteryChemistry = 0x60;   // 0 = Li-Ion, 0x20 = NCR, 0x60 = LiFePO4
+		constexpr float s_resistSensor = 0.01;          // current sense resistor, currently non-default values might lead to problems
+		constexpr bool s_vCharge = false;                   // true if charge voltage is greater than 4.275V
+	#endif
+
+	// enable I2C if necessary
+	#if defined(RFID_READER_TYPE_MFRC522_I2C) || defined(PORT_EXPANDER_ENABLE) || defined(MEASURE_BATTERY_MAX17055)
+		#define I2C_2_ENABLE
+	#endif
+
+	// (optinal) Headphone-detection (leave unchanged if in doubts...)
+	#ifdef HEADPHONE_ADJUST_ENABLE
+		constexpr uint16_t headphoneLastDetectionDebounce = 1000; // Debounce-interval in ms when plugging in headphone
+	#endif
+
+	// Seekmode-configuration
+	constexpr uint8_t jumpOffset = 30;                            // Offset in seconds to jump for commands CMD_SEEK_FORWARDS / CMD_SEEK_BACKWARDS
+
+	// (optional) Topics for MQTT
+	#ifdef MQTT_ENABLE
+		constexpr uint16_t mqttRetryInterval = 60;                // Try to reconnect to MQTT-server every (n) seconds if connection is broken
+		constexpr uint8_t mqttMaxRetriesPerInterval = 1;          // Number of retries per time-interval (mqttRetryInterval). mqttRetryInterval 60 / mqttMaxRetriesPerInterval 1 => once every 60s
+		#define DEVICE_HOSTNAME "ESP32-ESPuino"         // Name that is used for MQTT
+		constexpr const char topicSleepCmnd[] = "Cmnd/ESPuino/Sleep";
+		constexpr const char topicSleepState[] = "State/ESPuino/Sleep";
+		constexpr const char topicRfidCmnd[] = "Cmnd/ESPuino/Rfid";
+		constexpr const char topicRfidState[] = "State/ESPuino/Rfid";
+		constexpr const char topicTrackState[] = "State/ESPuino/Track";
+		constexpr const char topicTrackControlCmnd[] = "Cmnd/ESPuino/TrackControl";
+		constexpr const char topicCoverChangedState[] = "State/ESPuino/CoverChanged";
+		constexpr const char topicLoudnessCmnd[] = "Cmnd/ESPuino/Loudness";
+		constexpr const char topicLoudnessState[] = "State/ESPuino/Loudness";
+		constexpr const char topicSleepTimerCmnd[] = "Cmnd/ESPuino/SleepTimer";
+		constexpr const char topicSleepTimerState[] = "State/ESPuino/SleepTimer";
+		constexpr const char topicState[] = "State/ESPuino/State";
+		constexpr const char topicCurrentIPv4IP[] = "State/ESPuino/IPv4";
+		constexpr const char topicLockControlsCmnd[] ="Cmnd/ESPuino/LockControls";
+		constexpr const char topicLockControlsState[] ="State/ESPuino/LockControls";
+		constexpr const char topicPlaymodeState[] = "State/ESPuino/Playmode";
+		constexpr const char topicRepeatModeCmnd[] = "Cmnd/ESPuino/RepeatMode";
+		constexpr const char topicRepeatModeState[] = "State/ESPuino/RepeatMode";
+		constexpr const char topicLedBrightnessCmnd[] = "Cmnd/ESPuino/LedBrightness";
+		constexpr const char topicLedBrightnessState[] = "State/ESPuino/LedBrightness";
+		constexpr const char topicWiFiRssiState[] = "State/ESPuino/WifiRssi";
+		constexpr const char topicSRevisionState[] = "State/ESPuino/SoftwareRevision";
+		#ifdef BATTERY_MEASURE_ENABLE
+		constexpr const char topicBatteryVoltage[] = "State/ESPuino/Voltage";
+		constexpr const char topicBatterySOC[]     = "State/ESPuino/Battery";
+		#endif
+	#endif
+
+	// !!! MAKE SURE TO EDIT PLATFORM SPECIFIC settings-****.h !!!
+	#if (HAL == 1)
+		#include "settings-lolin32.h"                       // Contains all user-relevant settings for Wemos Lolin32
+	#elif (HAL == 2)
+		#include "settings-espa1s.h"                        // Contains all user-relevant settings for ESP32-A1S Audiokit
+	#elif (HAL == 3)
+		#include "settings-lolin_d32.h"                     // Contains all user-relevant settings for Wemos Lolin D32
+	#elif (HAL == 4)
+		#include "settings-lolin_d32_pro.h"                 // Contains all user-relevant settings for Wemos Lolin D32 pro
+	#elif (HAL == 5)
+		#include "settings-ttgo_t8.h"                       // Contains all user-relevant settings for Lilygo TTGO T8 1.7
+	#elif (HAL == 6)
+		#include "settings-complete.h"                      // Contains all user-relevant settings for ESPuino complete
+	#elif (HAL == 7)
+		#include "settings-lolin_d32_pro_sdmmc_pe.h"        // Pre-configured settings for ESPuino Lolin D32 pro with SDMMC + port-expander (https://forum.espuino.de/t/espuino-minid32pro-lolin-d32-pro-mit-sd-mmc-und-port-expander-smd/866)
+	#elif (HAL == 8)
+		#include "settings-azdelivery_sdmmc.h"              // Pre-configured settings for AZ Delivery ESP32 NodeMCU / Devkit C (https://forum.espuino.de/t/az-delivery-esp32-nodemcu-devkit-c-mit-sd-mmc-und-pn5180-als-rfid-leser/634)
+	#elif (HAL == 9)
+		#include "settings-lolin_d32_sdmmc_pe.h"            // Pre-configured settings for Lolin D32 (non-pro) with SDMMC + port-expander (https://forum.espuino.de/t/espuino-minid32-pro-lolin-d32-pro-mit-sd-mmc-und-port-expander-smd/866)
+	#elif (HAL == 99)
+		#include "settings-custom.h"                        // Contains all user-relevant settings custom-board
+	#endif
+
+	//#define ENABLE_ESPUINO_DEBUG                            // Needs modification of platformio.ini (https://forum.espuino.de/t/rfid-mit-oder-ohne-task/353/21); better don't enable unless you know what you're doing :-)
+	#endif //settings_override
 #endif
diff --git a/src/values.h b/src/values.h
index 0ee75ddc..0ef0bca4 100644
--- a/src/values.h
+++ b/src/values.h
@@ -48,6 +48,7 @@
 #define CMD_TOGGLE_WIFI_STATUS			 130 // Toggles WiFi-status
 #define CMD_TOGGLE_BLUETOOTH_SINK_MODE	 140 // Toggles Normal/Bluetooth sink Mode
 #define CMD_TOGGLE_BLUETOOTH_SOURCE_MODE 141 // Toggles Normal/Bluetooth source Mode
+#define CMD_TOGGLE_MODE					 142 // Toggles Normal => Bluetooth sink => Bluetooth source => Normal Mode
 #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
@@ -74,9 +75,10 @@
 #define TRACK_N_PLAYLIST 3 // Repeat both (infinite loop)
 
 // Seek-modes
-#define SEEK_NORMAL	   0 // Normal play
-#define SEEK_FORWARDS  1 // Seek forwards
-#define SEEK_BACKWARDS 2 // Seek backwards
+#define SEEK_NORMAL		 0 // Normal play
+#define SEEK_FORWARDS	 1 // Seek forwards
+#define SEEK_BACKWARDS	 2 // Seek backwards
+#define SEEK_POS_PERCENT 3 // Seek to position (0-100)
 
 // TTS
 #define TTS_NONE		 0 // Do nothng (IDLE)
@@ -88,4 +90,4 @@
 #define EN 2
 
 // Debug
-#define PRINT_TASK_STATS 900 // Prints task stats for debugging, needs CONFIG_FREERTOS_USE_TRACE_FACILITY=y and CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y in sdkconfig.defaults
+#define PRINT_TASK_STATS 199 // Prints task stats for debugging, needs CONFIG_FREERTOS_USE_TRACE_FACILITY=y and CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y in sdkconfig.defaults