diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index 58754e6f..a12a2ef4 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -7,7 +7,7 @@
         "extra_flags": "-DBOARD_HAS_PSRAM",
         "f_cpu": "240000000L",
         "f_flash": "80000000L",
-        "flash_mode": "dout",
+        "flash_mode": "qio",
         "mcu": "esp32s2",
         "variant": "esp32s2",
         "partitions": "esp32_partition_app1856k_spiffs320k.csv"
diff --git a/boards/esp32s2_solo1.json b/boards/esp32s2_solo1.json
index c2ae5c84..07405b36 100644
--- a/boards/esp32s2_solo1.json
+++ b/boards/esp32s2_solo1.json
@@ -7,7 +7,7 @@
         "extra_flags": "-DBOARD_HAS_PSRAM -DCORE32SOLO1",
         "f_cpu": "240000000L",
         "f_flash": "80000000L",
-        "flash_mode": "dout",
+        "flash_mode": "qoi",
         "mcu": "esp32s2",
         "variant": "esp32s2",
         "partitions": "esp32_partition_app1856k_spiffs320k.csv"
diff --git a/boards/esp32s3.json b/boards/esp32s3.json
deleted file mode 100644
index 555521bd..00000000
--- a/boards/esp32s3.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "build": {
-        "arduino": {
-            "ldscript": "esp32s3_out.ld"
-        },
-        "core": "esp32",
-        "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
-        "f_cpu": "240000000L",
-        "f_flash": "80000000L",
-        "flash_mode": "dio",
-        "mcu": "esp32s3",
-        "variant": "esp32s3",
-        "partitions": "esp32_partition_app1856k_spiffs320k.csv"
-    },
-    "connectivity": [
-        "wifi"
-    ],
-    "debug": {
-        "openocd_target": "esp32s3.cfg"
-    },
-    "frameworks": [
-        "espidf",
-        "arduino"
-    ],
-    "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
-    "upload": {
-        "flash_size": "4MB",
-        "maximum_ram_size": 327680,
-        "maximum_size": 4194304,
-        "require_upload_port": true,
-        "speed": 460800
-    },
-    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
-    "vendor": "Espressif"
-}
\ No newline at end of file
diff --git a/user_setups/esp32s3/esp32-s3-devkitc-1.ini b/user_setups/esp32s3/esp32-s3-devkitc-1.ini
index 14c2b754..ec957b3a 100644
--- a/user_setups/esp32s3/esp32-s3-devkitc-1.ini
+++ b/user_setups/esp32s3/esp32-s3-devkitc-1.ini
@@ -7,8 +7,8 @@
 
 [env:esp32-s3-devkitc-1]
 extends = arduino_esp32s3_v2, flash_8mb
-;board = esp32-s3-devkitc-1
-board = esp32s3_opi_opi
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = opi_opi
 
 build_flags =
     -D HASP_MODEL="ESP32-S3 Devkit C"
diff --git a/user_setups/esp32s3/freetouchdeck-s3.ini b/user_setups/esp32s3/freetouchdeck-s3.ini
index 47bb7bd6..510c81a0 100644
--- a/user_setups/esp32s3/freetouchdeck-s3.ini
+++ b/user_setups/esp32s3/freetouchdeck-s3.ini
@@ -6,8 +6,8 @@
 
 [freetouchdecks3]
 extends = arduino_esp32s3_v2
-;board = esp32-s3-devkitc-1
-board = esp32s3_opi_opi
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = opi_opi
 
 build_flags =
     -D HASP_MODEL="FreeTouchDeck S3"
diff --git a/user_setups/esp32s3/gs-t3e.ini b/user_setups/esp32s3/gs-t3e.ini
index a2cbe8b1..78bcdef9 100644
--- a/user_setups/esp32s3/gs-t3e.ini
+++ b/user_setups/esp32s3/gs-t3e.ini
@@ -7,8 +7,8 @@
 
 [odm-t3e]
 extends = arduino_esp32s3_v2
-;board = esp32-s3-devkitc-1
-board = esp32s3_qio_opi
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = qio_opi
 
 build_flags =
     -D HASP_MODEL="GS-T3E"
diff --git a/user_setups/esp32s3/sunton-esp32-s3-tft.ini b/user_setups/esp32s3/sunton-esp32-s3-tft.ini
index 8ad23696..a46a9036 100644
--- a/user_setups/esp32s3/sunton-esp32-s3-tft.ini
+++ b/user_setups/esp32s3/sunton-esp32-s3-tft.ini
@@ -7,7 +7,8 @@
 
 [sunton-esp32-s3-tft]
 extends = arduino_esp32s3_v2
-board = esp32s3_qio_opi
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = qio_opi
 
 build_flags =
     ${arduino_esp32s3_v2.build_flags}
@@ -140,8 +141,8 @@ build_flags =
     -D TFT_PREFER_SPEED=14000000
     -D TFT_AUTO_FLUSH=1
     ; Touch Setttings
-    -D TOUCH_WIDTH=480
-    -D TOUCH_HEIGHT=272
+    ;-D TOUCH_WIDTH=480
+    ;-D TOUCH_HEIGHT=272
     -D TOUCH_DRIVER=0x911
     -D TOUCH_SCL=20
     -D TOUCH_SDA=19
@@ -179,7 +180,7 @@ build_flags =
     ; Touch Setttings
     -D TOUCH_WIDTH=800
     -D TOUCH_HEIGHT=480
-    -D TOUCH_DRIVER=0x911
+    -D TOUCH_DRIVER=0x0911
     -D TOUCH_SCL=20
     -D TOUCH_SDA=19
     -D TOUCH_IRQ=-1
diff --git a/user_setups/esp32s3/ttgo-t-display-s3.ini b/user_setups/esp32s3/ttgo-t-display-s3.ini
index 90899935..192e960b 100644
--- a/user_setups/esp32s3/ttgo-t-display-s3.ini
+++ b/user_setups/esp32s3/ttgo-t-display-s3.ini
@@ -16,7 +16,8 @@ build_flags =
     ${esp32s3.ps_ram}
     -D HASP_MODEL="TTGO T-Display S3"
     -D ARDUINO_USB_MODE=1 
-    -D ARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_CDC_ON_BOOT
+	-DUSE_USB_CDC_CONSOLE
 
 ;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
diff --git a/user_setups/esp32s3/ttgo-t7-s3.ini b/user_setups/esp32s3/ttgo-t7-s3.ini
index 24439d97..1b47c865 100644
--- a/user_setups/esp32s3/ttgo-t7-s3.ini
+++ b/user_setups/esp32s3/ttgo-t7-s3.ini
@@ -7,7 +7,8 @@
 
 [ttgo-t7-s3_ili9341]
 extends = arduino_esp32s3_v2
-board = esp32s3_opi_opi
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = opi_opi
 
 build_flags =
     -D HASP_MODEL="TTGO T7 S3 v1.1"
diff --git a/user_setups/esp32s3/zw3d95ce01s_ar.ini b/user_setups/esp32s3/zw3d95ce01s_ar.ini
index 79f3585c..413b4dfb 100644
--- a/user_setups/esp32s3/zw3d95ce01s_ar.ini
+++ b/user_setups/esp32s3/zw3d95ce01s_ar.ini
@@ -7,8 +7,8 @@
 
 [panlee-zw3d95ce01s]
 extends = arduino_esp32s3_v2
-;board = esp32-s3-devkitc-1
-board = esp32s3_qio_opi
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = qio_opi
 
 build_flags =
     ${arduino_esp32s3_v2.build_flags}