diff --git a/platformio.ini b/platformio.ini
index dde844bf..17a3fd22 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,6 +16,7 @@ extra_configs =
     ; --  Base configurations per platform
     user_setups/esp32/_esp32.ini
     user_setups/esp32s2/_esp32s2.ini
+    user_setups/esp32s3/_esp32s3.ini
     ; --  Put active [env] files in this dir to be included in the build menu
     user_setups/active/*.ini
     ; --  Add customizations to this file only:
diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index e5e47e0f..42881b3f 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -2,6 +2,9 @@
 [esp32]
 extend = env
 board_build.filesystem = littlefs
+board_build.f_cpu = 240000000L
+board_build.mcu = esp32
+
 ; ----- crash reporter
 monitor_filters = esp32_exception_decoder
 
@@ -10,6 +13,7 @@ check_tool = cppcheck
 check_flags = --enable=all
 debug_tool = esp-prog
 debug_init_break = tbreak setup
+
 board_build.embed_files =
     data/edit.htm.gz
     data/openhasp.ttf
@@ -125,24 +129,6 @@ 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_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
-
 
 ; -- The Arduino ESP32 v2.0.2 with 3 available flash sizes:
 [arduino_esp32_v2]
@@ -156,23 +142,6 @@ lib_ignore =
     ${esp32.lib_ignore}
     LittleFS_esp32    ; Not needed for Arduino 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
diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index bc827334..cb3e1c91 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -10,9 +10,9 @@ extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
+    -D HASP_MODEL="AZ-Touch MOD ESP32 DevKitC"
     ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
-    -D HASP_MODEL="AZ-Touch MOD ESP32 DevKitC"
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index d3dcd309..69433d92 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -10,9 +10,9 @@ extends = arduino_esp32_v2, flash_4mb
 board = wemos_d1_mini32
 
 build_flags =
+    -D HASP_MODEL="ESP32 D1 Mini"
     ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
-    -D HASP_MODEL="ESP32 D1 Mini"
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
diff --git a/user_setups/esp32/d1-r32-waveshare_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
index a217a45f..45d6bfc2 100644
--- a/user_setups/esp32/d1-r32-waveshare_ili9486.ini
+++ b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
@@ -10,9 +10,9 @@ extends = arduino_esp32_v2, flash_4mb
 board = wemos_d1_mini32
 
 build_flags =
+    -D HASP_MODEL="ESP32 D1 R32 ILI9486"
     ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
-    -D HASP_MODEL="ESP32 D1 R32 ILI9486"
 
 ;region -- TFT_eSPI build options ------------------------
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index f99fa9a0..5f2ab998 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -9,9 +9,9 @@ extends = arduino_esp32_v2, flash_4mb
 board = esp32dev
 
 build_flags =
+    -D HASP_MODEL="ESP32 Touchdown"
     ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
-    -D HASP_MODEL="ESP32 Touchdown"
 
 ;region -- TFT_eSPI build options ------------------------
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
diff --git a/user_setups/esp32/freetouchdeck.ini b/user_setups/esp32/freetouchdeck.ini
index ab29cdd9..ff26d554 100644
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@@ -9,9 +9,9 @@ extends = arduino_esp32_v2
 board = esp32dev
 
 build_flags =
+    -D HASP_MODEL="FreeTouchDeck"
     ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
-    -D HASP_MODEL="FreeTouchDeck"
 
 ;region -- TFT_eSPI build options ------------------------
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini
index 527b9c36..672f9b01 100644
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@@ -10,9 +10,9 @@ extends = arduino_esp32_v2, flash_4mb
 board = featheresp32
 
 build_flags =
+    -D HASP_MODEL="Adafruit Featherwing 2.4"
     ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
-    -D HASP_MODEL="Adafruit Featherwing 2.4"
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.featherwing-24}
diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini
index d98a8fed..6890a1cc 100644
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@@ -10,9 +10,9 @@ extends = arduino_esp32_v2, flash_4mb
 board = featheresp32
 
 build_flags =
+    -D HASP_MODEL="Adafruit Featherwing 3.5"
     ${arduino_esp32_v2.build_flags}
     ${esp32.no_ps_ram}
-    -D HASP_MODEL="Adafruit Featherwing 3.5"
 
     -D LV_INDEV_DEF_READ_PERIOD=30
 ;region -- TFT_eSPI build options ------------------------
diff --git a/user_setups/esp32/lanbon_l8_eth.ini b/user_setups/esp32/lanbon_l8_eth.ini
index 89164866..5584ebb4 100644
--- a/user_setups/esp32/lanbon_l8_eth.ini
+++ b/user_setups/esp32/lanbon_l8_eth.ini
@@ -7,14 +7,13 @@
 ;***************************************************;
 
 [env:lanbon_l8_eth]
-extends = esp32_8mb_v2
+extends = arduino_esp32_v2, flash_8mb
 board = esp32dev
 
 build_flags =
-    ${env.build_flags}
-    ${esp32.build_flags}
+    -D HASP_MODEL="Lanbon L8 Ethernet"
+    ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
-    -D HASP_MODEL="Lanbon L8 ETH"
 
 ;region -- TFT_eSPI build options ------------------------
    ;-D LANBONL8               ; This need to be disabled as ethernet uses some of the pins used in the current sense module
@@ -67,10 +66,7 @@ build_flags =
     -D ETHSPI_CS_GPIO=15
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32.lib_deps}
     ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
     ;${tft_espi.lib_deps}
@@ -78,8 +74,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 16326126..1390dfb1 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -12,9 +12,9 @@ extends = arduino_esp32_v2, flash_16mb
 board = lolin_d32_pro
 
 build_flags =
+    -D HASP_MODEL="Lolin D32 Pro"
     ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
-    -D HASP_MODEL="Lolin D32 Pro"
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
diff --git a/user_setups/esp32/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index 7225d012..f6ac4797 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -10,6 +10,7 @@ extends = arduino_esp32_v2, flash_16mb
 board = esp32dev
 
 build_flags =
+    -D HASP_MODEL="M5Stack Core2"
     ${arduino_esp32_v2.build_flags}
     ${esp32.ps_ram}
 
diff --git a/user_setups/esp32/m5stack_tough.ini b/user_setups/esp32/m5stack_tough.ini
index 983a5bce..54b5f062 100644
--- a/user_setups/esp32/m5stack_tough.ini
+++ b/user_setups/esp32/m5stack_tough.ini
@@ -10,6 +10,7 @@ extends = esp32_16mb_v2
 board = esp32dev
 
 build_flags =
+    -D HASP_MODEL="M5Stack Tough"
     ${env.build_flags}
     ${esp32.build_flags}
     ${esp32.ps_ram}
diff --git a/user_setups/esp32s3/_esp32s3.ini b/user_setups/esp32s3/_esp32s3.ini
index 7b212129..7699f2a4 100644
--- a/user_setups/esp32s3/_esp32s3.ini
+++ b/user_setups/esp32s3/_esp32s3.ini
@@ -1,138 +1,12 @@
 ; -- Platform specific build flags
 [esp32s3]
+extend = esp32
 board_build.mcu = esp32s3
-board_build.f_cpu = 240000000L
-board_upload.flash_size = 4MB
-board_upload.maximum_size = 4194304
-board_build.partitions = user_setups/esp32s2/no_ota.csv
-board_build.filesystem = littlefs
-
-; ----- debugger
-check_tool = cppcheck
-check_flags = --enable=all
-debug_tool = esp-prog
-debug_init_break = tbreak setup
-
-board_build.embed_files = ${esp32.board_build.embed_files}
-
-build_flags =
-    ${env.build_flags}
-    -D HTTP_UPLOAD_BUFLEN=1024      ; lower http upload buffer
-    -D MQTT_MAX_PACKET_SIZE=2048    ; longer PubSubClient messages
-    -D HASP_CONSOLE_BUFFER=256      ; maximum length of a console/telnet command
-    -D NO_GLOBAL_HTTPUPDATE         ; dont instantiate httpUpdate
-    ;-D CONFIG_NEWLIB_NANO_FORMAT
-; -- lvgl build options -----------------------------
-    -D LV_ATTRIBUTE_FAST_MEM=IRAM_ATTR
-    -D LV_ATTRIBUTE_TASK_HANDLER=IRAM_ATTR
-    -D LV_USE_FS_IF=1
-    ;-D LV_FS_PC_PATH="//littlefs"   ; this needs to match the vfs mount pount
-; -- ArduinoJson build options ----------------------------
-    -D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments
-; -- tft_espi build options ------------------------
-    ;-D USE_DMA_TO_TFT
-; -- openHASP build options ------------------------
-    -D HASP_ATTRIBUTE_FAST_MEM=IRAM_ATTR
-    -D HASP_USE_LVGL_TASK=0
-    -D HASP_USE_TELNET=1
-    ;-D HASP_USE_SPIFFS=1
-    -D HASP_USE_LITTLEFS=1
-    ;-D HASP_USE_EEPROM=1
-    -D HASP_USE_CONFIG=1            ; Native application, not library
-    -D LV_LOG_TRACE_TIMER=1
-    -D HASP_USE_PNGDECODE=1
-    -D HASP_USE_BMPDECODE=1
-    -D HASP_USE_JPGDECODE=0
-    -D HASP_USE_GIFDECODE=0
-; -- LittleFS build options ------------------------
-	;-D CONFIG_LITTLEFS_FOR_IDF_3_2  ; obsolete in IDF 3.3
-; -- FreeType build options ------------------------
-    -D LV_FREETYPE_SBIT_CACHE=1             ; use small bitmap cache
-    -D LV_FREETYPE_CACHE_SIZE=1             ; cache freetype font sizes
-    -D LV_USE_FT_CACHE_MANAGER=1            ; crashes without cache
-    -D LVGL_FREETYPE_MAX_FACES=16           ; max number of FreeType faces in cache
-    -D LVGL_FREETYPE_MAX_SIZES=16           ; max number of sizes in cache
-    -D LVGL_FREETYPE_MAX_BYTES=16384        ; max bytes in cache
-    -D LVGL_FREETYPE_MAX_BYTES_PSRAM=262144 ; max bytes in cache when using PSRAM
-; -- SimpleFTpServer build options -----------------
-    -D HASP_USE_FTP=1
-    -D FTP_SERVER_DEBUG
-    -D FTP_SERVER_NETWORK_TYPE=4 ;// NETWORK_ESP32
-    -D STORAGE_TYPE=6 ;//  STORAGE_LITTLEFS
-    -D STORAGE_SD_FORCE_DISABLE
-    -D STORAGE_SPIFFS_FORCE_DISABLE
-    
-lib_ignore =
-    GxTFT
-    XPT2046_Touchscreen
-    Adafruit GFX Library
-    ESP32 BLE Arduino
-    lv_drv_fsmc_ili9341
-    lv_drivers
-    AXP192
-
-lib_deps =
-    git+https://github.com/fvanroie/ConsoleInput.git#dev
-    bxparks/AceButton@^1.9.2         ; GPIO button library
-    bblanchon/StreamUtils@^1.7.0     ; for EEPromStream and BufferedTelnetClient
-    ; knolleary/PubSubClient@^2.8.0    ; MQTT client
-
-extra_scripts =
-    pre:tools/auto_firmware_version.py
-    tools/littlefsbuilder.py
-    tools/esp_merge_bin.py
-    tools/analyze_elf.py
-;    ${env.extra_scripts}
-;    tools/copy_partitions.py
-
-ps_ram =
-    -DBOARD_HAS_PSRAM
-    ;-mfix-esp32-psram-cache-issue  ; uses 24kB
-    -D HASP_USE_FREETYPE=1
-    -D LV_USE_FREETYPE=1
-no_ps_ram =
-    -D HASP_USE_FREETYPE=1
-    -D LV_USE_FREETYPE=1
-
-; -- The ESP32 has 2 SPI Hardware Busses available to use:
-vspi =
-    -D TFT_MISO=19
-    -D TFT_MOSI=23
-    -D TFT_SCLK=18
-hspi =
-    -D TFT_MISO=12
-    -D TFT_MOSI=13
-    -D TFT_SCLK=14
-
 
 ; -- The Arduino ESP32 v2.0.2 with 3 available flash sizes:
 [arduino_esp32s3_v2]
+extends = esp32s3
 framework = arduino
 platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.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 =
-lib_ignore = 
-
-[esp32s3_4mb_v2]
-extends = esp32s3, arduino_esp32s3_v2
-board_upload.flash_size=4MB
-board_upload.maximum_size = 4194304
-board_build.partitions = user_setups/esp32/partitions_4MB.csv
-
-[esp32s3_8mb_v2]
-extends = esp32s3, arduino_esp32s3_v2
-board_upload.flash_size=8MB
-board_upload.maximum_size = 8388608
-board_build.partitions = user_setups/esp32/partitions_8MB.csv
-
-[esp32s3_16mb_v2]
-extends = esp32s3, arduino_esp32s3_v2
-board_upload.flash_size = 16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv
diff --git a/user_setups/esp32s3/esp32-s3-devkitc-1.ini b/user_setups/esp32s3/esp32-s3-devkitc-1.ini
index 200a7155..14c2b754 100644
--- a/user_setups/esp32s3/esp32-s3-devkitc-1.ini
+++ b/user_setups/esp32s3/esp32-s3-devkitc-1.ini
@@ -6,15 +6,14 @@
 ;***************************************************;
 
 [env:esp32-s3-devkitc-1]
-extends = esp32s3_8mb_v2
+extends = arduino_esp32s3_v2, flash_8mb
 ;board = esp32-s3-devkitc-1
 board = esp32s3_opi_opi
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
+    -D HASP_MODEL="ESP32-S3 Devkit C"
+    ${arduino_esp32s3_v2.build_flags}
     ${esp32s3.no_ps_ram}
-    -D HASP_MODEL="ESP32 D1 Mini"
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
@@ -27,15 +26,6 @@ build_flags =
     -D TOUCH_CS=17       ; (can also be 22 or 16)
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${lovyangfx.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
diff --git a/user_setups/esp32s3/freetouchdeck-s3.ini b/user_setups/esp32s3/freetouchdeck-s3.ini
index 1bbaae5b..47bb7bd6 100644
--- a/user_setups/esp32s3/freetouchdeck-s3.ini
+++ b/user_setups/esp32s3/freetouchdeck-s3.ini
@@ -5,14 +5,14 @@
 ;***************************************************;
 
 [freetouchdecks3]
+extends = arduino_esp32s3_v2
 ;board = esp32-s3-devkitc-1
 board = esp32s3_opi_opi
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
-    ${esp32s3.no_ps_ram}
     -D HASP_MODEL="FreeTouchDeck S3"
+    ${arduino_esp32s3_v2.build_flags}
+    ${esp32s3.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
@@ -46,20 +46,11 @@ build_flags =
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${tft_espi.lib_deps}
     ;${lovyangfx.lib_deps}
-    
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
 
 
 [env:freetouchdeck-s3_8MB]
-extends = freetouchdecks3, esp32s3_8mb_v2
+extends = freetouchdecks3, flash_8mb
diff --git a/user_setups/esp32s3/gs-t3e.ini b/user_setups/esp32s3/gs-t3e.ini
index 144a1c8a..a2cbe8b1 100644
--- a/user_setups/esp32s3/gs-t3e.ini
+++ b/user_setups/esp32s3/gs-t3e.ini
@@ -6,14 +6,14 @@
 ;***************************************************;
 
 [odm-t3e]
+extends = arduino_esp32s3_v2
 ;board = esp32-s3-devkitc-1
 board = esp32s3_qio_opi
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
-    ${esp32s3.ps_ram}
     -D HASP_MODEL="GS-T3E"
+    ${arduino_esp32s3_v2.build_flags}
+    ${esp32s3.ps_ram}
     ;-DARDUINO_USB_CDC_ON_BOOT
 	;-DUSE_USB_CDC_CONSOLE
 
@@ -57,20 +57,11 @@ build_flags =
     -D TFT_VSYNC_BACK_PORCH=20
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${arduinogfx.lib_deps}
     ${goodix.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
-
 
 [env:gs-t3e_16MB]
-extends = odm-t3e, esp32s3_16mb_v2
\ No newline at end of file
+extends = odm-t3e, flash_16mb
\ No newline at end of file
diff --git a/user_setups/esp32s3/makerfabs-s3-tft35-spi.ini b/user_setups/esp32s3/makerfabs-s3-tft35-spi.ini
index 7f8d405c..9f214e38 100644
--- a/user_setups/esp32s3/makerfabs-s3-tft35-spi.ini
+++ b/user_setups/esp32s3/makerfabs-s3-tft35-spi.ini
@@ -5,14 +5,13 @@
 ;***************************************************;
 
 [env:makerfabs-s3-tft35-spi]
-extends = esp32s3_16mb_v2
+extends = arduino_esp32s3_v2
 board = esp32s3
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
-    ${esp32s3.ps_ram}
     -D HASP_MODEL="Makerfabs S3 SPI TFT With Touch 3.5 ILI9488"
+    ${arduino_esp32s3_v2.build_flags}
+    ${esp32s3.ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
     -D LGFX_USE_V1=1
@@ -44,15 +43,6 @@ build_flags =
     -D SD_CS=1
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${lovyangfx.lib_deps}
-
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
diff --git a/user_setups/esp32s3/sunton-esp32-s3-tft.ini b/user_setups/esp32s3/sunton-esp32-s3-tft.ini
index 07f00615..1202dd45 100644
--- a/user_setups/esp32s3/sunton-esp32-s3-tft.ini
+++ b/user_setups/esp32s3/sunton-esp32-s3-tft.ini
@@ -6,11 +6,11 @@
 ;***************************************************;
 
 [sunton-esp32-s3-tft]
+extends = arduino_esp32s3_v2
 board = esp32s3_qio_opi
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
+    ${arduino_esp32s3_v2.build_flags}
     ${esp32s3.ps_ram}
     ; -D HASP_MODEL="Sunton 4.3\""
     ;-DARDUINO_USB_CDC_ON_BOOT
@@ -22,23 +22,16 @@ build_flags =
     -D TFT_BCKL=2
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${arduinogfx.lib_deps}
     Arduino_RPi_DPI_RGBPanel_mod
     ${goodix.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
 
 [sunton-tft-common-pins]
 build_flags =
+    ; Bus Setttings
     -D TFT_DE=40
     -D TFT_VSYNC=41
     -D TFT_HSYNC=39
@@ -61,15 +54,14 @@ build_flags =
     -D TFT_B4=1
 
 [sunton-4827s043r_16MB]
-extends = sunton-esp32-s3-tft, esp32s3_16mb_v2
+extends = sunton-esp32-s3-tft, flash_16mb
 
 build_flags =
-    ${sunton-esp32-s3-tft.build_flags}
     -D HASP_MODEL="Sunton ESP32-4827S043R"
+    ${sunton-esp32-s3-tft.build_flags}
+    ${sunton-tft-common-pins.build_flags} ; Bus Setttings
     -D TFT_WIDTH=480
     -D TFT_HEIGHT=272
-    ; Bus Setttings
-    ${sunton-tft-common-pins.build_flags}
     ; Panel Settings
     -D TFT_HSYNC_POLARITY=0
     -D TFT_HSYNC_FRONT_PORCH=8
@@ -89,19 +81,17 @@ build_flags =
     -D TOUCH_MOSI=11
     -D TOUCH_CS=38
     -D TOUCH_IRQ=18
-lib_deps =
-    ${sunton-esp32-s3-tft.lib_deps}
+
 
 [env:sunton-4827s043c_16MB]
-extends = sunton-esp32-s3-tft, esp32s3_16mb_v2
+extends = sunton-esp32-s3-tft, flash_16mb
 
 build_flags =
-    ${sunton-esp32-s3-tft.build_flags}
     -D HASP_MODEL="Sunton ESP32-4827S043C"
+    ${sunton-esp32-s3-tft.build_flags}
+    ${sunton-tft-common-pins.build_flags} ; Bus Setttings
     -D TFT_WIDTH=480
     -D TFT_HEIGHT=272
-    ; Bus Setttings
-    ${sunton-tft-common-pins.build_flags}
     ; Panel Settings
     -D TFT_HSYNC_POLARITY=0
     -D TFT_HSYNC_FRONT_PORCH=8
@@ -127,16 +117,15 @@ lib_deps =
 
 
 [env:sunton-8048s043c_16MB]
-extends = sunton-esp32-s3-tft, esp32s3_16mb_v2
+extends = sunton-esp32-s3-tft, flash_16mb
 
 build_flags =
-    ${sunton-esp32-s3-tft.build_flags}
     -D HASP_MODEL="Sunton ESP32-8048S043C"
+    ${sunton-esp32-s3-tft.build_flags}
+    ${sunton-tft-common-pins.build_flags} ; Bus Setttings
     -D LV_VDB_SIZE=76800 ; 10% of full framebuffer
     -D TFT_WIDTH=800
     -D TFT_HEIGHT=480
-    ; Bus Setttings
-    ${sunton-tft-common-pins.build_flags}
     ; Panel Settings
     -D TFT_HSYNC_POLARITY=0
     -D TFT_HSYNC_FRONT_PORCH=8
@@ -164,16 +153,15 @@ lib_deps =
 
 
 [env:sunton-8048s050c_16MB]
-extends = sunton-esp32-s3-tft, esp32s3_16mb_v2
+extends = sunton-esp32-s3-tft, flash_16mb
 
 build_flags =
-    ${sunton-esp32-s3-tft.build_flags}
     -D HASP_MODEL="Sunton ESP32-8048S050C"
+    ${sunton-esp32-s3-tft.build_flags}
+    ${sunton-tft-common-pins.build_flags} ; Bus Setttings
     -D LV_VDB_SIZE=76800 ; 10% of full framebuffer
     -D TFT_WIDTH=800
     -D TFT_HEIGHT=480
-    ; Bus Setttings
-    ${sunton-tft-common-pins.build_flags}
     ; Panel Setttings
     -D TFT_HSYNC_POLARITY=0
     -D TFT_HSYNC_FRONT_PORCH=8
@@ -201,11 +189,11 @@ lib_deps =
     
 
 [env:sunton-8048s070c_16MB]
-extends = sunton-esp32-s3-tft, esp32s3_16mb_v2
+extends = sunton-esp32-s3-tft, flash_16mb
 
 build_flags =
-    ${sunton-esp32-s3-tft.build_flags}
     -D HASP_MODEL="Sunton ESP32-8048S070C"
+    ${sunton-esp32-s3-tft.build_flags}
     -D LV_VDB_SIZE=76800 ; 10% of full framebuffer
     -D TFT_WIDTH=800
     -D TFT_HEIGHT=480
diff --git a/user_setups/esp32s3/ttgo-t7-s3.ini b/user_setups/esp32s3/ttgo-t7-s3.ini
index 9472dd27..24439d97 100644
--- a/user_setups/esp32s3/ttgo-t7-s3.ini
+++ b/user_setups/esp32s3/ttgo-t7-s3.ini
@@ -6,13 +6,13 @@
 ;***************************************************;
 
 [ttgo-t7-s3_ili9341]
+extends = arduino_esp32s3_v2
 board = esp32s3_opi_opi
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
-    ${esp32s3.ps_ram}
     -D HASP_MODEL="TTGO T7 S3 v1.1"
+    ${arduino_esp32s3_v2.build_flags}
+    ${esp32s3.ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
@@ -27,19 +27,12 @@ build_flags =
     -D TOUCH_CS=3        ; (can also be 14 or )
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${lovyangfx.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
-
 
 [env:ttgo-t7-s3_ili9341_16MB]
-extends = ttgo-t7-s3_ili9341, esp32s3_16mb_v2
+extends = ttgo-t7-s3_ili9341, flash_16mb
diff --git a/user_setups/esp32s3/wt32-sc01-plus.ini b/user_setups/esp32s3/wt32-sc01-plus.ini
index 4a472747..b2579d7c 100644
--- a/user_setups/esp32s3/wt32-sc01-plus.ini
+++ b/user_setups/esp32s3/wt32-sc01-plus.ini
@@ -6,13 +6,13 @@
 ;***************************************************;
 
 [wt32-sc01-plus]
+extends = arduino_esp32s3_v2
 board = esp32s3
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
-    ${esp32s3.ps_ram}
     -D HASP_MODEL="SC01 Plus"
+    ${arduino_esp32s3_v2.build_flags}
+    ${esp32s3.ps_ram}
     -DARDUINO_USB_CDC_ON_BOOT
 	-DUSE_USB_CDC_CONSOLE
 
@@ -48,22 +48,13 @@ build_flags =
     -D TOUCH_SCL=5
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${lovyangfx.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
-
 
 [env:wt32-sc01-plus_8MB]
-extends = wt32-sc01-plus, esp32s3_8mb_v2
+extends = wt32-sc01-plus, flash_8mb
 
 [env:wt32-sc01-plus_16MB]
-extends = wt32-sc01-plus, esp32s3_16mb_v2
\ No newline at end of file
+extends = wt32-sc01-plus, flash_16mb
\ No newline at end of file
diff --git a/user_setups/esp32s3/zw3d95ce01s_ar.ini b/user_setups/esp32s3/zw3d95ce01s_ar.ini
index 179ca907..79f3585c 100644
--- a/user_setups/esp32s3/zw3d95ce01s_ar.ini
+++ b/user_setups/esp32s3/zw3d95ce01s_ar.ini
@@ -6,12 +6,12 @@
 ;***************************************************;
 
 [panlee-zw3d95ce01s]
+extends = arduino_esp32s3_v2
 ;board = esp32-s3-devkitc-1
 board = esp32s3_qio_opi
 
 build_flags =
-    ${env.build_flags}
-    ${esp32s3.build_flags}
+    ${arduino_esp32s3_v2.build_flags}
     ${esp32s3.ps_ram}
     ;-DARDUINO_USB_CDC_ON_BOOT
 	;-DUSE_USB_CDC_CONSOLE
@@ -39,26 +39,17 @@ build_flags =
     -D I2C_TOUCH_PORT=1
 ;endregion
 
-;region -- Library options -------------------------------
 lib_deps =
-    ${env.lib_deps}
-    ${esp32s3.lib_deps}
     ${arduino_esp32s3_v2.lib_deps}
     ${arduinogfx.lib_deps}
     ${ft6336.lib_deps}
 
-lib_ignore =
-    ${env.lib_ignore}
-    ${esp32s3.lib_ignore}
-    ${arduino_esp32s3_v2.lib_ignore}
-;endregion
-
 
 [env:panlee-zw3d95ce01s-ur-4848_16MB]
-extends = panlee-zw3d95ce01s, esp32s3_16mb_v2
+extends = panlee-zw3d95ce01s, flash_16mb
 build_flags =
-    ${panlee-zw3d95ce01s.build_flags}
     -D HASP_MODEL="ZX3D95CE01S-UR-4848"
+    ${panlee-zw3d95ce01s.build_flags}
     -D TOUCH_RST=-1  ; Touch reset GPIO5, multiplexed with LCD reset
     -D TOUCH_SCL=6  ; touch I2C bus clock, multiplexed with external interface
     -D TOUCH_SDA=15 ; Touch I2C bus data, multiplexed with external interface
@@ -92,10 +83,10 @@ build_flags =
     -D TFT_BCKL=4   ; LCD backlight control, high level enable
 
 [env:panlee-zw3d95ce01s-ar-4848_16MB]
-extends = panlee-zw3d95ce01s, esp32s3_16mb_v2
+extends = panlee-zw3d95ce01s, flash_16mb
 build_flags =
-    ${panlee-zw3d95ce01s.build_flags}
     -D HASP_MODEL="ZX3D95CE01S-AR-4848"
+    ${panlee-zw3d95ce01s.build_flags}
     -D TOUCH_SCL=6 ; touch screen IIC, multiplexed with multiple peripherals
     -D TOUCH_SDA=7 ; touch screen IIC, multiplexed with multiple peripherals
     -D TOUCH_INT=-1 ; Missed