diff --git a/user_setups/esp32/arduitouch-esp32_ili9341.ini b/user_setups/esp32/arduitouch-esp32_ili9341.ini
index 40bbb440..f25d43af 100644
--- a/user_setups/esp32/arduitouch-esp32_ili9341.ini
+++ b/user_setups/esp32/arduitouch-esp32_ili9341.ini
@@ -15,7 +15,8 @@ build_flags =
     -D HASP_MODEL="Arduitouch ESP32"
 
 ;region -- TFT_eSPI build options ------------------------
-    ${lcd.lolin24}
+    ${lcd.ili9341}
+    ${touch.xpt2046}
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_DC=4
     -D TFT_CS=5 
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index 3f32e022..f1bebbad 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -15,7 +15,8 @@ build_flags =
     -D HASP_MODEL="ESP32 D1 Mini"
 
 ;region -- TFT_eSPI build options ------------------------
-    ${lcd.lolin24}
+    ${lcd.ili9341}
+    ${touch.xpt2046}
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_DC=5
     -D TFT_CS=26 
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 83a53575..f7445aea 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -21,7 +21,8 @@ build_flags =
     -D HASP_MODEL="Lolin D32 Pro"
 
 ;region -- TFT_eSPI build options ------------------------
-    ${lcd.lolin24}
+    ${lcd.ili9341}
+    ${touch.xpt2046}
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D USE_TFT_ESPI
     ; The board already defines the macros for the TFT connector:
diff --git a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
index 6eb7ac8a..ed48a048 100644
--- a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
+++ b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
@@ -14,7 +14,8 @@ build_flags =
     ${esp8266.build_flags}
 
 ;region -- TFT_eSPI build options ------------------------
-    ${lcd.lolin24}
+    ${lcd.ili9341}
+    ${touch.xpt2046}
     ;-D TFT_MISO=12 ;D6  Use default HSPI
     ;-D TFT_MOSI=13 ;D7  Use default HSPI
     ;-D TFT_SCLK=14 ;D5  Use default HSPI
diff --git a/user_setups/lcd_config.ini b/user_setups/lcd_config.ini
index ef9d816b..5f42d218 100644
--- a/user_setups/lcd_config.ini
+++ b/user_setups/lcd_config.ini
@@ -1,3 +1,17 @@
+; -- Standard configuration parameters for supported touch panels
+[touch]
+xpt2046 =
+    -D SPI_TOUCH_FREQUENCY=2500000
+    -D TOUCH_DRIVER=2046     ; XPT2046 Resistive SPI touch panel driver
+
+gt911 =
+    -D TOUCH_DRIVER=911      ; GT911 Capacitive I2C touch panel driver
+    -D I2C_TOUCH_FREQUENCY=400000
+
+stmpe610 =
+    -D TOUCH_DRIVER=610      ;STMPE610 Capacitive SPI touch panel driver
+    -D SPI_TOUCH_FREQUENCY=2500000
+
 ; -- Standard configuration parameters for supported displays
 [lcd]
 tft_rotation = 0      ; default rotation
@@ -14,6 +28,16 @@ tft_height = 320      ; default height
 ; 6 - mirror content, and rotate 0 deg anti-clockwise
 ; 7 - mirror content, and rotate 90 deg anti-clockwise
 
+ili9341 =
+    -D ILI9341_DRIVER=1
+    -D TFT_WIDTH=240
+    -D TFT_HEIGHT=320
+    -D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
+    -D SPI_FREQUENCY=40000000
+    -D SPI_READ_FREQUENCY=20000000
+    -D USER_SETUP_LOADED=1
+    -D SUPPORT_TRANSACTIONS
+
 lolin24 =
     -D ILI9341_DRIVER=1
     -D TFT_WIDTH=240