diff --git a/boards.txt b/boards.txt
index 83bad849bbe..fbedb4c960d 100644
--- a/boards.txt
+++ b/boards.txt
@@ -11927,6 +11927,391 @@ adafruit_matrixportal_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
 adafruit_matrixportal_esp32s3.menu.EraseFlash.all=Enabled
 adafruit_matrixportal_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
 
+##############################################################
+# Adafruit Camera ESP32-S3
+
+adafruit_camera_esp32s3.name=Adafruit pyCamera S3
+adafruit_camera_esp32s3.vid.0=0x239A
+adafruit_camera_esp32s3.pid.0=0x0117
+adafruit_camera_esp32s3.vid.1=0x239A
+adafruit_camera_esp32s3.pid.1=0x8117
+adafruit_camera_esp32s3.vid.1=0x239A
+adafruit_camera_esp32s3.pid.1=0x8118
+
+adafruit_camera_esp32s3.bootloader.tool=esptool_py
+adafruit_camera_esp32s3.bootloader.tool.default=esptool_py
+
+adafruit_camera_esp32s3.upload.tool=esptool_py
+adafruit_camera_esp32s3.upload.tool.default=esptool_py
+adafruit_camera_esp32s3.upload.tool.network=esp_ota
+
+adafruit_camera_esp32s3.upload.maximum_size=327680
+adafruit_camera_esp32s3.upload.maximum_data_size=1310720
+adafruit_camera_esp32s3.upload.flags=
+adafruit_camera_esp32s3.upload.extra_flags=
+adafruit_camera_esp32s3.upload.use_1200bps_touch=true
+adafruit_camera_esp32s3.upload.wait_for_upload_port=true
+
+adafruit_camera_esp32s3.serial.disableDTR=false
+adafruit_camera_esp32s3.serial.disableRTS=false
+
+adafruit_camera_esp32s3.build.tarch=xtensa
+adafruit_camera_esp32s3.build.bootloader_addr=0x0
+adafruit_camera_esp32s3.build.target=esp32s3
+adafruit_camera_esp32s3.build.mcu=esp32s3
+adafruit_camera_esp32s3.build.core=esp32
+adafruit_camera_esp32s3.build.variant=adafruit_camera_esp32s3
+adafruit_camera_esp32s3.build.board=ADAFRUIT_CAMERA_ESP32S3
+
+adafruit_camera_esp32s3.build.usb_mode=0
+adafruit_camera_esp32s3.build.cdc_on_boot=1
+adafruit_camera_esp32s3.build.msc_on_boot=0
+adafruit_camera_esp32s3.build.dfu_on_boot=0
+adafruit_camera_esp32s3.build.f_cpu=240000000L
+adafruit_camera_esp32s3.build.flash_size=4MB
+adafruit_camera_esp32s3.build.flash_freq=80m
+adafruit_camera_esp32s3.build.flash_mode=dio
+adafruit_camera_esp32s3.build.boot=qio
+adafruit_camera_esp32s3.build.partitions=default
+adafruit_camera_esp32s3.build.defines=
+adafruit_camera_esp32s3.build.loop_core=
+adafruit_camera_esp32s3.build.event_core=
+adafruit_camera_esp32s3.build.flash_type=qio
+adafruit_camera_esp32s3.build.psram_type=qspi
+adafruit_camera_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
+
+adafruit_camera_esp32s3.menu.LoopCore.1=Core 1
+adafruit_camera_esp32s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+adafruit_camera_esp32s3.menu.LoopCore.0=Core 0
+adafruit_camera_esp32s3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+adafruit_camera_esp32s3.menu.EventsCore.1=Core 1
+adafruit_camera_esp32s3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+adafruit_camera_esp32s3.menu.EventsCore.0=Core 0
+adafruit_camera_esp32s3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+adafruit_camera_esp32s3.menu.USBMode.default=USB-OTG (TinyUSB)
+adafruit_camera_esp32s3.menu.USBMode.default.build.usb_mode=0
+adafruit_camera_esp32s3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+adafruit_camera_esp32s3.menu.USBMode.hwcdc.build.usb_mode=1
+
+adafruit_camera_esp32s3.menu.CDCOnBoot.cdc=Enabled
+adafruit_camera_esp32s3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_camera_esp32s3.menu.CDCOnBoot.default=Disabled
+adafruit_camera_esp32s3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+adafruit_camera_esp32s3.menu.MSCOnBoot.default=Disabled
+adafruit_camera_esp32s3.menu.MSCOnBoot.default.build.msc_on_boot=0
+adafruit_camera_esp32s3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+adafruit_camera_esp32s3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+adafruit_camera_esp32s3.menu.DFUOnBoot.default=Disabled
+adafruit_camera_esp32s3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+adafruit_camera_esp32s3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+adafruit_camera_esp32s3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+adafruit_camera_esp32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+adafruit_camera_esp32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+adafruit_camera_esp32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+adafruit_camera_esp32s3.menu.UploadMode.default=UART0 / Hardware CDC
+adafruit_camera_esp32s3.menu.UploadMode.default.upload.use_1200bps_touch=false
+adafruit_camera_esp32s3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+adafruit_camera_esp32s3.menu.PSRAM.enabled=QSPI PSRAM
+adafruit_camera_esp32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+adafruit_camera_esp32s3.menu.PSRAM.enabled.build.psram_type=qspi
+adafruit_camera_esp32s3.menu.PSRAM.disabled=Disabled
+adafruit_camera_esp32s3.menu.PSRAM.disabled.build.defines=
+adafruit_camera_esp32s3.menu.PSRAM.disabled.build.psram_type=qspi
+adafruit_camera_esp32s3.menu.PSRAM.opi=OPI PSRAM
+adafruit_camera_esp32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+adafruit_camera_esp32s3.menu.PSRAM.opi.build.psram_type=opi
+
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (2.6MB APP/960KB FATFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-1ota
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2883584
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_camera_esp32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.default.build.partitions=default
+adafruit_camera_esp32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+adafruit_camera_esp32s3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.minimal.build.partitions=minimal
+adafruit_camera_esp32s3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+adafruit_camera_esp32s3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+adafruit_camera_esp32s3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+adafruit_camera_esp32s3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+adafruit_camera_esp32s3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+adafruit_camera_esp32s3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+adafruit_camera_esp32s3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+adafruit_camera_esp32s3.menu.CPUFreq.240=240MHz (WiFi)
+adafruit_camera_esp32s3.menu.CPUFreq.240.build.f_cpu=240000000L
+adafruit_camera_esp32s3.menu.CPUFreq.160=160MHz (WiFi)
+adafruit_camera_esp32s3.menu.CPUFreq.160.build.f_cpu=160000000L
+adafruit_camera_esp32s3.menu.CPUFreq.80=80MHz (WiFi)
+adafruit_camera_esp32s3.menu.CPUFreq.80.build.f_cpu=80000000L
+adafruit_camera_esp32s3.menu.CPUFreq.40=40MHz
+adafruit_camera_esp32s3.menu.CPUFreq.40.build.f_cpu=40000000L
+adafruit_camera_esp32s3.menu.CPUFreq.20=20MHz
+adafruit_camera_esp32s3.menu.CPUFreq.20.build.f_cpu=20000000L
+adafruit_camera_esp32s3.menu.CPUFreq.10=10MHz
+adafruit_camera_esp32s3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+adafruit_camera_esp32s3.menu.FlashMode.qio=QIO 80MHz
+adafruit_camera_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
+adafruit_camera_esp32s3.menu.FlashMode.qio.build.boot=qio
+adafruit_camera_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
+adafruit_camera_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
+adafruit_camera_esp32s3.menu.FlashMode.qio120=QIO 120MHz
+adafruit_camera_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
+adafruit_camera_esp32s3.menu.FlashMode.qio120.build.boot=qio
+adafruit_camera_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
+adafruit_camera_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
+adafruit_camera_esp32s3.menu.FlashMode.dio=DIO 80MHz
+adafruit_camera_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
+adafruit_camera_esp32s3.menu.FlashMode.dio.build.boot=dio
+adafruit_camera_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
+adafruit_camera_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
+adafruit_camera_esp32s3.menu.FlashMode.opi=OPI 80MHz
+adafruit_camera_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
+adafruit_camera_esp32s3.menu.FlashMode.opi.build.boot=opi
+adafruit_camera_esp32s3.menu.FlashMode.opi.build.boot_freq=80m
+adafruit_camera_esp32s3.menu.FlashMode.opi.build.flash_freq=80m
+
+adafruit_camera_esp32s3.menu.FlashSize.4M=4MB (32Mb)
+adafruit_camera_esp32s3.menu.FlashSize.4M.build.flash_size=4MB
+
+adafruit_camera_esp32s3.menu.UploadSpeed.921600=921600
+adafruit_camera_esp32s3.menu.UploadSpeed.921600.upload.speed=921600
+adafruit_camera_esp32s3.menu.UploadSpeed.115200=115200
+adafruit_camera_esp32s3.menu.UploadSpeed.115200.upload.speed=115200
+adafruit_camera_esp32s3.menu.UploadSpeed.256000.windows=256000
+adafruit_camera_esp32s3.menu.UploadSpeed.256000.upload.speed=256000
+adafruit_camera_esp32s3.menu.UploadSpeed.230400.windows.upload.speed=256000
+adafruit_camera_esp32s3.menu.UploadSpeed.230400=230400
+adafruit_camera_esp32s3.menu.UploadSpeed.230400.upload.speed=230400
+adafruit_camera_esp32s3.menu.UploadSpeed.460800.linux=460800
+adafruit_camera_esp32s3.menu.UploadSpeed.460800.macosx=460800
+adafruit_camera_esp32s3.menu.UploadSpeed.460800.upload.speed=460800
+adafruit_camera_esp32s3.menu.UploadSpeed.512000.windows=512000
+adafruit_camera_esp32s3.menu.UploadSpeed.512000.upload.speed=512000
+
+adafruit_camera_esp32s3.menu.DebugLevel.none=None
+adafruit_camera_esp32s3.menu.DebugLevel.none.build.code_debug=0
+adafruit_camera_esp32s3.menu.DebugLevel.error=Error
+adafruit_camera_esp32s3.menu.DebugLevel.error.build.code_debug=1
+adafruit_camera_esp32s3.menu.DebugLevel.warn=Warn
+adafruit_camera_esp32s3.menu.DebugLevel.warn.build.code_debug=2
+adafruit_camera_esp32s3.menu.DebugLevel.info=Info
+adafruit_camera_esp32s3.menu.DebugLevel.info.build.code_debug=3
+adafruit_camera_esp32s3.menu.DebugLevel.debug=Debug
+adafruit_camera_esp32s3.menu.DebugLevel.debug.build.code_debug=4
+adafruit_camera_esp32s3.menu.DebugLevel.verbose=Verbose
+adafruit_camera_esp32s3.menu.DebugLevel.verbose.build.code_debug=5
+
+adafruit_camera_esp32s3.menu.EraseFlash.none=Disabled
+adafruit_camera_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
+adafruit_camera_esp32s3.menu.EraseFlash.all=Enabled
+adafruit_camera_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+
+##############################################################
+# Adafruit Qualia ESP32-S3 RGB666
+
+adafruit_qualia_s3_rgb666.name=Adafruit Qualia ESP32-S3 RGB666
+adafruit_qualia_s3_rgb666.vid.0=0x239A
+adafruit_qualia_s3_rgb666.pid.0=0x8147
+adafruit_qualia_s3_rgb666.vid.1=0x239A
+adafruit_qualia_s3_rgb666.pid.1=0x0147
+adafruit_qualia_s3_rgb666.vid.2=0x239A
+adafruit_qualia_s3_rgb666.pid.2=0x8148
+
+adafruit_qualia_s3_rgb666.bootloader.tool=esptool_py
+adafruit_qualia_s3_rgb666.bootloader.tool.default=esptool_py
+
+adafruit_qualia_s3_rgb666.upload.tool=esptool_py
+adafruit_qualia_s3_rgb666.upload.tool.default=esptool_py
+adafruit_qualia_s3_rgb666.upload.tool.network=esp_ota
+
+adafruit_qualia_s3_rgb666.upload.maximum_size=1310720
+adafruit_qualia_s3_rgb666.upload.maximum_data_size=327680
+adafruit_qualia_s3_rgb666.upload.flags=
+adafruit_qualia_s3_rgb666.upload.extra_flags=
+adafruit_qualia_s3_rgb666.upload.use_1200bps_touch=true
+adafruit_qualia_s3_rgb666.upload.wait_for_upload_port=true
+
+adafruit_qualia_s3_rgb666.serial.disableDTR=false
+adafruit_qualia_s3_rgb666.serial.disableRTS=false
+
+adafruit_qualia_s3_rgb666.build.tarch=xtensa
+adafruit_qualia_s3_rgb666.build.bootloader_addr=0x0
+adafruit_qualia_s3_rgb666.build.target=esp32s3
+adafruit_qualia_s3_rgb666.build.mcu=esp32s3
+adafruit_qualia_s3_rgb666.build.core=esp32
+adafruit_qualia_s3_rgb666.build.variant=adafruit_qualia_s3_rgb666
+adafruit_qualia_s3_rgb666.build.board=QUALIA_S3_RGB666
+
+adafruit_qualia_s3_rgb666.build.usb_mode=0
+adafruit_qualia_s3_rgb666.build.cdc_on_boot=1
+adafruit_qualia_s3_rgb666.build.msc_on_boot=0
+adafruit_qualia_s3_rgb666.build.dfu_on_boot=0
+adafruit_qualia_s3_rgb666.build.f_cpu=240000000L
+adafruit_qualia_s3_rgb666.build.flash_size=16MB
+adafruit_qualia_s3_rgb666.build.flash_freq=80m
+adafruit_qualia_s3_rgb666.build.flash_mode=dio
+adafruit_qualia_s3_rgb666.build.boot=qio
+adafruit_qualia_s3_rgb666.build.partitions=default
+adafruit_qualia_s3_rgb666.build.defines=
+adafruit_qualia_s3_rgb666.build.loop_core=
+adafruit_qualia_s3_rgb666.build.event_core=
+adafruit_qualia_s3_rgb666.build.flash_type=qio
+adafruit_qualia_s3_rgb666.build.psram_type=opi
+adafruit_qualia_s3_rgb666.build.memory_type={build.flash_type}_{build.psram_type}
+
+adafruit_qualia_s3_rgb666.menu.LoopCore.1=Core 1
+adafruit_qualia_s3_rgb666.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+adafruit_qualia_s3_rgb666.menu.LoopCore.0=Core 0
+adafruit_qualia_s3_rgb666.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+adafruit_qualia_s3_rgb666.menu.EventsCore.1=Core 1
+adafruit_qualia_s3_rgb666.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+adafruit_qualia_s3_rgb666.menu.EventsCore.0=Core 0
+adafruit_qualia_s3_rgb666.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+adafruit_qualia_s3_rgb666.menu.USBMode.default=USB-OTG (TinyUSB)
+adafruit_qualia_s3_rgb666.menu.USBMode.default.build.usb_mode=0
+adafruit_qualia_s3_rgb666.menu.USBMode.hwcdc=Hardware CDC and JTAG
+adafruit_qualia_s3_rgb666.menu.USBMode.hwcdc.build.usb_mode=1
+
+adafruit_qualia_s3_rgb666.menu.CDCOnBoot.cdc=Enabled
+adafruit_qualia_s3_rgb666.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_qualia_s3_rgb666.menu.CDCOnBoot.default=Disabled
+adafruit_qualia_s3_rgb666.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+adafruit_qualia_s3_rgb666.menu.MSCOnBoot.default=Disabled
+adafruit_qualia_s3_rgb666.menu.MSCOnBoot.default.build.msc_on_boot=0
+adafruit_qualia_s3_rgb666.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+adafruit_qualia_s3_rgb666.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+adafruit_qualia_s3_rgb666.menu.DFUOnBoot.default=Disabled
+adafruit_qualia_s3_rgb666.menu.DFUOnBoot.default.build.dfu_on_boot=0
+adafruit_qualia_s3_rgb666.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+adafruit_qualia_s3_rgb666.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+adafruit_qualia_s3_rgb666.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+adafruit_qualia_s3_rgb666.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+adafruit_qualia_s3_rgb666.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+adafruit_qualia_s3_rgb666.menu.UploadMode.default=UART0 / Hardware CDC
+adafruit_qualia_s3_rgb666.menu.UploadMode.default.upload.use_1200bps_touch=false
+adafruit_qualia_s3_rgb666.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+adafruit_qualia_s3_rgb666.menu.PSRAM.opi=OPI PSRAM
+adafruit_qualia_s3_rgb666.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+adafruit_qualia_s3_rgb666.menu.PSRAM.opi.build.psram_type=opi
+adafruit_qualia_s3_rgb666.menu.PSRAM.disabled=Disabled
+adafruit_qualia_s3_rgb666.menu.PSRAM.disabled.build.defines=
+adafruit_qualia_s3_rgb666.menu.PSRAM.disabled.build.psram_type=opi
+
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2=TinyUF2 16MB (2MB APP/11.6MB FATFS)
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-16MB-tinyuf2
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.large_spiffs=Large SPIFFS (4.5MB APP/6.93MB SPIFFS)
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.large_spiffs.upload.maximum_size=4718592
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.fatflash.build.partitions=ffat
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+
+adafruit_qualia_s3_rgb666.menu.CPUFreq.240=240MHz (WiFi)
+adafruit_qualia_s3_rgb666.menu.CPUFreq.240.build.f_cpu=240000000L
+adafruit_qualia_s3_rgb666.menu.CPUFreq.160=160MHz (WiFi)
+adafruit_qualia_s3_rgb666.menu.CPUFreq.160.build.f_cpu=160000000L
+adafruit_qualia_s3_rgb666.menu.CPUFreq.80=80MHz (WiFi)
+adafruit_qualia_s3_rgb666.menu.CPUFreq.80.build.f_cpu=80000000L
+adafruit_qualia_s3_rgb666.menu.CPUFreq.40=40MHz
+adafruit_qualia_s3_rgb666.menu.CPUFreq.40.build.f_cpu=40000000L
+adafruit_qualia_s3_rgb666.menu.CPUFreq.20=20MHz
+adafruit_qualia_s3_rgb666.menu.CPUFreq.20.build.f_cpu=20000000L
+adafruit_qualia_s3_rgb666.menu.CPUFreq.10=10MHz
+adafruit_qualia_s3_rgb666.menu.CPUFreq.10.build.f_cpu=10000000L
+
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio=QIO 80MHz
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio.build.flash_mode=dio
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio.build.boot=qio
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio.build.boot_freq=80m
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio.build.flash_freq=80m
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio120=QIO 120MHz
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio120.build.flash_mode=dio
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio120.build.boot=qio
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio120.build.boot_freq=120m
+adafruit_qualia_s3_rgb666.menu.FlashMode.qio120.build.flash_freq=80m
+adafruit_qualia_s3_rgb666.menu.FlashMode.dio=DIO 80MHz
+adafruit_qualia_s3_rgb666.menu.FlashMode.dio.build.flash_mode=dio
+adafruit_qualia_s3_rgb666.menu.FlashMode.dio.build.boot=dio
+adafruit_qualia_s3_rgb666.menu.FlashMode.dio.build.boot_freq=80m
+adafruit_qualia_s3_rgb666.menu.FlashMode.dio.build.flash_freq=80m
+adafruit_qualia_s3_rgb666.menu.FlashMode.opi=OPI 80MHz
+adafruit_qualia_s3_rgb666.menu.FlashMode.opi.build.flash_mode=dout
+adafruit_qualia_s3_rgb666.menu.FlashMode.opi.build.boot=opi
+adafruit_qualia_s3_rgb666.menu.FlashMode.opi.build.boot_freq=80m
+adafruit_qualia_s3_rgb666.menu.FlashMode.opi.build.flash_freq=80m
+
+adafruit_qualia_s3_rgb666.menu.FlashSize.16M=16MB (128Mb)
+adafruit_qualia_s3_rgb666.menu.FlashSize.16M.build.flash_size=16MB
+
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.921600=921600
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.921600.upload.speed=921600
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.115200=115200
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.115200.upload.speed=115200
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.256000.windows=256000
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.256000.upload.speed=256000
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.230400.windows.upload.speed=256000
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.230400=230400
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.230400.upload.speed=230400
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.460800.linux=460800
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.460800.macosx=460800
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.460800.upload.speed=460800
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.512000.windows=512000
+adafruit_qualia_s3_rgb666.menu.UploadSpeed.512000.upload.speed=512000
+
+adafruit_qualia_s3_rgb666.menu.DebugLevel.none=None
+adafruit_qualia_s3_rgb666.menu.DebugLevel.none.build.code_debug=0
+adafruit_qualia_s3_rgb666.menu.DebugLevel.error=Error
+adafruit_qualia_s3_rgb666.menu.DebugLevel.error.build.code_debug=1
+adafruit_qualia_s3_rgb666.menu.DebugLevel.warn=Warn
+adafruit_qualia_s3_rgb666.menu.DebugLevel.warn.build.code_debug=2
+adafruit_qualia_s3_rgb666.menu.DebugLevel.info=Info
+adafruit_qualia_s3_rgb666.menu.DebugLevel.info.build.code_debug=3
+adafruit_qualia_s3_rgb666.menu.DebugLevel.debug=Debug
+adafruit_qualia_s3_rgb666.menu.DebugLevel.debug.build.code_debug=4
+adafruit_qualia_s3_rgb666.menu.DebugLevel.verbose=Verbose
+adafruit_qualia_s3_rgb666.menu.DebugLevel.verbose.build.code_debug=5
+
+adafruit_qualia_s3_rgb666.menu.EraseFlash.none=Disabled
+adafruit_qualia_s3_rgb666.menu.EraseFlash.none.upload.erase_cmd=
+adafruit_qualia_s3_rgb666.menu.EraseFlash.all=Enabled
+adafruit_qualia_s3_rgb666.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
diff --git a/variants/adafruit_camera_esp32s3/bootloader-tinyuf2.bin b/variants/adafruit_camera_esp32s3/bootloader-tinyuf2.bin
new file mode 100644
index 00000000000..721a1a1c70c
Binary files /dev/null and b/variants/adafruit_camera_esp32s3/bootloader-tinyuf2.bin differ
diff --git a/variants/adafruit_camera_esp32s3/partitions-4MB-1ota.csv b/variants/adafruit_camera_esp32s3/partitions-4MB-1ota.csv
new file mode 100644
index 00000000000..ab7fa8669d0
--- /dev/null
+++ b/variants/adafruit_camera_esp32s3/partitions-4MB-1ota.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,          0x8000, 4K
+
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    app,  ota_0,   0x10000,  2816K,
+uf2,      app,  factory,0x2d0000,  256K,
+ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_camera_esp32s3/pins_arduino.h b/variants/adafruit_camera_esp32s3/pins_arduino.h
new file mode 100644
index 00000000000..6117cd9f4ae
--- /dev/null
+++ b/variants/adafruit_camera_esp32s3/pins_arduino.h
@@ -0,0 +1,86 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+
+#define USB_VID            0x239A
+#define USB_PID            0x8117
+#define USB_MANUFACTURER   "Adafruit"
+#define USB_PRODUCT        "Camera ESP32-S3"
+#define USB_SERIAL         "" // Empty string for MAC adddress
+
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       20
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t PIN_NEOPIXEL = 1;
+static const uint8_t NEOPIXEL_PIN = 1;
+
+//static const uint8_t TFT_BACKLIGHT = 41;
+static const uint8_t TFT_DC        = 40;
+static const uint8_t TFT_CS        = 39;
+static const uint8_t TFT_RESET     = 38;
+static const uint8_t TFT_RST       = 38;
+
+static const uint8_t SD_CS          = 48;
+static const uint8_t SD_CHIP_SELECT = 48;
+static const uint8_t SPEAKER        = 41;
+
+static const uint8_t SDA = 33;
+static const uint8_t SCL = 34;
+
+static const uint8_t SS    = 48;
+static const uint8_t MOSI  = 35;
+static const uint8_t SCK   = 36;
+static const uint8_t MISO  = 37;
+
+static const uint8_t A0 = 17;
+static const uint8_t A1 = 18;
+static const uint8_t BATT_MONITOR = 4;
+static const uint8_t SHUTTER_BUTTON = 0;
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t DAC1 = 17;
+static const uint8_t DAC2 = 18;
+
+#define AWEXP_SPKR_SD 0
+#define AWEXP_BUTTON_SEL 1
+#define AWEXP_BACKLIGHT 2
+#define AWEXP_CAM_PWDN 7
+#define AWEXP_SD_DET 8
+#define AWEXP_SD_PWR 9
+#define AWEXP_CAM_RST 10
+#define AWEXP_BUTTON_OK 11
+#define AWEXP_BUTTON_RIGHT 12
+#define AWEXP_BUTTON_UP 13
+#define AWEXP_BUTTON_LEFT 14
+#define AWEXP_BUTTON_DOWN 15
+
+#define PWDN_GPIO_NUM     -1 // connected through expander
+#define RESET_GPIO_NUM    -1 // connected through expander
+#define XCLK_GPIO_NUM      8
+#define SIOD_GPIO_NUM     SDA
+#define SIOC_GPIO_NUM     SCL
+
+#define Y9_GPIO_NUM        7
+#define Y8_GPIO_NUM        9
+#define Y7_GPIO_NUM       10
+#define Y6_GPIO_NUM       12
+#define Y5_GPIO_NUM       14
+#define Y4_GPIO_NUM       16
+#define Y3_GPIO_NUM       15
+#define Y2_GPIO_NUM       13
+#define VSYNC_GPIO_NUM     5
+#define HREF_GPIO_NUM      6
+#define PCLK_GPIO_NUM     11
+
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/adafruit_camera_esp32s3/tinyuf2.bin b/variants/adafruit_camera_esp32s3/tinyuf2.bin
new file mode 100644
index 00000000000..21e91284e05
Binary files /dev/null and b/variants/adafruit_camera_esp32s3/tinyuf2.bin differ
diff --git a/variants/adafruit_camera_esp32s3/variant.cpp b/variants/adafruit_camera_esp32s3/variant.cpp
new file mode 100644
index 00000000000..dd3170f994a
--- /dev/null
+++ b/variants/adafruit_camera_esp32s3/variant.cpp
@@ -0,0 +1,36 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Ha Thach (tinyusb.org) for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#include "esp32-hal-gpio.h"
+#include "pins_arduino.h"
+
+extern "C" {
+
+// Initialize variant/board, called before setup()
+void initVariant(void)
+{
+
+}
+}
diff --git a/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin b/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin
index 73e8c06b33b..2ed855b65a5 100644
Binary files a/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin and b/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin differ
diff --git a/variants/adafruit_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h
index 78e3d0f224e..6e9ac56258f 100644
--- a/variants/adafruit_metro_esp32s3/pins_arduino.h
+++ b/variants/adafruit_metro_esp32s3/pins_arduino.h
@@ -19,8 +19,8 @@
 
 #define LED_BUILTIN     13
 
-#define PIN_NEOPIXEL    45
-#define NEOPIXEL_PIN    45
+#define PIN_NEOPIXEL    46
+#define NEOPIXEL_PIN    46
 #define NEOPIXEL_NUM    1
 
 #define PIN_BUTTON1     0  // BOOT0 switch
@@ -33,10 +33,10 @@ static const uint8_t RX = 41;
 static const uint8_t SDA = 47;
 static const uint8_t SCL = 48;
 
-static const uint8_t SS   = 21;
-static const uint8_t MOSI = 35;
-static const uint8_t SCK  = 36;
-static const uint8_t MISO = 37;
+static const uint8_t SS   = 45;
+static const uint8_t MOSI = 42;
+static const uint8_t SCK  = 39;
+static const uint8_t MISO = 21;
 
 static const uint8_t A0 = 14;
 static const uint8_t A1 = 15;
diff --git a/variants/adafruit_metro_esp32s3/tinyuf2.bin b/variants/adafruit_metro_esp32s3/tinyuf2.bin
index d57e5b75b55..25a5ba66b1e 100644
Binary files a/variants/adafruit_metro_esp32s3/tinyuf2.bin and b/variants/adafruit_metro_esp32s3/tinyuf2.bin differ
diff --git a/variants/adafruit_metro_esp32s3/variant.cpp b/variants/adafruit_metro_esp32s3/variant.cpp
index 811a6d508c9..485f08b4aef 100644
--- a/variants/adafruit_metro_esp32s3/variant.cpp
+++ b/variants/adafruit_metro_esp32s3/variant.cpp
@@ -30,7 +30,8 @@ extern "C" {
 
 // Initialize variant/board, called before setup()
 void initVariant(void) {
-  // default SD_CS to input pullup
+  // default SD_CS to input pullup (we cannot have built in pullup since its
+  // a strapping pin!)
   pinMode(SS, INPUT_PULLUP);
 }
 
diff --git a/variants/adafruit_qualia_s3_rgb666/bootloader-tinyuf2.bin b/variants/adafruit_qualia_s3_rgb666/bootloader-tinyuf2.bin
new file mode 100644
index 00000000000..e0b64a8f24a
Binary files /dev/null and b/variants/adafruit_qualia_s3_rgb666/bootloader-tinyuf2.bin differ
diff --git a/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv b/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv
new file mode 100644
index 00000000000..55f6c2b8d76
--- /dev/null
+++ b/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    app,  ota_0,   0x10000,  2048K,
+ota_1,    app,  ota_1,  0x210000,  2048K,
+uf2,      app,  factory,0x410000,  256K,
+ffat,     data, fat,    0x450000,  11968K,
diff --git a/variants/adafruit_qualia_s3_rgb666/pins_arduino.h b/variants/adafruit_qualia_s3_rgb666/pins_arduino.h
new file mode 100644
index 00000000000..120a50b91a6
--- /dev/null
+++ b/variants/adafruit_qualia_s3_rgb666/pins_arduino.h
@@ -0,0 +1,75 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID            0x239A
+#define USB_PID            0x8147
+
+#define USB_MANUFACTURER   "Adafruit"
+#define USB_PRODUCT        "Qualia ESP32-S3 RGB666"
+#define USB_SERIAL         "" // Empty string for MAC adddress
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       2
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<EXTERNAL_NUM_INTERRUPTS)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t PCA_TFT_SCK = 0;
+static const uint8_t PCA_TFT_CS = 1;
+static const uint8_t PCA_TFT_RESET = 2;
+static const uint8_t PCA_CPT_IRQ = 3;
+static const uint8_t PCA_TFT_BACKLIGHT = 4;
+static const uint8_t PCA_BUTTON_UP = 5;
+static const uint8_t PCA_BUTTON_DOWN = 6;
+static const uint8_t PCA_TFT_MOSI = 7;
+
+static const uint8_t TX = 16;
+static const uint8_t RX = 17;
+#define TX1 TX
+#define RX1 RX
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 18;
+
+static const uint8_t SS   = 15;
+static const uint8_t MOSI = 7;
+static const uint8_t MISO = 6;
+static const uint8_t SCK  = 5;
+
+static const uint8_t A0 = 17;
+static const uint8_t A1 = 16;
+
+static const uint8_t T3  = 3;  // Touch pin IDs map directly
+static const uint8_t T8  = 8;  // to underlying GPIO numbers NOT
+static const uint8_t T9  = 9;  // the analog numbers on board silk
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+
+
+ static const uint8_t TFT_R1 = 11;
+ static const uint8_t TFT_R2 = 10;
+ static const uint8_t TFT_R3 = 9;
+ static const uint8_t TFT_R4 = 46;
+ static const uint8_t TFT_R5 = 3;
+ static const uint8_t TFT_G0 = 48;
+ static const uint8_t TFT_G1 = 47;
+ static const uint8_t TFT_G2 = 21;
+ static const uint8_t TFT_G3 = 14;
+ static const uint8_t TFT_G4 = 13;
+ static const uint8_t TFT_G5 = 12;
+ static const uint8_t TFT_B1 = 40;
+ static const uint8_t TFT_B2 = 39;
+ static const uint8_t TFT_B3 = 38;
+ static const uint8_t TFT_B4 = 0;
+ static const uint8_t TFT_B5 = 45;
+ static const uint8_t TFT_PCLK = 1;
+ static const uint8_t TFT_DE = 2;
+ static const uint8_t TFT_HSYNC = 41;
+ static const uint8_t TFT_VSYNC = 42;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/adafruit_qualia_s3_rgb666/tinyuf2.bin b/variants/adafruit_qualia_s3_rgb666/tinyuf2.bin
new file mode 100644
index 00000000000..dd2ef92b724
Binary files /dev/null and b/variants/adafruit_qualia_s3_rgb666/tinyuf2.bin differ
diff --git a/variants/adafruit_qualia_s3_rgb666/variant.cpp b/variants/adafruit_qualia_s3_rgb666/variant.cpp
new file mode 100644
index 00000000000..811a6d508c9
--- /dev/null
+++ b/variants/adafruit_qualia_s3_rgb666/variant.cpp
@@ -0,0 +1,37 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Ha Thach (tinyusb.org) for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#include "esp32-hal-gpio.h"
+#include "pins_arduino.h"
+
+extern "C" {
+
+// Initialize variant/board, called before setup()
+void initVariant(void) {
+  // default SD_CS to input pullup
+  pinMode(SS, INPUT_PULLUP);
+}
+
+}