New settings es6 (merge from pbolduc fork) (#3231 )

* Initial new settings page test commit * quick poc to add chibi style helper and start to change files to es6 * add ready and loaded functions * added missing pageloaded variable to track if loaded already called. * More POC to dynamically add content, minimal DOM lib based on chibi * Add simple translation for any element that has class=l10n * simply self executing function --------- Co-authored-by: Phil Bolduc <philbolduc@gmail.com>
2026-06-21 20:31:30 +00:00 · 2023-06-05 16:33:51 +02:00
153 changed files with 11518 additions and 15543 deletions
@@ -1,24 +1,21 @@
-.cache
-.clang-format
-.direnv
-.DS_Store
-.gitignore
-.idea
 .pio
+.cache
 .pioenvs
 .piolibdeps
 .vscode
-
-esp01-update.sh
-platformio_override.ini
-replace_fs.py
-wled-update.sh
-
-/build_output/
-/node_modules/
-
-/wled00/extLibs
-/wled00/LittleFS
-/wled00/my_config.h
 /wled00/Release
-/wled00/wled00.ino.cpp
+/wled00/extLibs
+/platformio_override.ini
+/wled00/my_config.h
+/build_output
+.DS_Store
+.gitignore
+.clang-format
+node_modules
+.idea
+.direnv
+wled-update.sh
+esp01-update.sh
+/wled00/LittleFS
+replace_fs.py
+wled00/wled00.ino.cpp
@@ -1,136 +1,9 @@
 ## WLED changelog

-#### Build 2402120
-   Beta WLED 0.14.2-b1
-   Possible fix for #3589 & partial fix for #3605
-   Prevent JSON buffer clear after failed lock attempt
-   Multiple analog button fix for #3549
-   UM Audioreactive: add two compiler options (#3732 by @wled-install)
-   Fix for #3693
-
-#### Build 2401141
-   Official release of WLED 0.14.1
-   Fix for #3566, #3665, #3672
-   Sorting of palettes in custom palette editor (#3674 by @WoodyLetsCode)
-
-#### Build 2401060
-   Version bump: 0.14.1-b3
-   Global JSON buffer guarding (#3648 by @willmmiles, resolves #3641, #3312, #3367, #3637, #3646, #3447)
-   Fix for #3632
-   Custom palette editor mobile UI enhancement (#3617 by @imeszaros)
-   changelog update
-
-#### Build 2312290
-   Fix for #3622, #3613, #3609
-   Various tweaks and fixes
-   changelog update
-
-#### Build 2312230
-   Version bump: 0.14.1-b2
-   Fix for Pixel Magic button
-   Fix for #2922 (option to force WiFi PHY mode to G on ESP8266)
-   Fix for #3601, #3400 (incorrect sunrise/sunset, #3612 by @softhack007)
-
-#### Build 2312180
-   Bugfixes (#3593, #3490, #3573, #3517, #3561, #3555, #3541, #3536, #3515, #3522, #3533, #3508)
-   Various other internal cleanups and optimisations
-
-#### Build 2311160
-   Version bump: 0.14.1-b1
-   Bugfixes (#3526, #3502, #3496, #3484, #3487, #3445, #3466, #3296, #3382, #3312)
-   New feature: Sort presets by ID
-   New usermod: LDR sensor (#3490 by @JeffWDH)
-   Effect: Twinklefox & Tinklecat metadata fix
-   Effect: separate #HH and #MM for Scrolling Text (#3480)
-   SSDR usermod enhancements (#3368)
-   PWM fan usermod enhancements (#3414)
-
-#### Build 2310010, build 2310130
-   Release of WLED version 0.14.0 "Hoshi"
-   Bugfixes for #3400, #3403, #3405
-   minor HTML optimizations
-   audioreactive: bugfix for UDP sound sync (partly initialized packets)
-
-#### Build 2309240
-   Release of WLED beta version 0.14.0-b6 "Hoshi"
-   Effect bugfixes and improvements (Meteor, Meteor Smooth, Scrolling Text)
-   audioreactive: bugfixes for ES8388 and ES7243 init; minor improvements for analog inputs
-
-#### Build 2309100
-   Release of WLED beta version 0.14.0-b5 "Hoshi"
-   New standard esp32 build with audioreactive
-   Effect blending bugfixes, and minor optimizations
-
-#### Build 2309050
-   Effect blending (#3311) (finally effect transitions!)
-    *WARNING*: May not work well with ESP8266, with plenty of segments or usermods (low RAM condition)!!!
-   Added receive and send sync groups to JSON API (#3317) (you can change sync groups using preset)
-   Internal temperature usermod (#3246)
-   MQTT server and topic length overrides (#3354) (new build flags)
-   Animated Staircase usermod enhancement (#3348) (on/off toggle/relay control)
-   Added local time info to Info page (#3351)
-   New effect: Rolling Balls (a.k.a. linear bounce) (#1039)
-   Various bug fixes and enhancements.
-
-#### Build 2308110
-   Release of WLED beta version 0.14.0-b4 "Hoshi"
-   Reset effect data immediately upon mode change
-
-#### Build 2308030
-   Improved random palette handling and blending
-   Soap bugfix
-   Fix ESP-NOW crash with AP mode Always
-
-#### Build 2307180
-   Bus-level global buffering (#3280)
-   Removed per-segment LED buffer (SEGMENT.leds)
-   various fixes and improvements (ESP variants platform 5.3.0, effect optimizations, /json/cfg pin allocation)
-
-#### Build 2307130
-   larger `oappend()` stack buffer (3.5k) for ESP32
-   Preset cycle bugfix (#3262)
-   Rotary encoder ALT fix for large LED count (#3276)
-   effect updates (2D Plasmaball), `blur()` speedup
-   On/Off toggle from nodes view (may show unknown device type on older versions) (#3291)
-   various fixes and improvements (ABL, crashes when changing presets with different segments)
-
-#### Build 2306270
-   ESP-NOW remote support (#3237)
-   Pixel Magic tool (display pixel art) (#3249)
-   Websocket (peek) fallback when connection cannot be established, WS retries (#3267)
-   Add WiFi network scan RPC command to Improv Serial (#3271)
-   Longer (custom option available) segment name for ESP32
-   various fixes and improvements
-
-#### Build 2306210
-   0.14.0-b3 release
-   respect global I2C in all usermods (no local initialization of I2C bus)
-   Multi relay usermod compile-time enabled option (-D MULTI_RELAY_ENABLED=true|false)
-
-#### Build 2306180
-   Added client-side option for applying effect defaults from metadata
-   Improved ESP8266 stability by reducing WebSocket response resends
-   Updated ESP8266 core to 3.1.2
-
-#### Build 2306141
-   Lissajous improvements
-   Scrolling Text improvements (leading 0)
-
-#### Build 2306140
-   Add settings PIN (un)locking to JSON post API
-
-#### Build 2306130
-   Bumped version to 0.14-b3 (beta 3)
-   added pin dropdowns in LED preferences (not for LED pins) and usermods
-   introduced (unused ATM) NeoGammaWLEDMethod class
-   Reverse proxy support
-   PCF8754 support for Rotary encoder (requires wiring INT pin to ESP GPIO)
-   Rely on global I2C pins for usermods (breaking change)
-   various fixes and enhancements
-
 #### Build 2306020
+
 -   Support for segment sets (PR #3171)
-   Reduce sound simulation modes to 2 to facilitate segment sets
+-   Reduce sound simulation modes to 2 to facilitiate segment sets
 -   Trigger button immediately on press if all configured presets are the same (PR #3226)
 -   Changes for allowing Alexa to change light color to White when auto-calculating from RGB (PR #3211)

@@ -467,7 +340,7 @@

 -   Added application level pong websockets reply (#2139)
 -   Use AsyncTCP 1.0.3 as it mitigates the flickering issue from 0.13.0-b2
-   Fixed transition manually updated in preset overridden by field value
+-   Fixed transition manually updated in preset overriden by field value

 #### Build 2108050

@@ -996,7 +869,7 @@

 #### Build 2011040

-   Inverted Rain direction (fixes #1147)
+-   Inversed Rain direction (fixes #1147)

 #### Build 2011010

@@ -1207,7 +1080,7 @@

 -   Added module info page to web UI
 -   Added realtime override functionality to web UI
-   Added individual segment power and brightness to web UI
+-   Added individial segment power and brightness to web UI
 -   Added feature to one-click select single segment only by tapping segment name
 -   Removed palette jumping to default if color is changed

@@ -1,6 +1,6 @@
 {
  "name": "wled",
-  "version": "0.14.2-b1",
+  "version": "0.14.0-b2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1409,9 +1409,9 @@
      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
    },
    "semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
    },
    "semver-diff": {
      "version": "2.1.0",
@@ -1,6 +1,6 @@
 {
  "name": "wled",
-  "version": "0.14.2-b1",
+  "version": "0.14.0-b2",
  "description": "Tools for WLED project",
  "main": "tools/cdata.js",
  "directories": {
@@ -10,8 +10,8 @@
 # ------------------------------------------------------------------------------

 # CI binaries
-; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth # ESP32 variant builds are temporarily excluded from CI due to toolchain issues on the GitHub Actions Linux environment
-default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32dev_audioreactive, lolin_s2_mini, esp32c3dev, esp32s3dev_8MB, esp32s3dev_8MB_PSRAM_opi
+;; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth # ESP32 variant builds are temporarily excluded from CI due to toolchain issues on the GitHub Actions Linux environment
+default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_8MB

 # Release binaries
 ; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_8MB
@@ -40,9 +40,6 @@ default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32d
 ; default_envs = esp32dev_qio80
 ; default_envs = esp32_eth_ota1mapp
 ; default_envs = esp32s2_saola
-; default_envs = esp32c3dev
-; default_envs = lolin_s2_mini
-; default_envs = esp32s3dev_16MB_PSRAM_opi

 src_dir  = ./wled00
 data_dir = ./wled00/data
@@ -63,14 +60,13 @@ arduino_core_2_7_4 = espressif8266@2.6.2
 arduino_core_3_0_0 = espressif8266@3.0.0
 arduino_core_3_2_0 = espressif8266@3.2.0
 arduino_core_4_1_0 = espressif8266@4.1.0
-arduino_core_3_1_2 = espressif8266@4.2.0

 # Development platforms
 arduino_core_develop = https://github.com/platformio/platform-espressif8266#develop
 arduino_core_git = https://github.com/platformio/platform-espressif8266#feature/stage

 # Platform to use for ESP8266
-platform_wled_default = ${common.arduino_core_3_1_2}
+platform_wled_default = ${common.arduino_core_4_1_0}
 # We use 2.7.4.7 for all, includes PWM flicker fix and Wstring optimization
 #platform_packages = tasmota/framework-arduinoespressif8266 @ 3.20704.7
 platform_packages = platformio/framework-arduinoespressif8266
@@ -88,13 +84,11 @@ platform_packages = platformio/framework-arduinoespressif8266

 # ------------------------------------------------------------------------------
 # FLAGS: DEBUG
-# esp8266 : see https://docs.platformio.org/en/latest/platforms/espressif8266.html#debug-level
-# esp32   : see https://docs.platformio.org/en/latest/platforms/espressif32.html#debug-level
+#
 # ------------------------------------------------------------------------------
-debug_flags = -D DEBUG=1 -D WLED_DEBUG
-  -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM ;; for esp8266
-  # if needed (for memleaks etc) also add; -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h"
-  # -DDEBUG_ESP_CORE is not working right now
+debug_flags = -D DEBUG=1 -D WLED_DEBUG -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
+#if needed (for memleaks etc) also add; -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h"
+#-DDEBUG_ESP_CORE is not working right now

 # ------------------------------------------------------------------------------
 # FLAGS: ldscript (available ldscripts at https://github.com/esp8266/Arduino/tree/master/tools/sdk/ld)
@@ -178,7 +172,7 @@ upload_speed = 115200
 # ------------------------------------------------------------------------------
 lib_compat_mode = strict
 lib_deps =
-    fastled/FastLED @ 3.6.0
+    fastled/FastLED @ 3.5.0
    IRremoteESP8266 @ 2.8.2
    makuna/NeoPixelBus @ 2.7.5
    https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
@@ -204,7 +198,7 @@ build_flags =
  -DESP8266
  -DFP_IN_IROM
  ;-Wno-deprecated-declarations
-  ;-Wno-register  ;; leaves some warnings when compiling C files: command-line option '-Wno-register' is valid for C++/ObjC++ but not for C
+  -Wno-register  ;; leaves some warnings when compiling C files: command-line option '-Wno-register' is valid for C++/ObjC++ but not for C
  ;-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library ;; warning: this can be dangerous
  -Wno-misleading-indentation
  ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
@@ -217,9 +211,6 @@ build_flags =
  -DVTABLES_IN_FLASH
  ; restrict to minimal mime-types
  -DMIMETYPE_MINIMAL
-  ; other special-purpose framework flags (see https://docs.platformio.org/en/latest/platforms/espressif8266.html)
-  -D PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48 ;; in case of linker errors like "section `.text1' will not fit in region `iram1_0_seg'"
-  ; -D PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED ;; (experimental) adds some extra heap, but may cause slowdown

 lib_deps =
  #https://github.com/lorol/LITTLEFS.git
@@ -230,7 +221,9 @@ lib_deps =
 [esp32]
 #platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
 platform = espressif32@3.5.0
+
 platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4
+
 build_flags = -g
  -DARDUINO_ARCH_ESP32
  #-DCONFIG_LITTLEFS_FOR_IDF_3_2
@@ -238,14 +231,14 @@ build_flags = -g
  #use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
  -D LOROL_LITTLEFS
  ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
+
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
+
 lib_deps =
  https://github.com/lorol/LITTLEFS.git
  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
  ${env.lib_deps}
-# additional build flags for audioreactive
-AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT
-AR_lib_deps = https://github.com/kosme/arduinoFFT#develop @ ^1.9.2
+

 [esp32_idf_V4]
 ;; experimental build environment for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5
@@ -253,8 +246,9 @@ AR_lib_deps = https://github.com/kosme/arduinoFFT#develop @ ^1.9.2
 ;;
 ;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
 ;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
-platform = espressif32@5.3.0
+platform = espressif32@5.2.0
 platform_packages =
+  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to platform >=5.3.0
 build_flags = -g
  -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
  -DARDUINO_ARCH_ESP32 -DESP32
@@ -268,8 +262,9 @@ lib_deps =

 [esp32s2]
 ;; generic definitions for all ESP32-S2 boards
-platform = espressif32@5.3.0
+platform = espressif32@5.2.0
 platform_packages =
+  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to platform >=5.3.0
 build_flags = -g
  -DARDUINO_ARCH_ESP32
  -DARDUINO_ARCH_ESP32S2
@@ -287,8 +282,9 @@ lib_deps =

 [esp32c3]
 ;; generic definitions for all ESP32-C3 boards
-platform = espressif32@5.3.0
+platform = espressif32@5.2.0
 platform_packages =
+  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to platform >=5.3.0
 build_flags = -g
  -DARDUINO_ARCH_ESP32
  -DARDUINO_ARCH_ESP32C3
@@ -305,8 +301,9 @@ lib_deps =

 [esp32s3]
 ;; generic definitions for all ESP32-S3 boards
-platform = espressif32@5.3.0
+platform = espressif32@5.2.0
 platform_packages =
+  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to platform >=5.3.0
 build_flags = -g
  -DESP32
  -DARDUINO_ARCH_ESP32
@@ -353,7 +350,6 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA
-  ; -D WLED_USE_UNREAL_MATH ;; may cause wrong sunset/sunrise times, but saves 7064 bytes FLASH and 975 bytes RAM
 lib_deps = ${esp8266.lib_deps}

 [env:esp07]
@@ -404,20 +400,6 @@ lib_deps = ${esp32.lib_deps}
 monitor_filters = esp32_exception_decoder
 board_build.partitions = ${esp32.default_partitions}

-[env:esp32dev_audioreactive]
-board = esp32dev
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_audioreactive #-D WLED_DISABLE_BROWNOUT_DET
-  ${esp32.AR_build_flags}
-lib_deps = ${esp32.lib_deps}
-  ${esp32.AR_lib_deps}
-monitor_filters = esp32_exception_decoder
-board_build.partitions = ${esp32.default_partitions}
-; board_build.f_flash = 80000000L
-; board_build.flash_mode = dio
-
 [env:esp32dev_qio80]
 board = esp32dev
 platform = ${esp32.platform}
@@ -452,7 +434,6 @@ platform_packages = ${esp32.platform_packages}
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_Ethernet -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1
-  -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
 lib_deps = ${esp32.lib_deps}
 board_build.partitions = ${esp32.default_partitions}

@@ -466,7 +447,6 @@ board_build.flash_mode = qio
 upload_speed = 460800
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME=S2_saola
-  ;-DLOLIN_WIFI_FIX ;; try this in case Wifi does not work
  -DARDUINO_USB_CDC_ON_BOOT=1
 lib_deps = ${esp32s2.lib_deps}

@@ -477,11 +457,10 @@ platform_packages = ${esp32c3.platform_packages}
 framework = arduino
 board = esp32-c3-devkitm-1
 board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
-build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME=ESP32-C3
+build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32-C3
  -D WLED_WATCHDOG_TIMEOUT=0
-  -DLOLIN_WIFI_FIX ; seems to work much better with this
-  -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
-  ;-DARDUINO_USB_CDC_ON_BOOT=0   ;; for serial-to-USB chip
+  ; -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
+  -DARDUINO_USB_CDC_ON_BOOT=0   ;; for serial-to-USB chip
 upload_speed = 460800
 build_unflags = ${common.build_unflags}
 lib_deps = ${esp32c3.lib_deps}
@@ -493,10 +472,10 @@ platform = ${esp32s3.platform}
 platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600 ; or  460800
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_8MB
+build_flags = ${common.build_flags} ${esp32s3.build_flags}
  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
  -D ARDUINO_USB_CDC_ON_BOOT=0  ;; -D ARDUINO_USB_MODE=1 ;; for boards with serial-to-USB chip
-  ;-D ARDUINO_USB_CDC_ON_BOOT=1 ;; -D ARDUINO_USB_MODE=1 ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
+  ;-D ARDUINO_USB_CDC_ON_BOOT=1 ;; -D ARDUINO_USB_MODE=0 ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
  ;-D WLED_DEBUG
 lib_deps = ${esp32s3.lib_deps}
 board_build.partitions = tools/WLED_ESP32_8MB.csv
@@ -505,18 +484,19 @@ board_build.flash_mode = qio
 ; board_build.flash_mode = dio   ;; try this if you have problems at startup
 monitor_filters = esp32_exception_decoder

-[env:esp32s3dev_8MB_PSRAM_opi]
-;; ESP32-S3 development board, with 8MB FLASH and >= 8MB PSRAM (memory_type: qio_opi)
-board = esp32-s3-devkitc-1 ;; generic dev board; the next line adds PSRAM support
-board_build.arduino.memory_type = qio_opi     ;; use with PSRAM: 8MB or 16MB
+[env:esp32s3dev_8MB_PSRAM]
+;; ESP32-TinyS3 development board, with 8MB FLASH and 8MB PSRAM (memory_type: qio_opi, qio_qspi, or opi_opi)
+;board = um_tinys3 ;    -> needs workaround from https://github.com/Aircoookie/WLED/pull/2905#issuecomment-1328049860
+;board = esp32s3box   ; -> error: 'esp32_adc2gpio' was not declared in this scope
+board = esp32-s3-devkitc-1 ; -> compiles, but does not support PSRAM
 platform = ${esp32s3.platform}
 platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32s3.build_flags}
  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
-  ;-D ARDUINO_USB_CDC_ON_BOOT=0  ;; -D ARDUINO_USB_MODE=1 ;; for boards with serial-to-USB chip
-  -D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1      ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
+  ;-D ARDUINO_USB_CDC_ON_BOOT=0 ;; -D ARDUINO_USB_MODE=1 ;; for boards with serial-to-USB chip
+  -D ARDUINO_USB_CDC_ON_BOOT=1  ;; -D ARDUINO_USB_MODE=0 ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
  ; -D WLED_RELEASE_NAME=ESP32-S3_PSRAM
  -D WLED_USE_PSRAM -DBOARD_HAS_PSRAM ; tells WLED that PSRAM shall be used
 lib_deps = ${esp32s3.lib_deps}
@@ -525,18 +505,6 @@ board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 monitor_filters = esp32_exception_decoder

-[env:esp32s3dev_16MB_PSRAM_opi]
-extends = env:esp32s3dev_8MB_PSRAM_opi
-board_build.partitions = tools/WLED_ESP32_16MB.csv
-board_upload.flash_size = 16MB
-
-[env:esp32s3dev_8MB_PSRAM_qspi]
-;; ESP32-TinyS3 development board, with 8MB FLASH and PSRAM (memory_type: qio_qspi)
-extends = env:esp32s3dev_8MB_PSRAM_opi
-;board = um_tinys3 ;    -> needs workaround from https://github.com/Aircoookie/WLED/pull/2905#issuecomment-1328049860
-board = esp32-s3-devkitc-1 ;; generic dev board; the next line adds PSRAM support
-board_build.arduino.memory_type = qio_qspi ;; use with PSRAM: 2MB or  4MB
-
 [env:esp8285_4CH_MagicHome]
 board = esp8285
 platform = ${common.platform_wled_default}
@@ -604,15 +572,14 @@ platform = ${esp32s2.platform}
 platform_packages = ${esp32s2.platform_packages}
 board = lolin_s2_mini
 board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
-build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
-build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=ESP32-S2
+build_unflags = ${common.build_unflags} -DARDUINO_USB_CDC_ON_BOOT=1
+build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME=LolinS2
  -DBOARD_HAS_PSRAM
-  -DARDUINO_USB_CDC_ON_BOOT=1 # try disabling and enabling unflag above in case of board-specific issues, will disable Serial
+  -DARDUINO_USB_CDC_ON_BOOT=0
  -DARDUINO_USB_MSC_ON_BOOT=0
  -DARDUINO_USB_DFU_ON_BOOT=0
  -DLOLIN_WIFI_FIX ; seems to work much better with this
  -D WLED_USE_PSRAM
-  ; -D WLED_USE_UNREAL_MATH ;; may cause wrong sunset/sunrise times, but saves 6792 bytes FLASH
  -D WLED_WATCHDOG_TIMEOUT=0
  -D CONFIG_ASYNC_TCP_USE_WDT=0
  -D LEDPIN=16
@@ -648,8 +615,6 @@ upload_speed = 115200
 lib_deps = ${esp32c3.lib_deps}
 board_build.partitions = tools/WLED_ESP32_2MB_noOTA.csv
 board_build.flash_mode = dio
-board_upload.flash_size = 2MB
-board_upload.maximum_size = 2097152

 [env:wemos_shield_esp32]
 board = esp32dev
@@ -662,7 +627,7 @@ build_flags = ${common.build_flags_esp32}
  -D RLYPIN=19
  -D BTNPIN=17
  -D IRPIN=18
-  -U WLED_USE_MY_CONFIG
+  -D UWLED_USE_MY_CONFIG
  -D USERMOD_DALLASTEMPERATURE
  -D USERMOD_FOUR_LINE_DISPLAY
  -D TEMPERATURE_PIN=23
@@ -3,7 +3,7 @@
  <a href="https://github.com/Aircoookie/WLED/releases"><img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a>
  <a href="https://raw.githubusercontent.com/Aircoookie/WLED/master/LICENSE"><img src="https://img.shields.io/github/license/Aircoookie/wled?color=blue&style=flat-square"></a>
  <a href="https://wled.discourse.group"><img src="https://img.shields.io/discourse/topics?colorB=blue&label=forum&server=https%3A%2F%2Fwled.discourse.group%2F&style=flat-square"></a>
-  <a href="https://discord.gg/QAh7wJHrRM"><img src="https://img.shields.io/discord/473448917040758787.svg?colorB=blue&label=discord&style=flat-square"></a>
+  <a href="https://discord.gg/KuqP7NE"><img src="https://img.shields.io/discord/473448917040758787.svg?colorB=blue&label=discord&style=flat-square"></a>
  <a href="https://kno.wled.ge"><img src="https://img.shields.io/badge/quick_start-wiki-blue.svg?style=flat-square"></a>
  <a href="https://github.com/Aircoookie/WLED-App"><img src="https://img.shields.io/badge/app-wled-blue.svg?style=flat-square"></a>
  <a href="https://gitpod.io/#https://github.com/Aircoookie/WLED"><img src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?style=flat-square&logo=gitpod"></a>
@@ -26,7 +26,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
 - Up to 250 user presets to save and load colors/effects easily, supports cycling through them.  
 - Presets can be used to automatically execute API calls  
 - Nightlight function (gradually dims down)  
- Full OTA software updateability (HTTP + ArduinoOTA), password protectable  
+- Full OTA software updatability (HTTP + ArduinoOTA), password protectable  
 - Configurable analog clock (Cronixie, 7-segment and EleksTube IPS clock support via usermods) 
 - Configurable Auto Brightness limit for safe operation  
 - Filesystem-based config for easier backup of presets and settings  
@@ -66,7 +66,7 @@ Credits [here](https://kno.wled.ge/about/contributors/)!

 Join the Discord server to discuss everything about WLED!

-<a href="https://discord.gg/QAh7wJHrRM"><img src="https://discordapp.com/api/guilds/473448917040758787/widget.png?style=banner2" width="25%"></a>
+<a href="https://discord.gg/KuqP7NE"><img src="https://discordapp.com/api/guilds/473448917040758787/widget.png?style=banner2" width="25%"></a>

 Check out the WLED [Discourse forum](https://wled.discourse.group)!  

@@ -12,7 +12,7 @@ anyio==3.6.2
    # via starlette
 bottle==0.12.25
    # via platformio
-certifi==2023.7.22
+certifi==2022.12.7
    # via requests
 charset-normalizer==3.1.0
    # via requests
@@ -50,7 +50,7 @@ starlette==0.23.1
    # via platformio
 tabulate==0.9.0
    # via platformio
-urllib3==1.26.18
+urllib3==1.26.15
    # via requests
 uvicorn==0.20.0
    # via platformio
@@ -1,8 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x5000,
-otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x300000,
-app1,     app,  ota_1,   0x310000,0x300000,
-spiffs,   data, spiffs,  0x610000,0x9E0000,
-coredump, data, coredump,,64K
-# to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage
@@ -3,5 +3,4 @@ nvs,      data, nvs,     0x9000,  0x5000,
 otadata,  data, ota,     0xe000,  0x2000,
 app0,     app,  ota_0,   0x10000, 0x200000,
 app1,     app,  ota_1,   0x210000,0x200000,
-spiffs,   data, spiffs,  0x410000,0x3E0000,
-coredump, data, coredump,,64K
+spiffs,   data, spiffs,  0x410000,0x3F0000,
@@ -222,7 +222,6 @@ writeHtmlGzipped("wled00/data/index.htm", "wled00/html_ui.h", 'index');
 writeHtmlGzipped("wled00/data/simple.htm", "wled00/html_simple.h", 'simple');
 writeHtmlGzipped("wled00/data/pixart/pixart.htm", "wled00/html_pixart.h", 'pixart');
 writeHtmlGzipped("wled00/data/cpal/cpal.htm", "wled00/html_cpal.h", 'cpal');
-writeHtmlGzipped("wled00/data/pxmagic/pxmagic.htm", "wled00/html_pxmagic.h", 'pxmagic');
 /*
 writeChunks(
  "wled00/data",
@@ -390,6 +389,12 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
      method: "gzip",
      filter: "html-minify",
    },
+    {
+      file: "liveviewws.htm",
+      name: "PAGE_liveviewws",
+      method: "gzip",
+      filter: "html-minify",
+    },
    {
      file: "liveviewws2D.htm",
      name: "PAGE_liveviewws2D",
@@ -0,0 +1,122 @@
+
+const express = require("express");
+const { createProxyMiddleware } = require('http-proxy-middleware');
+const path = require("path");
+const nopt = require("nopt");
+const app = express();
+
+var knownOpts = {
+    "help": Boolean,
+    "port": Number,
+    "settings": [path],
+    "host": String,
+    "verbose": Boolean
+};
+var shortHands = {
+    "?":["--help"],
+    "p":["--port"],
+    "s":["--settings"],
+    "h":["--host"],
+    "v":["--verbose"]
+};
+
+nopt.invalidHandler = function(k,v,t) {
+    // TODO: console.log(k,v,t);
+}
+
+var parsedArgs = nopt(knownOpts,shortHands,process.argv,2);
+
+if (parsedArgs.help) {
+    console.log("WLED Dev Server");
+    console.log("Usage: wled [-v] [-?] [--settings settings.js] [--userDir DIR]");
+    console.log("                [--port PORT] [--host HOST]");
+    console.log("");
+    console.log("Options:");
+    console.log("  -p, --port     PORT  port to listen on");
+    console.log("  -s, --settings FILE  use specified settings file");
+    console.log("      --host     HOST  WLED instance for dynamic content");
+    console.log("  -v, --verbose        enable verbose output");
+    console.log("  -?, --help           show this help");
+    console.log("");
+    process.exit();
+} 
+
+// WLED_HOME - the root directory where the html files are
+process.env.WLED_HOME = process.env.WLED_HOME || path.resolve(__dirname,'..','wled00','data');
+
+parsedArgs.port = parsedArgs.port || 8080;
+parsedArgs.host = parsedArgs.host || "0.0.0.0";
+
+// get the static file reference
+function static(page) {
+    return express.static(process.env.WLED_HOME, {index: page});
+}
+
+// add routes for each setting page
+function useSettingsRoutes() {
+    app.use(`/settings`, static(`settings.htm`));
+
+    const settings = ['wifi', 'leds', 'ui', 'sync','time','um', 'sec'];
+    settings.forEach(function(setting) { 
+        app.use(`/settings/${setting}`, static(`settings_${setting}.htm`)); 
+    });
+}
+
+// dynamic content that is proxied to real WLED instance
+function useWebProxyRoutes(host) {
+    const httpProxy = createProxyMiddleware({ target: `http://${host}`, changeOrigin: true, logLevel: 'warn' });
+    const proxyRoutes = ['json', 'presets.json', 'skins.css', 'liveview'];
+    proxyRoutes.forEach(function(route) {
+        app.use(`/${route}`, httpProxy);
+    });
+}
+
+// proxy data to a real WLED instance
+function useWebSocketProxy(host, server) {
+    const wsProxy = createProxyMiddleware(`ws://${host}`, { changeOrigin: true, logLevel: 'warn' });
+    app.use(wsProxy);
+    server.on('upgrade', wsProxy.upgrade);
+}
+
+// first matching route 
+app.use('/', static("index.htm"));
+useSettingsRoutes(); // map the setting pages
+useWebProxyRoutes(parsedArgs.host);
+
+// use static files like style sheets etc
+app.use(express.static(process.env.WLED_HOME));
+
+const server = app.listen(parsedArgs.port, () => {
+    if (parsedArgs.verbose) {
+        console.log(`WLED UI listening at http://localhost:${parsedArgs.port}`)
+    }
+});
+
+useWebSocketProxy(parsedArgs.host, server);
+
+var stopping = false;
+function exitWhenStopped() {
+    if (!stopping) {
+        stopping = true;
+        server.close(function() {
+            console.log('WLED UI closed');
+            process.exit();
+        });
+    }
+}
+
+process.on('uncaughtException',function(err) {
+    util.log('[WLED] Uncaught Exception:');
+    if (err.stack) {
+        console.log(err.stack);
+    } else {
+        console.log(err);
+    }
+    process.exit(1);
+});
+
+process.on('SIGINT', exitWhenStopped);
+process.on('SIGTERM', exitWhenStopped);
+process.on('SIGHUP', exitWhenStopped);
+process.on('SIGUSR2', exitWhenStopped);  // for nodemon restart
+process.on('SIGBREAK', exitWhenStopped); // for windows ctrl-break
@@ -25,7 +25,6 @@ class Animated_Staircase : public Usermod {
    bool useUSSensorBottom         = false; // using PIR or UltraSound sensor?
    unsigned int topMaxDist        = 50;    // default maximum measured distance in cm, top
    unsigned int bottomMaxDist     = 50;    // default maximum measured distance in cm, bottom
-    bool togglePower               = false; // toggle power on/off with staircase on/off

    /* runtime variables */
    bool initDone = false;
@@ -91,8 +90,7 @@ class Animated_Staircase : public Usermod {
    static const char _bottomEcho_pin[];
    static const char _topEchoCm[];
    static const char _bottomEchoCm[];
-    static const char _togglePower[];
-
+    
    void publishMqtt(bool bottom, const char* state) {
 #ifndef WLED_DISABLE_MQTT
      //Check if MQTT Connected, otherwise it will crash the 8266
@@ -133,7 +131,7 @@ class Animated_Staircase : public Usermod {
    *            received within this time, an object is detected
    *            and the function will return true.
    *
-    * The speed of sound is 343 meters per second at 20 degrees Celsius.
+    * The speed of sound is 343 meters per second at 20 degress Celcius.
    * Since the sound has to travel back and forth, the detection
    * distance for the sensor in cm is (0.0343 * maxTimeUs) / 2.
    *
@@ -198,7 +196,6 @@ class Animated_Staircase : public Usermod {
          if (on) {
            lastSensor = topSensorRead;
          } else {
-            if (togglePower && onIndex == offIndex && offMode) toggleOnOff(); // toggle power on if off
            // If the bottom sensor triggered, we need to swipe up, ON
            swipe = bottomSensorRead;

@@ -252,14 +249,11 @@ class Animated_Staircase : public Usermod {
            offIndex = MAX(onIndex, offIndex - 1);
          }
        }
-        if (oldOn != onIndex || oldOff != offIndex) {
-          updateSegments(); // reduce the number of updates to necessary ones
-          if (togglePower && onIndex == offIndex && !offMode && !on) toggleOnOff();  // toggle power off for all segments off
-        }
+        if (oldOn != onIndex || oldOff != offIndex) updateSegments(); // reduce the number of updates to necessary ones
      }
    }

-    // send sensor values to JSON API
+    // send sesnor values to JSON API
    void writeSensorsToJson(JsonObject& staircase) {
      staircase[F("top-sensor")]    = topSensorRead;
      staircase[F("bottom-sensor")] = bottomSensorRead;
@@ -297,11 +291,10 @@ class Animated_Staircase : public Usermod {
        offIndex = maxSegmentId = strip.getLastActiveSegmentId() + 1;

        // shorten the strip transition time to be equal or shorter than segment delay
-        transitionDelay = segment_delay_ms;
-        strip.setTransition(segment_delay_ms);
+        transitionDelayTemp = transitionDelay = segment_delay_ms;
+        strip.setTransition(segment_delay_ms/100);
        strip.trigger();
      } else {
-        if (togglePower && !on && offMode) toggleOnOff(); // toggle power on if off
        // Restore segment options
        for (int i = 0; i <= strip.getLastActiveSegmentId(); i++) {
          Segment &seg = strip.getSegment(i);
@@ -309,7 +302,7 @@ class Animated_Staircase : public Usermod {
          seg.setOption(SEG_OPTION_ON, true);
        }
        strip.trigger();  // force strip update
-        stateChanged = true;  // inform external devices/UI of change
+        stateChanged = true;  // inform external dvices/UI of change
        colorUpdated(CALL_MODE_DIRECT_CHANGE);
        DEBUG_PRINTLN(F("Animated Staircase disabled."));
      }
@@ -451,7 +444,6 @@ class Animated_Staircase : public Usermod {
      staircase[FPSTR(_bottomEcho_pin)]            = useUSSensorBottom ? bottomEchoPin : -1;
      staircase[FPSTR(_topEchoCm)]                 = topMaxDist;
      staircase[FPSTR(_bottomEchoCm)]              = bottomMaxDist;
-      staircase[FPSTR(_togglePower)]               = togglePower;
      DEBUG_PRINTLN(F("Staircase config saved."));
    }

@@ -492,12 +484,10 @@ class Animated_Staircase : public Usermod {
      bottomEchoPin         = top[FPSTR(_bottomEcho_pin)] | bottomEchoPin;

      topMaxDist    = top[FPSTR(_topEchoCm)] | topMaxDist;
-      topMaxDist    = min(150,max(30,(int)topMaxDist));     // max distance ~1.5m (a lag of 9ms may be expected)
+      topMaxDist    = min(150,max(30,(int)topMaxDist));     // max distnace ~1.5m (a lag of 9ms may be expected)
      bottomMaxDist = top[FPSTR(_bottomEchoCm)] | bottomMaxDist;
      bottomMaxDist = min(150,max(30,(int)bottomMaxDist));  // max distance ~1.5m (a lag of 9ms may be expected)

-      togglePower = top[FPSTR(_togglePower)] | togglePower;  // staircase toggles power on/off
-
      DEBUG_PRINT(FPSTR(_name));
      if (!initDone) {
        // first run: reading from cfg.json
@@ -521,7 +511,7 @@ class Animated_Staircase : public Usermod {
        if (changed) setup();
      }
      // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
-      return !top[FPSTR(_togglePower)].isNull();
+      return true;
    }

    /*
@@ -561,4 +551,3 @@ const char Animated_Staircase::_bottomPIRorTrigger_pin[]    PROGMEM = "bottomPIR
 const char Animated_Staircase::_bottomEcho_pin[]            PROGMEM = "bottomEcho_pin";
 const char Animated_Staircase::_topEchoCm[]                 PROGMEM = "top-dist-cm";
 const char Animated_Staircase::_bottomEchoCm[]              PROGMEM = "bottom-dist-cm";
-const char Animated_Staircase::_togglePower[]               PROGMEM = "toggle-on-off";
@@ -11,7 +11,7 @@ The Animated Staircase can be controlled by the WLED API. Change settings such a
 speed, on/off time and distance by sending an HTTP request, see below.

 ## WLED integration
-To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://kno.wled.ge/advanced/compiling-wled/).
+To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://github.com/Aircoookie/WLED/wiki/Compiling-WLED).

 Before compiling, you have to make the following modifications:

@@ -38,7 +38,7 @@ Maximum distance for ultrasonic sensor can be configured as the time needed for
 You _may_ need to use 10k pull-down resistors on the selected PIR pins, depending on the sensor.

 ## WLED configuration
-1. In the WLED UI, configure a segment for each step. The lowest step of the stairs is the 
+1. In the WLED UI, confgure a segment for each step. The lowest step of the stairs is the 
   lowest segment id. 
 2. Save your segments into a preset. 
 3. Ideally, add the preset in the config > LED setup menu to the "apply 
@@ -91,7 +91,7 @@ To enable the usermod again, use `"enabled":true`.
 Alternatively you can use _Usermod_ Settings page where you can change other parameters as well.

 ### Changing animation parameters and detection range of the ultrasonic HC-SR04 sensor
-Using _Usermod_ Settings page you can define different usermod parameters, including sensor pins, delay between segment activation etc.
+Using _Usermod_ Settings page you can define different usermod parameters, includng sensor pins, delay between segment activation etc.

 When an ultrasonic sensor is enabled you can enter maximum detection distance in centimeters separately for top and bottom sensors.

@@ -9,7 +9,7 @@ The luminance is displayed in both the Info section of the web UI, as well as pu
  - This must be added under `lib_deps` in your `platformio.ini` (or `platformio_override.ini`).
 - Data is published over MQTT - make sure you've enabled the MQTT sync interface.

-## Compilation
+## Compiliation

 To enable, compile with `USERMOD_BH1750` defined  (e.g. in `platformio_override.ini`)
 ```ini
@@ -8,6 +8,7 @@
 #pragma once

 #include "wled.h"
+#include <Wire.h>
 #include <BH1750.h>

 // the max frequency to check photoresistor, 10 seconds
@@ -25,7 +26,7 @@
 #define USERMOD_BH1750_FIRST_MEASUREMENT_AT 10000
 #endif

-// only report if difference grater than offset value
+// only report if differance grater than offset value
 #ifndef USERMOD_BH1750_OFFSET_VALUE
 #define USERMOD_BH1750_OFFSET_VALUE 1
 #endif
@@ -55,6 +56,15 @@ private:
  static const char _offset[];
  static const char _HomeAssistantDiscovery[];

+  // set the default pins based on the architecture, these get overridden by Usermod menu settings
+  #ifdef ARDUINO_ARCH_ESP32 // ESP32 boards
+    #define HW_PIN_SCL 22
+    #define HW_PIN_SDA 21
+  #else // ESP8266 boards
+    #define HW_PIN_SCL 5
+    #define HW_PIN_SDA 4
+  #endif
+  int8_t ioPin[2] = {HW_PIN_SCL, HW_PIN_SDA};        // I2C pins: SCL, SDA...defaults to Arch hardware pins but overridden at setup()
  bool initDone = false;
  bool sensorFound = false;

@@ -113,7 +123,14 @@ private:
 public:
  void setup()
  {
-    if (i2c_scl<0 || i2c_sda<0) { enabled = false; return; }
+    bool HW_Pins_Used = (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA); // note whether architecture-based hardware SCL/SDA pins used
+    PinOwner po = PinOwner::UM_BH1750; // defaults to being pinowner for SCL/SDA pins
+    PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };  // allocate pins
+    if (HW_Pins_Used) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
+    if (!pinManager.allocateMultiplePins(pins, 2, po)) return;
+    
+    Wire.begin(ioPin[1], ioPin[0]);
+
    sensorFound = lightMeter.begin();
    initDone = true;
  }
@@ -173,9 +190,7 @@ public:
      user = root.createNestedObject(F("u"));

    JsonArray lux_json = user.createNestedArray(F("Luminance"));
-    if (!enabled) {
-      lux_json.add(F("disabled"));
-    } else if (!sensorFound) {
+    if (!sensorFound) {
        // if no sensor 
        lux_json.add(F("BH1750 "));
        lux_json.add(F("Not Found"));
@@ -201,6 +216,9 @@ public:
    top[FPSTR(_minReadInterval)] = minReadingInterval;
    top[FPSTR(_HomeAssistantDiscovery)] = HomeAssistantDiscovery;
    top[FPSTR(_offset)] = offset;
+    JsonArray io_pin = top.createNestedArray(F("pin"));
+    for (byte i=0; i<2; i++) io_pin.add(ioPin[i]);
+    top[F("help4Pins")] = F("SCL,SDA"); // help for Settings page

    DEBUG_PRINTLN(F("BH1750 config saved."));
  }
@@ -208,6 +226,8 @@ public:
  // called before setup() to populate properties from values stored in cfg.json
  bool readFromConfig(JsonObject &root)
  {
+    int8_t newPin[2]; for (byte i=0; i<2; i++) newPin[i] = ioPin[i]; // prepare to note changed pins
+
    // we look for JSON object.
    JsonObject top = root[FPSTR(_name)];
    if (top.isNull())
@@ -224,12 +244,27 @@ public:
    configComplete &= getJsonValue(top[FPSTR(_minReadInterval)], minReadingInterval, 500); //ms
    configComplete &= getJsonValue(top[FPSTR(_HomeAssistantDiscovery)], HomeAssistantDiscovery, false);
    configComplete &= getJsonValue(top[FPSTR(_offset)], offset, 1);
+    for (byte i=0; i<2; i++) configComplete &= getJsonValue(top[F("pin")][i], newPin[i], ioPin[i]);

    DEBUG_PRINT(FPSTR(_name));
    if (!initDone) {
+      // first run: reading from cfg.json
+      for (byte i=0; i<2; i++) ioPin[i] = newPin[i];
      DEBUG_PRINTLN(F(" config loaded."));
    } else {
      DEBUG_PRINTLN(F(" config (re)loaded."));
+      // changing parameters from settings page
+      bool pinsChanged = false;
+      for (byte i=0; i<2; i++) if (ioPin[i] != newPin[i]) { pinsChanged = true; break; } // check if any pins changed
+      if (pinsChanged) { //if pins changed, deallocate old pins and allocate new ones
+        PinOwner po = PinOwner::UM_BH1750;
+        if (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA) po = PinOwner::HW_I2C;  // allow multiple allocations of HW I2C bus pins
+        pinManager.deallocateMultiplePins((const uint8_t *)ioPin, 2, po);  // deallocate pins
+        for (byte i=0; i<2; i++) ioPin[i] = newPin[i];
+        setup();
+      }
+      // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
+      return !top[F("pin")].isNull();
    }

    return configComplete;
@@ -9,6 +9,7 @@

 #include "wled.h"
 #include <Arduino.h>
+#include <Wire.h>
 #include <BME280I2C.h>               // BME280 sensor
 #include <EnvironmentCalculations.h> // BME280 extended measurements

@@ -31,8 +32,9 @@ private:

  // set the default pins based on the architecture, these get overridden by Usermod menu settings
  #ifdef ESP8266
-    //uint8_t RST_PIN = 16; // Un-comment for Heltec WiFi-Kit-8
+    //uint8_t RST_PIN = 16; // Uncoment for Heltec WiFi-Kit-8
  #endif
+  int8_t ioPin[2] = {i2c_scl, i2c_sda};   // I2C pins: SCL, SDA...defaults to Arch hardware pins but overridden at setup()
  bool initDone = false;

  // BME280 sensor settings
@@ -78,7 +80,7 @@ private:
  static const char _name[];
  static const char _enabled[];

-  // Read the BME280/BMP280 Sensor (which one runs depends on whether Celsius or Fahrenheit being set in Usermod Menu)
+  // Read the BME280/BMP280 Sensor (which one runs depends on whether Celsius or Farenheit being set in Usermod Menu)
  void UpdateBME280Data(int SensorType)
  {
    float _temperature, _humidity, _pressure;
@@ -184,8 +186,14 @@ private:
 public:
  void setup()
  {
-    if (i2c_scl<0 || i2c_sda<0) { enabled = false; sensorType = 0; return; }
+    bool HW_Pins_Used = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda); // note whether architecture-based hardware SCL/SDA pins used
+    PinOwner po = PinOwner::UM_BME280; // defaults to being pinowner for SCL/SDA pins
+    PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };  // allocate pins
+    if (HW_Pins_Used) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
+    if (!pinManager.allocateMultiplePins(pins, 2, po)) { sensorType=0; return; }
    
+    Wire.begin(ioPin[1], ioPin[0]);
+
    if (!bme.begin())
    {
      sensorType = 0;
@@ -407,6 +415,9 @@ public:
    top[F("PublishAlways")] = PublishAlways;
    top[F("UseCelsius")] = UseCelsius;
    top[F("HomeAssistantDiscovery")] = HomeAssistantDiscovery;
+    JsonArray io_pin = top.createNestedArray(F("pin"));
+    for (byte i=0; i<2; i++) io_pin.add(ioPin[i]);
+    top[F("help4Pins")] = F("SCL,SDA"); // help for Settings page
    DEBUG_PRINTLN(F("BME280 config saved."));
  }

@@ -416,6 +427,8 @@ public:
    // default settings values could be set here (or below using the 3-argument getJsonValue()) instead of in the class definition or constructor
    // setting them inside readFromConfig() is slightly more robust, handling the rare but plausible use case of single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)

+    int8_t newPin[2]; for (byte i=0; i<2; i++) newPin[i] = ioPin[i]; // prepare to note changed pins
+
    JsonObject top = root[FPSTR(_name)];
    if (top.isNull()) {
      DEBUG_PRINT(F(_name));
@@ -434,14 +447,27 @@ public:
    configComplete &= getJsonValue(top[F("PublishAlways")], PublishAlways, false);
    configComplete &= getJsonValue(top[F("UseCelsius")], UseCelsius, true);
    configComplete &= getJsonValue(top[F("HomeAssistantDiscovery")], HomeAssistantDiscovery, false);
+    for (byte i=0; i<2; i++) configComplete &= getJsonValue(top[F("pin")][i], newPin[i], ioPin[i]);

    DEBUG_PRINT(FPSTR(_name));
    if (!initDone) {
      // first run: reading from cfg.json
+      for (byte i=0; i<2; i++) ioPin[i] = newPin[i];
      DEBUG_PRINTLN(F(" config loaded."));
    } else {
      DEBUG_PRINTLN(F(" config (re)loaded."));
      // changing parameters from settings page
+      bool pinsChanged = false;
+      for (byte i=0; i<2; i++) if (ioPin[i] != newPin[i]) { pinsChanged = true; break; } // check if any pins changed
+      if (pinsChanged) { //if pins changed, deallocate old pins and allocate new ones
+        PinOwner po = PinOwner::UM_BME280;
+        if (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda) po = PinOwner::HW_I2C;  // allow multiple allocations of HW I2C bus pins
+        pinManager.deallocateMultiplePins((const uint8_t *)ioPin, 2, po);  // deallocate pins
+        for (byte i=0; i<2; i++) ioPin[i] = newPin[i];
+        setup();
+      }
+      // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
+      return !top[F("pin")].isNull();
    }

    return configComplete;
@@ -19,7 +19,7 @@ If you have an ESP32 board, connect the positive side of the battery to ADC1 (GP
 - 💯 Displays current battery voltage 
 - 🚥 Displays battery level
 - 🚫 Auto-off with configurable Threshold
- 🚨 Low power indicator with many configuration possibilities
+- 🚨 Low power indicator with many configuration posibilities

 ## 🎈 Installation

@@ -41,7 +41,7 @@ define `USERMOD_BATTERY` in `wled00/my_config.h`
 | `USERMOD_BATTERY_MEASUREMENT_INTERVAL`          | ms          | battery check interval. defaults to 30 seconds                                        |
 | `USERMOD_BATTERY_MIN_VOLTAGE`                   | v           | minimum battery voltage. default is 2.6 (18650 battery standard)                      |
 | `USERMOD_BATTERY_MAX_VOLTAGE`                   | v           | maximum battery voltage. default is 4.2 (18650 battery standard)                      |
-| `USERMOD_BATTERY_TOTAL_CAPACITY`                | mAh         | the capacity of all cells in parallel summed up                                       |
+| `USERMOD_BATTERY_TOTAL_CAPACITY`                | mAh         | the capacity of all cells in parralel sumed up                                        |
 | `USERMOD_BATTERY_CALIBRATION`                   |             | offset / calibration number, fine tune the measured voltage by the microcontroller    |
 | Auto-Off                                        | ---         | ---                                                                                   |
 | `USERMOD_BATTERY_AUTO_OFF_ENABLED`              | true/false  | enables auto-off                                                                      |
@@ -49,7 +49,7 @@
 #endif

 // how many seconds after boot to take first measurement, 90 seconds
-// 90 gives enough time to OTA update firmware if this crashes
+// 90 gives enough time to OTA update firmware if this crashses
 #ifndef USERMOD_DHT_FIRST_MEASUREMENT_AT
 #define USERMOD_DHT_FIRST_MEASUREMENT_AT 90000
 #endif
@@ -46,7 +46,7 @@ class MyExampleUsermod : public Usermod {
    static const char _enabled[];


-    // any private methods should go here (non-inline method should be defined out of class)
+    // any private methods should go here (non-inline methosd should be defined out of class)
    void publishMqtt(const char* state, bool retain = false); // example for publishing MQTT message


@@ -15,23 +15,23 @@ OneWire oneWire(13);
 DallasTemperature sensor(&oneWire);
 long temptimer = millis();
 long lastMeasure = 0;
-#define Celsius // Show temperature measurement in Celsius otherwise is in Fahrenheit 
+#define Celsius // Show temperature mesaurement in Celcius otherwise is in Fahrenheit 

 // If display does not work or looks corrupted check the
 // constructor reference:
 // https://github.com/olikraus/u8g2/wiki/u8x8setupcpp
 // or check the gallery:
 // https://github.com/olikraus/u8g2/wiki/gallery
-// --> First choice of cheap I2C OLED 128X32 0.91"
+// --> First choise of cheap I2C OLED 128X32 0.91"
 U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Second choice of cheap I2C OLED 128X64 0.96" or 1.3"
+// --> Second choise of cheap I2C OLED 128X64 0.96" or 1.3"
 //U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
 // gets called once at boot. Do all initialization that doesn't depend on
 // network here
 void userSetup() {
  sensor.begin(); //Start Dallas temperature sensor
  u8x8.begin();
-  //u8x8.setFlipMode(1); //Un-comment if using WLED Wemos shield 
+  //u8x8.setFlipMode(1); //Uncoment if using WLED Wemos shield 
  u8x8.setPowerSave(0);
  u8x8.setContrast(10); //Contrast setup will help to preserve OLED lifetime. In case OLED need to be brighter increase number up to 255
  u8x8.setFont(u8x8_font_chroma48medium8_r);
@@ -71,7 +71,7 @@ void userLoop() {
    if (mqtt != nullptr)
    {
      sensor.requestTemperatures();
-//Gets preferred temperature scale based on selection in definitions section
+//Gets prefered temperature scale based on selection in definitions section
      #ifdef Celsius
      float board_temperature = sensor.getTempCByIndex(0);
      #else
@@ -138,11 +138,11 @@ void userLoop() {
  // First row with Wifi name
  u8x8.setCursor(1, 0);
  u8x8.print(knownSsid.substring(0, u8x8.getCols() > 1 ? u8x8.getCols() - 2 : 0));
-  // Print `~` char to indicate that SSID is longer than our display
+  // Print `~` char to indicate that SSID is longer, than owr dicplay
  if (knownSsid.length() > u8x8.getCols())
    u8x8.print("~");

-  // Second row with IP or Password
+  // Second row with IP or Psssword
  u8x8.setCursor(1, 1);
  // Print password in AP mode and if led is OFF.
  if (apActive && bri == 0)
@@ -10,7 +10,7 @@

 void UpdateBME280Data();

-#define Celsius // Show temperature measurement in Celsius otherwise is in Fahrenheit 
+#define Celsius // Show temperature mesaurement in Celcius otherwise is in Fahrenheit 
 BME280I2C bme;    // Default : forced mode, standby time = 1000 ms
                  // Oversampling = pressure ×1, temperature ×1, humidity ×1, filter off,

@@ -20,14 +20,14 @@ uint8_t SDA_PIN = 21;
 #else //ESP8266 boards
 uint8_t SCL_PIN = 5;
 uint8_t SDA_PIN = 4;
-// uint8_t RST_PIN = 16; // Un-comment for Heltec WiFi-Kit-8
+// uint8_t RST_PIN = 16; // Uncoment for Heltec WiFi-Kit-8
 #endif

 //The SCL and SDA pins are defined here.
 //ESP8266 Wemos D1 mini board use SCL=5 SDA=4 while ESP32 Wemos32 mini board use SCL=22 SDA=21
 #define U8X8_PIN_SCL SCL_PIN
 #define U8X8_PIN_SDA SDA_PIN
-//#define U8X8_PIN_RESET RST_PIN // Un-comment for Heltec WiFi-Kit-8
+//#define U8X8_PIN_RESET RST_PIN // Uncoment for Heltec WiFi-Kit-8

 // If display does not work or looks corrupted check the
 // constructor reference:
@@ -36,9 +36,9 @@ uint8_t SDA_PIN = 4;
 // https://github.com/olikraus/u8g2/wiki/gallery
 // --> First choise of cheap I2C OLED 128X32 0.91"
 U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Second choice of cheap I2C OLED 128X64 0.96" or 1.3"
+// --> Second choise of cheap I2C OLED 128X64 0.96" or 1.3"
 //U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Third choice of Heltec WiFi-Kit-8 OLED 128X32 0.91"
+// --> Third choise of Heltec WiFi-Kit-8 OLED 128X32 0.91"
 //U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_RESET, U8X8_PIN_SCL, U8X8_PIN_SDA); // Constructor for Heltec WiFi-Kit-8
 // gets called once at boot. Do all initialization that doesn't depend on network here

@@ -181,11 +181,11 @@ void userLoop() {
  // First row with Wifi name
  u8x8.setCursor(1, 0);
  u8x8.print(knownSsid.substring(0, u8x8.getCols() > 1 ? u8x8.getCols() - 2 : 0));
-  // Print `~` char to indicate that SSID is longer than our display
+  // Print `~` char to indicate that SSID is longer, than owr dicplay
  if (knownSsid.length() > u8x8.getCols())
    u8x8.print("~");

-  // Second row with IP or Password
+  // Second row with IP or Psssword
  u8x8.setCursor(1, 1);
  // Print password in AP mode and if led is OFF.
  if (apActive && bri == 0)
@@ -2,7 +2,7 @@

 **Attention: This usermod compiles only for ESP8266**

-This usermod-v2 modification performs a ping request to a local IP address every 60 seconds. This ensures WLED net services remain accessible in some problematic WiFi environments.
+This usermod-v2 modification performs a ping request to a local IP address every 60 seconds. This ensures WLED net services remain accessible in some problematic WLAN environments.

 The modification works with static or DHCP IP address configuration.

@@ -24,7 +24,7 @@ The usermod supports the following state changes:

 | JSON key    | Value range      | Description                     |
 |-------------|------------------|---------------------------------|
-| PingDelayMs | 5000 to 18000000 | Deactivate/activate the sensor  |
+| PingDelayMs | 5000 to 18000000 | Deactivdate/activate the sensor |

 Changes also persist after a reboot.

@@ -1,17 +0,0 @@
-# Internal Temperature Usermod
-This usermod adds the temperature readout to the Info tab and also publishes that over the topic `mcutemp` topic.
-
-## Important
-A shown temp of 53,33°C might indicate that the internal temp is not supported.
-
-ESP8266 does not have a internal temp sensor
-
-ESP32S2 seems to crash on reading the sensor -> disabled
-
-## Installation
-Add a build flag `-D USERMOD_INTERNAL_TEMPERATURE` to your `platformio.ini` (or `platformio_override.ini`).
-
-## Authors
-Soeren Willrodt [@lost-hope](https://github.com/lost-hope)
-
-Dimitry Zhemkov [@dima-zhemkov](https://github.com/dima-zhemkov)
@@ -1,117 +0,0 @@
-#pragma once
-
-#include "wled.h"
-
-class InternalTemperatureUsermod : public Usermod
-{
-
-private:
-  unsigned long loopInterval = 10000;
-  unsigned long lastTime = 0;
-  bool isEnabled = false;
-  float temperature = 0;
-
-  static const char _name[];
-  static const char _enabled[];
-  static const char _loopInterval[];
-
-  // any private methods should go here (non-inline method should be defined out of class)
-  void publishMqtt(const char *state, bool retain = false); // example for publishing MQTT message
-
-public:
-  void setup()
-  {
-  }
-
-  void loop()
-  {
-    // if usermod is disabled or called during strip updating just exit
-    // NOTE: on very long strips strip.isUpdating() may always return true so update accordingly
-    if (!isEnabled || strip.isUpdating() || millis() - lastTime <= loopInterval)
-      return;
-
-    lastTime = millis();
-
-#ifdef ESP8266 // ESP8266
-    // does not seem possible
-    temperature = -1;
-#elif defined(CONFIG_IDF_TARGET_ESP32S2) // ESP32S2
-    temperature = -1;
-#else                                    // ESP32 ESP32S3 and ESP32C3
-    temperature = roundf(temperatureRead() * 10) / 10;
-#endif
-
-#ifndef WLED_DISABLE_MQTT
-    if (WLED_MQTT_CONNECTED)
-    {
-      char array[10];
-      snprintf(array, sizeof(array), "%f", temperature);
-      publishMqtt(array);
-    }
-#endif
-  }
-
-  void addToJsonInfo(JsonObject &root)
-  {
-    if (!isEnabled)
-      return;
-
-    // if "u" object does not exist yet wee need to create it
-    JsonObject user = root["u"];
-    if (user.isNull())
-      user = root.createNestedObject("u");
-
-    JsonArray userTempArr = user.createNestedArray(FPSTR(_name));
-    userTempArr.add(temperature);
-    userTempArr.add(F(" °C"));
-
-    // if "sensor" object does not exist yet wee need to create it
-    JsonObject sensor = root[F("sensor")];
-    if (sensor.isNull())
-      sensor = root.createNestedObject(F("sensor"));
-
-    JsonArray sensorTempArr = sensor.createNestedArray(FPSTR(_name));
-    sensorTempArr.add(temperature);
-    sensorTempArr.add(F("°C"));
-  }
-
-  void addToConfig(JsonObject &root)
-  {
-    JsonObject top = root.createNestedObject(FPSTR(_name));
-    top[FPSTR(_enabled)] = isEnabled;
-    top[FPSTR(_loopInterval)] = loopInterval;
-  }
-
-  bool readFromConfig(JsonObject &root)
-  {
-    JsonObject top = root[FPSTR(_name)];
-    bool configComplete = !top.isNull();
-    configComplete &= getJsonValue(top[FPSTR(_enabled)], isEnabled);
-    configComplete &= getJsonValue(top[FPSTR(_loopInterval)], loopInterval);
-
-    return configComplete;
-  }
-
-  uint16_t getId()
-  {
-    return USERMOD_ID_INTERNAL_TEMPERATURE;
-  }
-};
-
-const char InternalTemperatureUsermod::_name[] PROGMEM = "Internal Temperature";
-const char InternalTemperatureUsermod::_enabled[] PROGMEM = "Enabled";
-const char InternalTemperatureUsermod::_loopInterval[] PROGMEM = "Loop Interval";
-
-void InternalTemperatureUsermod::publishMqtt(const char *state, bool retain)
-{
-#ifndef WLED_DISABLE_MQTT
-  // Check if MQTT Connected, otherwise it will crash the 8266
-  if (WLED_MQTT_CONNECTED)
-  {
-    char subuf[64];
-    strcpy(subuf, mqttDeviceTopic);
-    strcat_P(subuf, PSTR("/mcutemp"));
-    mqtt->publish(subuf, 0, retain, state);
-  }
-#endif
-}
@@ -1,26 +0,0 @@
-# LDR_Dusk_Dawn_v2
-This usermod will obtain readings from a Light Dependent Resistor (LDR) and will turn on/off specific presets based on those readings. This is useful for exterior lighting situations where you want the lights to only be on when it is dark out.
-
-# Installation
-Add "-D USERMOD_LDR_DUSK_DAWN" to your platformio.ini [common] build_flags and build.
-
-Example:
-```
-[common]
-build_flags =
-  -D USERMOD_LDR_DUSK_DAWN   # Enable LDR Dusk Dawn Usermod
-```
-
-# Usermod Settings
-Setting | Description | Default
--- | --- | ---
-Enabled | Enable/Disable the LDR functionality. | Disabled
-LDR Pin | The analog capable pin your LDR is connected to. | 34
-Threshold Minutes | The number of minutes of consistent readings above/below the on/off threshold before the LED state will change. | 5
-Threshold | The analog read value threshold from the LDR. Readings lower than this number will count towards changing the LED state to off. You can see the current LDR reading by going into the info section when LDR functionality is enabled. | 1000
-On Preset | The WLED preset to be used for the LED on state. | 1
-Off Preset | The WLED preset to be used for the LED off state. | 2
-
-## Author
-[@jeffwdh](https://github.com/jeffwdh)  
-jeffwdh@tarball.ca
@@ -1,153 +0,0 @@
-#pragma once
-#include "wled.h"
-
-#ifndef ARDUINO_ARCH_ESP32
-  // 8266 does not support analogRead on user selectable pins 
-  #error only ESP32 is supported by usermod LDR_DUSK_DAWN
-#endif
-
-class LDR_Dusk_Dawn_v2 : public Usermod {
-  private:
-    // Defaults
-    bool ldrEnabled = false;
-    int ldrPin = 34; //A2 on Adafruit Huzzah32
-    int ldrThresholdMinutes = 5; // How many minutes of readings above/below threshold until it switches LED state
-    int ldrThreshold = 1000; // Readings higher than this number will turn off LED. 
-    int ldrOnPreset = 1; // Default "On" Preset
-    int ldrOffPreset = 2; // Default "Off" Preset
-
-    // Variables
-    bool initDone = false;
-    bool ldrEnabledPreviously = false; // Was LDR enabled for the previous check? First check is always no.
-    int ldrOffCount; // Number of readings above the threshold
-    int ldrOnCount; // Number of readings below the threshold
-    int ldrReading = 0; // Last LDR reading
-    int ldrLEDState; // Current LED on/off state
-    unsigned long lastMillis = 0;
-    static const char _name[];
-
-  public:
-    void setup() {
-      // register ldrPin
-      if ((ldrPin >= 0) && (digitalPinToAnalogChannel(ldrPin) >= 0)) {
-        if(!pinManager.allocatePin(ldrPin, false, PinOwner::UM_LDR_DUSK_DAWN)) ldrEnabled = false; // pin already in use -> disable usermod
-        else pinMode(ldrPin, INPUT);                                                               // alloc success -> configure pin for input
-      } else ldrEnabled = false;                                                                   // invalid pin -> disable usermod
-      initDone = true;
-    }
-
-    void loop() {
-      // Only update every 10 seconds
-      if (millis() - lastMillis > 10000) {      
-        if (  (ldrEnabled == true)
-           && (ldrPin >= 0) && (digitalPinToAnalogChannel(ldrPin) >= 0) ) { // make sure that pin is valid for analogread()
-          // Default state is off
-          if (ldrEnabledPreviously == false) {
-              applyPreset(ldrOffPreset);
-              ldrEnabledPreviously = true;
-              ldrLEDState = 0;
-          }
-
-          // Get LDR reading and increment counter by number of seconds since last read
-          ldrReading = analogRead(ldrPin);
-          if (ldrReading <= ldrThreshold) {
-            ldrOnCount = ldrOnCount + 10;
-            ldrOffCount = 0;
-          } else {
-            ldrOffCount = ldrOffCount + 10;
-            ldrOnCount = 0;
-          }
-
-          if (ldrOnCount >= (ldrThresholdMinutes * 60)) {
-            ldrOnCount = 0;
-            // If LEDs were previously off, turn on
-            if (ldrLEDState == 0) {
-              applyPreset(ldrOnPreset);
-              ldrLEDState = 1;
-            }
-          }
-
-          if (ldrOffCount >= (ldrThresholdMinutes * 60)) {
-            ldrOffCount = 0;
-            // If LEDs were previously on, turn off
-            if (ldrLEDState == 1) {
-              applyPreset(ldrOffPreset);
-              ldrLEDState = 0;
-            }
-          }
-        } else {
-          // LDR is disabled, reset variables to default
-          ldrReading = 0;
-          ldrOnCount = 0;
-          ldrOffCount = 0;
-          ldrLEDState = 0;
-          ldrEnabledPreviously = false;
-        }
-        lastMillis = millis();
-      }
-    }
-
-  void addToConfig(JsonObject& root) {
-      JsonObject top = root.createNestedObject(FPSTR(_name));
-      top["Enabled"] = ldrEnabled;
-      top["LDR Pin"] = ldrPin;
-      top["Threshold Minutes"] = ldrThresholdMinutes;
-      top["Threshold"] = ldrThreshold;
-      top["On Preset"] = ldrOnPreset;
-      top["Off Preset"] = ldrOffPreset;
-  }
-
-  bool readFromConfig(JsonObject& root) {
-      int8_t oldLdrPin = ldrPin;
-      JsonObject top = root[FPSTR(_name)];
-      bool configComplete = !top.isNull();
-      configComplete &= getJsonValue(top["Enabled"], ldrEnabled);
-      configComplete &= getJsonValue(top["LDR Pin"], ldrPin);
-      configComplete &= getJsonValue(top["Threshold Minutes"], ldrThresholdMinutes);
-      configComplete &= getJsonValue(top["Threshold"], ldrThreshold);
-      configComplete &= getJsonValue(top["On Preset"], ldrOnPreset);
-      configComplete &= getJsonValue(top["Off Preset"], ldrOffPreset);
-
-      if (initDone && (ldrPin != oldLdrPin)) {
-         // pin changed - un-register previous pin, register new pin
-        if (oldLdrPin >= 0) pinManager.deallocatePin(oldLdrPin, PinOwner::UM_LDR_DUSK_DAWN);
-        setup();             // setup new pin
-      }
-      return configComplete;
-  }
-
-  void addToJsonInfo(JsonObject& root) {
-      // If "u" object does not exist yet we need to create it
-      JsonObject user = root["u"];
-      if (user.isNull()) user = root.createNestedObject("u");
-
-      JsonArray LDR_Enabled = user.createNestedArray("LDR dusk/dawn enabled");
-      LDR_Enabled.add(ldrEnabled);
-      if (!ldrEnabled) return; // do not add more if usermod is disabled
-
-      JsonArray LDR_Reading = user.createNestedArray("LDR reading");
-      LDR_Reading.add(ldrReading);
-
-      JsonArray LDR_State = user.createNestedArray("LDR turned LEDs on");
-      LDR_State.add(bool(ldrLEDState));
-
-      // Optional debug information:
-      //JsonArray LDR_On_Count = user.createNestedArray("LDR on count");
-      //LDR_On_Count.add(ldrOnCount);
-
-      //JsonArray LDR_Off_Count = user.createNestedArray("LDR off count");
-      //LDR_Off_Count.add(ldrOffCount);
-
-      //bool pinValid = ((ldrPin >= 0) && (digitalPinToAnalogChannel(ldrPin) >= 0));
-      //if (pinManager.getPinOwner(ldrPin) != PinOwner::UM_LDR_DUSK_DAWN) pinValid = false;
-      //JsonArray LDR_valid = user.createNestedArray(F("LDR pin"));
-      //LDR_valid.add(ldrPin);
-      //LDR_valid.add(pinValid ? F(" OK"): F(" invalid"));
-  }
-
-  uint16_t getId() {
-    return USERMOD_ID_LDR_DUSK_DAWN;
-  }
-};
-
-const char LDR_Dusk_Dawn_v2::_name[]    PROGMEM = "LDR_Dusk_Dawn_v2";
@@ -23,7 +23,7 @@ You can also use usermod's off timer instead of sensor's. In such case rotate th

 ## Usermod installation

-**NOTE:** Usermod has been included in master branch of WLED so it can be compiled in directly just by defining `-D USERMOD_PIRSWITCH` and optionally `-D PIR_SENSOR_PIN=16` to override default pin. You can also change the default off time by adding `-D PIR_SENSOR_OFF_SEC=30`.
+**NOTE:** Usermod has been included in master branch of WLED so it can be compiled in directly just by defining `-D USERMOD_PIRSWITCH` and optionaly `-D PIR_SENSOR_PIN=16` to override default pin. You can also change the default off time by adding `-D PIR_SENSOR_OFF_SEC=30`.

 ## API to enable/disable the PIR sensor from outside. For example from another usermod:

@@ -31,7 +31,7 @@ To query or change the PIR sensor state the methods `bool PIRsensorEnabled()` an

 When the PIR sensor state changes an MQTT message is broadcasted with topic `wled/deviceMAC/motion` and message `on` or `off`.
 Usermod can also be configured to send just the MQTT message but not change WLED state using settings page as well as responding to motion only at night
-(assuming NTP and latitude/longitude are set to determine sunrise/sunset times).
+(assuming NTP and lattitude/longitude are set to determine sunrise/sunset times).

 ### There are two options to get access to the usermod instance:

@@ -85,7 +85,7 @@ Have fun - @gegu & @blazoncek

 2021-11
 * Added information about dynamic configuration options
-* Added option to temporary enable/disable usermod from WLED UI (Info dialog)
+* Added option to temporary enable/disble usermod from WLED UI (Info dialog)

 2022-11
 * Added compile time option for off timer.
@@ -20,7 +20,7 @@
 * This usermod handles PIR sensor states.
 * The strip will be switched on and the off timer will be resetted when the sensor goes HIGH. 
 * When the sensor state goes LOW, the off timer is started and when it expires, the strip is switched off. 
- * Maintained by: @blazoncek
+ * 
 * 
 * Usermods allow you to add own functionality to WLED more easily
 * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
@@ -38,21 +38,21 @@ public:
  ~PIRsensorSwitch() {}

  //Enable/Disable the PIR sensor
-  inline void EnablePIRsensor(bool en) { enabled = en; }
+  void EnablePIRsensor(bool en) { enabled = en; }
  
  // Get PIR sensor enabled/disabled state
-  inline bool PIRsensorEnabled() { return enabled; }
+  bool PIRsensorEnabled() { return enabled; }

 private:

  byte prevPreset   = 0;
  byte prevPlaylist = 0;

-  volatile unsigned long offTimerStart = 0;     // off timer start time
-  volatile bool PIRtriggered           = false; // did PIR trigger?
+  uint32_t offTimerStart = 0;                   // off timer start time
  byte NotifyUpdateMode  = CALL_MODE_NO_NOTIFY; // notification mode for stateUpdated(): CALL_MODE_NO_NOTIFY or CALL_MODE_DIRECT_CHANGE
  byte sensorPinState    = LOW;                 // current PIR sensor pin state
  bool initDone          = false;               // status of initialization
+  bool PIRtriggered      = false;
  unsigned long lastLoop = 0;

  // configurable parameters
@@ -66,7 +66,6 @@ private:
  // flag to enable triggering only if WLED is initially off (LEDs are not on, preventing running effect being overwritten by PIR)
  bool m_offOnly            = false;
  bool m_offMode            = offMode;
-  bool m_override           = false;

  // Home Assistant
  bool HomeAssistantDiscovery = false;        // is HA discovery turned on
@@ -82,33 +81,173 @@ private:
  static const char _offOnly[];
  static const char _haDiscovery[];
  static const char _notify[];
-  static const char _override[];

  /**
   * check if it is daytime
   * if sunrise/sunset is not defined (no NTP or lat/lon) default to nighttime
   */
-  static bool isDayTime();
+  bool isDayTime() {
+    updateLocalTime();
+    uint8_t hr = hour(localTime);
+    uint8_t mi = minute(localTime);
+
+    if (sunrise && sunset) {
+      if (hour(sunrise)<hr && hour(sunset)>hr) {
+        return true;
+      } else {
+        if (hour(sunrise)==hr && minute(sunrise)<mi) {
+          return true;
+        }
+        if (hour(sunset)==hr && minute(sunset)>mi) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }

  /**
   * switch strip on/off
   */
-  void switchStrip(bool switchOn);
-  void publishMqtt(const char* state);
+  void switchStrip(bool switchOn)
+  {
+    if (m_offOnly && bri && (switchOn || (!PIRtriggered && !switchOn))) return; //if lights on and off only, do nothing
+    if (PIRtriggered && switchOn) return; //if already on and triggered before, do nothing
+    PIRtriggered = switchOn;
+    DEBUG_PRINT(F("PIR: strip=")); DEBUG_PRINTLN(switchOn?"on":"off");
+    if (switchOn) {
+      if (m_onPreset) {
+        if (currentPlaylist>0 && !offMode) {
+          prevPlaylist = currentPlaylist;
+          unloadPlaylist();
+        } else if (currentPreset>0 && !offMode) {
+          prevPreset   = currentPreset;
+        } else {
+          saveTemporaryPreset();
+          prevPlaylist = 0;
+          prevPreset   = 255;
+        }
+        applyPreset(m_onPreset, NotifyUpdateMode);
+        return;
+      }
+      // preset not assigned
+      if (bri == 0) {
+        bri = briLast;
+        stateUpdated(NotifyUpdateMode);
+      }
+    } else {
+      if (m_offPreset) {
+        applyPreset(m_offPreset, NotifyUpdateMode);
+        return;
+      } else if (prevPlaylist) {
+        if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPlaylist, NotifyUpdateMode);
+        prevPlaylist = 0;
+        return;
+      } else if (prevPreset) {
+        if (prevPreset<255) { if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPreset, NotifyUpdateMode); }
+        else                { if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyTemporaryPreset(); }
+        prevPreset = 0;
+        return;
+      }
+      // preset not assigned
+      if (bri != 0) {
+        briLast = bri;
+        bri = 0;
+        stateUpdated(NotifyUpdateMode);
+      }
+    }
+  }
+
+  void publishMqtt(const char* state)
+  {
+  #ifndef WLED_DISABLE_MQTT
+    //Check if MQTT Connected, otherwise it will crash the 8266
+    if (WLED_MQTT_CONNECTED) {
+      char subuf[64];
+      strcpy(subuf, mqttDeviceTopic);
+      strcat_P(subuf, PSTR("/motion"));
+      mqtt->publish(subuf, 0, false, state);
+    }
+  #endif
+  }

  // Create an MQTT Binary Sensor for Home Assistant Discovery purposes, this includes a pointer to the topic that is published to in the Loop.
-  void publishHomeAssistantAutodiscovery();
+  void publishHomeAssistantAutodiscovery()
+  {
+  #ifndef WLED_DISABLE_MQTT
+    if (WLED_MQTT_CONNECTED) {
+      StaticJsonDocument<600> doc;
+      char uid[24], json_str[1024], buf[128];
+
+      sprintf_P(buf, PSTR("%s Motion"), serverDescription); //max length: 33 + 7 = 40
+      doc[F("name")] = buf;
+      sprintf_P(buf, PSTR("%s/motion"), mqttDeviceTopic);   //max length: 33 + 7 = 40
+      doc[F("stat_t")] = buf;
+      doc[F("pl_on")]  = "on";
+      doc[F("pl_off")] = "off";
+      sprintf_P(uid, PSTR("%s_motion"), escapedMac.c_str());
+      doc[F("uniq_id")] = uid;
+      doc[F("dev_cla")] = F("motion");
+      doc[F("exp_aft")] = 1800;
+
+      JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
+      device[F("name")] = serverDescription;
+      device[F("ids")]  = String(F("wled-sensor-")) + mqttClientID;
+      device[F("mf")]   = "WLED";
+      device[F("mdl")]  = F("FOSS");
+      device[F("sw")]   = versionString;
+      
+      sprintf_P(buf, PSTR("homeassistant/binary_sensor/%s/config"), uid);
+      DEBUG_PRINTLN(buf);
+      size_t payload_size = serializeJson(doc, json_str);
+      DEBUG_PRINTLN(json_str);
+
+      mqtt->publish(buf, 0, true, json_str, payload_size); // do we really need to retain?
+    }
+  #endif
+  }

  /**
   * Read and update PIR sensor state.
-   * Initialize/reset switch off timer
+   * Initilize/reset switch off timer
   */
-  bool updatePIRsensorState();
+  bool updatePIRsensorState()
+  {
+    bool pinState = digitalRead(PIRsensorPin);
+    if (pinState != sensorPinState) {
+      sensorPinState = pinState; // change previous state
+
+      if (sensorPinState == HIGH) {
+        offTimerStart = 0;
+        if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()))) switchStrip(true);
+        else if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
+        publishMqtt("on");
+      } else {
+        // start switch off timer
+        offTimerStart = millis();
+        if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
+      }
+      return true;
+    }
+    return false;
+  }

  /**
   * switch off the strip if the delay has elapsed 
   */
-  bool handleOffTimer();
+  bool handleOffTimer()
+  {
+    if (offTimerStart > 0 && millis() - offTimerStart > m_switchOffDelay) {
+      offTimerStart = 0;
+      if (enabled == true) {
+        if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()) || PIRtriggered)) switchStrip(false);
+        else if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
+        publishMqtt("off");
+      }
+      return true;
+    }
+    return false;
+  }

 public:
  //Functions called by WLED
@@ -117,57 +256,186 @@ public:
   * setup() is called once at boot. WiFi is not yet connected at this point.
   * You can use it to initialize variables, sensors or similar.
   */
-  void setup();
+  void setup()
+  {
+    if (enabled) {
+      // pin retrieved from cfg.json (readFromConfig()) prior to running setup()
+      if (PIRsensorPin >= 0 && pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
+        // PIR Sensor mode INPUT_PULLUP
+        pinMode(PIRsensorPin, INPUT_PULLUP);
+        sensorPinState = digitalRead(PIRsensorPin);
+      } else {
+        if (PIRsensorPin >= 0) {
+          DEBUG_PRINTLN(F("PIRSensorSwitch pin allocation failed."));
+        }
+        PIRsensorPin = -1;  // allocation failed
+        enabled = false;
+      }
+    }
+    initDone = true;
+  }

  /**
   * connected() is called every time the WiFi is (re)connected
   * Use it to initialize network interfaces
   */
-  //void connected();
+  void connected()
+  {
+  }

  /**
   * onMqttConnect() is called when MQTT connection is established
   */
-  void onMqttConnect(bool sessionPresent);
+  void onMqttConnect(bool sessionPresent) {
+    if (HomeAssistantDiscovery) {
+      publishHomeAssistantAutodiscovery();
+    }
+  }

  /**
   * loop() is called continuously. Here you can check for events, read sensors, etc.
   */
-  void loop();
+  void loop()
+  {
+    // only check sensors 4x/s
+    if (!enabled || millis() - lastLoop < 250 || strip.isUpdating()) return;
+    lastLoop = millis();
+
+    if (!updatePIRsensorState()) {
+      handleOffTimer();
+    }
+  }

  /**
   * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
   * 
   * Add PIR sensor state and switch off timer duration to jsoninfo
   */
-  void addToJsonInfo(JsonObject &root);
+  void addToJsonInfo(JsonObject &root)
+  {
+    JsonObject user = root["u"];
+    if (user.isNull()) user = root.createNestedObject("u");
+
+    JsonArray infoArr = user.createNestedArray(FPSTR(_name));
+
+    String uiDomString;
+    if (enabled) {
+      if (offTimerStart > 0)
+      {
+        uiDomString = "";
+        unsigned int offSeconds = (m_switchOffDelay - (millis() - offTimerStart)) / 1000;
+        if (offSeconds >= 3600)
+        {
+          uiDomString += (offSeconds / 3600);
+          uiDomString += F("h ");
+          offSeconds %= 3600;
+        }
+        if (offSeconds >= 60)
+        {
+          uiDomString += (offSeconds / 60);
+          offSeconds %= 60;
+        }
+        else if (uiDomString.length() > 0)
+        {
+          uiDomString += 0;
+        }
+        if (uiDomString.length() > 0)
+        {
+          uiDomString += F("min ");
+        }
+        uiDomString += (offSeconds);
+        infoArr.add(uiDomString + F("s"));
+      } else {
+        infoArr.add(sensorPinState ? F("sensor on") : F("inactive"));
+      }
+    } else {
+      infoArr.add(F("disabled"));
+    }
+
+    uiDomString  = F(" <button class=\"btn btn-xs\" onclick=\"requestJson({");
+    uiDomString += FPSTR(_name);
+    uiDomString += F(":{");
+    uiDomString += FPSTR(_enabled);
+    if (enabled) {
+      uiDomString += F(":false}});\">");
+      uiDomString += F("<i class=\"icons on\">&#xe325;</i>");
+    } else {
+      uiDomString += F(":true}});\">");
+      uiDomString += F("<i class=\"icons off\">&#xe08f;</i>");
+    }
+    uiDomString += F("</button>");
+    infoArr.add(uiDomString);
+
+    JsonObject sensor = root[F("sensor")];
+    if (sensor.isNull()) sensor = root.createNestedObject(F("sensor"));
+    sensor[F("motion")] = sensorPinState || offTimerStart>0 ? true : false;
+  }

  /**
   * onStateChanged() is used to detect WLED state change
   */
-  void onStateChange(uint8_t mode);
+  void onStateChange(uint8_t mode) {
+    if (!initDone) return;
+    DEBUG_PRINT(F("PIR: offTimerStart=")); DEBUG_PRINTLN(offTimerStart);
+    if (PIRtriggered && offTimerStart) {
+      // checking PIRtriggered and offTimerStart will prevent cancellation upon On trigger
+      DEBUG_PRINTLN(F("PIR: Canceled."));
+      offTimerStart = 0;
+      PIRtriggered = false;
+    }
+  }

  /**
   * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
   * Values in the state object may be modified by connected clients
   */
-  //void addToJsonState(JsonObject &root);
+/*
+  void addToJsonState(JsonObject &root)
+  {
+  }
+*/

  /**
   * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
   * Values in the state object may be modified by connected clients
   */
-  void readFromJsonState(JsonObject &root);
+
+  void readFromJsonState(JsonObject &root)
+  {
+    if (!initDone) return;  // prevent crash on boot applyPreset()
+    JsonObject usermod = root[FPSTR(_name)];
+    if (!usermod.isNull()) {
+      if (usermod[FPSTR(_enabled)].is<bool>()) {
+        enabled = usermod[FPSTR(_enabled)].as<bool>();
+      }
+    }
+  }
+

  /**
   * provide the changeable values
   */
-  void addToConfig(JsonObject &root);
+  void addToConfig(JsonObject &root)
+  {
+    JsonObject top = root.createNestedObject(FPSTR(_name));
+    top[FPSTR(_enabled)]        = enabled;
+    top[FPSTR(_switchOffDelay)] = m_switchOffDelay / 1000;
+    top["pin"]                  = PIRsensorPin;
+    top[FPSTR(_onPreset)]       = m_onPreset;
+    top[FPSTR(_offPreset)]      = m_offPreset;
+    top[FPSTR(_nightTime)]      = m_nightTimeOnly;
+    top[FPSTR(_mqttOnly)]       = m_mqttOnly;
+    top[FPSTR(_offOnly)]        = m_offOnly;
+    top[FPSTR(_haDiscovery)]    = HomeAssistantDiscovery;
+    top[FPSTR(_notify)]         = (NotifyUpdateMode != CALL_MODE_NO_NOTIFY);
+    DEBUG_PRINTLN(F("PIR config saved."));
+  }

-  /**
-   * provide UI information and allow extending UI options
-   */
-  void appendConfigData();
+  void appendConfigData()
+  {
+    oappend(SET_F("addInfo('PIRsensorSwitch:HA-discovery',1,'HA=Home Assistant');"));     // 0 is field type, 1 is actual field
+    oappend(SET_F("addInfo('PIRsensorSwitch:notifications',1,'Periodic WS updates');"));  // 0 is field type, 1 is actual field
+  }

  /**
   * restore the changeable values
@@ -175,13 +443,72 @@ public:
   *
   * The function should return true if configuration was successfully loaded or false if there was no configuration.
   */
-  bool readFromConfig(JsonObject &root);
+  bool readFromConfig(JsonObject &root)
+  {
+    bool oldEnabled = enabled;
+    int8_t oldPin = PIRsensorPin;
+
+    DEBUG_PRINT(FPSTR(_name));
+    JsonObject top = root[FPSTR(_name)];
+    if (top.isNull()) {
+      DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
+      return false;
+    }
+
+    PIRsensorPin = top["pin"] | PIRsensorPin;
+
+    enabled = top[FPSTR(_enabled)] | enabled;
+
+    m_switchOffDelay = (top[FPSTR(_switchOffDelay)] | m_switchOffDelay/1000) * 1000;
+
+    m_onPreset = top[FPSTR(_onPreset)] | m_onPreset;
+    m_onPreset = max(0,min(250,(int)m_onPreset));
+    m_offPreset = top[FPSTR(_offPreset)] | m_offPreset;
+    m_offPreset = max(0,min(250,(int)m_offPreset));
+
+    m_nightTimeOnly = top[FPSTR(_nightTime)] | m_nightTimeOnly;
+    m_mqttOnly      = top[FPSTR(_mqttOnly)] | m_mqttOnly;
+    m_offOnly       = top[FPSTR(_offOnly)] | m_offOnly;
+    HomeAssistantDiscovery = top[FPSTR(_haDiscovery)] | HomeAssistantDiscovery;
+
+    NotifyUpdateMode = top[FPSTR(_notify)] ? CALL_MODE_DIRECT_CHANGE : CALL_MODE_NO_NOTIFY;
+
+    if (!initDone) {
+      // reading config prior to setup()
+      DEBUG_PRINTLN(F(" config loaded."));
+    } else {
+      if (oldPin != PIRsensorPin || oldEnabled != enabled) {
+        // check if pin is OK
+        if (oldPin != PIRsensorPin && oldPin >= 0) {
+          // if we are changing pin in settings page
+          // deallocate old pin
+          pinManager.deallocatePin(oldPin, PinOwner::UM_PIR);
+          if (pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
+            pinMode(PIRsensorPin, INPUT_PULLUP);
+          } else {
+            // allocation failed
+            PIRsensorPin = -1;
+            enabled = false;
+          }
+        }
+        if (enabled) {
+          sensorPinState = digitalRead(PIRsensorPin);
+        }
+      }
+      DEBUG_PRINTLN(F(" config (re)loaded."));
+    }
+    // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
+    return !top[FPSTR(_haDiscovery)].isNull();
+  }

  /**
   * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
   * This could be used in the future for the system to determine whether your usermod is installed.
   */
-  uint16_t getId() { return USERMOD_ID_PIRSWITCH; }
+  uint16_t getId()
+  {
+    return USERMOD_ID_PIRSWITCH;
+  }
 };

 // strings to reduce flash memory usage (used more than twice)
@@ -195,359 +522,3 @@ const char PIRsensorSwitch::_mqttOnly[]       PROGMEM = "mqtt-only";
 const char PIRsensorSwitch::_offOnly[]        PROGMEM = "off-only";
 const char PIRsensorSwitch::_haDiscovery[]    PROGMEM = "HA-discovery";
 const char PIRsensorSwitch::_notify[]         PROGMEM = "notifications";
-const char PIRsensorSwitch::_override[]       PROGMEM = "override";
-
-bool PIRsensorSwitch::isDayTime() {
-  updateLocalTime();
-  uint8_t hr = hour(localTime);
-  uint8_t mi = minute(localTime);
-
-  if (sunrise && sunset) {
-    if (hour(sunrise)<hr && hour(sunset)>hr) {
-      return true;
-    } else {
-      if (hour(sunrise)==hr && minute(sunrise)<mi) {
-        return true;
-      }
-      if (hour(sunset)==hr && minute(sunset)>mi) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void PIRsensorSwitch::switchStrip(bool switchOn)
-{
-  if (m_offOnly && bri && (switchOn || (!PIRtriggered && !switchOn))) return; //if lights on and off only, do nothing
-  if (PIRtriggered && switchOn) return; //if already on and triggered before, do nothing
-  PIRtriggered = switchOn;
-  DEBUG_PRINT(F("PIR: strip=")); DEBUG_PRINTLN(switchOn?"on":"off");
-  if (switchOn) {
-    if (m_onPreset) {
-      if (currentPlaylist>0 && !offMode) {
-        prevPlaylist = currentPlaylist;
-        unloadPlaylist();
-      } else if (currentPreset>0 && !offMode) {
-        prevPreset   = currentPreset;
-      } else {
-        saveTemporaryPreset();
-        prevPlaylist = 0;
-        prevPreset   = 255;
-      }
-      applyPreset(m_onPreset, NotifyUpdateMode);
-      return;
-    }
-    // preset not assigned
-    if (bri == 0) {
-      bri = briLast;
-      stateUpdated(NotifyUpdateMode);
-    }
-  } else {
-    if (m_offPreset) {
-      applyPreset(m_offPreset, NotifyUpdateMode);
-      return;
-    } else if (prevPlaylist) {
-      if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPlaylist, NotifyUpdateMode);
-      prevPlaylist = 0;
-      return;
-    } else if (prevPreset) {
-      if (prevPreset<255) { if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPreset, NotifyUpdateMode); }
-      else                { if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyTemporaryPreset(); }
-      prevPreset = 0;
-      return;
-    }
-    // preset not assigned
-    if (bri != 0) {
-      briLast = bri;
-      bri = 0;
-      stateUpdated(NotifyUpdateMode);
-    }
-  }
-}
-
-void PIRsensorSwitch::publishMqtt(const char* state)
-{
-#ifndef WLED_DISABLE_MQTT
-  //Check if MQTT Connected, otherwise it will crash the 8266
-  if (WLED_MQTT_CONNECTED) {
-    char buf[64];
-    sprintf_P(buf, PSTR("%s/motion"), mqttDeviceTopic);   //max length: 33 + 7 = 40
-    mqtt->publish(buf, 0, false, state);
-  }
-#endif
-}
-
-void PIRsensorSwitch::publishHomeAssistantAutodiscovery()
-{
-#ifndef WLED_DISABLE_MQTT
-  if (WLED_MQTT_CONNECTED) {
-    StaticJsonDocument<600> doc;
-    char uid[24], json_str[1024], buf[128];
-
-    sprintf_P(buf, PSTR("%s Motion"), serverDescription); //max length: 33 + 7 = 40
-    doc[F("name")] = buf;
-    sprintf_P(buf, PSTR("%s/motion"), mqttDeviceTopic);   //max length: 33 + 7 = 40
-    doc[F("stat_t")] = buf;
-    doc[F("pl_on")]  = "on";
-    doc[F("pl_off")] = "off";
-    sprintf_P(uid, PSTR("%s_motion"), escapedMac.c_str());
-    doc[F("uniq_id")] = uid;
-    doc[F("dev_cla")] = F("motion");
-    doc[F("exp_aft")] = 1800;
-
-    JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
-    device[F("name")] = serverDescription;
-    device[F("ids")]  = String(F("wled-sensor-")) + mqttClientID;
-    device[F("mf")]   = "WLED";
-    device[F("mdl")]  = F("FOSS");
-    device[F("sw")]   = versionString;
-    
-    sprintf_P(buf, PSTR("homeassistant/binary_sensor/%s/config"), uid);
-    DEBUG_PRINTLN(buf);
-    size_t payload_size = serializeJson(doc, json_str);
-    DEBUG_PRINTLN(json_str);
-
-    mqtt->publish(buf, 0, true, json_str, payload_size); // do we really need to retain?
-  }
-#endif
-}
-
-bool PIRsensorSwitch::updatePIRsensorState()
-{
-  bool pinState = digitalRead(PIRsensorPin);
-  if (pinState != sensorPinState) {
-    sensorPinState = pinState; // change previous state
-
-    if (sensorPinState == HIGH) {
-      offTimerStart = 0;
-      if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()))) switchStrip(true);
-      else if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
-      publishMqtt("on");
-    } else {
-      // start switch off timer
-      offTimerStart = millis();
-      if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
-    }
-    return true;
-  }
-  return false;
-}
-
-bool PIRsensorSwitch::handleOffTimer()
-{
-  if (offTimerStart > 0 && millis() - offTimerStart > m_switchOffDelay) {
-    offTimerStart = 0;
-    if (enabled == true) {
-      if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()) || PIRtriggered)) switchStrip(false);
-      else if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
-      publishMqtt("off");
-    }
-    return true;
-  }
-  return false;
-}
-
-//Functions called by WLED
-
-void PIRsensorSwitch::setup()
-{
-  if (enabled) {
-    // pin retrieved from cfg.json (readFromConfig()) prior to running setup()
-    if (PIRsensorPin >= 0 && pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
-      // PIR Sensor mode INPUT_PULLUP
-      pinMode(PIRsensorPin, INPUT_PULLUP);
-      sensorPinState = digitalRead(PIRsensorPin);
-    } else {
-      if (PIRsensorPin >= 0) {
-        DEBUG_PRINTLN(F("PIRSensorSwitch pin allocation failed."));
-      }
-      PIRsensorPin = -1;  // allocation failed
-      enabled = false;
-    }
-  }
-  initDone = true;
-}
-
-void PIRsensorSwitch::onMqttConnect(bool sessionPresent)
-{
-  if (HomeAssistantDiscovery) {
-    publishHomeAssistantAutodiscovery();
-  }
-}
-
-void PIRsensorSwitch::loop()
-{
-  // only check sensors 4x/s
-  if (!enabled || millis() - lastLoop < 250 || strip.isUpdating()) return;
-  lastLoop = millis();
-
-  if (!updatePIRsensorState()) {
-    handleOffTimer();
-  }
-}
-
-void PIRsensorSwitch::addToJsonInfo(JsonObject &root)
-{
-  JsonObject user = root["u"];
-  if (user.isNull()) user = root.createNestedObject("u");
-
-  JsonArray infoArr = user.createNestedArray(FPSTR(_name));
-
-  String uiDomString;
-  if (enabled) {
-    if (offTimerStart > 0)
-    {
-      uiDomString = "";
-      unsigned int offSeconds = (m_switchOffDelay - (millis() - offTimerStart)) / 1000;
-      if (offSeconds >= 3600)
-      {
-        uiDomString += (offSeconds / 3600);
-        uiDomString += F("h ");
-        offSeconds %= 3600;
-      }
-      if (offSeconds >= 60)
-      {
-        uiDomString += (offSeconds / 60);
-        offSeconds %= 60;
-      }
-      else if (uiDomString.length() > 0)
-      {
-        uiDomString += 0;
-      }
-      if (uiDomString.length() > 0)
-      {
-        uiDomString += F("min ");
-      }
-      uiDomString += (offSeconds);
-      infoArr.add(uiDomString + F("s"));
-    } else {
-      infoArr.add(sensorPinState ? F("sensor on") : F("inactive"));
-    }
-  } else {
-    infoArr.add(F("disabled"));
-  }
-
-  uiDomString  = F(" <button class=\"btn btn-xs\" onclick=\"requestJson({");
-  uiDomString += FPSTR(_name);
-  uiDomString += F(":{");
-  uiDomString += FPSTR(_enabled);
-  if (enabled) {
-    uiDomString += F(":false}});\">");
-    uiDomString += F("<i class=\"icons on\">&#xe325;</i>");
-  } else {
-    uiDomString += F(":true}});\">");
-    uiDomString += F("<i class=\"icons off\">&#xe08f;</i>");
-  }
-  uiDomString += F("</button>");
-  infoArr.add(uiDomString);
-
-  JsonObject sensor = root[F("sensor")];
-  if (sensor.isNull()) sensor = root.createNestedObject(F("sensor"));
-  sensor[F("motion")] = sensorPinState || offTimerStart>0 ? true : false;
-}
-
-void PIRsensorSwitch::onStateChange(uint8_t mode) {
-  if (!initDone) return;
-  DEBUG_PRINT(F("PIR: offTimerStart=")); DEBUG_PRINTLN(offTimerStart);
-  if (m_override && PIRtriggered && offTimerStart) { // debounce
-    // checking PIRtriggered and offTimerStart will prevent cancellation upon On trigger
-    DEBUG_PRINTLN(F("PIR: Canceled."));
-    offTimerStart = 0;
-    PIRtriggered = false;
-  }
-}
-
-void PIRsensorSwitch::readFromJsonState(JsonObject &root)
-{
-  if (!initDone) return;  // prevent crash on boot applyPreset()
-  JsonObject usermod = root[FPSTR(_name)];
-  if (!usermod.isNull()) {
-    if (usermod[FPSTR(_enabled)].is<bool>()) {
-      enabled = usermod[FPSTR(_enabled)].as<bool>();
-    }
-  }
-}
-
-void PIRsensorSwitch::addToConfig(JsonObject &root)
-{
-  JsonObject top = root.createNestedObject(FPSTR(_name));
-  top[FPSTR(_enabled)]        = enabled;
-  top[FPSTR(_switchOffDelay)] = m_switchOffDelay / 1000;
-  top["pin"]                  = PIRsensorPin;
-  top[FPSTR(_onPreset)]       = m_onPreset;
-  top[FPSTR(_offPreset)]      = m_offPreset;
-  top[FPSTR(_nightTime)]      = m_nightTimeOnly;
-  top[FPSTR(_mqttOnly)]       = m_mqttOnly;
-  top[FPSTR(_offOnly)]        = m_offOnly;
-  top[FPSTR(_override)]       = m_override;
-  top[FPSTR(_haDiscovery)]    = HomeAssistantDiscovery;
-  top[FPSTR(_notify)]         = (NotifyUpdateMode != CALL_MODE_NO_NOTIFY);
-  DEBUG_PRINTLN(F("PIR config saved."));
-}
-
-void PIRsensorSwitch::appendConfigData()
-{
-  oappend(SET_F("addInfo('PIRsensorSwitch:HA-discovery',1,'HA=Home Assistant');"));     // 0 is field type, 1 is actual field
-  oappend(SET_F("addInfo('PIRsensorSwitch:notifications',1,'Periodic WS updates');"));  // 0 is field type, 1 is actual field
-  oappend(SET_F("addInfo('PIRsensorSwitch:override',1,'Cancel timer on change');"));    // 0 is field type, 1 is actual field
-}
-
-bool PIRsensorSwitch::readFromConfig(JsonObject &root)
-{
-  bool oldEnabled = enabled;
-  int8_t oldPin = PIRsensorPin;
-
-  DEBUG_PRINT(FPSTR(_name));
-  JsonObject top = root[FPSTR(_name)];
-  if (top.isNull()) {
-    DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
-    return false;
-  }
-
-  PIRsensorPin = top["pin"] | PIRsensorPin;
-
-  enabled = top[FPSTR(_enabled)] | enabled;
-
-  m_switchOffDelay = (top[FPSTR(_switchOffDelay)] | m_switchOffDelay/1000) * 1000;
-
-  m_onPreset = top[FPSTR(_onPreset)] | m_onPreset;
-  m_onPreset = max(0,min(250,(int)m_onPreset));
-  m_offPreset = top[FPSTR(_offPreset)] | m_offPreset;
-  m_offPreset = max(0,min(250,(int)m_offPreset));
-
-  m_nightTimeOnly = top[FPSTR(_nightTime)] | m_nightTimeOnly;
-  m_mqttOnly      = top[FPSTR(_mqttOnly)] | m_mqttOnly;
-  m_offOnly       = top[FPSTR(_offOnly)] | m_offOnly;
-  m_override      = top[FPSTR(_override)] | m_override;
-  HomeAssistantDiscovery = top[FPSTR(_haDiscovery)] | HomeAssistantDiscovery;
-
-  NotifyUpdateMode = top[FPSTR(_notify)] ? CALL_MODE_DIRECT_CHANGE : CALL_MODE_NO_NOTIFY;
-
-  if (!initDone) {
-    // reading config prior to setup()
-    DEBUG_PRINTLN(F(" config loaded."));
-  } else {
-    if (oldPin != PIRsensorPin || oldEnabled != enabled) {
-      // check if pin is OK
-      if (oldPin != PIRsensorPin && oldPin >= 0) {
-        // if we are changing pin in settings page
-        // deallocate old pin
-        pinManager.deallocatePin(oldPin, PinOwner::UM_PIR);
-        if (pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
-          pinMode(PIRsensorPin, INPUT_PULLUP);
-        } else {
-          // allocation failed
-          PIRsensorPin = -1;
-          enabled = false;
-        }
-      }
-      if (enabled) {
-        sensorPinState = digitalRead(PIRsensorPin);
-      }
-    }
-    DEBUG_PRINTLN(F(" config (re)loaded."));
-  }
-  // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
-  return !top[FPSTR(_override)].isNull();
-}
@@ -5,7 +5,7 @@ v2 Usermod to to control PWM fan with RPM feedback and temperature control
 This usermod requires the Dallas Temperature usermod to obtain temperature information. If it's not available, the fan will run at 100% speed.
 If the fan does not have _tachometer_ (RPM) output you can set the _tachometer-pin_ to -1 to disable that feature.

-You can also set the threshold temperature at which fan runs at lowest speed. If the measured temperature is 3°C greater than the threshold temperature, the fan will run at 100%.
+You can also set the thershold temperature at which fan runs at lowest speed. If the measured temperature is 3°C greater than the threshold temperature, the fan will run at 100%.

 If the _tachometer_ is supported, the current speed (in RPM) will be displayed on the WLED Info page.

@@ -22,7 +22,7 @@ This includes:
 * PWM output pin (can be configured at compile time `-D PWM_PIN=xx`)
 * tachometer input pin (can be configured at compile time `-D TACHO_PIN=xx`)
 * sampling frequency in seconds
-* threshold temperature in degrees Celsius
+* threshold temperature in degees C

 _NOTE:_ You may also need to tweak Dallas Temperature usermod sampling frequency to match PWM fan sampling frequency.

@@ -52,15 +52,9 @@ class PWMFanUsermod : public Usermod {
    uint8_t tachoUpdateSec    = 30;
    float   targetTemperature = 35.0;
    uint8_t minPWMValuePct    = 0;
-    uint8_t maxPWMValuePct    = 100;
    uint8_t numberOfInterrupsInOneSingleRotation = 2;     // Number of interrupts ESP32 sees on tacho signal on a single fan rotation. All the fans I've seen trigger two interrups.
    uint8_t pwmValuePct       = 0;

-    // constant values
-    static const uint8_t _pwmMaxValue     = 255;
-    static const uint8_t _pwmMaxStepCount = 7;
-    float _pwmTempStepSize = 0.5f;
-
    // strings to reduce flash memory usage (used more than twice)
    static const char _name[];
    static const char _enabled[];
@@ -69,7 +63,6 @@ class PWMFanUsermod : public Usermod {
    static const char _temperature[];
    static const char _tachoUpdateSec[];
    static const char _minPWMValuePct[];
-    static const char _maxPWMValuePct[];
    static const char _IRQperRotation[];
    static const char _speed[];
    static const char _lock[];
@@ -163,25 +156,31 @@ class PWMFanUsermod : public Usermod {

    void setFanPWMbasedOnTemperature(void) {
      float temp = getActualTemperature();
-      // dividing minPercent and maxPercent into equal pwmvalue sizes
-      int pwmStepSize = ((maxPWMValuePct - minPWMValuePct) * _pwmMaxValue) / (_pwmMaxStepCount*100);
-      int pwmStep = calculatePwmStep(temp - targetTemperature);
-      // minimum based on full speed - not entered MaxPercent 
-      int pwmMinimumValue = (minPWMValuePct * _pwmMaxValue) / 100;
-      updateFanSpeed(pwmMinimumValue + pwmStep*pwmStepSize);
-    }
+      float difftemp = temp - targetTemperature;
+      // Default to run fan at full speed.
+      int newPWMvalue = 255;
+      int pwmStep = ((100 - minPWMValuePct) * newPWMvalue) / (7*100);
+      int pwmMinimumValue = (minPWMValuePct * newPWMvalue) / 100;

-    uint8_t calculatePwmStep(float diffTemp){
-      if ((diffTemp == NAN) || (diffTemp <= -100.0)) {
+      if ((temp == NAN) || (temp <= -100.0)) {
        DEBUG_PRINTLN(F("WARNING: no temperature value available. Cannot do temperature control. Will set PWM fan to 255."));
-        return _pwmMaxStepCount;
+      } else if (difftemp <= 0.0) {
+        // Temperature is below target temperature. Run fan at minimum speed.
+        newPWMvalue = pwmMinimumValue;
+      } else if (difftemp <= 0.5) {
+        newPWMvalue = pwmMinimumValue + pwmStep;
+      } else if (difftemp <= 1.0) {
+        newPWMvalue = pwmMinimumValue + 2*pwmStep;
+      } else if (difftemp <= 1.5) {
+        newPWMvalue = pwmMinimumValue + 3*pwmStep;
+      } else if (difftemp <= 2.0) {
+        newPWMvalue = pwmMinimumValue + 4*pwmStep;
+      } else if (difftemp <= 2.5) {
+        newPWMvalue = pwmMinimumValue + 5*pwmStep;
+      } else if (difftemp <= 3.0) {
+        newPWMvalue = pwmMinimumValue + 6*pwmStep;
      }
-      if(diffTemp <=0){
-        return 0;
-      }
-      int calculatedStep = (diffTemp / _pwmTempStepSize)+1;
-      // anything greater than max stepcount gets max 
-      return (uint8_t)min((int)_pwmMaxStepCount,calculatedStep);      
+      updateFanSpeed(newPWMvalue);
    }

  public:
@@ -313,7 +312,6 @@ class PWMFanUsermod : public Usermod {
      top[FPSTR(_tachoUpdateSec)] = tachoUpdateSec;
      top[FPSTR(_temperature)]    = targetTemperature;
      top[FPSTR(_minPWMValuePct)] = minPWMValuePct;
-      top[FPSTR(_maxPWMValuePct)] = maxPWMValuePct;
      top[FPSTR(_IRQperRotation)] = numberOfInterrupsInOneSingleRotation;
      DEBUG_PRINTLN(F("Autosave config saved."));
    }
@@ -347,8 +345,6 @@ class PWMFanUsermod : public Usermod {
      targetTemperature = top[FPSTR(_temperature)] | targetTemperature;
      minPWMValuePct    = top[FPSTR(_minPWMValuePct)] | minPWMValuePct;
      minPWMValuePct    = (uint8_t) min(100,max(0,(int)minPWMValuePct)); // bounds checking
-      maxPWMValuePct    = top[FPSTR(_maxPWMValuePct)] | maxPWMValuePct;
-      maxPWMValuePct    = (uint8_t) min(100,max((int)minPWMValuePct,(int)maxPWMValuePct)); // bounds checking
      numberOfInterrupsInOneSingleRotation = top[FPSTR(_IRQperRotation)] | numberOfInterrupsInOneSingleRotation;
      numberOfInterrupsInOneSingleRotation = (uint8_t) max(1,(int)numberOfInterrupsInOneSingleRotation); // bounds checking

@@ -393,7 +389,6 @@ const char PWMFanUsermod::_pwmPin[]         PROGMEM = "PWM-pin";
 const char PWMFanUsermod::_temperature[]    PROGMEM = "target-temp-C";
 const char PWMFanUsermod::_tachoUpdateSec[] PROGMEM = "tacho-update-s";
 const char PWMFanUsermod::_minPWMValuePct[] PROGMEM = "min-PWM-percent";
-const char PWMFanUsermod::_maxPWMValuePct[] PROGMEM = "max-PWM-percent";
 const char PWMFanUsermod::_IRQperRotation[] PROGMEM = "IRQs-per-rotation";
 const char PWMFanUsermod::_speed[]          PROGMEM = "speed";
 const char PWMFanUsermod::_lock[]           PROGMEM = "lock";
@@ -12,7 +12,8 @@ class RTCUsermod : public Usermod {
  public:

    void setup() {
-      if (i2c_scl<0 || i2c_sda<0) { disabled = true; return; }
+      PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
+      if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { disabled = true; return; }
      RTC.begin();
      time_t rtcTime = RTC.get();
      if (rtcTime) {
@@ -24,8 +25,8 @@ class RTCUsermod : public Usermod {
    }

    void loop() {
-      if (disabled || strip.isUpdating()) return;
-      if (toki.isTick()) {
+      if (strip.isUpdating()) return;
+      if (!disabled && toki.isTick()) {
        time_t t = toki.second();
        if (t != RTC.get()) RTC.set(t); //set RTC to NTP/UI-provided value
      }
@@ -30,7 +30,7 @@
 #define USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE 10000.0f
 #endif

-// only report if difference grater than offset value
+// only report if differance grater than offset value
 #ifndef USERMOD_SN_PHOTORESISTOR_OFFSET_VALUE
 #define USERMOD_SN_PHOTORESISTOR_OFFSET_VALUE 5
 #endif
@@ -17,6 +17,12 @@
    #ifndef TFT_HEIGHT
        #error Please define TFT_HEIGHT
    #endif
+    #ifndef TFT_MOSI
+        #error Please define TFT_MOSI
+    #endif
+    #ifndef TFT_SCLK
+        #error Please define TFT_SCLK
+    #endif
    #ifndef TFT_DC
        #error Please define TFT_DC
    #endif
@@ -134,14 +140,8 @@ class St7789DisplayUsermod : public Usermod {
     */
    void setup()
    {
-        PinManagerPinType spiPins[] = { { spi_mosi, true }, { spi_miso, false}, { spi_sclk, true } };
-        if (!pinManager.allocateMultiplePins(spiPins, 3, PinOwner::HW_SPI)) { enabled = false; return; }
-        PinManagerPinType displayPins[] = { { TFT_CS, true}, { TFT_DC, true}, { TFT_RST, true }, { TFT_BL, true } };
-        if (!pinManager.allocateMultiplePins(displayPins, sizeof(displayPins)/sizeof(PinManagerPinType), PinOwner::UM_FourLineDisplay)) {
-            pinManager.deallocateMultiplePins(spiPins, 3, PinOwner::HW_SPI);
-            enabled = false;
-            return;
-        }
+        PinManagerPinType pins[] = { { TFT_MOSI, true }, { TFT_MISO, false}, { TFT_SCLK, true }, { TFT_CS, true}, { TFT_DC, true}, { TFT_RST, true }, { TFT_BL, true } };
+        if (!pinManager.allocateMultiplePins(pins, 7, PinOwner::UM_FourLineDisplay)) { enabled = false; return; }

        tft.init();
        tft.setRotation(0);  //Rotation here is set up for the text to be readable with the port on the left. Use 1 to flip.
@@ -365,6 +365,9 @@ class St7789DisplayUsermod : public Usermod {
    {
      JsonObject top = root.createNestedObject("ST7789");
      JsonArray pins = top.createNestedArray("pin");
+      pins.add(TFT_MOSI);
+      pins.add(TFT_MISO);
+      pins.add(TFT_SCLK);
      pins.add(TFT_CS);
      pins.add(TFT_DC);
      pins.add(TFT_RST);
@@ -373,13 +376,6 @@ class St7789DisplayUsermod : public Usermod {
    }


-    void appendConfigData() {
-      oappend(SET_F("addInfo('ST7789:pin[]',0,'','SPI CS');"));
-      oappend(SET_F("addInfo('ST7789:pin[]',1,'','SPI DC');"));
-      oappend(SET_F("addInfo('ST7789:pin[]',2,'','SPI RST');"));
-      oappend(SET_F("addInfo('ST7789:pin[]',2,'','SPI BL');"));
-    }
-
    /*
     * readFromConfig() can be used to read back the custom settings you added with addToConfig().
     * This is called by WLED when settings are loaded (currently this only happens once immediately after boot)
@@ -13,6 +13,14 @@

 Adafruit_Si7021 si7021;

+#ifdef ARDUINO_ARCH_ESP32 //ESP32 boards
+uint8_t SCL_PIN = 22;
+uint8_t SDA_PIN = 21;
+#else //ESP8266 boards
+uint8_t SCL_PIN = 5;
+uint8_t SDA_PIN = 4;
+#endif
+
 class Si7021_MQTT_HA : public Usermod
 {
  private:
@@ -176,6 +184,7 @@ class Si7021_MQTT_HA : public Usermod
    {
      if (enabled) {
        Serial.println("Si7021_MQTT_HA: Starting!");
+        Wire.begin(SDA_PIN, SCL_PIN);
        Serial.println("Si7021_MQTT_HA: Initializing sensors.. ");
        _initializeSensor();
      }
@@ -3,7 +3,7 @@
 * This file allows you to add own functionality to WLED more easily
 * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
 * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in const.h)
- * bytes 2400+ are currently unused, but might be used for future wled features
+ * bytes 2400+ are currently ununsed, but might be used for future wled features
 */

 /*
@@ -144,7 +144,7 @@ void userLoop() {
  // First row with Wifi name
  tft.setCursor(1, 1);
  tft.print(knownSsid.substring(0, tftcharwidth > 1 ? tftcharwidth - 1 : 0));
-  // Print `~` char to indicate that SSID is longer than our display
+  // Print `~` char to indicate that SSID is longer, than our dicplay
  if (knownSsid.length() > tftcharwidth)
    tft.print("~");

@@ -18,7 +18,7 @@ Copy the example `platformio_override.ini` to the root directory.  This file sho
 * `USERMOD_DALLASTEMPERATURE`                      - enables this user mod wled00/usermods_list.cpp
 * `USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL` - number of milliseconds between measurements, defaults to 60000 ms (60s)

-All parameters can be configured at runtime via the Usermods settings page, including pin, temperature in degrees Celsius or Fahrenheit and measurement interval.
+All parameters can be configured at runtime via the Usermods settings page, including pin, temperature in degrees Celsius or Farenheit and measurement interval.

 ## Project link

@@ -50,7 +50,9 @@ class UsermodVL53L0XGestures : public Usermod {
  public:

    void setup() {
-      if (i2c_scl<0 || i2c_sda<0) { enabled = false; return; }
+      PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
+      if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { enabled = false; return; }
+      Wire.begin();

      sensor.setTimeout(150);
      if (!sensor.init())
@@ -34,30 +34,30 @@ uint8_t DALLAS_PIN =23;
 uint8_t SCL_PIN = 5;
 uint8_t SDA_PIN = 4;
 uint8_t DALLAS_PIN =13;
-// uint8_t RST_PIN = 16; // Un-comment for Heltec WiFi-Kit-8
+// uint8_t RST_PIN = 16; // Uncoment for Heltec WiFi-Kit-8
 #endif

 //The SCL and SDA pins are defined here.
 //ESP8266 Wemos D1 mini board use SCL=5 SDA=4 while ESP32 Wemos32 mini board use SCL=22 SDA=21
 #define U8X8_PIN_SCL SCL_PIN
 #define U8X8_PIN_SDA SDA_PIN
-//#define U8X8_PIN_RESET RST_PIN // Un-comment for Heltec WiFi-Kit-8
+//#define U8X8_PIN_RESET RST_PIN // Uncoment for Heltec WiFi-Kit-8

 // Dallas sensor reading timer
 long temptimer = millis();
 long lastMeasure = 0;
-#define Celsius // Show temperature measurement in Celsius otherwise is in Fahrenheit 
+#define Celsius // Show temperature mesaurement in Celcius otherwise is in Fahrenheit 

 // If display does not work or looks corrupted check the
 // constructor reference:
 // https://github.com/olikraus/u8g2/wiki/u8x8setupcpp
 // or check the gallery:
 // https://github.com/olikraus/u8g2/wiki/gallery
-// --> First choice of cheap I2C OLED 128X32 0.91"
+// --> First choise of cheap I2C OLED 128X32 0.91"
 U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Second choice of cheap I2C OLED 128X64 0.96" or 1.3"
+// --> Second choise of cheap I2C OLED 128X64 0.96" or 1.3"
 //U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Third choice of Heltec WiFi-Kit-8 OLED 128X32 0.91"
+// --> Third choise of Heltec WiFi-Kit-8 OLED 128X32 0.91"
 //U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_RESET, U8X8_PIN_SCL, U8X8_PIN_SDA); // Constructor for Heltec WiFi-Kit-8
 // gets called once at boot. Do all initialization that doesn't depend on network here
 void userSetup() {
@@ -97,7 +97,7 @@ void userLoop() {

 //----> Dallas temperature sensor MQTT publishing
  temptimer = millis();  
-// Timer to publish new temperature every 60 seconds
+// Timer to publishe new temperature every 60 seconds
  if (temptimer - lastMeasure > 60000) 
  {
    lastMeasure = temptimer;    
@@ -106,7 +106,7 @@ void userLoop() {
    if (mqtt != nullptr)
    {
 //      Serial.println(Dallas(DALLAS_PIN,0));
-//Gets preferred temperature scale based on selection in definitions section
+//Gets prefered temperature scale based on selection in definitions section
        #ifdef Celsius
        int16_t board_temperature = Dallas(DALLAS_PIN,0);
        #else
@@ -173,11 +173,11 @@ void userLoop() {
  // First row with Wifi name
  u8x8.setCursor(1, 0);
  u8x8.print(knownSsid.substring(0, u8x8.getCols() > 1 ? u8x8.getCols() - 2 : 0));
-  // Print `~` char to indicate that SSID is longer than our display
+  // Print `~` char to indicate that SSID is longer, than owr dicplay
  if (knownSsid.length() > u8x8.getCols())
    u8x8.print("~");

-  // Second row with IP or Password
+  // Second row with IP or Psssword
  u8x8.setCursor(1, 1);
  // Print password in AP mode and if led is OFF.
  if (apActive && bri == 0)
@@ -6,7 +6,7 @@

 void UpdateBME280Data();

-#define Celsius // Show temperature measurement in Celsius otherwise is in Fahrenheit 
+#define Celsius // Show temperature mesaurement in Celcius otherwise is in Fahrenheit 
 BME280I2C bme;    // Default : forced mode, standby time = 1000 ms
                  // Oversampling = pressure ×1, temperature ×1, humidity ×1, filter off,

@@ -16,25 +16,25 @@ uint8_t SDA_PIN = 21;
 #else //ESP8266 boards
 uint8_t SCL_PIN = 5;
 uint8_t SDA_PIN = 4;
-// uint8_t RST_PIN = 16; // Un-comment for Heltec WiFi-Kit-8
+// uint8_t RST_PIN = 16; // Uncoment for Heltec WiFi-Kit-8
 #endif

 //The SCL and SDA pins are defined here.
 //ESP8266 Wemos D1 mini board use SCL=5 SDA=4 while ESP32 Wemos32 mini board use SCL=22 SDA=21
 #define U8X8_PIN_SCL SCL_PIN
 #define U8X8_PIN_SDA SDA_PIN
-//#define U8X8_PIN_RESET RST_PIN // Un-comment for Heltec WiFi-Kit-8
+//#define U8X8_PIN_RESET RST_PIN // Uncoment for Heltec WiFi-Kit-8

 // If display does not work or looks corrupted check the
 // constructor reference:
 // https://github.com/olikraus/u8g2/wiki/u8x8setupcpp
 // or check the gallery:
 // https://github.com/olikraus/u8g2/wiki/gallery
-// --> First choice of cheap I2C OLED 128X32 0.91"
+// --> First choise of cheap I2C OLED 128X32 0.91"
 U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Second choice of cheap I2C OLED 128X64 0.96" or 1.3"
+// --> Second choise of cheap I2C OLED 128X64 0.96" or 1.3"
 //U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Third choice of Heltec WiFi-Kit-8 OLED 128X32 0.91"
+// --> Third choise of Heltec WiFi-Kit-8 OLED 128X32 0.91"
 //U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_RESET, U8X8_PIN_SCL, U8X8_PIN_SDA); // Constructor for Heltec WiFi-Kit-8
 // gets called once at boot. Do all initialization that doesn't depend on network here

@@ -179,11 +179,11 @@ void userLoop() {
  // First row with Wifi name
  u8x8.setCursor(1, 0);
  u8x8.print(knownSsid.substring(0, u8x8.getCols() > 1 ? u8x8.getCols() - 2 : 0));
-  // Print `~` char to indicate that SSID is longer, than our display
+  // Print `~` char to indicate that SSID is longer, than owr dicplay
  if (knownSsid.length() > u8x8.getCols())
    u8x8.print("~");

-  // Second row with IP or Password
+  // Second row with IP or Psssword
  u8x8.setCursor(1, 1);
  // Print password in AP mode and if led is OFF.
  if (apActive && bri == 0)
@@ -20,12 +20,6 @@
 * ....
 */

-#if !defined(FFTTASK_PRIORITY)
-#define FFTTASK_PRIORITY 1 // standard: looptask prio
-//#define FFTTASK_PRIORITY 2 // above looptask, below asyc_tcp
-//#define FFTTASK_PRIORITY 4 // above asyc_tcp
-#endif
-
 // Comment/Uncomment to toggle usb serial debugging
 // #define MIC_LOGGER                   // MIC sampling & sound input debugging (serial plotter)
 // #define FFT_SAMPLING_LOG             // FFT result debugging
@@ -73,15 +67,11 @@ static uint8_t audioSyncEnabled = 0;          // bit field: bit 0 - send, bit 1
 static bool udpSyncConnected = false;         // UDP connection status -> true if connected to multicast group

 // user settable parameters for limitSoundDynamics()
-#ifdef UM_AUDIOREACTIVE_DYNAMICS_LIMITER_OFF
-static bool limiterOn = false;                 // bool: enable / disable dynamics limiter
-#else
-static bool limiterOn = true;
-#endif
+static bool limiterOn = true;                 // bool: enable / disable dynamics limiter
 static uint16_t attackTime =  80;             // int: attack time in milliseconds. Default 0.08sec
 static uint16_t decayTime = 1400;             // int: decay time in milliseconds.  Default 1.40sec
 // user settable options for FFTResult scaling
-static uint8_t FFTScalingMode = 3;            // 0 none; 1 optimized logarithmic; 2 optimized linear; 3 optimized square root
+static uint8_t FFTScalingMode = 3;            // 0 none; 1 optimized logarithmic; 2 optimized linear; 3 optimized sqare root

 // 
 // AGC presets
@@ -114,11 +104,11 @@ static float    sampleAgc = 0.0f;               // Smoothed AGC sample

 // peak detection
 static bool samplePeak = false;      // Boolean flag for peak - used in effects. Responding routine may reset this flag. Auto-reset after strip.getMinShowDelay()
-static uint8_t maxVol = 31;          // Reasonable value for constant volume for 'peak detector', as it won't always trigger (deprecated)
+static uint8_t maxVol = 10;          // Reasonable value for constant volume for 'peak detector', as it won't always trigger (deprecated)
 static uint8_t binNum = 8;           // Used to select the bin for FFT based beat detection  (deprecated)
-static bool udpSamplePeak = false;   // Boolean flag for peak. Set at the same time as samplePeak, but reset by transmitAudioData
+static bool udpSamplePeak = false;   // Boolean flag for peak. Set at the same tiem as samplePeak, but reset by transmitAudioData
 static unsigned long timeOfPeak = 0; // time of last sample peak detection.
-static void detectSamplePeak(void);  // peak detection function (needs scaled FFT results in vReal[])
+static void detectSamplePeak(void);  // peak detection function (needs scaled FFT reasults in vReal[])
 static void autoResetPeak(void);     // peak auto-reset function


@@ -183,18 +173,13 @@ static float windowWeighingFactors[samplesFFT] = {0.0f};

 // Create FFT object
 #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
-  // lib_deps += https://github.com/kosme/arduinoFFT#develop @ 1.9.2
-  // these options actually cause slow-downs on all esp32 processors, don't use them.
-  // #define FFT_SPEED_OVER_PRECISION     // enables use of reciprocals (1/x etc) - not faster on ESP32
-  // #define FFT_SQRT_APPROXIMATION       // enables "quake3" style inverse sqrt  - slower on ESP32
-  // Below options are forcing ArduinoFFT to use sqrtf() instead of sqrt()
-  #define sqrt(x) sqrtf(x)             // little hack that reduces FFT time by 10-50% on ESP32
-  #define sqrt_internal sqrtf          // see https://github.com/kosme/arduinoFFT/pull/83
+// lib_deps += https://github.com/kosme/arduinoFFT#develop @ 1.9.2
+#define FFT_SPEED_OVER_PRECISION     // enables use of reciprocals (1/x etc), and an a few other speedups
+#define FFT_SQRT_APPROXIMATION       // enables "quake3" style inverse sqrt
+#define sqrt(x) sqrtf(x)             // little hack that reduces FFT time by 50% on ESP32 (as alternative to FFT_SQRT_APPROXIMATION)
 #else
-  // around 40% slower on -S2
-  // lib_deps += https://github.com/blazoncek/arduinoFFT.git
+// lib_deps += https://github.com/blazoncek/arduinoFFT.git
 #endif
-
 #include <arduinoFFT.h>

 #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
@@ -210,7 +195,7 @@ static float mapf(float x, float in_min, float in_max, float out_min, float out_
  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 }

-// compute average of several FFT result bins
+// compute average of several FFT resut bins
 static float fftAddAvg(int from, int to) {
  float result = 0.0f;
  for (int i = from; i <= to; i++) {
@@ -328,7 +313,7 @@ void FFTcode(void * parameter)
    *
    * Andrew's updated mapping of 256 bins down to the 16 result bins with Sample Freq = 10240, samplesFFT = 512 and some overlap.
    * Based on testing, the lowest/Start frequency is 60 Hz (with bin 3) and a highest/End frequency of 5120 Hz in bin 255.
-    * Now, Take the 60Hz and multiply by 1.320367784 to get the next frequency and so on until the end. Then determine the bins.
+    * Now, Take the 60Hz and multiply by 1.320367784 to get the next frequency and so on until the end. Then detetermine the bins.
    * End frequency = Start frequency * multiplier ^ 16
    * Multiplier = (End frequency/ Start frequency) ^ 1/16
    * Multiplier = 1.320367784
@@ -387,7 +372,7 @@ void FFTcode(void * parameter)
      }
    }

-    // post-processing of frequency channels (pink noise adjustment, AGC, smoothing, scaling)
+    // post-processing of frequency channels (pink noise adjustment, AGC, smooting, scaling)
    postProcessFFTResults((fabsf(sampleAvg) > 0.25f)? true : false , NUM_GEQ_CHANNELS);

 #if defined(WLED_DEBUG) || defined(SR_DEBUG)
@@ -426,7 +411,7 @@ static void runMicFilter(uint16_t numSamples, float *sampleBuffer)          // p
  //constexpr float beta1 = 0.8285f; // 18Khz
  constexpr float beta1 = 0.85f;  // 20Khz

-  constexpr float beta2 = (1.0f - beta1) / 2.0f;
+  constexpr float beta2 = (1.0f - beta1) / 2.0;
  static float last_vals[2] = { 0.0f }; // FIR high freq cutoff filter
  static float lowfilt = 0.0f;          // IIR low frequency cutoff filter

@@ -434,7 +419,7 @@ static void runMicFilter(uint16_t numSamples, float *sampleBuffer)          // p
        // FIR lowpass, to remove high frequency noise
        float highFilteredSample;
        if (i < (numSamples-1)) highFilteredSample = beta1*sampleBuffer[i] + beta2*last_vals[0] + beta2*sampleBuffer[i+1];  // smooth out spikes
-        else highFilteredSample = beta1*sampleBuffer[i] + beta2*last_vals[0]  + beta2*last_vals[1];                  // special handling for last sample in array
+        else highFilteredSample = beta1*sampleBuffer[i] + beta2*last_vals[0]  + beta2*last_vals[1];                  // spcial handling for last sample in array
        last_vals[1] = last_vals[0];
        last_vals[0] = sampleBuffer[i];
        sampleBuffer[i] = highFilteredSample;
@@ -479,17 +464,17 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
      switch (FFTScalingMode) {
        case 1:
            // Logarithmic scaling
-            currentResult *= 0.42f;                      // 42 is the answer ;-)
-            currentResult -= 8.0f;                       // this skips the lowest row, giving some room for peaks
-            if (currentResult > 1.0f) currentResult = logf(currentResult); // log to base "e", which is the fastest log() function
-            else currentResult = 0.0f;                   // special handling, because log(1) = 0; log(0) = undefined
+            currentResult *= 0.42;                      // 42 is the answer ;-)
+            currentResult -= 8.0;                       // this skips the lowest row, giving some room for peaks
+            if (currentResult > 1.0) currentResult = logf(currentResult); // log to base "e", which is the fastest log() function
+            else currentResult = 0.0;                   // special handling, because log(1) = 0; log(0) = undefined
            currentResult *= 0.85f + (float(i)/18.0f);  // extra up-scaling for high frequencies
            currentResult = mapf(currentResult, 0, LOG_256, 0, 255); // map [log(1) ... log(255)] to [0 ... 255]
        break;
        case 2:
            // Linear scaling
            currentResult *= 0.30f;                     // needs a bit more damping, get stay below 255
-            currentResult -= 4.0f;                       // giving a bit more room for peaks
+            currentResult -= 4.0;                       // giving a bit more room for peaks
            if (currentResult < 1.0f) currentResult = 0.0f;
            currentResult *= 0.85f + (float(i)/1.8f);   // extra up-scaling for high frequencies
        break;
@@ -497,8 +482,8 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
            // square root scaling
            currentResult *= 0.38f;
            currentResult -= 6.0f;
-            if (currentResult > 1.0f) currentResult = sqrtf(currentResult);
-            else currentResult = 0.0f;                   // special handling, because sqrt(0) = undefined
+            if (currentResult > 1.0) currentResult = sqrtf(currentResult);
+            else currentResult = 0.0;                   // special handling, because sqrt(0) = undefined
            currentResult *= 0.85f + (float(i)/4.5f);   // extra up-scaling for high frequencies
            currentResult = mapf(currentResult, 0.0, 16.0, 0.0, 255.0); // map [sqrt(1) ... sqrt(256)] to [0 ... 255]
        break;
@@ -526,11 +511,11 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
 // peak detection is called from FFT task when vReal[] contains valid FFT results
 static void detectSamplePeak(void) {
  bool havePeak = false;
-  // softhack007: this code continuously triggers while amplitude in the selected bin is above a certain threshold. So it does not detect peaks - it detects high activity in a frequency bin.
+
  // Poor man's beat detection by seeing if sample > Average + some value.
  // This goes through ALL of the 255 bins - but ignores stupid settings
  // Then we got a peak, else we don't. The peak has to time out on its own in order to support UDP sound sync.
-  if ((sampleAvg > 1) && (maxVol > 0) && (binNum > 4) && (vReal[binNum] > maxVol) && ((millis() - timeOfPeak) > 100)) {
+  if ((sampleAvg > 1) && (maxVol > 0) && (binNum > 1) && (vReal[binNum] > maxVol) && ((millis() - timeOfPeak) > 100)) {
    havePeak = true;
  }

@@ -584,6 +569,16 @@ class AudioReactive : public Usermod {
    #else
    int8_t i2sckPin = I2S_CKPIN;
    #endif
+    #ifndef ES7243_SDAPIN
+    int8_t sdaPin = -1;
+    #else
+    int8_t sdaPin = ES7243_SDAPIN;
+    #endif
+    #ifndef ES7243_SCLPIN
+    int8_t sclPin = -1;
+    #else
+    int8_t sclPin = ES7243_SCLPIN;
+    #endif
    #ifndef MCLK_PIN
    int8_t mclkPin = I2S_PIN_NO_CHANGE;  /* ESP32: only -1, 0, 1, 3 allowed*/
    #else
@@ -616,12 +611,7 @@ class AudioReactive : public Usermod {
    };

    // set your config variables to their boot default value (this can also be done in readFromConfig() or a constructor if you prefer)
-    #ifdef UM_AUDIOREACTIVE_ENABLE
-    bool     enabled = true;
-    #else
    bool     enabled = false;
-    #endif
-
    bool     initDone = false;

    // variables  for UDP sound sync
@@ -636,7 +626,7 @@ class AudioReactive : public Usermod {

    // variables used by getSample() and agcAvg()
    int16_t  micIn = 0;           // Current sample starts with negative values and large values, which is why it's 16 bit signed
-    double   sampleMax = 0.0;     // Max sample over a few seconds. Needed for AGC controller.
+    double   sampleMax = 0.0;     // Max sample over a few seconds. Needed for AGC controler.
    double   micLev = 0.0;        // Used to convert returned value to have '0' as minimum. A leveller
    float    expAdjF = 0.0f;      // Used for exponential filter.
    float    sampleReal = 0.0f;	  // "sampleRaw" as float, to provide bits that are lost otherwise (before amplification by sampleGain or inputLevel). Needed for AGC.
@@ -754,13 +744,13 @@ class AudioReactive : public Usermod {
    * 2. we use two setpoints, one at ~60%, and one at ~80% of the maximum signal
    * 3. the amplification depends on signal level:
    *    a) normal zone - very slow adjustment
-    *    b) emergency zone (<10% or >90%) - very fast adjustment
+    *    b) emergency zome (<10% or >90%) - very fast adjustment
    */
    void agcAvg(unsigned long the_time)
    {
      const int AGC_preset = (soundAgc > 0)? (soundAgc-1): 0; // make sure the _compiler_ knows this value will not change while we are inside the function

-      float lastMultAgc = multAgc;      // last multiplier used
+      float lastMultAgc = multAgc;      // last muliplier used
      float multAgcTemp = multAgc;      // new multiplier
      float tmpAgc = sampleReal * multAgc;        // what-if amplified signal

@@ -778,7 +768,7 @@ class AudioReactive : public Usermod {
      if (time_now - last_time > 2)  {
        last_time = time_now;

-        if((fabsf(sampleReal) < 2.0f) || (sampleMax < 1.0)) {
+        if((fabsf(sampleReal) < 2.0f) || (sampleMax < 1.0f)) {
          // MIC signal is "squelched" - deliver silence
          tmpAgc = 0;
          // we need to "spin down" the intgrated error buffer
@@ -800,13 +790,13 @@ class AudioReactive : public Usermod {
        
        if (((multAgcTemp > 0.085f) && (multAgcTemp < 6.5f))    //integrator anti-windup by clamping
            && (multAgc*sampleMax < agcZoneStop[AGC_preset]))   //integrator ceiling (>140% of max)
-          control_integrated += control_error * 0.002 * 0.25;   // 2ms = integration time; 0.25 for damping
+          control_integrated += control_error * 0.002 * 0.25;   // 2ms = intgration time; 0.25 for damping
        else
          control_integrated *= 0.9;                            // spin down that beasty integrator

        // apply PI Control 
        tmpAgc = sampleReal * lastMultAgc;                      // check "zone" of the signal using previous gain
-        if ((tmpAgc > agcZoneHigh[AGC_preset]) || (tmpAgc < soundSquelch + agcZoneLow[AGC_preset])) {  // upper/lower energy zone
+        if ((tmpAgc > agcZoneHigh[AGC_preset]) || (tmpAgc < soundSquelch + agcZoneLow[AGC_preset])) {  // upper/lower emergy zone
          multAgcTemp = lastMultAgc + agcFollowFast[AGC_preset] * agcControlKp[AGC_preset] * control_error;
          multAgcTemp += agcFollowFast[AGC_preset] * agcControlKi[AGC_preset] * control_integrated;
        } else {                                                                         // "normal zone"
@@ -814,7 +804,7 @@ class AudioReactive : public Usermod {
          multAgcTemp += agcFollowSlow[AGC_preset] * agcControlKi[AGC_preset] * control_integrated;
        }

-        // limit amplification again - PI controller sometimes "overshoots"
+        // limit amplification again - PI controler sometimes "overshoots"
        //multAgcTemp = constrain(multAgcTemp, 0.015625f, 32.0f); // 1/64 < multAgcTemp < 32
        if (multAgcTemp > 32.0f)      multAgcTemp = 32.0f;
        if (multAgcTemp < 1.0f/64.0f) multAgcTemp = 1.0f/64.0f;
@@ -844,7 +834,7 @@ class AudioReactive : public Usermod {
    void getSample()
    {
      float    sampleAdj;           // Gain adjusted sample value
-      float    tmpSample;           // An interim sample variable used for calculations.
+      float    tmpSample;           // An interim sample variable used for calculatioins.
      const float weighting = 0.2f; // Exponential filter weighting. Will be adjustable in a future release.
      const int   AGC_preset = (soundAgc > 0)? (soundAgc-1): 0; // make sure the _compiler_ knows this value will not change while we are inside the function

@@ -893,8 +883,8 @@ class AudioReactive : public Usermod {
      // keep "peak" sample, but decay value if current sample is below peak
      if ((sampleMax < sampleReal) && (sampleReal > 0.5f)) {
        sampleMax = sampleMax + 0.5f * (sampleReal - sampleMax);  // new peak - with some filtering
-        // another simple way to detect samplePeak - cannot detect beats, but reacts on peak volume
-        if (((binNum < 12) || ((maxVol < 1))) && (millis() - timeOfPeak > 80) && (sampleAvg > 1)) {
+        // another simple way to detect samplePeak
+        if ((binNum < 10) && (millis() - timeOfPeak > 80) && (sampleAvg > 1)) {
          samplePeak    = true;
          timeOfPeak    = millis();
          udpSamplePeak = true;
@@ -969,8 +959,6 @@ class AudioReactive : public Usermod {
      //DEBUGSR_PRINTLN("Transmitting UDP Mic Packet");

      audioSyncPacket transmitData;
-      memset(reinterpret_cast<void *>(&transmitData), 0, sizeof(transmitData)); // make sure that the packet - including "invisible" padding bytes added by the compiler - is fully initialized
-
      strncpy_P(transmitData.header, PSTR(UDP_SYNC_HEADER), 6);
      // transmit samples that were not modified by limitSampleDynamics()
      transmitData.sampleRaw   = (soundAgc) ? rawSampleAgc: sampleRaw;
@@ -986,10 +974,9 @@ class AudioReactive : public Usermod {
      transmitData.FFT_Magnitude = my_magnitude;
      transmitData.FFT_MajorPeak = FFT_MajorPeak;

-      if (fftUdp.beginMulticastPacket() != 0) { // beginMulticastPacket returns 0 in case of error
-        fftUdp.write(reinterpret_cast<uint8_t *>(&transmitData), sizeof(transmitData));
-        fftUdp.endPacket();
-      }
+      fftUdp.beginMulticastPacket();
+      fftUdp.write(reinterpret_cast<uint8_t *>(&transmitData), sizeof(transmitData));
+      fftUdp.endPacket();
      return;
    } // transmitAudioData()

@@ -1149,7 +1136,7 @@ class AudioReactive : public Usermod {
          DEBUGSR_PRINTLN(F("AR: ES7243 Microphone (right channel only)."));
          audioSource = new ES7243(SAMPLE_RATE, BLOCK_SIZE);
          delay(100);
-          if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
+          if (audioSource) audioSource->initialize(sdaPin, sclPin, i2swsPin, i2ssdPin, i2sckPin, mclkPin);
          break;
        case 3:
          DEBUGSR_PRINT(F("AR: SPH0645 Microphone - ")); DEBUGSR_PRINTLN(F(I2S_MIC_CHANNEL_TEXT));
@@ -1172,13 +1159,6 @@ class AudioReactive : public Usermod {
          if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin);
          break;
        #endif
-        case 6:
-          DEBUGSR_PRINTLN(F("AR: ES8388 Source"));
-          audioSource = new ES8388Source(SAMPLE_RATE, BLOCK_SIZE);
-          delay(100);
-          if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
-          break;
-
        #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
        // ADC over I2S is only possible on "classic" ESP32
        case 0:
@@ -1186,7 +1166,6 @@ class AudioReactive : public Usermod {
          DEBUGSR_PRINTLN(F("AR: Analog Microphone (left channel only)."));
          audioSource = new I2SAdcSource(SAMPLE_RATE, BLOCK_SIZE);
          delay(100);
-          useBandPassFilter = true;  // PDM bandpass filter seems to help for bad quality analog
          if (audioSource) audioSource->initialize(audioPin);
          break;
        #endif
@@ -1296,10 +1275,9 @@ class AudioReactive : public Usermod {

        #ifdef WLED_DEBUG
          // complain when audio userloop has been delayed for long time. Currently we need userloop running between 500 and 1500 times per second. 
-          // softhack007 disabled temporarily - avoid serial console spam with MANY leds and low FPS
-          //if ((userloopDelay > 65) && !disableSoundProcessing && (audioSyncEnabled == 0)) {
-            //DEBUG_PRINTF("[AR userLoop] hiccup detected -> was inactive for last %d millis!\n", userloopDelay);
-          //}
+          if ((userloopDelay > 23) && !disableSoundProcessing && (audioSyncEnabled == 0)) {
+            DEBUG_PRINTF("[AR userLoop] hickup detected -> was inactive for last %d millis!\n", userloopDelay);
+          }
        #endif

        // run filters, and repeat in case of loop delays (hick-up compensation)
@@ -1336,9 +1314,6 @@ class AudioReactive : public Usermod {
          if (millis() - lastTime > delayMs) {
            have_new_sample = receiveAudioData();
            if (have_new_sample) last_UDPTime = millis();
-#ifdef ARDUINO_ARCH_ESP32
-            else fftUdp.flush(); // Flush udp input buffers if we haven't read it - avoids hickups in receive mode. Does not work on 8266.
-#endif
            lastTime = millis();
          }
          if (have_new_sample) syncVolumeSmth = volumeSmth;   // remember received sample
@@ -1357,7 +1332,7 @@ class AudioReactive : public Usermod {
      // Info Page: keep max sample from last 5 seconds
      if ((millis() -  sampleMaxTimer) > CYCLE_SAMPLEMAX) {
        sampleMaxTimer = millis();
-        maxSample5sec = (0.15f * maxSample5sec) + 0.85f *((soundAgc) ? sampleAgc : sampleAvg); // reset, and start with some smoothing
+        maxSample5sec = (0.15 * maxSample5sec) + 0.85 *((soundAgc) ? sampleAgc : sampleAvg); // reset, and start with some smoothing
        if (sampleAvg < 1) maxSample5sec = 0; // noise gate 
      } else {
         if ((sampleAvg >= 1)) maxSample5sec = fmaxf(maxSample5sec, (soundAgc) ? rawSampleAgc : sampleRaw); // follow maximum volume
@@ -1401,11 +1376,10 @@ class AudioReactive : public Usermod {
      memset(fftAvg, 0, sizeof(fftAvg)); 
      memset(fftResult, 0, sizeof(fftResult)); 
      for(int i=(init?0:1); i<NUM_GEQ_CHANNELS; i+=2) fftResult[i] = 16; // make a tiny pattern
-      inputLevel = 128;                                    // reset level slider to default
+      inputLevel = 128;                                    // resset level slider to default
      autoResetPeak();

      if (init && FFT_Task) {
-        delay(25);                // give some time for I2S driver to finish sampling before we suspend it
        vTaskSuspend(FFT_Task);   // update is about to begin, disable task to prevent crash
        if (udpSyncConnected) {   // close UDP sync connection (if open)
          udpSyncConnected = false;
@@ -1417,14 +1391,15 @@ class AudioReactive : public Usermod {
          vTaskResume(FFT_Task);
          connected(); // resume UDP
        } else
-          xTaskCreateUniversal(               // xTaskCreateUniversal also works on -S2 and -C3 with single core
+//          xTaskCreatePinnedToCore(
+          xTaskCreate(                        // no need to "pin" this task to core #0
            FFTcode,                          // Function to implement the task
            "FFT",                            // Name of the task
-            3592,                             // Stack size in words // 3592 leaves 800-1024 bytes of task stack free
+            5000,                             // Stack size in words
            NULL,                             // Task input parameter
-            FFTTASK_PRIORITY,                 // Priority of the task
+            1,                                // Priority of the task
            &FFT_Task                         // Task handle
-            , 0                               // Core where the task should run
+//            , 0                                 // Core where the task should run
          );
      }
      micDataReal = 0.0f;                     // just to be sure
@@ -1514,14 +1489,14 @@ class AudioReactive : public Usermod {
        } else {
          // Analog or I2S digital input
          if (audioSource && (audioSource->isInitialized())) {
-            // audio source successfully configured
+            // audio source sucessfully configured
            if (audioSource->getType() == AudioSource::Type_I2SAdc) {
              infoArr.add(F("ADC analog"));
            } else {
              infoArr.add(F("I2S digital"));
            }
            // input level or "silence"
-            if (maxSample5sec > 1.0f) {
+            if (maxSample5sec > 1.0) {
              float my_usage = 100.0f * (maxSample5sec / 255.0f);
              snprintf_P(myStringBuffer, 15, PSTR(" - peak %3d%%"), int(my_usage));
              infoArr.add(myStringBuffer);
@@ -1531,7 +1506,7 @@ class AudioReactive : public Usermod {
          } else {
            // error during audio source setup
            infoArr.add(F("not initialized"));
-            infoArr.add(F(" - check pin settings"));
+            infoArr.add(F(" - check GPIO config"));
          }
        }

@@ -1682,6 +1657,8 @@ class AudioReactive : public Usermod {
      pinArray.add(i2swsPin);
      pinArray.add(i2sckPin);
      pinArray.add(mclkPin);
+      pinArray.add(sdaPin);
+      pinArray.add(sclPin);

      JsonObject cfg = top.createNestedObject("config");
      cfg[F("squelch")] = soundSquelch;
@@ -1742,6 +1719,8 @@ class AudioReactive : public Usermod {
      configComplete &= getJsonValue(top[FPSTR(_digitalmic)]["pin"][1], i2swsPin);
      configComplete &= getJsonValue(top[FPSTR(_digitalmic)]["pin"][2], i2sckPin);
      configComplete &= getJsonValue(top[FPSTR(_digitalmic)]["pin"][3], mclkPin);
+      configComplete &= getJsonValue(top[FPSTR(_digitalmic)]["pin"][4], sdaPin);
+      configComplete &= getJsonValue(top[FPSTR(_digitalmic)]["pin"][5], sclPin);

      configComplete &= getJsonValue(top["config"][F("squelch")], soundSquelch);
      configComplete &= getJsonValue(top["config"][F("gain")],    sampleGain);
@@ -1773,8 +1752,6 @@ class AudioReactive : public Usermod {
    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
      oappend(SET_F("addOption(dd,'Generic I2S PDM',5);"));
    #endif
-    oappend(SET_F("addOption(dd,'ES8388',6);"));
-    
      oappend(SET_F("dd=addDropdown('AudioReactive','config:AGC');"));
      oappend(SET_F("addOption(dd,'Off',0);"));
      oappend(SET_F("addOption(dd,'Normal',1);"));
@@ -1807,6 +1784,8 @@ class AudioReactive : public Usermod {
      #else
        oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'<i>master clock</i>','I2S MCLK');"));
      #endif
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',4,'','I2C SDA');"));
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',5,'','I2C SCL');"));
    }


@@ -1835,9 +1814,7 @@ class AudioReactive : public Usermod {
 const char AudioReactive::_name[]       PROGMEM = "AudioReactive";
 const char AudioReactive::_enabled[]    PROGMEM = "enabled";
 const char AudioReactive::_inputLvl[]   PROGMEM = "inputLevel";
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 const char AudioReactive::_analogmic[]  PROGMEM = "analogmic";
-#endif
 const char AudioReactive::_digitalmic[] PROGMEM = "digitalmic";
 const char AudioReactive::UDP_SYNC_HEADER[]    PROGMEM = "00002"; // new sync header version, as format no longer compatible with previous structure
 const char AudioReactive::UDP_SYNC_HEADER_v1[] PROGMEM = "00001"; // old sync header version - need to add backwards-compatibility feature
@@ -1,5 +1,6 @@
 #pragma once
-#ifdef ARDUINO_ARCH_ESP32
+
+#include <Wire.h>
 #include "wled.h"
 #include <driver/i2s.h>
 #include <driver/adc.h>
@@ -22,14 +23,14 @@

 // see https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/chip-series-comparison.html#related-documents
 // and https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/i2s.html#overview-of-all-modes
-#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(ESP8266) || defined(ESP8265)
+#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(ESP8266) || defined(ESP8265)
  // there are two things in these MCUs that could lead to problems with audio processing:
  // * no floating point hardware (FPU) support - FFT uses float calculations. If done in software, a strong slow-down can be expected (between 8x and 20x)
  // * single core, so FFT task might slow down other things like LED updates
  #if !defined(SOC_I2S_NUM) || (SOC_I2S_NUM < 1)
-  #error This audio reactive usermod does not support ESP32-C2 or ESP32-C3.
+  #error This audio reactive usermod does not support ESP32-C2, ESP32-C3 or ESP32-S2.
  #else
-  #warning This audio reactive usermod does not support ESP32-C2 and ESP32-C3.
+  #warning This audio reactive usermod does not support ESP32-C2, ESP32-C3 or ESP32-S2.
  #endif
 #endif

@@ -44,7 +45,7 @@
 // benefit: analog mic inputs will be sampled contiously -> better response times and less "glitches"
 // WARNING: this option WILL lock-up your device in case that any other analogRead() operation is performed; 
 //          for example if you want to read "analog buttons"
-//#define I2S_GRAB_ADC1_COMPLETELY // (experimental) continuously sample analog ADC microphone. WARNING will cause analogRead() lock-up
+//#define I2S_GRAB_ADC1_COMPLETELY // (experimental) continously sample analog ADC microphone. WARNING will cause analogRead() lock-up

 // data type requested from the I2S driver - currently we always use 32bit
 //#define I2S_USE_16BIT_SAMPLES   // (experimental) define this to request 16bit - more efficient but possibly less compatible
@@ -71,7 +72,7 @@
 * if you want to receive two channels, one is the actual data from microphone and another channel is suppose to receive 0, it's different data in two channels, you need to choose I2S_CHANNEL_FMT_RIGHT_LEFT in this case.
 */

-#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) && (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4, 4, 4))
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) && (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4, 4, 3))
 // espressif bug: only_left has no sound, left and right are swapped 
 // https://github.com/espressif/esp-idf/issues/9635  I2S mic not working since 4.4 (IDFGH-8138)
 // https://github.com/espressif/esp-idf/issues/8538  I2S channel selection issue? (IDFGH-6918)
@@ -122,7 +123,7 @@ class AudioSource {
       This function needs to take care of anything that needs to be done
       before samples can be obtained from the microphone.
    */
-    virtual void initialize(int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) = 0;
+    virtual void initialize(int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) = 0;

    /* Deinitialize
       Release all resources and deactivate any functionality that is used
@@ -191,8 +192,7 @@ class I2SSource : public AudioSource {
      };
    }

-    virtual void initialize(int8_t i2swsPin = I2S_PIN_NO_CHANGE, int8_t i2ssdPin = I2S_PIN_NO_CHANGE, int8_t i2sckPin = I2S_PIN_NO_CHANGE, int8_t mclkPin = I2S_PIN_NO_CHANGE) {
-      DEBUGSR_PRINTLN("I2SSource:: initialize().");
+    virtual void initialize(int8_t i2swsPin = I2S_PIN_NO_CHANGE, int8_t i2ssdPin = I2S_PIN_NO_CHANGE, int8_t i2sckPin = I2S_PIN_NO_CHANGE, int8_t mclkPin = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
      if (i2swsPin != I2S_PIN_NO_CHANGE && i2ssdPin != I2S_PIN_NO_CHANGE) {
        if (!pinManager.allocatePin(i2swsPin, true, PinOwner::UM_Audioreactive) ||
            !pinManager.allocatePin(i2ssdPin, false, PinOwner::UM_Audioreactive)) { // #206
@@ -378,17 +378,26 @@ class I2SSource : public AudioSource {
 };

 /* ES7243 Microphone
-   This is an I2S microphone that requires initialization over
+   This is an I2S microphone that requires ininitialization over
   I2C before I2S data can be received
 */
 class ES7243 : public I2SSource {
  private:
+    // I2C initialization functions for ES7243
+    void _es7243I2cBegin() {
+      bool i2c_initialized = Wire.begin(pin_ES7243_SDA, pin_ES7243_SCL, 100000U);
+      if (i2c_initialized == false) {
+        DEBUGSR_PRINTLN(F("AR: ES7243 failed to initialize I2C bus driver."));
+      }
+    }

    void _es7243I2cWrite(uint8_t reg, uint8_t val) {
-      #ifndef ES7243_ADDR
-        #define ES7243_ADDR 0x13   // default address
-      #endif
+#ifndef ES7243_ADDR
+      Wire.beginTransmission(0x13);
+      #define ES7243_ADDR 0x13   // default address
+#else
      Wire.beginTransmission(ES7243_ADDR);
+#endif
      Wire.write((uint8_t)reg);
      Wire.write((uint8_t)val);
      uint8_t i2cErr = Wire.endTransmission();  // i2cErr == 0 means OK
@@ -398,6 +407,7 @@ class ES7243 : public I2SSource {
    }

    void _es7243InitAdc() {
+      _es7243I2cBegin();
      _es7243I2cWrite(0x00, 0x01);
      _es7243I2cWrite(0x06, 0x00);
      _es7243I2cWrite(0x05, 0x1B);
@@ -412,140 +422,47 @@ public:
      _config.channel_format = I2S_CHANNEL_FMT_ONLY_RIGHT;
    };

-    void initialize(int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t mclkPin) {
-      DEBUGSR_PRINTLN("ES7243:: initialize();");
+    void initialize(int8_t sdaPin, int8_t sclPin, int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t mclkPin) {
+      // check that pins are valid
+      if ((sdaPin < 0) || (sclPin < 0)) {
+        DEBUGSR_PRINTF("\nAR: invalid ES7243 I2C pins: SDA=%d, SCL=%d\n", sdaPin, sclPin); 
+        return;
+      }
+
      if ((i2sckPin < 0) || (mclkPin < 0)) {
        DEBUGSR_PRINTF("\nAR: invalid I2S pin: SCK=%d, MCLK=%d\n", i2sckPin, mclkPin); 
        return;
      }

+      // Reserve SDA and SCL pins of the I2C interface
+      PinManagerPinType es7243Pins[2] = { { sdaPin, true }, { sclPin, true } };
+      if (!pinManager.allocateMultiplePins(es7243Pins, 2, PinOwner::HW_I2C)) {
+        pinManager.deallocateMultiplePins(es7243Pins, 2, PinOwner::HW_I2C);
+        DEBUGSR_PRINTF("\nAR: Failed to allocate ES7243 I2C pins: SDA=%d, SCL=%d\n", sdaPin, sclPin); 
+        return;
+      }
+
+      pin_ES7243_SDA = sdaPin;
+      pin_ES7243_SCL = sclPin;
+
      // First route mclk, then configure ADC over I2C, then configure I2S
      _es7243InitAdc();
      I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
    }

    void deinitialize() {
+      // Release SDA and SCL pins of the I2C interface
+      PinManagerPinType es7243Pins[2] = { { pin_ES7243_SDA, true }, { pin_ES7243_SCL, true } };
+      pinManager.deallocateMultiplePins(es7243Pins, 2, PinOwner::HW_I2C);
      I2SSource::deinitialize();
    }
-};

-/* ES8388 Sound Module
-   This is an I2S sound processing unit that requires initialization over
-   I2C before I2S data can be received. 
-*/
-class ES8388Source : public I2SSource {
  private:
-
-    void _es8388I2cWrite(uint8_t reg, uint8_t val) {
-#ifndef ES8388_ADDR
-      Wire.beginTransmission(0x10);
-      #define ES8388_ADDR 0x10   // default address
-#else
-      Wire.beginTransmission(ES8388_ADDR);
-#endif
-      Wire.write((uint8_t)reg);
-      Wire.write((uint8_t)val);
-      uint8_t i2cErr = Wire.endTransmission();  // i2cErr == 0 means OK
-      if (i2cErr != 0) {
-        DEBUGSR_PRINTF("AR: ES8388 I2C write failed with error=%d  (addr=0x%X, reg 0x%X, val 0x%X).\n", i2cErr, ES8388_ADDR, reg, val);
-      }
-    }
-
-    void _es8388InitAdc() {
-      // https://dl.radxa.com/rock2/docs/hw/ds/ES8388%20user%20Guide.pdf Section 10.1
-      // http://www.everest-semi.com/pdf/ES8388%20DS.pdf Better spec sheet, more clear. 
-      // https://docs.google.com/spreadsheets/d/1CN3MvhkcPVESuxKyx1xRYqfUit5hOdsG45St9BCUm-g/edit#gid=0 generally
-      // Sets ADC to around what AudioReactive expects, and loops line-in to line-out/headphone for monitoring.
-      // Registries are decimal, settings are binary as that's how everything is listed in the docs
-      // ...which makes it easier to reference the docs.
-      //
-      _es8388I2cWrite( 8,0b00000000); // I2S to slave
-      _es8388I2cWrite( 2,0b11110011); // Power down DEM and STM
-      _es8388I2cWrite(43,0b10000000); // Set same LRCK
-      _es8388I2cWrite( 0,0b00000101); // Set chip to Play & Record Mode
-      _es8388I2cWrite(13,0b00000010); // Set MCLK/LRCK ratio to 256
-      _es8388I2cWrite( 1,0b01000000); // Power up analog and lbias
-      _es8388I2cWrite( 3,0b00000000); // Power up ADC, Analog Input, and Mic Bias
-      _es8388I2cWrite( 4,0b11111100); // Power down DAC, Turn on LOUT1 and ROUT1 and LOUT2 and ROUT2 power
-      _es8388I2cWrite( 2,0b01000000); // Power up DEM and STM and undocumented bit for "turn on line-out amp"
-
-      // #define use_es8388_mic
-
-    #ifdef use_es8388_mic
-      // The mics *and* line-in are BOTH connected to LIN2/RIN2 on the AudioKit
-      // so there's no way to completely eliminate the mics. It's also hella noisy. 
-      // Line-in works OK on the AudioKit, generally speaking, as the mics really need
-      // amplification to be noticeable in a quiet room. If you're in a very loud room, 
-      // the mics on the AudioKit WILL pick up sound even in line-in mode. 
-      // TL;DR: Don't use the AudioKit for anything, use the LyraT. 
-      //
-      // The LyraT does a reasonable job with mic input as configured below.
-
-      // Pick one of these. If you have to use the mics, use a LyraT over an AudioKit if you can:
-      _es8388I2cWrite(10,0b00000000); // Use Lin1/Rin1 for ADC input (mic on LyraT)
-      //_es8388I2cWrite(10,0b01010000); // Use Lin2/Rin2 for ADC input (mic *and* line-in on AudioKit)
-      
-      _es8388I2cWrite( 9,0b10001000); // Select Analog Input PGA Gain for ADC to +24dB (L+R)
-      _es8388I2cWrite(16,0b00000000); // Set ADC digital volume attenuation to 0dB (left)
-      _es8388I2cWrite(17,0b00000000); // Set ADC digital volume attenuation to 0dB (right)
-      _es8388I2cWrite(38,0b00011011); // Mixer - route LIN1/RIN1 to output after mic gain
-
-      _es8388I2cWrite(39,0b01000000); // Mixer - route LIN to mixL, +6dB gain
-      _es8388I2cWrite(42,0b01000000); // Mixer - route RIN to mixR, +6dB gain
-      _es8388I2cWrite(46,0b00100001); // LOUT1VOL - 0b00100001 = +4.5dB
-      _es8388I2cWrite(47,0b00100001); // ROUT1VOL - 0b00100001 = +4.5dB
-      _es8388I2cWrite(48,0b00100001); // LOUT2VOL - 0b00100001 = +4.5dB
-      _es8388I2cWrite(49,0b00100001); // ROUT2VOL - 0b00100001 = +4.5dB
-
-      // Music ALC - the mics like Auto Level Control
-      // You can also use this for line-in, but it's not really needed.
-      //
-      _es8388I2cWrite(18,0b11111000); // ALC: stereo, max gain +35.5dB, min gain -12dB 
-      _es8388I2cWrite(19,0b00110000); // ALC: target -1.5dB, 0ms hold time
-      _es8388I2cWrite(20,0b10100110); // ALC: gain ramp up = 420ms/93ms, gain ramp down = check manual for calc
-      _es8388I2cWrite(21,0b00000110); // ALC: use "ALC" mode, no zero-cross, window 96 samples
-      _es8388I2cWrite(22,0b01011001); // ALC: noise gate threshold, PGA gain constant, noise gate enabled 
-    #else
-      _es8388I2cWrite(10,0b01010000); // Use Lin2/Rin2 for ADC input ("line-in")
-      _es8388I2cWrite( 9,0b00000000); // Select Analog Input PGA Gain for ADC to 0dB (L+R)
-      _es8388I2cWrite(16,0b01000000); // Set ADC digital volume attenuation to -32dB (left)
-      _es8388I2cWrite(17,0b01000000); // Set ADC digital volume attenuation to -32dB (right)
-      _es8388I2cWrite(38,0b00001001); // Mixer - route LIN2/RIN2 to output
-
-      _es8388I2cWrite(39,0b01010000); // Mixer - route LIN to mixL, 0dB gain
-      _es8388I2cWrite(42,0b01010000); // Mixer - route RIN to mixR, 0dB gain
-      _es8388I2cWrite(46,0b00011011); // LOUT1VOL - 0b00011110 = +0dB, 0b00011011 = LyraT balance fix
-      _es8388I2cWrite(47,0b00011110); // ROUT1VOL - 0b00011110 = +0dB
-      _es8388I2cWrite(48,0b00011110); // LOUT2VOL - 0b00011110 = +0dB
-      _es8388I2cWrite(49,0b00011110); // ROUT2VOL - 0b00011110 = +0dB
-    #endif
-
-    }
-
-  public:
-    ES8388Source(SRate_t sampleRate, int blockSize, float sampleScale = 1.0f, bool i2sMaster=true) :
-      I2SSource(sampleRate, blockSize, sampleScale) {
-      _config.channel_format = I2S_CHANNEL_FMT_ONLY_LEFT;
-    };
-
-    void initialize(int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t mclkPin) {
-      DEBUGSR_PRINTLN("ES8388Source:: initialize();");
-      if ((i2sckPin < 0) || (mclkPin < 0)) {
-        DEBUGSR_PRINTF("\nAR: invalid I2S pin: SCK=%d, MCLK=%d\n", i2sckPin, mclkPin); 
-        return;
-      }
-
-      // First route mclk, then configure ADC over I2C, then configure I2S
-      _es8388InitAdc();
-      I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
-    }
-
-    void deinitialize() {
-      I2SSource::deinitialize();
-    }
-
+    int8_t pin_ES7243_SDA;
+    int8_t pin_ES7243_SCL;
 };

+
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
 #if !defined(SOC_I2S_SUPPORTS_ADC) && !defined(SOC_I2S_SUPPORTS_ADC_DAC)
  #warning this MCU does not support analog sound input
@@ -586,8 +503,7 @@ class I2SAdcSource : public I2SSource {
    /* identify Audiosource type - I2S-ADC*/
    AudioSourceType getType(void) {return(Type_I2SAdc);}

-    void initialize(int8_t audioPin, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
-      DEBUGSR_PRINTLN("I2SAdcSource:: initialize().");
+    void initialize(int8_t audioPin, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
      _myADCchannel = 0x0F;
      if(!pinManager.allocatePin(audioPin, false, PinOwner::UM_Audioreactive)) {
         DEBUGSR_PRINTF("failed to allocate GPIO for audio analog input: %d\n", audioPin);
@@ -758,8 +674,7 @@ class SPH0654 : public I2SSource {
      I2SSource(sampleRate, blockSize, sampleScale)
    {}

-    void initialize(int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t = I2S_PIN_NO_CHANGE) {
-      DEBUGSR_PRINTLN("SPH0654:: initialize();");
+    void initialize(uint8_t i2swsPin, uint8_t i2ssdPin, uint8_t i2sckPin, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
      I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin);
 #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 // these registers are only existing in "classic" ESP32
@@ -770,4 +685,3 @@ class SPH0654 : public I2SSource {
 #endif
    }
 };
-#endif
@@ -1,6 +1,6 @@
 # Audioreactive usermod

-Enables controlling LEDs via audio input. Audio source can be a microphone or analog-in (AUX) using an appropriate adapter.
+Enabless controlling LEDs via audio input. Audio source can be a microphone or analog-in (AUX) using an appropriate adapter.
 Supported microphones range from analog (MAX4466, MAX9814, ...) to digital (INMP441, ICS-43434, ...).

 Does audio processing and provides data structure that specially written effects can use.
@@ -19,7 +19,7 @@ This usermod is an evolution of [SR-WLED](https://github.com/atuline/WLED), and
 ## Supported MCUs
 This audioreactive usermod works best on "classic ESP32" (dual core), and on ESP32-S3 which also has dual core and hardware floating point support. 

-It will compile successfully for ESP32-S2 and ESP32-C3, however might not work well, as other WLED functions will become slow. Audio processing requires a lot of computing power, which can be problematic on smaller MCUs like -S2 and -C3. 
+It will compile succesfully for ESP32-S2 and ESP32-C3, however might not work well, as other WLED functions will become slow. Audio processing requires a lot of computing power, which can be problematic on smaller MCUs like -S2 and -C3. 

 Analog audio is only possible on "classic" ESP32, but not on other MCUs like ESP32-S3.

@@ -35,7 +35,7 @@ Customised _arduinoFFT_ library for use with this usermod can be found at https:

 ### using latest (develop) _arduinoFFT_ library
 Alternatively, you can use the latest arduinoFFT development version.
-ArduinoFFT `develop` library is slightly more accurate, and slightly faster than our customised library, however also needs additional 2kB RAM.
+ArduinoFFT `develop` library is slightly more accurate, and slighly faster than our customised library, however also needs additional 2kB RAM.

 * `build_flags` = `-D USERMOD_AUDIOREACTIVE` `-D UM_AUDIOREACTIVE_USE_NEW_FFT`
 * `lib_deps`= `https://github.com/kosme/arduinoFFT#develop @ 1.9.2`
@@ -55,11 +55,6 @@ If you want to define default GPIOs during compile time, use the following (defa
 - `-D ES7243_SDAPIN` : GPIO for I2C SDA pin on ES7243 microphone (-1)
 - `-D ES7243_SCLPIN` : GPIO for I2C SCL pin on ES7243 microphone (-1)

-Other options:
-
- `-D UM_AUDIOREACTIVE_ENABLE` : makes usermod default enabled (not the same as include into build option!)
- `-D UM_AUDIOREACTIVE_DYNAMICS_LIMITER_OFF` : disables rise/fall limiter default
-
 **NOTE** I2S is used for analog audio sampling. Hence, the analog *buttons* (i.e. potentiometers) are disabled when running this usermod with an analog microphone.

 ### Advanced Compile-Time Options
@@ -68,7 +63,7 @@ You can use the following additional flags in your `build_flags`
 * `-D SR_GAIN=x`     : Default "gain" setting (60)
 * `-D I2S_USE_RIGHT_CHANNEL`: Use RIGHT instead of LEFT channel (not recommended unless you strictly need this).
 * `-D I2S_USE_16BIT_SAMPLES`: Use 16bit instead of 32bit for internal sample buffers. Reduces sampling quality, but frees some RAM ressources (not recommended unless you absolutely need this).
-* `-D I2S_GRAB_ADC1_COMPLETELY`: Experimental: continuously sample analog ADC microphone. Only effective on ESP32. WARNING this _will_ cause conflicts(lock-up) with any analogRead() call.
+* `-D I2S_GRAB_ADC1_COMPLETELY`: Experimental: continously sample analog ADC microphone. Only effective on ESP32. WARNING this _will_ cause conflicts(lock-up) with any analogRead() call.
 * `-D MIC_LOGGER`     : (debugging) Logs samples from the microphone to serial USB. Use with serial plotter (Arduino IDE)
 * `-D SR_DEBUG`       : (debugging) Additional error diagnostics and debug info on serial USB.

@@ -85,9 +85,12 @@ class MPU6050Driver : public Usermod {
     * setup() is called once at boot. WiFi is not yet connected at this point.
     */
    void setup() {
-      if (i2c_scl<0 || i2c_sda<0) { enabled = false; return; }
+      PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
+      if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { enabled = false; return; }
+      // join I2C bus (I2Cdev library doesn't do this automatically)
      #if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE
-        Wire.setClock(400000U); // 400kHz I2C clock. Comment this line if having compilation difficulties
+        Wire.begin();
+        Wire.setClock(400000); // 400kHz I2C clock. Comment this line if having compilation difficulties
      #elif I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE
        Fastwire::setup(400, true);
      #endif
@@ -50,5 +50,5 @@ This usermod listens on `[mqttDeviceTopic]/switch/0/set` (where 0 is replaced wi
 Feedback about the current state is provided at `[mqttDeviceTopic]/switch/0/state`.

 ### Home Assistant auto-discovery
-Auto-discovery information is automatically published and you shouldn't have to do anything to register the switches in Home Assistant.
+Auto-discovery information is automatically published and you shoudn't have to do anything to register the switches in Home Assistant.
 
@@ -2,7 +2,7 @@

 This usermod-v2 modification allows the connection of multiple relays, each with individual delay and on/off mode.
 Usermod supports PCF8574 I2C port expander to reduce GPIO use.
-PCF8574 supports 8 outputs and each output corresponds to a relay in WLED (relay 0 = port 0, etc). I you are using more than 8 relays with multiple PCF8574 make sure their addresses are set in sequence (e.g. 0x20 and 0x21). You can set address of first expander in settings.
+PCF8574 supports 8 outputs and each output corresponds to a relay in WLED (relay 0 = port 0, etc). I you are using more than 8 relays with multiple PCF8574 make sure their addresses are set conscutively (e.g. 0x20 and 0x21). You can set address of first expander in settings.
 (**NOTE:** Will require Wire library and global I2C pins defined.)

 ## HTTP API
@@ -5,18 +5,14 @@
 #ifndef MULTI_RELAY_MAX_RELAYS
  #define MULTI_RELAY_MAX_RELAYS 4
 #else
-  #if MULTI_RELAY_MAX_RELAYS>8
+  #if MULTI_RELAY_MAX_RELAYS>16
    #undef MULTI_RELAY_MAX_RELAYS
-    #define MULTI_RELAY_MAX_RELAYS 8
-    #warning Maximum relays set to 8
+    #define MULTI_RELAY_MAX_RELAYS 16
  #endif
 #endif

 #ifndef MULTI_RELAY_PINS
  #define MULTI_RELAY_PINS -1
-  #define MULTI_RELAY_ENABLED false
-#else
-  #define MULTI_RELAY_ENABLED true
 #endif

 #define WLED_DEBOUNCE_THRESHOLD 50 //only consider button input of at least 50ms as valid (debouncing)
@@ -24,14 +20,6 @@
 #define ON  true
 #define OFF false

-#ifndef USERMOD_USE_PCF8574
-  #undef USE_PCF8574
-  #define USE_PCF8574 false
-#else
-  #undef USE_PCF8574
-  #define USE_PCF8574 true
-#endif
-
 #ifndef PCF8574_ADDRESS
  #define PCF8574_ADDRESS 0x20  // some may start at 0x38
 #endif
@@ -49,7 +37,7 @@ typedef struct relay_t {
  int8_t pin;
  struct { // reduces memory footprint
    bool active   : 1;  // is the relay waiting to be switched
-    bool invert   : 1;  // does On mean 1 or 0
+    bool mode     : 1;  // does On mean 1 or 0 (inverted output)
    bool state    : 1;  // 1 relay is On, 0 relay is Off
    bool external : 1;  // is the relay externally controlled
    int8_t button : 4;  // which button triggers relay
@@ -62,17 +50,23 @@ class MultiRelay : public Usermod {

  private:
    // array of relays
-    Relay    _relay[MULTI_RELAY_MAX_RELAYS];
+    Relay _relay[MULTI_RELAY_MAX_RELAYS];

-    uint32_t _switchTimerStart; // switch timer start time
-    bool     _oldMode;          // old brightness
-    bool     enabled;           // usermod enabled
-    bool     initDone;          // status of initialisation
-    bool     usePcf8574;
-    uint8_t  addrPcf8574;
-    bool     HAautodiscovery;
-    uint16_t periodicBroadcastSec;
-    unsigned long lastBroadcast;
+    // switch timer start time
+    uint32_t _switchTimerStart = 0;
+    // old brightness
+    bool _oldMode;
+
+    // usermod enabled
+    bool enabled = false;  // needs to be configured (no default config)
+    // status of initialisation
+    bool initDone = false;
+    bool usePcf8574  = false;
+    uint8_t addrPcf8574 = PCF8574_ADDRESS;
+    bool HAautodiscovery = false;
+
+    uint16_t periodicBroadcastSec = 60;
+    unsigned long lastBroadcast = 0;

    // strings to reduce flash memory usage (used more than twice)
    static const char _name[];
@@ -109,7 +103,7 @@ class MultiRelay : public Usermod {
    /**
     * desctructor
     */
-    //~MultiRelay() {}
+    ~MultiRelay() {}

    /**
     * Enable/Disable the usermod
@@ -202,7 +196,7 @@ class MultiRelay : public Usermod {
 };


-// class implementation
+// class implementetion

 void MultiRelay::publishMqtt(int relay) {
 #ifndef WLED_DISABLE_MQTT
@@ -319,7 +313,7 @@ int MultiRelay::getValue(String data, char separator, int index) {

 //Write a byte to the IO expander
 byte MultiRelay::IOexpanderWrite(byte address, byte _data ) {
-  Wire.beginTransmission(address);
+  Wire.beginTransmission(addrPcf8574 + address);
  Wire.write(_data);
  return Wire.endTransmission(); 
 }
@@ -327,7 +321,7 @@ byte MultiRelay::IOexpanderWrite(byte address, byte _data ) {
 //Read a byte from the IO expander
 byte MultiRelay::IOexpanderRead(int address) {
  byte _data = 0;
-  Wire.requestFrom(address, 1);
+  Wire.requestFrom(addrPcf8574 + address, 1);
  if (Wire.available()) {
    _data = Wire.read();
  }
@@ -337,21 +331,12 @@ byte MultiRelay::IOexpanderRead(int address) {

 // public methods

-MultiRelay::MultiRelay()
-  : _switchTimerStart(0)
-  , enabled(MULTI_RELAY_ENABLED)
-  , initDone(false)
-  , usePcf8574(USE_PCF8574)
-  , addrPcf8574(PCF8574_ADDRESS)
-  , HAautodiscovery(false)
-  , periodicBroadcastSec(60)
-  , lastBroadcast(0)
-{
+MultiRelay::MultiRelay() {
  const int8_t defPins[] = {MULTI_RELAY_PINS};
  for (size_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
    _relay[i].pin      = i<sizeof(defPins) ? defPins[i] : -1;
    _relay[i].delay    = 0;
-    _relay[i].invert   = false;
+    _relay[i].mode     = false;
    _relay[i].active   = false;
    _relay[i].state    = false;
    _relay[i].external = false;
@@ -363,27 +348,25 @@ MultiRelay::MultiRelay()
 * switch relay on/off
 */
 void MultiRelay::switchRelay(uint8_t relay, bool mode) {
-  if (relay>=MULTI_RELAY_MAX_RELAYS || _relay[relay].pin<0) return;
+  if (relay>=MULTI_RELAY_MAX_RELAYS || (_relay[relay].pin<0 && !usePcf8574)) return;
  _relay[relay].state = mode;
-  if (usePcf8574 && _relay[relay].pin >= 100) {
-    // we need to send all outputs at the same time
-    uint8_t state = 0;
-    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
-      if (_relay[i].pin < 100) continue;
-      uint8_t pin = _relay[i].pin - 100;
-      state |= (_relay[i].invert ? !_relay[i].state : _relay[i].state) << pin; // fill relay states for all pins
-    }
-    IOexpanderWrite(addrPcf8574, state);
-    DEBUG_PRINT(F("Writing to PCF8574: ")); DEBUG_PRINTLN(state);
-  } else if (_relay[relay].pin < 100) {
+  if (usePcf8574) {
+    byte expander = relay/8;
+    uint16_t state = 0;
+    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) state |= (uint16_t)_relay[i].state << i; // fill relay states for all pins
+    state = (mode ? !_relay[relay].mode : _relay[relay].mode) ? state | (1<<relay) : state & ~(1<<relay); // take into account invert mode
+    IOexpanderWrite(expander, state>>(8*expander));
+    DEBUG_PRINT(F("PCF8574 Writing to ")); DEBUG_PRINT(addrPcf8574 + expander); DEBUG_PRINT(F(" with data ")); DEBUG_PRINTLN(state>>(8*expander));
+  } else {
    pinMode(_relay[relay].pin, OUTPUT);
-    digitalWrite(_relay[relay].pin, _relay[relay].invert ? !_relay[relay].state : _relay[relay].state);
-  } else return;
+    digitalWrite(_relay[relay].pin, mode ? !_relay[relay].mode : _relay[relay].mode);
+  }
  publishMqtt(relay);
 }

 uint8_t MultiRelay::getActiveRelayCount() {
  uint8_t count = 0;
+  if (usePcf8574) return MULTI_RELAY_MAX_RELAYS;  // we don't know how many there are
  for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) if (_relay[i].pin>=0) count++;
  return count;
 }
@@ -482,28 +465,29 @@ void MultiRelay::publishHomeAssistantAutodiscovery() {
 void MultiRelay::setup() {
  // pins retrieved from cfg.json (readFromConfig()) prior to running setup()
  // if we want PCF8574 expander I2C pins need to be valid
-  if (i2c_sda<0 || i2c_scl<0) usePcf8574 = false;
+  if (i2c_sda == i2c_scl && i2c_sda == -1) usePcf8574 = false;

-  uint8_t state = 0;
-  for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
-    if (usePcf8574 && _relay[i].pin >= 100) {
-      uint8_t pin = _relay[i].pin - 100;
-      if (!_relay[i].external) _relay[i].state = !offMode;
-      state |= (uint8_t)(_relay[i].invert ? !_relay[i].state : _relay[i].state) << pin;
-    } else if (_relay[i].pin<100 && _relay[i].pin>=0) {
-      if (pinManager.allocatePin(_relay[i].pin,true, PinOwner::UM_MultiRelay)) {
+  if (usePcf8574) {
+    uint16_t state = 0;
+    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) state |= (uint16_t)(_relay[i].external ? (_relay[i].mode ? !_relay[i].state : _relay[i].state) : (_relay[i].mode ? !offMode : offMode)) << i; // fill relay states for all pins
+    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i += 8) {
+      byte expander = i/8;
+      IOexpanderWrite(expander, state>>(8*expander));  // init expander (set all outputs)
+      delay(1);
+    }
+    DEBUG_PRINTLN(F("PCF8574(s) inited."));
+  } else {
+    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
+      if (_relay[i].pin<0) continue;
+      if (!pinManager.allocatePin(_relay[i].pin,true, PinOwner::UM_MultiRelay)) {
+        _relay[i].pin = -1;  // allocation failed
+      } else {
        if (!_relay[i].external) _relay[i].state = !offMode;
        switchRelay(i, _relay[i].state);
        _relay[i].active = false;
-      } else {
-        _relay[i].pin = -1;  // allocation failed
      }
    }
  }
-  if (usePcf8574) {
-    IOexpanderWrite(addrPcf8574, state);  // init expander (set all outputs)
-    DEBUG_PRINTLN(F("PCF8574(s) inited."));
-  }
  _oldMode = offMode;
  initDone = true;
 }
@@ -512,10 +496,10 @@ void MultiRelay::setup() {
 * loop() is called continuously. Here you can check for events, read sensors, etc.
 */
 void MultiRelay::loop() {
-  static unsigned long lastUpdate = 0;
  yield();
-  if (!enabled || (strip.isUpdating() && millis() - lastUpdate < 100)) return;
+  if (!enabled || strip.isUpdating()) return;

+  static unsigned long lastUpdate = 0;
  if (millis() - lastUpdate < 100) return;  // update only 10 times/s
  lastUpdate = millis();

@@ -524,7 +508,7 @@ void MultiRelay::loop() {
    _oldMode = offMode;
    _switchTimerStart = millis();
    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
-      if ((_relay[i].pin>=0) && !_relay[i].external) _relay[i].active = true;
+      if ((_relay[i].pin>=0 || usePcf8574) && !_relay[i].external) _relay[i].active = true;
    }
  }

@@ -640,7 +624,7 @@ void MultiRelay::addToJsonInfo(JsonObject &root) {

    String uiDomString;
    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
-      if (_relay[i].pin<0 || !_relay[i].external) continue;
+      if ((_relay[i].pin<0 && !usePcf8574) || !_relay[i].external) continue;
      uiDomString = F("Relay "); uiDomString += i;
      JsonArray infoArr = user.createNestedArray(uiDomString); // timer value

@@ -731,7 +715,7 @@ void MultiRelay::addToConfig(JsonObject &root) {
    String parName = FPSTR(_relay_str); parName += '-'; parName += i;
    JsonObject relay = top.createNestedObject(parName);
    relay["pin"]              = _relay[i].pin;
-    relay[FPSTR(_activeHigh)] = _relay[i].invert;
+    relay[FPSTR(_activeHigh)] = _relay[i].mode;
    relay[FPSTR(_delay_str)]  = _relay[i].delay;
    relay[FPSTR(_external)]   = _relay[i].external;
    relay[FPSTR(_button)]     = _relay[i].button;
@@ -740,10 +724,9 @@ void MultiRelay::addToConfig(JsonObject &root) {
 }

 void MultiRelay::appendConfigData() {
-  oappend(SET_F("addInfo('MultiRelay:PCF8574-address',1,'<i>(not hex!)</i>');"));
+  oappend(SET_F("addInfo('MultiRelay:first-PCF8574',1,'<i>(not hex!)</i>','address');"));
  oappend(SET_F("addInfo('MultiRelay:broadcast-sec',1,'(MQTT message)');"));
-  //oappend(SET_F("addInfo('MultiRelay:relay-0:pin',1,'(use -1 for PCF8574)');"));
-  oappend(SET_F("d.extra.push({'MultiRelay':{pin:[['P0',100],['P1',101],['P2',102],['P3',103],['P4',104],['P5',105],['P6',106],['P7',107]]}});"));
+  oappend(SET_F("addInfo('MultiRelay:relay-0:pin',1,'(use -1 for PCF8574)');"));
 }

 /**
@@ -768,7 +751,7 @@ bool MultiRelay::readFromConfig(JsonObject &root) {
  usePcf8574 = top[FPSTR(_pcf8574)] | usePcf8574;
  addrPcf8574 = top[FPSTR(_pcfAddress)] | addrPcf8574;
  // if I2C is not globally initialised just ignore
-  if (i2c_sda<0 || i2c_scl<0) usePcf8574 = false;
+  if (i2c_sda == i2c_scl && i2c_sda == -1) usePcf8574 = false;
  periodicBroadcastSec = top[FPSTR(_broadcast)] | periodicBroadcastSec;
  periodicBroadcastSec = min(900,max(0,(int)periodicBroadcastSec));
  HAautodiscovery = top[FPSTR(_HAautodiscovery)] | HAautodiscovery;
@@ -777,14 +760,14 @@ bool MultiRelay::readFromConfig(JsonObject &root) {
    String parName = FPSTR(_relay_str); parName += '-'; parName += i;
    oldPin[i]          = _relay[i].pin;
    _relay[i].pin      = top[parName]["pin"] | _relay[i].pin;
-    _relay[i].invert   = top[parName][FPSTR(_activeHigh)] | _relay[i].invert;
+    _relay[i].mode     = top[parName][FPSTR(_activeHigh)] | _relay[i].mode;
    _relay[i].external = top[parName][FPSTR(_external)]   | _relay[i].external;
    _relay[i].delay    = top[parName][FPSTR(_delay_str)]  | _relay[i].delay;
    _relay[i].button   = top[parName][FPSTR(_button)]     | _relay[i].button;
    // begin backwards compatibility (beta) remove when 0.13 is released
    parName += '-';
    _relay[i].pin      = top[parName+"pin"] | _relay[i].pin;
-    _relay[i].invert   = top[parName+FPSTR(_activeHigh)] | _relay[i].invert;
+    _relay[i].mode     = top[parName+FPSTR(_activeHigh)] | _relay[i].mode;
    _relay[i].external = top[parName+FPSTR(_external)]   | _relay[i].external;
    _relay[i].delay    = top[parName+FPSTR(_delay_str)]  | _relay[i].delay;
    // end compatibility
@@ -798,11 +781,22 @@ bool MultiRelay::readFromConfig(JsonObject &root) {
  } else {
    // deallocate all pins 1st
    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++)
-      if (oldPin[i]>=0 && oldPin[i]<100) {
+      if (oldPin[i]>=0) {
        pinManager.deallocatePin(oldPin[i], PinOwner::UM_MultiRelay);
      }
    // allocate new pins
-    setup();
+    for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
+      if (_relay[i].pin>=0 && pinManager.allocatePin(_relay[i].pin, true, PinOwner::UM_MultiRelay)) {
+        if (!_relay[i].external) {
+          _relay[i].state = !offMode;
+          switchRelay(i, _relay[i].state);
+          _oldMode = offMode;
+        }
+      } else {
+        _relay[i].pin = -1;
+      }
+      _relay[i].active = false;
+    }
    DEBUG_PRINTLN(F(" config (re)loaded."));
  }
  // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
@@ -820,4 +814,4 @@ const char MultiRelay::_button[]          PROGMEM = "button";
 const char MultiRelay::_broadcast[]       PROGMEM = "broadcast-sec";
 const char MultiRelay::_HAautodiscovery[] PROGMEM = "HA-autodiscovery";
 const char MultiRelay::_pcf8574[]         PROGMEM = "use-PCF8574";
-const char MultiRelay::_pcfAddress[]      PROGMEM = "PCF8574-address";
+const char MultiRelay::_pcfAddress[]      PROGMEM = "first-PCF8574";
@@ -2,7 +2,7 @@
 The (un)official usermod to get the best out of the QuinLED-An-Penta (https://quinled.info/quinled-an-penta/), e.g. using the OLED and the SHT30 temperature/humidity sensor.

 ## Requirements
-* "u8g2" by olikraus, v2.28 or higher: https://github.com/olikraus/u8g2
+* "u8gs" by olikraus, v2.28 or higher: https://github.com/olikraus/u8g2
 * "SHT85" by Rob Tillaart, v0.2 or higher: https://github.com/RobTillaart/SHT85

 ## Usermod installation
@@ -20,7 +20,7 @@
  | `pinSourceSelect` | GPIO that is connected to SD's `SS`(source select) / `CS`(chip select)                           | 16      |
  | `pinSourceClock`  | GPIO that is connected to SD's `SCLK` (source clock) / `CLK`(clock)                              | 14      |
  | `pinPoci`         | GPIO that is connected to SD's `POCI`<sup>☨</sup> (Peripheral-Out-Ctrl-In) / `MISO` (deprecated) | 36      |
-  | `pinPico`         | GPIO that is connected to SD's `PICO`<sup>☨</sup> (Peripheral-In-Ctrl-Out) / `MOSI` (deprecated) | 15      |
+  | `pinPico`         | GPIO that is connected to SD's `PICO`<sup>☨</sup> (Peripheral-In-Ctrl-Out) / `MOSI` (deprecated) | 14      |
  | `sdEnable`        | Enable to read data from the SD-card                                                             | true    |

  <sup>☨</sup><sub>Following new naming convention of [OSHWA](https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/)</sub>
@@ -31,4 +31,4 @@
 -  checks if the specified file is available on the SD card
   ```cpp
   bool file_onSD(const char *filepath) {...}
-   ```
+   ```
@@ -6,6 +6,7 @@

 #include "wled.h"
 #include <Arduino.h>
+#include <Wire.h>
 #include <Adafruit_Sensor.h>
 #include <Adafruit_BMP280.h>
 #include <Adafruit_CCS811.h>
@@ -15,6 +16,14 @@ Adafruit_BMP280 bmp;
 Adafruit_Si7021 si7021;
 Adafruit_CCS811 ccs811;

+#ifdef ARDUINO_ARCH_ESP32 //ESP32 boards
+uint8_t SCL_PIN = 22;
+uint8_t SDA_PIN = 21;
+#else //ESP8266 boards
+uint8_t SCL_PIN = 5;
+uint8_t SDA_PIN = 4;
+#endif
+
 class UserMod_SensorsToMQTT : public Usermod
 {
 private:
@@ -222,6 +231,7 @@ public:
  void setup()
  {
    Serial.println("Starting!");
+    Wire.begin(SDA_PIN, SCL_PIN);
    Serial.println("Initializing sensors.. ");
    _initialize();
  }
@@ -17,7 +17,7 @@ The number of individual LEDs per segment. 7 segments per digit.
 #### perPeriod -- ssLEDPerPeriod
 The number of individual LEDs per period. A ':' (colon) has two periods.
 #### startIdx -- ssStartLED
-Index of the LED the display starts at. Enables a seven segment display to be in the middle of a string.
+Index of the LED the display starts at. Enabless a seven segment display to be in the middle of a string.
 #### timeEnable -- ssTimeEnabled
 When true, when displayMask is configured for a time output and no message is set, the time will be displayed.
 #### scrollSpd -- ssScrollSpeed
@@ -409,7 +409,7 @@ public:

    if (mqttGroupTopic[0] != 0)
    {
-      //subscribe for sevenseg messages on the group topic
+      //subcribe for sevenseg messages on the group topic
      sprintf_P(subBuffer, PSTR("%s/%S/+/set"), mqttGroupTopic, _str_sevenSeg);
      mqtt->subscribe(subBuffer, 2);
    }
@@ -417,7 +417,7 @@ public:

  bool onMqttMessage(char *topic, char *payload)
  {
-    //If topic beings with sevenSeg cut it off, otherwise not our message.
+    //If topic beings iwth sevenSeg cut it off, otherwise not our message.
    size_t topicPrefixLen = strlen_P(PSTR("/sevenSeg/"));
    if (strncmp_P(topic, PSTR("/sevenSeg/"), topicPrefixLen) == 0)
      topic += topicPrefixLen;
@@ -24,9 +24,6 @@ Enables the inverted mode in which the background should be enabled and the digi
 ### Colon-blinking
 Enables the blinking colon(s) if they are defined

-### Leading-Zero
-Shows the leading zero of the hour if it exists (i.e. shows `07` instead of `7`)
-
 ### enable-auto-brightness
 Enables the auto brightness feature. Can be used only when the usermod SN_Photoresistor is installed.

@@ -17,7 +17,6 @@ private:
  bool umSSDRDisplayTime = false;
  bool umSSDRInverted = false;
  bool umSSDRColonblink = true;
-  bool umSSDRLeadingZero = false;
  bool umSSDREnableLDR = false;
  String umSSDRHours = "";
  String umSSDRMinutes = "";
@@ -80,7 +79,6 @@ private:
  static const char _str_timeEnabled[];
  static const char _str_inverted[];
  static const char _str_colonblink[];
-  static const char _str_leadingZero[];
  static const char _str_displayMask[];
  static const char _str_hours[];
  static const char _str_minutes[];
@@ -107,15 +105,15 @@ private:
      switch (umSSDRDisplayMask[index]) {
        case 'h':
          timeVar = hourFormat12(localTime);
-          _showElements(&umSSDRHours, timeVar, 0, !umSSDRLeadingZero);
+          _showElements(&umSSDRHours, timeVar, 0, 1);
          break;
        case 'H':
          timeVar = hour(localTime);
-          _showElements(&umSSDRHours, timeVar, 0, !umSSDRLeadingZero);
+          _showElements(&umSSDRHours, timeVar, 0, 1);
          break;
        case 'k':
          timeVar = hour(localTime) + 1;
-          _showElements(&umSSDRHours, timeVar, 0, !umSSDRLeadingZero);
+          _showElements(&umSSDRHours, timeVar, 0, 0);
          break;
        case 'm':
          timeVar = minute(localTime);
@@ -311,9 +309,6 @@ private:
    if (_cmpIntSetting_P(topic, payload, _str_colonblink, &umSSDRColonblink)) {
      return true;
    }
-    if (_cmpIntSetting_P(topic, payload, _str_leadingZero, &umSSDRLeadingZero)) {
-      return true;
-    }
    if (strcmp_P(topic, _str_displayMask) == 0) {
      umSSDRDisplayMask = String(payload);
      _publishMQTTstr_P(_str_displayMask, umSSDRDisplayMask);
@@ -328,7 +323,6 @@ private:
    _publishMQTTint_P(_str_ldrEnabled, umSSDREnableLDR);
    _publishMQTTint_P(_str_inverted, umSSDRInverted);
    _publishMQTTint_P(_str_colonblink, umSSDRColonblink);
-    _publishMQTTint_P(_str_leadingZero, umSSDRLeadingZero);

    _publishMQTTstr_P(_str_hours, umSSDRHours);
    _publishMQTTstr_P(_str_minutes, umSSDRMinutes);
@@ -353,7 +347,6 @@ private:
    ssdrObj[FPSTR(_str_ldrEnabled)] = umSSDREnableLDR;
    ssdrObj[FPSTR(_str_inverted)] = umSSDRInverted;
    ssdrObj[FPSTR(_str_colonblink)] = umSSDRColonblink;
-    ssdrObj[FPSTR(_str_leadingZero)] = umSSDRLeadingZero;
    ssdrObj[FPSTR(_str_displayMask)] = umSSDRDisplayMask;
    ssdrObj[FPSTR(_str_hours)] = umSSDRHours;
    ssdrObj[FPSTR(_str_minutes)] = umSSDRMinutes;
@@ -432,8 +425,6 @@ public:
    invert.add(umSSDRInverted);
    JsonArray blink = user.createNestedArray("Blinking colon");
    blink.add(umSSDRColonblink);
-    JsonArray zero = user.createNestedArray("Show the hour leading zero");
-    zero.add(umSSDRLeadingZero);
    JsonArray ldrEnable = user.createNestedArray("Auto Brightness enabled");
    ldrEnable.add(umSSDREnableLDR);

@@ -463,7 +454,6 @@ public:
      umSSDREnableLDR = ssdrObj[FPSTR(_str_ldrEnabled)] | umSSDREnableLDR;
      umSSDRInverted = ssdrObj[FPSTR(_str_inverted)] | umSSDRInverted;
      umSSDRColonblink = ssdrObj[FPSTR(_str_colonblink)] | umSSDRColonblink;
-      umSSDRLeadingZero = ssdrObj[FPSTR(_str_leadingZero)] | umSSDRLeadingZero;
      umSSDRDisplayMask = ssdrObj[FPSTR(_str_displayMask)] | umSSDRDisplayMask;
    }
  }
@@ -480,14 +470,14 @@ public:

    if (mqttGroupTopic[0] != 0)
    {
-      //subscribe for sevenseg messages on the group topic
+      //subcribe for sevenseg messages on the group topic
      sprintf_P(subBuffer, PSTR("%s/%S/+/set"), mqttGroupTopic, _str_name);
      mqtt->subscribe(subBuffer, 2);
    }
  }

  bool onMqttMessage(char *topic, char *payload) {
-    //If topic begins with sevenSeg cut it off, otherwise not our message.
+    //If topic beings iwth sevenSeg cut it off, otherwise not our message.
    size_t topicPrefixLen = strlen_P(PSTR("/wledSS/"));
    if (strncmp_P(topic, PSTR("/wledSS/"), topicPrefixLen) == 0) {
      topic += topicPrefixLen;
@@ -526,7 +516,6 @@ public:
    umSSDREnableLDR        = (top[FPSTR(_str_ldrEnabled)] | umSSDREnableLDR);
    umSSDRInverted         = (top[FPSTR(_str_inverted)] | umSSDRInverted);
    umSSDRColonblink       = (top[FPSTR(_str_colonblink)] | umSSDRColonblink);
-    umSSDRLeadingZero      = (top[FPSTR(_str_leadingZero)] | umSSDRLeadingZero);

    umSSDRDisplayMask      = top[FPSTR(_str_displayMask)] | umSSDRDisplayMask;
    umSSDRHours            = top[FPSTR(_str_hours)] | umSSDRHours;
@@ -557,7 +546,6 @@ const char UsermodSSDR::_str_name[]        PROGMEM = "UsermodSSDR";
 const char UsermodSSDR::_str_timeEnabled[] PROGMEM = "enabled";
 const char UsermodSSDR::_str_inverted[]    PROGMEM = "inverted";
 const char UsermodSSDR::_str_colonblink[]  PROGMEM = "Colon-blinking";
-const char UsermodSSDR::_str_leadingZero[] PROGMEM = "Leading-Zero";
 const char UsermodSSDR::_str_displayMask[] PROGMEM = "Display-Mask";
 const char UsermodSSDR::_str_hours[]       PROGMEM = "LED-Numbers-Hours";
 const char UsermodSSDR::_str_minutes[]     PROGMEM = "LED-Numbers-Minutes";
@@ -16,6 +16,7 @@ class ShtUsermod : public Usermod
  private:
    bool enabled = false; // Is usermod enabled or not
    bool firstRunDone = false; // Remembers if the first config load run had been done
+    bool pinAllocDone = true; // Remembers if we have allocated pins
    bool initDone = false; // Remembers if the mod has been completely initialised
    bool haMqttDiscovery = false; // Is MQTT discovery enabled or not
    bool haMqttDiscoveryDone = false; // Remembers if we already published the HA discovery topics
@@ -93,7 +94,7 @@ void ShtUsermod::initShtTempHumiditySensor()
    case USERMOD_SHT_TYPE_SHT85: shtTempHumidSensor = (SHT *) new SHT85(); break;
  }

-  shtTempHumidSensor->begin(shtI2cAddress); // uses &Wire
+  shtTempHumidSensor->begin(shtI2cAddress, i2c_sda, i2c_scl);
  if (shtTempHumidSensor->readStatus() == 0xFFFF) {
    DEBUG_PRINTF("[%s] SHT init failed!\n", _name);
    cleanup();
@@ -131,6 +132,13 @@ void ShtUsermod::cleanupShtTempHumiditySensor()
 void ShtUsermod::cleanup()
 {
  cleanupShtTempHumiditySensor();
+
+  if (pinAllocDone) {
+    PinManagerPinType pins[2] = { { i2c_sda, true }, { i2c_scl, true } };
+    pinManager.deallocateMultiplePins(pins, 2, PinOwner::HW_I2C);
+    pinAllocDone = false;
+  }
+
  enabled = false;
 }

@@ -229,12 +237,14 @@ void ShtUsermod::appendDeviceToMqttDiscoveryMessage(JsonDocument& root) {
 void ShtUsermod::setup()
 {
  if (enabled) {
-    // GPIOs can be set to -1 , so check they're gt zero
-    if (i2c_sda < 0 || i2c_scl < 0) {
-      DEBUG_PRINTF("[%s] I2C bus not initialised!\n", _name);
+    PinManagerPinType pins[2] = { { i2c_sda, true }, { i2c_scl, true } };
+    // GPIOs can be set to -1 and allocateMultiplePins() will return true, so check they're gt zero
+    if (i2c_sda < 0 || i2c_scl < 0 || !pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) {
+      DEBUG_PRINTF("[%s] SHT pin allocation failed!\n", _name);
      cleanup();
      return;
    }
+    pinAllocDone = true;

    initShtTempHumiditySensor();

@@ -290,7 +300,7 @@ void ShtUsermod::loop()
 /**
 * Whenever MQTT is connected, publish HA autodiscovery topics.
 *
- * Is only done once.
+ * Is only donce once.
 *
 * @see Usermod::onMqttConnect()
 * @see UsermodManager::onMqttConnect()
@@ -91,8 +91,7 @@ class StairwayWipeUsermod : public Usermod {
    void startWipe()
    {
    bri = briLast; //turn on
-    jsonTransitionOnce = true;
-    strip.setTransition(0); //no transition
+    transitionDelayTemp = 0; //no transition
    effectCurrent = FX_MODE_COLOR_WIPE;
    resetTimebase(); //make sure wipe starts from beginning

@@ -106,11 +105,10 @@ class StairwayWipeUsermod : public Usermod {

    void turnOff()
    {
-    jsonTransitionOnce = true;
    #ifdef STAIRCASE_WIPE_OFF
-    strip.setTransition(0); //turn off immediately after wipe completed
+    transitionDelayTemp = 0; //turn off immediately after wipe completed
    #else
-    strip.setTransition(4000); //fade out slowly
+    transitionDelayTemp = 4000; //fade out slowly
    #endif
    bri = 0;
    stateUpdated(CALL_MODE_NOTIFICATION);
@@ -23,7 +23,7 @@ private:
  unsigned char Enc_B;
  unsigned char Enc_A_prev = 0;

-  // private class members configurable by Usermod Settings (defaults set inside readFromConfig())
+  // private class memebers configurable by Usermod Settings (defaults set inside readFromConfig())
  int8_t pins[3]; // pins[0] = DT from encoder, pins[1] = CLK from encoder, pins[2] = CLK from encoder (optional)
  int fadeAmount; // how many points to fade the Neopixel with each step

@@ -162,7 +162,7 @@ public:
   * - configComplete is used to return false if any value is missing, not just if the main object is missing
   * - The defaults are loaded every time readFromConfig() is run, not just once after boot
   * 
-   * This ensures that missing values are added to the config, with their default values, in the rare but plausible cases of:
+   * This ensures that missing values are added to the config, with their default values, in the rare but plauible cases of:
   * - a single value being missing at boot, e.g. if the Usermod was upgraded and a new setting was added
   * - a single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)
   * 
@@ -101,7 +101,7 @@ class AutoSaveUsermod : public Usermod {
    // network here
    void setup() {
      #ifdef USERMOD_FOUR_LINE_DISPLAY    
-      // This Usermod has enhanced functionality if
+      // This Usermod has enhanced funcionality if
      // FourLineDisplayUsermod is available.
      display = (FourLineDisplayUsermod*) usermods.lookup(USERMOD_ID_FOUR_LINE_DISP);
      #endif
@@ -148,7 +148,7 @@ class AutoSaveUsermod : public Usermod {

      if (autoSaveAfter && now > autoSaveAfter) {
        autoSaveAfter = 0;
-        // Time to auto save. You may have some flickery?
+        // Time to auto save. You may have some flickry?
        saveSettings();
        displayOverlay();
      }
@@ -23,7 +23,7 @@ This file should be placed in the same directory as `platformio.ini`.
 * `FLD_PIN_SCL`                - The display SCL pin, defaults to 5
 * `FLD_PIN_SDA`                - The display SDA pin, defaults to 4

-All of the parameters can be configured via the Usermods settings page, including GPIO pins.
+All of the parameters can be configured via the Usermods settings page, inluding GPIO pins.

 ### PlatformIO requirements

@@ -11,7 +11,7 @@
 // for WLED.
 //
 // Dependencies
-// * This usermod REQUIRES the ModeSortUsermod
+// * This usermod REQURES the ModeSortUsermod
 // * This Usermod works best, by far, when coupled 
 //   with RotaryEncoderUIUsermod.
 //
@@ -393,7 +393,7 @@ class FourLineDisplayUsermod : public Usermod {
        drawString(getCols() - 1, 0, "~");
      }

-      // Second row with IP or Password
+      // Second row with IP or Psssword
      drawGlyph(0, lineHeight, 68, u8x8_font_open_iconic_embedded_1x1); // wifi icon
      // Print password in AP mode and if led is OFF.
      if (apActive && bri == 0) {
@@ -10,7 +10,7 @@ curl --location --request GET 'http://[]/printer/objects/query?virtual_sdcard=pr
 ## Usage
 Compile the source with the buildflag  `-D USERMOD_KLIPPER_PERCENTAGE` added.

-You can also use the WLBD bot in the Discord by simply extending an existing build environment:
+You can also use the WLBD bot in the Discord by simply extending an exsisting build enviroment:
 ```
 [env:esp32klipper]
 extends = env:esp32dev
@@ -23,7 +23,7 @@ build_flags = ${common.build_flags_esp32} -D USERMOD_KLIPPER_PERCENTAGE
 Checkbox to enable or disable the overlay

 ### Klipper IP: 
-IP address of your Klipper instance you want to poll. ESP has to be restarted after change
+IP adress of your Klipper instance you want to poll. ESP has to be restarted after change

 ### Direction : 
 0 = normal
@@ -79,7 +79,7 @@ public:
          httpGet(wifiClient, errorMessage);
          if (strcmp(errorMessage, "") == 0)
          {
-            PSRAMDynamicJsonDocument klipperDoc(4096); // in practice about 2673
+            PSRAMDynamicJsonDocument klipperDoc(4096); // in practive about 2673
            DeserializationError error = deserializeJson(klipperDoc, wifiClient);
            if (error)
            {
@@ -7,4 +7,4 @@ Contains a modification to use WLED in combination with the Ping Pong Ball LED C
 To install this Usermod, you instruct PlatformIO to compile the Project with the USERMOD_PING_PONG_CLOCK flag.
 WLED then automatically provides you with various settings on the Usermod Page.

-Note: Depending on the size of your clock, you may have to update the led indices for the individual numbers and the base indices.
+Note: Depending on the size of your clock, you may have to update the led indices for the indivdual numbers and the base indices.
@@ -18,15 +18,15 @@ private:

  // ---- Variables for correct LED numbering below, edit only if your clock is built different ----

-  int baseH = 43;  // Address for the one place of the hours
-  int baseHH = 7;  // Address for the tens place of the hours
-  int baseM = 133; // Address for the one place of the minutes
-  int baseMM = 97; // Address for the tens place of the minutes
-  int colon1 = 79; // Address for the first colon led
-  int colon2 = 80; // Address for the second colon led
+  int baseH = 43;  // Adress for the one place of the hours
+  int baseHH = 7;  // Adress for the tens place of the hours
+  int baseM = 133; // Adress for the one place of the minutes
+  int baseMM = 97; // Adress for the tens place of the minutes
+  int colon1 = 79; // Adress for the first colon led
+  int colon2 = 80; // Adress for the second colon led

  // Matrix for the illumination of the numbers
-  // Note: These only define the increments of the base address. e.g. to define the second Minute you have to add the baseMM to every led position
+  // Note: These only define the increments of the base adress. e.g. to define the second Minute you have to add the baseMM to every led position
  const int numbers[10][10] = 
    {
      {  0,  1,  4,  6, 13, 15, 18, 19, -1, -1 }, // 0: null
@@ -20,7 +20,7 @@
 // Change between modes by pressing a button.
 //
 // Dependencies
-// * This usermod REQUIRES the ModeSortUsermod
+// * This usermod REQURES the ModeSortUsermod
 // * This Usermod works best coupled with 
 //   FourLineDisplayUsermod.
 //
@@ -8,7 +8,7 @@ active: enable/disable usermod
 diplayItIs: enable/disable display of "Es ist" on the clock
 ledOffset: number of LEDs before the wordclock LEDs

-### Update for alternative wiring pattern
+### Update for alternatative wiring pattern
 Based on this fantastic work I added an alternative wiring pattern.
 The original used a long wire to connect DO to DI, from one line to the next line.

@@ -7,8 +7,8 @@
 * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
 * 
 * This usermod can be used to drive a wordclock with a 11x10 pixel matrix with WLED. There are also 4 additional dots for the minutes. 
- * The visualisation is described in 4 mask with LED numbers (single dots for minutes, minutes, hours and "clock/Uhr").
- * There are 2 parameters to change the behaviour:
+ * The visualisation is desribed in 4 mask with LED numbers (single dots for minutes, minutes, hours and "clock/Uhr").
+ * There are 2 parameters to chnage the behaviour:
 * 
 * active: enable/disable usermod
 * diplayItIs: enable/disable display of "Es ist" on the clock.
@@ -1,22 +0,0 @@
-# Example PlatformIO Project Configuration Override for WireGuard
-# ------------------------------------------------------------------------------
-# Copy to platformio_override.ini to activate.
-# ------------------------------------------------------------------------------
-# Please visit documentation: https://docs.platformio.org/page/projectconf.html
-
-[platformio]
-default_envs = WLED_ESP32-WireGuard
-
-[env:WLED_ESP32-WireGuard]
-board = esp32dev
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} 
-   -D WLED_RELEASE_NAME=ESP32-WireGuard
-   -D USERMOD_WIREGUARD
-lib_deps = ${esp32.lib_deps}
-   https://github.com/kienvu58/WireGuard-ESP32-Arduino.git
-monitor_filters = esp32_exception_decoder
-board_build.partitions = ${esp32.default_partitions}
-upload_speed = 921600
@@ -1,19 +0,0 @@
-# WireGuard VPN
-
-This usermod will connect your WLED instance to a remote WireGuard subnet.
-
-Configuration is performed via the Usermod menu. There are no parameters to set in code!
-
-## Installation 
-
-Copy the `platformio_override.ini` file to the root project directory, review the build options, and select the `WLED_ESP32-WireGuard` environment.
-
-
-## Author
-
-Aiden Vigue [vigue.me](https://vigue.me)
-[@acvigue](https://github.com/acvigue)
-aiden@vigue.me
-
-
-
@@ -1,127 +0,0 @@
-#pragma once
-
-#include <WireGuard-ESP32.h>
-
-#include "wled.h"
-
-class WireguardUsermod : public Usermod {
-   public:
-    void setup() { configTzTime(posix_tz, ntpServerName); }
-
-    void connected() {
-        if (wg.is_initialized()) {
-            wg.end();
-        }
-    }
-
-    void loop() {
-        if (millis() - lastTime > 5000) {
-            if (is_enabled && WLED_CONNECTED) {
-                if (!wg.is_initialized()) {
-                    struct tm timeinfo;
-                    if (getLocalTime(&timeinfo, 0)) {
-                        if (strlen(preshared_key) < 1) {
-                            wg.begin(local_ip, private_key, endpoint_address, public_key, endpoint_port, NULL);
-                        } else {
-                            wg.begin(local_ip, private_key, endpoint_address, public_key, endpoint_port, preshared_key);
-                        }
-                    }
-                }
-            }
-
-            lastTime = millis();
-        }
-    }
-
-    void addToJsonInfo(JsonObject& root) {
-        JsonObject user = root["u"];
-        if (user.isNull()) user = root.createNestedObject("u");
-
-        JsonArray infoArr = user.createNestedArray(F("WireGuard"));
-        String uiDomString;
-
-        struct tm timeinfo;
-        if (!getLocalTime(&timeinfo, 0)) {
-            uiDomString = "Time out of sync!";
-        } else {
-            if (wg.is_initialized()) {
-                uiDomString = "netif up!";
-            } else {
-                uiDomString = "netif down :(";
-            }
-        }
-        if (is_enabled) infoArr.add(uiDomString);
-    }
-
-    void appendConfigData() {
-        oappend(SET_F("addInfo('WireGuard:host',1,'Server Hostname');"));           // 0 is field type, 1 is actual field
-        oappend(SET_F("addInfo('WireGuard:port',1,'Server Port');"));               // 0 is field type, 1 is actual field
-        oappend(SET_F("addInfo('WireGuard:ip',1,'Device IP');"));                   // 0 is field type, 1 is actual field
-        oappend(SET_F("addInfo('WireGuard:psk',1,'Pre Shared Key (optional)');"));  // 0 is field type, 1 is actual field
-        oappend(SET_F("addInfo('WireGuard:pem',1,'Private Key');"));                // 0 is field type, 1 is actual field
-        oappend(SET_F("addInfo('WireGuard:pub',1,'Public Key');"));                 // 0 is field type, 1 is actual field
-        oappend(SET_F("addInfo('WireGuard:tz',1,'POSIX timezone string');"));       // 0 is field type, 1 is actual field
-    }
-
-    void addToConfig(JsonObject& root) {
-        JsonObject top = root.createNestedObject(F("WireGuard"));
-        top[F("host")] = endpoint_address;
-        top[F("port")] = endpoint_port;
-        top[F("ip")] = local_ip.toString();
-        top[F("psk")] = preshared_key;
-        top[F("pem")] = private_key;
-        top[F("pub")] = public_key;
-        top[F("tz")] = posix_tz;
-    }
-
-    bool readFromConfig(JsonObject& root) {
-        JsonObject top = root[F("WireGuard")];
-
-        if (top["host"].isNull() || top["port"].isNull() || top["ip"].isNull() || top["pem"].isNull() || top["pub"].isNull() || top["tz"].isNull()) {
-            is_enabled = false;
-            return false;
-        } else {
-            const char* host = top["host"];
-            strncpy(endpoint_address, host, 100);
-
-            const char* ip_s = top["ip"];
-            uint8_t ip[4];
-            sscanf(ip_s, "%u.%u.%u.%u", &ip[0], &ip[1], &ip[2], &ip[3]);
-            local_ip = IPAddress(ip[0], ip[1], ip[2], ip[3]);
-
-            const char* pem = top["pem"];
-            strncpy(private_key, pem, 45);
-
-            const char* pub = top["pub"];
-            strncpy(public_key, pub, 45);
-
-            const char* tz = top["tz"];
-            strncpy(posix_tz, tz, 150);
-
-            endpoint_port = top["port"];
-
-            if (!top["psk"].isNull()) {
-                const char* psk = top["psk"];
-                strncpy(preshared_key, psk, 45);
-            }
-
-            is_enabled = true;
-        }
-
-        return is_enabled;
-    }
-
-    uint16_t getId() { return USERMOD_ID_WIREGUARD; }
-
-   private:
-    WireGuard wg;
-    char preshared_key[45];
-    char private_key[45];
-    IPAddress local_ip;
-    char public_key[45];
-    char endpoint_address[100];
-    char posix_tz[150];
-    int endpoint_port = 0;
-    bool is_enabled = false;
-    unsigned long lastTime = 0;
-};
@@ -1,6 +1,6 @@
 # Controlling Wiz lights

-Enables controlling [WiZ](https://www.wizconnected.com/en/consumer/) lights that are part of the same network as the WLED controller.
+Enabless controlling [WiZ](https://www.wizconnected.com/en/consumer/) lights that are part of the same network as the WLED controller.

 The mod takes the colors from the first few pixels and sends them to the lights.

@@ -8,7 +8,7 @@ The mod takes the colors from the first few pixels and sends them to the lights.

 - Interval (ms)
    - How frequently to update the WiZ lights, in milliseconds.
-    - Setting it too low may cause the ESP to become unresponsive.
+    - Setting it too low may causse the ESP to become unresponsive.
 - Send Delay (ms)
    - An optional millisecond delay after updating each WiZ light. 
    - Can help smooth out effects when using a large number of WiZ lights
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2046
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wled00", "wled00\wled00.vcxproj", "{C5F80730-F44F-4478-BDAE-6634EFC2CA88}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|x86.ActiveCfg = Debug|Win32
+		{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|x86.Build.0 = Debug|Win32
+		{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|x86.ActiveCfg = Release|Win32
+		{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9A679C2B-61D3-400B-B96F-06E604E9CED2}
+	EndGlobalSection
+EndGlobal
@@ -109,15 +109,20 @@
 #define PINK       (uint32_t)0xFF1493
 #define ULTRAWHITE (uint32_t)0xFFFFFFFF
 #define DARKSLATEGRAY (uint32_t)0x2F4F4F
-#define DARKSLATEGREY DARKSLATEGRAY
+#define DARKSLATEGREY (uint32_t)0x2F4F4F

-// segment options
+// options
+// bit    7: segment is in transition mode
+// bits 4-6: TBD
+// bit    3: mirror effect within segment
+// bit    2: segment is on
+// bit    1: reverse segment
+// bit    0: segment is selected
 #define NO_OPTIONS   (uint16_t)0x0000
-#define TRANSPOSED   (uint16_t)0x0100 // rotated 90deg & reversed
-#define MIRROR_Y_2D  (uint16_t)0x0080
-#define REVERSE_Y_2D (uint16_t)0x0040
-#define RESET_REQ    (uint16_t)0x0020
-#define FROZEN       (uint16_t)0x0010
+#define TRANSPOSED   (uint16_t)0x0400 // rotated 90deg & reversed
+#define REVERSE_Y_2D (uint16_t)0x0200
+#define MIRROR_Y_2D  (uint16_t)0x0100
+#define TRANSITIONAL (uint16_t)0x0080
 #define MIRROR       (uint16_t)0x0008
 #define SEGMENT_ON   (uint16_t)0x0004
 #define REVERSE      (uint16_t)0x0002
@@ -171,7 +176,7 @@
 #define FX_MODE_FIRE_FLICKER            45
 #define FX_MODE_GRADIENT                46
 #define FX_MODE_LOADING                 47
-#define FX_MODE_ROLLINGBALLS            48  //was Police before 0.14
+// #define FX_MODE_POLICE                  48  // removed in 0.14!
 #define FX_MODE_FAIRY                   49  //was Police All prior to 0.13.0-b6 (use "Two Dots" with Red/Blue and full intensity)
 #define FX_MODE_TWO_DOTS                50
 #define FX_MODE_FAIRYTWINKLE            51  //was Two Areas prior to 0.13.0-b6 (use "Two Dots" with full intensity)
@@ -324,7 +329,7 @@ typedef enum mapping1D2D {
  M12_pCorner = 3
 } mapping1D2D_t;

-// segment, 80 bytes
+// segment, 72 bytes
 typedef struct Segment {
  public:
    uint16_t start; // start index / start X coordinate 2D (left)
@@ -343,11 +348,12 @@ typedef struct Segment {
        bool    mirror      : 1;  //     3 : mirrored
        bool    freeze      : 1;  //     4 : paused/frozen
        bool    reset       : 1;  //     5 : indicates that Segment runtime requires reset
-        bool    reverse_y   : 1;  //     6 : reversed Y (2D)
-        bool    mirror_y    : 1;  //     7 : mirrored Y (2D)
-        bool    transpose   : 1;  //     8 : transposed (2D, swapped X & Y)
-        uint8_t map1D2D     : 3;  //  9-11 : mapping for 1D effect on 2D (0-use as strip, 1-expand vertically, 2-circular/arc, 3-rectangular/corner, ...)
-        uint8_t soundSim    : 2;  // 12-13 : 0-3 sound simulation types ("soft" & "hard" or "on"/"off")
+        bool    transitional: 1;  //     6 : transitional (there is transition occuring)
+        bool    reverse_y   : 1;  //     7 : reversed Y (2D)
+        bool    mirror_y    : 1;  //     8 : mirrored Y (2D)
+        bool    transpose   : 1;  //     9 : transposed (2D, swapped X & Y)
+        uint8_t map1D2D     : 3;  // 10-12 : mapping for 1D effect on 2D (0-use as strip, 1-expand vertically, 2-circular/arc, 3-rectangular/corner, ...)
+        uint8_t soundSim    : 1;  //    13 : 0-1 sound simulation types ("soft" & "hard" or "on"/"off")
        uint8_t set         : 2;  // 14-15 : 0-3 UI segment sets/groups
      };
    };
@@ -364,7 +370,7 @@ typedef struct Segment {
    };
    uint8_t startY;  // start Y coodrinate 2D (top); there should be no more than 255 rows
    uint8_t stopY;   // stop Y coordinate 2D (bottom); there should be no more than 255 rows
-    char    *name;
+    char *name;

    // runtime data
    unsigned long next_time;  // millis() of next update
@@ -372,33 +378,11 @@ typedef struct Segment {
    uint32_t call;  // call counter
    uint16_t aux0;  // custom var
    uint16_t aux1;  // custom var
-    byte     *data; // effect data pointer
+    byte* data;     // effect data pointer
+    CRGB* leds;     // local leds[] array (may be a pointer to global)
+    static CRGB *_globalLeds;             // global leds[] array
    static uint16_t maxWidth, maxHeight;  // these define matrix width & height (max. segment dimensions)

-    typedef struct TemporarySegmentData {
-      uint16_t _optionsT;
-      uint32_t _colorT[NUM_COLORS];
-      uint8_t  _speedT;
-      uint8_t  _intensityT;
-      uint8_t  _custom1T, _custom2T;   // custom FX parameters/sliders
-      struct {
-        uint8_t _custom3T : 5;        // reduced range slider (0-31)
-        bool    _check1T  : 1;        // checkmark 1
-        bool    _check2T  : 1;        // checkmark 2
-        bool    _check3T  : 1;        // checkmark 3
-      };
-      uint16_t _aux0T;
-      uint16_t _aux1T;
-      uint32_t _stepT;
-      uint32_t _callT;
-      uint8_t *_dataT;
-      uint16_t _dataLenT;
-      TemporarySegmentData()
-        : _dataT(nullptr) // just in case...
-        , _dataLenT(0)
-      {}
-    } tmpsegd_t;
-
  private:
    union {
      uint8_t  _capabilities;
@@ -410,37 +394,42 @@ typedef struct Segment {
        uint8_t _reserved : 4;
      };
    };
-    uint16_t        _dataLen;
+    uint16_t _dataLen;
    static uint16_t _usedSegmentData;

-    // perhaps this should be per segment, not static
-    static CRGBPalette16 _randomPalette;      // actual random palette
-    static CRGBPalette16 _newRandomPalette;   // target random palette
-    static unsigned long _lastPaletteChange;  // last random palette change time in millis()
-    #ifndef WLED_DISABLE_MODE_BLEND
-    static bool          _modeBlend;          // mode/effect blending semaphore
-    #endif
-
-    // transition data, valid only if transitional==true, holds values during transition (72 bytes)
+    // transition data, valid only if transitional==true, holds values during transition
    struct Transition {
-      #ifndef WLED_DISABLE_MODE_BLEND
-      tmpsegd_t     _segT;        // previous segment environment
-      uint8_t       _modeT;       // previous mode/effect
-      #else
      uint32_t      _colorT[NUM_COLORS];
-      #endif
      uint8_t       _briT;        // temporary brightness
      uint8_t       _cctT;        // temporary CCT
      CRGBPalette16 _palT;        // temporary palette
-      uint8_t       _prevPaletteBlends; // number of previous palette blends (there are max 255 blends possible)
-      unsigned long _start;       // must accommodate millis()
+      uint8_t       _prevPaletteBlends; // number of previous palette blends (there are max 255 belnds possible)
+      uint8_t       _modeP;       // previous mode/effect
+      //uint16_t      _aux0, _aux1; // previous mode/effect runtime data
+      //uint32_t      _step, _call; // previous mode/effect runtime data
+      //byte         *_data;        // previous mode/effect runtime data
+      uint32_t      _start;
      uint16_t      _dur;
      Transition(uint16_t dur=750)
-        : _palT(CRGBPalette16(CRGB::Black))
+        : _briT(255)
+        , _cctT(127)
+        , _palT(CRGBPalette16(CRGB::Black))
        , _prevPaletteBlends(0)
+        , _modeP(FX_MODE_STATIC)
        , _start(millis())
        , _dur(dur)
      {}
+      Transition(uint16_t d, uint8_t b, uint8_t c, const uint32_t *o)
+        : _briT(b)
+        , _cctT(c)
+        , _palT(CRGBPalette16(CRGB::Black))
+        , _prevPaletteBlends(0)
+        , _modeP(FX_MODE_STATIC)
+        , _start(millis())
+        , _dur(d)
+      {
+        for (size_t i=0; i<NUM_COLORS; i++) _colorT[i] = o[i];
+      }
    } *_t;

  public:
@@ -474,13 +463,12 @@ typedef struct Segment {
      aux0(0),
      aux1(0),
      data(nullptr),
+      leds(nullptr),
      _capabilities(0),
      _dataLen(0),
      _t(nullptr)
    {
-      #ifdef WLED_DEBUG
-      //Serial.printf("-- Creating segment: %p\n", this);
-      #endif
+      //refreshLightCapabilities();
    }

    Segment(uint16_t sStartX, uint16_t sStopX, uint16_t sStartY, uint16_t sStopY) : Segment(sStartX, sStopX) {
@@ -492,14 +480,16 @@ typedef struct Segment {
    Segment(Segment &&orig) noexcept; // move constructor

    ~Segment() {
-      #ifdef WLED_DEBUG
-      //Serial.printf("-- Destroying segment: %p\n", this);
+      //#ifdef WLED_DEBUG
+      //Serial.print(F("Destroying segment:"));
      //if (name) Serial.printf(" %s (%p)", name, name);
      //if (data) Serial.printf(" %d (%p)", (int)_dataLen, data);
+      //if (leds) Serial.printf(" [%u]", length()*sizeof(CRGB));
      //Serial.println();
-      #endif
-      if (name) { delete[] name; name = nullptr; }
-      stopTransition();
+      //#endif
+      if (!Segment::_globalLeds && leds) free(leds);
+      if (name) delete[] name;
+      if (_t) delete _t;
      deallocateData();
    }

@@ -507,31 +497,26 @@ typedef struct Segment {
    Segment& operator= (Segment &&orig) noexcept; // move assignment

 #ifdef WLED_DEBUG
-    size_t getSize() const { return sizeof(Segment) + (data?_dataLen:0) + (name?strlen(name):0) + (_t?sizeof(Transition):0); }
+    size_t getSize() const { return sizeof(Segment) + (data?_dataLen:0) + (name?strlen(name):0) + (_t?sizeof(Transition):0) + (!Segment::_globalLeds && leds?sizeof(CRGB)*length():0); }
 #endif

    inline bool     getOption(uint8_t n) const { return ((options >> n) & 0x01); }
    inline bool     isSelected(void)     const { return selected; }
-    inline bool     isInTransition(void) const { return _t != nullptr; }
    inline bool     isActive(void)       const { return stop > start; }
    inline bool     is2D(void)           const { return (width()>1 && height()>1); }
    inline bool     hasRGB(void)         const { return _isRGB; }
    inline bool     hasWhite(void)       const { return _hasW; }
    inline bool     isCCT(void)          const { return _isCCT; }
-    inline uint16_t width(void)          const { return isActive() ? (stop - start) : 0; }  // segment width in physical pixels (length if 1D)
-    inline uint16_t height(void)         const { return stopY - startY; }                   // segment height (if 2D) in physical pixels (it *is* always >=1)
-    inline uint16_t length(void)         const { return width() * height(); }               // segment length (count) in physical pixels
+    inline uint16_t width(void)          const { return stop - start; }       // segment width in physical pixels (length if 1D)
+    inline uint16_t height(void)         const { return stopY - startY; }     // segment height (if 2D) in physical pixels
+    inline uint16_t length(void)         const { return width() * height(); } // segment length (count) in physical pixels
    inline uint16_t groupLength(void)    const { return grouping + spacing; }
    inline uint8_t  getLightCapabilities(void) const { return _capabilities; }

    static uint16_t getUsedSegmentData(void)    { return _usedSegmentData; }
    static void     addUsedSegmentData(int len) { _usedSegmentData += len; }
-    #ifndef WLED_DISABLE_MODE_BLEND
-    static void     modeBlend(bool blend)       { _modeBlend = blend; }
-    #endif
-    static void     handleRandomPalette();

-    void    setUp(uint16_t i1, uint16_t i2, uint8_t grp=1, uint8_t spc=0, uint16_t ofs=UINT16_MAX, uint16_t i1Y=0, uint16_t i2Y=1, uint8_t segId = 255);
+    void    setUp(uint16_t i1, uint16_t i2, uint8_t grp=1, uint8_t spc=0, uint16_t ofs=UINT16_MAX, uint16_t i1Y=0, uint16_t i2Y=1);
    bool    setColor(uint8_t slot, uint32_t c); //returns true if changed
    void    setCCT(uint16_t k);
    void    setOpacity(uint8_t o);
@@ -553,26 +538,21 @@ typedef struct Segment {
      * Safe to call from interrupts and network requests.
      */
    inline void markForReset(void) { reset = true; }  // setOption(SEG_OPTION_RESET, true)
+    void setUpLeds(void);   // set up leds[] array for loseless getPixelColor()

    // transition functions
    void     startTransition(uint16_t dur); // transition has to start before actual segment values change
-    void     stopTransition(void);
    void     handleTransition(void);
-    #ifndef WLED_DISABLE_MODE_BLEND
-    void     swapSegenv(tmpsegd_t &tmpSegD);
-    void     restoreSegenv(tmpsegd_t &tmpSegD);
-    #endif
    uint16_t progress(void); //transition progression between 0-65535
-    uint8_t  currentBri(bool useCct = false);
-    uint8_t  currentMode(void);
-    uint32_t currentColor(uint8_t slot);
+    uint8_t  currentBri(uint8_t briNew, bool useCct = false);
+    uint8_t  currentMode(uint8_t modeNew);
+    uint32_t currentColor(uint8_t slot, uint32_t colorNew);
    CRGBPalette16 &loadPalette(CRGBPalette16 &tgt, uint8_t pal);
    CRGBPalette16 &currentPalette(CRGBPalette16 &tgt, uint8_t paletteID);

    // 1D strip
    uint16_t virtualLength(void) const;
    void setPixelColor(int n, uint32_t c); // set relative pixel within segment with color
-    void setPixelColor(unsigned n, uint32_t c)                    { setPixelColor(int(n), c); }
    void setPixelColor(int n, byte r, byte g, byte b, byte w = 0) { setPixelColor(n, RGBW32(r,g,b,w)); } // automatically inline
    void setPixelColor(int n, CRGB c)                             { setPixelColor(n, RGBW32(c.r,c.g,c.b,0)); } // automatically inline
    void setPixelColor(float i, uint32_t c, bool aa = true);
@@ -590,6 +570,7 @@ typedef struct Segment {
    void addPixelColor(int n, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColor(n, RGBW32(r,g,b,w), fast); } // automatically inline
    void addPixelColor(int n, CRGB c, bool fast = false)          { addPixelColor(n, RGBW32(c.r,c.g,c.b,0), fast); } // automatically inline
    void fadePixelColor(uint16_t n, uint8_t fade);
+    uint8_t get_random_wheel_index(uint8_t pos);
    uint32_t color_from_palette(uint16_t, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri = 255);
    uint32_t color_wheel(uint8_t pos);

@@ -598,9 +579,8 @@ typedef struct Segment {
    uint16_t virtualHeight(void) const;
    uint16_t nrOfVStrips(void) const;
  #ifndef WLED_DISABLE_2D
-    uint16_t XY(uint16_t x, uint16_t y); // support function to get relative index within segment
+    uint16_t XY(uint16_t x, uint16_t y); // support function to get relative index within segment (for leds[])
    void setPixelColorXY(int x, int y, uint32_t c); // set relative pixel within segment with color
-    void setPixelColorXY(unsigned x, unsigned y, uint32_t c)               { setPixelColorXY(int(x), int(y), c); }
    void setPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0) { setPixelColorXY(x, y, RGBW32(r,g,b,w)); } // automatically inline
    void setPixelColorXY(int x, int y, CRGB c)                             { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0)); } // automatically inline
    void setPixelColorXY(float x, float y, uint32_t c, bool aa = true);
@@ -624,9 +604,9 @@ typedef struct Segment {
    void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
-    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2 = 0, int8_t rotate = 0);
+    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2 = 0);
    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c) { drawCharacter(chr, x, y, w, h, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
-    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2, int8_t rotate = 0) { drawCharacter(chr, x, y, w, h, RGBW32(c.r,c.g,c.b,0), RGBW32(c2.r,c2.g,c2.b,0), rotate); } // automatic inline
+    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2) { drawCharacter(chr, x, y, w, h, RGBW32(c.r,c.g,c.b,0), RGBW32(c2.r,c2.g,c2.b,0)); } // automatic inline
    void wu_pixel(uint32_t x, uint32_t y, CRGB c);
    void blur1d(fract8 blur_amount); // blur all rows in 1 dimension
    void blur2d(fract8 blur_amount) { blur(blur_amount); }
@@ -656,9 +636,8 @@ typedef struct Segment {
    void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c) {}
    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c) {}
    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) {}
-    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t = 0, int8_t = 0) {}
+    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color) {}
    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB color) {}
-    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2, int8_t rotate = 0) {}
    void wu_pixel(uint32_t x, uint32_t y, CRGB c) {}
  #endif
 } segment;
@@ -713,15 +692,7 @@ class WS2812FX {  // 96 bytes
      customMappingSize(0),
      _lastShow(0),
      _segment_index(0),
-      _mainSegment(0),
-      _queuedChangesSegId(255),
-      _qStart(0),
-      _qStop(0),
-      _qStartY(0),
-      _qStopY(0),
-      _qGrouping(0),
-      _qSpacing(0),
-      _qOffset(0)
+      _mainSegment(0)
    {
      WS2812FX::instance = this;
      _mode.reserve(_modeCount);     // allocate memory to prevent initial fragmentation (does not increase size())
@@ -739,6 +710,7 @@ class WS2812FX {  // 96 bytes
      panel.clear();
 #endif
      customPalettes.clear();
+      if (useLedsArray && Segment::_globalLeds) free(Segment::_globalLeds);
    }

    static WS2812FX* getInstance(void) { return instance; }
@@ -777,7 +749,7 @@ class WS2812FX {  // 96 bytes
    inline void trigger(void) { _triggered = true; } // Forces the next frame to be computed on all active segments.
    inline void setShowCallback(show_callback cb) { _callback = cb; }
    inline void setTransition(uint16_t t) { _transitionDur = t; }
-    inline void appendSegment(const Segment &seg = Segment()) { if (_segments.size() < getMaxSegments()) _segments.push_back(seg); }
+    inline void appendSegment(const Segment &seg = Segment()) { _segments.push_back(seg); }

    bool
      checkSegmentAlignment(void),
@@ -785,7 +757,8 @@ class WS2812FX {  // 96 bytes
      hasCCTBus(void),
      // return true if the strip is being sent pixel updates
      isUpdating(void),
-      deserializeMap(uint8_t n=0);
+      deserializeMap(uint8_t n=0),
+      useLedsArray = false;

    inline bool isServicing(void) { return _isServicing; }
    inline bool hasWhiteChannel(void) {return _hasWhiteChannel;}
@@ -876,14 +849,16 @@ class WS2812FX {  // 96 bytes
    std::vector<Panel> panel;
 #endif

-    void setUpMatrix();
+    void
+      setUpMatrix(),
+      setPixelColorXY(int x, int y, uint32_t c);

    // outsmart the compiler :) by correctly overloading
-    inline void setPixelColorXY(int x, int y, uint32_t c)   { setPixelColor(y * Segment::maxWidth + x, c); }
-    inline void setPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0) { setPixelColorXY(x, y, RGBW32(r,g,b,w)); }
-    inline void setPixelColorXY(int x, int y, CRGB c)       { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0)); }
+    inline void setPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0) { setPixelColorXY(x, y, RGBW32(r,g,b,w)); } // automatically inline
+    inline void setPixelColorXY(int x, int y, CRGB c)                             { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0)); }

-    inline uint32_t getPixelColorXY(uint16_t x, uint16_t y) { return getPixelColor(isMatrix ? y * Segment::maxWidth + x : x);}
+    uint32_t
+      getPixelColorXY(uint16_t, uint16_t);

  // end 2D support

@@ -925,20 +900,13 @@ class WS2812FX {  // 96 bytes
    uint16_t* customMappingTable;
    uint16_t  customMappingSize;

-    unsigned long _lastShow;
+    uint32_t _lastShow;

    uint8_t _segment_index;
    uint8_t _mainSegment;
-    uint8_t _queuedChangesSegId;
-    uint16_t _qStart, _qStop, _qStartY, _qStopY;
-    uint8_t _qGrouping, _qSpacing;
-    uint16_t _qOffset;
-
-    uint8_t
-      estimateCurrentAndLimitBri(void);

    void
-      setUpSegmentFromQueuedChanges(void);
+      estimateCurrentAndLimitBri(void);
 };

 extern const char JSON_mode_names[];
@@ -134,7 +134,7 @@ void WS2812FX::setUpMatrix() {

      #ifdef WLED_DEBUG
      DEBUG_PRINT(F("Matrix ledmap:"));
-      for (unsigned i=0; i<customMappingSize; i++) {
+      for (uint16_t i=0; i<customMappingSize; i++) {
        if (!(i%Segment::maxWidth)) DEBUG_PRINTLN();
        DEBUG_PRINTF("%4d,", customMappingTable[i]);
      }
@@ -155,6 +155,31 @@ void WS2812FX::setUpMatrix() {
 #endif
 }

+// absolute matrix version of setPixelColor()
+void /*IRAM_ATTR*/ WS2812FX::setPixelColorXY(int x, int y, uint32_t col)
+{
+#ifndef WLED_DISABLE_2D
+  if (!isMatrix) return; // not a matrix set-up
+  uint16_t index = y * Segment::maxWidth + x;
+#else
+  uint16_t index = x;
+#endif
+  if (index < customMappingSize) index = customMappingTable[index];
+  if (index >= _length) return;
+  busses.setPixelColor(index, col);
+}
+
+// returns RGBW values of pixel
+uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) {
+#ifndef WLED_DISABLE_2D
+  uint16_t index = (y * Segment::maxWidth + x);
+#else
+  uint16_t index = x;
+#endif
+  if (index < customMappingSize) index = customMappingTable[index];
+  if (index >= _length) return 0;
+  return busses.getPixelColor(index);
+}

 ///////////////////////////////////////////////////////////
 // Segment:: routines
@@ -163,19 +188,21 @@ void WS2812FX::setUpMatrix() {
 #ifndef WLED_DISABLE_2D

 // XY(x,y) - gets pixel index within current segment (often used to reference leds[] array element)
-uint16_t IRAM_ATTR Segment::XY(uint16_t x, uint16_t y)
-{
-  uint16_t width  = virtualWidth();   // segment width in logical pixels (can be 0 if segment is inactive)
-  uint16_t height = virtualHeight();  // segment height in logical pixels (is always >= 1)
-  return isActive() ? (x%width) + (y%height) * width : 0;
+uint16_t /*IRAM_ATTR*/ Segment::XY(uint16_t x, uint16_t y) {
+  uint16_t width  = virtualWidth();   // segment width in logical pixels
+  uint16_t height = virtualHeight();  // segment height in logical pixels
+  return (x%width) + (y%height) * width;
 }

-void IRAM_ATTR Segment::setPixelColorXY(int x, int y, uint32_t col)
+void /*IRAM_ATTR*/ Segment::setPixelColorXY(int x, int y, uint32_t col)
 {
-  if (!isActive()) return; // not active
+  if (Segment::maxHeight==1) return; // not a matrix set-up
  if (x >= virtualWidth() || y >= virtualHeight() || x<0 || y<0) return;  // if pixel would fall out of virtual segment just exit

-  uint8_t _bri_t = currentBri();
+  if (leds) leds[XY(x,y)] = col;
+
+  uint8_t _bri_t = currentBri(on ? opacity : 0);
+  if (!_bri_t && !transitional) return;
  if (_bri_t < 255) {
    byte r = scale8(R(col), _bri_t);
    byte g = scale8(G(col), _bri_t);
@@ -192,29 +219,23 @@ void IRAM_ATTR Segment::setPixelColorXY(int x, int y, uint32_t col)
  y *= groupLength(); // expand to physical pixels
  if (x >= width() || y >= height()) return;  // if pixel would fall out of segment just exit

-  uint32_t tmpCol = col;
  for (int j = 0; j < grouping; j++) {   // groupping vertically
    for (int g = 0; g < grouping; g++) { // groupping horizontally
      uint16_t xX = (x+g), yY = (y+j);
      if (xX >= width() || yY >= height()) continue; // we have reached one dimension's end

-#ifndef WLED_DISABLE_MODE_BLEND
-      // if blending modes, blend with underlying pixel
-      if (_modeBlend) tmpCol = color_blend(strip.getPixelColorXY(start + xX, startY + yY), col, 0xFFFFU - progress(), true);
-#endif
-
-      strip.setPixelColorXY(start + xX, startY + yY, tmpCol);
+      strip.setPixelColorXY(start + xX, startY + yY, col);

      if (mirror) { //set the corresponding horizontally mirrored pixel
-        if (transpose) strip.setPixelColorXY(start + xX, startY + height() - yY - 1, tmpCol);
-        else           strip.setPixelColorXY(start + width() - xX - 1, startY + yY, tmpCol);
+        if (transpose) strip.setPixelColorXY(start + xX, startY + height() - yY - 1, col);
+        else           strip.setPixelColorXY(start + width() - xX - 1, startY + yY, col);
      }
      if (mirror_y) { //set the corresponding vertically mirrored pixel
-        if (transpose) strip.setPixelColorXY(start + width() - xX - 1, startY + yY, tmpCol);
-        else           strip.setPixelColorXY(start + xX, startY + height() - yY - 1, tmpCol);
+        if (transpose) strip.setPixelColorXY(start + width() - xX - 1, startY + yY, col);
+        else           strip.setPixelColorXY(start + xX, startY + height() - yY - 1, col);
      }
      if (mirror_y && mirror) { //set the corresponding vertically AND horizontally mirrored pixel
-        strip.setPixelColorXY(width() - xX - 1, height() - yY - 1, tmpCol);
+        strip.setPixelColorXY(width() - xX - 1, height() - yY - 1, col);
      }
    }
  }
@@ -223,7 +244,7 @@ void IRAM_ATTR Segment::setPixelColorXY(int x, int y, uint32_t col)
 // anti-aliased version of setPixelColorXY()
 void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa)
 {
-  if (!isActive()) return; // not active
+  if (Segment::maxHeight==1) return; // not a matrix set-up
  if (x<0.0f || x>1.0f || y<0.0f || y>1.0f) return; // not normalized

  const uint16_t cols = virtualWidth();
@@ -266,8 +287,8 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa)

 // returns RGBW values of pixel
 uint32_t Segment::getPixelColorXY(uint16_t x, uint16_t y) {
-  if (!isActive()) return 0; // not active
-  if (x >= virtualWidth() || y >= virtualHeight() || x<0 || y<0) return 0;  // if pixel would fall out of virtual segment just exit
+  int i = XY(x,y);
+  if (leds) return RGBW32(leds[i].r, leds[i].g, leds[i].b, 0);
  if (reverse  ) x = virtualWidth()  - x - 1;
  if (reverse_y) y = virtualHeight() - y - 1;
  if (transpose) { uint16_t t = x; x = y; y = t; } // swap X & Y if segment transposed
@@ -284,75 +305,80 @@ void Segment::blendPixelColorXY(uint16_t x, uint16_t y, uint32_t color, uint8_t

 // Adds the specified color with the existing pixel color perserving color balance.
 void Segment::addPixelColorXY(int x, int y, uint32_t color, bool fast) {
-  if (!isActive()) return; // not active
-  if (x >= virtualWidth() || y >= virtualHeight() || x<0 || y<0) return;  // if pixel would fall out of virtual segment just exit
-  setPixelColorXY(x, y, color_add(getPixelColorXY(x,y), color, fast));
+  uint32_t col = getPixelColorXY(x,y);
+  uint8_t r = R(col);
+  uint8_t g = G(col);
+  uint8_t b = B(col);
+  uint8_t w = W(col);
+  if (fast) {
+    r = qadd8(r, R(color));
+    g = qadd8(g, G(color));
+    b = qadd8(b, B(color));
+    w = qadd8(w, W(color));
+    col = RGBW32(r,g,b,w);
+  } else {
+    col = color_add(col, color);
+  }
+  setPixelColorXY(x, y, col);
 }

 void Segment::fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade) {
-  if (!isActive()) return; // not active
-  setPixelColorXY(x, y, color_fade(getPixelColorXY(x,y), fade, true));
+  CRGB pix = CRGB(getPixelColorXY(x,y)).nscale8_video(fade);
+  setPixelColorXY(x, y, pix);
 }

 // blurRow: perform a blur on a row of a rectangular matrix
 void Segment::blurRow(uint16_t row, fract8 blur_amount) {
-  if (!isActive() || blur_amount == 0) return; // not active
-  const uint_fast16_t cols = virtualWidth();
-  const uint_fast16_t rows = virtualHeight();
+  const uint16_t cols = virtualWidth();
+  const uint16_t rows = virtualHeight();

  if (row >= rows) return;
  // blur one row
  uint8_t keep = 255 - blur_amount;
  uint8_t seep = blur_amount >> 1;
  CRGB carryover = CRGB::Black;
-  for (unsigned x = 0; x < cols; x++) {
+  for (uint16_t x = 0; x < cols; x++) {
    CRGB cur = getPixelColorXY(x, row);
-    CRGB before = cur;     // remember color before blur
    CRGB part = cur;
    part.nscale8(seep);
    cur.nscale8(keep);
    cur += carryover;
-    if (x>0) {
+    if (x) {
      CRGB prev = CRGB(getPixelColorXY(x-1, row)) + part;
      setPixelColorXY(x-1, row, prev);
    }
-    if (before != cur)         // optimization: only set pixel if color has changed
-      setPixelColorXY(x, row, cur);
+    setPixelColorXY(x, row, cur);
    carryover = part;
  }
 }

 // blurCol: perform a blur on a column of a rectangular matrix
 void Segment::blurCol(uint16_t col, fract8 blur_amount) {
-  if (!isActive() || blur_amount == 0) return; // not active
-  const uint_fast16_t cols = virtualWidth();
-  const uint_fast16_t rows = virtualHeight();
+  const uint16_t cols = virtualWidth();
+  const uint16_t rows = virtualHeight();

  if (col >= cols) return;
  // blur one column
  uint8_t keep = 255 - blur_amount;
  uint8_t seep = blur_amount >> 1;
  CRGB carryover = CRGB::Black;
-  for (unsigned y = 0; y < rows; y++) {
-    CRGB cur = getPixelColorXY(col, y);
+  for (uint16_t i = 0; i < rows; i++) {
+    CRGB cur = getPixelColorXY(col, i);
    CRGB part = cur;
-    CRGB before = cur;     // remember color before blur
    part.nscale8(seep);
    cur.nscale8(keep);
    cur += carryover;
-    if (y>0) {
-      CRGB prev = CRGB(getPixelColorXY(col, y-1)) + part;
-      setPixelColorXY(col, y-1, prev);
+    if (i) {
+      CRGB prev = CRGB(getPixelColorXY(col, i-1)) + part;
+      setPixelColorXY(col, i-1, prev);
    }
-    if (before != cur)         // optimization: only set pixel if color has changed
-      setPixelColorXY(col, y, cur);
+    setPixelColorXY(col, i, cur);
    carryover = part;
  }
 }

 // 1D Box blur (with added weight - blur_amount: [0=no blur, 255=max blur])
 void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
-  if (!isActive() || blur_amount == 0) return; // not active
  const uint16_t cols = virtualWidth();
  const uint16_t rows = virtualHeight();
  const uint16_t dim1 = vertical ? rows : cols;
@@ -362,11 +388,11 @@ void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
  const float keep = 3.f - 2.f*seep;
  // 1D box blur
  CRGB tmp[dim1];
-  for (int j = 0; j < dim1; j++) {
+  for (uint16_t j = 0; j < dim1; j++) {
    uint16_t x = vertical ? i : j;
    uint16_t y = vertical ? j : i;
-    int16_t xp = vertical ? x : x-1;  // "signed" to prevent underflow
-    int16_t yp = vertical ? y-1 : y;  // "signed" to prevent underflow
+    uint16_t xp = vertical ? x : x-1;
+    uint16_t yp = vertical ? y-1 : y;
    uint16_t xn = vertical ? x : x+1;
    uint16_t yn = vertical ? y+1 : y;
    CRGB curr = getPixelColorXY(x,y);
@@ -378,7 +404,7 @@ void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
    b = (curr.b*keep + (prev.b + next.b)*seep) / 3;
    tmp[j] = CRGB(r,g,b);
  }
-  for (int j = 0; j < dim1; j++) {
+  for (uint16_t j = 0; j < dim1; j++) {
    uint16_t x = vertical ? i : j;
    uint16_t y = vertical ? j : i;
    setPixelColorXY(x, y, tmp[j]);
@@ -401,11 +427,10 @@ void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {

 void Segment::blur1d(fract8 blur_amount) {
  const uint16_t rows = virtualHeight();
-  for (unsigned y = 0; y < rows; y++) blurRow(y, blur_amount);
+  for (uint16_t y = 0; y < rows; y++) blurRow(y, blur_amount);
 }

 void Segment::moveX(int8_t delta, bool wrap) {
-  if (!isActive()) return; // not active
  const uint16_t cols = virtualWidth();
  const uint16_t rows = virtualHeight();
  if (!delta || abs(delta) >= cols) return;
@@ -423,7 +448,6 @@ void Segment::moveX(int8_t delta, bool wrap) {
 }

 void Segment::moveY(int8_t delta, bool wrap) {
-  if (!isActive()) return; // not active
  const uint16_t cols = virtualWidth();
  const uint16_t rows = virtualHeight();
  if (!delta || abs(delta) >= rows) return;
@@ -459,7 +483,6 @@ void Segment::move(uint8_t dir, uint8_t delta, bool wrap) {
 }

 void Segment::draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
-  if (!isActive() || radius == 0) return; // not active
  // Bresenham’s Algorithm
  int d = 3 - (2*radius);
  int y = radius, x = 0;
@@ -484,7 +507,6 @@ void Segment::draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {

 // by stepko, taken from https://editor.soulmatelights.com/gallery/573-blobs
 void Segment::fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
-  if (!isActive() || radius == 0) return; // not active
  const uint16_t cols = virtualWidth();
  const uint16_t rows = virtualHeight();
  for (int16_t y = -radius; y <= radius; y++) {
@@ -498,17 +520,15 @@ void Segment::fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
 }

 void Segment::nscale8(uint8_t scale) {
-  if (!isActive()) return; // not active
  const uint16_t cols = virtualWidth();
  const uint16_t rows = virtualHeight();
-  for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) {
+  for(uint16_t y = 0; y < rows; y++) for (uint16_t x = 0; x < cols; x++) {
    setPixelColorXY(x, y, CRGB(getPixelColorXY(x, y)).nscale8(scale));
  }
 }

 //line function
 void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c) {
-  if (!isActive()) return; // not active
  const uint16_t cols = virtualWidth();
  const uint16_t rows = virtualHeight();
  if (x0 >= cols || x1 >= cols || y0 >= rows || y1 >= rows) return;
@@ -532,8 +552,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3

 // draws a raster font character on canvas
 // only supports: 4x6=24, 5x8=40, 5x12=60, 6x8=48 and 7x9=63 fonts ATM
-void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, int8_t rotate) {
-  if (!isActive()) return; // not active
+void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2) {
  if (chr < 32 || chr > 126) return; // only ASCII 32-126 supported
  chr -= 32; // align with font table entries
  const uint16_t cols = virtualWidth();
@@ -545,6 +564,9 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,

  //if (w<5 || w>6 || h!=8) return;
  for (int i = 0; i<h; i++) { // character height
+    int16_t y0 = y + i;
+    if (y0 < 0) continue; // drawing off-screen
+    if (y0 >= rows) break; // drawing off-screen
    uint8_t bits = 0;
    switch (font) {
      case 24: bits = pgm_read_byte_near(&console_font_4x6[(chr * h) + i]); break;  // 5x8 font
@@ -556,16 +578,8 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
    }
    col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
    for (int j = 0; j<w; j++) { // character width
-      int x0, y0;
-      switch (rotate) {
-        case -1: x0 = x + (h-1) - i; y0 = y + (w-1) - j; break; // -90 deg
-        case -2:
-        case  2: x0 = x + j;         y0 = y + (h-1) - i; break; // 180 deg
-        case  1: x0 = x + i;         y0 = y + j;         break; // +90 deg
-        default: x0 = x + (w-1) - j; y0 = y + i;         break; // no rotation
-      }
-      if (x0 < 0 || x0 >= cols || y0 < 0 || y0 >= rows) continue; // drawing off-screen
-      if (((bits>>(j+(8-w))) & 0x01)) { // bit set
+      int16_t x0 = x + (w-1) - j;
+      if ((x0 >= 0 || x0 < cols) && ((bits>>(j+(8-w))) & 0x01)) { // bit set & drawing on-screen
        setPixelColorXY(x0, y0, col);
      }
    }
@@ -574,7 +588,6 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,

 #define WU_WEIGHT(a,b) ((uint8_t) (((a)*(b)+(a)+(b))>>8))
 void Segment::wu_pixel(uint32_t x, uint32_t y, CRGB c) {      //awesome wu_pixel procedure by reddit u/sutaburosu
-  if (!isActive()) return; // not active
  // extract the fractional parts and derive their inverses
  uint8_t xx = x & 0xff, yy = y & 0xff, ix = 255 - xx, iy = 255 - yy;
  // calculate the intensities for each affected pixel
@@ -9,9 +9,9 @@
 #include <IPAddress.h>

 #define NODE_TYPE_ID_UNDEFINED        0
-#define NODE_TYPE_ID_ESP8266         82 // should be 1
-#define NODE_TYPE_ID_ESP32           32 // should be 2
-#define NODE_TYPE_ID_ESP32S2         33 // etc
+#define NODE_TYPE_ID_ESP8266         82
+#define NODE_TYPE_ID_ESP32           32
+#define NODE_TYPE_ID_ESP32S2         33
 #define NODE_TYPE_ID_ESP32S3         34
 #define NODE_TYPE_ID_ESP32C3         35

@@ -23,13 +23,7 @@ struct NodeStruct
  String    nodeName;
  IPAddress ip;
  uint8_t   age;
-  union {
-    uint8_t nodeType;   // a waste of space as we only have 5 types
-    struct {
-      uint8_t type : 7; // still a waste of space (4 bits would be enough and future-proof)
-      bool    on   : 1;
-    };
-  };
+  uint8_t   nodeType;
  uint32_t  build;

  NodeStruct() : age(0), nodeType(0), build(0)
@@ -64,7 +64,7 @@ void ColorOrderMap::add(uint16_t start, uint16_t len, uint8_t colorOrder) {

 uint8_t IRAM_ATTR ColorOrderMap::getPixelColorOrder(uint16_t pix, uint8_t defaultColorOrder) const {
  if (_count == 0) return defaultColorOrder;
-  // upper nibble contains W swap information
+  // upper nibble containd W swap information
  uint8_t swapW = defaultColorOrder >> 4;
  for (uint8_t i = 0; i < _count; i++) {
    if (pix >= _mappings[i].start && pix < (_mappings[i].start + _mappings[i].len)) {
@@ -77,7 +77,7 @@ uint8_t IRAM_ATTR ColorOrderMap::getPixelColorOrder(uint16_t pix, uint8_t defaul

 uint32_t Bus::autoWhiteCalc(uint32_t c) {
  uint8_t aWM = _autoWhiteMode;
-  if (_gAWM != AW_GLOBAL_DISABLED) aWM = _gAWM;
+  if (_gAWM < 255) aWM = _gAWM;
  if (aWM == RGBW_MODE_MANUAL_ONLY) return c;
  uint8_t w = W(c);
  //ignore auto-white calculation if w>0 and mode DUAL (DUAL behaves as BRIGHTER if w==0)
@@ -91,172 +91,96 @@ uint32_t Bus::autoWhiteCalc(uint32_t c) {
  return RGBW32(r, g, b, w);
 }

-uint8_t *Bus::allocData(size_t size) {
-  if (_data) free(_data); // should not happen, but for safety
-  return _data = (uint8_t *)(size>0 ? calloc(size, sizeof(uint8_t)) : nullptr);
-}

-
-BusDigital::BusDigital(BusConfig &bc, uint8_t nr, const ColorOrderMap &com)
-: Bus(bc.type, bc.start, bc.autoWhite, bc.count, bc.reversed, (bc.refreshReq || bc.type == TYPE_TM1814))
-, _skip(bc.skipAmount) //sacrificial pixels
-, _colorOrder(bc.colorOrder)
-, _colorOrderMap(com)
-{
+BusDigital::BusDigital(BusConfig &bc, uint8_t nr, const ColorOrderMap &com) : Bus(bc.type, bc.start, bc.autoWhite), _colorOrderMap(com) {
  if (!IS_DIGITAL(bc.type) || !bc.count) return;
  if (!pinManager.allocatePin(bc.pins[0], true, PinOwner::BusDigital)) return;
  _frequencykHz = 0U;
  _pins[0] = bc.pins[0];
  if (IS_2PIN(bc.type)) {
    if (!pinManager.allocatePin(bc.pins[1], true, PinOwner::BusDigital)) {
-      cleanup();
-      return;
+    cleanup(); return;
    }
    _pins[1] = bc.pins[1];
    _frequencykHz = bc.frequency ? bc.frequency : 2000U; // 2MHz clock if undefined
  }
+  reversed = bc.reversed;
+  _needsRefresh = bc.refreshReq || bc.type == TYPE_TM1814;
+  _skip = bc.skipAmount;    //sacrificial pixels
+  _len = bc.count + _skip;
  _iType = PolyBus::getI(bc.type, _pins, nr);
  if (_iType == I_NONE) return;
-  if (bc.doubleBuffer && !allocData(bc.count * (Bus::hasWhite(_type) + 3*Bus::hasRGB(_type)))) return; //warning: hardcoded channel count
-  _buffering = bc.doubleBuffer;
-  uint16_t lenToCreate = bc.count;
-  if (bc.type == TYPE_WS2812_1CH_X3) lenToCreate = NUM_ICS_WS2812_1CH_3X(bc.count); // only needs a third of "RGB" LEDs for NeoPixelBus
-  _busPtr = PolyBus::create(_iType, _pins, lenToCreate + _skip, nr, _frequencykHz);
+  uint16_t lenToCreate = _len;
+  if (bc.type == TYPE_WS2812_1CH_X3) lenToCreate = NUM_ICS_WS2812_1CH_3X(_len); // only needs a third of "RGB" LEDs for NeoPixelBus 
+  _busPtr = PolyBus::create(_iType, _pins, lenToCreate, nr, _frequencykHz);
  _valid = (_busPtr != nullptr);
-  DEBUG_PRINTF("%successfully inited strip %u (len %u) with type %u and pins %u,%u (itype %u)\n", _valid?"S":"Uns", nr, bc.count, bc.type, _pins[0], _pins[1], _iType);
+  _colorOrder = bc.colorOrder;
+  DEBUG_PRINTF("%successfully inited strip %u (len %u) with type %u and pins %u,%u (itype %u)\n", _valid?"S":"Uns", nr, _len, bc.type, _pins[0],_pins[1],_iType);
 }

 void BusDigital::show() {
-  if (!_valid) return;
-  if (_buffering) { // should be _data != nullptr, but that causes ~20% FPS drop
-    size_t channels = Bus::hasWhite(_type) + 3*Bus::hasRGB(_type);
-    for (size_t i=0; i<_len; i++) {
-      size_t offset = i*channels;
-      uint8_t co = _colorOrderMap.getPixelColorOrder(i+_start, _colorOrder);
-      uint32_t c;
-      if (_type == TYPE_WS2812_1CH_X3) { // map to correct IC, each controls 3 LEDs (_len is always a multiple of 3)
-        switch (i%3) {
-          case 0: c = RGBW32(_data[offset]  , _data[offset+1], _data[offset+2], 0); break;
-          case 1: c = RGBW32(_data[offset-1], _data[offset]  , _data[offset+1], 0); break;
-          case 2: c = RGBW32(_data[offset-2], _data[offset-1], _data[offset]  , 0); break;
-        }
-      } else {
-        c = RGBW32(_data[offset],_data[offset+1],_data[offset+2],(Bus::hasWhite(_type)?_data[offset+3]:0));
-      }
-      uint16_t pix = i;
-      if (_reversed) pix = _len - pix -1;
-      pix += _skip;
-      PolyBus::setPixelColor(_busPtr, _iType, pix, c, co);
-    }
-    #if !defined(STATUSLED) || STATUSLED>=0
-    if (_skip) PolyBus::setPixelColor(_busPtr, _iType, 0, 0, _colorOrderMap.getPixelColorOrder(_start, _colorOrder)); // paint skipped pixels black
-    #endif
-    for (int i=1; i<_skip; i++) PolyBus::setPixelColor(_busPtr, _iType, i, 0, _colorOrderMap.getPixelColorOrder(_start, _colorOrder)); // paint skipped pixels black
-  }
-  PolyBus::show(_busPtr, _iType, !_buffering); // faster if buffer consistency is not important
+  PolyBus::show(_busPtr, _iType);
 }

 bool BusDigital::canShow() {
-  if (!_valid) return true;
  return PolyBus::canShow(_busPtr, _iType);
 }

 void BusDigital::setBrightness(uint8_t b) {
-  if (_bri == b) return;
  //Fix for turning off onboard LED breaking bus
  #ifdef LED_BUILTIN
-  if (_bri == 0) { // && b > 0, covered by guard if above
-    if (_pins[0] == LED_BUILTIN || _pins[1] == LED_BUILTIN) reinit();
+  if (_bri == 0 && b > 0) {
+    if (_pins[0] == LED_BUILTIN || _pins[1] == LED_BUILTIN) PolyBus::begin(_busPtr, _iType, _pins);
  }
  #endif
-  uint8_t prevBri = _bri;
  Bus::setBrightness(b);
  PolyBus::setBrightness(_busPtr, _iType, b);
-
-  if (_buffering) return;
-
-  // must update/repaint every LED in the NeoPixelBus buffer to the new brightness
-  // the only case where repainting is unnecessary is when all pixels are set after the brightness change but before the next show
-  // (which we can't rely on)
-  uint16_t hwLen = _len;
-  if (_type == TYPE_WS2812_1CH_X3) hwLen = NUM_ICS_WS2812_1CH_3X(_len); // only needs a third of "RGB" LEDs for NeoPixelBus
-  for (uint_fast16_t i = 0; i < hwLen; i++) {
-    // use 0 as color order, actual order does not matter here as we just update the channel values as-is
-    uint32_t c = restoreColorLossy(PolyBus::getPixelColor(_busPtr, _iType, i, 0),prevBri);
-    PolyBus::setPixelColor(_busPtr, _iType, i, c, 0);
-  }
 }

 //If LEDs are skipped, it is possible to use the first as a status LED.
 //TODO only show if no new show due in the next 50ms
 void BusDigital::setStatusPixel(uint32_t c) {
-  if (_valid && _skip) {
+  if (_skip && canShow()) {
    PolyBus::setPixelColor(_busPtr, _iType, 0, c, _colorOrderMap.getPixelColorOrder(_start, _colorOrder));
-    if (canShow()) PolyBus::show(_busPtr, _iType);
+    PolyBus::show(_busPtr, _iType);
  }
 }

 void IRAM_ATTR BusDigital::setPixelColor(uint16_t pix, uint32_t c) {
-  if (!_valid) return;
-  if (Bus::hasWhite(_type)) c = autoWhiteCalc(c);
+  if (_type == TYPE_SK6812_RGBW || _type == TYPE_TM1814 || _type == TYPE_WS2812_1CH_X3) c = autoWhiteCalc(c);
  if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
-  if (_buffering) { // should be _data != nullptr, but that causes ~20% FPS drop
-    size_t channels = Bus::hasWhite(_type) + 3*Bus::hasRGB(_type);
-    size_t offset = pix*channels;
-    if (Bus::hasRGB(_type)) {
-      _data[offset++] = R(c);
-      _data[offset++] = G(c);
-      _data[offset++] = B(c);
+  if (reversed) pix = _len - pix -1;
+  else pix += _skip;
+  uint8_t co = _colorOrderMap.getPixelColorOrder(pix+_start, _colorOrder);
+  if (_type == TYPE_WS2812_1CH_X3) { // map to correct IC, each controls 3 LEDs
+    uint16_t pOld = pix;
+    pix = IC_INDEX_WS2812_1CH_3X(pix);
+    uint32_t cOld = PolyBus::getPixelColor(_busPtr, _iType, pix, co);
+    switch (pOld % 3) { // change only the single channel (TODO: this can cause loss because of get/set)
+      case 0: c = RGBW32(R(cOld), W(c)   , B(cOld), 0); break;
+      case 1: c = RGBW32(W(c)   , G(cOld), B(cOld), 0); break;
+      case 2: c = RGBW32(R(cOld), G(cOld), W(c)   , 0); break;
    }
-    if (Bus::hasWhite(_type)) _data[offset] = W(c);
-  } else {
-    if (_reversed) pix = _len - pix -1;
-    pix += _skip;
-    uint8_t co = _colorOrderMap.getPixelColorOrder(pix+_start, _colorOrder);
-    if (_type == TYPE_WS2812_1CH_X3) { // map to correct IC, each controls 3 LEDs
-      uint16_t pOld = pix;
-      pix = IC_INDEX_WS2812_1CH_3X(pix);
-      uint32_t cOld = restoreColorLossy(PolyBus::getPixelColor(_busPtr, _iType, pix, co),_bri);
-      switch (pOld % 3) { // change only the single channel (TODO: this can cause loss because of get/set)
-        case 0: c = RGBW32(R(cOld), W(c)   , B(cOld), 0); break;
-        case 1: c = RGBW32(W(c)   , G(cOld), B(cOld), 0); break;
-        case 2: c = RGBW32(R(cOld), G(cOld), W(c)   , 0); break;
-      }
-    }
-    PolyBus::setPixelColor(_busPtr, _iType, pix, c, co);
  }
+  PolyBus::setPixelColor(_busPtr, _iType, pix, c, co);
 }

-// returns original color if global buffering is enabled, else returns lossly restored color from bus
 uint32_t BusDigital::getPixelColor(uint16_t pix) {
-  if (!_valid) return 0;
-  if (_buffering) { // should be _data != nullptr, but that causes ~20% FPS drop
-    size_t channels = Bus::hasWhite(_type) + 3*Bus::hasRGB(_type);
-    size_t offset = pix*channels;
-    uint32_t c;
-    if (!Bus::hasRGB(_type)) {
-      c = RGBW32(_data[offset], _data[offset], _data[offset], _data[offset]);
-    } else {
-      c = RGBW32(_data[offset], _data[offset+1], _data[offset+2], Bus::hasWhite(_type) ? _data[offset+3] : 0);
-    }
-    return c;
-  } else {
-    if (_reversed) pix = _len - pix -1;
-    pix += _skip;
-    uint8_t co = _colorOrderMap.getPixelColorOrder(pix+_start, _colorOrder);
-    uint32_t c = restoreColorLossy(PolyBus::getPixelColor(_busPtr, _iType, (_type==TYPE_WS2812_1CH_X3) ? IC_INDEX_WS2812_1CH_3X(pix) : pix, co),_bri);
-    if (_type == TYPE_WS2812_1CH_X3) { // map to correct IC, each controls 3 LEDs
-      uint8_t r = R(c);
-      uint8_t g = _reversed ? B(c) : G(c); // should G and B be switched if _reversed?
-      uint8_t b = _reversed ? G(c) : B(c);
-      switch (pix % 3) { // get only the single channel
-        case 0: c = RGBW32(g, g, g, g); break;
-        case 1: c = RGBW32(r, r, r, r); break;
-        case 2: c = RGBW32(b, b, b, b); break;
-      }
+  if (reversed) pix = _len - pix -1;
+  else pix += _skip;
+  uint8_t co = _colorOrderMap.getPixelColorOrder(pix+_start, _colorOrder);
+  if (_type == TYPE_WS2812_1CH_X3) { // map to correct IC, each controls 3 LEDs
+    uint16_t pOld = pix;
+    pix = IC_INDEX_WS2812_1CH_3X(pix);
+    uint32_t c = PolyBus::getPixelColor(_busPtr, _iType, pix, co);
+    switch (pOld % 3) { // get only the single channel
+      case 0: c = RGBW32(G(c), G(c), G(c), G(c)); break;
+      case 1: c = RGBW32(R(c), R(c), R(c), R(c)); break;
+      case 2: c = RGBW32(B(c), B(c), B(c), B(c)); break;
    }
    return c;
  }
+  return PolyBus::getPixelColor(_busPtr, _iType, pix, co);
 }

 uint8_t BusDigital::getPins(uint8_t* pinArray) {
@@ -272,7 +196,6 @@ void BusDigital::setColorOrder(uint8_t colorOrder) {
 }

 void BusDigital::reinit() {
-  if (!_valid) return;
  PolyBus::begin(_busPtr, _iType, _pins);
 }

@@ -282,15 +205,13 @@ void BusDigital::cleanup() {
  _iType = I_NONE;
  _valid = false;
  _busPtr = nullptr;
-  if (_data != nullptr) freeData();
  pinManager.deallocatePin(_pins[1], PinOwner::BusDigital);
  pinManager.deallocatePin(_pins[0], PinOwner::BusDigital);
 }


-BusPwm::BusPwm(BusConfig &bc)
-: Bus(bc.type, bc.start, bc.autoWhite, 1, bc.reversed)
-{
+BusPwm::BusPwm(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+  _valid = false;
  if (!IS_PWM(bc.type)) return;
  uint8_t numPins = NUM_PWM_PINS(bc.type);
  _frequency = bc.frequency ? bc.frequency : WLED_PWM_FREQ;
@@ -308,7 +229,7 @@ BusPwm::BusPwm(BusConfig &bc)
  for (uint8_t i = 0; i < numPins; i++) {
    uint8_t currentPin = bc.pins[i];
    if (!pinManager.allocatePin(currentPin, true, PinOwner::BusPwm)) {
-      deallocatePins(); return;
+    deallocatePins(); return;
    }
    _pins[i] = currentPin; //store only after allocatePin() succeeds
    #ifdef ESP8266
@@ -318,7 +239,7 @@ BusPwm::BusPwm(BusConfig &bc)
    ledcAttachPin(_pins[i], _ledcStart + i);
    #endif
  }
-  _data = _pwmdata; // avoid malloc() and use stack
+  reversed = bc.reversed;
  _valid = true;
 }

@@ -386,7 +307,7 @@ void BusPwm::show() {
  uint8_t numPins = NUM_PWM_PINS(_type);
  for (uint8_t i = 0; i < numPins; i++) {
    uint8_t scaled = (_data[i] * _bri) / 255;
-    if (_reversed) scaled = 255 - scaled;
+    if (reversed) scaled = 255 - scaled;
    #ifdef ESP8266
    analogWrite(_pins[i], scaled);
    #else
@@ -421,10 +342,8 @@ void BusPwm::deallocatePins() {
 }


-BusOnOff::BusOnOff(BusConfig &bc)
-: Bus(bc.type, bc.start, bc.autoWhite, 1, bc.reversed)
-, _onoffdata(0)
-{
+BusOnOff::BusOnOff(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+  _valid = false;
  if (bc.type != TYPE_ONOFF) return;

  uint8_t currentPin = bc.pins[0];
@@ -433,7 +352,7 @@ BusOnOff::BusOnOff(BusConfig &bc)
  }
  _pin = currentPin; //store only after allocatePin() succeeds
  pinMode(_pin, OUTPUT);
-  _data = &_onoffdata; // avoid malloc() and use stack
+  reversed = bc.reversed;
  _valid = true;
 }

@@ -444,17 +363,18 @@ void BusOnOff::setPixelColor(uint16_t pix, uint32_t c) {
  uint8_t g = G(c);
  uint8_t b = B(c);
  uint8_t w = W(c);
-  _data[0] = bool(r|g|b|w) && bool(_bri) ? 0xFF : 0;
+
+  _data = bool(r|g|b|w) && bool(_bri) ? 0xFF : 0;
 }

 uint32_t BusOnOff::getPixelColor(uint16_t pix) {
  if (!_valid) return 0;
-  return RGBW32(_data[0], _data[0], _data[0], _data[0]);
+  return RGBW32(_data, _data, _data, _data);
 }

 void BusOnOff::show() {
  if (!_valid) return;
-  digitalWrite(_pin, _reversed ? !(bool)_data[0] : (bool)_data[0]);
+  digitalWrite(_pin, reversed ? !(bool)_data : (bool)_data);
 }

 uint8_t BusOnOff::getPins(uint8_t* pinArray) {
@@ -464,10 +384,8 @@ uint8_t BusOnOff::getPins(uint8_t* pinArray) {
 }


-BusNetwork::BusNetwork(BusConfig &bc)
-: Bus(bc.type, bc.start, bc.autoWhite, bc.count)
-, _broadcastLock(false)
-{
+BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+  _valid = false;
  switch (bc.type) {
    case TYPE_NET_ARTNET_RGB:
      _rgbw = false;
@@ -483,13 +401,18 @@ BusNetwork::BusNetwork(BusConfig &bc)
      break;
  }
  _UDPchannels = _rgbw ? 4 : 3;
+  _data = (byte *)malloc(bc.count * _UDPchannels);
+  if (_data == nullptr) return;
+  memset(_data, 0, bc.count * _UDPchannels);
+  _len = bc.count;
  _client = IPAddress(bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
-  _valid = (allocData(_len * _UDPchannels) != nullptr);
+  _broadcastLock = false;
+  _valid = true;
 }

 void BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
  if (!_valid || pix >= _len) return;
-  if (_rgbw) c = autoWhiteCalc(c);
+  if (hasWhite()) c = autoWhiteCalc(c);
  if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
  uint16_t offset = pix * _UDPchannels;
  _data[offset]   = R(c);
@@ -501,7 +424,7 @@ void BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
 uint32_t BusNetwork::getPixelColor(uint16_t pix) {
  if (!_valid || pix >= _len) return 0;
  uint16_t offset = pix * _UDPchannels;
-  return RGBW32(_data[offset], _data[offset+1], _data[offset+2], (_rgbw ? _data[offset+3] : 0));
+  return RGBW32(_data[offset], _data[offset+1], _data[offset+2], _rgbw ? (_data[offset+3] << 24) : 0);
 }

 void BusNetwork::show() {
@@ -521,7 +444,8 @@ uint8_t BusNetwork::getPins(uint8_t* pinArray) {
 void BusNetwork::cleanup() {
  _type = I_NONE;
  _valid = false;
-  freeData();
+  if (_data != nullptr) free(_data);
+  _data = nullptr;
 }


@@ -582,7 +506,7 @@ void BusManager::setStatusPixel(uint32_t c) {
  }
 }

-void IRAM_ATTR BusManager::setPixelColor(uint16_t pix, uint32_t c) {
+void IRAM_ATTR BusManager::setPixelColor(uint16_t pix, uint32_t c, int16_t cct) {
  for (uint8_t i = 0; i < numBusses; i++) {
    Bus* b = busses[i];
    uint16_t bstart = b->getStart();
@@ -18,10 +18,6 @@
 #define IC_INDEX_WS2812_2CH_3X(i)  ((i)*2/3)
 #define WS2812_2CH_3X_SPANS_2_ICS(i) ((i)&0x01)    // every other LED zone is on two different ICs

-// flag for using double buffering in BusDigital
-extern bool useGlobalLedBuffer;
-
-
 //temporary struct for passing bus configuration to bus
 struct BusConfig {
  uint8_t type;
@@ -34,25 +30,15 @@ struct BusConfig {
  uint8_t autoWhite;
  uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255};
  uint16_t frequency;
-  bool doubleBuffer;
-
-  BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0, byte aw=RGBW_MODE_MANUAL_ONLY, uint16_t clock_kHz=0U, bool dblBfr=false)
-  : count(len)
-  , start(pstart)
-  , colorOrder(pcolorOrder)
-  , reversed(rev)
-  , skipAmount(skip)
-  , autoWhite(aw)
-  , frequency(clock_kHz)
-  , doubleBuffer(dblBfr)
-  {
+  BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0, byte aw=RGBW_MODE_MANUAL_ONLY, uint16_t clock_kHz=0U) {
    refreshReq = (bool) GET_BIT(busType,7);
    type = busType & 0x7F;  // bit 7 may be/is hacked to include refresh info (1=refresh in off state, 0=no refresh)
-    size_t nPins = 1;
+    count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipAmount = skip; autoWhite = aw; frequency = clock_kHz;
+    uint8_t nPins = 1;
    if (type >= TYPE_NET_DDP_RGB && type < 96) nPins = 4; //virtual network bus. 4 "pins" store IP address
    else if (type > 47) nPins = 2;
    else if (type > 40 && type < 46) nPins = NUM_PWM_PINS(type);
-    for (size_t i = 0; i < nPins; i++) pins[i] = ppins[i];
+    for (uint8_t i = 0; i < nPins; i++) pins[i] = ppins[i];
  }

  //validates start and length and extends total if needed
@@ -68,7 +54,6 @@ struct BusConfig {
  }
 };

-
 // Defines an LED Strip and its color ordering.
 struct ColorOrderMapEntry {
  uint16_t start;
@@ -79,7 +64,9 @@ struct ColorOrderMapEntry {
 struct ColorOrderMap {
    void add(uint16_t start, uint16_t len, uint8_t colorOrder);

-    uint8_t count() const { return _count; }
+    uint8_t count() const {
+      return _count;
+    }

    void reset() {
      _count = 0;
@@ -100,63 +87,56 @@ struct ColorOrderMap {
    ColorOrderMapEntry _mappings[WLED_MAX_COLOR_ORDER_MAPPINGS];
 };

-
 //parent class of BusDigital, BusPwm, and BusNetwork
 class Bus {
  public:
-    Bus(uint8_t type, uint16_t start, uint8_t aw, uint16_t len = 1, bool reversed = false, bool refresh = false)
-    : _type(type)
-    , _bri(255)
-    , _start(start)
-    , _len(len)
-    , _reversed(reversed)
+    Bus(uint8_t type, uint16_t start, uint8_t aw)
+    : _bri(255)
+    , _len(1)
    , _valid(false)
-    , _needsRefresh(refresh)
-    , _data(nullptr) // keep data access consistent across all types of buses
+    , _needsRefresh(false)
    {
-      _autoWhiteMode = Bus::hasWhite(type) ? aw : RGBW_MODE_MANUAL_ONLY;
+      _type = type;
+      _start = start;
+      _autoWhiteMode = Bus::hasWhite(_type) ? aw : RGBW_MODE_MANUAL_ONLY;
    };

    virtual ~Bus() {} //throw the bus under the bus

    virtual void     show() = 0;
-    virtual bool     canShow()                   { return true; }
-    virtual void     setStatusPixel(uint32_t c)  {}
+    virtual bool     canShow() { return true; }
+    virtual void     setStatusPixel(uint32_t c) {}
    virtual void     setPixelColor(uint16_t pix, uint32_t c) = 0;
    virtual uint32_t getPixelColor(uint16_t pix) { return 0; }
-    virtual void     setBrightness(uint8_t b)    { _bri = b; };
+    virtual void     setBrightness(uint8_t b) { _bri = b; };
    virtual void     cleanup() = 0;
-    virtual uint8_t  getPins(uint8_t* pinArray)  { return 0; }
-    virtual uint16_t getLength()                 { return _len; }
-    virtual void     setColorOrder()             {}
-    virtual uint8_t  getColorOrder()             { return COL_ORDER_RGB; }
-    virtual uint8_t  skippedLeds()               { return 0; }
-    virtual uint16_t getFrequency()              { return 0U; }
-    inline  void     setReversed(bool reversed)  { _reversed = reversed; }
-    inline  uint16_t getStart()                  { return _start; }
-    inline  void     setStart(uint16_t start)    { _start = start; }
-    inline  uint8_t  getType()                   { return _type; }
-    inline  bool     isOk()                      { return _valid; }
-    inline  bool     isReversed()                { return _reversed; }
-    inline  bool     isOffRefreshRequired()      { return _needsRefresh; }
+    virtual uint8_t  getPins(uint8_t* pinArray) { return 0; }
+    virtual uint16_t getLength() { return _len; }
+    virtual void     setColorOrder() {}
+    virtual uint8_t  getColorOrder() { return COL_ORDER_RGB; }
+    virtual uint8_t  skippedLeds() { return 0; }
+    virtual uint16_t getFrequency() { return 0U; }
+    inline  uint16_t getStart() { return _start; }
+    inline  void     setStart(uint16_t start) { _start = start; }
+    inline  uint8_t  getType() { return _type; }
+    inline  bool     isOk() { return _valid; }
+    inline  bool     isOffRefreshRequired() { return _needsRefresh; }
            bool     containsPixel(uint16_t pix) { return pix >= _start && pix < _start+_len; }

-    virtual bool hasRGB(void) { return Bus::hasRGB(_type); }
-    static  bool hasRGB(uint8_t type) {
-      if ((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_ANALOG_1CH || type == TYPE_ANALOG_2CH || type == TYPE_ONOFF) return false;
+    virtual bool hasRGB() {
+      if ((_type >= TYPE_WS2812_1CH && _type <= TYPE_WS2812_WWA) || _type == TYPE_ANALOG_1CH || _type == TYPE_ANALOG_2CH || _type == TYPE_ONOFF) return false;
      return true;
    }
-    virtual bool hasWhite(void) { return Bus::hasWhite(_type); }
+    virtual bool hasWhite() { return Bus::hasWhite(_type); }
    static  bool hasWhite(uint8_t type) {
-      if ((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_SK6812_RGBW || type == TYPE_TM1814 || type == TYPE_UCS8904) return true; // digital types with white channel
+      if ((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_SK6812_RGBW || type == TYPE_TM1814) return true; // digital types with white channel
      if (type > TYPE_ONOFF && type <= TYPE_ANALOG_5CH && type != TYPE_ANALOG_3CH) return true; // analog types with white channel
      if (type == TYPE_NET_DDP_RGBW) return true; // network types with white channel
      return false;
    }
-    virtual bool hasCCT(void) { return Bus::hasCCT(_type); }
-    static  bool hasCCT(uint8_t type) {
-      if (type == TYPE_WS2812_2CH_X3 || type == TYPE_WS2812_WWA ||
-          type == TYPE_ANALOG_2CH    || type == TYPE_ANALOG_5CH) return true;
+    virtual bool hasCCT() {
+      if (_type == TYPE_WS2812_2CH_X3 || _type == TYPE_WS2812_WWA ||
+          _type == TYPE_ANALOG_2CH    || _type == TYPE_ANALOG_5CH) return true;
      return false;
    }
    static void setCCT(uint16_t cct) {
@@ -175,87 +155,107 @@ class Bus {
    inline static void    setGlobalAWMode(uint8_t m)  { if (m < 5) _gAWM = m; else _gAWM = AW_GLOBAL_DISABLED; }
    inline static uint8_t getGlobalAWMode()           { return _gAWM; }

+    bool reversed = false;
+
  protected:
    uint8_t  _type;
    uint8_t  _bri;
    uint16_t _start;
    uint16_t _len;
-    bool     _reversed;
    bool     _valid;
    bool     _needsRefresh;
    uint8_t  _autoWhiteMode;
-    uint8_t  *_data;
    static uint8_t _gAWM;
    static int16_t _cct;
    static uint8_t _cctBlend;

    uint32_t autoWhiteCalc(uint32_t c);
-    uint8_t *allocData(size_t size = 1);
-    void     freeData() { if (_data != nullptr) free(_data); _data = nullptr; }
 };


 class BusDigital : public Bus {
  public:
    BusDigital(BusConfig &bc, uint8_t nr, const ColorOrderMap &com);
-    ~BusDigital() { cleanup(); }

-    void show();
+    inline void show();
+
    bool canShow();
+
    void setBrightness(uint8_t b);
+
    void setStatusPixel(uint32_t c);
+
    void setPixelColor(uint16_t pix, uint32_t c);
-    void setColorOrder(uint8_t colorOrder);
+
    uint32_t getPixelColor(uint16_t pix);
-    uint8_t  getColorOrder() { return _colorOrder; }
-    uint8_t  getPins(uint8_t* pinArray);
-    uint8_t  skippedLeds()   { return _skip; }
-    uint16_t getFrequency()  { return _frequencykHz; }
+
+    uint8_t getColorOrder() {
+      return _colorOrder;
+    }
+
+    uint16_t getLength() {
+      return _len - _skip;
+    }
+
+    uint8_t getPins(uint8_t* pinArray);
+
+    void setColorOrder(uint8_t colorOrder);
+
+    uint8_t skippedLeds() {
+      return _skip;
+    }
+
+    uint16_t getFrequency() { return _frequencykHz; }
+
    void reinit();
+
    void cleanup();

-  private:
-    uint8_t _skip;
-    uint8_t _colorOrder;
-    uint8_t _pins[2];
-    uint8_t _iType;
-    uint16_t _frequencykHz;
-    void * _busPtr;
-    const ColorOrderMap &_colorOrderMap;
-    bool _buffering; // temporary until we figure out why comparison "_data != nullptr" causes severe FPS drop
-
-    inline uint32_t restoreColorLossy(uint32_t c, uint8_t restoreBri) {
-      if (restoreBri < 255) {
-        uint8_t* chan = (uint8_t*) &c;
-        for (uint_fast8_t i=0; i<4; i++) {
-          uint_fast16_t val = chan[i];
-          chan[i] = ((val << 8) + restoreBri) / (restoreBri + 1); //adding _bri slightly improves recovery / stops degradation on re-scale
-        }
-      }
-      return c;
+    ~BusDigital() {
+      cleanup();
    }
+
+  private:
+    uint8_t _colorOrder = COL_ORDER_GRB;
+    uint8_t _pins[2] = {255, 255};
+    uint8_t _iType = 0; //I_NONE;
+    uint8_t _skip = 0;
+    uint16_t _frequencykHz = 0U;
+    void * _busPtr = nullptr;
+    const ColorOrderMap &_colorOrderMap;
 };


 class BusPwm : public Bus {
  public:
    BusPwm(BusConfig &bc);
-    ~BusPwm() { cleanup(); }

    void setPixelColor(uint16_t pix, uint32_t c);
-    uint32_t getPixelColor(uint16_t pix); //does no index check
-    uint8_t  getPins(uint8_t* pinArray);
-    uint16_t getFrequency() { return _frequency; }
+
+    //does no index check
+    uint32_t getPixelColor(uint16_t pix);
+
    void show();
-    void cleanup() { deallocatePins(); }
+
+    uint8_t getPins(uint8_t* pinArray);
+
+    uint16_t getFrequency() { return _frequency; }
+
+    void cleanup() {
+      deallocatePins();
+    }
+
+    ~BusPwm() {
+      cleanup();
+    }

  private:
-    uint8_t _pins[5];
-    uint8_t _pwmdata[5];
+    uint8_t _pins[5] = {255, 255, 255, 255, 255};
+    uint8_t _data[5] = {0};
    #ifdef ARDUINO_ARCH_ESP32
-    uint8_t _ledcStart;
+    uint8_t _ledcStart = 255;
    #endif
-    uint16_t _frequency;
+    uint16_t _frequency = 0U;

    void deallocatePins();
 };
@@ -264,46 +264,72 @@ class BusPwm : public Bus {
 class BusOnOff : public Bus {
  public:
    BusOnOff(BusConfig &bc);
-    ~BusOnOff() { cleanup(); }

    void setPixelColor(uint16_t pix, uint32_t c);
+
    uint32_t getPixelColor(uint16_t pix);
-    uint8_t  getPins(uint8_t* pinArray);
+
    void show();
-    void cleanup() { pinManager.deallocatePin(_pin, PinOwner::BusOnOff); }
+
+    uint8_t getPins(uint8_t* pinArray);
+
+    void cleanup() {
+      pinManager.deallocatePin(_pin, PinOwner::BusOnOff);
+    }
+
+    ~BusOnOff() {
+      cleanup();
+    }

  private:
-    uint8_t _pin;
-    uint8_t _onoffdata;
+    uint8_t _pin = 255;
+    uint8_t _data = 0;
 };


 class BusNetwork : public Bus {
  public:
    BusNetwork(BusConfig &bc);
-    ~BusNetwork() { cleanup(); }

-    bool hasRGB()   { return true; }
+    bool hasRGB() { return true; }
    bool hasWhite() { return _rgbw; }
-    bool canShow()  { return !_broadcastLock; } // this should be a return value from UDP routine if it is still sending data out
+
    void setPixelColor(uint16_t pix, uint32_t c);
+
    uint32_t getPixelColor(uint16_t pix);
-    uint8_t  getPins(uint8_t* pinArray);
+
    void show();
+
+    bool canShow() {
+      // this should be a return value from UDP routine if it is still sending data out
+      return !_broadcastLock;
+    }
+
+    uint8_t getPins(uint8_t* pinArray);
+
+    uint16_t getLength() {
+      return _len;
+    }
+
    void cleanup();

+    ~BusNetwork() {
+      cleanup();
+    }
+
  private:
    IPAddress _client;
    uint8_t   _UDPtype;
    uint8_t   _UDPchannels;
    bool      _rgbw;
    bool      _broadcastLock;
+    byte     *_data;
 };


 class BusManager {
  public:
-    BusManager() : numBusses(0) {};
+    BusManager() {};

    //utility to get the approx. memory usage of a given BusConfig
    static uint32_t memUsage(BusConfig &bc);
@@ -314,24 +340,38 @@ class BusManager {
    void removeAll();

    void show();
-    bool canAllShow();
+
    void setStatusPixel(uint32_t c);
-    void setPixelColor(uint16_t pix, uint32_t c);
+
+    void setPixelColor(uint16_t pix, uint32_t c, int16_t cct=-1);
+
    void setBrightness(uint8_t b);
+
    void setSegmentCCT(int16_t cct, bool allowWBCorrection = false);
+
    uint32_t getPixelColor(uint16_t pix);

+    bool canAllShow();
+
    Bus* getBus(uint8_t busNr);

    //semi-duplicate of strip.getLengthTotal() (though that just returns strip._length, calculated in finalizeInit())
    uint16_t getTotalLength();
-    inline uint8_t getNumBusses() const { return numBusses; }

-    inline void                 updateColorOrderMap(const ColorOrderMap &com) { memcpy(&colorOrderMap, &com, sizeof(ColorOrderMap)); }
-    inline const ColorOrderMap& getColorOrderMap() const { return colorOrderMap; }
+    inline void updateColorOrderMap(const ColorOrderMap &com) {
+      memcpy(&colorOrderMap, &com, sizeof(ColorOrderMap));
+    }
+
+    inline const ColorOrderMap& getColorOrderMap() const {
+      return colorOrderMap;
+    }
+
+    inline uint8_t getNumBusses() {
+      return numBusses;
+    }

  private:
-    uint8_t numBusses;
+    uint8_t numBusses = 0;
    Bus* busses[WLED_MAX_BUSSES+WLED_MIN_VIRTUAL_BUSSES];
    ColorOrderMap colorOrderMap;

@@ -341,4 +381,4 @@ class BusManager {
      return j;
    }
 };
-#endif
+#endif
@@ -69,17 +69,17 @@
 #define I_32_RN_NEO_3 21
 #define I_32_I0_NEO_3 22
 #define I_32_I1_NEO_3 23
-#define I_32_BB_NEO_3 24  // bitbanging on ESP32 not recommended
+#define I_32_BB_NEO_3 24  // bitbangging on ESP32 not recommended
 //RGBW
 #define I_32_RN_NEO_4 25
 #define I_32_I0_NEO_4 26
 #define I_32_I1_NEO_4 27
-#define I_32_BB_NEO_4 28  // bitbanging on ESP32 not recommended
+#define I_32_BB_NEO_4 28  // bitbangging on ESP32 not recommended
 //400Kbps
 #define I_32_RN_400_3 29
 #define I_32_I0_400_3 30
 #define I_32_I1_400_3 31
-#define I_32_BB_400_3 32  // bitbanging on ESP32 not recommended
+#define I_32_BB_400_3 32  // bitbangging on ESP32 not recommended
 //TM1814 (RGBW)
 #define I_32_RN_TM1_4 33
 #define I_32_I0_TM1_4 34
@@ -122,9 +122,6 @@
 #define I_SS_LPO_3 48


-// In the following NeoGammaNullMethod can be replaced with NeoGammaWLEDMethod to perform Gamma correction implicitly
-// unfortunately that may apply Gamma correction to pre-calculated palettes which is undesired
-
 /*** ESP8266 Neopixel methods ***/
 #ifdef ESP8266
 //RGB
@@ -250,11 +247,7 @@
 #define B_SS_LPO_3 NeoPixelBusLg<Lpd6803GrbFeature, Lpd6803Method, NeoGammaNullMethod>

 //WS2801
-#ifdef WLED_USE_ETHERNET
-#define B_HS_WS1_3 NeoPixelBusLg<NeoRbgFeature, Ws2801MethodBase<TwoWireHspiImple<SpiSpeedHz>>, NeoGammaNullMethod>
-#else
 #define B_HS_WS1_3 NeoPixelBusLg<NeoRbgFeature, Ws2801SpiHzMethod, NeoGammaNullMethod>
-#endif
 #define B_SS_WS1_3 NeoPixelBusLg<NeoRbgFeature, Ws2801Method, NeoGammaNullMethod>

 //P9813
@@ -280,7 +273,6 @@ class PolyBus {
    #endif
    if (clock_kHz) dotStar_strip->SetMethodSettings(NeoSpiSettings((uint32_t)clock_kHz*1000));
  }
-
  // Begin & initialize the PixelSettings for TM1814 strips.
  template <class T>
  static void beginTM1814(void* busPtr) {
@@ -289,7 +281,6 @@ class PolyBus {
    // Max current for each LED (22.5 mA).
    tm1814_strip->SetPixelSettings(NeoTm1814Settings(/*R*/225, /*G*/225, /*B*/225, /*W*/225));
  }
-
  static void begin(void* busPtr, uint8_t busType, uint8_t* pins, uint16_t clock_kHz = 0U) {
    switch (busType) {
      case I_NONE: break;
@@ -379,7 +370,7 @@ class PolyBus {
      case I_32_I1_UCS_4: (static_cast<B_32_I1_UCS_4*>(busPtr))->Begin(); break;
      #endif
 //      case I_32_BB_UCS_4: (static_cast<B_32_BB_UCS_4*>(busPtr))->Begin(); break;
-      // ESP32 can (and should, to avoid inadvertently driving the chip select signal) specify the pins used for SPI, but only in begin()
+      // ESP32 can (and should, to avoid inadvertantly driving the chip select signal) specify the pins used for SPI, but only in begin()
      case I_HS_DOT_3: beginDotStar<B_HS_DOT_3*>(busPtr, pins[1], -1, pins[0], -1, clock_kHz); break;
      case I_HS_LPD_3: beginDotStar<B_HS_LPD_3*>(busPtr, pins[1], -1, pins[0], -1, clock_kHz); break;
      case I_HS_LPO_3: beginDotStar<B_HS_LPO_3*>(busPtr, pins[1], -1, pins[0], -1, clock_kHz); break;
@@ -392,8 +383,7 @@ class PolyBus {
      case I_SS_WS1_3: (static_cast<B_SS_WS1_3*>(busPtr))->Begin(); break;
      case I_SS_P98_3: (static_cast<B_SS_P98_3*>(busPtr))->Begin(); break;
    }
-  }
-
+  };
  static void* create(uint8_t busType, uint8_t* pins, uint16_t len, uint8_t channel, uint16_t clock_kHz = 0U) {
    void* busPtr = nullptr;
    switch (busType) {
@@ -494,106 +484,104 @@ class PolyBus {
    }
    begin(busPtr, busType, pins, clock_kHz);
    return busPtr;
-  }
-
-  static void show(void* busPtr, uint8_t busType, bool consistent = true) {
+  };
+  static void show(void* busPtr, uint8_t busType) {
    switch (busType) {
      case I_NONE: break;
    #ifdef ESP8266
-      case I_8266_U0_NEO_3: (static_cast<B_8266_U0_NEO_3*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_NEO_3: (static_cast<B_8266_U1_NEO_3*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_NEO_3: (static_cast<B_8266_DM_NEO_3*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_NEO_3: (static_cast<B_8266_BB_NEO_3*>(busPtr))->Show(consistent); break;
-      case I_8266_U0_NEO_4: (static_cast<B_8266_U0_NEO_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_NEO_4: (static_cast<B_8266_U1_NEO_4*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_NEO_4: (static_cast<B_8266_DM_NEO_4*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_NEO_4: (static_cast<B_8266_BB_NEO_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U0_400_3: (static_cast<B_8266_U0_400_3*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_400_3: (static_cast<B_8266_U1_400_3*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_400_3: (static_cast<B_8266_DM_400_3*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_400_3: (static_cast<B_8266_BB_400_3*>(busPtr))->Show(consistent); break;
-      case I_8266_U0_TM1_4: (static_cast<B_8266_U0_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_TM1_4: (static_cast<B_8266_U1_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_TM1_4: (static_cast<B_8266_DM_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_TM1_4: (static_cast<B_8266_BB_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U0_TM2_3: (static_cast<B_8266_U0_TM2_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_TM2_3: (static_cast<B_8266_U1_TM2_4*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_TM2_3: (static_cast<B_8266_DM_TM2_4*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_TM2_3: (static_cast<B_8266_BB_TM2_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U0_UCS_3: (static_cast<B_8266_U0_UCS_3*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_UCS_3: (static_cast<B_8266_U1_UCS_3*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_UCS_3: (static_cast<B_8266_DM_UCS_3*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_UCS_3: (static_cast<B_8266_BB_UCS_3*>(busPtr))->Show(consistent); break;
-      case I_8266_U0_UCS_4: (static_cast<B_8266_U0_UCS_4*>(busPtr))->Show(consistent); break;
-      case I_8266_U1_UCS_4: (static_cast<B_8266_U1_UCS_4*>(busPtr))->Show(consistent); break;
-      case I_8266_DM_UCS_4: (static_cast<B_8266_DM_UCS_4*>(busPtr))->Show(consistent); break;
-      case I_8266_BB_UCS_4: (static_cast<B_8266_BB_UCS_4*>(busPtr))->Show(consistent); break;
+      case I_8266_U0_NEO_3: (static_cast<B_8266_U0_NEO_3*>(busPtr))->Show(); break;
+      case I_8266_U1_NEO_3: (static_cast<B_8266_U1_NEO_3*>(busPtr))->Show(); break;
+      case I_8266_DM_NEO_3: (static_cast<B_8266_DM_NEO_3*>(busPtr))->Show(); break;
+      case I_8266_BB_NEO_3: (static_cast<B_8266_BB_NEO_3*>(busPtr))->Show(); break;
+      case I_8266_U0_NEO_4: (static_cast<B_8266_U0_NEO_4*>(busPtr))->Show(); break;
+      case I_8266_U1_NEO_4: (static_cast<B_8266_U1_NEO_4*>(busPtr))->Show(); break;
+      case I_8266_DM_NEO_4: (static_cast<B_8266_DM_NEO_4*>(busPtr))->Show(); break;
+      case I_8266_BB_NEO_4: (static_cast<B_8266_BB_NEO_4*>(busPtr))->Show(); break;
+      case I_8266_U0_400_3: (static_cast<B_8266_U0_400_3*>(busPtr))->Show(); break;
+      case I_8266_U1_400_3: (static_cast<B_8266_U1_400_3*>(busPtr))->Show(); break;
+      case I_8266_DM_400_3: (static_cast<B_8266_DM_400_3*>(busPtr))->Show(); break;
+      case I_8266_BB_400_3: (static_cast<B_8266_BB_400_3*>(busPtr))->Show(); break;
+      case I_8266_U0_TM1_4: (static_cast<B_8266_U0_TM1_4*>(busPtr))->Show(); break;
+      case I_8266_U1_TM1_4: (static_cast<B_8266_U1_TM1_4*>(busPtr))->Show(); break;
+      case I_8266_DM_TM1_4: (static_cast<B_8266_DM_TM1_4*>(busPtr))->Show(); break;
+      case I_8266_BB_TM1_4: (static_cast<B_8266_BB_TM1_4*>(busPtr))->Show(); break;
+      case I_8266_U0_TM2_3: (static_cast<B_8266_U0_TM2_4*>(busPtr))->Show(); break;
+      case I_8266_U1_TM2_3: (static_cast<B_8266_U1_TM2_4*>(busPtr))->Show(); break;
+      case I_8266_DM_TM2_3: (static_cast<B_8266_DM_TM2_4*>(busPtr))->Show(); break;
+      case I_8266_BB_TM2_3: (static_cast<B_8266_BB_TM2_4*>(busPtr))->Show(); break;
+      case I_8266_U0_UCS_3: (static_cast<B_8266_U0_UCS_3*>(busPtr))->Show(); break;
+      case I_8266_U1_UCS_3: (static_cast<B_8266_U1_UCS_3*>(busPtr))->Show(); break;
+      case I_8266_DM_UCS_3: (static_cast<B_8266_DM_UCS_3*>(busPtr))->Show(); break;
+      case I_8266_BB_UCS_3: (static_cast<B_8266_BB_UCS_3*>(busPtr))->Show(); break;
+      case I_8266_U0_UCS_4: (static_cast<B_8266_U0_UCS_4*>(busPtr))->Show(); break;
+      case I_8266_U1_UCS_4: (static_cast<B_8266_U1_UCS_4*>(busPtr))->Show(); break;
+      case I_8266_DM_UCS_4: (static_cast<B_8266_DM_UCS_4*>(busPtr))->Show(); break;
+      case I_8266_BB_UCS_4: (static_cast<B_8266_BB_UCS_4*>(busPtr))->Show(); break;
    #endif
    #ifdef ARDUINO_ARCH_ESP32
-      case I_32_RN_NEO_3: (static_cast<B_32_RN_NEO_3*>(busPtr))->Show(consistent); break;
+      case I_32_RN_NEO_3: (static_cast<B_32_RN_NEO_3*>(busPtr))->Show(); break;
      #ifndef WLED_NO_I2S0_PIXELBUS
-      case I_32_I0_NEO_3: (static_cast<B_32_I0_NEO_3*>(busPtr))->Show(consistent); break;
+      case I_32_I0_NEO_3: (static_cast<B_32_I0_NEO_3*>(busPtr))->Show(); break;
      #endif
      #ifndef WLED_NO_I2S1_PIXELBUS
-      case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->Show(consistent); break;
+      case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->Show(); break;
      #endif
-//      case I_32_BB_NEO_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->Show(consistent); break;
-      case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->Show(consistent); break;
+//      case I_32_BB_NEO_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->Show(); break;
+      case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->Show(); break;
      #ifndef WLED_NO_I2S0_PIXELBUS
-      case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->Show(consistent); break;
+      case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->Show(); break;
      #endif
      #ifndef WLED_NO_I2S1_PIXELBUS
-      case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->Show(consistent); break;
+      case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->Show(); break;
      #endif
-//      case I_32_BB_NEO_4: (static_cast<B_32_BB_NEO_4*>(busPtr))->Show(consistent); break;
-      case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->Show(consistent); break;
+//      case I_32_BB_NEO_4: (static_cast<B_32_BB_NEO_4*>(busPtr))->Show(); break;
+      case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->Show(); break;
      #ifndef WLED_NO_I2S0_PIXELBUS
-      case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->Show(consistent); break;
+      case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->Show(); break;
      #endif
      #ifndef WLED_NO_I2S1_PIXELBUS
-      case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->Show(consistent); break;
+      case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->Show(); break;
      #endif
-//      case I_32_BB_400_3: (static_cast<B_32_BB_400_3*>(busPtr))->Show(consistent); break;
-      case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->Show(consistent); break;
+//      case I_32_BB_400_3: (static_cast<B_32_BB_400_3*>(busPtr))->Show(); break;
+      case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->Show(); break;
+      case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->Show(); break;
      #ifndef WLED_NO_I2S0_PIXELBUS
-      case I_32_I0_TM1_4: (static_cast<B_32_I0_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_32_I0_TM2_3: (static_cast<B_32_I0_TM2_3*>(busPtr))->Show(consistent); break;
+      case I_32_I0_TM1_4: (static_cast<B_32_I0_TM1_4*>(busPtr))->Show(); break;
+      case I_32_I0_TM2_3: (static_cast<B_32_I0_TM2_3*>(busPtr))->Show(); break;
      #endif
      #ifndef WLED_NO_I2S1_PIXELBUS
-      case I_32_I1_TM1_4: (static_cast<B_32_I1_TM1_4*>(busPtr))->Show(consistent); break;
-      case I_32_I1_TM2_3: (static_cast<B_32_I1_TM2_3*>(busPtr))->Show(consistent); break;
+      case I_32_I1_TM1_4: (static_cast<B_32_I1_TM1_4*>(busPtr))->Show(); break;
+      case I_32_I1_TM2_3: (static_cast<B_32_I1_TM2_3*>(busPtr))->Show(); break;
      #endif
-      case I_32_RN_UCS_3: (static_cast<B_32_RN_UCS_3*>(busPtr))->Show(consistent); break;
+      case I_32_RN_UCS_3: (static_cast<B_32_RN_UCS_3*>(busPtr))->Show(); break;
      #ifndef WLED_NO_I2S0_PIXELBUS
-      case I_32_I0_UCS_3: (static_cast<B_32_I0_UCS_3*>(busPtr))->Show(consistent); break;
+      case I_32_I0_UCS_3: (static_cast<B_32_I0_UCS_3*>(busPtr))->Show(); break;
      #endif
      #ifndef WLED_NO_I2S1_PIXELBUS
-      case I_32_I1_UCS_3: (static_cast<B_32_I1_UCS_3*>(busPtr))->Show(consistent); break;
+      case I_32_I1_UCS_3: (static_cast<B_32_I1_UCS_3*>(busPtr))->Show(); break;
      #endif
-//      case I_32_BB_UCS_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->Show(consistent); break;
-      case I_32_RN_UCS_4: (static_cast<B_32_RN_UCS_4*>(busPtr))->Show(consistent); break;
+//      case I_32_BB_UCS_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->Show(); break;
+      case I_32_RN_UCS_4: (static_cast<B_32_RN_UCS_4*>(busPtr))->Show(); break;
      #ifndef WLED_NO_I2S0_PIXELBUS
-      case I_32_I0_UCS_4: (static_cast<B_32_I0_UCS_4*>(busPtr))->Show(consistent); break;
+      case I_32_I0_UCS_4: (static_cast<B_32_I0_UCS_4*>(busPtr))->Show(); break;
      #endif
      #ifndef WLED_NO_I2S1_PIXELBUS
-      case I_32_I1_UCS_4: (static_cast<B_32_I1_UCS_4*>(busPtr))->Show(consistent); break;
+      case I_32_I1_UCS_4: (static_cast<B_32_I1_UCS_4*>(busPtr))->Show(); break;
      #endif
-//      case I_32_BB_UCS_4: (static_cast<B_32_BB_UCS_4*>(busPtr))->Show(consistent); break;
+//      case I_32_BB_UCS_4: (static_cast<B_32_BB_UCS_4*>(busPtr))->Show(); break;
    #endif
-      case I_HS_DOT_3: (static_cast<B_HS_DOT_3*>(busPtr))->Show(consistent); break;
-      case I_SS_DOT_3: (static_cast<B_SS_DOT_3*>(busPtr))->Show(consistent); break;
-      case I_HS_LPD_3: (static_cast<B_HS_LPD_3*>(busPtr))->Show(consistent); break;
-      case I_SS_LPD_3: (static_cast<B_SS_LPD_3*>(busPtr))->Show(consistent); break;
-      case I_HS_LPO_3: (static_cast<B_HS_LPO_3*>(busPtr))->Show(consistent); break;
-      case I_SS_LPO_3: (static_cast<B_SS_LPO_3*>(busPtr))->Show(consistent); break;
-      case I_HS_WS1_3: (static_cast<B_HS_WS1_3*>(busPtr))->Show(consistent); break;
-      case I_SS_WS1_3: (static_cast<B_SS_WS1_3*>(busPtr))->Show(consistent); break;
-      case I_HS_P98_3: (static_cast<B_HS_P98_3*>(busPtr))->Show(consistent); break;
-      case I_SS_P98_3: (static_cast<B_SS_P98_3*>(busPtr))->Show(consistent); break;
+      case I_HS_DOT_3: (static_cast<B_HS_DOT_3*>(busPtr))->Show(); break;
+      case I_SS_DOT_3: (static_cast<B_SS_DOT_3*>(busPtr))->Show(); break;
+      case I_HS_LPD_3: (static_cast<B_HS_LPD_3*>(busPtr))->Show(); break;
+      case I_SS_LPD_3: (static_cast<B_SS_LPD_3*>(busPtr))->Show(); break;
+      case I_HS_LPO_3: (static_cast<B_HS_LPO_3*>(busPtr))->Show(); break;
+      case I_SS_LPO_3: (static_cast<B_SS_LPO_3*>(busPtr))->Show(); break;
+      case I_HS_WS1_3: (static_cast<B_HS_WS1_3*>(busPtr))->Show(); break;
+      case I_SS_WS1_3: (static_cast<B_SS_WS1_3*>(busPtr))->Show(); break;
+      case I_HS_P98_3: (static_cast<B_HS_P98_3*>(busPtr))->Show(); break;
+      case I_SS_P98_3: (static_cast<B_SS_P98_3*>(busPtr))->Show(); break;
    }
-  }
-
+  };
  static bool canShow(void* busPtr, uint8_t busType) {
    switch (busType) {
      case I_NONE: return true;
@@ -690,8 +678,7 @@ class PolyBus {
      case I_SS_P98_3: return (static_cast<B_SS_P98_3*>(busPtr))->CanShow(); break;
    }
    return true;
-  }
-
+  };
  static void setPixelColor(void* busPtr, uint8_t busType, uint16_t pix, uint32_t c, uint8_t co) {
    uint8_t r = c >> 16;
    uint8_t g = c >> 8;
@@ -811,8 +798,7 @@ class PolyBus {
      case I_HS_P98_3: (static_cast<B_HS_P98_3*>(busPtr))->SetPixelColor(pix, RgbColor(col)); break;
      case I_SS_P98_3: (static_cast<B_SS_P98_3*>(busPtr))->SetPixelColor(pix, RgbColor(col)); break;
    }
-  }
-
+  };
  static void setBrightness(void* busPtr, uint8_t busType, uint8_t b) {
    switch (busType) {
      case I_NONE: break;
@@ -909,8 +895,7 @@ class PolyBus {
      case I_HS_P98_3: (static_cast<B_HS_P98_3*>(busPtr))->SetLuminance(b); break;
      case I_SS_P98_3: (static_cast<B_SS_P98_3*>(busPtr))->SetLuminance(b); break;
    }
-  }
-
+  };
  static uint32_t getPixelColor(void* busPtr, uint8_t busType, uint16_t pix, uint8_t co) {
    RgbwColor col(0,0,0,0);
    switch (busType) {
@@ -1217,4 +1202,4 @@ class PolyBus {
  }
 };

-#endif
+#endif
@@ -21,7 +21,6 @@ void shortPressAction(uint8_t b)
      case 1: ++effectCurrent %= strip.getModeCount(); stateChanged = true; colorUpdated(CALL_MODE_BUTTON); break;
    }
  } else {
-    unloadPlaylist(); // applying a preset unloads the playlist
    applyPreset(macroButton[b], CALL_MODE_BUTTON_PRESET);
  }

@@ -43,7 +42,6 @@ void longPressAction(uint8_t b)
      case 1: bri += 8; stateUpdated(CALL_MODE_BUTTON); buttonPressedTime[b] = millis(); break; // repeatable action
    }
  } else {
-    unloadPlaylist(); // applying a preset unloads the playlist
    applyPreset(macroLongPress[b], CALL_MODE_BUTTON_PRESET);
  }

@@ -65,7 +63,6 @@ void doublePressAction(uint8_t b)
      case 1: ++effectPalette %= strip.getPaletteCount(); colorUpdated(CALL_MODE_BUTTON); break;
    }
  } else {
-    unloadPlaylist(); // applying a preset unloads the playlist
    applyPreset(macroDoublePress[b], CALL_MODE_BUTTON_PRESET);
  }

@@ -156,7 +153,6 @@ void handleAnalog(uint8_t b)
  #ifdef ESP8266
  rawReading = analogRead(A0) << 2;   // convert 10bit read to 12bit
  #else
-  if ((btnPin[b] < 0) || (digitalPinToAnalogChannel(btnPin[b]) < 0)) return; // pin must support analog ADC - newer esp32 frameworks throw lots of warnings otherwise
  rawReading = analogRead(btnPin[b]); // collect at full 12bit resolution
  #endif
  yield();                            // keep WiFi task running - analog read may take several millis on ESP8266
@@ -171,12 +167,13 @@ void handleAnalog(uint8_t b)
  // remove noise & reduce frequency of UI updates
  if (abs(int(aRead) - int(oldRead[b])) <= POT_SENSITIVITY) return;  // no significant change in reading

-  // Un-comment the next lines if you still see flickering related to potentiometer
+  // Unomment the next lines if you still see flickering related to potentiometer
  // This waits until strip finishes updating (why: strip was not updating at the start of handleButton() but may have started during analogRead()?)
  //unsigned long wait_started = millis();
  //while(strip.isUpdating() && (millis() - wait_started < STRIP_WAIT_TIME)) {
  //  delay(1);
  //}
+  //if (strip.isUpdating()) return; // give up

  oldRead[b] = aRead;

@@ -188,7 +185,7 @@ void handleAnalog(uint8_t b)
      if (aRead == 0) {
        briLast = bri;
        bri = 0;
-      } else {
+      } else{
        bri = aRead;
      }
    } else if (macroDoublePress[b] == 249) {
@@ -226,11 +223,11 @@ void handleAnalog(uint8_t b)

 void handleButton()
 {
-  static unsigned long lastAnalogRead = 0UL;
+  static unsigned long lastRead = 0UL;
  static unsigned long lastRun = 0UL;
  unsigned long now = millis();

-  if (strip.isUpdating() && (now - lastRun < ANALOG_BTN_READ_CYCLE+1)) return; // don't interfere with strip update (unless strip is updating continuously, e.g. very long strips)
+  if (strip.isUpdating() && (now - lastRun < 400)) return; // don't interfere with strip update (unless strip is updating continuously, e.g. very long strips)
  lastRun = now;

  for (uint8_t b=0; b<WLED_MAX_BUTTONS; b++) {
@@ -243,8 +240,9 @@ void handleButton()
    if (usermods.handleButton(b)) continue; // did usermod handle buttons

    if (buttonType[b] == BTN_TYPE_ANALOG || buttonType[b] == BTN_TYPE_ANALOG_INVERTED) { // button is not a button but a potentiometer
-      if (now - lastAnalogRead > ANALOG_BTN_READ_CYCLE) {
+      if (now - lastRead > ANALOG_BTN_READ_CYCLE) {
        handleAnalog(b);
+        lastRead = now;
      }
      continue;
    }
@@ -264,7 +262,7 @@ void handleButton()
          shortPressAction(b);
        buttonPressedBefore[b] = true;
        buttonPressedTime[b] = now; // continually update (for debouncing to work in release handler)
-        continue;
+        return;
      }

      if (!buttonPressedBefore[b]) buttonPressedTime[b] = now;
@@ -285,7 +283,7 @@ void handleButton()
      // released after rising-edge short press action
      if (macroButton[b] && macroButton[b] == macroLongPress[b] && macroButton[b] == macroDoublePress[b]) {
        if (dur > WLED_DEBOUNCE_THRESHOLD) buttonPressedBefore[b] = false; // debounce, blocks button for 50 ms once it has been released
-        continue;
+        return;
      }

      if (dur < WLED_DEBOUNCE_THRESHOLD) {buttonPressedBefore[b] = false; continue;} // too short "press", debounce
@@ -324,9 +322,6 @@ void handleButton()
      shortPressAction(b);
    }
  }
-  if (now - lastAnalogRead > ANALOG_BTN_READ_CYCLE) {
-    lastAnalogRead = now;
-  }
 }

 // If enabled, RMT idle level is set to HIGH when off
@@ -376,7 +371,7 @@ void handleIO()
    if (!offMode) {
      #ifdef ESP8266
      // turn off built-in LED if strip is turned off
-      // this will break digital bus so will need to be re-initialised on On
+      // this will break digital bus so will need to be reinitialised on On
      PinOwner ledPinOwner = pinManager.getPinOwner(LED_BUILTIN);
      if (!strip.isOffRefreshRequired() && (ledPinOwner == PinOwner::None || ledPinOwner == PinOwner::BusDigital)) {
        pinMode(LED_BUILTIN, OUTPUT);
@@ -393,4 +388,4 @@ void handleIO()
    }
    offMode = true;
  }
-}
+}
@@ -74,22 +74,23 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {

  noWifiSleep = doc[F("wifi")][F("sleep")] | !noWifiSleep; // inverted
  noWifiSleep = !noWifiSleep;
-  force802_3g = doc[F("wifi")][F("phy")] | force802_3g; //force phy mode g?
+  //int wifi_phy = doc[F("wifi")][F("phy")]; //force phy mode n?

  JsonObject hw = doc[F("hw")];

  // initialize LED pins and lengths prior to other HW (except for ethernet)
  JsonObject hw_led = hw["led"];

+  uint8_t autoWhiteMode = RGBW_MODE_MANUAL_ONLY;
  CJSON(strip.ablMilliampsMax, hw_led[F("maxpwr")]);
  CJSON(strip.milliampsPerLed, hw_led[F("ledma")]);
-  Bus::setGlobalAWMode(hw_led[F("rgbwm")] | AW_GLOBAL_DISABLED);
+  Bus::setGlobalAWMode(hw_led[F("rgbwm")] | 255);
  CJSON(correctWB, hw_led["cct"]);
  CJSON(cctFromRgb, hw_led[F("cr")]);
  CJSON(strip.cctBlending, hw_led[F("cb")]);
  Bus::setCCTBlend(strip.cctBlending);
  strip.setTargetFps(hw_led["fps"]); //NOP if 0, default 42 FPS
-  CJSON(useGlobalLedBuffer, hw_led[F("ld")]);
+  CJSON(strip.useLedsArray, hw_led[F("ld")]);

  #ifndef WLED_DISABLE_2D
  // 2D Matrix Settings
@@ -133,8 +134,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
  if (fromFS || !ins.isNull()) {
    uint8_t s = 0;  // bus iterator
    if (fromFS) busses.removeAll(); // can't safely manipulate busses directly in network callback
-    uint32_t mem = 0, globalBufMem = 0;
-    uint16_t maxlen = 0;
+    uint32_t mem = 0;
    bool busesChanged = false;
    for (JsonObject elm : ins) {
      if (s >= WLED_MAX_BUSSES+WLED_MIN_VIRTUAL_BUSSES) break;
@@ -149,7 +149,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
      }

      uint16_t length = elm["len"] | 1;
-      uint8_t colorOrder = (int)elm[F("order")]; // contains white channel swap option in upper nibble
+      uint8_t colorOrder = (int)elm[F("order")];
      uint8_t skipFirst = elm[F("skip")];
      uint16_t start = elm["start"] | 0;
      if (length==0 || start + length > MAX_LEDS) continue; // zero length or we reached max. number of LEDs, just stop
@@ -158,18 +158,14 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
      bool refresh = elm["ref"] | false;
      uint16_t freqkHz = elm[F("freq")] | 0;  // will be in kHz for DotStar and Hz for PWM (not yet implemented fully)
      ledType |= refresh << 7; // hack bit 7 to indicate strip requires off refresh
-      uint8_t AWmode = elm[F("rgbwm")] | RGBW_MODE_MANUAL_ONLY;
+      uint8_t AWmode = elm[F("rgbwm")] | autoWhiteMode;
      if (fromFS) {
-        BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz, useGlobalLedBuffer);
+        BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz);
        mem += BusManager::memUsage(bc);
-        if (useGlobalLedBuffer && start + length > maxlen) {
-          maxlen = start + length;
-          globalBufMem = maxlen * 4;
-        }
-        if (mem + globalBufMem <= MAX_LED_MEMORY) if (busses.add(bc) == -1) break;  // finalization will be done in WLED::beginStrip()
+        if (mem <= MAX_LED_MEMORY) if (busses.add(bc) == -1) break;  // finalization will be done in WLED::beginStrip()
      } else {
        if (busConfigs[s] != nullptr) delete busConfigs[s];
-        busConfigs[s] = new BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz, useGlobalLedBuffer);
+        busConfigs[s] = new BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode);
        busesChanged = true;
      }
      s++;
@@ -177,7 +173,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
    doInitBusses = busesChanged;
    // finalization done in beginStrip()
  }
-  if (hw_led["rev"]) busses.getBus(0)->setReversed(true); //set 0.11 global reversed setting for first bus
+  if (hw_led["rev"]) busses.getBus(0)->reversed = true; //set 0.11 global reversed setting for first bus

  // read color order map configuration
  JsonArray hw_com = hw[F("com")];
@@ -201,9 +197,6 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
  disablePullUp = !pull;
  JsonArray hw_btn_ins = btn_obj[F("ins")];
  if (!hw_btn_ins.isNull()) {
-    for (uint8_t b = 0; b < WLED_MAX_BUTTONS; b++) { // deallocate existing button pins
-      pinManager.deallocatePin(btnPin[b], PinOwner::Button); // does nothing if trying to deallocate a pin with PinOwner != Button
-    }
    uint8_t s = 0;
    for (JsonObject btn : hw_btn_ins) {
      CJSON(buttonType[s], btn["type"]);
@@ -215,9 +208,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
        if (((buttonType[s] == BTN_TYPE_ANALOG) || (buttonType[s] == BTN_TYPE_ANALOG_INVERTED)) && (digitalPinToAnalogChannel(btnPin[s]) < 0))
        {
          // not an ADC analog pin
-          DEBUG_PRINT(F("PIN ALLOC error: GPIO")); DEBUG_PRINT(btnPin[s]);
-          DEBUG_PRINT(F("for analog button #")); DEBUG_PRINT(s);
-          DEBUG_PRINTLN(F(" is not an analog pin!"));
+          DEBUG_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[s], s);
          btnPin[s] = -1;
          pinManager.deallocatePin(pin,PinOwner::Button);
        }
@@ -273,7 +264,6 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {

  int hw_ir_pin = hw["ir"]["pin"] | -2; // 4
  if (hw_ir_pin > -2) {
-    pinManager.deallocatePin(irPin, PinOwner::IR);
    if (pinManager.allocatePin(hw_ir_pin, false, PinOwner::IR)) {
      irPin = hw_ir_pin;
    } else {
@@ -286,7 +276,6 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
  JsonObject relay = hw[F("relay")];
  int hw_relay_pin = relay["pin"] | -2;
  if (hw_relay_pin > -2) {
-    pinManager.deallocatePin(rlyPin, PinOwner::Relay);
    if (pinManager.allocatePin(hw_relay_pin,true, PinOwner::Relay)) {
      rlyPin = hw_relay_pin;
      pinMode(rlyPin, OUTPUT);
@@ -308,11 +297,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
  PinManagerPinType i2c[2] = { { i2c_sda, true }, { i2c_scl, true } };
  if (i2c_scl >= 0 && i2c_sda >= 0 && pinManager.allocateMultiplePins(i2c, 2, PinOwner::HW_I2C)) {
    #ifdef ESP32
-    if (!Wire.setPins(i2c_sda, i2c_scl)) { i2c_scl = i2c_sda = -1; } // this will fail if Wire is initialised (Wire.begin() called prior)
-    else Wire.begin();
-    #else
-    Wire.begin(i2c_sda, i2c_scl);
+    Wire.setPins(i2c_sda, i2c_scl); // this will fail if Wire is initilised (Wire.begin() called prior)
    #endif
+    Wire.begin();
  } else {
    i2c_sda = -1;
    i2c_scl = -1;
@@ -349,7 +336,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
  if (light_gc_col > 1.0f) gammaCorrectCol = true;
  else                     gammaCorrectCol = false;
  if (gammaCorrectVal > 1.0f && gammaCorrectVal <= 3) {
-    if (gammaCorrectVal != 2.8f) NeoGammaWLEDMethod::calcGammaTable(gammaCorrectVal);
+    if (gammaCorrectVal != 2.8f) calcGammaTable(gammaCorrectVal);
  } else {
    gammaCorrectVal = 1.0f; // no gamma correction
    gammaCorrectBri = false;
@@ -358,10 +345,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {

  JsonObject light_tr = light["tr"];
  CJSON(fadeTransition, light_tr["mode"]);
-  CJSON(modeBlending, light_tr["fx"]);
  int tdd = light_tr["dur"] | -1;
  if (tdd >= 0) transitionDelay = transitionDelayDefault = tdd * 100;
-  strip.setTransition(fadeTransition ? transitionDelayDefault : 0);
  CJSON(strip.paletteFade, light_tr["pal"]);
  CJSON(randomPaletteChangeTime, light_tr[F("rpc")]);

@@ -445,24 +430,17 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
 #ifdef WLED_ENABLE_MQTT
  JsonObject if_mqtt = interfaces["mqtt"];
  CJSON(mqttEnabled, if_mqtt["en"]);
-  getStringFromJson(mqttServer, if_mqtt[F("broker")], MQTT_MAX_SERVER_LEN+1);
+  getStringFromJson(mqttServer, if_mqtt[F("broker")], 33);
  CJSON(mqttPort, if_mqtt["port"]); // 1883
  getStringFromJson(mqttUser, if_mqtt[F("user")], 41);
  getStringFromJson(mqttPass, if_mqtt["psk"], 65); //normally not present due to security
  getStringFromJson(mqttClientID, if_mqtt[F("cid")], 41);

-  getStringFromJson(mqttDeviceTopic, if_mqtt[F("topics")][F("device")], MQTT_MAX_TOPIC_LEN+1); // "wled/test"
-  getStringFromJson(mqttGroupTopic, if_mqtt[F("topics")][F("group")], MQTT_MAX_TOPIC_LEN+1); // ""
+  getStringFromJson(mqttDeviceTopic, if_mqtt[F("topics")][F("device")], 33); // "wled/test"
+  getStringFromJson(mqttGroupTopic, if_mqtt[F("topics")][F("group")], 33); // ""
  CJSON(retainMqttMsg, if_mqtt[F("rtn")]);
 #endif

-#ifndef WLED_DISABLE_ESPNOW
-  JsonObject remote = doc["remote"];
-  CJSON(enable_espnow_remote, remote[F("remote_enabled")]);
-  getStringFromJson(linked_remote, remote[F("linked_remote")], 13);
-#endif
-
-
 #ifndef WLED_DISABLE_HUESYNC
  JsonObject if_hue = interfaces["hue"];
  CJSON(huePollingEnabled, if_hue["en"]);
@@ -682,7 +660,7 @@ void serializeConfig() {

  JsonObject wifi = doc.createNestedObject("wifi");
  wifi[F("sleep")] = !noWifiSleep;
-  wifi[F("phy")] = force802_3g;
+  //wifi[F("phy")] = 1;

  #ifdef WLED_USE_ETHERNET
  JsonObject ethernet = doc.createNestedObject("eth");
@@ -719,7 +697,7 @@ void serializeConfig() {
  hw_led[F("cb")] = strip.cctBlending;
  hw_led["fps"] = strip.getTargetFps();
  hw_led[F("rgbwm")] = Bus::getGlobalAWMode(); // global auto white mode override
-  hw_led[F("ld")] = useGlobalLedBuffer;
+  hw_led[F("ld")] = strip.useLedsArray;

  #ifndef WLED_DISABLE_2D
  // 2D Matrix Settings
@@ -754,7 +732,7 @@ void serializeConfig() {
    uint8_t nPins = bus->getPins(pins);
    for (uint8_t i = 0; i < nPins; i++) ins_pin.add(pins[i]);
    ins[F("order")] = bus->getColorOrder();
-    ins["rev"] = bus->isReversed();
+    ins["rev"] = bus->reversed;
    ins[F("skip")] = bus->skippedLeds();
    ins["type"] = bus->getType() & 0x7F;
    ins["ref"] = bus->isOffRefreshRequired();
@@ -830,7 +808,6 @@ void serializeConfig() {

  JsonObject light_tr = light.createNestedObject("tr");
  light_tr["mode"] = fadeTransition;
-  light_tr["fx"] = modeBlending;
  light_tr["dur"] = transitionDelayDefault / 100;
  light_tr["pal"] = strip.paletteFade;
  light_tr[F("rpc")] = randomPaletteChangeTime;
@@ -892,7 +869,6 @@ void serializeConfig() {
  if_live[F("no-gc")] = arlsDisableGammaCorrection;
  if_live[F("offset")] = arlsOffset;

-#ifndef WLED_DISABLE_ALEXA
  JsonObject if_va = interfaces.createNestedObject("va");
  if_va[F("alexa")] = alexaEnabled;

@@ -901,7 +877,6 @@ void serializeConfig() {
  if_va_macros.add(macroAlexaOff);

  if_va["p"] = alexaNumPresets;
-#endif

 #ifdef WLED_ENABLE_MQTT
  JsonObject if_mqtt = interfaces.createNestedObject("mqtt");
@@ -918,13 +893,6 @@ void serializeConfig() {
  if_mqtt_topics[F("group")] = mqttGroupTopic;
 #endif

-#ifndef WLED_DISABLE_ESPNOW
-  JsonObject remote = doc.createNestedObject(F("remote"));
-  remote[F("remote_enabled")] = enable_espnow_remote;
-  remote[F("linked_remote")] = linked_remote;
-#endif
-
-
 #ifndef WLED_DISABLE_HUESYNC
  JsonObject if_hue = interfaces.createNestedObject("hue");
  if_hue["en"] = huePollingEnabled;
@@ -1039,7 +1007,7 @@ bool deserializeConfigSec() {
  JsonObject ap = doc["ap"];
  getStringFromJson(apPass, ap["psk"] , 65);

-  [[maybe_unused]] JsonObject interfaces = doc["if"];
+  JsonObject interfaces = doc["if"];

 #ifdef WLED_ENABLE_MQTT
  JsonObject if_mqtt = interfaces["mqtt"];
@@ -1078,7 +1046,7 @@ void serializeConfigSec() {
  JsonObject ap = doc.createNestedObject("ap");
  ap["psk"] = apPass;

-  [[maybe_unused]] JsonObject interfaces = doc.createNestedObject("if");
+  JsonObject interfaces = doc.createNestedObject("if");
 #ifdef WLED_ENABLE_MQTT
  JsonObject if_mqtt = interfaces.createNestedObject("mqtt");
  if_mqtt["psk"] = mqttPass;
@@ -35,59 +35,23 @@ uint32_t color_blend(uint32_t color1, uint32_t color2, uint16_t blend, bool b16)
 * color add function that preserves ratio
 * idea: https://github.com/Aircoookie/WLED/pull/2465 by https://github.com/Proto-molecule
 */
-uint32_t color_add(uint32_t c1, uint32_t c2, bool fast)
+uint32_t color_add(uint32_t c1, uint32_t c2)
 {
-  if (fast) {
-    uint8_t r = R(c1);
-    uint8_t g = G(c1);
-    uint8_t b = B(c1);
-    uint8_t w = W(c1);
-    r = qadd8(r, R(c2));
-    g = qadd8(g, G(c2));
-    b = qadd8(b, B(c2));
-    w = qadd8(w, W(c2));
-    return RGBW32(r,g,b,w);
-  } else {
-    uint32_t r = R(c1) + R(c2);
-    uint32_t g = G(c1) + G(c2);
-    uint32_t b = B(c1) + B(c2);
-    uint32_t w = W(c1) + W(c2);
-    uint16_t max = r;
-    if (g > max) max = g;
-    if (b > max) max = b;
-    if (w > max) max = w;
-    if (max < 256) return RGBW32(r, g, b, w);
-    else           return RGBW32(r * 255 / max, g * 255 / max, b * 255 / max, w * 255 / max);
-  }
-}
-
-/*
- * fades color toward black
- * if using "video" method the resulting color will never become black unless it is already black
- */
-uint32_t color_fade(uint32_t c1, uint8_t amount, bool video)
-{
-  uint8_t r = R(c1);
-  uint8_t g = G(c1);
-  uint8_t b = B(c1);
-  uint8_t w = W(c1);
-  if (video) {
-    r = scale8_video(r, amount);
-    g = scale8_video(g, amount);
-    b = scale8_video(b, amount);
-    w = scale8_video(w, amount);
-  } else {
-    r = scale8(r, amount);
-    g = scale8(g, amount);
-    b = scale8(b, amount);
-    w = scale8(w, amount);
-  }
-  return RGBW32(r, g, b, w);
+  uint32_t r = R(c1) + R(c2);
+  uint32_t g = G(c1) + G(c2);
+  uint32_t b = B(c1) + B(c2);
+  uint32_t w = W(c1) + W(c2);
+  uint16_t max = r;
+  if (g > max) max = g;
+  if (b > max) max = b;
+  if (w > max) max = w;
+  if (max < 256) return RGBW32(r, g, b, w);
+  else           return RGBW32(r * 255 / max, g * 255 / max, b * 255 / max, w * 255 / max);
 }

 void setRandomColor(byte* rgb)
 {
-  lastRandomIndex = get_random_wheel_index(lastRandomIndex);
+  lastRandomIndex = strip.getMainSegment().get_random_wheel_index(lastRandomIndex);
  colorHStoRGB(lastRandomIndex*256,255,rgb);
 }

@@ -338,7 +302,7 @@ uint16_t approximateKelvinFromRGB(uint32_t rgb) {
 }

 //gamma 2.8 lookup table used for color correction
-uint8_t NeoGammaWLEDMethod::gammaT[256] = {
+static byte gammaT[] = {
    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
    1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,
@@ -356,22 +320,27 @@ uint8_t NeoGammaWLEDMethod::gammaT[256] = {
  177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213,
  215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 };

-// re-calculates & fills gamma table
-void NeoGammaWLEDMethod::calcGammaTable(float gamma)
+uint8_t gamma8_cal(uint8_t b, float gamma)
 {
-  for (size_t i = 0; i < 256; i++) {
-    gammaT[i] = (int)(powf((float)i / 255.0f, gamma) * 255.0f + 0.5f);
+  return (int)(powf((float)b / 255.0f, gamma) * 255.0f + 0.5f);
+}
+
+// re-calculates & fills gamma table
+void calcGammaTable(float gamma)
+{
+  for (uint16_t i = 0; i < 256; i++) {
+    gammaT[i] = gamma8_cal(i, gamma);
  }
 }

-uint8_t NeoGammaWLEDMethod::Correct(uint8_t value)
+// used for individual channel or brightness gamma correction
+uint8_t gamma8(uint8_t b)
 {
-  if (!gammaCorrectCol) return value;
-  return gammaT[value];
+  return gammaT[b];
 }

 // used for color gamma correction
-uint32_t NeoGammaWLEDMethod::Correct32(uint32_t color)
+uint32_t gamma32(uint32_t color)
 {
  if (!gammaCorrectCol) return color;
  uint8_t w = W(color);
@@ -91,21 +91,6 @@
  #endif
 #endif

-#ifndef WLED_MAX_SEGNAME_LEN
-  #ifdef ESP8266
-    #define WLED_MAX_SEGNAME_LEN 32
-  #else
-    #define WLED_MAX_SEGNAME_LEN 64
-  #endif
-#else
-  #if WLED_MAX_SEGNAME_LEN<32
-    #undef WLED_MAX_SEGNAME_LEN
-    #define WLED_MAX_SEGNAME_LEN 32
-  #else
-    #warning WLED UI does not support modified maximum segment name length!
-  #endif
-#endif
-
 //Usermod IDs
 #define USERMOD_ID_RESERVED               0     //Unused. Might indicate no usermod present
 #define USERMOD_ID_UNSPECIFIED            1     //Default value for a general user mod that does not specify a custom ID
@@ -147,10 +132,7 @@
 #define USERMOD_ID_SD_CARD               37     //Usermod "usermod_sd_card.h"
 #define USERMOD_ID_PWM_OUTPUTS           38     //Usermod "usermod_pwm_outputs.h
 #define USERMOD_ID_SHT                   39     //Usermod "usermod_sht.h
-#define USERMOD_ID_KLIPPER               40     //Usermod Klipper percentage
-#define USERMOD_ID_WIREGUARD             41     //Usermod "wireguard.h"
-#define USERMOD_ID_INTERNAL_TEMPERATURE  42     //Usermod "usermod_internal_temperature.h"
-#define USERMOD_ID_LDR_DUSK_DAWN         43     //Usermod "usermod_LDR_Dusk_Dawn_v2.h"
+#define USERMOD_ID_KLIPPER               40     // Usermod Klipper percentage

 //Access point behavior
 #define AP_BEHAVIOR_BOOT_NO_CONN          0     //Open AP when no connection after boot
@@ -167,7 +149,7 @@
 #define CALL_MODE_NO_NOTIFY      5
 #define CALL_MODE_FX_CHANGED     6     //no longer used
 #define CALL_MODE_HUE            7
-#define CALL_MODE_PRESET_CYCLE   8     //no longer used
+#define CALL_MODE_PRESET_CYCLE   8
 #define CALL_MODE_BLYNK          9     //no longer used
 #define CALL_MODE_ALEXA         10
 #define CALL_MODE_WS_SEND       11     //special call mode, not for notifier, updates websocket only
@@ -207,8 +189,8 @@
 #define DMX_MODE_MULTIPLE_RGB     4            //every LED is addressed with its own RGB (ledCount * 3 channels)
 #define DMX_MODE_MULTIPLE_DRGB    5            //every LED is addressed with its own RGB and share a master dimmer (ledCount * 3 + 1 channels)
 #define DMX_MODE_MULTIPLE_RGBW    6            //every LED is addressed with its own RGBW (ledCount * 4 channels)
-#define DMX_MODE_EFFECT_SEGMENT   8            //trigger standalone effects of WLED (15 channels per segment)
-#define DMX_MODE_EFFECT_SEGMENT_W 9            //trigger standalone effects of WLED (18 channels per segment)
+#define DMX_MODE_EFFECT_SEGMENT   8            //trigger standalone effects of WLED (15 channels per segement)
+#define DMX_MODE_EFFECT_SEGMENT_W 9            //trigger standalone effects of WLED (18 channels per segement)
 #define DMX_MODE_PRESET           10           //apply presets (1 channel)

 //Light capability byte (unused) 0bRCCCTTTT
@@ -314,16 +296,17 @@
 #define SEG_OPTION_MIRROR         3            //Indicates that the effect will be mirrored within the segment
 #define SEG_OPTION_FREEZE         4            //Segment contents will not be refreshed
 #define SEG_OPTION_RESET          5            //Segment runtime requires reset
-#define SEG_OPTION_REVERSED_Y     6
-#define SEG_OPTION_MIRROR_Y       7
-#define SEG_OPTION_TRANSPOSED     8
+#define SEG_OPTION_TRANSITIONAL   6
+#define SEG_OPTION_REVERSED_Y     7
+#define SEG_OPTION_MIRROR_Y       8
+#define SEG_OPTION_TRANSPOSED     9

 //Segment differs return byte
 #define SEG_DIFFERS_BRI        0x01 // opacity
 #define SEG_DIFFERS_OPT        0x02 // all segment options except: selected, reset & transitional
 #define SEG_DIFFERS_COL        0x04 // colors
 #define SEG_DIFFERS_FX         0x08 // effect/mode parameters
-#define SEG_DIFFERS_BOUNDS     0x10 // segment start/stop bounds
+#define SEG_DIFFERS_BOUNDS     0x10 // segment start/stop ounds
 #define SEG_DIFFERS_GSO        0x20 // grouping, spacing & offset
 #define SEG_DIFFERS_SEL        0x80 // selected

@@ -337,46 +320,26 @@

 // WLED Error modes
 #define ERR_NONE         0  // All good :)
-#define ERR_DENIED       1  // Permission denied
-#define ERR_EEP_COMMIT   2  // Could not commit to EEPROM (wrong flash layout?) OBSOLETE
+#define ERR_EEP_COMMIT   2  // Could not commit to EEPROM (wrong flash layout?)
 #define ERR_NOBUF        3  // JSON buffer was not released in time, request cannot be handled at this time
 #define ERR_JSON         9  // JSON parsing failed (input too large?)
 #define ERR_FS_BEGIN    10  // Could not init filesystem (no partition?)
 #define ERR_FS_QUOTA    11  // The FS is full or the maximum file size is reached
 #define ERR_FS_PLOAD    12  // It was attempted to load a preset that does not exist
 #define ERR_FS_IRLOAD   13  // It was attempted to load an IR JSON cmd, but the "ir.json" file does not exist
-#define ERR_FS_RMLOAD   14  // It was attempted to load an remote JSON cmd, but the "remote.json" file does not exist
-#define ERR_FS_GENERAL  19  // A general unspecified filesystem error occurred
+#define ERR_FS_GENERAL  19  // A general unspecified filesystem error occured
 #define ERR_OVERTEMP    30  // An attached temperature sensor has measured above threshold temperature (not implemented)
 #define ERR_OVERCURRENT 31  // An attached current sensor has measured a current above the threshold (not implemented)
 #define ERR_UNDERVOLT   32  // An attached voltmeter has measured a voltage below the threshold (not implemented)

-// Timer mode types
+//Timer mode types
 #define NL_MODE_SET               0            //After nightlight time elapsed, set to target brightness
 #define NL_MODE_FADE              1            //Fade to target brightness gradually
 #define NL_MODE_COLORFADE         2            //Fade to target brightness and secondary color gradually
 #define NL_MODE_SUN               3            //Sunrise/sunset. Target brightness is set immediately, then Sunrise effect is started. Max 60 min.

-// Settings sub page IDs
-#define SUBPAGE_MENU              0
-#define SUBPAGE_WIFI              1
-#define SUBPAGE_LEDS              2
-#define SUBPAGE_UI                3
-#define SUBPAGE_SYNC              4
-#define SUBPAGE_TIME              5
-#define SUBPAGE_SEC               6
-#define SUBPAGE_DMX               7
-#define SUBPAGE_UM                8
-#define SUBPAGE_UPDATE            9
-#define SUBPAGE_2D               10
-#define SUBPAGE_LOCK            251
-#define SUBPAGE_PINREQ          252
-#define SUBPAGE_CSS             253
-#define SUBPAGE_JS              254
-#define SUBPAGE_WELCOME         255

-#define NTP_PACKET_SIZE 48       // size of NTP receive buffer
-#define NTP_MIN_PACKET_SIZE 48   // min expected size - NTP v4 allows for "extended information" appended to the standard fields
+#define NTP_PACKET_SIZE 48

 //maximum number of rendered LEDs - this does not have to match max. physical LEDs, e.g. if there are virtual busses
 #ifndef MAX_LEDS
@@ -407,7 +370,7 @@
 #ifdef ESP8266
 #define SETTINGS_STACK_BUF_SIZE 2048
 #else
-#define SETTINGS_STACK_BUF_SIZE 3608  // warning: quite a large value for stack
+#define SETTINGS_STACK_BUF_SIZE 3096
 #endif

 #ifdef WLED_USE_ETHERNET
@@ -460,8 +423,8 @@

 //this is merely a default now and can be changed at runtime
 #ifndef LEDPIN
-#if defined(ESP8266) || (defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ARDUINO_ESP32_PICO)
-  #define LEDPIN 2    // GPIO2 (D4) on Wemos D1 mini compatible boards, and on boards where GPIO16 is not available
+#if defined(ESP8266) || (defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)) || defined(CONFIG_IDF_TARGET_ESP32C3)
+  #define LEDPIN 2    // GPIO2 (D4) on Wemod D1 mini compatible boards
 #else
  #define LEDPIN 16   // aligns with GPIO2 (D4) on Wemos D1 mini32 compatible boards
 #endif
@@ -479,13 +442,10 @@
  #define DEFAULT_LED_COUNT 30
 #endif

-#define INTERFACE_UPDATE_COOLDOWN 1000 // time in ms to wait between websockets, alexa, and MQTT updates
-
-#define PIN_RETRY_COOLDOWN   3000 // time in ms after an incorrect attempt PIN and OTA pass will be rejected even if correct
-#define PIN_TIMEOUT        900000 // time in ms after which the PIN will be required again, 15 minutes
+#define INTERFACE_UPDATE_COOLDOWN 2000 //time in ms to wait between websockets, alexa, and MQTT updates

 // HW_PIN_SCL & HW_PIN_SDA are used for information in usermods settings page and usermods themselves
-// which GPIO pins are actually used in a hardware layout (controller board)
+// which GPIO pins are actually used in a hardwarea layout (controller board)
 #if defined(I2CSCLPIN) && !defined(HW_PIN_SCL)
  #define HW_PIN_SCL I2CSCLPIN
 #endif
@@ -508,7 +468,7 @@
 #endif

 // HW_PIN_SCLKSPI & HW_PIN_MOSISPI & HW_PIN_MISOSPI are used for information in usermods settings page and usermods themselves
-// which GPIO pins are actually used in a hardware layout (controller board)
+// which GPIO pins are actually used in a hardwarea layout (controller board)
 #if defined(SPISCLKPIN) && !defined(HW_PIN_CLOCKSPI)
  #define HW_PIN_CLOCKSPI SPISCLKPIN
 #endif
@@ -42,6 +42,6 @@
 		<img alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAbUExURQAAAAB81gCU/zKq/////9bW1oCAgGhoaAAAAGPLX8AAAAAJdFJOU///////////AFNPeBIAAAAJcEhZcwAADsAAAA7AAWrWiQkAAACdSURBVDhPxc9bDoUgEANQebP/FUuHMjBGY/B+3EYR7RH0qC/ZBc6HwCljgHO+xZIVSI2sYgHaG7EBWh8jWoxTrCBFdDJ+BD4lbIHxAcz8APAVLTsrZE4eQD5qzt3cAFTYokC4YCN9Gybgu4yAQtBFLQXHuHABA7JMeOEC/E0W5uy9gv4vo5QHK2i7yq2C8UABM4HmL+CSTXCTF1DrCX6+Gp9zB5dsAAAAAElFTkSuQmCC">
 		<h1>404 Not Found</h1>
 		<b>Akemi does not know where you are headed...</b><br><br>
-		<button onclick="window.location.href='../?sliders'">Back to controls</button>
+		<button onclick="window.location.href='/sliders'">Back to controls</button>
 	</body>
 </html>
@@ -0,0 +1,129 @@
+@font-face {
+    font-family: "CIcons";
+    src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAApMAAsAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgDxIGEWNtYXAAAAFoAAAAVAAAAFQXVtKTZ2FzcAAAAbwAAAAIAAAACAAAABBnbHlmAAABxAAABfwAAAX8iNRp/2hlYWQAAAfAAAAANgAAADYd+7tRaGhlYQAAB/gAAAAkAAAAJAeYA9JobXR4AAAIHAAAAEQAAABEOgAGTGxvY2EAAAhgAAAAJAAAACQItgqAbWF4cAAACIQAAAAgAAAAIAAWAExuYW1lAAAIpAAAAYYAAAGGmUoJ+3Bvc3QAAAosAAAAIAAAACAAAwAAAAMD2wGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA6QwDwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADgAAAAKAAgAAgACAAEAIOkM//3//wAAAAAAIOkA//3//wAB/+MXBAADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQDWAIEDKgLVAAsAAAEhESMRITUhETMRIQMq/wBU/wABAFQBAAGB/wABAFQBAP8AAAAAAAIAgAArA7gDYwANABEAAAEXBzMRIREzJxUhESEVAREhEQLG8vK6/qqc8P6qAVb+qgFWA2Py8P6qAVbwnAFWuv26AVb+qgAAAAEAqgABA4ADVQAlAAABMxEhERQHBisBIicmNREhNSMVFAcGIyEiJyY9ATQ3NjMhMhcWFQMAgP6qDAwSVhIMDAGqKgwMEv4AEg0NDQ0SAgASDAwDAf6q/oASDAwMDBIB1qoqEg0NDQ0SqhIMDAwMEgABAQAAKwMqAysAEwAAASEVIxEjBgcGIyInJjU0NzYzMhcCAAEqqgIINjZKUDg4ODhQHCQDK4D+KkgxMTg4UFA4OAwAAAIAVgArA4ADKwALAB0AAAEWFRQHAScBNjMyFwEyFxYVFAcGIyInMjc2NTQ3NgN0DAz+gnYBfgwSEgz98DQmJjIyRmhCHhsbJiYC5QwSEgz+gnYBfgwM/jYmJjRGMjJWFxcmNCYmAAAAAQCSAIEDgAK9AAUAACUBFwEnNwGAAcQ8/gDuPPkBxDz+AO48AAAAAAIAqv/VA1YDgQAQACEAAAEWFRQHBiMVJzcVMjc2NTQnJyIHBhUUFwcmNTQ3NjM1FwcDIDZlZYyqqmpLSx7iaktLHj42ZWWMqqoCYVJkjGVlgKyqgEtLajw8iEtLakA4PlJkjGVlgKyqAAAAAAEAVgABA9YDgQA/AAABMhcWFRQHBisBFRQHBisBNTQnJiMiBwYdASMiJyY9ATMyNzY1NCcmKwE1NDc2OwE1NDc2MzIXFh0BMzIXFh0BA2osICAgICxAGRkioiIiMDAiIqIiGRlAMCEhISEwQBkZIqwfHywsHx+sIhkZAdUfHywsHx+sIhkZQDAhISEhMEAZGSKiIiIwMCIioiIZGUAsICAgICxAGRkirAAAAAACAFYAHQOqAysAIgA+AAAlNjc2NzY3NjU0JyYjIgcGByMmJyYjIgcGFRQXFhcWFxYfARMyFxYVFAcGBwYHBg8BJyYnJicmNTQ3NjMyFzYCBGAuLjY2FRUrK0AyKysQUBArKzJAKysVFTY2Li5gBMBkQ0MWFjs7MDBqPj6KPT00NENDZHRMTJNWLCw8PC4uLEAqKhwcLCwcHCoqQCwuLjw8LCxWBAKcRERiOjc3REQuLmA4Nnw+PlRUTmJERFpaAAAEAFYAAQOqA1UAAwATACMAJwAAATUzFQMyNzY1NCcmIyIHBhUUFxYTMhcWFRQHBiMiJyY1NDc2ExEzEQHWVCqMZWVlZYyMZWVlZYywfX19fbCwfX19fYZUAitWVv4qZWWMjGVlZWWMjGVlAwB9fbCwfX19fbCwfX39gAEA/wAAAAIAZAABA5wDVQAPAEkAAAEyNzY1NCcmIyIHBhUUFxYlFxYPAQYvAQYPAQYrASIvASYnBwYvASY/ASY1NDcnJj8BNh8BNj8BNjsBMh8BFhc3Nh8BFg8BFhUUAgA+LCwsLD4+LCwsLAF8Wg4KVggSaioeEAQQrBAEECYiahIIVgoOWgICWg4KVggSaioeEAQQrBAEECYiahIIVgoOWgIBFSwsPj4sLCwsPj4sLGxGChKUDgYqHgxwEhJwEBoqBg6UEgpGDhwcDkYKEpQOBioeDHASEnAQGioGDpQSCkYOHBwAAwAq/9UD1gOBAAcADwAXAAABPwEvAQ8BFwUnDwEfAT8BFw8BHwE/AScDKjZ2djY0dnb+9Gpq7OxqauxUNHZ2NDZ2dgIrdjQ2dnY2NIzs7Gpq7OxqgHY0NnZ2NjQAAAAAAwAqAFUD1gLtAA0AEwAdAAATNjMyFwcmJyYjIgcGBxc2MzIXBwE2ISAXByYjIgfWfK+velQkPz80ND8/JFY2Sko2gP4qxAETARPCVqDg4KABgXp6ViQaGhoaJFY2NoAB1sLCVp6eAAABAAAAAAAA3GG4ZV8PPPUACwQAAAAAAN2Du38AAAAA3YO7fwAA/9UD1gOBAAAACAACAAAAAAAAAAEAAAPA/8AAAAQAAAAAAAPWAAEAAAAAAAAAAAAAAAAAAAARBAAAAAAAAAAAAAAAAgAAAAQAANYEAACABAAAqgQAAQAEAABWBAAAkgQAAKoEAABWBAAAVgQAAFYEAABkBAAAKgQAACoAAAAAAAoAFAAeADgAXACUALYA6gD+ATQBigHqAioCmgLKAv4AAQAAABEASgAEAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAcAAAABAAAAAAACAAcAYAABAAAAAAADAAcANgABAAAAAAAEAAcAdQABAAAAAAAFAAsAFQABAAAAAAAGAAcASwABAAAAAAAKABoAigADAAEECQABAA4ABwADAAEECQACAA4AZwADAAEECQADAA4APQADAAEECQAEAA4AfAADAAEECQAFABYAIAADAAEECQAGAA4AUgADAAEECQAKADQApGljb21vb24AaQBjAG8AbQBvAG8AblZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMGljb21vb24AaQBjAG8AbQBvAG8Abmljb21vb24AaQBjAG8AbQBvAG8AblJlZ3VsYXIAUgBlAGcAdQBsAGEAcmljb21vb24AaQBjAG8AbQBvAG8AbkZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=) format('woff');
+}
+
+:root {
+    --c-1: #111;
+    --c-f: #fff;
+    --c-2: #222;
+    --c-3: #333;
+    --c-4: #444;
+    --c-5: #555;
+    --c-6: #666;
+    --c-8: #888;
+    --c-b: #bbb;
+    --c-c: #ccc;
+    --c-e: #eee;
+    --c-d: #ddd;
+    --c-r: #831;
+}
+
+html {
+    touch-action: manipulation;
+}
+
+body {
+    margin: 0;
+    background-color: var(--c-2);
+    font-family: Helvetica, Verdana, sans-serif;
+    font-size: 17px;
+    color: var(--c-f);
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-tap-highlight-color: transparent;
+    scrollbar-width: 6px;
+    scrollbar-color: var(--c-sb) transparent;
+}
+
+html,
+body {
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    overscroll-behavior: none;
+}
+
+.icons {
+    font-family: "CIcons";
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    display: inline-block;
+}
+
+#header {
+    width: 100%;
+    background-color: var(--c-3);
+    height: 45px;
+}
+
+#menu {
+    height: calc(100% - 45px);
+    background-color: var(--c-3);
+    width: 180px;
+}
+
+.entry {
+    height: 45px;
+    color: var(--c-b);
+}
+
+.entry:hover {
+    color: var(--c-f);
+    background-color: var(--c-4);
+}
+
+.e-icon {
+    padding: 10px;
+    display: inline-block;
+    width: 45px;
+    height: 100%;
+    box-sizing: border-box;
+}
+
+.e-label {
+    display: inline-block;
+    height: 45px;
+    vertical-align: top;
+    padding: 14px 0;
+    box-sizing: border-box;
+}
+
+.btn {
+    padding: 9px;
+    color: var(--c-b);
+    box-sizing: border-box;
+}
+
+.btn:hover {
+    color: var(--c-f);
+    background-color: var(--c-4);
+}
+
+.save {
+    float: right;
+    height: 100%;
+}
+
+.b-icon {
+    display: inline-block;
+}
+
+.b-label {
+    display: inline-block;
+    vertical-align: top;
+    padding: 4px;
+}
+
+@media (max-width: 500px) {
+    #menu {
+        width: 45px;
+    }
+    .e-label {
+        display: none;
+    }
+}
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+    <meta charset="utf-8">
+    <meta name="theme-color" content="#222222">
+    <link rel="stylesheet" href="cfg.css">
+    <script src="cfg_lang.js"></script>
+</head>
+
+<body>
+    <div id="header">
+        <div class="e-icon"><i class="icons">&#xe90a;</i></div>
+        <div class="l e-label l10n" id="h-cfg"></div>
+        <div class="btn save">
+            <div class="b-icon"><i class="icons">&#xe905;</i></div>
+            <div class="l b-label l10n" id="b-save">Save</div>
+        </div>
+    </div>
+    <div id="menu">
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe90c;</i></div><div class="l e-label l10n" id="e-nw">Network</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe90a;</i></div><div class="l e-label l10n" id="e-hw">Hardware</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe904;</i></div><div class="l e-label l10n" id="e-ui">Customization</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe906;</i></div><div class="l e-label l10n" id="e-if">Interfaces</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe90b;</i></div><div class="l e-label l10n" id="e-tm">Schedules</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe90a;</i></div><div class="l e-label l10n" id="e-dx">DMX Out</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe903;</i></div><div class="l e-label l10n" id="e-sr">Sound Reactive</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe907;</i></div><div class="l e-label l10n" id="e-um">Usermods</div></div>
+        <div class="entry"><div class="e-icon"><i class="icons">&#xe909;</i></div><div class="l e-label l10n" id="e-ab">About</div></div>
+    </div>
+    <div id="content">
+        <!-- simulate sections for each menu item -->
+        <div id="nw">
+            <h2 class="l10n">Network</h2>
+        </div>
+        <div id="hw">
+            <h2 class="l10n">Hardware</h2>
+        </div>
+        <div id="ui">
+            <h2 class="l10n">Customization</h2>
+        </div>
+        <div id="if">
+            <h2 class="l10n">Interfaces</h2>
+        </div>
+        <div id="tm">
+            <h2 class="l10n">Schedules</h2>
+        </div>
+        <div id="sr">
+            <h2 class="l10n">Sound Reactive</h2>
+        </div>
+        <div id="um">
+            <h2 class="l10n">Usermods</h2>
+        </div>
+        <div id="dx">
+            <h2 class="l10n">DMX Out</h2>
+        </div>
+        <div id="ab">
+            <h2 class="l10n">About</h2>
+        </div>
+        <div id="up">
+            <h2 class="l10n">Update</h2>
+        </div>
+        <div id="rb">
+            <h2 class="l10n">Reboot</h2>
+        </div>
+    </div>
+    <script src="cfg.js" type="module"></script>
+</body>
+
+</html>
@@ -0,0 +1,30 @@
+import $ from './dom.mjs'
+import translate from './translator.mjs'
+
+/* Dynamically create the menu
+const menuItems = [
+    { "icon": "&#xe90c;", "id": "e-nw", "text": "Network" },
+    { "icon": "&#xe90a;", "id": "e-hw", "text": "Hardware" },
+    { "icon": "&#xe904;", "id": "e-ui", "text": "Customization" },
+    { "icon": "&#xe906;", "id": "e-if", "text": "Interfaces" },
+    { "icon": "&#xe90b;", "id": "e-tm", "text": "Schedules" },
+    { "icon": "&#xe90a;", "id": "e-dx", "text": "DMX Out" },
+    { "icon": "&#xe903;", "id": "e-sr", "text": "Sound Reactive" },
+    { "icon": "&#xe907;", "id": "e-um", "text": "Usermods" },
+    { "icon": "&#xe909;", "id": "e-ab", "text": "About" }
+];
+
+$().ready(function() {
+    const menu = $('#menu');
+    menuItems.map(item =>
+        menu.append(`<div class="entry"><div class="e-icon"><i class="icons">${item.icon}</i></div><div class="l e-label l10n" id="${item.id}">${item.text}</div></div>`)
+    );
+});
+*/
+
+// populate labels when to dom is ready but before it is rendered
+$().ready(function() {
+    // https://www.w3.org/International/questions/qa-i18n
+    // Localization is sometimes written in English as l10n
+    translate('.l10n');
+});
@@ -0,0 +1,10 @@
+(function() {
+    // self executing function to ensure translations is set on page load
+    // so we dont have to wait for fetch/xhr request
+    window.translations = {
+        "About": "Über",
+        "Save": "Speichern",
+        "Schedules": "Zeitpläne",
+        "Sound Reactive": "Tonreaktiv"
+    };
+}());
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
    <meta http-equiv="Pragma" content="no-cache">
    <meta http-equiv="Expires" content="0">
@@ -46,7 +45,6 @@
        width: 7px;
        top: 50%;
        transform: translateY(-50%);
-        touch-action: none;
      }
      .color-picker-marker {
        height: 7px;
@@ -96,14 +94,9 @@
        line-height: 1;
      }
      .wrap {
-        width: 100%;
+        width: 800px;
        margin: 0 auto;
      }
-      @media (min-width: 800px) {
-        .wrap {
-          width: 800px;
-        }
-      }
      .palette {
        height: 20px;
      }
@@ -143,9 +136,6 @@
      .sendSpan, .editSpan{
        cursor: pointer;
      }
-      h1 {
-        font-size: 1.6rem;
-      }
    </style>
  </head>
 <body>
@@ -201,7 +191,6 @@
  var gradientLength = rect.width;
  var mOffs = Math.round((gradientLength / 256) / 2) - 5;
  var paletteArray = []; //Holds the palettes after load.
-  var paletteName = []; // Holds the names of the palettes after load.
  var svgSave = '<svg style="width:25px;height:25px" viewBox="0 0 24 24"><path fill=#fff d="M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M7,12L12,17V14H16V10H12V7L7,12Z"/></svg>'
  var svgEdit = '<svg style="width:25px;height:25px" viewBox="0 0 24 24"><path fill=#fff d="M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M15.1,7.07C15.24,7.07 15.38,7.12 15.5,7.23L16.77,8.5C17,8.72 17,9.07 16.77,9.28L15.77,10.28L13.72,8.23L14.72,7.23C14.82,7.12 14.96,7.07 15.1,7.07M13.13,8.81L15.19,10.87L9.13,16.93H7.07V14.87L13.13,8.81Z"/></svg>'

@@ -360,31 +349,24 @@
    var gradientLength = maxX - minX + 1;

    elmnt.onmousedown = dragMouseDown;
-    elmnt.ontouchstart = dragMouseDown;

    function dragMouseDown(e) {
      removeTrashcan(event)
      e = e || window.event;
-      var isTouch = e.type.startsWith('touch');
-      if (!isTouch) e.preventDefault();
+      e.preventDefault();
      // get the mouse cursor position at startup:
-      mousePos = isTouch ? e.touches[0].clientX : e.clientX;
+      mousePos = e.clientX;
      d.onmouseup = closeDragElement;
-      d.ontouchcancel = closeDragElement;
-      d.ontouchend = closeDragElement;
      // call a function whenever the cursor moves:
      d.onmousemove = elementDrag;
-      d.ontouchmove = elementDrag;
    }

    function elementDrag(e) {
      e = e || window.event;
-      var isTouch = e.type.startsWith('touch');
-      if (!isTouch) e.preventDefault();
+      e.preventDefault();
      // calculate the new cursor position:
-      var clientX = isTouch ? e.touches[0].clientX : e.clientX;
-      posNew = mousePos - clientX;
-      mousePos = clientX;
+      posNew = mousePos - e.clientX;
+      mousePos = e.clientX;
      mousePosInGradient = mousePos - (minX + 1)
      
      truePos = Math.round((mousePosInGradient/gradientLength)*256);
@@ -411,10 +393,7 @@
    function closeDragElement() {
      /* stop moving when mouse button is released:*/
      d.onmouseup = null;
-      d.ontouchcancel = null;
-      d.ontouchend = null;
      d.onmousemove = null;
-      d.ontouchmove = null;
    }
  }

@@ -506,7 +485,7 @@
      console.log('Error: ', e); console.log(' Status: ', this.status);
      //Show some error notification for some time
      setTimeout(()=>{
-        //Remove it when time has passed
+        //Remove it when time has pased
      }, 1000);
    });
    req.open("POST", "/upload");
@@ -521,10 +500,8 @@
    if (hst.length > 0 ) {
      try {
        var arr = [];
-        const responseInfo = await fetch('http://'+hst+'/json/info');
-        const responsePalettes = await fetch('http://'+hst+'/json/palettes');
-        const json = await responseInfo.json();
-        paletteName = await responsePalettes.json();
+        const response = await fetch('http://'+hst+'/json/info');
+        const json = await response.json();
        cpalc = json.cpalcount;
        fetchPalettes(cpalc-1);
      } catch (error) {
@@ -553,7 +530,7 @@
      paletteArray.push({"palette":[0,70,70,70,255,70,70,70]});
    }

-    //Get static palettes from localStorage and do some magic to reformat them into the same format as the palette JSONs
+    //Get static palettes from localStorage and do some magic to reformat them into the same format as the pallete JSONs
    //This code excludes any objects with "non valid integer colors", i.e. r, c1, c2, c3 and such
    //This code also fixes potentially broken palettes which doesn't end on 255
    //The code finally also removes any representations of the custom palettes, since we read them from file
@@ -563,7 +540,6 @@
      alert("The cache of palettes are missig from your browser. You should probably return to the main page and let it load properly for the palettes cache to regenerate before returning here.","Missing cached palettes!")
    } else {
      for (const key in wledPalx.p) {
-        wledPalx.p[key].name = paletteName[key];
        if (key > 245) {
          delete wledPalx.p[key];
          continue;
@@ -595,11 +571,8 @@
      }

      const pArray = Object.entries(wledPalx.p).map(([key, value]) => ({
-        [key]: value.flat(),
-        name: value.name
+        [key]: value.flat()
      }));
-      // Sort pArray by name
-      pArray.sort((a, b) => a.name.localeCompare(b.name));

      paletteArray.push( ...pArray);
    }
@@ -641,9 +614,6 @@
      editSpan.id = `editSpan${i}`;
      editSpan.onclick = function() {loadForEdit(i)};
      editSpan.setAttribute('title', `Copy slot ${i} palette to editor`);
-      if (paletteArray[i].name) {
-        editSpan.setAttribute('title', `Copy ${paletteArray[i].name} palette to editor`);
-      }
      editSpan.innerHTML = svgEdit;
      editSpan.classList.add("editSpan")

@@ -0,0 +1,126 @@
+/*
+ ** DOM module - base on https://github.com/kylebarrow/chibi with IE hacks removed
+ **
+ */
+var readyfn = [],
+    loadedfn = [],
+    domready = false,
+    pageloaded = false,
+    d = document,
+    w = window;
+
+// Fire any function calls on ready event
+function fireReady() {
+    var i;
+    domready = true;
+    for (i = 0; i < readyfn.length; i += 1) {
+        readyfn[i]();
+    }
+    readyfn = [];
+}
+
+// Fire any function calls on loaded event
+function fireLoaded() {
+    var i;
+    pageloaded = true;
+    for (i = 0; i < loadedfn.length; i += 1) {
+        loadedfn[i]();
+    }
+    loadedfn = [];
+}
+
+// Check DOM ready, page loaded
+if (d.addEventListener) {
+    // Standards
+    d.addEventListener('DOMContentLoaded', fireReady, false);
+    w.addEventListener('load', fireLoaded, false);
+}
+
+// Loop through node array
+function nodeLoop(fn, nodes) {
+    var i;
+    // Good idea to walk up the DOM
+    for (i = nodes.length - 1; i >= 0; i -= 1) {
+        fn(nodes[i]);
+    }
+}
+
+function dom(selector) {
+    var self, nodes = [],
+        json = false,
+        nodelist;
+
+    if (selector) {
+
+        // Element node
+        if (selector instanceof HTMLElement) {
+            nodes = [selector]; // return element as node list
+        } else if (selector instanceof NodeList) {
+            // JSON, document object or node list
+            json = (typeof selector.length !== 'number');
+            nodes = selector;
+        } else if (typeof selector === 'string') {
+            nodelist = d.querySelectorAll(selector);
+            nodes = Array.from(nodelist);
+        }
+    }
+
+    // Only attach nodes if not JSON
+    self = json ? {} : nodes;
+
+    // Public functions
+
+    // Fire on DOM ready
+    self.ready = function(fn) {
+        if (fn) {
+            if (domready) {
+                fn();
+                return self;
+            } else {
+                readyfn.push(fn);
+            }
+        }
+    };
+    // Fire on page loaded
+    self.loaded = function(fn) {
+        if (fn) {
+            if (pageloaded) {
+                fn();
+                return self;
+            } else {
+                loadedfn.push(fn);
+            }
+        }
+    };
+
+    // Executes a function on nodes
+    self.each = function(fn) {
+        if (typeof fn === 'function') {
+            nodeLoop(fn, nodes);
+        }
+        return self;
+    };
+
+    self.first = function() {
+        return dom(nodes.shift());
+    };
+
+    // Find last
+    self.last = function() {
+        return dom(nodes.pop());
+    };
+
+    // append html before end of the of the tag
+    self.append = function(value) {
+        if (value) {
+            nodeLoop(function(elm) {
+                elm.insertAdjacentHTML('beforeend', value);
+            }, nodes);
+        }
+        return self;
+    };
+
+    return self;
+}
+
+export default dom;
@@ -134,7 +134,7 @@ button {

 .off {
 	color: var(--c-6) !important;
-	/* cursor: default !important; */
+	cursor: default !important;
 }

 .top .icons, .bot .icons {
@@ -410,7 +410,6 @@ button {
 	position: -webkit-sticky;
 	position: sticky;
 	bottom: 0;
-	max-width: 300px;
 }

 #sliders .labels {
@@ -419,7 +418,7 @@ button {
 }

 .slider {
-	/*max-width: 300px;*/
+	max-width: 300px;
 	/* margin: 5px auto; add 5px; if you want some vertical space but looks ugly */
 	border-radius: 24px;
 	position: relative;
@@ -435,16 +434,12 @@ button {
 	z-index: 0;
 }

-#sliders .slider {
-	padding-right: 64px; /* offset for bubble */
-}
-
 #sliders .slider, #info .slider {
 	background-color: var(--c-2);
 }

 #sliders .sliderwrap, .sbs .sliderwrap {
-	left: 32px; /* offset for icon */
+	left: 16px; /* offset for icon */
 }

 .filter, .option {
@@ -690,19 +685,18 @@ img {

 .sliderbubble {
 	width: 24px;
-	position: absolute;
+	position: relative;
 	display: inline-block;
-	border-radius: 16px;
+	border-radius: 10px;
 	background: var(--c-3);
 	color: var(--c-f);
-	padding: 4px;
+	padding: 2px 4px;
 	font-size: 14px;
-	right: 6px;
-	transition: visibility .25s ease,opacity .25s ease;
+	right: 3px;
+	transition: visibility 0.25s ease, opacity 0.25s ease;
 	opacity: 0;
 	visibility: hidden;
-	/* left: 8px; */
-	top: 4px;
+	left: 8px;
 }

 output.sliderbubbleshow {
@@ -1010,7 +1004,7 @@ textarea {
 	width: 50px !important;
 }

-.segname, .pname, .bname {
+.segname, .pname {
 	white-space: nowrap;
 	text-align: center;
 	overflow: hidden;
@@ -1020,9 +1014,6 @@ textarea {
 	max-width: 170px;
 	position: relative;
 }
-.bname {
-	padding: 0 24px;
-}

 .segname .flr, .pname .flr {
 	transform: rotate(0deg);
@@ -1031,10 +1022,8 @@ textarea {

 /* segment power wrapper */
 .sbs {
-	/*padding: 1px 0 1px 20px;*/
+	padding: 1px 0 1px 20px;
 	display: var(--sgp);
-	width: 100%;
-	position: relative;
 }

 .pname {
@@ -1549,11 +1538,8 @@ TD .checkmark, TD .radiomark {
 	#sliders .sliderbubble {
 		display: none;
 	}
-	#sliders .sliderwrap, .sbs .sliderwrap {
-		width: calc(100% - 42px);
-	}
-	#sliders .slider {
-		padding-right: 0;
+	.sliderwrap {
+		width: calc(100% - 28px);
 	}
 	#sliders .sliderwrap {
 		left: 12px;
@@ -67,7 +67,7 @@
 			<button id="buttonSr" onclick="toggleLiveview()"><i class="icons">&#xe410;</i><p class="tab-label">Peek</p></button>
 			<button id="buttonI" onclick="toggleInfo()"><i class="icons">&#xe066;</i><p class="tab-label">Info</p></button>
 			<button id="buttonNodes" onclick="toggleNodes()"><i class="icons">&#xe22d;</i><p class="tab-label">Nodes</p></button>
-			<button onclick="window.location.href=getURL('/settings');"><i class="icons">&#xe0a2;</i><p class="tab-label">Config</p></button>
+			<button onclick="window.location.href='/settings';"><i class="icons">&#xe0a2;</i><p class="tab-label">Config</p></button>
 			<button id="buttonPcm" onclick="togglePcMode(true)"><i class="icons">&#xe23d;</i><p class="tab-label">PC Mode</p></button>
 		</div>
 		<div id="briwrap">
@@ -88,7 +88,7 @@
 <div class ="container">
 	<div id="Colors" class="tabcontent">
 		<div id="picker" class="noslide"></div>
-		<div id="hwrap" class="slider" style="margin-top: 20px;">
+		<div id="hwrap" class="slider">
 			<div class="sliderwrap il">
 				<input id="sliderH" class="noslide" oninput="fromH()" onchange="setColor(0)" max="359" min="0" type="range" value="0" step="any">
 				<div class="sliderdisplay" style="background: linear-gradient(90deg, #f00 2%, #ff0 19%, #0f0 35%, #0ff 52%, #00f 68%, #f0f 85%, #f00)"></div>
@@ -198,11 +198,10 @@
 					</label>
 				</div>
 			</div>
-		</div>
-		<div style="padding-block: 10px;">
-			<button class="btn btn-xs" type="button" onclick="window.location.href=getURL('/pxmagic.htm')"><i class="icons btn-icon">&#xe410;</i></button>
-			<button class="btn btn-xs" type="button" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
-			<button class="btn btn-xs" type="button" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
+			<div style="padding-bottom: 10px;">
+				<button class="btn btn-xs" type="button" onclick="window.location.href=(loc?'http://'+locip:'')+'/cpal.htm'"><i class="icons btn-icon">&#xe18a;</i></button>
+				<button class="btn btn-xs" type="button" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
+			</div>
 		</div>
 	</div>

@@ -364,7 +363,7 @@
 	<div>
 		<button class="btn infobtn" onclick="requestJson()">Refresh</button>
 		<button class="btn infobtn" onclick="toggleNodes()">Instance List</button>
-		<button class="btn infobtn" onclick="window.open(getURL('/update'),'_self');">Update WLED</button>
+		<button class="btn infobtn" onclick="window.open('/update','_self');">Update WLED</button>
 		<button class="btn infobtn" id="resetbtn" onclick="cnfReset()">Reboot WLED</button>
 	</div>
 	<br>
@@ -380,8 +379,8 @@
 	</div>	
 </div>

-<div id="mlv2D" class="modal">
-	<div id="klv2D" style="width:100%; height:100%">Loading...</div>
+<div id="mliveview2D" class="modal">
+	<div id="kliveview2D" style="width:100%; height:100%">Loading...</div><br>
 </div>

 <div id="rover" class="modal">
@@ -393,7 +392,6 @@
 	<button class="btn" onclick="setLor(2)">Override until reboot</button><br>
 	<span class="h">For best performance, it is recommended to turn off the streaming source when not in use.</span>
 </div>
-
 <i id="roverstar" class="icons huge" onclick="setLor(0)">&#xe410;</i><br>
 <script src="index.js"></script>
 </body>
@@ -1,5 +1,5 @@
 //page js
-var loc = false, locip, locproto = "http:";
+var loc = false, locip;
 var isOn = false, nlA = false, isLv = false, isInfo = false, isNodes = false, syncSend = false, syncTglRecv = true;
 var hasWhite = false, hasRGB = false, hasCCT = false;
 var nlDur = 60, nlTar = 0;
@@ -22,20 +22,20 @@ var pN = "", pI = 0, pNum = 0;
 var pmt = 1, pmtLS = 0, pmtLast = 0;
 var lastinfo = {};
 var isM = false, mw = 0, mh=0;
-var ws, cpick, ranges, wsRpt=0;
+var ws, cpick, ranges;
 var cfg = {
 	theme:{base:"dark", bg:{url:""}, alpha:{bg:0.6,tab:0.8}, color:{bg:""}},
 	comp :{colors:{picker: true, rgb: false, quick: true, hex: false},
-          labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:false,
-		  css:true, hdays:false, fxdef:true, idsort: false}
+          labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:false, css:true, hdays:false}
 };
 var hol = [
 	[0,11,24,4,"https://aircoookie.github.io/xmas.png"], // christmas
 	[0,2,17,1,"https://images.alphacoders.com/491/491123.jpg"], // st. Patrick's day
 	[2025,3,20,2,"https://aircoookie.github.io/easter.png"],
+	[2023,3,9,2,"https://aircoookie.github.io/easter.png"],
 	[2024,2,31,2,"https://aircoookie.github.io/easter.png"],
-	[0,6,4,1,"https://images.alphacoders.com/516/516792.jpg"], // 4th of July
-	[0,0,1,1,"https://images.alphacoders.com/119/1198800.jpg"] // new year
+	[0,6,4,1,"https://initiate.alphacoders.com/download/wallpaper/516792/images/jpg/510921363292536"], // 4th of July
+	[0,0,1,1,"https://initiate.alphacoders.com/download/wallpaper/1198800/images/jpg/2522807481585600"] // new year
 ];

 function handleVisibilityChange() {if (!d.hidden && new Date () - lastUpdate > 3000) requestJson();}
@@ -193,39 +193,21 @@ function loadSkinCSS(cId)
 		l.id   = cId;
 		l.rel  = 'stylesheet';
 		l.type = 'text/css';
-		l.href = getURL('/skin.css');
+		l.href = (loc?`http://${locip}`:'.') + '/skin.css';
 		l.media = 'all';
 		h.appendChild(l);
 	}
 }

-function getURL(path) {
-	return (loc ? locproto + "//" + locip : "") + path;
-}
 function onLoad()
 {
-	let l = window.location;
-	if (l.protocol == "file:") {
+	if (window.location.protocol == "file:") {
 		loc = true;
 		locip = localStorage.getItem('locIp');
 		if (!locip) {
 			locip = prompt("File Mode. Please enter WLED IP!");
 			localStorage.setItem('locIp', locip);
 		}
-	} else {
-		// detect reverse proxy and/or HTTPS
-		let pathn = l.pathname;
-		let paths = pathn.slice(1,pathn.endsWith('/')?-1:undefined).split("/");
-		//if (paths[0]==="sliders") paths.shift();
-		//while (paths[0]==="") paths.shift();
-		locproto = l.protocol;
-		locip = l.hostname + (l.port ? ":" + l.port : "");
-		if (paths.length > 0 && paths[0]!=="") {
-			loc = true;
-			locip +=  "/" + paths[0];
-		} else if (locproto==="https:") {
-			loc = true;
-		}
 	}
 	var sett = localStorage.getItem('wledUiCfg');
 	if (sett) cfg = mergeDeep(cfg, JSON.parse(sett));
@@ -235,7 +217,7 @@ function onLoad()
 	if (localStorage.getItem('pcm') == "true" || (!/Mobi/.test(navigator.userAgent) && localStorage.getItem('pcm') == null)) togglePcMode(true);
 	applyCfg();
 	if (cfg.comp.hdays) { //load custom holiday list
-		fetch(getURL("/holidays.json"), {	// may be loaded from external source
+		fetch((loc?`http://${locip}`:'.') + "/holidays.json", {	// may be loaded from external source
 			method: 'get'
 		})
 		.then((res)=>{
@@ -451,7 +433,9 @@ function loadPresets(callback = null)
 	// afterwards
 	if (!callback && pmt == pmtLast) return;

-	fetch(getURL('/presets.json'), {
+	var url = (loc?`http://${locip}`:'') + '/presets.json';
+
+	fetch(url, {
 		method: 'get'
 	})
 	.then(res => {
@@ -475,7 +459,9 @@ function loadPresets(callback = null)

 function loadPalettes(callback = null)
 {
-	fetch(getURL('/json/palettes'), {
+	var url = (loc?`http://${locip}`:'') + '/json/palettes';
+
+	fetch(url, {
 		method: 'get'
 	})
 	.then((res)=>{
@@ -497,7 +483,9 @@ function loadPalettes(callback = null)

 function loadFX(callback = null)
 {
-	fetch(getURL('/json/effects'), {
+	var url = (loc?`http://${locip}`:'') + '/json/effects';
+
+	fetch(url, {
 		method: 'get'
 	})
 	.then((res)=>{
@@ -509,7 +497,6 @@ function loadFX(callback = null)
 		populateEffects();
 	})
 	.catch((e)=>{
-		//setTimeout(loadFX, 250); // retry
 		showToast(e, true);
 	})
 	.finally(()=>{
@@ -520,7 +507,9 @@ function loadFX(callback = null)

 function loadFXData(callback = null)
 {
-	fetch(getURL('/json/fxdata'), {
+	var url = (loc?`http://${locip}`:'') + '/json/fxdata';
+
+	fetch(url, {
 		method: 'get'
 	})
 	.then((res)=>{
@@ -535,7 +524,6 @@ function loadFXData(callback = null)
 	})
 	.catch((e)=>{
 		fxdata = [];
-		//setTimeout(loadFXData, 250); // retry
 		showToast(e, true);
 	})
 	.finally(()=>{
@@ -682,7 +670,6 @@ ${i.opt&0x100?inforow("Debug","<button class=\"btn btn-xs\" onclick=\"requestJso
 ${inforow("Build",i.vid)}
 ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
 ${inforow("Uptime",getRuntimeStr(i.uptime))}
-${inforow("Time",i.time)}
 ${inforow("Free heap",heap," kB")}
 ${i.psram?inforow("Free PSRAM",(i.psram/1024).toFixed(1)," kB"):""}
 ${inforow("Estimated current",pwru)}
@@ -773,7 +760,7 @@ function populateSegments(s)
 				`<i class="icons e-icon flr" id="sege${i}" onclick="expand(${i})">&#xe395;</i>`+
 				(cfg.comp.segpwr ? segp : '') +
 				`<div class="segin" id="seg${i}in">`+
-					`<input type="text" class="ptxt" id="seg${i}t" autocomplete="off" maxlength=${li.arch=="esp8266"?32:64} value="${inst.n?inst.n:""}" placeholder="Enter name..."/>`+
+					`<input type="text" class="ptxt" id="seg${i}t" autocomplete="off" maxlength=32 value="${inst.n?inst.n:""}" placeholder="Enter name..."/>`+
 					`<table class="infot segt">`+
 					`<tr>`+
 						`<td>${isMSeg?'Start X':'Start LED'}</td>`+
@@ -826,7 +813,6 @@ function populateSegments(s)
 	resetUtil(noNewSegs);
 	if (gId('selall')) gId('selall').checked = true;
 	for (var i = 0; i <= lSeg; i++) {
-		if (!gId(`seg${i}`)) continue;
 		updateLen(i);
 		updateTrail(gId(`seg${i}bri`));
 		gId(`segr${i}`).classList.add("hide");
@@ -834,7 +820,7 @@ function populateSegments(s)
 	}
 	if (segCount < 2) {
 		gId(`segd${lSeg}`).classList.add("hide");
-		if (parseInt(gId("seg0bri").value)==255) gId(`segp0`).classList.add("hide");
+		gId(`segp0`).classList.add("hide");
 	}
 	if (!isM && !noNewSegs && (cfg.comp.seglen?parseInt(gId(`seg${lSeg}s`).value):0)+parseInt(gId(`seg${lSeg}e`).value)<ledCount) gId(`segr${lSeg}`).classList.remove("hide");
 	gId('segutil2').style.display = (segCount > 1) ? "block":"none"; // rsbtn parent
@@ -1005,15 +991,10 @@ function generateListItemHtml(listName, id, name, clickAction, extraHtml = '', e
 function btype(b)
 {
 	switch (b) {
-		case 2:
 		case 32: return "ESP32";
-		case 3:
 		case 33: return "ESP32-S2";
-		case 4:
 		case 34: return "ESP32-S3";
-		case 5:
 		case 35: return "ESP32-C3";
-		case 1:
 		case 82: return "ESP8266";
 	}
 	return "?";
@@ -1034,9 +1015,8 @@ function populateNodes(i,n)
 		n.nodes.sort((a,b) => (a.name).localeCompare(b.name));
 		for (var o of n.nodes) {
 			if (o.name) {
-				let onoff = `<i class="icons e-icon flr ${o.type&0x80?'':'off'}" onclick="rmtTgl('${o.ip}',this);"">&#xe08f;</i>`;
-				var url = `<button class="btn" title="${o.ip}" onclick="location.assign('http://${o.ip}');"><div class="bname">${bname(o)}</div>${o.vid<2307130?'':onoff}</button>`;
-				urows += inforow(url,`${btype(o.type&0x7F)}<br><i>${o.vid==0?"N/A":o.vid}</i>`);
+				var url = `<button class="btn" title="${o.ip}" onclick="location.assign('http://${o.ip}');">${bname(o)}</button>`;
+				urows += inforow(url,`${btype(o.type)}<br><i>${o.vid==0?"N/A":o.vid}</i>`);
 				nnodes++;
 			}
 		}
@@ -1052,7 +1032,8 @@ function populateNodes(i,n)

 function loadNodes()
 {
-	fetch(getURL('/json/nodes'), {
+	var url = (loc?`http://${locip}`:'') + '/json/nodes';
+	fetch(url, {
 		method: 'get'
 	})
 	.then((res)=>{
@@ -1208,7 +1189,7 @@ function updateUI()
 	if (hasRGB) {
 		updateTrail(gId('sliderR'));
 		updateTrail(gId('sliderG'));
-		updateTrail(gId('sliderB'));
+		updateTrail(gId('sliderB'));	
 	}
 	if (hasWhite) updateTrail(gId('sliderW'));

@@ -1247,7 +1228,7 @@ function updateSelectedPalette(s)
 	if (s > 1 && s < 6) {
 		cd[0].classList.remove('hide'); // * Color 1
 		if (s > 2) cd[1].classList.remove('hide'); // * Color 1 & 2
-		if (s > 3) cd[2].classList.remove('hide'); // all colors
+		if (s == 5) cd[2].classList.remove('hide'); // all colors
 	} else {
 		for (let i of cd) if (i.dataset.hide == '1') i.classList.add('hide');
 	}
@@ -1272,7 +1253,6 @@ function updateSelectedFx()
 		// hide non-0D effects if segment only has 1 pixel (0D)
 		var fxs = parent.querySelectorAll('.lstI');
 		for (const fx of fxs) {
-			if (!fx.dataset.opt) continue;
 			let opts = fx.dataset.opt.split(";");
 			if (fx.dataset.id>0) {
 				if (segLmax==0) fx.classList.add('hide'); // none of the segments selected (hide all effects)
@@ -1301,7 +1281,7 @@ function displayRover(i,s)

 function cmpP(a, b)
 {
-	if (cfg.comp.idsort || !a[1].n) return (parseInt(a[0]) > parseInt(b[0]));
+	if (!a[1].n) return (a[0] > b[0]);
 	// sort playlists first, followed by presets with characters and last presets with special 1st character
 	const c = a[1].n.charCodeAt(0);
 	const d = b[1].n.charCodeAt(0);
@@ -1313,8 +1293,7 @@ function cmpP(a, b)

 function makeWS() {
 	if (ws || lastinfo.ws < 0) return;
-	let url = loc ? getURL('/ws').replace("http","ws") : "ws://"+window.location.hostname+"/ws";
-	ws = new WebSocket(url);
+	ws = new WebSocket((window.location.protocol == "https:"?"wss":"ws")+'://'+(loc?locip:window.location.hostname)+'/ws');
 	ws.binaryType = "arraybuffer";
 	ws.onmessage = (e)=>{
 		if (e.data instanceof ArrayBuffer) return; // liveview packet
@@ -1338,12 +1317,11 @@ function makeWS() {
 	};
 	ws.onclose = (e)=>{
 		gId('connind').style.backgroundColor = "var(--c-r)";
-		if (wsRpt++ < 5) setTimeout(makeWS,1500); // retry WS connection
+		setTimeout(makeWS,1500); // retry WS connection
 		ws = null;
 	}
 	ws.onopen = (e)=>{
 		//ws.send("{'v':true}"); // unnecessary (https://github.com/Aircoookie/WLED/blob/master/wled00/ws.cpp#L18)
-		wsRpt = 0;
 		reqsLegal = true;
 	}
 }
@@ -1460,9 +1438,9 @@ function readState(s,command=false)
 //      - For AC effects (id<128) 2 sliders and 3 colors and the palette will be shown
 //      - For SR effects (id>128) 5 sliders and 3 colors and the palette will be shown
 // If effective (@)
-//      - a ; separates slider controls (left) from color controls (middle) and palette control (right)
+//      - a ; seperates slider controls (left) from color controls (middle) and palette control (right)
 //      - if left, middle or right is empty no controls are shown
-//      - a , separates slider controls (max 5) or color controls (max 3). Palette has only one value
+//      - a , seperates slider controls (max 5) or color controls (max 3). Palette has only one value
 //      - a ! means that the default is used.
 //             - For sliders: Effect speeds, Effect intensity, Custom 1, Custom 2, Custom 3
 //             - For colors: Fx color, Background color, Custom
@@ -1513,15 +1491,12 @@ function setEffectParameters(idx)
 	}

 	// set the bottom position of selected effect (sticky) as the top of sliders div
-	function setSelectedEffectPosition() {
+	setInterval(()=>{
 		let top = parseInt(getComputedStyle(gId("sliders")).height);
 		top += 5;
 		let sel = d.querySelector('#fxlist .selected');
 		if (sel) sel.style.bottom = top + "px"; // we will need to remove this when unselected (in setFX())
-	}
-
-	setSelectedEffectPosition();
-	setInterval(setSelectedEffectPosition,750);
+	},750);
 	// set html color items on/off
 	var cslLabel = '';
 	var sep = '';
@@ -1597,6 +1572,7 @@ function requestJson(command=null)
 	if (command && !reqsLegal) return; // stop post requests from chrome onchange event on page restore
 	if (!jsonTimeout) jsonTimeout = setTimeout(()=>{if (ws) ws.close(); ws=null; showErrorToast()}, 3000);
 	var req = null;
+	var url = (loc?`http://${locip}`:'') + '/json/si';
 	var useWs = (ws && ws.readyState === WebSocket.OPEN);
 	var type = command ? 'post':'get';
 	if (command) {
@@ -1617,7 +1593,7 @@ function requestJson(command=null)
 		return;
 	}

-	fetch(getURL('/json/si'), {
+	fetch(url, {
 		method: type,
 		headers: {
 			"Content-type": "application/json; charset=UTF-8"
@@ -1648,7 +1624,6 @@ function requestJson(command=null)
 		//load presets and open websocket sequentially
 		if (!pJson || isEmpty(pJson)) setTimeout(()=>{
 			loadPresets(()=>{
-				wsRpt = 0;
 				if (!(ws && ws.readyState === WebSocket.OPEN)) makeWS();
 			});
 		},25);
@@ -1696,22 +1671,27 @@ function toggleSync()

 function toggleLiveview()
 {
+	//WLEDSR adding liveview2D support
 	if (isInfo && isM) toggleInfo();
 	if (isNodes && isM) toggleNodes();
 	isLv = !isLv;
-	let wsOn = ws && ws.readyState === WebSocket.OPEN;

 	var lvID = "liveview";
-	if (isM && wsOn) {
-		lvID += "2D";
-		if (isLv) gId('klv2D').innerHTML = `<iframe id="${lvID}" src="about:blank"></iframe>`;
-		gId('mlv2D').style.transform = (isLv) ? "translateY(0px)":"translateY(100%)";
+	if (isM) {   
+		lvID = "liveview2D"
+		if (isLv) {
+		var cn = '<iframe id="liveview2D" src="about:blank"></iframe>';
+		d.getElementById('kliveview2D').innerHTML = cn;
+		}
+
+		gId('mliveview2D').style.transform = (isLv) ? "translateY(0px)":"translateY(100%)";
 	}

 	gId(lvID).style.display = (isLv) ? "block":"none";
-	gId(lvID).src = (isLv) ? getURL("/" + lvID + ((wsOn) ? "?ws":"")):"about:blank";
-	gId('buttonSr').classList.toggle("active");
-	if (!isLv && wsOn) ws.send('{"lv":false}');
+	var url = (loc?`http://${locip}`:'') + "/" + lvID;
+	gId(lvID).src = (isLv) ? url:"about:blank";
+	gId('buttonSr').className = (isLv) ? "active":"";
+	if (!isLv && ws && ws.readyState === WebSocket.OPEN) ws.send('{"lv":false}');
 	size();
 }

@@ -1798,7 +1778,6 @@ function makePlSel(el, incPl=false)
 	var arr = Object.entries(pJson);
 	for (var a of arr) {
 		var n = a[1].n ? a[1].n : "Preset " + a[0];
-		if (cfg.comp.idsort) n = a[0] + ' ' + n;
 		if (!incPl && a[1].playlist && a[1].playlist.ps) continue; // remove playlists, sub-playlists not yet supported
 		plSelContent += `<option value="${a[0]}" ${a[0]==el?"selected":""}>${n}</option>`
 	}
@@ -1890,7 +1869,7 @@ function makeP(i,pl)
 			end: 0
 		};
 		var rep = plJson[i].repeat ? plJson[i].repeat : 0;
-		content =
+		content = 
 `<div id="ple${i}" style="margin-top:10px;"></div><label class="check revchkl">Shuffle
 	<input type="checkbox" id="pl${i}rtgl" onchange="plR(${i})" ${plJson[i].r||rep<0?"checked":""}>
 	<span class="checkmark"></span>
@@ -2056,14 +2035,14 @@ function tglSegn(s)
 function selSegAll(o)
 {
 	var obj = {"seg":[]};
-	for (let i=0; i<=lSeg; i++) if (gId(`seg${i}`)) obj.seg.push({"id":i,"sel":o.checked});
+	for (let i=0; i<=lSeg; i++) obj.seg.push({"id":i,"sel":o.checked});
 	requestJson(obj);
 }

 function selSegEx(s)
 {
 	var obj = {"seg":[]};
-	for (let i=0; i<=lSeg; i++) if (gId(`seg${i}`)) obj.seg.push({"id":i,"sel":(i==s)});
+	for (let i=0; i<=lSeg; i++) obj.seg.push({"id":i,"sel":(i==s)});
 	obj.mainseg = s;
 	requestJson(obj);
 }
@@ -2081,7 +2060,7 @@ function selGrp(g)
 	event.stopPropagation();
 	var sel = gId(`segcont`).querySelectorAll(`div[data-set="${g}"]`);
 	var obj = {"seg":[]};
-	for (let i=0; i<=lSeg; i++) if (gId(`seg${i}`)) obj.seg.push({"id":i,"sel":false});
+	for (let i=0; i<=lSeg; i++) obj.seg.push({"id":i,"sel":false});
 	if (sel) for (let s of sel||[]) {
 		let i = parseInt(s.id.substring(3));
 		obj.seg[i] = {"id":i,"sel":true};
@@ -2248,7 +2227,8 @@ function setFX(ind = null)
 	} else {
 		d.querySelector(`#fxlist input[name="fx"][value="${ind}"]`).checked = true;
 	}
-	var obj = {"seg": {"fx": parseInt(ind), "fxdef": cfg.comp.fxdef}}; // fxdef sets effect parameters to default values
+
+	var obj = {"seg": {"fx": parseInt(ind),"fxdef":1}}; // fxdef sets effect parameters to default values, TODO add client setting
 	requestJson(obj);
 }

@@ -2582,24 +2562,6 @@ function setBalance(b)
 	requestJson(obj);
 }

-function rmtTgl(ip,i) {
-	event.preventDefault();
-	event.stopPropagation();
-	fetch(`http://${ip}/win&T=2`, {method: 'get'})
-	.then((r)=>{
-		return r.text();
-	})
-	.then((t)=>{
-		let c = (new window.DOMParser()).parseFromString(t, "text/xml");
-		// perhaps just i.classList.toggle("off"); would be enough
-		if (c.getElementsByTagName('ac')[0].textContent === "0") {
-			i.classList.add("off");
-		} else {
-			i.classList.remove("off");
-		}
-	});
-}
-
 var hc = 0;
 setInterval(()=>{
 	if (!isInfo) return;
@@ -2622,7 +2584,7 @@ function cnfReset()
 		bt.innerHTML = "Confirm Reboot";
 		cnfr = true; return;
 	}
-	window.location.href = getURL("/reset");
+	window.location.href = "/reset";
 }

 var cnfrS = false;
@@ -2676,7 +2638,9 @@ function loadPalettesData(callback = null)

 function getPalettesData(page, callback)
 {
-	fetch(getURL(`/json/palx?page=${page}`), {
+	var url = (loc?`http://${locip}`:'') + `/json/palx?page=${page}`;
+
+	fetch(url, {
 		method: 'get',
 		headers: {
 			"Content-type": "application/json; charset=UTF-8"
@@ -17,17 +17,21 @@
    position: absolute;
  }
  </style>
+</head>
+<body>
+  <div id="canv" />
  <script>
-    var ws;
+    update();
+    
    var tmout = null;
-    function update() // via HTTP (/json/live)
+    function update()
    {
      if (document.hidden) {
        clearTimeout(tmout);
        tmout = setTimeout(update, 250);
        return;
      }
-      fetch('./json/live')
+      fetch('/json/live')
      .then(res => {
        if (!res.ok) {
          clearTimeout(tmout);
@@ -53,57 +57,8 @@
        clearTimeout(tmout);
        tmout = setTimeout(update, 2500);
      })
-    }
-    function S() { // Startup function (onload)
-      let wsOn = (window.location.href.indexOf("?ws") > 0);
-      if (!wsOn) {update(); return;}

-      // Initialize WebSocket connection
-      try {
-        ws = top.window.ws;
-      } catch (e) {}
-      if (ws && ws.readyState === WebSocket.OPEN) {
-        //console.info("Peek uses top WS");
-        ws.send("{'lv':true}");
-      } else {
-        //console.info("Peek WS opening");
-        let l = window.location;
-        let pathn = l.pathname;
-        let paths = pathn.slice(1,pathn.endsWith('/')?-1:undefined).split("/");
-        let url = l.origin.replace("http","ws");
-        if (paths.length > 1) {
-          url +=  "/" + paths[0];
-        }
-        ws = new WebSocket(url+"/ws");
-        ws.onopen = function () {
-          //console.info("Peek WS open");
-          ws.send("{'lv':true}");
-        }
-      }
-      ws.binaryType = "arraybuffer";
-      ws.addEventListener('message', (e) => {
-        try {
-          if (toString.call(e.data) === '[object ArrayBuffer]') {
-            let leds = new Uint8Array(event.data);
-            if (leds[0] != 76) return; //'L'
-            let str = "linear-gradient(90deg,";
-            let len = leds.length;
-            let start = leds[1]==2 ? 4 : 2; // 1 = 1D, 2 = 1D/2D (leds[2]=w, leds[3]=h)
-            for (i = start; i < len; i+=3) {
-              str += `rgb(${leds[i]},${leds[i+1]},${leds[i+2]})`;
-              if (i < len -3) str += ","
-            }
-            str += ")";
-            document.getElementById("canv").style.background = str;
-          }
-        } catch (err) {
-          console.error("Peek WS error:",err);
-        } 
-      });
    }
  </script>
-</head>
-<body onload="S()">
-  <div id="canv"></div>
 </body>
 </html>
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+  <meta charset="utf-8">
+  <meta name="theme-color" content="#222222">
+  <title>WLED Live Preview</title>
+  <style>
+  body {
+    margin: 0;
+  }
+  #canv {
+    background: black;
+    filter: brightness(175%);
+    width: 100%;
+    height: 100%;
+    position: absolute;
+  }
+  </style>
+</head>
+<body>
+  <div id="canv"></div>
+  <script>
+    var ws;
+    try {
+      ws = top.window.ws;
+    } catch (e) {}
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      //console.info("Peek uses top WS");
+      ws.send("{'lv':true}");
+    } else {
+      console.info("Peek WS opening");
+      ws = new WebSocket((window.location.protocol == "https:"?"wss":"ws")+"://"+document.location.host+"/ws");
+      ws.onopen = function () {
+        //console.info("Peek WS open");
+        ws.send("{'lv':true}");
+      }
+    }
+    ws.binaryType = "arraybuffer";
+    ws.addEventListener('message', (e) => {
+      try {
+        if (toString.call(e.data) === '[object ArrayBuffer]') {
+          let leds = new Uint8Array(event.data);
+          if (leds[0] != 76) return; //'L'
+          let str = "linear-gradient(90deg,";
+          let len = leds.length;
+          let start = leds[1]==2 ? 4 : 2; // 1 = 1D, 2 = 1D/2D (leds[2]=w, leds[3]=h)
+          for (i = start; i < len; i+=3) {
+            str += `rgb(${leds[i]},${leds[i+1]},${leds[i+2]})`;
+            if (i < len -3) str += ","
+          }
+          str += ")";
+          document.getElementById("canv").style.background = str;
+        }
+      } catch (err) {
+        console.error("Peek WS error:",err);
+      } 
+    });
+  </script>
+</body>
+</html>
@@ -33,14 +33,7 @@
 			if (ws && ws.readyState === WebSocket.OPEN) {
 				ws.send("{'lv':true}");
 			} else {
-				let l = window.location;
-				let pathn = l.pathname;
-				let paths = pathn.slice(1,pathn.endsWith('/')?-1:undefined).split("/");
-				let url = l.origin.replace("http","ws");
-				if (paths.length > 1) {
-					url +=  "/" + paths[0];
-				}
-				ws = new WebSocket(url+"/ws");
+				ws = new WebSocket((window.location.protocol == "https:"?"wss":"ws")+"://"+document.location.host+"/ws");
 				ws.onopen = ()=>{
 					ws.send("{'lv':true}");
 				}
@@ -54,7 +47,7 @@
 						let mW = leds[2]; // matrix width
 						let mH = leds[3]; // matrix height
 						let pPL = Math.min(c.width / mW, c.height / mH); // pixels per LED (width of circle)
-						let lOf = Math.floor((c.width - pPL*mW)/2); //left offset (to center matrix)
+						let lOf = Math.floor((c.width - pPL*mW)/2); //left offeset (to center matrix)
 						var i = 4;
 						for (y=0.5;y<mH;y++) for (x=0.5; x<mW; x++) {
 							ctx.fillStyle = `rgb(${leds[i]},${leds[i+1]},${leds[i+2]})`;
@@ -6,8 +6,8 @@
 	<title>WLED Message</title>
 	<script>
 		function B() { window.history.back() };
-		function RS() { window.location = "../settings"; }
-		function RP() { top.location.href = "../"; }
+		function RS() { window.location = "/settings"; }
+		function RP() { top.location.href = "/"; }
 	</script>
 	<style>
 		@import url("style.css");
@@ -69,7 +69,7 @@ function getPixelRGBValues(base64Image) {
    let sizeY = szY.value;

    if (color != accentColor || sizeX < 1 || sizeY < 1){
-      //image will not be resized Set desired size to original size
+      //image will not be rezised Set desitred size to original size
      sizeX = image.width;
      sizeY = image.height;
      //failsafe for not generating huge images automatically
@@ -153,7 +153,7 @@ function getPixelRGBValues(base64Image) {
    let curentColorIndex = 0
    let commandArray = [];

-    //For every pixel in the LED array
+    //For evry pixel in the LED array
    for (let i = 0; i < maxi; i++) {
      let pixel = ledRGBValues[i];
      let r = pixel[0];
--- a/Show More
+++ b/Show More