diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini
index 353c4741..efe47298 100644
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@@ -6,14 +6,13 @@
 ;***************************************************;
 
 [env:lanbon_l8]
-extends = esp32_8mb_v2
+extends = arduino_esp32_v2, flash_8mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
-    ${esp32.ps_ram}
     -D HASP_MODEL="Lanbon L8"
+    ${arduino_esp32_v2.build_flags}
+    ${esp32.ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
     -D LANBONL8
@@ -53,10 +52,7 @@ build_flags =
     -D RELAY_3=37
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
     ;${tft_espi.lib_deps}
@@ -64,8 +60,3 @@ lib_deps =
     ;git+https://github.com/lewisxhe/FocalTech_Library.git
     ${ft6336.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 4a6d2ba5..16326126 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -8,12 +8,11 @@
 ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!
 
 [env:lolin-d32-pro_ili9341]
-extends = esp32_16mb_v2
+extends = arduino_esp32_v2, flash_16mb
 board = lolin_d32_pro
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
     -D HASP_MODEL="Lolin D32 Pro"
 
@@ -29,15 +28,7 @@ build_flags =
     -D TOUCH_CS=12  ; Default for TFT connector
 ;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/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index f3602068..7225d012 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -6,12 +6,11 @@
 ;***************************************************;
 
 [env:m5stack-core2]
-extends = esp32_16mb_v2
+extends = arduino_esp32_v2, flash_16mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -32,17 +31,8 @@ build_flags =
     -D I2C_TOUCH_ADDRESS=0x38
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${ft6336.lib_deps}
     https://github.com/fvanroie/M5Core2.git#AXP192
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
diff --git a/user_setups/esp32/makerfabs-tft35-cap.ini b/user_setups/esp32/makerfabs-tft35-cap.ini
index 1f0c488d..05d3ff69 100644
--- a/user_setups/esp32/makerfabs-tft35-cap.ini
+++ b/user_setups/esp32/makerfabs-tft35-cap.ini
@@ -5,15 +5,14 @@
 ;***************************************************;
 
 [env:makerfabs-tft35-cap]
-extends = esp32_16mb_v2
+extends = arduino_esp32_v2, flash_16mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    -D HASP_MODEL="Makerfabs TFT Touch 3.5 Capacitive"
+    ${arduino_esp32_v2.build_flags}
     ${esp32.hspi}        ; Use HSPI hardware SPI bus
     ${esp32.ps_ram}
-    -D HASP_MODEL="Makerfabs TFT Touch 3.5 Capacitive"
 
 ;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
@@ -36,16 +35,7 @@ build_flags =
     -D I2C_TOUCH_ADDRESS=0x38
 ;endregion
 
-;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
diff --git a/user_setups/esp32/partitions_2MB.csv b/user_setups/esp32/partitions_2MB.csv
index 441aa8b5..fa56aa28 100644
--- a/user_setups/esp32/partitions_2MB.csv
+++ b/user_setups/esp32/partitions_2MB.csv
@@ -1,9 +1,9 @@
-# One single application partition of 1.625 MB
+# One single application partition of 1.687 MB
 # 240 kB filesystem
 #
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,     20K,
 otadata,  data, ota,     56K,     8K,
 app0,     app,  ota_0,   64K,     1728K,
-user,     data, nvs,     1792K,   16K,
+config,   data, nvs,     1792K,   16K,
 spiffs,   data, spiffs,  1808K,   240K,
diff --git a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
index 531a061b..281d109c 100644
--- a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
+++ b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
@@ -6,13 +6,13 @@
 ;***************************************************;
 
 [ttgo-t7-v1.5_ili9341]
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
-    ${esp32.ps_ram}
     -D HASP_MODEL="TTGO T7 v1.5"
+    ${arduino_esp32_v2.build_flags}
+    ${esp32.ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
@@ -25,21 +25,13 @@ build_flags =
     -D TOUCH_CS=27       ; (can also be 22 or 16)
 ;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:ttgo-t7-v1.5_ili9341_4MB]
-extends = ttgo-t7-v1.5_ili9341, esp32_4mb_v2
+extends = ttgo-t7-v1.5_ili9341, flash_4mb
 
 [env:ttgo-t7-v1.5_ili9341_16MB]
-extends = ttgo-t7-v1.5_ili9341, esp32_16mb_v2
+extends = ttgo-t7-v1.5_ili9341, flash_16mb
diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini
index 7dfaf7d8..8770935f 100644
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@@ -6,11 +6,12 @@
 ;***************************************************;
 
 [wt32-sc01]
+extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    -D HASP_MODEL="WT32-SC01"
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
@@ -37,23 +38,14 @@ build_flags =
     -D I2C_TOUCH_ADDRESS=0x38
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ;${lovyangfx.lib_deps}
     ${ft6336.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32.lib_ignore}
-    ${arduino_esp32_v2.lib_ignore}
-;endregion
-
 [env:wt32-sc01_4MB]
-extends = wt32-sc01, esp32_4mb_v2
+extends = wt32-sc01, flash_8mb
 
 [env:wt32-sc01_16MB]
-extends = wt32-sc01, esp32_16mb_v2
+extends = wt32-sc01, flash_16mb
diff --git a/user_setups/esp32/yeacreate-nscreen32.ini b/user_setups/esp32/yeacreate-nscreen32.ini
index 0def818c..50df6490 100644
--- a/user_setups/esp32/yeacreate-nscreen32.ini
+++ b/user_setups/esp32/yeacreate-nscreen32.ini
@@ -6,15 +6,14 @@
 ; untested config
 
 [env:yeacreate-nscreen32]
-extends = esp32_16mb_v2
+extends = arduino_esp32_v2, flash_8mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    -D HASP_MODEL="YeaCreate Nscreen32"
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
     ${esp32.hspi}        ; Use HSPI hardware SPI bus
-    -D HASP_MODEL="YeaCreate Nscreen32"
 
 ;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
@@ -53,17 +52,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}
     ${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