diff --git a/docs/displays/MHS4001.md b/docs/displays/MHS4001.md
index a0e4954c..8d2aed4f 100644
--- a/docs/displays/MHS4001.md
+++ b/docs/displays/MHS4001.md
@@ -55,9 +55,10 @@ build_flags =
     ${flags.esp32_flags}
 ; -- TFT_eSPI build options ------------------------
     ${lcd.raspberrypi}
-    ${pins.vspi32}
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_CS=15
     -D TFT_DC=4
     -D TFT_RST=32
+    -D TFT_BCKL=-1       ; None
     -D TOUCH_CS=22
 ```
\ No newline at end of file
diff --git a/docs/displays/Waveshare_40RPi_LCD(C).md b/docs/displays/Waveshare_40RPi_LCD(C).md
index 6d496c7b..1c2b813e 100644
--- a/docs/displays/Waveshare_40RPi_LCD(C).md
+++ b/docs/displays/Waveshare_40RPi_LCD(C).md
@@ -58,9 +58,10 @@ build_flags =
     ${flags.esp32_flags}
 ; -- TFT_eSPI build options ------------------------
     ${lcd.raspberrypi}
-    ${pins.vspi32}
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_CS=15
     -D TFT_DC=4
     -D TFT_RST=32
+    -D TFT_BCKL=-1       ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=22
 ```
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index 73545805..b5b850a6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -122,6 +122,15 @@ lib_deps = LittleFS_esp32
 extra_scripts =
     tools/copy_partitions.py
 
+; -- 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
 
 [esp8266]
 build_flags=
@@ -165,20 +174,6 @@ lib_deps =
     stm32duino/STM32duino LwIP @ ^2.1.2
     ;https://github.com/stm32duino/LwIP.git
 
-;***************************************************
-;          Hardware options
-;***************************************************
-; -- The SPI Hardware Busses available to use
-[pins]
-vspi32 =
-    -D TFT_MISO=19
-    -D TFT_MOSI=23
-    -D TFT_SCLK=18
-hspi32 =
-    -D TFT_MISO=12
-    -D TFT_MOSI=13
-    -D TFT_SCLK=14
-
 
 ;***************************************************
 ;          Native build
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
index 8f51dea2..8b6271b2 100644
--- a/platformio_override-template.ini
+++ b/platformio_override-template.ini
@@ -74,10 +74,11 @@ build_flags =
     ${esp32.build_flags}
 ;region -- TFT_eSPI build options -----------------------------------
     ${lcd.raspberrypi}
-    ${pins.vspi32}
+    ${esp32.vspi}
     -D TFT_CS=5
     -D TFT_DC=4
     -D TFT_RST=32
+    -D TFT_BCKL=-1       ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=22
 ;endregion
 
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index 31975e33..68ed7003 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -21,12 +21,12 @@ build_flags =
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
-    ${pins.vspi32}
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_DC=5
     -D TFT_CS=26 
-    -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)
+    -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)
 ;endregion
 
 ;region -- Library options -------------------------------
diff --git a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
index 3be95ae9..8c188f00 100644
--- a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
+++ b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
@@ -24,7 +24,7 @@ build_flags =
     -D TFT_ROTATION=${lcd.TFT_ROTATION}
     -D TFT_WIDTH=320
     -D TFT_HEIGHT=480
-    ${pins.vspi32}
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_BCKL=-1  ;None, configurable via web UI (e.g. 2 for D4)
     -D TFT_CS=33  ; Chip select control pin
     -D TFT_DC=15  ; Data Command control pin - must use a pin in the range 0-31
diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini
index 1ff53c0a..88d4e79d 100644
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@@ -31,12 +31,12 @@ build_flags =
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.raspberrypi}
     -D USE_HSPI_PORT
-    ${pins.hspi32}
+    ${esp32.hspi}        ; Use HSPI hardware SPI bus
     -D TFT_CS=15
     -D TFT_DC=2
-    -D TFT_RST=-1    ; 3.3v
-    -D TOUCH_CS=0   ; 3   ; RX
-    -D TFT_BCKL=-1
+    -D TFT_RST=-1        ; 3.3v
+    -D TFT_BCKL=-1       ; None, configurable via web UI (e.g. 21)
+    -D TOUCH_CS=0        
 ;endregion
 
 ; -- Debugging options -----------------------------
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 7b4ef28c..88c6d021 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -25,8 +25,8 @@ build_flags =
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
-    ${pins.vspi32}
-    ; The board already defines the macros for the TFT connector
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
+    ; The board already defines the macros for the TFT connector:
     ;-D TFT_DC=27   ; Defined by board, don't redefine !!
     ;-D TFT_CS=14   ; Defined by board, don't redefine !!
     ;-D TFT_RST=33  ; Defined by board, don't redefine !!
diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini
index 46d4813d..919b9ee4 100644
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@@ -21,10 +21,11 @@ build_flags =
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.raspberrypi}
-    ${pins.vspi32}
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_CS=15
     -D TFT_DC=4
     -D TFT_RST=32
+    -D TFT_BCKL=-1       ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=22
 ;endregion