diff --git a/User_Setup_Select.h b/User_Setup_Select.h
index c0e3fbf..8016fdc 100644
--- a/User_Setup_Select.h
+++ b/User_Setup_Select.h
@@ -74,6 +74,8 @@
 
 //#include <User_Setups/Setup47_ST7735.h>            // Setup file configured for ST7735 128 x 128 animated eyes
 
+//#include <User_Setups/Setup48_ST7796_Parallel_ESP32.h>  // Setup for ESP32 and ST7796 parallel display (with Arduino pin layout)
+
 //#include <User_Setups/Setup50_SSD1963_Parallel.h>  // Setup file for ESP32 and SSD1963 TFT display
 
 //#include <User_Setups/Setup135_ST7789.h>           // Setup file for ESP8266 and ST7789 135 x 240 TFT
diff --git a/User_Setups/Setup48_ST7796_Parallel_ESP32.h b/User_Setups/Setup48_ST7796_Parallel_ESP32.h
new file mode 100644
index 0000000..f69d269
--- /dev/null
+++ b/User_Setups/Setup48_ST7796_Parallel_ESP32.h
@@ -0,0 +1,39 @@
+// Config for 3.95"TFT LCD Shield, For UNO/Mega2560, 480X320 Pixels
+// http://www.lcdwiki.com/3.95inch_Arduino_Display-UNO
+
+// See SetupX_Template.h for all options available
+
+// Display type
+#define ESP32_PARALLEL
+
+// Only define one driver
+#define ST7796_DRIVER
+
+// Pin map is compatible with Arduino Uno shield
+// ESP32 pins used for the parallel interface TFT
+#define TFT_CS   33  // Chip select control pin
+#define TFT_DC   15  // Data Command control pin - must use a pin in the range 0-31
+#define TFT_RST  32  // Reset pin
+
+#define TFT_WR    4  // Write strobe control pin - must use a pin in the range 0-31
+#define TFT_RD    2
+
+#define TFT_D0   12  // Must use pins in the range 0-31 for the data bus
+#define TFT_D1   13  // so a single register write sets/clears all bits
+#define TFT_D2   26
+#define TFT_D3   25
+#define TFT_D4   17
+#define TFT_D5   16
+#define TFT_D6   27
+#define TFT_D7   14
+
+// Fonts to be available
+#define LOAD_GLCD   // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
+#define LOAD_FONT2  // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
+#define LOAD_FONT4  // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
+#define LOAD_FONT6  // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
+#define LOAD_FONT7  // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:.
+#define LOAD_FONT8  // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
+#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
+
+#define SMOOTH_FONT