diff --git a/boards.txt b/boards.txt
index c2415668a52..d7463d14c2f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -8099,133 +8099,6 @@ onehorse32dev.menu.EraseFlash.none.upload.erase_cmd=
 onehorse32dev.menu.EraseFlash.all=Enabled
 onehorse32dev.menu.EraseFlash.all.upload.erase_cmd=-e
 
-##############################################################
-# Adafruit ESP32 Feather
-
-featheresp32.name=Adafruit ESP32 Feather
-
-featheresp32.bootloader.tool=esptool_py
-featheresp32.bootloader.tool.default=esptool_py
-
-featheresp32.upload.tool=esptool_py
-featheresp32.upload.tool.default=esptool_py
-featheresp32.upload.tool.network=esp_ota
-
-featheresp32.upload.maximum_size=1310720
-featheresp32.upload.maximum_data_size=327680
-featheresp32.upload.flags=
-featheresp32.upload.extra_flags=
-
-featheresp32.serial.disableDTR=true
-featheresp32.serial.disableRTS=true
-
-featheresp32.build.tarch=xtensa
-featheresp32.build.bootloader_addr=0x1000
-featheresp32.build.target=esp32
-featheresp32.build.mcu=esp32
-featheresp32.build.core=esp32
-featheresp32.build.variant=feather_esp32
-featheresp32.build.board=FEATHER_ESP32
-
-featheresp32.build.f_cpu=240000000L
-featheresp32.build.flash_size=4MB
-featheresp32.build.flash_freq=80m
-featheresp32.build.flash_mode=dio
-featheresp32.build.boot=dio
-featheresp32.build.partitions=default
-featheresp32.build.defines=
-featheresp32.build.loop_core=
-featheresp32.build.event_core=
-
-featheresp32.menu.LoopCore.1=Core 1
-featheresp32.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
-featheresp32.menu.LoopCore.0=Core 0
-featheresp32.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
-
-featheresp32.menu.EventsCore.1=Core 1
-featheresp32.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
-featheresp32.menu.EventsCore.0=Core 0
-featheresp32.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
-
-featheresp32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
-featheresp32.menu.PartitionScheme.default.build.partitions=default
-featheresp32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
-featheresp32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-featheresp32.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
-featheresp32.menu.PartitionScheme.minimal.build.partitions=minimal
-featheresp32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-featheresp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
-featheresp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-featheresp32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
-featheresp32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
-featheresp32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
-featheresp32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
-featheresp32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
-featheresp32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
-featheresp32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
-featheresp32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
-featheresp32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
-featheresp32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
-featheresp32.menu.PartitionScheme.huge_app.build.partitions=huge_app
-featheresp32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-featheresp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
-featheresp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-featheresp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-
-featheresp32.menu.CPUFreq.240=240MHz (WiFi/BT)
-featheresp32.menu.CPUFreq.240.build.f_cpu=240000000L
-featheresp32.menu.CPUFreq.160=160MHz (WiFi/BT)
-featheresp32.menu.CPUFreq.160.build.f_cpu=160000000L
-featheresp32.menu.CPUFreq.80=80MHz (WiFi/BT)
-featheresp32.menu.CPUFreq.80.build.f_cpu=80000000L
-featheresp32.menu.CPUFreq.40=40MHz
-featheresp32.menu.CPUFreq.40.build.f_cpu=40000000L
-featheresp32.menu.CPUFreq.20=20MHz
-featheresp32.menu.CPUFreq.20.build.f_cpu=20000000L
-featheresp32.menu.CPUFreq.10=10MHz
-featheresp32.menu.CPUFreq.10.build.f_cpu=10000000L
-
-featheresp32.menu.FlashFreq.80=80MHz
-featheresp32.menu.FlashFreq.80.build.flash_freq=80m
-featheresp32.menu.FlashFreq.40=40MHz
-featheresp32.menu.FlashFreq.40.build.flash_freq=40m
-
-featheresp32.menu.FlashSize.4M=4MB (32Mb)
-featheresp32.menu.FlashSize.4M.build.flash_size=4MB
-
-featheresp32.menu.UploadSpeed.921600=921600
-featheresp32.menu.UploadSpeed.921600.upload.speed=921600
-featheresp32.menu.UploadSpeed.115200=115200
-featheresp32.menu.UploadSpeed.115200.upload.speed=115200
-featheresp32.menu.UploadSpeed.256000.windows=256000
-featheresp32.menu.UploadSpeed.256000.upload.speed=256000
-featheresp32.menu.UploadSpeed.230400.windows.upload.speed=256000
-featheresp32.menu.UploadSpeed.230400=230400
-featheresp32.menu.UploadSpeed.230400.upload.speed=230400
-featheresp32.menu.UploadSpeed.460800.linux=460800
-featheresp32.menu.UploadSpeed.460800.macosx=460800
-featheresp32.menu.UploadSpeed.460800.upload.speed=460800
-featheresp32.menu.UploadSpeed.512000.windows=512000
-featheresp32.menu.UploadSpeed.512000.upload.speed=512000
-
-featheresp32.menu.DebugLevel.none=None
-featheresp32.menu.DebugLevel.none.build.code_debug=0
-featheresp32.menu.DebugLevel.error=Error
-featheresp32.menu.DebugLevel.error.build.code_debug=1
-featheresp32.menu.DebugLevel.warn=Warn
-featheresp32.menu.DebugLevel.warn.build.code_debug=2
-featheresp32.menu.DebugLevel.info=Info
-featheresp32.menu.DebugLevel.info.build.code_debug=3
-featheresp32.menu.DebugLevel.debug=Debug
-featheresp32.menu.DebugLevel.debug.build.code_debug=4
-featheresp32.menu.DebugLevel.verbose=Verbose
-featheresp32.menu.DebugLevel.verbose.build.code_debug=5
-
-featheresp32.menu.EraseFlash.none=Disabled
-featheresp32.menu.EraseFlash.none.upload.erase_cmd=
-featheresp32.menu.EraseFlash.all=Enabled
-featheresp32.menu.EraseFlash.all.upload.erase_cmd=-e
-
 ##############################################################
 # Adafruit Metro ESP32-S2
 
@@ -8397,6 +8270,191 @@ adafruit_metro_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
 adafruit_metro_esp32s2.menu.EraseFlash.all=Enabled
 adafruit_metro_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
 
+##############################################################
+# Adafruit Metro ESP32-S3
+
+adafruit_metro_esp32s3.name=Adafruit Metro ESP32-S3
+adafruit_metro_esp32s3.vid.0=0x239A
+adafruit_metro_esp32s3.pid.0=0x8145
+adafruit_metro_esp32s3.vid.1=0x239A
+adafruit_metro_esp32s3.pid.1=0x0145
+adafruit_metro_esp32s3.vid.2=0x239A
+adafruit_metro_esp32s3.pid.2=0x8146
+
+adafruit_metro_esp32s3.bootloader.tool=esptool_py
+adafruit_metro_esp32s3.bootloader.tool.default=esptool_py
+
+adafruit_metro_esp32s3.upload.tool=esptool_py
+adafruit_metro_esp32s3.upload.tool.default=esptool_py
+adafruit_metro_esp32s3.upload.tool.network=esp_ota
+
+adafruit_metro_esp32s3.upload.maximum_size=1310720
+adafruit_metro_esp32s3.upload.maximum_data_size=327680
+adafruit_metro_esp32s3.upload.flags=
+adafruit_metro_esp32s3.upload.extra_flags=
+adafruit_metro_esp32s3.upload.use_1200bps_touch=true
+adafruit_metro_esp32s3.upload.wait_for_upload_port=true
+
+adafruit_metro_esp32s3.serial.disableDTR=false
+adafruit_metro_esp32s3.serial.disableRTS=false
+
+adafruit_metro_esp32s3.build.tarch=xtensa
+adafruit_metro_esp32s3.build.bootloader_addr=0x0
+adafruit_metro_esp32s3.build.target=esp32s3
+adafruit_metro_esp32s3.build.mcu=esp32s3
+adafruit_metro_esp32s3.build.core=esp32
+adafruit_metro_esp32s3.build.variant=adafruit_metro_esp32s3
+adafruit_metro_esp32s3.build.board=METRO_ESP32S3
+
+adafruit_metro_esp32s3.build.usb_mode=0
+adafruit_metro_esp32s3.build.cdc_on_boot=1
+adafruit_metro_esp32s3.build.msc_on_boot=0
+adafruit_metro_esp32s3.build.dfu_on_boot=0
+adafruit_metro_esp32s3.build.f_cpu=240000000L
+adafruit_metro_esp32s3.build.flash_size=16MB
+adafruit_metro_esp32s3.build.flash_freq=80m
+adafruit_metro_esp32s3.build.flash_mode=dio
+adafruit_metro_esp32s3.build.boot=qio
+adafruit_metro_esp32s3.build.partitions=default
+adafruit_metro_esp32s3.build.defines=
+adafruit_metro_esp32s3.build.loop_core=
+adafruit_metro_esp32s3.build.event_core=
+adafruit_metro_esp32s3.build.flash_type=qio
+adafruit_metro_esp32s3.build.psram_type=opi
+adafruit_metro_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
+
+adafruit_metro_esp32s3.menu.LoopCore.1=Core 1
+adafruit_metro_esp32s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+adafruit_metro_esp32s3.menu.LoopCore.0=Core 0
+adafruit_metro_esp32s3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+adafruit_metro_esp32s3.menu.EventsCore.1=Core 1
+adafruit_metro_esp32s3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+adafruit_metro_esp32s3.menu.EventsCore.0=Core 0
+adafruit_metro_esp32s3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+adafruit_metro_esp32s3.menu.USBMode.default=USB-OTG (TinyUSB)
+adafruit_metro_esp32s3.menu.USBMode.default.build.usb_mode=0
+adafruit_metro_esp32s3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+adafruit_metro_esp32s3.menu.USBMode.hwcdc.build.usb_mode=1
+
+adafruit_metro_esp32s3.menu.CDCOnBoot.cdc=Enabled
+adafruit_metro_esp32s3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_metro_esp32s3.menu.CDCOnBoot.default=Disabled
+adafruit_metro_esp32s3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+adafruit_metro_esp32s3.menu.MSCOnBoot.default=Disabled
+adafruit_metro_esp32s3.menu.MSCOnBoot.default.build.msc_on_boot=0
+adafruit_metro_esp32s3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+adafruit_metro_esp32s3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+adafruit_metro_esp32s3.menu.DFUOnBoot.default=Disabled
+adafruit_metro_esp32s3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+adafruit_metro_esp32s3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+adafruit_metro_esp32s3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+adafruit_metro_esp32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+adafruit_metro_esp32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+adafruit_metro_esp32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+adafruit_metro_esp32s3.menu.UploadMode.default=UART0 / Hardware CDC
+adafruit_metro_esp32s3.menu.UploadMode.default.upload.use_1200bps_touch=false
+adafruit_metro_esp32s3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+adafruit_metro_esp32s3.menu.PSRAM.opi=OPI PSRAM
+adafruit_metro_esp32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+adafruit_metro_esp32s3.menu.PSRAM.opi.build.psram_type=opi
+adafruit_metro_esp32s3.menu.PSRAM.disabled=Disabled
+adafruit_metro_esp32s3.menu.PSRAM.disabled.build.defines=
+adafruit_metro_esp32s3.menu.PSRAM.disabled.build.psram_type=opi
+
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 16MB (2MB APP/11.6MB FATFS)
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-16MB-tinyuf2
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
+adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
+adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
+adafruit_metro_esp32s3.menu.PartitionScheme.large_spiffs=Large SPIFFS (4.5MB APP/6.93MB SPIFFS)
+adafruit_metro_esp32s3.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
+adafruit_metro_esp32s3.menu.PartitionScheme.large_spiffs.upload.maximum_size=4718592
+adafruit_metro_esp32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+adafruit_metro_esp32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+adafruit_metro_esp32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+adafruit_metro_esp32s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+adafruit_metro_esp32s3.menu.PartitionScheme.fatflash.build.partitions=ffat
+adafruit_metro_esp32s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+
+adafruit_metro_esp32s3.menu.CPUFreq.240=240MHz (WiFi)
+adafruit_metro_esp32s3.menu.CPUFreq.240.build.f_cpu=240000000L
+adafruit_metro_esp32s3.menu.CPUFreq.160=160MHz (WiFi)
+adafruit_metro_esp32s3.menu.CPUFreq.160.build.f_cpu=160000000L
+adafruit_metro_esp32s3.menu.CPUFreq.80=80MHz (WiFi)
+adafruit_metro_esp32s3.menu.CPUFreq.80.build.f_cpu=80000000L
+adafruit_metro_esp32s3.menu.CPUFreq.40=40MHz
+adafruit_metro_esp32s3.menu.CPUFreq.40.build.f_cpu=40000000L
+adafruit_metro_esp32s3.menu.CPUFreq.20=20MHz
+adafruit_metro_esp32s3.menu.CPUFreq.20.build.f_cpu=20000000L
+adafruit_metro_esp32s3.menu.CPUFreq.10=10MHz
+adafruit_metro_esp32s3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+adafruit_metro_esp32s3.menu.FlashMode.qio=QIO 80MHz
+adafruit_metro_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
+adafruit_metro_esp32s3.menu.FlashMode.qio.build.boot=qio
+adafruit_metro_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
+adafruit_metro_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
+adafruit_metro_esp32s3.menu.FlashMode.qio120=QIO 120MHz
+adafruit_metro_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
+adafruit_metro_esp32s3.menu.FlashMode.qio120.build.boot=qio
+adafruit_metro_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
+adafruit_metro_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
+adafruit_metro_esp32s3.menu.FlashMode.dio=DIO 80MHz
+adafruit_metro_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
+adafruit_metro_esp32s3.menu.FlashMode.dio.build.boot=dio
+adafruit_metro_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
+adafruit_metro_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
+adafruit_metro_esp32s3.menu.FlashMode.opi=OPI 80MHz
+adafruit_metro_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
+adafruit_metro_esp32s3.menu.FlashMode.opi.build.boot=opi
+adafruit_metro_esp32s3.menu.FlashMode.opi.build.boot_freq=80m
+adafruit_metro_esp32s3.menu.FlashMode.opi.build.flash_freq=80m
+
+adafruit_metro_esp32s3.menu.FlashSize.16M=16MB (128Mb)
+adafruit_metro_esp32s3.menu.FlashSize.16M.build.flash_size=16MB
+
+adafruit_metro_esp32s3.menu.UploadSpeed.921600=921600
+adafruit_metro_esp32s3.menu.UploadSpeed.921600.upload.speed=921600
+adafruit_metro_esp32s3.menu.UploadSpeed.115200=115200
+adafruit_metro_esp32s3.menu.UploadSpeed.115200.upload.speed=115200
+adafruit_metro_esp32s3.menu.UploadSpeed.256000.windows=256000
+adafruit_metro_esp32s3.menu.UploadSpeed.256000.upload.speed=256000
+adafruit_metro_esp32s3.menu.UploadSpeed.230400.windows.upload.speed=256000
+adafruit_metro_esp32s3.menu.UploadSpeed.230400=230400
+adafruit_metro_esp32s3.menu.UploadSpeed.230400.upload.speed=230400
+adafruit_metro_esp32s3.menu.UploadSpeed.460800.linux=460800
+adafruit_metro_esp32s3.menu.UploadSpeed.460800.macosx=460800
+adafruit_metro_esp32s3.menu.UploadSpeed.460800.upload.speed=460800
+adafruit_metro_esp32s3.menu.UploadSpeed.512000.windows=512000
+adafruit_metro_esp32s3.menu.UploadSpeed.512000.upload.speed=512000
+
+adafruit_metro_esp32s3.menu.DebugLevel.none=None
+adafruit_metro_esp32s3.menu.DebugLevel.none.build.code_debug=0
+adafruit_metro_esp32s3.menu.DebugLevel.error=Error
+adafruit_metro_esp32s3.menu.DebugLevel.error.build.code_debug=1
+adafruit_metro_esp32s3.menu.DebugLevel.warn=Warn
+adafruit_metro_esp32s3.menu.DebugLevel.warn.build.code_debug=2
+adafruit_metro_esp32s3.menu.DebugLevel.info=Info
+adafruit_metro_esp32s3.menu.DebugLevel.info.build.code_debug=3
+adafruit_metro_esp32s3.menu.DebugLevel.debug=Debug
+adafruit_metro_esp32s3.menu.DebugLevel.debug.build.code_debug=4
+adafruit_metro_esp32s3.menu.DebugLevel.verbose=Verbose
+adafruit_metro_esp32s3.menu.DebugLevel.verbose.build.code_debug=5
+
+adafruit_metro_esp32s3.menu.EraseFlash.none=Disabled
+adafruit_metro_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
+adafruit_metro_esp32s3.menu.EraseFlash.all=Enabled
+adafruit_metro_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+
 ##############################################################
 # Adafruit MagTag 2.9"
 
@@ -8739,6 +8797,244 @@ adafruit_funhouse_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
 adafruit_funhouse_esp32s2.menu.EraseFlash.all=Enabled
 adafruit_funhouse_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
 
+##############################################################
+# Adafruit ESP32 Feather
+
+featheresp32.name=Adafruit ESP32 Feather
+
+featheresp32.bootloader.tool=esptool_py
+featheresp32.bootloader.tool.default=esptool_py
+
+featheresp32.upload.tool=esptool_py
+featheresp32.upload.tool.default=esptool_py
+featheresp32.upload.tool.network=esp_ota
+
+featheresp32.upload.maximum_size=1310720
+featheresp32.upload.maximum_data_size=327680
+featheresp32.upload.flags=
+featheresp32.upload.extra_flags=
+
+featheresp32.serial.disableDTR=true
+featheresp32.serial.disableRTS=true
+
+featheresp32.build.tarch=xtensa
+featheresp32.build.bootloader_addr=0x1000
+featheresp32.build.target=esp32
+featheresp32.build.mcu=esp32
+featheresp32.build.core=esp32
+featheresp32.build.variant=feather_esp32
+featheresp32.build.board=FEATHER_ESP32
+
+featheresp32.build.f_cpu=240000000L
+featheresp32.build.flash_size=4MB
+featheresp32.build.flash_freq=80m
+featheresp32.build.flash_mode=dio
+featheresp32.build.boot=dio
+featheresp32.build.partitions=default
+featheresp32.build.defines=
+featheresp32.build.loop_core=
+featheresp32.build.event_core=
+
+featheresp32.menu.LoopCore.1=Core 1
+featheresp32.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+featheresp32.menu.LoopCore.0=Core 0
+featheresp32.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+featheresp32.menu.EventsCore.1=Core 1
+featheresp32.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+featheresp32.menu.EventsCore.0=Core 0
+featheresp32.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+featheresp32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+featheresp32.menu.PartitionScheme.default.build.partitions=default
+featheresp32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+featheresp32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+featheresp32.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+featheresp32.menu.PartitionScheme.minimal.build.partitions=minimal
+featheresp32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+featheresp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+featheresp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+featheresp32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+featheresp32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+featheresp32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+featheresp32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+featheresp32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+featheresp32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+featheresp32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+featheresp32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+featheresp32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+featheresp32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+featheresp32.menu.PartitionScheme.huge_app.build.partitions=huge_app
+featheresp32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+featheresp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+featheresp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+featheresp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+featheresp32.menu.CPUFreq.240=240MHz (WiFi/BT)
+featheresp32.menu.CPUFreq.240.build.f_cpu=240000000L
+featheresp32.menu.CPUFreq.160=160MHz (WiFi/BT)
+featheresp32.menu.CPUFreq.160.build.f_cpu=160000000L
+featheresp32.menu.CPUFreq.80=80MHz (WiFi/BT)
+featheresp32.menu.CPUFreq.80.build.f_cpu=80000000L
+featheresp32.menu.CPUFreq.40=40MHz
+featheresp32.menu.CPUFreq.40.build.f_cpu=40000000L
+featheresp32.menu.CPUFreq.20=20MHz
+featheresp32.menu.CPUFreq.20.build.f_cpu=20000000L
+featheresp32.menu.CPUFreq.10=10MHz
+featheresp32.menu.CPUFreq.10.build.f_cpu=10000000L
+
+featheresp32.menu.FlashFreq.80=80MHz
+featheresp32.menu.FlashFreq.80.build.flash_freq=80m
+featheresp32.menu.FlashFreq.40=40MHz
+featheresp32.menu.FlashFreq.40.build.flash_freq=40m
+
+featheresp32.menu.FlashSize.4M=4MB (32Mb)
+featheresp32.menu.FlashSize.4M.build.flash_size=4MB
+
+featheresp32.menu.UploadSpeed.921600=921600
+featheresp32.menu.UploadSpeed.921600.upload.speed=921600
+featheresp32.menu.UploadSpeed.115200=115200
+featheresp32.menu.UploadSpeed.115200.upload.speed=115200
+featheresp32.menu.UploadSpeed.256000.windows=256000
+featheresp32.menu.UploadSpeed.256000.upload.speed=256000
+featheresp32.menu.UploadSpeed.230400.windows.upload.speed=256000
+featheresp32.menu.UploadSpeed.230400=230400
+featheresp32.menu.UploadSpeed.230400.upload.speed=230400
+featheresp32.menu.UploadSpeed.460800.linux=460800
+featheresp32.menu.UploadSpeed.460800.macosx=460800
+featheresp32.menu.UploadSpeed.460800.upload.speed=460800
+featheresp32.menu.UploadSpeed.512000.windows=512000
+featheresp32.menu.UploadSpeed.512000.upload.speed=512000
+
+featheresp32.menu.DebugLevel.none=None
+featheresp32.menu.DebugLevel.none.build.code_debug=0
+featheresp32.menu.DebugLevel.error=Error
+featheresp32.menu.DebugLevel.error.build.code_debug=1
+featheresp32.menu.DebugLevel.warn=Warn
+featheresp32.menu.DebugLevel.warn.build.code_debug=2
+featheresp32.menu.DebugLevel.info=Info
+featheresp32.menu.DebugLevel.info.build.code_debug=3
+featheresp32.menu.DebugLevel.debug=Debug
+featheresp32.menu.DebugLevel.debug.build.code_debug=4
+featheresp32.menu.DebugLevel.verbose=Verbose
+featheresp32.menu.DebugLevel.verbose.build.code_debug=5
+
+featheresp32.menu.EraseFlash.none=Disabled
+featheresp32.menu.EraseFlash.none.upload.erase_cmd=
+featheresp32.menu.EraseFlash.all=Enabled
+featheresp32.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+# Adafruit Feather ESP32 V2
+
+adafruit_feather_esp32_v2.name=Adafruit Feather ESP32 V2
+
+adafruit_feather_esp32_v2.bootloader.tool=esptool_py
+adafruit_feather_esp32_v2.bootloader.tool.default=esptool_py
+
+adafruit_feather_esp32_v2.upload.tool=esptool_py
+adafruit_feather_esp32_v2.upload.tool.default=esptool_py
+adafruit_feather_esp32_v2.upload.tool.network=esp_ota
+
+adafruit_feather_esp32_v2.upload.maximum_size=1310720
+adafruit_feather_esp32_v2.upload.maximum_data_size=327680
+adafruit_feather_esp32_v2.upload.flags=
+adafruit_feather_esp32_v2.upload.extra_flags=
+
+adafruit_feather_esp32_v2.serial.disableDTR=true
+adafruit_feather_esp32_v2.serial.disableRTS=true
+
+adafruit_feather_esp32_v2.build.tarch=xtensa
+adafruit_feather_esp32_v2.build.bootloader_addr=0x1000
+adafruit_feather_esp32_v2.build.target=esp32
+adafruit_feather_esp32_v2.build.mcu=esp32
+adafruit_feather_esp32_v2.build.core=esp32
+adafruit_feather_esp32_v2.build.variant=adafruit_feather_esp32_v2
+adafruit_feather_esp32_v2.build.board=ADAFRUIT_FEATHER_ESP32_V2
+
+adafruit_feather_esp32_v2.build.f_cpu=240000000L
+adafruit_feather_esp32_v2.build.flash_size=8MB
+adafruit_feather_esp32_v2.build.flash_freq=80m
+adafruit_feather_esp32_v2.build.flash_mode=dio
+adafruit_feather_esp32_v2.build.boot=dio
+adafruit_feather_esp32_v2.build.partitions=default
+adafruit_feather_esp32_v2.build.defines=
+adafruit_feather_esp32_v2.build.loop_core=
+adafruit_feather_esp32_v2.build.event_core=
+
+adafruit_feather_esp32_v2.menu.LoopCore.1=Core 1
+adafruit_feather_esp32_v2.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+adafruit_feather_esp32_v2.menu.LoopCore.0=Core 0
+adafruit_feather_esp32_v2.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+adafruit_feather_esp32_v2.menu.EventsCore.1=Core 1
+adafruit_feather_esp32_v2.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+adafruit_feather_esp32_v2.menu.EventsCore.0=Core 0
+adafruit_feather_esp32_v2.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+adafruit_feather_esp32_v2.menu.PSRAM.enabled=Enabled
+adafruit_feather_esp32_v2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
+adafruit_feather_esp32_v2.menu.PSRAM.disabled=Disabled
+adafruit_feather_esp32_v2.menu.PSRAM.disabled.build.defines=
+
+adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
+adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+
+adafruit_feather_esp32_v2.menu.CPUFreq.240=240MHz (WiFi/BT)
+adafruit_feather_esp32_v2.menu.CPUFreq.240.build.f_cpu=240000000L
+adafruit_feather_esp32_v2.menu.CPUFreq.160=160MHz (WiFi/BT)
+adafruit_feather_esp32_v2.menu.CPUFreq.160.build.f_cpu=160000000L
+adafruit_feather_esp32_v2.menu.CPUFreq.80=80MHz (WiFi/BT)
+adafruit_feather_esp32_v2.menu.CPUFreq.80.build.f_cpu=80000000L
+adafruit_feather_esp32_v2.menu.CPUFreq.40=40MHz
+adafruit_feather_esp32_v2.menu.CPUFreq.40.build.f_cpu=40000000L
+adafruit_feather_esp32_v2.menu.CPUFreq.20=20MHz
+adafruit_feather_esp32_v2.menu.CPUFreq.20.build.f_cpu=20000000L
+adafruit_feather_esp32_v2.menu.CPUFreq.10=10MHz
+adafruit_feather_esp32_v2.menu.CPUFreq.10.build.f_cpu=10000000L
+
+adafruit_feather_esp32_v2.menu.FlashFreq.80=80MHz
+adafruit_feather_esp32_v2.menu.FlashFreq.80.build.flash_freq=80m
+adafruit_feather_esp32_v2.menu.FlashFreq.40=40MHz
+adafruit_feather_esp32_v2.menu.FlashFreq.40.build.flash_freq=40m
+
+adafruit_feather_esp32_v2.menu.FlashSize.8M=8MB (64Mb)
+adafruit_feather_esp32_v2.menu.FlashSize.8M.build.flash_size=8MB
+
+adafruit_feather_esp32_v2.menu.UploadSpeed.921600=921600
+adafruit_feather_esp32_v2.menu.UploadSpeed.921600.upload.speed=921600
+adafruit_feather_esp32_v2.menu.UploadSpeed.115200=115200
+adafruit_feather_esp32_v2.menu.UploadSpeed.115200.upload.speed=115200
+adafruit_feather_esp32_v2.menu.UploadSpeed.256000.windows=256000
+adafruit_feather_esp32_v2.menu.UploadSpeed.256000.upload.speed=256000
+adafruit_feather_esp32_v2.menu.UploadSpeed.230400.windows.upload.speed=256000
+adafruit_feather_esp32_v2.menu.UploadSpeed.230400=230400
+adafruit_feather_esp32_v2.menu.UploadSpeed.230400.upload.speed=230400
+adafruit_feather_esp32_v2.menu.UploadSpeed.460800.linux=460800
+adafruit_feather_esp32_v2.menu.UploadSpeed.460800.macosx=460800
+adafruit_feather_esp32_v2.menu.UploadSpeed.460800.upload.speed=460800
+adafruit_feather_esp32_v2.menu.UploadSpeed.512000.windows=512000
+adafruit_feather_esp32_v2.menu.UploadSpeed.512000.upload.speed=512000
+
+adafruit_feather_esp32_v2.menu.DebugLevel.none=None
+adafruit_feather_esp32_v2.menu.DebugLevel.none.build.code_debug=0
+adafruit_feather_esp32_v2.menu.DebugLevel.error=Error
+adafruit_feather_esp32_v2.menu.DebugLevel.error.build.code_debug=1
+adafruit_feather_esp32_v2.menu.DebugLevel.warn=Warn
+adafruit_feather_esp32_v2.menu.DebugLevel.warn.build.code_debug=2
+adafruit_feather_esp32_v2.menu.DebugLevel.info=Info
+adafruit_feather_esp32_v2.menu.DebugLevel.info.build.code_debug=3
+adafruit_feather_esp32_v2.menu.DebugLevel.debug=Debug
+adafruit_feather_esp32_v2.menu.DebugLevel.debug.build.code_debug=4
+adafruit_feather_esp32_v2.menu.DebugLevel.verbose=Verbose
+adafruit_feather_esp32_v2.menu.DebugLevel.verbose.build.code_debug=5
+
+adafruit_feather_esp32_v2.menu.EraseFlash.none=Disabled
+adafruit_feather_esp32_v2.menu.EraseFlash.none.upload.erase_cmd=
+adafruit_feather_esp32_v2.menu.EraseFlash.all=Enabled
+adafruit_feather_esp32_v2.menu.EraseFlash.all.upload.erase_cmd=-e
+
 ##############################################################
 # Adafruit Feather ESP32-S2
 
@@ -9252,117 +9548,6 @@ adafruit_feather_esp32s2_reversetft.menu.EraseFlash.none.upload.erase_cmd=
 adafruit_feather_esp32s2_reversetft.menu.EraseFlash.all=Enabled
 adafruit_feather_esp32s2_reversetft.menu.EraseFlash.all.upload.erase_cmd=-e
 
-##############################################################
-# Adafruit Feather ESP32 V2
-
-adafruit_feather_esp32_v2.name=Adafruit Feather ESP32 V2
-
-adafruit_feather_esp32_v2.bootloader.tool=esptool_py
-adafruit_feather_esp32_v2.bootloader.tool.default=esptool_py
-
-adafruit_feather_esp32_v2.upload.tool=esptool_py
-adafruit_feather_esp32_v2.upload.tool.default=esptool_py
-adafruit_feather_esp32_v2.upload.tool.network=esp_ota
-
-adafruit_feather_esp32_v2.upload.maximum_size=1310720
-adafruit_feather_esp32_v2.upload.maximum_data_size=327680
-adafruit_feather_esp32_v2.upload.flags=
-adafruit_feather_esp32_v2.upload.extra_flags=
-
-adafruit_feather_esp32_v2.serial.disableDTR=true
-adafruit_feather_esp32_v2.serial.disableRTS=true
-
-adafruit_feather_esp32_v2.build.tarch=xtensa
-adafruit_feather_esp32_v2.build.bootloader_addr=0x1000
-adafruit_feather_esp32_v2.build.target=esp32
-adafruit_feather_esp32_v2.build.mcu=esp32
-adafruit_feather_esp32_v2.build.core=esp32
-adafruit_feather_esp32_v2.build.variant=adafruit_feather_esp32_v2
-adafruit_feather_esp32_v2.build.board=ADAFRUIT_FEATHER_ESP32_V2
-
-adafruit_feather_esp32_v2.build.f_cpu=240000000L
-adafruit_feather_esp32_v2.build.flash_size=8MB
-adafruit_feather_esp32_v2.build.flash_freq=80m
-adafruit_feather_esp32_v2.build.flash_mode=dio
-adafruit_feather_esp32_v2.build.boot=dio
-adafruit_feather_esp32_v2.build.partitions=default
-adafruit_feather_esp32_v2.build.defines=
-adafruit_feather_esp32_v2.build.loop_core=
-adafruit_feather_esp32_v2.build.event_core=
-
-adafruit_feather_esp32_v2.menu.LoopCore.1=Core 1
-adafruit_feather_esp32_v2.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
-adafruit_feather_esp32_v2.menu.LoopCore.0=Core 0
-adafruit_feather_esp32_v2.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
-
-adafruit_feather_esp32_v2.menu.EventsCore.1=Core 1
-adafruit_feather_esp32_v2.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
-adafruit_feather_esp32_v2.menu.EventsCore.0=Core 0
-adafruit_feather_esp32_v2.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
-
-adafruit_feather_esp32_v2.menu.PSRAM.enabled=Enabled
-adafruit_feather_esp32_v2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
-adafruit_feather_esp32_v2.menu.PSRAM.disabled=Disabled
-adafruit_feather_esp32_v2.menu.PSRAM.disabled.build.defines=
-
-adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
-adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
-adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
-
-adafruit_feather_esp32_v2.menu.CPUFreq.240=240MHz (WiFi/BT)
-adafruit_feather_esp32_v2.menu.CPUFreq.240.build.f_cpu=240000000L
-adafruit_feather_esp32_v2.menu.CPUFreq.160=160MHz (WiFi/BT)
-adafruit_feather_esp32_v2.menu.CPUFreq.160.build.f_cpu=160000000L
-adafruit_feather_esp32_v2.menu.CPUFreq.80=80MHz (WiFi/BT)
-adafruit_feather_esp32_v2.menu.CPUFreq.80.build.f_cpu=80000000L
-adafruit_feather_esp32_v2.menu.CPUFreq.40=40MHz
-adafruit_feather_esp32_v2.menu.CPUFreq.40.build.f_cpu=40000000L
-adafruit_feather_esp32_v2.menu.CPUFreq.20=20MHz
-adafruit_feather_esp32_v2.menu.CPUFreq.20.build.f_cpu=20000000L
-adafruit_feather_esp32_v2.menu.CPUFreq.10=10MHz
-adafruit_feather_esp32_v2.menu.CPUFreq.10.build.f_cpu=10000000L
-
-adafruit_feather_esp32_v2.menu.FlashFreq.80=80MHz
-adafruit_feather_esp32_v2.menu.FlashFreq.80.build.flash_freq=80m
-adafruit_feather_esp32_v2.menu.FlashFreq.40=40MHz
-adafruit_feather_esp32_v2.menu.FlashFreq.40.build.flash_freq=40m
-
-adafruit_feather_esp32_v2.menu.FlashSize.8M=8MB (64Mb)
-adafruit_feather_esp32_v2.menu.FlashSize.8M.build.flash_size=8MB
-
-adafruit_feather_esp32_v2.menu.UploadSpeed.921600=921600
-adafruit_feather_esp32_v2.menu.UploadSpeed.921600.upload.speed=921600
-adafruit_feather_esp32_v2.menu.UploadSpeed.115200=115200
-adafruit_feather_esp32_v2.menu.UploadSpeed.115200.upload.speed=115200
-adafruit_feather_esp32_v2.menu.UploadSpeed.256000.windows=256000
-adafruit_feather_esp32_v2.menu.UploadSpeed.256000.upload.speed=256000
-adafruit_feather_esp32_v2.menu.UploadSpeed.230400.windows.upload.speed=256000
-adafruit_feather_esp32_v2.menu.UploadSpeed.230400=230400
-adafruit_feather_esp32_v2.menu.UploadSpeed.230400.upload.speed=230400
-adafruit_feather_esp32_v2.menu.UploadSpeed.460800.linux=460800
-adafruit_feather_esp32_v2.menu.UploadSpeed.460800.macosx=460800
-adafruit_feather_esp32_v2.menu.UploadSpeed.460800.upload.speed=460800
-adafruit_feather_esp32_v2.menu.UploadSpeed.512000.windows=512000
-adafruit_feather_esp32_v2.menu.UploadSpeed.512000.upload.speed=512000
-
-adafruit_feather_esp32_v2.menu.DebugLevel.none=None
-adafruit_feather_esp32_v2.menu.DebugLevel.none.build.code_debug=0
-adafruit_feather_esp32_v2.menu.DebugLevel.error=Error
-adafruit_feather_esp32_v2.menu.DebugLevel.error.build.code_debug=1
-adafruit_feather_esp32_v2.menu.DebugLevel.warn=Warn
-adafruit_feather_esp32_v2.menu.DebugLevel.warn.build.code_debug=2
-adafruit_feather_esp32_v2.menu.DebugLevel.info=Info
-adafruit_feather_esp32_v2.menu.DebugLevel.info.build.code_debug=3
-adafruit_feather_esp32_v2.menu.DebugLevel.debug=Debug
-adafruit_feather_esp32_v2.menu.DebugLevel.debug.build.code_debug=4
-adafruit_feather_esp32_v2.menu.DebugLevel.verbose=Verbose
-adafruit_feather_esp32_v2.menu.DebugLevel.verbose.build.code_debug=5
-
-adafruit_feather_esp32_v2.menu.EraseFlash.none=Disabled
-adafruit_feather_esp32_v2.menu.EraseFlash.none.upload.erase_cmd=
-adafruit_feather_esp32_v2.menu.EraseFlash.all=Enabled
-adafruit_feather_esp32_v2.menu.EraseFlash.all.upload.erase_cmd=-e
-
 ##############################################################
 # Adafruit Feather ESP32-S3 2MB PSRAM
 
diff --git a/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin b/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin
new file mode 100644
index 00000000000..73e8c06b33b
Binary files /dev/null and b/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin differ
diff --git a/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv b/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv
new file mode 100644
index 00000000000..55f6c2b8d76
--- /dev/null
+++ b/variants/adafruit_metro_esp32s3/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_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h
new file mode 100644
index 00000000000..e4e69345cb7
--- /dev/null
+++ b/variants/adafruit_metro_esp32s3/pins_arduino.h
@@ -0,0 +1,78 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID            0x239A
+#define USB_PID            0x8145
+#define USB_MANUFACTURER   "Adafruit"
+#define USB_PRODUCT        "Metro 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)
+
+#define LED_BUILTIN     13
+
+#define PIN_NEOPIXEL    45
+#define NEOPIXEL_PIN    45
+#define NEOPIXEL_NUM    1
+
+#define PIN_BUTTON1     0  // BOOT0 switch
+
+static const uint8_t TX = 40;
+static const uint8_t RX = 41;
+#define TX1 TX
+#define RX1 RX
+
+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 A0 = 14;
+static const uint8_t A1 = 15;
+static const uint8_t A2 = 16;
+static const uint8_t A3 = 17;
+static const uint8_t A4 = 18;
+static const uint8_t A5 = 1;
+
+static const uint8_t A6 = 40;
+static const uint8_t A7 = 41;
+static const uint8_t A8 = 2;
+static const uint8_t A9 = 3;
+static const uint8_t A10 = 4;
+static const uint8_t A11 = 5;
+static const uint8_t A12 = 6;
+static const uint8_t A13 = 7;
+static const uint8_t A14 = 8;
+static const uint8_t A15 = 9;
+static const uint8_t A16 = 10;
+static const uint8_t A17 = 11;
+static const uint8_t A18 = 12;
+static const uint8_t A19 = 13;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/adafruit_metro_esp32s3/tinyuf2.bin b/variants/adafruit_metro_esp32s3/tinyuf2.bin
new file mode 100644
index 00000000000..d57e5b75b55
Binary files /dev/null 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
new file mode 100644
index 00000000000..811a6d508c9
--- /dev/null
+++ b/variants/adafruit_metro_esp32s3/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);
+}
+
+}