diff --git a/boards.txt b/boards.txt
index 5d2fd5d2d05..f102fa2dbaa 100644
--- a/boards.txt
+++ b/boards.txt
@@ -406,7 +406,8 @@ esp32wrover.menu.DebugLevel.verbose=Verbose
 esp32wrover.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
-pico32.name=ESP32 Pico Kit
+
+pico32.name=ESP32 PICO-D4
 
 pico32.upload.tool=esptool_py
 pico32.upload.maximum_size=1310720
@@ -467,125 +468,124 @@ pico32.menu.DebugLevel.verbose=Verbose
 pico32.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
-micros2.name=microS2
-micros2.vid.0=0x239A
-micros2.pid.0=0x80C5
-
-micros2.upload.tool=esptool_py
-micros2.upload.maximum_size=1310720
-micros2.upload.maximum_data_size=327680
-micros2.upload.flags=
-
-micros2.serial.disableDTR=false
-micros2.serial.disableRTS=false
 
-micros2.build.mcu=esp32s2
-micros2.build.core=esp32
-micros2.build.variant=micro_s2
-micros2.build.board=MICROS2
-
-micros2.build.serial=1
-micros2.build.f_cpu=240000000L
-micros2.build.flash_size=16MB
-micros2.build.flash_freq=80m
-micros2.build.flash_mode=dio
-micros2.build.boot=qio
-micros2.build.partitions=fatflash
-micros2.build.defines=
-
-micros2.menu.SerialMode.cdc=USB CDC
-micros2.menu.SerialMode.cdc.build.serial=1
-micros2.menu.SerialMode.default=UART0
-micros2.menu.SerialMode.default.build.serial=0
-
-micros2.menu.PSRAM.enabled=Enabled
-micros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-micros2.menu.PSRAM.disabled=Disabled
-micros2.menu.PSRAM.disabled.build.defines=
-
-micros2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
-micros2.menu.PartitionScheme.fatflash.build.partitions=ffat
-micros2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
-micros2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
-micros2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-micros2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
-micros2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
-micros2.menu.PartitionScheme.default.build.partitions=default
-micros2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
-micros2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-micros2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
-micros2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
-micros2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
-micros2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
-micros2.menu.PartitionScheme.minimal.build.partitions=minimal
-micros2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-micros2.menu.PartitionScheme.no_ota.build.partitions=no_ota
-micros2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-micros2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
-micros2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
-micros2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
-micros2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
-micros2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
-micros2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
-micros2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
-micros2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
-micros2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
-micros2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
-micros2.menu.PartitionScheme.huge_app.build.partitions=huge_app
-micros2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-micros2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
-micros2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-micros2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-
-micros2.menu.CPUFreq.240=240MHz (WiFi)
-micros2.menu.CPUFreq.240.build.f_cpu=240000000L
-micros2.menu.CPUFreq.160=160MHz (WiFi)
-micros2.menu.CPUFreq.160.build.f_cpu=160000000L
-micros2.menu.CPUFreq.80=80MHz (WiFi)
-micros2.menu.CPUFreq.80.build.f_cpu=80000000L
-micros2.menu.CPUFreq.40=40MHz
-micros2.menu.CPUFreq.40.build.f_cpu=40000000L
-micros2.menu.CPUFreq.20=20MHz
-micros2.menu.CPUFreq.20.build.f_cpu=20000000L
-micros2.menu.CPUFreq.10=10MHz
-micros2.menu.CPUFreq.10.build.f_cpu=10000000L
-
-micros2.menu.FlashSize.16M=16MB (128Mb)
-micros2.menu.FlashSize.16M.build.flash_size=16MB
-micros2.menu.FlashSize.4M=4MB (32Mb)
-micros2.menu.FlashSize.4M.build.flash_size=4MB
-micros2.menu.FlashSize.8M=8MB (64Mb)
-micros2.menu.FlashSize.8M.build.flash_size=8MB
-micros2.menu.FlashSize.8M.build.partitions=default_8MB
-micros2.menu.FlashSize.2M=2MB (16Mb)
-micros2.menu.FlashSize.2M.build.flash_size=2MB
-micros2.menu.FlashSize.2M.build.partitions=minimal
-
-micros2.menu.UploadSpeed.921600=921600
-micros2.menu.UploadSpeed.921600.upload.speed=921600
-micros2.menu.UploadSpeed.115200=115200
-micros2.menu.UploadSpeed.115200.upload.speed=115200
-micros2.menu.UploadSpeed.256000.windows=256000
-micros2.menu.UploadSpeed.256000.upload.speed=256000
-micros2.menu.UploadSpeed.230400.windows.upload.speed=256000
-micros2.menu.UploadSpeed.230400=230400
-micros2.menu.UploadSpeed.230400.upload.speed=230400
-micros2.menu.UploadSpeed.460800.linux=460800
-micros2.menu.UploadSpeed.460800.macosx=460800
-micros2.menu.UploadSpeed.460800.upload.speed=460800
-
-micros2.menu.DebugLevel.none=None
-micros2.menu.DebugLevel.none.build.code_debug=0
-micros2.menu.DebugLevel.error=Error
-micros2.menu.DebugLevel.error.build.code_debug=1
-micros2.menu.DebugLevel.warn=Warn
-micros2.menu.DebugLevel.warn.build.code_debug=2
-micros2.menu.DebugLevel.info=Info
-micros2.menu.DebugLevel.info.build.code_debug=3
-micros2.menu.DebugLevel.debug=Debug
-micros2.menu.DebugLevel.debug.build.code_debug=4
-micros2.menu.DebugLevel.verbose=Verbose
-micros2.menu.DebugLevel.verbose.build.code_debug=5
+esp32wroverkit.name=ESP32 Wrover Kit (all versions)
+esp32wroverkit.upload.tool=esptool_py
+esp32wroverkit.upload.maximum_size=1310720
+esp32wroverkit.upload.maximum_data_size=327680
+esp32wroverkit.upload.flags=
+esp32wroverkit.serial.disableDTR=true
+esp32wroverkit.serial.disableRTS=true
+esp32wroverkit.build.mcu=esp32
+esp32wroverkit.build.core=esp32
+esp32wroverkit.build.variant=esp32
+esp32wroverkit.build.board=ESP32_WROVER_KIT
+esp32wroverkit.build.f_cpu=240000000L
+esp32wroverkit.menu.CPUFreq.240=240MHz (WiFi/BT)
+esp32wroverkit.menu.CPUFreq.240.build.f_cpu=240000000L
+esp32wroverkit.menu.CPUFreq.160=160MHz (WiFi/BT)
+esp32wroverkit.menu.CPUFreq.160.build.f_cpu=160000000L
+esp32wroverkit.menu.CPUFreq.80=80MHz (WiFi/BT)
+esp32wroverkit.menu.CPUFreq.80.build.f_cpu=80000000L
+esp32wroverkit.menu.CPUFreq.40=40MHz (40MHz XTAL)
+esp32wroverkit.menu.CPUFreq.40.build.f_cpu=40000000L
+esp32wroverkit.menu.CPUFreq.26=26MHz (26MHz XTAL)
+esp32wroverkit.menu.CPUFreq.26.build.f_cpu=26000000L
+esp32wroverkit.menu.CPUFreq.20=20MHz (40MHz XTAL)
+esp32wroverkit.menu.CPUFreq.20.build.f_cpu=20000000L
+esp32wroverkit.menu.CPUFreq.13=13MHz (26MHz XTAL)
+esp32wroverkit.menu.CPUFreq.13.build.f_cpu=13000000L
+esp32wroverkit.menu.CPUFreq.10=10MHz (40MHz XTAL)
+esp32wroverkit.menu.CPUFreq.10.build.f_cpu=10000000L
+esp32wroverkit.build.flash_size=4MB
+esp32wroverkit.build.flash_freq=40m
+esp32wroverkit.menu.FlashSize.4M=4MB (32Mb)
+esp32wroverkit.menu.FlashSize.4M.build.flash_size=4MB
+esp32wroverkit.menu.FlashSize.8M=8MB (64Mb)
+esp32wroverkit.menu.FlashSize.8M.build.flash_size=8MB
+esp32wroverkit.menu.FlashSize.8M.build.partitions=default_8MB
+esp32wroverkit.menu.FlashSize.2M=2MB (16Mb)
+esp32wroverkit.menu.FlashSize.2M.build.flash_size=2MB
+esp32wroverkit.menu.FlashSize.2M.build.partitions=minimal
+esp32wroverkit.menu.FlashSize.16M=16MB (128Mb)
+esp32wroverkit.menu.FlashSize.16M.build.flash_size=16MB
+esp32wroverkit.build.flash_mode=dio
+esp32wroverkit.build.boot=dio
+esp32wroverkit.build.partitions=default
+esp32wroverkit.menu.PSRAM.enabled=Enabled
+esp32wroverkit.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
+esp32wroverkit.menu.PSRAM.disabled=Disabled
+esp32wroverkit.menu.PSRAM.disabled.build.defines=
+esp32wroverkit.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.default.build.partitions=default
+esp32wroverkit.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+esp32wroverkit.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+esp32wroverkit.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+esp32wroverkit.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+esp32wroverkit.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.minimal.build.partitions=minimal
+esp32wroverkit.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32wroverkit.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32wroverkit.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+esp32wroverkit.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+esp32wroverkit.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+esp32wroverkit.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+esp32wroverkit.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+esp32wroverkit.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+esp32wroverkit.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+esp32wroverkit.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+esp32wroverkit.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.huge_app.build.partitions=huge_app
+esp32wroverkit.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+esp32wroverkit.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32wroverkit.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+esp32wroverkit.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+esp32wroverkit.menu.PartitionScheme.fatflash.build.partitions=ffat
+esp32wroverkit.menu.FlashMode.qio=QIO
+esp32wroverkit.menu.FlashMode.qio.build.flash_mode=dio
+esp32wroverkit.menu.FlashMode.qio.build.boot=qio
+esp32wroverkit.menu.FlashMode.dio=DIO
+esp32wroverkit.menu.FlashMode.dio.build.flash_mode=dio
+esp32wroverkit.menu.FlashMode.dio.build.boot=dio
+esp32wroverkit.menu.FlashMode.qout=QOUT
+esp32wroverkit.menu.FlashMode.qout.build.flash_mode=dout
+esp32wroverkit.menu.FlashMode.qout.build.boot=qout
+esp32wroverkit.menu.FlashMode.dout=DOUT
+esp32wroverkit.menu.FlashMode.dout.build.flash_mode=dout
+esp32wroverkit.menu.FlashMode.dout.build.boot=dout
+esp32wroverkit.menu.FlashFreq.80=80MHz
+esp32wroverkit.menu.FlashFreq.80.build.flash_freq=80m
+esp32wroverkit.menu.FlashFreq.40=40MHz
+esp32wroverkit.menu.FlashFreq.40.build.flash_freq=40m
+esp32wroverkit.menu.UploadSpeed.921600=921600
+esp32wroverkit.menu.UploadSpeed.921600.upload.speed=921600
+esp32wroverkit.menu.UploadSpeed.115200=115200
+esp32wroverkit.menu.UploadSpeed.115200.upload.speed=115200
+esp32wroverkit.menu.UploadSpeed.256000.windows=256000
+esp32wroverkit.menu.UploadSpeed.256000.upload.speed=256000
+esp32wroverkit.menu.UploadSpeed.230400.windows.upload.speed=256000
+esp32wroverkit.menu.UploadSpeed.230400=230400
+esp32wroverkit.menu.UploadSpeed.230400.upload.speed=230400
+esp32wroverkit.menu.UploadSpeed.460800.linux=460800
+esp32wroverkit.menu.UploadSpeed.460800.macosx=460800
+esp32wroverkit.menu.UploadSpeed.460800.upload.speed=460800
+esp32wroverkit.menu.UploadSpeed.512000.windows=512000
+esp32wroverkit.menu.UploadSpeed.512000.upload.speed=512000
+esp32wroverkit.menu.DebugLevel.none=None
+esp32wroverkit.menu.DebugLevel.none.build.code_debug=0
+esp32wroverkit.menu.DebugLevel.error=Error
+esp32wroverkit.menu.DebugLevel.error.build.code_debug=1
+esp32wroverkit.menu.DebugLevel.warn=Warn
+esp32wroverkit.menu.DebugLevel.warn.build.code_debug=2
+esp32wroverkit.menu.DebugLevel.info=Info
+esp32wroverkit.menu.DebugLevel.info.build.code_debug=3
+esp32wroverkit.menu.DebugLevel.debug=Debug
+esp32wroverkit.menu.DebugLevel.debug.build.code_debug=4
+esp32wroverkit.menu.DebugLevel.verbose=Verbose
+esp32wroverkit.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 tinypico.name=UM TinyPICO
@@ -908,6 +908,128 @@ pros2.menu.DebugLevel.debug.build.code_debug=4
 pros2.menu.DebugLevel.verbose=Verbose
 pros2.menu.DebugLevel.verbose.build.code_debug=5
 
+##############################################################
+
+micros2.name=microS2
+micros2.vid.0=0x239A
+micros2.pid.0=0x80C5
+
+micros2.upload.tool=esptool_py
+micros2.upload.maximum_size=1310720
+micros2.upload.maximum_data_size=327680
+micros2.upload.flags=
+
+micros2.serial.disableDTR=false
+micros2.serial.disableRTS=false
+
+micros2.build.mcu=esp32s2
+micros2.build.core=esp32
+micros2.build.variant=micro_s2
+micros2.build.board=MICROS2
+
+micros2.build.serial=1
+micros2.build.f_cpu=240000000L
+micros2.build.flash_size=16MB
+micros2.build.flash_freq=80m
+micros2.build.flash_mode=dio
+micros2.build.boot=qio
+micros2.build.partitions=fatflash
+micros2.build.defines=
+
+micros2.menu.SerialMode.cdc=USB CDC
+micros2.menu.SerialMode.cdc.build.serial=1
+micros2.menu.SerialMode.default=UART0
+micros2.menu.SerialMode.default.build.serial=0
+
+micros2.menu.PSRAM.enabled=Enabled
+micros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+micros2.menu.PSRAM.disabled=Disabled
+micros2.menu.PSRAM.disabled.build.defines=
+
+micros2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+micros2.menu.PartitionScheme.fatflash.build.partitions=ffat
+micros2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+micros2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+micros2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+micros2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+micros2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+micros2.menu.PartitionScheme.default.build.partitions=default
+micros2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+micros2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+micros2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+micros2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+micros2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+micros2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+micros2.menu.PartitionScheme.minimal.build.partitions=minimal
+micros2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+micros2.menu.PartitionScheme.no_ota.build.partitions=no_ota
+micros2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+micros2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+micros2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+micros2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+micros2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+micros2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+micros2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+micros2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+micros2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+micros2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+micros2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+micros2.menu.PartitionScheme.huge_app.build.partitions=huge_app
+micros2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+micros2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+micros2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+micros2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+micros2.menu.CPUFreq.240=240MHz (WiFi)
+micros2.menu.CPUFreq.240.build.f_cpu=240000000L
+micros2.menu.CPUFreq.160=160MHz (WiFi)
+micros2.menu.CPUFreq.160.build.f_cpu=160000000L
+micros2.menu.CPUFreq.80=80MHz (WiFi)
+micros2.menu.CPUFreq.80.build.f_cpu=80000000L
+micros2.menu.CPUFreq.40=40MHz
+micros2.menu.CPUFreq.40.build.f_cpu=40000000L
+micros2.menu.CPUFreq.20=20MHz
+micros2.menu.CPUFreq.20.build.f_cpu=20000000L
+micros2.menu.CPUFreq.10=10MHz
+micros2.menu.CPUFreq.10.build.f_cpu=10000000L
+
+micros2.menu.FlashSize.16M=16MB (128Mb)
+micros2.menu.FlashSize.16M.build.flash_size=16MB
+micros2.menu.FlashSize.4M=4MB (32Mb)
+micros2.menu.FlashSize.4M.build.flash_size=4MB
+micros2.menu.FlashSize.8M=8MB (64Mb)
+micros2.menu.FlashSize.8M.build.flash_size=8MB
+micros2.menu.FlashSize.8M.build.partitions=default_8MB
+micros2.menu.FlashSize.2M=2MB (16Mb)
+micros2.menu.FlashSize.2M.build.flash_size=2MB
+micros2.menu.FlashSize.2M.build.partitions=minimal
+
+micros2.menu.UploadSpeed.921600=921600
+micros2.menu.UploadSpeed.921600.upload.speed=921600
+micros2.menu.UploadSpeed.115200=115200
+micros2.menu.UploadSpeed.115200.upload.speed=115200
+micros2.menu.UploadSpeed.256000.windows=256000
+micros2.menu.UploadSpeed.256000.upload.speed=256000
+micros2.menu.UploadSpeed.230400.windows.upload.speed=256000
+micros2.menu.UploadSpeed.230400=230400
+micros2.menu.UploadSpeed.230400.upload.speed=230400
+micros2.menu.UploadSpeed.460800.linux=460800
+micros2.menu.UploadSpeed.460800.macosx=460800
+micros2.menu.UploadSpeed.460800.upload.speed=460800
+
+micros2.menu.DebugLevel.none=None
+micros2.menu.DebugLevel.none.build.code_debug=0
+micros2.menu.DebugLevel.error=Error
+micros2.menu.DebugLevel.error.build.code_debug=1
+micros2.menu.DebugLevel.warn=Warn
+micros2.menu.DebugLevel.warn.build.code_debug=2
+micros2.menu.DebugLevel.info=Info
+micros2.menu.DebugLevel.info.build.code_debug=3
+micros2.menu.DebugLevel.debug=Debug
+micros2.menu.DebugLevel.debug.build.code_debug=4
+micros2.menu.DebugLevel.verbose=Verbose
+micros2.menu.DebugLevel.verbose.build.code_debug=5
+
 ##############################################################
 magicbit.name=MagicBit
 
@@ -2574,11 +2696,11 @@ esp32-gateway.build.core=esp32
 esp32-gateway.build.variant=esp32-gateway
 esp32-gateway.build.board=ESP32_GATEWAY
 esp32-gateway.menu.Revision.RevC=Revision C or older
-esp32-gateway.menu.Revision.RevC.build.board=ESP32_GATEWAY='C'
+esp32-gateway.menu.Revision.RevC.build.board=ESP32_GATEWAY_C
 esp32-gateway.menu.Revision.RevE=Revision E
-esp32-gateway.menu.Revision.RevE.build.board=ESP32_GATEWAY='E'
+esp32-gateway.menu.Revision.RevE.build.board=ESP32_GATEWAY_E
 esp32-gateway.menu.Revision.RevF=Revision F
-esp32-gateway.menu.Revision.RevF.build.board=ESP32_GATEWAY='F'
+esp32-gateway.menu.Revision.RevF.build.board=ESP32_GATEWAY_F
 
 esp32-gateway.build.f_cpu=240000000L
 esp32-gateway.build.flash_mode=dio
@@ -3966,7 +4088,7 @@ bpi-bit.serial.disableRTS=true
 bpi-bit.build.mcu=esp32
 bpi-bit.build.core=esp32
 bpi-bit.build.variant=bpi-bit
-bpi-bit.build.board=BPI-BIT
+bpi-bit.build.board=BPI_BIT
 
 bpi-bit.build.f_cpu=160000000L
 bpi-bit.build.flash_mode=dio
@@ -4066,7 +4188,7 @@ t-beam.serial.disableRTS=true
 t-beam.build.mcu=esp32
 t-beam.build.core=esp32
 t-beam.build.variant=t-beam
-t-beam.build.board=T-Beam
+t-beam.build.board=T_Beam
 
 t-beam.build.f_cpu=240000000L
 t-beam.build.flash_mode=dio
@@ -4127,7 +4249,7 @@ d-duino-32.serial.disableRTS=true
 d-duino-32.build.mcu=esp32
 d-duino-32.build.core=esp32
 d-duino-32.build.variant=d-duino-32
-d-duino-32.build.board=D-duino-32
+d-duino-32.build.board=D_Duino_32
 
 d-duino-32.build.f_cpu=240000000L
 d-duino-32.build.flash_size=4MB
@@ -4381,7 +4503,7 @@ fm-devkit.serial.disableRTS=true
 fm-devkit.build.mcu=esp32
 fm-devkit.build.core=esp32
 fm-devkit.build.variant=fm-devkit
-fm-devkit.build.board=fm-devkit
+fm-devkit.build.board=fm_devkit
 
 fm-devkit.build.f_cpu=240000000L
 fm-devkit.build.flash_size=4MB
@@ -4621,7 +4743,7 @@ ttgo-t-watch.serial.disableRTS=true
 ttgo-t-watch.build.mcu=esp32
 ttgo-t-watch.build.core=esp32
 ttgo-t-watch.build.variant=twatch
-ttgo-t-watch.build.board=T-Watch
+ttgo-t-watch.build.board=T_Watch
 
 ttgo-t-watch.build.f_cpu=240000000L
 ttgo-t-watch.build.flash_size=16MB