diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efdb3f7af..3de08ff7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,11 +57,6 @@ jobs:
           cache: 'pip'
     - name: Install PlatformIO
       run: pip install -r requirements.txt
-    - name: Add usermods environment
-      run: |
-        cp -v usermods/platformio_override.usermods.ini platformio_override.ini
-        echo -n "custom_usermods = " >> platformio_override.ini
-        find usermods/ -name library.json | xargs dirname | xargs -n 1 basename | xargs echo >> platformio_override.ini
 
     - name: Build firmware
       run: pio run -e ${{ matrix.environment }}
diff --git a/boards/lolin_s3_mini.json b/boards/lolin_s3_mini.json
new file mode 100644
index 000000000..7f55f0bde
--- /dev/null
+++ b/boards/lolin_s3_mini.json
@@ -0,0 +1,47 @@
+{
+    "build": {
+      "arduino": {
+        "ldscript": "esp32s3_out.ld",
+        "memory_type": "qio_qspi"
+      },
+      "core": "esp32",
+      "extra_flags": [
+        "-DBOARD_HAS_PSRAM",
+        "-DARDUINO_LOLIN_S3_MINI",
+        "-DARDUINO_USB_MODE=1"
+      ],
+      "f_cpu": "240000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "qio",
+      "hwids": [
+        [
+          "0x303A",
+          "0x8167"
+        ]
+      ],
+      "mcu": "esp32s3",
+      "variant": "lolin_s3_mini"
+    },
+    "connectivity": [
+      "bluetooth",
+      "wifi"
+    ],
+    "debug": {
+      "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "WEMOS LOLIN S3 Mini",
+    "upload": {
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://www.wemos.cc/en/latest/s3/index.html",
+    "vendor": "WEMOS"
+}
+  
\ No newline at end of file
diff --git a/pio-scripts/fixup_usermods.py b/pio-scripts/fixup_usermods.py
deleted file mode 100644
index 5b8cddf32..000000000
--- a/pio-scripts/fixup_usermods.py
+++ /dev/null
@@ -1,17 +0,0 @@
-Import('env')
-
-# Patch up each usermod's include folders to include anything referenced by wled
-# This is because usermods need to include wled.h
-lib_builders = env.GetLibBuilders()
-um_deps = [dep for dep in lib_builders if "/usermods" in dep.src_dir]
-other_deps = [dep for dep in lib_builders if "/usermods" not in dep.src_dir]
-
-for um in um_deps:
-    # Add include paths for all non-usermod dependencies
-    for dep in other_deps:
-        for dir in dep.get_include_dirs():
-            um.env.PrependUnique(CPPPATH=dir)
-    # Add the wled folder to the include path
-    um.env.PrependUnique(CPPPATH=env["PROJECT_SRC_DIR"])
-       
-#raise RuntimeError("debug")
diff --git a/pio-scripts/load_usermods.py b/pio-scripts/load_usermods.py
index 55b9c4b1b..7aa6c4d8d 100644
--- a/pio-scripts/load_usermods.py
+++ b/pio-scripts/load_usermods.py
@@ -1,26 +1,95 @@
-Import('env')
-import os
-
-def find_usermod(mod_dir: str, mod: str):
-  """Locate this library in the usermods folder.
-     We do this to avoid needing to rename a bunch of folders;
-     this could be removed later
-  """
-  # Check name match
-  mp = f"{mod_dir}/{mod}"
-  if os.path.exists(mp):
-    return mp
-  mp = f"{mod_dir}/usermod_v2_{mod}"
-  if os.path.exists(mp):
-    return mp
-  raise RuntimeError(f"Couldn't locate module {mod} in usermods directory!")
-
-usermods = env.GetProjectOption("custom_usermods","")
-if usermods:
-  proj = env.GetProjectConfig()
-  deps = env.GetProjectOption('lib_deps')  
-  src_dir = proj.get("platformio", "src_dir")
-  src_dir = src_dir.replace('\\','/')
-  mod_paths = {mod: find_usermod(f"{src_dir}/../usermods", mod) for mod in usermods.split(" ")}
-  usermods = [f"{mod} = symlink://{path}" for mod, path in mod_paths.items()]
-  proj.set("env:" + env['PIOENV'], 'lib_deps', deps + usermods)  
+Import('env')
+import os.path
+from pathlib import Path   # For OS-agnostic path manipulation
+from platformio.package.manager.library import LibraryPackageManager
+
+usermod_dir = Path(env["PROJECT_DIR"]) / "usermods"
+all_usermods = [f for f in usermod_dir.iterdir() if f.is_dir() and f.joinpath('library.json').exists()]
+
+if env['PIOENV'] == "usermods":
+   # Add all usermods
+   env.GetProjectConfig().set(f"env:usermods", 'custom_usermods', " ".join([f.name for f in all_usermods]))
+
+def find_usermod(mod: str):
+  """Locate this library in the usermods folder.
+     We do this to avoid needing to rename a bunch of folders;
+     this could be removed later
+  """
+  # Check name match
+  mp = usermod_dir / mod
+  if mp.exists():
+    return mp
+  mp = usermod_dir / f"usermod_v2_{mod}"
+  if mp.exists():
+    return mp
+  raise RuntimeError(f"Couldn't locate module {mod} in usermods directory!")
+
+usermods = env.GetProjectOption("custom_usermods","")
+if usermods:
+  # Inject usermods in to project lib_deps
+  proj = env.GetProjectConfig()
+  deps = env.GetProjectOption('lib_deps')
+  src_dir = proj.get("platformio", "src_dir")
+  src_dir = src_dir.replace('\\','/')
+  mod_paths = {mod: find_usermod(mod) for mod in usermods.split(" ")}
+  usermods = [f"{mod} = symlink://{path}" for mod, path in mod_paths.items()]
+  proj.set("env:" + env['PIOENV'], 'lib_deps', deps + usermods)
+  # Force usermods to be installed in to the environment build state before the LDF runs
+  # Otherwise we won't be able to see them until it's too late to change their paths for LDF
+  # Logic is largely borrowed from PlaformIO internals
+  not_found_specs = []
+  for spec in usermods:
+    found = False
+    for storage_dir in env.GetLibSourceDirs():
+      #print(f"Checking {storage_dir} for {spec}")
+      lm = LibraryPackageManager(storage_dir)
+      if lm.get_package(spec):
+          #print("Found!")
+          found = True
+          break
+    if not found:
+        #print("Missing!")
+        not_found_specs.append(spec)
+  if not_found_specs:
+      lm = LibraryPackageManager(
+          env.subst(os.path.join("$PROJECT_LIBDEPS_DIR", "$PIOENV"))
+      )
+      for spec in not_found_specs:
+        #print(f"LU: forcing install of {spec}")
+        lm.install(spec)
+
+
+# Monkey-patch ConfigureProjectLibBuilder to mark up the dependencies
+# Save the old value
+old_ConfigureProjectLibBuilder = env.ConfigureProjectLibBuilder
+
+# Our new wrapper
+def wrapped_ConfigureProjectLibBuilder(xenv):
+  # Update usermod properties
+  # Set libArchive before build actions are added
+  for um in (um for um in xenv.GetLibBuilders() if usermod_dir in Path(um.src_dir).parents):
+    build = um._manifest.get("build", {})
+    build["libArchive"] = False
+    um._manifest["build"] = build
+
+  # Call the wrapped function
+  result = old_ConfigureProjectLibBuilder.clone(xenv)()
+
+  # Fix up include paths
+  # In PlatformIO >=6.1.17, this could be done prior to ConfigureProjectLibBuilder
+  wled_dir = xenv["PROJECT_SRC_DIR"]
+  lib_builders = xenv.GetLibBuilders()
+  um_deps = [dep for dep in lib_builders if usermod_dir in Path(dep.src_dir).parents]
+  other_deps = [dep for dep in lib_builders if usermod_dir not in Path(dep.src_dir).parents]
+  for um in um_deps:
+    # Add the wled folder to the include path
+    um.env.PrependUnique(CPPPATH=wled_dir)
+    # Add WLED's own dependencies
+    for dep in other_deps:
+        for dir in dep.get_include_dirs():
+            um.env.PrependUnique(CPPPATH=dir)
+
+  return result
+
+# Apply the wrapper
+env.AddMethod(wrapped_ConfigureProjectLibBuilder, "ConfigureProjectLibBuilder")
diff --git a/platformio.ini b/platformio.ini
index a64295e51..9d346fa57 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,7 +10,7 @@
 # ------------------------------------------------------------------------------
 
 # CI/release binaries
-default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, nodemcuv2_160, esp8266_2m_160, esp01_1m_full_160, nodemcuv2_compat, esp8266_2m_compat, esp01_1m_full_compat, esp32dev, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_16MB_opi, esp32s3dev_8MB_opi, esp32s3_4M_qspi, esp32_wrover, usermods
+default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, nodemcuv2_160, esp8266_2m_160, esp01_1m_full_160, nodemcuv2_compat, esp8266_2m_compat, esp01_1m_full_compat, esp32dev, esp32dev_V4, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_16MB_opi, esp32s3dev_8MB_opi, esp32s3_4M_qspi, esp32_wrover, usermods
 
 src_dir  = ./wled00
 data_dir = ./wled00/data
@@ -115,7 +115,6 @@ extra_scripts =
   post:pio-scripts/strip-floats.py
   pre:pio-scripts/user_config_copy.py
   pre:pio-scripts/load_usermods.py
-  post:pio-scripts/fixup_usermods.py
   pre:pio-scripts/build_ui.py
   ; post:pio-scripts/obj-dump.py  ;; convenience script to create a disassembly dump of the firmware (hardcore debugging)
 
@@ -267,8 +266,9 @@ AR_lib_deps =  ;; for pre-usermod-library platformio_override compatibility
 ;;
 ;; 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@ ~6.3.2
-platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+
+;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.06.02/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.9 with IPv6 support, based on IDF 4.4.4
 build_unflags = ${common.build_unflags}
 build_flags = -g
   -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
@@ -282,8 +282,7 @@ board_build.partitions = ${esp32.default_partitions}   ;; default partioning for
 
 [esp32s2]
 ;; generic definitions for all ESP32-S2 boards
-platform = espressif32@ ~6.3.2
-platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+platform = ${esp32_idf_V4.platform}
 build_unflags = ${common.build_unflags}
 build_flags = -g
   -DARDUINO_ARCH_ESP32
@@ -302,8 +301,7 @@ board_build.partitions = ${esp32.default_partitions}   ;; default partioning for
 
 [esp32c3]
 ;; generic definitions for all ESP32-C3 boards
-platform = espressif32@ ~6.3.2
-platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+platform = ${esp32_idf_V4.platform}
 build_unflags = ${common.build_unflags}
 build_flags = -g
   -DARDUINO_ARCH_ESP32
@@ -321,8 +319,7 @@ board_build.partitions = ${esp32.default_partitions}   ;; default partioning for
 
 [esp32s3]
 ;; generic definitions for all ESP32-S3 boards
-platform = espressif32@ ~6.3.2
-platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+platform = ${esp32_idf_V4.platform}
 build_unflags = ${common.build_unflags}
 build_flags = -g
   -DESP32
@@ -366,7 +363,7 @@ build_flags = ${common.build_flags} ${esp8266.build_flags_compat} -D WLED_RELEAS
 extends = env:nodemcuv2
 board_build.f_cpu = 160000000L
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP8266_160\" #-DWLED_DISABLE_2D
-  -D USERMOD_AUDIOREACTIVE
+custom_usermods = audioreactive
 
 [env:esp8266_2m]
 board = esp_wroom_02
@@ -388,7 +385,7 @@ build_flags = ${common.build_flags} ${esp8266.build_flags_compat} -D WLED_RELEAS
 extends = env:esp8266_2m
 board_build.f_cpu = 160000000L
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP02_160\"
-  -D USERMOD_AUDIOREACTIVE
+custom_usermods = audioreactive
 
 [env:esp01_1m_full]
 board = esp01_1m
@@ -411,24 +408,34 @@ build_flags = ${common.build_flags} ${esp8266.build_flags_compat} -D WLED_RELEAS
 extends = env:esp01_1m_full
 board_build.f_cpu = 160000000L
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP01_160\" -D WLED_DISABLE_OTA
-  -D USERMOD_AUDIOREACTIVE
   ; -D WLED_USE_REAL_MATH ;; may fix wrong sunset/sunrise times, at the cost of 7064 bytes FLASH and 975 bytes RAM
+custom_usermods = audioreactive
 
 [env:esp32dev]
 board = esp32dev
 platform = ${esp32.platform}
 platform_packages = ${esp32.platform_packages}
-custom_usermods = audioreactive auto_save animartrix
+custom_usermods = audioreactive
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"ESP32\" #-D WLED_DISABLE_BROWNOUT_DET
 lib_deps = ${esp32.lib_deps}
 monitor_filters = esp32_exception_decoder
 board_build.partitions = ${esp32.default_partitions}
 
+[env:esp32dev_V4]
+board = esp32dev
+platform = ${esp32_idf_V4.platform}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=\"ESP32_V4\" #-D WLED_DISABLE_BROWNOUT_DET
+lib_deps = ${esp32_idf_V4.lib_deps}
+  ${esp32.AR_lib_deps}
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}
+board_build.flash_mode = dio
+
 [env:esp32dev_8M]
 board = esp32dev
 platform = ${esp32_idf_V4.platform}
-platform_packages = ${esp32_idf_V4.platform_packages}
 custom_usermods = audioreactive
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=\"ESP32_8M\" #-D WLED_DISABLE_BROWNOUT_DET
@@ -443,7 +450,6 @@ board_upload.maximum_size = 8388608
 [env:esp32dev_16M]
 board = esp32dev
 platform = ${esp32_idf_V4.platform}
-platform_packages = ${esp32_idf_V4.platform_packages}
 custom_usermods = audioreactive
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=\"ESP32_16M\" #-D WLED_DISABLE_BROWNOUT_DET
@@ -483,7 +489,6 @@ board_build.partitions = ${esp32.default_partitions}
 [env:esp32_wrover]
 extends = esp32_idf_V4
 platform = ${esp32_idf_V4.platform}
-platform_packages = ${esp32_idf_V4.platform_packages}
 board = ttgo-t7-v14-mini32
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
@@ -498,7 +503,6 @@ lib_deps = ${esp32_idf_V4.lib_deps}
 [env:esp32c3dev]
 extends = esp32c3
 platform = ${esp32c3.platform}
-platform_packages = ${esp32c3.platform_packages}
 framework = arduino
 board = esp32-c3-devkitm-1
 board_build.partitions = ${esp32.default_partitions}
@@ -510,13 +514,13 @@ build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME=
 upload_speed = 460800
 build_unflags = ${common.build_unflags}
 lib_deps = ${esp32c3.lib_deps}
+board_build.flash_mode = qio
 
 [env:esp32s3dev_16MB_opi]
 ;; ESP32-S3 development board, with 16MB 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
 platform = ${esp32s3.platform}
-platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600
 custom_usermods = audioreactive
 build_unflags = ${common.build_unflags}
@@ -538,7 +542,6 @@ monitor_filters = esp32_exception_decoder
 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
 platform = ${esp32s3.platform}
-platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600
 custom_usermods = audioreactive
 build_unflags = ${common.build_unflags}
@@ -557,7 +560,6 @@ monitor_filters = esp32_exception_decoder
 ;; For ESP32-S3 WROOM-2, a.k.a. ESP32-S3 DevKitC-1 v1.1
 ;; with >= 16MB FLASH and >= 8MB PSRAM (memory_type: opi_opi)
 platform = ${esp32s3.platform}
-platform_packages = ${esp32s3.platform_packages}
 board = esp32s3camlcd ;; this is the only standard board with "opi_opi"
 board_build.arduino.memory_type = opi_opi
 upload_speed = 921600
@@ -583,7 +585,6 @@ monitor_filters = esp32_exception_decoder
 ;; ESP32-S3, with 4MB FLASH and <= 4MB PSRAM (memory_type: qio_qspi)
 board = lolin_s3_mini ;; -S3 mini, 4MB flash 2MB PSRAM 
 platform = ${esp32s3.platform}
-platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600
 custom_usermods = audioreactive
 build_unflags = ${common.build_unflags}
@@ -600,7 +601,6 @@ monitor_filters = esp32_exception_decoder
 
 [env:lolin_s2_mini]
 platform = ${esp32s2.platform}
-platform_packages = ${esp32s2.platform_packages}
 board = lolin_s2_mini
 board_build.partitions = ${esp32.default_partitions}
 board_build.flash_mode = qio
@@ -627,9 +627,13 @@ lib_deps = ${esp32s2.lib_deps}
 
 [env:usermods]
 board = esp32dev
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
+platform = ${esp32_idf_V4.platform}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"USERMODS\"
-  ${esp32.AR_build_flags}
-lib_deps = ${esp32.lib_deps}
+build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=\"ESP32_USERMODS\"
+  -DTOUCH_CS=9
+  -DMQTTSWITCHPINS=8
+lib_deps = ${esp32_idf_V4.lib_deps}
+monitor_filters = esp32_exception_decoder
+board_build.flash_mode = dio
+; custom_usermods = *every folder with library.json* -- injected by pio-scripts/load_usermods.py
+board_build.partitions = ${esp32.extreme_partitions}  ; We're gonna need a bigger boat
diff --git a/usermods/ADS1115_v2/ADS1115_v2.cpp b/usermods/ADS1115_v2/ADS1115_v2.cpp
index 48f917332..bbf457f48 100644
--- a/usermods/ADS1115_v2/ADS1115_v2.cpp
+++ b/usermods/ADS1115_v2/ADS1115_v2.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include <Adafruit_ADS1X15.h>
 #include <math.h>
diff --git a/usermods/AHT10_v2/AHT10_v2.cpp b/usermods/AHT10_v2/AHT10_v2.cpp
index 171e15754..f88bee1da 100644
--- a/usermods/AHT10_v2/AHT10_v2.cpp
+++ b/usermods/AHT10_v2/AHT10_v2.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include <AHT10.h>
 
@@ -54,12 +52,6 @@ private:
     _lastTemperature = 0;
   }
 
-  ~UsermodAHT10()
-  {
-    delete _aht;
-    _aht = nullptr;
-  }
-
 #ifndef WLED_DISABLE_MQTT
   void mqttInitialize()
   {
@@ -322,6 +314,12 @@ public:
     _initDone = true;
     return configComplete;
   }
+
+  ~UsermodAHT10()
+  {
+    delete _aht;
+    _aht = nullptr;
+  }
 };
 
 const char UsermodAHT10::_name[] PROGMEM = "AHTxx";
diff --git a/usermods/Analog_Clock/Analog_Clock.cpp b/usermods/Analog_Clock/Analog_Clock.cpp
index 8a4c048a8..970ba7224 100644
--- a/usermods/Analog_Clock/Analog_Clock.cpp
+++ b/usermods/Analog_Clock/Analog_Clock.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "wled.h"
 
 /*
diff --git a/usermods/Animated_Staircase/Animated_Staircase.cpp b/usermods/Animated_Staircase/Animated_Staircase.cpp
index 43d9db6b4..2d2d27cf4 100644
--- a/usermods/Animated_Staircase/Animated_Staircase.cpp
+++ b/usermods/Animated_Staircase/Animated_Staircase.cpp
@@ -7,7 +7,6 @@
  * 
  * See the accompanying README.md file for more info.
  */
-#pragma once
 #include "wled.h"
 
 class Animated_Staircase : public Usermod {
diff --git a/usermods/BH1750_v2/BH1750_v2.cpp b/usermods/BH1750_v2/BH1750_v2.cpp
index 5bd476245..f033f39ed 100644
--- a/usermods/BH1750_v2/BH1750_v2.cpp
+++ b/usermods/BH1750_v2/BH1750_v2.cpp
@@ -1,15 +1,13 @@
 // force the compiler to show a warning to confirm that this file is included
 #warning **** Included USERMOD_BH1750 ****
 
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
-#pragma once
-
 #include "wled.h"
 #include <BH1750.h>
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 // the max frequency to check photoresistor, 10 seconds
 #ifndef USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL
 #define USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL 10000
diff --git a/usermods/BME280_v2/BME280_v2.cpp b/usermods/BME280_v2/BME280_v2.cpp
index d29451eed..05aeca55a 100644
--- a/usermods/BME280_v2/BME280_v2.cpp
+++ b/usermods/BME280_v2/BME280_v2.cpp
@@ -1,17 +1,15 @@
 // force the compiler to show a warning to confirm that this file is included
 #warning **** Included USERMOD_BME280 version 2.0 ****
 
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
-#pragma once
-
 #include "wled.h"
 #include <Arduino.h>
 #include <BME280I2C.h>               // BME280 sensor
 #include <EnvironmentCalculations.h> // BME280 extended measurements
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 class UsermodBME280 : public Usermod
 {
 private:
diff --git a/usermods/BME280_v2/library.json b/usermods/BME280_v2/library.json
deleted file mode 100644
index faae0f34a..000000000
--- a/usermods/BME280_v2/library.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name:": "BME280_v2",
-  "build": { "libArchive": false }
-}
\ No newline at end of file
diff --git a/usermods/BME280_v2/library.json.disabled b/usermods/BME280_v2/library.json.disabled
new file mode 100644
index 000000000..1cb805d34
--- /dev/null
+++ b/usermods/BME280_v2/library.json.disabled
@@ -0,0 +1,7 @@
+{
+  "name:": "BME280_v2",
+  "build": { "libArchive": false },
+  "dependencies": {
+    "finitespace/BME280":"~3.0.0"
+  }
+}
\ No newline at end of file
diff --git a/usermods/BME68X_v2/BME68X_v2.cpp b/usermods/BME68X_v2/BME68X_v2.cpp
index 5814506b3..081d03ff9 100644
--- a/usermods/BME68X_v2/BME68X_v2.cpp
+++ b/usermods/BME68X_v2/BME68X_v2.cpp
@@ -6,7 +6,6 @@
  * @date 19 Feb 2024
  */
 
-#pragma once
 #warning ********************Included USERMOD_BME68X ********************
 
 #define UMOD_DEVICE "ESP32"                 			 // NOTE - Set your hardware here
diff --git a/usermods/BME68X_v2/library.json b/usermods/BME68X_v2/library.json.disabled
similarity index 100%
rename from usermods/BME68X_v2/library.json
rename to usermods/BME68X_v2/library.json.disabled
diff --git a/usermods/Battery/Battery.cpp b/usermods/Battery/Battery.cpp
index 4646a2384..5572f5502 100644
--- a/usermods/Battery/Battery.cpp
+++ b/usermods/Battery/Battery.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include "battery_defaults.h"
 #include "UMBattery.h"
diff --git a/usermods/Cronixie/Cronixie.cpp b/usermods/Cronixie/Cronixie.cpp
index 09e7e25ac..05557de0f 100644
--- a/usermods/Cronixie/Cronixie.cpp
+++ b/usermods/Cronixie/Cronixie.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 class UsermodCronixie : public Usermod {
diff --git a/usermods/DHT/DHT.cpp b/usermods/DHT/DHT.cpp
index fad6dad5c..2ed3dd0ac 100644
--- a/usermods/DHT/DHT.cpp
+++ b/usermods/DHT/DHT.cpp
@@ -1,7 +1,5 @@
-#pragma once
-
 #include "wled.h"
-#ifndef WLED_ENABLE_MQTT
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
diff --git a/usermods/EleksTube_IPS/EleksTube_IPS.cpp b/usermods/EleksTube_IPS/EleksTube_IPS.cpp
index 48fbb2b40..e8637b0fe 100644
--- a/usermods/EleksTube_IPS/EleksTube_IPS.cpp
+++ b/usermods/EleksTube_IPS/EleksTube_IPS.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "TFTs.h"
 #include "wled.h"
 
diff --git a/usermods/EleksTube_IPS/library.json b/usermods/EleksTube_IPS/library.json
index e5ed62198..0fc259afa 100644
--- a/usermods/EleksTube_IPS/library.json
+++ b/usermods/EleksTube_IPS/library.json
@@ -1,4 +1,7 @@
 {
   "name:": "EleksTube_IPS",
-  "build": { "libArchive": false }
-}
\ No newline at end of file
+  "build": { "libArchive": false },
+  "dependencies": {
+    "TFT_eSPI" : "2.5.33"
+  } 
+}
diff --git a/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp b/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
index 823ad7472..d51ddb57c 100644
--- a/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
@@ -1,11 +1,12 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <Arduino.h>
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
 #include <DallasTemperature.h> //Dallastemperature sensor
+
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 //The SCL and SDA pins are defined here. 
 //Lolin32 boards use SCL=5 SDA=4 
 #define U8X8_PIN_SCL 5
diff --git a/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp b/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
index 29a4332db..ce3c659e8 100644
--- a/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
@@ -1,13 +1,13 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <Arduino.h>
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
 #include <Wire.h>
 #include <BME280I2C.h> //BME280 sensor
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 void UpdateBME280Data();
 
 #define Celsius // Show temperature measurement in Celsius otherwise is in Fahrenheit 
diff --git a/usermods/INA226_v2/INA226_v2.cpp b/usermods/INA226_v2/INA226_v2.cpp
index 3c79f05bb..26f92f494 100644
--- a/usermods/INA226_v2/INA226_v2.cpp
+++ b/usermods/INA226_v2/INA226_v2.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include <INA226_WE.h>
 
@@ -210,12 +208,6 @@ private:
         }
     }
 
-    ~UsermodINA226()
-    {
-        delete _ina226;
-        _ina226 = nullptr;
-    }
-
 #ifndef WLED_DISABLE_MQTT
     void mqttInitialize()
     {
@@ -551,6 +543,13 @@ public:
         _initDone = true;
         return configComplete;
     }
+
+    ~UsermodINA226()
+    {
+        delete _ina226;
+        _ina226 = nullptr;
+    }
+
 };
 
 const char UsermodINA226::_name[] PROGMEM = "INA226";
diff --git a/usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp b/usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp
index ab7f907ec..7c30985ee 100644
--- a/usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp
+++ b/usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 class InternalTemperatureUsermod : public Usermod
diff --git a/usermods/LD2410_v2/LD2410_v2.cpp b/usermods/LD2410_v2/LD2410_v2.cpp
index 51c887fa4..095da12f2 100644
--- a/usermods/LD2410_v2/LD2410_v2.cpp
+++ b/usermods/LD2410_v2/LD2410_v2.cpp
@@ -1,14 +1,10 @@
-#warning **** Included USERMOD_LD2410 ****
-
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
-#pragma once
-
 #include "wled.h"
 #include <ld2410.h>
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 class LD2410Usermod : public Usermod {
 
   private:
diff --git a/usermods/LD2410_v2/library.json b/usermods/LD2410_v2/library.json
index faef37d4d..60d493ad9 100644
--- a/usermods/LD2410_v2/library.json
+++ b/usermods/LD2410_v2/library.json
@@ -1,4 +1,7 @@
 {
   "name:": "LD2410_v2",
-  "build": { "libArchive": false }
+  "build": { "libArchive": false },
+  "dependencies": {
+    "ncmreynolds/ld2410":"^0.1.3"
+  }
 }
\ No newline at end of file
diff --git a/usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp b/usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp
index 6104fcab5..9c5c835e9 100644
--- a/usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp
+++ b/usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "wled.h"
 
 #ifndef ARDUINO_ARCH_ESP32
diff --git a/usermods/MAX17048_v2/MAX17048_v2.cpp b/usermods/MAX17048_v2/MAX17048_v2.cpp
index 1a1108cf6..c284bca7f 100644
--- a/usermods/MAX17048_v2/MAX17048_v2.cpp
+++ b/usermods/MAX17048_v2/MAX17048_v2.cpp
@@ -1,8 +1,6 @@
 // force the compiler to show a warning to confirm that this file is included
 #warning **** Included USERMOD_MAX17048 V2.0 ****
 
-#pragma once
-
 #include "wled.h"
 #include "Adafruit_MAX1704X.h"
 
diff --git a/usermods/MAX17048_v2/library.json b/usermods/MAX17048_v2/library.json.disabled
similarity index 100%
rename from usermods/MAX17048_v2/library.json
rename to usermods/MAX17048_v2/library.json.disabled
diff --git a/usermods/MY9291/MY9291.cpp b/usermods/MY9291/MY9291.cpp
index ce8d0f001..3881ffd07 100644
--- a/usermods/MY9291/MY9291.cpp
+++ b/usermods/MY9291/MY9291.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include "MY92xx.h"
 
diff --git a/usermods/MY9291/library.json b/usermods/MY9291/library.json.disabled
similarity index 100%
rename from usermods/MY9291/library.json
rename to usermods/MY9291/library.json.disabled
diff --git a/usermods/PIR_sensor_switch/PIR_sensor_switch.cpp b/usermods/PIR_sensor_switch/PIR_sensor_switch.cpp
index 1cc31a08d..20e4bc148 100644
--- a/usermods/PIR_sensor_switch/PIR_sensor_switch.cpp
+++ b/usermods/PIR_sensor_switch/PIR_sensor_switch.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 #ifndef PIR_SENSOR_PIN
@@ -571,7 +569,7 @@ bool PIRsensorSwitch::readFromConfig(JsonObject &root)
   // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
   return !(pins.isNull() || pins.size() != PIR_SENSOR_MAX_SENSORS);
 }
-
-
-static PIRsensorSwitch pir_sensor_switch;
+
+
+static PIRsensorSwitch pir_sensor_switch;
 REGISTER_USERMOD(pir_sensor_switch);
\ No newline at end of file
diff --git a/usermods/PWM_fan/PWM_fan.cpp b/usermods/PWM_fan/PWM_fan.cpp
index 9df373045..a89a1f323 100644
--- a/usermods/PWM_fan/PWM_fan.cpp
+++ b/usermods/PWM_fan/PWM_fan.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #if !defined(USERMOD_DALLASTEMPERATURE) && !defined(USERMOD_SHT)
 #error The "PWM fan" usermod requires "Dallas Temeprature" or "SHT" usermod to function properly.
 #endif
diff --git a/usermods/PWM_fan/library.json b/usermods/PWM_fan/library.json.disabled
similarity index 100%
rename from usermods/PWM_fan/library.json
rename to usermods/PWM_fan/library.json.disabled
diff --git a/usermods/RTC/RTC.cpp b/usermods/RTC/RTC.cpp
index f9dbe3cf2..2b9c3b4f7 100644
--- a/usermods/RTC/RTC.cpp
+++ b/usermods/RTC/RTC.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "src/dependencies/time/DS1307RTC.h"
 #include "wled.h"
 
diff --git a/usermods/RTC/library.json b/usermods/RTC/library.json.disabled
similarity index 100%
rename from usermods/RTC/library.json
rename to usermods/RTC/library.json.disabled
diff --git a/usermods/SN_Photoresistor/SN_Photoresistor.cpp b/usermods/SN_Photoresistor/SN_Photoresistor.cpp
index 5e50ab7a6..97f865a97 100644
--- a/usermods/SN_Photoresistor/SN_Photoresistor.cpp
+++ b/usermods/SN_Photoresistor/SN_Photoresistor.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 //Pin defaults for QuinLed Dig-Uno (A0)
diff --git a/usermods/ST7789_display/ST7789_display.cpp b/usermods/ST7789_display/ST7789_display.cpp
index e81c53ba5..c596baecc 100644
--- a/usermods/ST7789_display/ST7789_display.cpp
+++ b/usermods/ST7789_display/ST7789_display.cpp
@@ -1,8 +1,6 @@
 // Credits to @mrVanboy, @gwaland and my dearest friend @westward
 // Also for @spiff72 for usermod TTGO-T-Display
 // 210217
-#pragma once
-
 #include "wled.h"
 #include <TFT_eSPI.h>
 #include <SPI.h>
diff --git a/usermods/ST7789_display/library.json b/usermods/ST7789_display/library.json.disabled
similarity index 100%
rename from usermods/ST7789_display/library.json
rename to usermods/ST7789_display/library.json.disabled
diff --git a/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp b/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
index 04f6d750d..44218d596 100644
--- a/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
+++ b/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
@@ -1,9 +1,3 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
-#pragma once
-
 // this is remixed from usermod_v2_SensorsToMqtt.h (sensors_to_mqtt usermod)
 // and usermod_multi_relay.h (multi_relay usermod)
 
@@ -11,6 +5,10 @@
 #include <Adafruit_Si7021.h>
 #include <EnvironmentCalculations.h> // EnvironmentCalculations::HeatIndex(), ::DewPoint(), ::AbsoluteHumidity()
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 Adafruit_Si7021 si7021;
 
 class Si7021_MQTT_HA : public Usermod
diff --git a/usermods/Si7021_MQTT_HA/library.json b/usermods/Si7021_MQTT_HA/library.json
index 60991a3e9..8294c1264 100644
--- a/usermods/Si7021_MQTT_HA/library.json
+++ b/usermods/Si7021_MQTT_HA/library.json
@@ -1,4 +1,7 @@
 {
   "name:": "Si7021_MQTT_HA",
-  "build": { "libArchive": false }
+  "build": { "libArchive": false },
+  "dependencies": {
+    "finitespace/BME280":"3.0.0"
+  }
 }
\ No newline at end of file
diff --git a/usermods/Temperature/Temperature.cpp b/usermods/Temperature/Temperature.cpp
index a17bd2d90..8c925eb15 100644
--- a/usermods/Temperature/Temperature.cpp
+++ b/usermods/Temperature/Temperature.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include "OneWire.h"
 
diff --git a/usermods/TetrisAI_v2/TetrisAI_v2.cpp b/usermods/TetrisAI_v2/TetrisAI_v2.cpp
index 78cdfd227..b51250b26 100644
--- a/usermods/TetrisAI_v2/TetrisAI_v2.cpp
+++ b/usermods/TetrisAI_v2/TetrisAI_v2.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include "FX.h"
 #include "fcn_declare.h"
diff --git a/usermods/VL53L0X_gestures/VL53L0X_gestures.cpp b/usermods/VL53L0X_gestures/VL53L0X_gestures.cpp
index 759c31c7c..af3220b3c 100644
--- a/usermods/VL53L0X_gestures/VL53L0X_gestures.cpp
+++ b/usermods/VL53L0X_gestures/VL53L0X_gestures.cpp
@@ -13,8 +13,6 @@
  * lib_deps = ${env.lib_deps}
  *     pololu/VL53L0X @ ^1.3.0
  */
-#pragma once
-
 #include "wled.h"
 
 #include <Wire.h>
diff --git a/usermods/boblight/boblight.cpp b/usermods/boblight/boblight.cpp
index 2a52fc156..5980443d3 100644
--- a/usermods/boblight/boblight.cpp
+++ b/usermods/boblight/boblight.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 /*
diff --git a/usermods/buzzer/buzzer.cpp b/usermods/buzzer/buzzer.cpp
index e421a2391..e5a071e62 100644
--- a/usermods/buzzer/buzzer.cpp
+++ b/usermods/buzzer/buzzer.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include "Arduino.h"
 
diff --git a/usermods/deep_sleep/deep_sleep.cpp b/usermods/deep_sleep/deep_sleep.cpp
index 741b618fd..f6f3604fb 100644
--- a/usermods/deep_sleep/deep_sleep.cpp
+++ b/usermods/deep_sleep/deep_sleep.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include "driver/rtc_io.h"
 
diff --git a/usermods/mpu6050_imu/mpu6050_imu.cpp b/usermods/mpu6050_imu/mpu6050_imu.cpp
index 2f8166cdd..6df5d64e1 100644
--- a/usermods/mpu6050_imu/mpu6050_imu.cpp
+++ b/usermods/mpu6050_imu/mpu6050_imu.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 /* This driver reads quaternion data from the MPU6060 and adds it to the JSON
@@ -105,7 +103,7 @@ class MPU6050Driver : public Usermod {
     VectorInt16 aaReal;     // [x, y, z]            gravity-free accel sensor measurements
     VectorInt16 aaWorld;    // [x, y, z]            world-frame accel sensor measurements
     VectorFloat gravity;    // [x, y, z]            gravity vector
-    uint32 sample_count;
+    uint32_t sample_count;
 
     // Usermod output
     um_data_t um_data;
diff --git a/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp b/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
index d4d823f32..2d745863a 100644
--- a/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
+++ b/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
@@ -1,9 +1,7 @@
-#pragma once
-
 #warning "This usermod is deprecated and no longer maintained. It will be removed in a future WLED release. Please use usermod multi_relay which has more features."
 
 #include "wled.h"
-#ifndef WLED_ENABLE_MQTT
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
@@ -159,5 +157,5 @@ inline void UsermodMqttSwitch::updateState(uint8_t pinNr)
 }
 
 
-static UsermodMqttSwitc mqtt_switch_v2;
+static UsermodMqttSwitch mqtt_switch_v2;
 REGISTER_USERMOD(mqtt_switch_v2);
\ No newline at end of file
diff --git a/usermods/multi_relay/multi_relay.cpp b/usermods/multi_relay/multi_relay.cpp
index ea07e281e..f8b1f566a 100644
--- a/usermods/multi_relay/multi_relay.cpp
+++ b/usermods/multi_relay/multi_relay.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 #define COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x])))))
diff --git a/usermods/pixels_dice_tray/pixels_dice_tray.cpp b/usermods/pixels_dice_tray/pixels_dice_tray.cpp
index 07fd3d596..73457c67f 100644
--- a/usermods/pixels_dice_tray/pixels_dice_tray.cpp
+++ b/usermods/pixels_dice_tray/pixels_dice_tray.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <pixels_dice_interface.h>  // https://github.com/axlan/arduino-pixels-dice
 #include "wled.h"
 
diff --git a/usermods/platformio_override.usermods.ini b/usermods/platformio_override.usermods.ini
deleted file mode 100644
index 3b3e6696e..000000000
--- a/usermods/platformio_override.usermods.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[env:usermods]
-board = esp32dev
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"USERMODS\"
-  ${esp32.AR_build_flags}
-lib_deps = ${esp32.lib_deps}
-board_build.partitions = ${esp32.big_partitions}
diff --git a/usermods/pov_display/library.json b/usermods/pov_display/library.json.disabled
similarity index 100%
rename from usermods/pov_display/library.json
rename to usermods/pov_display/library.json.disabled
diff --git a/usermods/pov_display/pov_display.cpp b/usermods/pov_display/pov_display.cpp
index c1bd143a0..b2b91f7d5 100644
--- a/usermods/pov_display/pov_display.cpp
+++ b/usermods/pov_display/pov_display.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "wled.h"
 #include <PNGdec.h>
 
diff --git a/usermods/pwm_outputs/pwm_outputs.cpp b/usermods/pwm_outputs/pwm_outputs.cpp
index 72a78475c..d94f1d848 100644
--- a/usermods/pwm_outputs/pwm_outputs.cpp
+++ b/usermods/pwm_outputs/pwm_outputs.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "wled.h"
 
 #ifndef ESP32
diff --git a/usermods/quinled-an-penta/quinled-an-penta.cpp b/usermods/quinled-an-penta/quinled-an-penta.cpp
index 1fbfd807e..a3b452bf1 100644
--- a/usermods/quinled-an-penta/quinled-an-penta.cpp
+++ b/usermods/quinled-an-penta/quinled-an-penta.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "U8g2lib.h"
 #include "SHT85.h"
 #include "Wire.h"
diff --git a/usermods/rgb-rotary-encoder/library.json b/usermods/rgb-rotary-encoder/library.json.disabled
similarity index 100%
rename from usermods/rgb-rotary-encoder/library.json
rename to usermods/rgb-rotary-encoder/library.json.disabled
diff --git a/usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp b/usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp
index 5b4e73153..1514e2307 100644
--- a/usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp
+++ b/usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "ESPRotary.h"
 #include <math.h>
 #include "wled.h"
diff --git a/usermods/sd_card/sd_card.cpp b/usermods/sd_card/sd_card.cpp
index e33a643fe..4e68b97a3 100644
--- a/usermods/sd_card/sd_card.cpp
+++ b/usermods/sd_card/sd_card.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 // SD connected via MMC / SPI
diff --git a/usermods/sensors_to_mqtt/library.json b/usermods/sensors_to_mqtt/library.json
index 9ce4424e1..731f57b2b 100644
--- a/usermods/sensors_to_mqtt/library.json
+++ b/usermods/sensors_to_mqtt/library.json
@@ -2,8 +2,8 @@
   "name:": "sensors_to_mqtt",
   "build": { "libArchive": false},
   "dependencies": {
-    "adafruit/Adafruit BMP280 Library":"2.1.0",
-    "adafruit/Adafruit CCS811 Library":"1.0.4",
-    "adafruit/Adafruit Si7021 Library":"1.4.0"
+    "adafruit/Adafruit BMP280 Library":"2.6.8",
+    "adafruit/Adafruit CCS811 Library":"1.1.3",
+    "adafruit/Adafruit Si7021 Library":"1.5.3"
   }
 }
diff --git a/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp b/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
index 02f8e8d27..343fd08b6 100644
--- a/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
+++ b/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
@@ -1,9 +1,3 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
-#pragma once
-
 #include "wled.h"
 #include <Arduino.h>
 #include <Adafruit_Sensor.h>
@@ -11,6 +5,10 @@
 #include <Adafruit_CCS811.h>
 #include <Adafruit_Si7021.h>
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 Adafruit_BMP280 bmp;
 Adafruit_Si7021 si7021;
 Adafruit_CCS811 ccs811;
@@ -23,7 +21,7 @@ private:
   float SensorPressure = 0;
   float SensorTemperature = 0;
   float SensorHumidity = 0;
-  char *SensorIaq = "Unknown";
+  const char *SensorIaq = "Unknown";
   String mqttTemperatureTopic = "";
   String mqttHumidityTopic = "";
   String mqttPressureTopic = "";
@@ -117,7 +115,7 @@ private:
   /**
    * Credits: Bouke_Regnerus @ https://community.home-assistant.io/t/example-indoor-air-quality-text-sensor-using-ccs811-sensor/125854 
    */
-  char *_getIaqIndex(float humidity, int tvoc, int eco2)
+  const char *_getIaqIndex(float humidity, int tvoc, int eco2)
   {
     int iaq_index = 0;
 
@@ -216,6 +214,7 @@ private:
     {
       return "Excellent";
     }
+    return "Unknown";
   }
 
 public:
diff --git a/usermods/seven_segment_display/seven_segment_display.cpp b/usermods/seven_segment_display/seven_segment_display.cpp
index d3aa57378..13a6306be 100644
--- a/usermods/seven_segment_display/seven_segment_display.cpp
+++ b/usermods/seven_segment_display/seven_segment_display.cpp
@@ -1,11 +1,9 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#pragma once
-
-#include "wled.h"
-
 class SevenSegmentDisplay : public Usermod
 {
 
diff --git a/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
index 812065d86..3e6877d5d 100644
--- a/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
+++ b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
@@ -1,11 +1,9 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#pragma once
-
-#include "wled.h"
-
 class UsermodSSDR : public Usermod {
 
 //#define REFRESHTIME 497
diff --git a/usermods/sht/library.json b/usermods/sht/library.json.disabled
similarity index 100%
rename from usermods/sht/library.json
rename to usermods/sht/library.json.disabled
diff --git a/usermods/sht/sht.cpp b/usermods/sht/sht.cpp
index 7641bbc2e..6a0e1ec45 100644
--- a/usermods/sht/sht.cpp
+++ b/usermods/sht/sht.cpp
@@ -1,11 +1,10 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+#include "SHT85.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#pragma once
-
-#include "SHT85.h"
-
 #define USERMOD_SHT_TYPE_SHT30 0
 #define USERMOD_SHT_TYPE_SHT31 1
 #define USERMOD_SHT_TYPE_SHT35 2
diff --git a/usermods/smartnest/smartnest.cpp b/usermods/smartnest/smartnest.cpp
index be7710abc..d0cb92dcf 100644
--- a/usermods/smartnest/smartnest.cpp
+++ b/usermods/smartnest/smartnest.cpp
@@ -1,11 +1,9 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#pragma once
-
-#include "wled.h"
-
 class Smartnest : public Usermod
 {
 private:
diff --git a/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp b/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
index 076e91f73..84c11afcd 100644
--- a/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
+++ b/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 //v2 usermod that allows to change brightness and color using a rotary encoder, 
diff --git a/usermods/usermod_v2_HttpPullLightControl/library.json b/usermods/usermod_v2_HttpPullLightControl/library.json.disabled
similarity index 100%
rename from usermods/usermod_v2_HttpPullLightControl/library.json
rename to usermods/usermod_v2_HttpPullLightControl/library.json.disabled
diff --git a/usermods/usermod_v2_auto_save/usermod_v2_auto_save.cpp b/usermods/usermod_v2_auto_save/usermod_v2_auto_save.cpp
index 2dae867da..1b97ea94d 100644
--- a/usermods/usermod_v2_auto_save/usermod_v2_auto_save.cpp
+++ b/usermods/usermod_v2_auto_save/usermod_v2_auto_save.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 // v2 Usermod to automatically save settings 
diff --git a/usermods/usermod_v2_four_line_display_ALT/library.json b/usermods/usermod_v2_four_line_display_ALT/library.json.disabled
similarity index 100%
rename from usermods/usermod_v2_four_line_display_ALT/library.json
rename to usermods/usermod_v2_four_line_display_ALT/library.json.disabled
diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
index 851e378e1..93c4110c3 100644
--- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
+++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #undef U8X8_NO_HW_I2C // borrowed from WLEDMM: we do want I2C hardware drivers - if possible
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
diff --git a/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp b/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp
index 55132b84d..71c5c45f3 100644
--- a/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp
+++ b/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 class klipper_percentage : public Usermod
diff --git a/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp b/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp
index 8212947a6..c6632b53a 100644
--- a/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp
+++ b/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 class PingPongClockUsermod : public Usermod
diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
index ac2cc3c4e..9d1129841 100644
--- a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
+++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 //
diff --git a/usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp b/usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp
index 781dd7d81..789292387 100644
--- a/usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp
+++ b/usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 /*
diff --git a/usermods/wireguard/wireguard.cpp b/usermods/wireguard/wireguard.cpp
index 77cc952fc..f88bfeb32 100644
--- a/usermods/wireguard/wireguard.cpp
+++ b/usermods/wireguard/wireguard.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <WireGuard-ESP32.h>
 
 #include "wled.h"
diff --git a/usermods/wizlights/wizlights.cpp b/usermods/wizlights/wizlights.cpp
index 67c0effdb..3ac756b12 100644
--- a/usermods/wizlights/wizlights.cpp
+++ b/usermods/wizlights/wizlights.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 #include <WiFiUdp.h>
 
diff --git a/usermods/word-clock-matrix/library.json b/usermods/word-clock-matrix/library.json.disabled
similarity index 100%
rename from usermods/word-clock-matrix/library.json
rename to usermods/word-clock-matrix/library.json.disabled
diff --git a/usermods/word-clock-matrix/word-clock-matrix.cpp b/usermods/word-clock-matrix/word-clock-matrix.cpp
index 6643d293b..cd8f78c3a 100644
--- a/usermods/word-clock-matrix/word-clock-matrix.cpp
+++ b/usermods/word-clock-matrix/word-clock-matrix.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "wled.h"
 
 /*
diff --git a/wled00/wled.h b/wled00/wled.h
index ae93d9548..533b12063 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -269,7 +269,7 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
 // Global Variable definitions
 WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
 WLED_GLOBAL char releaseString[] _INIT(WLED_RELEASE_NAME); // must include the quotes when defining, e.g -D WLED_RELEASE_NAME=\"ESP32_MULTI_USREMODS\"
-#define WLED_CODENAME "Kōsen"
+#define WLED_CODENAME "Niji"
 
 // AP and OTA default passwords (for maximum security change them!)
 WLED_GLOBAL char apPass[65]  _INIT(WLED_AP_PASS);