diff --git a/boards.txt b/boards.txt
index ecb66378e..88fb110b0 100644
--- a/boards.txt
+++ b/boards.txt
@@ -41427,204 +41427,204 @@ jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb
 
 ##############################################################
 
-waveshare_esp32_touch_amoled_241.name=Waveshare ESP32-Touch-AMOLED-2.41
-waveshare_esp32_touch_amoled_241.vid.0=0x303a
-waveshare_esp32_touch_amoled_241.pid.0=0x8242
-waveshare_esp32_touch_amoled_241.upload_port.0.vid=0x303a
-waveshare_esp32_touch_amoled_241.upload_port.0.pid=0x8242
+waveshare_esp32_s3_touch_amoled_241.name=Waveshare ESP32-S3-Touch-AMOLED-2.41
+waveshare_esp32_s3_touch_amoled_241.vid.0=0x303a
+waveshare_esp32_s3_touch_amoled_241.pid.0=0x8242
+waveshare_esp32_s3_touch_amoled_241.upload_port.0.vid=0x303a
+waveshare_esp32_s3_touch_amoled_241.upload_port.0.pid=0x8242
 
-waveshare_esp32_touch_amoled_241.bootloader.tool=esptool_py
-waveshare_esp32_touch_amoled_241.bootloader.tool.default=esptool_py
+waveshare_esp32_s3_touch_amoled_241.bootloader.tool=esptool_py
+waveshare_esp32_s3_touch_amoled_241.bootloader.tool.default=esptool_py
 
-waveshare_esp32_touch_amoled_241.upload.tool=esptool_py
-waveshare_esp32_touch_amoled_241.upload.tool.default=esptool_py
-waveshare_esp32_touch_amoled_241.upload.tool.network=esp_ota
+waveshare_esp32_s3_touch_amoled_241.upload.tool=esptool_py
+waveshare_esp32_s3_touch_amoled_241.upload.tool.default=esptool_py
+waveshare_esp32_s3_touch_amoled_241.upload.tool.network=esp_ota
 
-waveshare_esp32_touch_amoled_241.upload.maximum_size=1310720
+waveshare_esp32_s3_touch_amoled_241.upload.maximum_size=1310720
 
-waveshare_esp32_touch_amoled_241.upload.maximum_data_size=327680
-waveshare_esp32_touch_amoled_241.upload.flags=
-waveshare_esp32_touch_amoled_241.upload.extra_flags=
-waveshare_esp32_touch_amoled_241.upload.use_1200bps_touch=false
-waveshare_esp32_touch_amoled_241.upload.wait_for_upload_port=false
+waveshare_esp32_s3_touch_amoled_241.upload.maximum_data_size=327680
+waveshare_esp32_s3_touch_amoled_241.upload.flags=
+waveshare_esp32_s3_touch_amoled_241.upload.extra_flags=
+waveshare_esp32_s3_touch_amoled_241.upload.use_1200bps_touch=false
+waveshare_esp32_s3_touch_amoled_241.upload.wait_for_upload_port=false
 
-waveshare_esp32_touch_amoled_241.serial.disableDTR=false
-waveshare_esp32_touch_amoled_241.serial.disableRTS=false
+waveshare_esp32_s3_touch_amoled_241.serial.disableDTR=false
+waveshare_esp32_s3_touch_amoled_241.serial.disableRTS=false
 
-waveshare_esp32_touch_amoled_241.build.tarch=xtensa
-waveshare_esp32_touch_amoled_241.build.bootloader_addr=0x0
-waveshare_esp32_touch_amoled_241.build.target=esp32s3
-waveshare_esp32_touch_amoled_241.build.mcu=esp32s3
-waveshare_esp32_touch_amoled_241.build.core=esp32
-waveshare_esp32_touch_amoled_241.build.variant=waveshare_esp32_touch_amoled_241
-waveshare_esp32_touch_amoled_241.build.board=WAVESHARE_ESP32_TOUCH_AMOLED_241
+waveshare_esp32_s3_touch_amoled_241.build.tarch=xtensa
+waveshare_esp32_s3_touch_amoled_241.build.bootloader_addr=0x0
+waveshare_esp32_s3_touch_amoled_241.build.target=esp32s3
+waveshare_esp32_s3_touch_amoled_241.build.mcu=esp32s3
+waveshare_esp32_s3_touch_amoled_241.build.core=esp32
+waveshare_esp32_s3_touch_amoled_241.build.variant=waveshare_esp32_s3_touch_amoled_241
+waveshare_esp32_s3_touch_amoled_241.build.board=WAVESHARE_ESP32_S3_TOUCH_AMOLED_241
 
-waveshare_esp32_touch_amoled_241.build.usb_mode=1
-waveshare_esp32_touch_amoled_241.build.cdc_on_boot=0
-waveshare_esp32_touch_amoled_241.build.msc_on_boot=0
-waveshare_esp32_touch_amoled_241.build.dfu_on_boot=0
-waveshare_esp32_touch_amoled_241.build.f_cpu=240000000L
-waveshare_esp32_touch_amoled_241.build.flash_size=16MB
+waveshare_esp32_s3_touch_amoled_241.build.usb_mode=1
+waveshare_esp32_s3_touch_amoled_241.build.cdc_on_boot=0
+waveshare_esp32_s3_touch_amoled_241.build.msc_on_boot=0
+waveshare_esp32_s3_touch_amoled_241.build.dfu_on_boot=0
+waveshare_esp32_s3_touch_amoled_241.build.f_cpu=240000000L
+waveshare_esp32_s3_touch_amoled_241.build.flash_size=16MB
 
-waveshare_esp32_touch_amoled_241.build.flash_freq=80m
-waveshare_esp32_touch_amoled_241.build.flash_mode=dio
-waveshare_esp32_touch_amoled_241.build.boot=qio
-waveshare_esp32_touch_amoled_241.build.boot_freq=80m
-waveshare_esp32_touch_amoled_241.build.partitions=default
-waveshare_esp32_touch_amoled_241.build.defines=
-waveshare_esp32_touch_amoled_241.build.loop_core=
-waveshare_esp32_touch_amoled_241.build.event_core=
-waveshare_esp32_touch_amoled_241.build.psram_type=qspi
-waveshare_esp32_touch_amoled_241.build.memory_type={build.boot}_{build.psram_type}
+waveshare_esp32_s3_touch_amoled_241.build.flash_freq=80m
+waveshare_esp32_s3_touch_amoled_241.build.flash_mode=dio
+waveshare_esp32_s3_touch_amoled_241.build.boot=qio
+waveshare_esp32_s3_touch_amoled_241.build.boot_freq=80m
+waveshare_esp32_s3_touch_amoled_241.build.partitions=default
+waveshare_esp32_s3_touch_amoled_241.build.defines=
+waveshare_esp32_s3_touch_amoled_241.build.loop_core=
+waveshare_esp32_s3_touch_amoled_241.build.event_core=
+waveshare_esp32_s3_touch_amoled_241.build.psram_type=qspi
+waveshare_esp32_s3_touch_amoled_241.build.memory_type={build.boot}_{build.psram_type}
 
-waveshare_esp32_touch_amoled_241.menu.PSRAM.disabled=Disabled
-waveshare_esp32_touch_amoled_241.menu.PSRAM.disabled.build.defines=
-waveshare_esp32_touch_amoled_241.menu.PSRAM.disabled.build.psram_type=qspi
-waveshare_esp32_touch_amoled_241.menu.PSRAM.enabled=Enabled
-waveshare_esp32_touch_amoled_241.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-waveshare_esp32_touch_amoled_241.menu.PSRAM.enabled.build.psram_type=opi
+waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.disabled=Disabled
+waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.disabled.build.defines=
+waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.disabled.build.psram_type=qspi
+waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.enabled=Enabled
+waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.enabled.build.psram_type=opi
 
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio=QIO 80MHz
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio.build.flash_mode=dio
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio.build.boot=qio
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio.build.boot_freq=80m
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio.build.flash_freq=80m
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio120=QIO 120MHz
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio120.build.flash_mode=dio
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio120.build.boot=qio
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio120.build.boot_freq=120m
-waveshare_esp32_touch_amoled_241.menu.FlashMode.qio120.build.flash_freq=80m
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio=QIO 80MHz
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.flash_mode=dio
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.boot=qio
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.boot_freq=80m
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.flash_freq=80m
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120=QIO 120MHz
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.flash_mode=dio
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.boot=qio
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.boot_freq=120m
+waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.flash_freq=80m
 
-waveshare_esp32_touch_amoled_241.menu.LoopCore.1=Core 1
-waveshare_esp32_touch_amoled_241.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
-waveshare_esp32_touch_amoled_241.menu.LoopCore.0=Core 0
-waveshare_esp32_touch_amoled_241.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.1=Core 1
+waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.0=Core 0
+waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
 
-waveshare_esp32_touch_amoled_241.menu.EventsCore.1=Core 1
-waveshare_esp32_touch_amoled_241.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
-waveshare_esp32_touch_amoled_241.menu.EventsCore.0=Core 0
-waveshare_esp32_touch_amoled_241.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.1=Core 1
+waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.0=Core 0
+waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
 
-waveshare_esp32_touch_amoled_241.menu.USBMode.hwcdc=Hardware CDC and JTAG
-waveshare_esp32_touch_amoled_241.menu.USBMode.hwcdc.build.usb_mode=1
-waveshare_esp32_touch_amoled_241.menu.USBMode.default=USB-OTG (TinyUSB)
-waveshare_esp32_touch_amoled_241.menu.USBMode.default.build.usb_mode=0
+waveshare_esp32_s3_touch_amoled_241.menu.USBMode.hwcdc=Hardware CDC and JTAG
+waveshare_esp32_s3_touch_amoled_241.menu.USBMode.hwcdc.build.usb_mode=1
+waveshare_esp32_s3_touch_amoled_241.menu.USBMode.default=USB-OTG (TinyUSB)
+waveshare_esp32_s3_touch_amoled_241.menu.USBMode.default.build.usb_mode=0
 
-waveshare_esp32_touch_amoled_241.menu.CDCOnBoot.default=Disabled
-waveshare_esp32_touch_amoled_241.menu.CDCOnBoot.default.build.cdc_on_boot=0
-waveshare_esp32_touch_amoled_241.menu.CDCOnBoot.cdc=Enabled
-waveshare_esp32_touch_amoled_241.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.default=Disabled
+waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.default.build.cdc_on_boot=0
+waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.cdc=Enabled
+waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
 
-waveshare_esp32_touch_amoled_241.menu.MSCOnBoot.default=Disabled
-waveshare_esp32_touch_amoled_241.menu.MSCOnBoot.default.build.msc_on_boot=0
-waveshare_esp32_touch_amoled_241.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
-waveshare_esp32_touch_amoled_241.menu.MSCOnBoot.msc.build.msc_on_boot=1
+waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.default=Disabled
+waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.default.build.msc_on_boot=0
+waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.msc.build.msc_on_boot=1
 
-waveshare_esp32_touch_amoled_241.menu.DFUOnBoot.default=Disabled
-waveshare_esp32_touch_amoled_241.menu.DFUOnBoot.default.build.dfu_on_boot=0
-waveshare_esp32_touch_amoled_241.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
-waveshare_esp32_touch_amoled_241.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.default=Disabled
+waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.default.build.dfu_on_boot=0
+waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
 
-waveshare_esp32_touch_amoled_241.menu.UploadMode.default=UART0 / Hardware CDC
-waveshare_esp32_touch_amoled_241.menu.UploadMode.default.upload.use_1200bps_touch=false
-waveshare_esp32_touch_amoled_241.menu.UploadMode.default.upload.wait_for_upload_port=false
-waveshare_esp32_touch_amoled_241.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
-waveshare_esp32_touch_amoled_241.menu.UploadMode.cdc.upload.use_1200bps_touch=true
-waveshare_esp32_touch_amoled_241.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.default=UART0 / Hardware CDC
+waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.default.upload.use_1200bps_touch=false
+waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.default.upload.wait_for_upload_port=false
+waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.default.build.partitions=default
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.default.build.partitions=default
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
 
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.no_ota.build.partitions=no_ota
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.huge_app.build.partitions=huge_app
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.rainmaker=RainMaker 4MB
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.fatflash.build.partitions=ffat
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.no_ota.build.partitions=no_ota
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.huge_app.build.partitions=huge_app
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker=RainMaker 4MB
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.fatflash.build.partitions=ffat
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.otanofs.upload.maximum_size=2031616
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA)
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.all_app.build.custom_partitions=partitions_all_app_4MB
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.all_app.upload.maximum_size=4128768
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.otanofs.upload.maximum_size=2031616
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA)
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.all_app.build.custom_partitions=partitions_all_app_4MB
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.all_app.upload.maximum_size=4128768
 
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.custom=Custom
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.custom.build.partitions=
-waveshare_esp32_touch_amoled_241.menu.PartitionScheme.custom.upload.maximum_size=16777216
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.custom=Custom
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.custom.build.partitions=
+waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.custom.upload.maximum_size=16777216
 
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.240=240MHz (WiFi)
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.240.build.f_cpu=240000000L
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.160=160MHz (WiFi)
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.160.build.f_cpu=160000000L
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.80=80MHz (WiFi)
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.80.build.f_cpu=80000000L
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.40=40MHz
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.40.build.f_cpu=40000000L
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.20=20MHz
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.20.build.f_cpu=20000000L
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.10=10MHz
-waveshare_esp32_touch_amoled_241.menu.CPUFreq.10.build.f_cpu=10000000L
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.240=240MHz (WiFi)
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.240.build.f_cpu=240000000L
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.160=160MHz (WiFi)
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.160.build.f_cpu=160000000L
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.80=80MHz (WiFi)
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.80.build.f_cpu=80000000L
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.40=40MHz
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.40.build.f_cpu=40000000L
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.20=20MHz
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.20.build.f_cpu=20000000L
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.10=10MHz
+waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.10.build.f_cpu=10000000L
 
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.921600=921600
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.921600.upload.speed=921600
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.115200=115200
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.115200.upload.speed=115200
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.256000.windows=256000
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.256000.upload.speed=256000
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.230400.windows.upload.speed=256000
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.230400=230400
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.230400.upload.speed=230400
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.460800.linux=460800
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.460800.macosx=460800
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.460800.upload.speed=460800
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.512000.windows=512000
-waveshare_esp32_touch_amoled_241.menu.UploadSpeed.512000.upload.speed=512000
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.921600=921600
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.921600.upload.speed=921600
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.115200=115200
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.115200.upload.speed=115200
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.256000.windows=256000
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.256000.upload.speed=256000
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.230400.windows.upload.speed=256000
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.230400=230400
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.230400.upload.speed=230400
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.460800.linux=460800
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.460800.macosx=460800
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.460800.upload.speed=460800
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.512000.windows=512000
+waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.512000.upload.speed=512000
 
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.none=None
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.none.build.code_debug=0
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.error=Error
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.error.build.code_debug=1
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.warn=Warn
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.warn.build.code_debug=2
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.info=Info
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.info.build.code_debug=3
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.debug=Debug
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.debug.build.code_debug=4
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.verbose=Verbose
-waveshare_esp32_touch_amoled_241.menu.DebugLevel.verbose.build.code_debug=5
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.none=None
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.none.build.code_debug=0
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.error=Error
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.error.build.code_debug=1
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.warn=Warn
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.warn.build.code_debug=2
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.info=Info
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.info.build.code_debug=3
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.debug=Debug
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.debug.build.code_debug=4
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.verbose=Verbose
+waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.verbose.build.code_debug=5
 
-waveshare_esp32_touch_amoled_241.menu.EraseFlash.none=Disabled
-waveshare_esp32_touch_amoled_241.menu.EraseFlash.none.upload.erase_cmd=
-waveshare_esp32_touch_amoled_241.menu.EraseFlash.all=Enabled
-waveshare_esp32_touch_amoled_241.menu.EraseFlash.all.upload.erase_cmd=-e
+waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.none=Disabled
+waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.none.upload.erase_cmd=
+waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.all=Enabled
+waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
diff --git a/variants/waveshare_esp32_touch_amoled_241/pins_arduino.h b/variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h
similarity index 96%
rename from variants/waveshare_esp32_touch_amoled_241/pins_arduino.h
rename to variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h
index 7c26553fc..cb6c5f40a 100644
--- a/variants/waveshare_esp32_touch_amoled_241/pins_arduino.h
+++ b/variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h
@@ -9,7 +9,7 @@
 #define USB_PID 0x8242
 
 #define USB_MANUFACTURER "Waveshare"
-#define USB_PRODUCT      "ESP32-Touch-AMOLED-2.41"
+#define USB_PRODUCT      "ESP32-S3-Touch-AMOLED-2.41"
 #define USB_SERIAL       ""
 
 // display QSPI SPI2