diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index bae61bc9..ffb405e2 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -10,7 +10,8 @@ platform = espressif32@^1.12.0
 board = wemos_d1_mini32
 upload_port = COM5      ; To change the port, use platform_override.ini
 monitor_port = COM5     ; To change the port, use platform_override.ini
-board_build.partitions = default.csv
+board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv
+
 build_flags =
     ${flags.esp32_flags}
 ; -- TFT_eSPI build options ------------------------
@@ -21,3 +22,7 @@ build_flags =
     -D TFT_RST=-1  ; RST
     -D TFT_BCKL=-1 ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=17 ; (can also be 22 or 16)
+
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
index e3c45355..e9b956ed 100644
--- a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
+++ b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
@@ -9,6 +9,7 @@ platform = espressif32
 board = esp32dev
 upload_port = COM4      ; To change the port, use platform_override.ini
 monitor_port = COM4     ; To change the port, use platform_override.ini
+board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv
 
 build_flags =
     ${flags.esp32_flags}
diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini
index b3fac875..4b731642 100644
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@@ -13,6 +13,7 @@ monitor_port = COM2     ; To change the port, use platform_override.ini
 ; upload_port = 10.4.0.171 ; IP of the ESP
 ; upload_flags =
 ;  --port=3232
+board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv
 debug_tool = esp-prog
 debug_init_break = tbreak setup
 
@@ -45,4 +46,6 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
 
-src_filter = +<*> +<../drivers/stm32f429_disco>
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
index 52e79ade..2a3835d3 100644
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@@ -10,6 +10,7 @@ platform = espressif32
 board = esp32dev
 upload_port = COM1      ; To change the port, use platform_override.ini
 monitor_port = COM1     ; To change the port, use platform_override.ini
+board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv
 debug_tool = esp-prog
 debug_init_break = tbreak setup
 
@@ -43,4 +44,6 @@ lib_deps =
     ${env.lib_deps}
     https://github.com/netwizeBE/arduino-goodix.git  ; GT911 touch screen driver
 
-src_filter = +<*> +<../drivers/stm32f429_disco>
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini
index cc111771..bab672a6 100644
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@@ -18,7 +18,7 @@ board = esp32cam
 debug_tool = esp-prog
 debug_init_break = tbreak setup
 ;board_build.partitions = min_spiffs.csv
-board_build.partitions = default.csv
+board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv
 ;ESP32 CAM PINS
 build_flags =
     ${flags.esp32_flags}
@@ -26,6 +26,7 @@ build_flags =
     ${lcd.raspberrypi}
     -D USE_HSPI_PORT
     ${pins.hspi32}
+    -DBOARD_HAS_PSRAM
     -D TFT_CS=15
     -D TFT_DC=2
     -D TFT_RST=-1    ; 3.3v
@@ -39,3 +40,6 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
 
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini
index 9ccd8f96..579e1fa1 100644
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@@ -10,6 +10,7 @@ platform = espressif32
 board = nodemcu-32s
 upload_port = COM3      ; To change the port, use platform_override.ini
 monitor_port = COM3     ; To change the port, use platform_override.ini
+board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv
 debug_tool = esp-prog
 debug_init_break = tbreak setup
 
@@ -29,3 +30,7 @@ build_flags =
 ; -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
+
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/esp8266/D1-mini_ili9341.ini b/user_setups/esp8266/D1-mini_ili9341.ini
index bd669242..2c334eb1 100644
--- a/user_setups/esp8266/D1-mini_ili9341.ini
+++ b/user_setups/esp8266/D1-mini_ili9341.ini
@@ -26,3 +26,7 @@ build_flags =
     -D TFT_BCKL=-1  ;None, configurable via web UI (e.g. 2 for D4)
     -D TOUCH_CS=0   ;D3  (can also be D1 or D2)
     -D TFT_RST=-1   ;RST
+
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/esp8266/esp8266_st7735.ini b/user_setups/esp8266/esp8266_st7735.ini
index 077eec02..28c8d593 100644
--- a/user_setups/esp8266/esp8266_st7735.ini
+++ b/user_setups/esp8266/esp8266_st7735.ini
@@ -36,3 +36,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ;Ethernet@<2.0.0
+
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
\ No newline at end of file
diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index 07efbcb0..1aef1610 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -10,7 +10,7 @@ platform = ststm32
 board = black_f407ve
 ;board_build.mcu = stm32f407vet6
 ; upload_protocol = dfu
-upload_protocol = stlink
+upload_protocol = dfu
 debug_tool = stlink
 monitor_port = COM19     ; To change the port, use platform_override.ini
 build_flags =
@@ -23,19 +23,29 @@ build_flags =
     -D ILI9341_DRIVER=1
     -D TFT_WIDTH=240
     -D TFT_HEIGHT=320
-    -D USER_SETUP_LOADED=1
-    -D TOUCH_CS=PA6 ;NC
-    -D TFT_RST=-1  ;D4
-    -D STM32
-    -D TFT_SPI3
-    -D USE_DMA_TO_TFT
-    -D HASP_USE_TASMOTA_SLAVE=1
+    -D USE_FSMC                     ; Use the onboard FSMC TFT header
+    ;-D USER_SETUP_LOADED=1
+    ;-D TOUCH_CS=PA6 ;NC
+    ;-D TFT_RST=-1  ;D4
+    ;-D STM32
+    ;-D TFT_SPI3
+    ;-D USE_DMA_TO_TFT
+    -D HASP_USE_TASMOTA_SLAVE=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
     -D STM32_SERIAL1                ; Set this option to use Serial1 as default sersial port, leave out if using Serial2
-    -D HASP_USE_ETHERNET=1
-    -D USE_BUILTIN_ETHERNET=1
-    -D HAL_ETH_MODULE_ENABLED=1
+    -D HASP_USE_WIFI=0
+    -D HASP_USE_MQTT=0
+    -D HASP_USE_HTTP=0
+    -D HASP_USE_MDNS=0
+    -D HASP_USE_SYSLOG=0
+    -D HASP_USE_TELNET=0
+    -D HASP_USE_SPIFFS=0
+    -D HASP_USE_EEPROM=1
+    -D HASP_USE_GPIO=0
+    -D HASP_USE_ETHERNET=0
+    -D USE_BUILTIN_ETHERNET=0
+    -D HAL_ETH_MODULE_ENABLED=0
     ; -D LAN8742A_PHY_ADDRESS=0x01U ; moved to include\stm32f4\hal_conf_custom.h
     ; -D DP83848_PHY_ADDRESS=0x01U
 
@@ -51,4 +61,7 @@ lib_deps =
     ;https://github.com/ZinggJM/GxTFT.git
     XPT2046_Touchscreen
 
+lib_ignore =
+    lv_lib_zifont
+
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
index 8f96fa44..361239a4 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -48,6 +48,11 @@ lib_deps =
     https://github.com/netwizeBE/Ethernet3.git
     https://github.com/khoih-prog/EthernetWebServer_STM32
 
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
+    lv_lib_zifont
+
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
 
 ;***************************************************
diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
index 43b5d65c..a27c1059 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -49,4 +49,9 @@ lib_deps =
     https://github.com/stm32duino/STM32Ethernet.git
     https://github.com/khoih-prog/EthernetWebServer_STM32
 
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
+    lv_lib_zifont
+    
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>