diff --git a/User_Setup_Select.h b/User_Setup_Select.h
index be58b13..bd31358 100644
--- a/User_Setup_Select.h
+++ b/User_Setup_Select.h
@@ -43,6 +43,9 @@
 //#include <User_Setups/Setup20_ILI9488.h>           // Setup file for ESP8266 and ILI9488 SPI bus TFT
 //#include <User_Setups/Setup21_ILI9488.h>           // Setup file for ESP32 and ILI9488 SPI bus TFT
 
+//#include <User_Setups/Setup22_TTGO_T4.h>           // Setup file for ESP32 and TTGO T4 (BTC) ILI9341 SPI bus TFT
+//#include <User_Setups/Setup23_TTGO_TM.h>           // Setup file for ESP32 and TTGO TM ST7789 SPI bus TFT
+
 //#include <User_Setups/Setup43_ST7735.h>              // Setup file configured for my ST7735S 80x160
 
 //#include <User_Setups/SetupX_Template.h>
diff --git a/User_Setups/Setup22_TTGO_T4.h b/User_Setups/Setup22_TTGO_T4.h
new file mode 100644
index 0000000..fa04323
--- /dev/null
+++ b/User_Setups/Setup22_TTGO_T4.h
@@ -0,0 +1,28 @@
+// Setup for the TTGO T4 ("Bitcoin Tracker") ESP32 board with 2.2" ILI9341 display
+
+#define ILI9341_DRIVER
+
+#define TFT_MISO 12
+#define TFT_MOSI 23
+#define TFT_SCLK 18
+
+#define TFT_CS   27
+#define TFT_DC   26
+#define TFT_RST   5
+
+#define LOAD_GLCD
+#define LOAD_FONT2
+#define LOAD_FONT4
+#define LOAD_FONT6
+#define LOAD_FONT7
+#define LOAD_FONT8
+#define LOAD_GFXFF
+
+#define SMOOTH_FONT
+
+//#define SPI_FREQUENCY  27000000   // Actually sets it to 26.67MHz = 80/3
+  #define SPI_FREQUENCY  40000000   // Maximum for ILI9341
+
+#define SPI_TOUCH_FREQUENCY  2500000
+
+#define SPI_READ_FREQUENCY  10000000
diff --git a/User_Setups/Setup23_TTGO_TM.h b/User_Setups/Setup23_TTGO_TM.h
new file mode 100644
index 0000000..74c9a05
--- /dev/null
+++ b/User_Setups/Setup23_TTGO_TM.h
@@ -0,0 +1,34 @@
+// Setup for the TTGO TM (Music) ESP32 board with 2.4" ST7789V display
+
+#define ST7789_DRIVER
+
+#define TFT_SDA_READ // Read from display, it only provides an SDA pin
+
+#define TFT_MISO 19  // Must be defined even though it is not used
+#define TFT_MOSI 23  // Connected to display SDA line
+#define TFT_SCLK 18
+
+#define TFT_CS   05
+#define TFT_DC   16
+#define TFT_RST  17
+
+#define TFT_WIDTH  240
+#define TFT_HEIGHT 320
+
+//#define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
+#define TFT_RGB_ORDER TFT_BGR // Colour order Blue-Green-Red
+
+#define LOAD_GLCD
+#define LOAD_FONT2
+#define LOAD_FONT4
+#define LOAD_FONT6
+#define LOAD_FONT7
+#define LOAD_FONT8
+#define LOAD_GFXFF
+
+#define SMOOTH_FONT
+
+#define SPI_FREQUENCY  40000000 // The display also seems to work reliably at 80MHz
+
+#define SPI_READ_FREQUENCY  6000000 // 6 MHz is the maximum SPI read speed for the ST7789V
+