diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index 58f7c28e..e5e47e0f 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -1,5 +1,10 @@
 ; -- Platform specific build flags
 [esp32]
+extend = env
+board_build.filesystem = littlefs
+; ----- crash reporter
+monitor_filters = esp32_exception_decoder
+
 ; ----- debugger
 check_tool = cppcheck
 check_flags = --enable=all
@@ -67,6 +72,7 @@ build_flags =
     -D STORAGE_SPIFFS_FORCE_DISABLE
     
 lib_ignore =
+    ${env.lib_ignore}
     GxTFT
     XPT2046_Touchscreen
     Adafruit GFX Library
@@ -76,6 +82,7 @@ lib_ignore =
     AXP192
 
 lib_deps =
+    ${env.lib_deps}
     git+https://github.com/fvanroie/ConsoleInput.git#dev
     ; lorol/LittleFS_esp32@^1.0.6    ; for Arduino v1 only
     bxparks/AceButton@^1.9.2         ; GPIO button library
@@ -111,69 +118,73 @@ hspi =
 
 ; -- The Arduino ESP32 v1.0.6 with 3 available flash sizes:
 [arduino_esp32_v1]
+extends = esp32
 framework = arduino
 platform = espressif32@^3.5.0
-board_build.filesystem = littlefs
-; ----- crash reporter
-monitor_filters = esp32_exception_decoder
-extra_scripts =
-    ${esp32.extra_scripts}
-lib_deps = lorol/LittleFS_esp32@^1.0.6   ; Needed for Arduino v1 only
-lib_ignore =
+lib_deps =
+    ${esp32.lib_deps}
+    lorol/LittleFS_esp32@^1.0.6   ; Needed for Arduino v1 only
 
-[esp32_4mb]
-extends = esp32, arduino_esp32_v1
-board_upload.flash_size=4MB
-board_upload.maximum_size = 4194304
-board_build.partitions = user_setups/esp32/partitions_4MB.csv
+; [esp32_4mb]
+; extends = esp32, arduino_esp32_v1
+; board_upload.flash_size=4MB
+; board_upload.maximum_size = 4194304
+; board_build.partitions = user_setups/esp32/partitions_4MB.csv
 
-[esp32_8mb]
-extends = esp32, arduino_esp32_v1
-board_upload.flash_size=8MB
-board_upload.maximum_size = 8388608
-board_build.partitions = user_setups/esp32/partitions_8MB.csv
+; [esp32_8mb]
+; extends = esp32, arduino_esp32_v1
+; board_upload.flash_size=8MB
+; board_upload.maximum_size = 8388608
+; board_build.partitions = user_setups/esp32/partitions_8MB.csv
 
-[esp32_16mb]
-extends = esp32, arduino_esp32_v1
-board_upload.flash_size = 16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv
+; [esp32_16mb]
+; extends = esp32, arduino_esp32_v1
+; board_upload.flash_size = 16MB
+; board_upload.maximum_size = 16777216
+; board_build.partitions = user_setups/esp32/partitions_16MB.csv
 
 
 ; -- The Arduino ESP32 v2.0.2 with 3 available flash sizes:
 [arduino_esp32_v2]
+extends = esp32
 framework = arduino
 platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.5/platform-espressif32-v.2.0.5.zip
 ;platform = https://github.com/tasmota/platform-espressif32/releases/download/2022.12.2/platform-espressif32.zip
 ;platform = espressif32
-board_build.filesystem = littlefs
-; ----- crash reporter
-monitor_filters = esp32_exception_decoder
-extra_scripts =
-    ${esp32.extra_scripts}
-lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
 
 lib_ignore =
-    ${env.lib_ignore}
     ${esp32.lib_ignore}
     LittleFS_esp32    ; Not needed for Arduino v2
 
-[esp32_4mb_v2]
-extends = esp32, arduino_esp32_v2
+; [esp32_4mb_v2]
+; extends = esp32, arduino_esp32_v2
+; board_upload.flash_size=4MB
+; board_upload.maximum_size = 4194304
+; board_build.partitions = user_setups/esp32/partitions_4MB.csv
+
+; [esp32_8mb_v2]
+; extends = esp32, arduino_esp32_v2
+; board_upload.flash_size=8MB
+; board_upload.maximum_size = 8388608
+; board_build.partitions = user_setups/esp32/partitions_8MB.csv
+
+; [esp32_16mb_v2]
+; extends = esp32, arduino_esp32_v2
+; board_upload.flash_size = 16MB
+; board_upload.maximum_size = 16777216
+; board_build.partitions = user_setups/esp32/partitions_16MB.csv
+
+[flash_4mb]
 board_upload.flash_size=4MB
 board_upload.maximum_size = 4194304
 board_build.partitions = user_setups/esp32/partitions_4MB.csv
 
-[esp32_8mb_v2]
-extends = esp32, arduino_esp32_v2
+[flash_8mb]
 board_upload.flash_size=8MB
 board_upload.maximum_size = 8388608
 board_build.partitions = user_setups/esp32/partitions_8MB.csv
 
-[esp32_16mb_v2]
-extends = esp32, arduino_esp32_v2
+[flash_16mb]
 board_upload.flash_size = 16MB
 board_upload.maximum_size = 16777216
 board_build.partitions = user_setups/esp32/partitions_16MB.csv
diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index 84550b58..bc827334 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -6,11 +6,11 @@
 ;***************************************************;
 
 [az-touch-mod-esp32_ili9341]
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
     -D HASP_MODEL="AZ-Touch MOD ESP32 DevKitC"
 
@@ -28,19 +28,12 @@ build_flags =
 
 ;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
 ;endregion
 
 [env:az-touch-mod-esp32_ili9341_4MB]
-extends = az-touch-mod-esp32_ili9341, esp32_4mb_v2
+extends = az-touch-mod-esp32_ili9341, flash_4mb
 
 [env:az-touch-mod-esp32_ili9341_8MB]
-extends = az-touch-mod-esp32_ili9341, esp32_8mb_v2
\ No newline at end of file
+extends = az-touch-mod-esp32_ili9341, flash_8mb
\ No newline at end of file
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index 40698f04..d3dcd309 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [env:d1-mini-esp32_ili9341]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = wemos_d1_mini32
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
     -D HASP_MODEL="ESP32 D1 Mini"
 
@@ -28,13 +27,6 @@ build_flags =
 
 ;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
index 85136cd9..d5058cdc 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
@@ -5,12 +5,11 @@
 ;***************************************************;
 
 [env:d1-r32-unoshield_ili9341_adc]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -50,14 +49,7 @@ build_flags =
 
 ;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ; ${tft_espi.lib_deps}
     ${lovyangfx.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
index dc16739c..4f14ec52 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
@@ -5,12 +5,11 @@
 ;***************************************************;
 
 [env:d1-r32-unoshield_ili9486_adc]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -47,16 +46,7 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ; ${tft_espi.lib_deps}
     ${lovyangfx.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/d1-r32-waveshare_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
index 9a64ef0c..a217a45f 100644
--- a/user_setups/esp32/d1-r32-waveshare_ili9486.ini
+++ b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [env:d1-r32-waveshare_ili9486]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = wemos_d1_mini32
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
     -D HASP_MODEL="ESP32 D1 R32 ILI9486"
 
@@ -36,16 +35,7 @@ build_flags =
     -D TOUCH_CS=17
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ; ${lovyangfx.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/esp32-2832s028.ini b/user_setups/esp32/esp32-2832s028.ini
index 75a9dcc9..c9a96cc8 100644
--- a/user_setups/esp32/esp32-2832s028.ini
+++ b/user_setups/esp32/esp32-2832s028.ini
@@ -5,12 +5,12 @@
 ;***************************************************;
 
 [esp32-2432s028r]
+extends = arduino_esp32_v2
 board = esp32dev
 upload_speed = 921600
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -38,22 +38,13 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
-    
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
 
 
 [env:esp32-2432s028r_4MB]
-extends = esp32-2432s028r, esp32_4mb_v2
+extends = esp32-2432s028r, flash_4mb
 build_flags =
     ${esp32-2432s028r.build_flags}
     -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
@@ -70,17 +61,8 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
-    ${arduino_esp32_v2.lib_deps}
+    ${esp32-2432s028r.lib_deps}
     ;${tft_espi.lib_deps}
     ${lovyangfx.lib_deps}
     ;${goodix.lib_deps}
-    
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/esp32-3248s035.ini b/user_setups/esp32/esp32-3248s035.ini
index b59ec218..b5fd3e06 100644
--- a/user_setups/esp32/esp32-3248s035.ini
+++ b/user_setups/esp32/esp32-3248s035.ini
@@ -5,11 +5,11 @@
 ;***************************************************;
 
 [esp32-3248s035]
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -32,23 +32,9 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
-lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
-    ${arduino_esp32_v2.lib_deps}
-    ${tft_espi.lib_deps}
-    ;${lovyangfx.lib_deps}
-    
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
-
 
 [env:esp32-3248s035r_4MB]
-extends = esp32-3248s035, esp32_4mb_v2
+extends = esp32-3248s035, flash_4mb
 build_flags =
     ${esp32-3248s035.build_flags}
     -D TOUCH_CS=33
@@ -62,14 +48,18 @@ build_flags =
     -D I2C_TOUCH_FREQUENCY=0
     -D SPI_TOUCH_FREQUENCY=2500000
 
+lib_deps =
+    ${esp32-3248s035.lib_deps}
+    ${tft_espi.lib_deps}
+    ;${lovyangfx.lib_deps}
+    
 
 [env:esp32-3248s035c_4MB]
-extends = esp32_4mb_v2
+extends = esp32-3248s035, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${esp32-3248s035.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -103,17 +93,8 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
-    ${arduino_esp32_v2.lib_deps}
+    ${esp32-3248s035.lib_deps}
     ;${tft_espi.lib_deps}
     ${lovyangfx.lib_deps}
     ;${goodix.lib_deps}
-    
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini
index 18d28c52..41daf493 100644
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@@ -5,12 +5,11 @@
 ;***************************************************;
 
 [env:esp32dev-ili9488]
-extends = esp32_4mb
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -35,13 +34,6 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-;endregion
diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
index 15c1ef23..dd385e4c 100644
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [env:esp32dev-mrb3511]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -39,17 +38,9 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${goodix.lib_deps}
     ; adafruit/Adafruit GFX Library @ ^1.10.3
     ; adafruit/Adafruit BusIO @ ^1.6.0
-
-lib_ignore =
-    ${env.lib_ignore}
-    ; ${esp32.lib_ignore}
-    lv_drv_fsmc_ili9341
-;endregion
diff --git a/user_setups/esp32/esp32-one.ini b/user_setups/esp32/esp32-one.ini
index 03a8d6e1..d8e48993 100644
--- a/user_setups/esp32/esp32-one.ini
+++ b/user_setups/esp32/esp32-one.ini
@@ -6,13 +6,13 @@
 ;***************************************************;
 
 [esp32one]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
-    -DBOARD_HAS_PSRAM               ; uses 78kB
+    ${arduino_esp32_v2.build_flags}
+    ${esp32.ps_ram}
+    ;-DBOARD_HAS_PSRAM               ; uses 78kB
     ;-mfix-esp32-psram-cache-issue  ; uses 
     
 ;region -- TFT_eSPI build options ------------------------
@@ -40,28 +40,19 @@ build_flags =
     -D HASP_USE_WIFI=1
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
-
 
 [env:esp32-one_ili9486]
-extends = esp32one
+extends = esp32one, flash_4mb
 build_flags =
     ${esp32one.build_flags}
     -D ILI9486_DRIVER=1
 
 [env:esp32-one_st7796]
-extends = esp32one
+extends = esp32one, flash_4mb
 build_flags =
     ${esp32one.build_flags}
     -D ST7796_DRIVER=1
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index 3b3652d6..f99fa9a0 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -5,12 +5,11 @@
 ;***************************************************;
 
 [env:esp32-touchdown]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
     -D HASP_MODEL="ESP32 Touchdown"
 
@@ -40,16 +39,7 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${ft6336.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/freetouchdeck.ini b/user_setups/esp32/freetouchdeck.ini
index f681652c..ab29cdd9 100644
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@@ -5,11 +5,11 @@
 ;***************************************************;
 
 [freetouchdeck]
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
     -D HASP_MODEL="FreeTouchDeck"
 
@@ -44,20 +44,13 @@ build_flags =
 
 ;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
 ;endregion
 
 
 [env:freetouchdeck_4MB]
-extends = merge:freetouchdeck, esp32_4mb_v2
+extends = freetouchdeck, flash_4mb
 
 [env:freetouchdeck_8MB]
-extends = merge:freetouchdeck, esp32_8mb_v2
+extends = freetouchdeck, flash_8mb
diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini
index 39ce47b5..527b9c36 100644
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [env:huzzah32-featherwing-24]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = featheresp32
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
     -D HASP_MODEL="Adafruit Featherwing 2.4"
 
@@ -28,13 +27,6 @@ build_flags =
 ;endregion
 
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
-    ${stmpe610.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
+    ${stmpe610.lib_deps}
\ No newline at end of file
diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini
index 4a14fb9d..d98a8fed 100644
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [env:huzzah32-featherwing-35]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = featheresp32
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
     -D HASP_MODEL="Adafruit Featherwing 3.5"
 
@@ -29,13 +28,6 @@ build_flags =
 ;endregion
 
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${stmpe610.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
diff --git a/user_setups/esp32/lilygo-lily-pi.ini b/user_setups/esp32/lilygo-lily-pi.ini
index a5ba9105..2fe14096 100644
--- a/user_setups/esp32/lilygo-lily-pi.ini
+++ b/user_setups/esp32/lilygo-lily-pi.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [lilygo-lily-pi]
-extends = esp32_16mb_v2
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
     
 ;region -- TFT_eSPI build options ------------------------
@@ -40,34 +39,21 @@ build_flags =
     -D HASP_USE_WIFI=1
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
-
 [env:lilygo-lily-pi_st7796]
-extends = lilygo-lily-pi, esp32_16mb_v2
+extends = lilygo-lily-pi, flash_16mb
 build_flags =
     ${lilygo-lily-pi.build_flags}
     -D ST7796_DRIVER=1
     -D SPI_FREQUENCY=40000000
     -D I2C_TOUCH_ADDRESS=0x38
     -D TOUCH_DRIVER=0x6336
-lib_deps =
-    ${lilygo-lily-pi.lib_deps}
-lib_ignore =
-    ${lilygo-lily-pi.lib_ignore}
     
 [env:lilygo-lily-pi_ili9481]
-extends = lilygo-lily-pi, esp32_16mb_v2
+extends = lilygo-lily-pi, flash_16mb
 build_flags =
     ${lilygo-lily-pi.build_flags}
     -D ILI9481_DRIVER=1
@@ -75,8 +61,4 @@ build_flags =
     ;-D TFT_INVERSION_ON   ; for inverted colors
     -D SPI_FREQUENCY=27000000
     -D I2C_TOUCH_ADDRESS=0x5D ; or 0x14
-    -D TOUCH_DRIVER=0x0911 ; GT911 Capacitive I2C touch panel driver
-lib_deps =
-    ${lilygo-lily-pi.lib_deps}
-lib_ignore =
-    ${lilygo-lily-pi.lib_ignore}
\ No newline at end of file
+    -D TOUCH_DRIVER=0x0911 ; GT911 Capacitive I2C touch panel driver
\ No newline at end of file
diff --git a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
index aea8e21b..4340a5a1 100644
--- a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
+++ b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
@@ -7,12 +7,11 @@
 ;***************************************************;
 
 [env:ttgo_esp32_poe-ili9341]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -32,15 +31,6 @@ build_flags =
     -D HASP_USE_WIFI=0
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
diff --git a/user_setups/esp32/ttgo-esp32_tdisplay_v1.ini b/user_setups/esp32/ttgo-esp32_tdisplay_v1.ini
index 6cf23fc0..f54e7831 100644
--- a/user_setups/esp32/ttgo-esp32_tdisplay_v1.ini
+++ b/user_setups/esp32/ttgo-esp32_tdisplay_v1.ini
@@ -1,11 +1,10 @@
 [env:ttgo-esp32_tdisplay_v1]
-extends = esp32_4mb_v2
+extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
     -D HASP_MODEL="TTGO T-Display"
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
     ; -D LGFX_USE_V1=1; LGFX lib, no rotation support yet
     -D USER_SETUP_LOADED=1 ; for espi lib, LGFX works without rotation
@@ -29,16 +28,6 @@ build_flags =
 
 
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ; ${lovyangfx.lib_deps}
     ${tft_espi.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-
-extra_scripts =
-    ${env.extra_scripts}
-    ${esp32.extra_scripts}
\ No newline at end of file