diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index de463b31..78872577 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -44,7 +44,7 @@ jobs:
         run: |
           cat platformio_override.ini
       - name: Run PlatformIO
-        run: pio run -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
+        run: pio run -e makerfabs-tft35-cap -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
       - name: Upload output file
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7c308c15..29e7fbff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
       run: |
         cat platformio_override.ini
     - name: Run PlatformIO
-      run: pio run -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
+      run: pio run -e makerfabs-tft35-cap -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
     - name: Upload output file
       uses: actions/upload-artifact@v2
       with:
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
index 7ffe6600..6f5c4f19 100644
--- a/platformio_override-template.ini
+++ b/platformio_override-template.ini
@@ -86,12 +86,12 @@ build_flags =
     ${esp32.build_flags}
 ;region -- TFT_eSPI build options -----------------------------------
     ${lcd.lolin24}
-    ${esp32.vspi}
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_DC=5
     -D TFT_CS=26 
-    -D TFT_RST=-1  ; RST
-    -D TFT_BCKL=22 ; None, configurable via web UI (e.g. 21)
-    -D TOUCH_CS=17 ; (can also be 22 or 16)
+    -D TFT_RST=-1        ; RST
+    -D TFT_BCKL=22       ; None, configurable via web UI (e.g. 21)
+    -D TOUCH_CS=17       ; (can also be 22 or 16)
 ; -- Options ----------------------------------------
     -D HASP_USE_TELNET=1
 ;endregion
diff --git a/user_setups/esp32/esp32-tft-touch.ini b/user_setups/esp32/makerfabs-tft35-cap.ini
similarity index 54%
rename from user_setups/esp32/esp32-tft-touch.ini
rename to user_setups/esp32/makerfabs-tft35-cap.ini
index b4cb8e07..8c52ddf7 100644
--- a/user_setups/esp32/esp32-tft-touch.ini
+++ b/user_setups/esp32/makerfabs-tft35-cap.ini
@@ -1,44 +1,43 @@
 ;***************************************************;
-;       ESP32 TFT Touch with camera 3.5" Capacitive ;
+;   Makerfabs TFT Touch with camera 3.5" Capacitive ;
 ;               - 3.5" ili9488 TFT SPI 4-WIRE       ;
 ;               - ft6336 touch controller           ;
 ;***************************************************;
-; untested config
 
-[env:esp32-tft-touch-35]
+[env:makerfabs-tft35-cap]
 extends = esp32
 board = esp32dev
+board_upload.flash_size=16MB
+board_upload.maximum_size = 16777216
+board_build.partitions = user_setups/esp32/partitions_16MB.csv
 
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-    ${esp32.hspi}        ; Use VSPI hardware SPI bus
-    -D HASP_MODEL="ESP32 TFT Touch 3.5"
+    ${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
     -D ILI9488_DRIVER=1
+    -D SUPPORT_TRANSACTIONS
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
     -D TFT_WIDTH=320
     -D TFT_HEIGHT=480
-    -D TFT_CS=15  ;// SS Chip select control pin
-    -D TFT_DC=33  ;// RS Data Command control pin
-    -D TFT_RST=-1 ;// Reset pin (could connect to RST pin)
-    -D TFT_BCKL=32  ;None, configurable via web UI (e.g. 2 for D4)
-    -D SUPPORT_TRANSACTIONS
-    -D TOUCH_DRIVER=6336 ; FT6336 Capacitive touch panel driver 
+    -D TFT_RST=26
+    -D TFT_DC=33
+    -D TFT_CS=15
+    -D TFT_BCKL=-1    ; Needs soldering R31
+    -D SPI_FREQUENCY=60000000
+    -D TOUCH_DRIVER=6336
     -D TOUCH_SDA=26
     -D TOUCH_SCL=27
     -D TOUCH_IRQ=0
-    -D TOUCH_RST=-1   ; not used
+    -D TOUCH_RST=-1
     -D TOUCH_FREQUENCY=400000
-    -D SPI_FREQUENCY=40000000
-    -D SPI_READ_FREQUENCY=20000000
 ;endregion
 
-; -- Debugging options -----------------------------
-;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
-
 ;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
@@ -47,5 +46,12 @@ lib_deps =
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
-;endregion
\ No newline at end of file
+    GxTFT
+    XPT2046_Touchscreen
+    Adafruit TouchScreen
+    Adafruit BusIO
+    Adafruit GFX Library
+    sstaub/Ticker
+    lv_drv_fsmc_ili9341
+    lv_drivers
+;endregion
diff --git a/user_setups/esp32/nscreen32.ini b/user_setups/esp32/nscreen32.ini
index b13212cd..e92dfeb3 100644
--- a/user_setups/esp32/nscreen32.ini
+++ b/user_setups/esp32/nscreen32.ini
@@ -15,7 +15,7 @@ board_build.partitions = user_setups/esp32/partitions_16MB.csv
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-    ${esp32.hspi}        ; Use VSPI hardware SPI bus
+    ${esp32.hspi}        ; Use HSPI hardware SPI bus
     -D HASP_MODEL="YeaCreate Nscreen32"
 
 ;region -- TFT_eSPI build options ------------------------