diff --git a/platformio.ini b/platformio.ini
index 9ec25da2a..c946a21f4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,16 +22,16 @@ monitor_speed = 115200
 upload_speed = 921600
 lib_compat_mode = strict
 lib_deps =
-    https://github.com/adafruit/Adafruit-PWM-Servo-Driver-Library#2.4.0
-    https://github.com/bblanchon/ArduinoJson#v7.2.0
-    https://github.com/djGrrr/Int64String#1.1.1
-    https://github.com/esphome/ESPAsyncWebServer#4fd0a1fdf421664214a27373c0eb0247f94b7a79
-    https://github.com/forkineye/ESPAsyncE131
-    https://github.com/OttoWinter/async-mqtt-client#v0.8.6
+    adafruit/Adafruit PWM Servo Driver Library @ ^2.4.0
+    bblanchon/ArduinoJson @ ^7.2.0
+    djgrrr/Int64String @ ^1.1.1
+    forkineye/ESPAsyncE131 @ ^1.0.5
+    greiman/SdFat @ ^2.2.3
+    mathieucarbou/ESPAsyncWebServer @ ^3.3.23
+    ottowinter/AsyncMqttClient-esphome @ ^0.8.6
+    paulstoffregen/Time @ ^1.6.1
     https://github.com/MartinMueller2003/Artnet
     https://github.com/MartinMueller2003/Espalexa
-    https://github.com/PaulStoffregen/Time
-    https://github.com/greiman/SdFat#2.2.3
     https://github.com/MartinMueller2003/SimpleFTPServer
 extra_scripts =
     .scripts/download_fs.py
@@ -60,7 +60,7 @@ lib_ignore =
 ; https://docs.platformio.org/en/latest/platforms/espressif8266.html ;
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
 [esp8266]
-platform = espressif8266 @ 4.2.1 ; Arduino Core v3.0.2
+platform = espressif8266 @ ^4.2.1 ; Arduino Core v3.0.2
 board_build.f_cpu = 160000000L
 board_build.filesystem = littlefs
 board_build.ldscript = eagle.flash.4m2m.ld
@@ -83,8 +83,8 @@ lib_ignore =
     Ethernet ; Remove once Art-Net is fixed / replaced to not depend on Ethernet in lib config
 lib_deps =
     ${env.lib_deps}
-    https://github.com/me-no-dev/ESPAsyncUDP#697c75a0255e5dccf91b4ef8b5cc28c569b3bac9
-    https://github.com/OttoWinter/ESPAsyncTCP#v1.2.3
+    esphome/ESPAsyncTCP-esphome @ ^2.0.0
+    me-no-dev/ESPAsyncUDP
 extra_scripts =
     ${env.extra_scripts}
     pre:.scripts/deleteSD.py
@@ -94,6 +94,7 @@ extra_scripts =
 ; https://docs.platformio.org/en/latest/platforms/espressif32.html ;
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
 [esp32]
+platform = espressif32 @ ^6.8.1
 board_build.filesystem = littlefs
 board_build.partitions = ESP32_partitions.csv
 monitor_filters = esp32_exception_decoder
@@ -104,10 +105,15 @@ build_flags =
     -D DEFAULT_STORAGE_TYPE_ESP32=2
     -Wl,-Map=firmware.map
     -Wl,--cref
+    -mtext-section-literals
+;    -D USE_SERIAL_DEBUG_COUNTERS=1
+;    -D USE_RMT_DEBUG_COUNTERS=1
+;    -D USE_PIXEL_DEBUG_COUNTERS=1
+;    -D USE_PIXEL_DEBUG_COUNTERS=1
 lib_deps =
     ${env.lib_deps}
-    https://github.com/esphome/AsyncTCP#v2.0.0
-    https://github.com/blazoncek/OneWire
+    mathieucarbou/AsyncTCP @ ^3.2.14
+    mathieucarbou/OneWire @ ^2.3.9
     https://github.com/matmunk/DS18B20
 extra_scripts = ${env.extra_scripts}
     .scripts/replace_fs.py
@@ -119,12 +125,7 @@ extra_scripts = ${env.extra_scripts}
 extends = esp32
 build_flags =
     ${esp32.build_flags}
-    -mtext-section-literals
-;    -D USE_SERIAL_DEBUG_COUNTERS=1
-;    -D USE_RMT_DEBUG_COUNTERS=1
-;    -D USE_PIXEL_DEBUG_COUNTERS=1
-;    -D USE_PIXEL_DEBUG_COUNTERS=1
-platform = https://github.com/platformio/platform-espressif32#v6.8.1 ; uses esp-idf 5.1
+platform = https://github.com/platformio/platform-espressif32
 ;platform_packages =
 ;    framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.4
 board_build.arduino.upstream_packages = no
@@ -176,10 +177,10 @@ build_flags =
 
 ; Lolin D32 Pro
 [env:d32_pro]
-extends = esp32git
+extends = esp32
 board = lolin_d32_pro
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d32_pro"'
     -D BOARD_ESP32_LOLIN_D32_PRO
     -mfix-esp32-psram-cache-issue
@@ -191,10 +192,10 @@ build_flags =
 
 ; Lolin D32 Pro with Ethernet
 [env:d32_pro_eth]
-extends = esp32git
+extends = esp32
 board = lolin_d32_pro
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d32_pro_eth"'
     -D BOARD_ESP32_LOLIN_D32_PRO_ETH
     -mfix-esp32-psram-cache-issue
@@ -202,12 +203,12 @@ build_flags =
 
 ; ESP32 CAM
 [env:esp32_cam]
-extends = esp32git
+extends = esp32
 board = esp32cam
 monitor_rts = 0
 monitor_dtr = 0
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_cam"'
     -D BOARD_ESP32_CAM
     -fexceptions
@@ -218,12 +219,12 @@ build_unflags =
 
 ; ESP32 TTGO-T8 V1.x
 [env:esp32_ttgo_t8]
-extends = esp32git
+extends = esp32
 board = ttgo-t7-v14-mini32 ; use until platformio adds TTGO-T8
 monitor_rts = 0
 monitor_dtr = 0
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_ttgo_t8"'
     -D BOARD_ESP32_TTGO_T8
     -D BOARD_HAS_PSRAM
@@ -232,47 +233,47 @@ build_flags =
 
 ; Generic Wemos D1 Mini 32
 [env:d1_mini32]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d1_mini32"'
     -D BOARD_ESP32_D1_MINI
 
 ; Generic Wemos D1 Mini 32
 [env:d1_mini32_eth]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d1_mini32_eth"'
     -D BOARD_ESP32_D1_MINI_ETH
 
 ; WT 32 ETH 01
 [env:esp32_wt32eth01]
-extends = esp32git
+extends = esp32
 board = esp32dev
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_wt32eth01"'
     -D BOARD_ESP32_WT32ETH01
     -I ./.pio/packages/framework-arduinoespressif32/libraries/Ethernet/src
 
 ; bong69
 [env:esp32_bong69]
-extends = esp32git
+extends = esp32
 board = esp32dev
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_bong69"'
     -D BOARD_ESP32_BONG69
     -I ./.pio/packages/framework-arduinoespressif32/libraries/Ethernet/src
 
 [env:esp32_quinled_dig_octa]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_dig_octa"'
     -D BOARD_ESP32_QUINLED_DIG_OCTA
 build_unflags =
@@ -281,10 +282,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_quad]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_quad"'
     -D BOARD_ESP32_QUINLED_QUAD
 build_unflags =
@@ -293,10 +294,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_quad_ae_plus]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_quad_ae_plus"'
     -D BOARD_ESP32_QUINLED_QUAD_AE_PLUS
 build_unflags =
@@ -305,10 +306,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_quad_ae_plus_8]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_quad_ae_plus_8"'
     -D BOARD_ESP32_QUINLED_QUAD_AE_PLUS_8
 build_unflags =
@@ -317,10 +318,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_quad_eth]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_quad_eth"'
     -D BOARD_ESP32_QUINLED_QUAD_ETH
 build_unflags =
@@ -329,10 +330,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_uno]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_uno"'
     -D BOARD_ESP32_QUINLED_UNO
 build_unflags =
@@ -341,10 +342,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_uno_ae_plus]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_uno_ae_plus"'
     -D BOARD_ESP32_QUINLED_UNO_AE_PLUS
 build_unflags =
@@ -353,10 +354,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_uno_eth]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_uno_eth"'
     -D BOARD_ESP32_QUINLED_UNO_ETH
 build_unflags =
@@ -365,10 +366,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_uno_eth_espsv3]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_uno_eth_espsv3"'
     -D BOARD_ESP32_QUINLED_UNO_ETH_ESPSV3
 build_unflags =
@@ -377,10 +378,10 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:esp32_quinled_uno_espsv3]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_quinled_uno_espsv3"'
     -D BOARD_ESP32_QUINLED_UNO_ESPSV3
 build_unflags =
@@ -389,105 +390,105 @@ build_unflags =
     -mfix-esp32-psram-cache-strategy=memw
 
 [env:d1_mini_mhetesp32minikit]
-extends = esp32git
+extends = esp32
 board = mhetesp32minikit
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d1_mini_mhetesp32minikit"'
     -D BOARD_ESP32_QUINLED_UNO_ETH
 
 ; Olimex ESP32 Gateway
 [env:olimex_esp32_gw]
-extends = esp32git
+extends = esp32
 board = esp32-gateway
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"olimex_esp32_gw"'
     -D BOARD_ESP32_OLIMEX_GATEWAY
 
 [env:d1_mini_twilightlord]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d1_mini_twilightlord"'
     -D BOARD_ESP32_TWILIGHTLORD
 
 [env:d1_mini_twilightlord_eth]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"d1_mini_twilightlord_eth"'
     -D BOARD_ESP32_TWILIGHTLORD_ETH
 
 [env:esp32_devkitc]
-extends = esp32git
+extends = esp32
 board = esp32dev
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_devkitc"'
     -D BOARD_ESP32_DEVKITC
 
 [env:esp32_devkitc6]
-extends = esp32git
+extends = esp32
 board = esp32-c6-devkitc-1
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_devkitc6"'
     -D BOARD_ESP32_DEVKITC
 
 ;M5Stack Atom Lite/Matrix
 [env:m5stack_atom]
-extends = esp32git
+extends = esp32
 board = m5stack-atom
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"m5stack_atom"'
     -D BOARD_ESP32_M5STACK_ATOM
 
 ;Quatro from CanadaPixelsCoro.ca
 [env:esp3deuxquatro_dmx]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp3deuxquatro_dmx"'
     -D BOARD_ESPS_ESP3DEUXQUATRO_DMX
 
 [env:esp32_wasatch]
-extends = esp32git
+extends = esp32
 board = esp32dev
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_wasatch"'
     -D BOARD_ESP32_WT32ETH01_WASATCH
     -I ./.pio/packages/framework-arduinoespressif32/libraries/Ethernet/src
 
 ; https://rgb2go.com/products/tetra2go-4-port-wi-fi-pixel-controller
 [env:esp32_tetra2go]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_tetra2go"'
     -D BOARD_ESP32_TETRA2GO
 
 ; https://rgb2go.com/products/octa2go-8-port-wi-fi-pixel-controller
 [env:esp32_octa2go]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_octa2go"'
     -D BOARD_ESP32_OCTA2GO
 
 ; KR Lights SEED Matrix
 [env:esp32_kr_lights_msm]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_kr_lights_msm"'
     -D BOARD_ESP32_KR_LIGHTS_MSM
 build_unflags =
@@ -497,10 +498,10 @@ build_unflags =
 
 ; KA Relay board
 [env:esp32_ka]
-extends = esp32git
+extends = esp32
 board = wemos_d1_mini32
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_ka"'
     -D BOARD_ESP32_KA
 build_unflags =
@@ -508,10 +509,10 @@ build_unflags =
 
 ; Breakdance board
 [env:esp32_breakdancev2]
-extends = esp32git
+extends = esp32
 board = nodemcu-32s
 build_flags =
-    ${esp32git.build_flags}
+    ${esp32.build_flags}
     -D BOARD_NAME='"esp32_breakdancev2"'
     -D BOARD_ESP32_BREAKDANCEV2
 build_unflags =