diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index 178ac100..e45a1aa9 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -63,11 +63,11 @@ lib_ignore =
 
 lib_deps =
     ;lorol/LittleFS_esp32@^1.0.6   ; for v1
-    bodmer/TFT_eSPI@2.4.42
-    ;ESP Async WebServer
+    ${tft_espi.lib_deps}
     git+https://github.com/fvanroie/ConsoleInput.git#dev
 
 extra_scripts =
+    pre:tools/auto_firmware_version.py
     tools/littlefsbuilder.py
     tools/esp_merge_bin.py
     tools/analyze_elf.py
@@ -93,7 +93,7 @@ hspi =
 ; -- The Arduino ESP32 v1.0.6 with 3 available flash sizes:
 [arduino_esp32_v1]
 framework = arduino
-platform = espressif32@^3.3.2
+platform = espressif32@^3.5.0
 board_build.embed_files =
     data/edit.htm.gz
     data/style.css.gz
diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index 96c7ffe0..6440c181 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -33,6 +33,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index 8ee0134d..d13035ca 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -30,6 +30,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/d1-r32-waveshare_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
index 7586d8a6..bd8b4619 100644
--- a/user_setups/esp32/d1-r32-waveshare_ili9486.ini
+++ b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
@@ -40,6 +40,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini
index 2a613bac..7bead00a 100644
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@@ -41,6 +41,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
index fa98ffbb..15c1ef23 100644
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@@ -43,10 +43,10 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    adafruit/Adafruit GFX Library @ ^1.10.3
-    adafruit/Adafruit BusIO @ ^1.6.0
-    ; GT911 touch screen driver
-    git+https://github.com/netwizeBE/arduino-goodix.git
+    ${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}
diff --git a/user_setups/esp32/esp32-one_st7796.ini b/user_setups/esp32/esp32-one_st7796.ini
index d3b6d799..d8ff9c3f 100644
--- a/user_setups/esp32/esp32-one_st7796.ini
+++ b/user_setups/esp32/esp32-one_st7796.ini
@@ -36,6 +36,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index 530db3b4..fb9ed43d 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -44,7 +44,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    ${tft_espi.lib_deps}
+    ${ft6336.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini
index 83a455b7..7f5e173b 100644
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@@ -33,6 +33,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/freetouchdeck.ini b/user_setups/esp32/freetouchdeck.ini
index 92ffdd68..82b83a4f 100644
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@@ -43,6 +43,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini
index d44d908b..536a92ff 100644
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@@ -30,7 +30,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    adafruit/Adafruit STMPE610@^1.1.4 ;STMPE610 touch controller
+    ${tft_espi.lib_deps}
+    ${stmpe610.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini
index fcfe4d75..38f120a1 100644
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@@ -31,7 +31,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    adafruit/Adafruit STMPE610@^1.1.4 ;STMPE610 touch controller
+    ${tft_espi.lib_deps}
+    ${stmpe610.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini
index 5cbeae0c..ee17597d 100644
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@@ -44,9 +44,10 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
     ; FT6336U is 6x faster then FocalTech Library
     ;git+https://github.com/lewisxhe/FocalTech_Library.git
-    git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    ${ft6336.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index e0ea5b02..411421b7 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -33,6 +33,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index cc30b84b..0469d5ef 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -36,7 +36,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    ${tft_espi.lib_deps}
+    ${ft6336.lib_deps}
     https://github.com/fvanroie/M5Core2.git#AXP192
 
 lib_ignore =
diff --git a/user_setups/esp32/makerfabs-tft35-cap.ini b/user_setups/esp32/makerfabs-tft35-cap.ini
index 75159551..51557e74 100644
--- a/user_setups/esp32/makerfabs-tft35-cap.ini
+++ b/user_setups/esp32/makerfabs-tft35-cap.ini
@@ -40,7 +40,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    ${tft_espi.lib_deps}
+    ${ft6336.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini
index 0d03e12c..3fb4c37f 100644
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@@ -31,6 +31,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
index d0613674..4568e3df 100644
--- a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
+++ b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
@@ -36,6 +36,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
index af2af7e7..98cf362c 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
@@ -55,11 +55,10 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${lovyangfx.lib_deps}
+    ${goodix.lib_deps}
     adafruit/Adafruit GFX Library @ ^1.10.3
     adafruit/Adafruit BusIO @ ^1.6.0
-    ; GT911 touch screen driver
-    ; git+https://github.com/netwizeBE/arduino-goodix.git
-    lovyan03/LovyanGFX @ ^0.4.12
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
index bae27608..a067c37f 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
@@ -49,12 +49,10 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${lovyangfx.lib_deps}
+    ${ft6336.lib_deps}
     adafruit/Adafruit GFX Library @ ^1.10.3
     adafruit/Adafruit BusIO @ ^1.6.0
-    ; GT911 touch screen driver
-    ; git+https://github.com/netwizeBE/arduino-goodix.git
-    ; git+https://github.com/aselectroworks/Arduino-FT6336U.git
-    lovyan03/LovyanGFX @ ^0.4.12
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
index 8094cb93..f6ae2fef 100644
--- a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
+++ b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
@@ -33,6 +33,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini
index 1ec5d4b0..422f5ac3 100644
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@@ -39,7 +39,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    ${tft_espi.lib_deps}
+    ${ft6336.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32/yeacreate-nscreen32.ini b/user_setups/esp32/yeacreate-nscreen32.ini
index 4302faac..2b92d03c 100644
--- a/user_setups/esp32/yeacreate-nscreen32.ini
+++ b/user_setups/esp32/yeacreate-nscreen32.ini
@@ -6,7 +6,7 @@
 ; untested config
 
 [env:yeacreate-nscreen32]
-extends = esp32_16mb_v2
+extends = esp32_16mb
 board = esp32dev
 
 build_flags =
@@ -17,7 +17,8 @@ build_flags =
     -D HASP_MODEL="YeaCreate Nscreen32"
 
 ;region -- TFT_eSPI build options ------------------------
-    -D USER_SETUP_LOADED=1
+    ;-D USER_SETUP_LOADED=1
+    -D LGFX_USE_V1=1
     -D ST7796_DRIVER=1
     -D ESP32_PARALLEL=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
@@ -56,5 +57,14 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    git+https://github.com/netwizeBE/arduino-goodix.git
+    bodmer/TFT_eSPI @ 2.4.32
+    ; ${tft_espi.lib_deps}
+    ${goodix.lib_deps}
+    ; https://github.com/lovyan03/LovyanGFX.git#1be6600
+    lorol/LittleFS_esp32@^1.0.6   ; for v1
+
+lib_ignore =
+    ${env.lib_ignore}
+    ;${esp32.lib_ignore}
+    ; TFT_eSPI
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini
index 4eea84c9..2ddc63a0 100644
--- a/user_setups/esp32s2/_esp32s2.ini
+++ b/user_setups/esp32s2/_esp32s2.ini
@@ -67,7 +67,7 @@ lib_ignore =
     AXP192
 
 lib_deps =
-    bodmer/TFT_eSPI@2.4.42
+    ${tft_espi.lib_deps}
     ;ESP Async WebServer
     git+https://github.com/fvanroie/ConsoleInput.git#dev
 
diff --git a/user_setups/esp32s2/esp32s2-featherwing-24.ini b/user_setups/esp32s2/esp32s2-featherwing-24.ini
index d3558a2f..0654b9e8 100644
--- a/user_setups/esp32s2/esp32s2-featherwing-24.ini
+++ b/user_setups/esp32s2/esp32s2-featherwing-24.ini
@@ -45,8 +45,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32s2.lib_deps}
-    adafruit/Adafruit STMPE610@^1.1.4 ;STMPE610 touch controller
-    lovyan03/LovyanGFX @ ^0.4.12
+    ${stmpe610.lib_deps}
+    ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32s2/esp32s2-metro.ini b/user_setups/esp32s2/esp32s2-metro.ini
index 32d76957..9e48297c 100644
--- a/user_setups/esp32s2/esp32s2-metro.ini
+++ b/user_setups/esp32s2/esp32s2-metro.ini
@@ -59,8 +59,8 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32s2.lib_deps}
-    adafruit/Adafruit STMPE610@^1.1.4 ;STMPE610 touch controller
-    lovyan03/LovyanGFX @ ^0.4.12
+    ${stmpe610.lib_deps}
+    ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32s2/makerfabs-tft-s2.ini b/user_setups/esp32s2/makerfabs-tft-s2.ini
index 945ca498..9990f9cb 100644
--- a/user_setups/esp32s2/makerfabs-tft-s2.ini
+++ b/user_setups/esp32s2/makerfabs-tft-s2.ini
@@ -47,7 +47,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32s2.lib_deps}
-    lovyan03/LovyanGFX @ ^0.4.12
+    ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
diff --git a/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini b/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini
index e8b3606c..36d5bda5 100644
--- a/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini
+++ b/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini
@@ -45,7 +45,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32s2.lib_deps}
-    lovyan03/LovyanGFX @ ^0.4.12
+    ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}