diff --git a/src/hasp_oobe.cpp b/src/hasp_oobe.cpp
index ebf86692..291e3c47 100644
--- a/src/hasp_oobe.cpp
+++ b/src/hasp_oobe.cpp
@@ -51,7 +51,7 @@ static void kb_event_cb(lv_obj_t* event_kb, lv_event_t event)
 {
     if(event == LV_EVENT_APPLY) {
         StaticJsonDocument<256> settings;
-        char ssid[MAX_SSID_LEN] = "";
+        char ssid[MAX_SSID_LEN]       = "";
         char pass[MAX_PASSPHRASE_LEN] = "";
         lv_obj_t* obj;
 
@@ -113,8 +113,10 @@ static void ta_event_cb(lv_obj_t* ta, lv_event_t event)
 
 static void oobeSetupQR(const char* ssid, const char* pass)
 {
-    lv_disp_t* disp = lv_disp_get_default();
-    oobepage[0]     = lv_obj_create(NULL, NULL);
+    lv_disp_t* disp    = lv_disp_get_default();
+    lv_coord_t hor_res = lv_disp_get_hor_res(disp);
+    lv_coord_t ver_res = lv_disp_get_ver_res(disp);
+    oobepage[0]        = lv_obj_create(NULL, NULL);
     char buffer[128];
     lv_obj_t* container = lv_cont_create(oobepage[0], NULL);
     lv_obj_set_pos(container, 5, 5);
@@ -131,14 +133,16 @@ static void oobeSetupQR(const char* ssid, const char* pass)
     snprintf_P(buffer, sizeof(buffer), PSTR(D_OOBE_SCAN_TO_CONNECT));
     lv_label_set_text(qrlabel, buffer);
 
-    if(disp->driver.hor_res <= disp->driver.ver_res) {
+    if(hor_res <= ver_res) {
         lv_obj_align(qr, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -5);
-        lv_obj_set_size(container, disp->driver.hor_res - 10, disp->driver.ver_res - 10 - 125);
+        lv_obj_set_size(container, hor_res - 10, ver_res - 10 - 125);
         lv_obj_align(qrlabel, container, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+        LOG_INFO(TAG_OOBE, "h: %d - v: %d", hor_res, ver_res);
     } else {
-        lv_obj_align(qr, NULL, LV_ALIGN_IN_RIGHT_MID, -5, 0);
-        lv_obj_set_size(container, disp->driver.hor_res - 10 - 125, disp->driver.ver_res - 10);
+        lv_obj_align(qr, NULL, LV_ALIGN_IN_RIGHT_MID, -5, -6);
+        lv_obj_set_size(container, hor_res - 10 - 125, ver_res - 10);
         lv_obj_align(qrlabel, qr, LV_ALIGN_OUT_BOTTOM_MID, 0, 5);
+        LOG_INFO(TAG_OOBE, "h: %d - v: %d", hor_res, ver_res);
     }
 
 #else
diff --git a/user_setups/esp32/m5stack_tough.ini b/user_setups/esp32/m5stack_tough.ini
index 54b5f062..52d0b1a1 100644
--- a/user_setups/esp32/m5stack_tough.ini
+++ b/user_setups/esp32/m5stack_tough.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:m5stack-tough]
-extends = esp32_16mb_v2
+extends = flash_16mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/ttgo-lilygo-pi_ili9481.old b/user_setups/esp32/ttgo-lilygo-pi_ili9481.old
index 9ac86cc4..bc67453f 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_ili9481.old
+++ b/user_setups/esp32/ttgo-lilygo-pi_ili9481.old
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:ttgo-lilygo-pi_ili9481b]
-extends = esp32_16mb_v2
+extends = flash_16mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/ttgo-lilygo-pi_st7796 copy.old b/user_setups/esp32/ttgo-lilygo-pi_st7796 copy.old
index 7945979e..0e9a9b63 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_st7796 copy.old	
+++ b/user_setups/esp32/ttgo-lilygo-pi_st7796 copy.old	
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:ttgo-lilygo-pi_st7796b]
-extends = esp32_16mb_v2
+extends = flash_16mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32s3/ttgo-t-display-s3.ini b/user_setups/esp32s3/ttgo-t-display-s3.ini
new file mode 100644
index 00000000..90899935
--- /dev/null
+++ b/user_setups/esp32s3/ttgo-t-display-s3.ini
@@ -0,0 +1,66 @@
+;***************************************************;
+;        TTGO T-Display-S3 with ST7789              ;
+;             - TTGO T7 S3 v1.1 Mini esp32 s3 board ;
+;             - ST7789  TFT                         ;
+;             - no touch controller            ;
+;***************************************************;
+
+[ttgo-t-display-s3_st7789]
+extends = arduino_esp32s3_v2
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = qio_opi
+
+build_flags =
+    ${env.build_flags}
+    ${esp32s3.build_flags}
+    ${esp32s3.ps_ram}
+    -D HASP_MODEL="TTGO T-Display S3"
+    -D ARDUINO_USB_MODE=1 
+    -D ARDUINO_USB_CDC_ON_BOOT=1
+
+;region -- TFT_eSPI build options ------------------------
+    -D USER_SETUP_LOADED=1
+    -D ST7789_DRIVER=1
+    -D CGRAM_OFFSET=1        ; Library will add offsets required
+    ;-D TFT_SDA_READ         ; Read from display, it only provides an SDA pin
+    -D TFT_WIDTH=170
+    -D TFT_HEIGHT=320
+    ;-D TFT_ROTATION=2       ; see TFT_ROTATION values
+    ; -D TFT_INVERSION_OFF   ; for normal colors
+    -D TFT_INVERSION_ON
+    -D TFT_RGB_ORDER=0       ; Colour order Blue-Green-Red
+    -D INVERT_COLORS=1       ; for inverted colors
+
+    ;-D INIT_SEQUENCE_3 // Using this initialisation sequence improves the display image
+    -D TFT_PARALLEL_8_BIT
+    -D TFT_DC=7
+    -D TFT_RST=5
+    -D TFT_WR=8
+    -D TFT_RD=9
+    -D TFT_D0=39
+    -D TFT_D1=40
+    -D TFT_D2=41
+    -D TFT_D3=42
+    -D TFT_D4=45
+    -D TFT_D5=46
+    -D TFT_D6=47
+    -D TFT_D7=48
+    -D TFT_BCKL=38
+;endregion
+
+;region -- Library options -------------------------------
+lib_deps =
+    ${env.lib_deps}
+    ${esp32s3.lib_deps}
+    ${arduino_esp32s3_v2.lib_deps}
+    ${tft_espi.lib_deps}
+
+lib_ignore =
+    ${env.lib_ignore}
+    ${esp32s3.lib_ignore}
+    ${arduino_esp32s3_v2.lib_ignore}
+;endregion
+
+
+[env:ttgo-t-display-s3_st7789_16MB]
+extends = ttgo-t-display-s3_st7789, flash_16mb