diff --git a/platformio.ini b/platformio.ini
index d3b71d3c4c5a361a9d7e3dea3e2205dd1d4545a8..430263b71750d143322866734a95826986edd946 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -249,12 +249,10 @@ ;; 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.
-; default_envs = esp8266_2m
+[platformio]
-; Please visit documentation: https://docs.platformio.org/page/projectconf.html
-[platformio]
; default_envs = esp8266_2m
-# ------------------------------------------------------------------------------
+[platformio]
build_flags = -g
-Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
-DARDUINO_ARCH_ESP32 -DESP32
@@ -268,12 +266,10 @@ ${env.lib_deps}
[esp32s2]
;; generic definitions for all ESP32-S2 boards
-; default_envs = esp8266_2m
+[platformio]
-; Please visit documentation: https://docs.platformio.org/page/projectconf.html
-[platformio]
; default_envs = esp8266_2m
-# ------------------------------------------------------------------------------
+[platformio]
build_flags = -g
-DARDUINO_ARCH_ESP32
-DARDUINO_ARCH_ESP32S2
@@ -291,12 +287,10 @@ ${env.lib_deps}
[esp32c3]
;; generic definitions for all ESP32-C3 boards
-; default_envs = esp8266_2m
+[platformio]
-; Please visit documentation: https://docs.platformio.org/page/projectconf.html
-[platformio]
; default_envs = esp8266_2m
-# ------------------------------------------------------------------------------
+[platformio]
build_flags = -g
-DARDUINO_ARCH_ESP32
-DARDUINO_ARCH_ESP32C3
@@ -313,12 +307,10 @@ ${env.lib_deps}
[esp32s3]
;; generic definitions for all ESP32-S3 boards
-; default_envs = esp8266_2m
+[platformio]
-; Please visit documentation: https://docs.platformio.org/page/projectconf.html
-[platformio]
; default_envs = esp8266_2m
-# ------------------------------------------------------------------------------
+[platformio]
build_flags = -g
-DESP32
-DARDUINO_ARCH_ESP32
diff --git a/tools/WLED_ESP32_16MB_9MB_FS.csv b/tools/WLED_ESP32_16MB_9MB_FS.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f2f3f7783a7a0e54337f069edc3c8ee0d389e0a5
--- /dev/null
+++ b/tools/WLED_ESP32_16MB_9MB_FS.csv
@@ -0,0 +1,8 @@
+# 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
\ No newline at end of file
diff --git a/tools/WLED_ESP32_8MB.csv b/tools/WLED_ESP32_8MB.csv
index 5e930b89a23f0283da49f391c57cf34c21cd9c76..3cf3afc342136e03cdd2d443ebb5b8c5e8710d0b 100644
--- a/tools/WLED_ESP32_8MB.csv
+++ b/tools/WLED_ESP32_8MB.csv
@@ -3,4 +3,5 @@ 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,0x3F0000,
\ No newline at end of file
+spiffs, data, spiffs, 0x410000,0x3E0000,
+coredump, data, coredump,,64K
