diff --git a/platformio.ini b/platformio.ini
index 471f7bf5b7..e8e76394ac 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -126,11 +126,7 @@ extra_configs =
 #   arduino core 2.6.3 = platformIO 2.3.2
 #   arduino core 2.7.0 = platformIO 2.5.0
 # ------------------------------------------------------------------------------
-arduino_core_2_6_3 = espressif8266@2.3.3
-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.1
 
 # Development platforms
@@ -212,7 +208,7 @@ build_flags =
 build_unflags =
 
 build_flags_esp8266 = ${common.build_flags}  ${esp8266.build_flags}
-build_flags_esp32   = ${common.build_flags}  ${esp32.build_flags}
+build_flags_esp32   = ${common.build_flags}  ${esp32_idf_V4.build_flags}
 build_flags_esp32_V4= ${common.build_flags}  ${esp32_idf_V4.build_flags}
 
 ldscript_1m128k = eagle.flash.1m128.ld
@@ -342,21 +338,9 @@ lib_deps_compat =
 
 
 [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
-  -D CONFIG_ASYNC_TCP_USE_WDT=0
-  -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472                ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
-  #use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
-  -D LOROL_LITTLEFS
-  ; -D WLEDMM_TWOPATH    ;; use I2S1 as the second bus --> ~15% faster on "V3" builds - may flicker a bit more
-  ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
-  ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
+platform             = ${esp32_idf_V4.platform}
+platform_packages    = ${esp32_idf_V4.platform_packages}
+build_flags          = ${esp32_idf_V4.build_flags}
 
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv      ;; WLED standard for 4MB flash: 1.4MB firmware, 1MB filesystem
 ;default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; WLEDMM alternative for 4MB flash:   1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing)
@@ -367,14 +351,7 @@ big_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv     ;; 1.8MB firmware, 256KB
 large_partitions = tools/WLED_ESP32_8MB.csv
 extreme_partitions = tools/WLED_ESP32_16MB_9MB_FS.csv
 
-lib_deps =
-  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 ;; WLEDMM this must be first in the list, otherwise Aircoookie/ESPAsyncWebServer pulls in an older version of AsyncTCP !!
-  ; https://github.com/lorol/LITTLEFS.git
-  ; WLEDMM specific: use patched version of lorol LittleFS
-  https://github.com/softhack007/LITTLEFS-threadsafe.git#master
-  makuna/NeoPixelBus @ 2.7.5
-  ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
-  ${env.lib_deps}
+lib_deps = ${esp32_idf_V4.lib_deps}
 
 ;; Compatibility with upstream --> you should prefer using ${common_mm.build_flags_S} and ${common_mm.lib_deps_S}
 AR_build_flags = ${common_mm.AR_build_flags}
@@ -417,9 +394,6 @@ lib_depsV4 =
 ;; WLEDMM end
 
 [esp32_idf_V4]
-;; experimental build environment for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5
-;; very similar to the normal ESP32 flags, but omitting Lorol LittleFS, as littlefs is included in the new framework already.
-;;
 ;; 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.