diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json
index d8293b248190..4a5a81f99ff2 100644
--- a/ports/cc3200/boards/WIPY/board.json
+++ b/ports/cc3200/boards/WIPY/board.json
@@ -5,11 +5,10 @@
     "docs": "https://docs.pycom.io/datasheets/development/wipy3/",
     "features": [
         "BLE",
-        "Breadboard Friendly",
-        "MicroSD",
+        "External Flash",
         "RGB LED",
-        "SPI Flash",
-        "WiFi"
+        "WiFi",
+        "microSD"
     ],
     "id": "wipy",
     "images": [
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
index afb24e10494b..77aa19295995 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
@@ -5,9 +5,10 @@
     "docs": "",
     "features": [
         "BLE",
-        "WiFi",
+        "External Flash",
+        "RGB LED",
         "USB-C",
-        "RGB LED"
+        "WiFi"
     ],
     "images": [
         "ABX00092_01.iso_1000x750.jpg"
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json
index 7ebc84415c16..d4c4ce21dff3 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/board.json
+++ b/ports/esp32/boards/ESP32_S2_WROVER/board.json
@@ -5,7 +5,8 @@
     "docs": "",
     "features": [
         "BLE",
-        "SPIRAM",
+        "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index a52d58007d0c..f70e2e0890fa 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32",
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
index 6cc326bf1430..c993c87603e9 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32c3",
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
index 23f9a8eb2023..6d51e0a2c151 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/board.json
+++ b/ports/esp32/boards/GENERIC_C3_USB/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32c3-usb",
diff --git a/ports/esp32/boards/GENERIC_D2WD/board.json b/ports/esp32/boards/GENERIC_D2WD/board.json
index 39fce46bcabc..0582820445f9 100644
--- a/ports/esp32/boards/GENERIC_D2WD/board.json
+++ b/ports/esp32/boards/GENERIC_D2WD/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32-d2wd",
diff --git a/ports/esp32/boards/GENERIC_OTA/board.json b/ports/esp32/boards/GENERIC_OTA/board.json
index 97756a9fb2c5..3b882e04f8ff 100644
--- a/ports/esp32/boards/GENERIC_OTA/board.json
+++ b/ports/esp32/boards/GENERIC_OTA/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32-ota",
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index dbd3b5b015fd..102b039bf81a 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index 0db9b3250330..c30d4ed99395 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
index 3b405d4a122c..947787f3af8a 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
index f3ca177ef974..4cf15e888c98 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.json b/ports/esp32/boards/GENERIC_SPIRAM/board.json
index afb57b2ed125..02242028fb6e 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.json
@@ -5,7 +5,8 @@
     "docs": "",
     "features": [
         "BLE",
-        "SPIRAM",
+        "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "id": "esp32spiram",
diff --git a/ports/esp32/boards/GENERIC_UNICORE/board.json b/ports/esp32/boards/GENERIC_UNICORE/board.json
index 8fed71a018aa..1f3beaf6e082 100644
--- a/ports/esp32/boards/GENERIC_UNICORE/board.json
+++ b/ports/esp32/boards/GENERIC_UNICORE/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32-unicore",
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
index 9dd76b579237..525551df3b17 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
@@ -5,10 +5,11 @@
     "docs": "",
     "features": [
         "BLE",
+        "Display",
+        "External Flash",
         "LoRa",
-        "OLED",
         "SDCard",
-        "USB-MICRO",
+        "USB",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/board.json b/ports/esp32/boards/LOLIN_C3_MINI/board.json
index f47c672fa49a..c9b91641e528 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_C3_MINI/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index 41e62a02287b..a45d0434d995 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -4,7 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "SPIRAM",
+        "External Flash",
+        "External RAM",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/board.json b/ports/esp32/boards/LOLIN_S2_PICO/board.json
index 43322b87b0a9..6c72e60f8054 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/board.json
+++ b/ports/esp32/boards/LOLIN_S2_PICO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "OLED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
+        "Display",
+        "External Flash",
+        "External RAM",
+        "JST-SH",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
index 9d1886887c67..4b6c09db3a7e 100644
--- a/ports/esp32/boards/M5STACK_ATOM/board.json
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -4,9 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Grove",
+        "External Flash",
         "IMU",
-        "Infrared",
+        "JST-PH",
         "RGB LED",
         "USB-C",
         "WiFi"
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
index 84b6680d591b..e62b960ccd68 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
@@ -5,12 +5,12 @@
     "docs": "",
     "features": [
         "BLE",
-        "WiFi",
-        "MicroSD",
         "Battery Charging",
         "Ethernet",
+        "External Flash",
         "PoE",
-        "Breadboard friendly"
+        "WiFi",
+        "microSD"
     ],
     "images": [
         "ESP32-POE-ISO-1.jpg"
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 050620d61801..5c77b4887ad1 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -6,6 +6,7 @@
     "features": [
         "BLE",
         "Ethernet",
+        "External Flash",
         "PoE",
         "WiFi"
     ],
@@ -18,5 +19,5 @@
     "product": "SIL WESP32",
     "thumbnail": "",
     "url": "https://wesp32.com/",
-    "vendor": "Silicognition LLC"
+    "vendor": "Silicognition"
 }
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index fa5b213db013..4b6ea8855894 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -5,10 +5,11 @@
     "docs": "",
     "features": [
         "Battery Charging",
+        "External Flash",
+        "External RAM",
         "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index d809485e86ef..51bb02b97b23 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -5,10 +5,11 @@
     "docs": "",
     "features": [
         "Battery Charging",
+        "External Flash",
+        "External RAM",
         "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json
index 68423cca5e5d..0ad1ff73becb 100644
--- a/ports/esp32/boards/UM_FEATHERS3/board.json
+++ b/ports/esp32/boards/UM_FEATHERS3/board.json
@@ -4,17 +4,17 @@
     ],
     "docs": "",
     "features": [
+        "BLE",
         "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
-        "WiFi",
-        "BLE",
-        "STEMMA QT/QWIIC",
-        "Feather"
-    ],
-    "features_non_filterable": [
+        "WiFi"
     ],
+    "features_non_filterable": [],
     "id": "feathers3",
     "images": [
         "unexpectedmaker_feathers3.jpg"
diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json
index 0122e4b99167..3e83a813f4b2 100644
--- a/ports/esp32/boards/UM_PROS3/board.json
+++ b/ports/esp32/boards/UM_PROS3/board.json
@@ -4,17 +4,17 @@
     ],
     "docs": "",
     "features": [
+        "BLE",
         "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
-        "WiFi",
-        "BLE",
-        "STEMMA QT/QWIIC",
-        "Feather"
-    ],
-    "features_non_filterable": [
+        "WiFi"
     ],
+    "features_non_filterable": [],
     "id": "pros3",
     "images": [
         "unexpectedmaker_pros3.jpg"
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 9f1783a9f1e4..f6ba9ddb0edb 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -4,10 +4,11 @@
     ],
     "docs": "",
     "features": [
-        "Battery Charging",
         "BLE",
+        "Battery Charging",
+        "External Flash",
+        "External RAM",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index e7068170cbcb..b6c94ba9e89d 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -5,9 +5,10 @@
     "docs": "",
     "features": [
         "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json
index 73482a6284f6..3b7bb1334539 100644
--- a/ports/esp32/boards/UM_TINYS3/board.json
+++ b/ports/esp32/boards/UM_TINYS3/board.json
@@ -4,12 +4,13 @@
     ],
     "docs": "",
     "features": [
+        "BLE",
         "Battery Charging",
+        "External Flash",
+        "External RAM",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
-        "WiFi",
-        "BLE"
+        "WiFi"
     ],
     "features_non_filterable": [
         "TinyPICO Compatible"
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/GENERIC/board.json
index 46c2659d8a7e..ebdd95493b6d 100644
--- a/ports/esp8266/boards/GENERIC/board.json
+++ b/ports/esp8266/boards/GENERIC/board.json
@@ -4,6 +4,7 @@
     ],
     "docs": "",
     "features": [
+        "External Flash",
         "WiFi"
     ],
     "id": "esp8266",
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
index 2ef4bd99fa57..5446f291284b 100644
--- a/ports/esp8266/boards/GENERIC_1M/board.json
+++ b/ports/esp8266/boards/GENERIC_1M/board.json
@@ -4,6 +4,7 @@
     ],
     "docs": "",
     "features": [
+        "External Flash",
         "WiFi"
     ],
     "id": "esp8266-1m",
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
index 10050592cf40..1feac4a05cba 100644
--- a/ports/esp8266/boards/GENERIC_512K/board.json
+++ b/ports/esp8266/boards/GENERIC_512K/board.json
@@ -4,6 +4,7 @@
     ],
     "docs": "",
     "features": [
+        "External Flash",
         "WiFi"
     ],
     "id": "esp8266-512k",
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
index c96e9b08fe21..9f260b3a00f9 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
@@ -4,16 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "USB-C",
-        "SPI",
-        "I2C",
-        "UART",
+        "BLE",
+        "External Flash",
+        "JST-SH",
         "RGB LED",
-        "QSPI Flash",
-        "QWIIC",
-        "JLink",
-        "WiFi",
-        "BLE"
+        "USB-C",
+        "WiFi"
     ],
     "images": [
         "Metro_M7.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
index 4bf9ce052457..3fc3403c069a 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
@@ -4,12 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "MicroUSB",
+        "Audio Codec",
+        "External Flash",
         "Microphone",
-        "AudioCodec",
-        "SPDIF",
-        "OpenSDA",
-        "JLink"
+        "USB"
     ],
     "images": [
         "i.MXRT1010-TOP.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/board.json b/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
index 78044c134e53..d0bdd920bc52 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
@@ -4,13 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "MicroSD",
-        "MicroUSB",
+        "Audio Codec",
+        "External Flash",
         "Microphone",
-        "AudioCodec",
-        "CAN",
-        "OpenSDA",
-        "JLink"
+        "USB"
     ],
     "images": [
         "MIMXRT1015-EVK-TOP.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
index cc74c25fed43..4da224fc99c6 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
@@ -4,15 +4,14 @@
     ],
     "docs": "",
     "features": [
+        "Audio Codec",
+        "CAN",
         "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
+        "External Flash",
+        "External RAM",
         "Microphone",
-        "AudioCodec",
-        "CAN",
-        "OpenSDA",
-        "JLink"
+        "USB",
+        "microSD"
     ],
     "images": [
         "MIMXRT-1020-EVKBD.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
index d99ad9fcfdc0..d7c82358cc41 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
@@ -4,16 +4,14 @@
     ],
     "docs": "",
     "features": [
+        "Audio Codec",
+        "CAN",
         "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
+        "External Flash",
+        "External RAM",
         "Microphone",
-        "AudioCodec",
-        "SPDIF",
-        "CAN",
-        "OpenSDA",
-        "JLink"
+        "USB",
+        "microSD"
     ],
     "images": [
         "IMX_RT1050-EVKB_TOP-LR.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
index 67a3818ee27d..73c0cd1395c3 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
@@ -4,17 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
-        "Microphone",
-        "AudioCodec",
-        "SPDIF",
+        "Audio Codec",
         "CAN",
         "Camera",
-        "OpenSDA",
-        "JLink"
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "Microphone",
+        "USB",
+        "microSD"
     ],
     "images": [
         "X-MIMXRT1060-EVK-BOARD-BOTTOM.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
index ef12336c445d..a573009d381b 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
@@ -4,17 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
-        "Microphone",
-        "AudioAmp",
-        "SPDIF",
+        "Audio Codec",
         "CAN",
         "Camera",
-        "OpenSDA",
-        "JLink"
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "Microphone",
+        "USB",
+        "microSD"
     ],
     "images": [
         "MIMXRT1064EVK-TOP.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/board.json b/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
index 01e554751b46..73453b45a665 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
@@ -4,18 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
-        "Microphone",
-        "AudioCodec",
-        "SPDIF",
+        "Audio Codec",
         "CAN",
         "Camera",
-        "SIM Socket",
-        "OpenSDA",
-        "JLink"
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "Microphone",
+        "USB",
+        "microSD"
     ],
     "images": [
         "IMX-RT1170-EVK-TOP.jpg"
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/board.json b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
index 177872565863..882b931f8b7d 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/board.json
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
@@ -4,11 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "MicroUSB",
-        "MicroSD",
-        "AudioCodec",
-        "SPDIF",
-        "JLink"
+        "External Flash",
+        "USB",
+        "microSD"
     ],
     "images": [
         "OLIMEX_RT1010Py.jpg"
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json b/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
index 3142f1a81431..138d28418cb8 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
@@ -4,10 +4,11 @@
     ],
     "docs": "",
     "features": [
-        "MicroSD",
-        "MicroUSB",
-        "SDRAM",
-        "RGB LED"
+        "External Flash",
+        "External RAM",
+        "RGB LED",
+        "USB",
+        "microSD"
     ],
     "images": [
         "main1.jpg"
@@ -16,5 +17,5 @@
     "product": "Arch Mix",
     "thumbnail": "",
     "url": "https://wiki.seeedstudio.com/Arch_Mix/",
-    "vendor": "Seeed Technology Co.,Ltd."
+    "vendor": "Seeed Studio"
 }
diff --git a/ports/mimxrt/boards/TEENSY40/board.json b/ports/mimxrt/boards/TEENSY40/board.json
index daa6dbf99e04..599fb2f7296a 100644
--- a/ports/mimxrt/boards/TEENSY40/board.json
+++ b/ports/mimxrt/boards/TEENSY40/board.json
@@ -4,7 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly"
+        "External Flash",
+        "USB"
     ],
     "images": [
         "teensy40_front.jpg"
diff --git a/ports/mimxrt/boards/TEENSY41/board.json b/ports/mimxrt/boards/TEENSY41/board.json
index 1f8fe37a9996..08235d4dae61 100644
--- a/ports/mimxrt/boards/TEENSY41/board.json
+++ b/ports/mimxrt/boards/TEENSY41/board.json
@@ -4,9 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "MicroSD",
         "Ethernet",
-        "Breadboard Friendly"
+        "External Flash",
+        "USB",
+        "microSD"
     ],
     "images": [
         "teensy41_4.jpg"
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json b/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
index 65a8e2435059..9079fbd666d7 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
@@ -4,15 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "Bluetooth 5.0",
-        "IMU LSM9DS1",
-        "Humidity sensor HTS221",
-        "Pressure sensor LPS22H",
-        "Proximity, Light, RGB sensor APDS-9960",
-        "Microphone MPM3610",
-        "Crypto IC ARM CC310",
-        "USB-MICRO",
-        "Breadboard Friendly"
+        "BLE",
+        "Environment Sensor",
+        "IMU",
+        "Microphone",
+        "Secure Element",
+        "USB"
     ],
     "images": [
         "ABX00031_01.iso_998x749.jpg"
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/arduino_primo/board.json
index d16ce1c3460f..f7afed0ced57 100644
--- a/ports/nrf/boards/arduino_primo/board.json
+++ b/ports/nrf/boards/arduino_primo/board.json
@@ -11,5 +11,5 @@
     "product": "arduino_primo",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "Arduino"
 }
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
index 853c3757105c..99d0caad235d 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
@@ -11,5 +11,5 @@
     "product": "nrf52840-mdk-usb-dongle",
     "thumbnail": "",
     "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle",
-    "vendor": ""
+    "vendor": "Makerdiary"
 }
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.json b/ports/nrf/boards/seeed_xiao_nrf52/board.json
index 619a7c23b9e8..d40355bb2e2d 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/board.json
+++ b/ports/nrf/boards/seeed_xiao_nrf52/board.json
@@ -4,14 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "Bluetooth 5.0",
-        "IMU LSM6DS3TR",
-        "Microphone MSM261D3526H1CPM",
-        "USB-C",
-        "Breadboard Friendly",
-        "Battery Management",
+        "BLE",
+        "Battery Charging",
+        "External Flash",
+        "IMU",
+        "Microphone",
         "RGB LED",
-        "QSPI Flash"
+        "USB-C"
     ],
     "images": [
         "XIAO_nrf52840_front.jpg"
diff --git a/ports/renesas-ra/boards/EK_RA4M1/board.json b/ports/renesas-ra/boards/EK_RA4M1/board.json
index bab3bcacee29..d21fe0c12122 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4M1/board.json
@@ -3,17 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA4M1",
     "images": [
         "ek_ra4m1_board.jpg"
     ],
-    "mcu": "RA4M1",
+    "mcu": "ra4m1",
     "product": "EK-RA4M1",
     "thumbnail": "",
     "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4m1-evaluation-kit-ra4m1-mcu-group",
diff --git a/ports/renesas-ra/boards/EK_RA4W1/board.json b/ports/renesas-ra/boards/EK_RA4W1/board.json
index db06b6751db9..878d97a8acdb 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4W1/board.json
@@ -3,17 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA4W1",
     "images": [
         "ek_ra4w1_board.jpg"
     ],
-    "mcu": "RA4W1",
+    "mcu": "ra4w1",
     "product": "EK-RA4W1",
     "thumbnail": "",
     "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4w1-evaluation-kit-ra4w1-mcu-group",
diff --git a/ports/renesas-ra/boards/EK_RA6M1/board.json b/ports/renesas-ra/boards/EK_RA6M1/board.json
index babcc5c166aa..d678fa387e08 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M1/board.json
@@ -3,17 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA6M1",
     "images": [
         "ek_ra6m1_board.jpg"
     ],
-    "mcu": "RA6M1",
+    "mcu": "ra6m1",
     "product": "EK-RA6M1",
     "thumbnail": "",
     "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra6m1-evaluation-kit-ra6m1-mcu-group",
diff --git a/ports/renesas-ra/boards/EK_RA6M2/board.json b/ports/renesas-ra/boards/EK_RA6M2/board.json
index 63547d880733..3d6b95aacb8a 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M2/board.json
@@ -3,12 +3,7 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA6M2",
     "images": [
         "ek_ra6m2_board.jpg",
@@ -17,7 +12,7 @@
         "ek_ra6m2_j3_pins.jpg",
         "ek_ra6m2_j4_pins.jpg"
     ],
-    "mcu": "RA6M2",
+    "mcu": "ra6m2",
     "product": "EK-RA6M2",
     "thumbnail": "",
     "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra6m2-evaluation-kit-ra6m2-mcu-group",
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
index 1c3c4c8e91e2..8cb64f660103 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
@@ -3,18 +3,13 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "RA4M1-CLICKER",
     "images": [
         "ra4m1_clicker_board.jpg",
         "ra4m1_clicker_pins.jpg"
     ],
-    "mcu": "RA4M1",
+    "mcu": "ra4m1",
     "product": "Mikroe RA4M1 Clicker",
     "thumbnail": "",
     "url": "https://www.mikroe.com/ra4m1-clicker",
diff --git a/ports/renesas-ra/boards/VK_RA6M5/board.json b/ports/renesas-ra/boards/VK_RA6M5/board.json
index ae11d5221347..b2ff6b0e401e 100644
--- a/ports/renesas-ra/boards/VK_RA6M5/board.json
+++ b/ports/renesas-ra/boards/VK_RA6M5/board.json
@@ -4,18 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "UART",
-        "SPI",
-        "I2C",
-        "ADC",
-        "DAC",
-        "PWM"
+        "DAC"
     ],
     "id": "VK-RA6M5",
     "images": [
         "VK-RA6M5.jpg"
     ],
-    "mcu": "RA6M5",
+    "mcu": "ra6m5",
     "product": "VK-RA6M5",
     "thumbnail": "",
     "url": "https://vekatech.com/VK-RA6M5_docs/brochures/VK-RA6M5%20Flyer%20R2.pdf",
diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
index a7db469389c1..be63f4430be5 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
@@ -5,11 +5,11 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "Dual-core",
+        "External Flash",
         "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
index 7ca0db06985e..ea9070e13cc5 100644
--- a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
+        "Dual-core",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "4888-05.jpg"
diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
index d63166616ff0..d5e4394f4ea3 100644
--- a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
@@ -4,11 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "RGB LED",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
index 5bd03e1e0b7e..5639aaa2a4b7 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
@@ -4,15 +4,14 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
-        "WiFi Nina-W102",
-        "Bluetooth Nina-W102",
-        "IMU LSM6DSOXTR",
-        "Crypto IC ATECC608A-MAHDA-T",
-        "Microphone MP34DT05",
-        "SPI Flash 16MB",
-        "USB-MICRO"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "IMU",
+        "Microphone",
+        "Secure Element",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00052_01.iso_999x750.jpg"
diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
index 1b9e113143c3..df9dd5d0de8e 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
@@ -4,12 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "USB Stick form factor",
-        "Breadboard Friendly",
-        "Reset/User button",
-        "Red/green/orange/blue leds",
-        "1MB SPI Flash",
-        "USB-A"
+        "Dual-core",
+        "External Flash",
+        "RGB LED",
+        "USB"
     ],
     "images": [
         "pybstick-rp2040-26-broches-micropython-c.jpg"
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
index 2aff0580d879..08aa7068ef16 100644
--- a/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
+        "Dual-core",
+        "External Flash",
         "RGB LED",
-        "USB-C",
-        "SPI Flash"
+        "USB-C"
     ],
     "images": [
         "nullbits_bit_c_pro.jpg"
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json
index 9abf505e5435..8c0a12ae76c4 100644
--- a/ports/rp2/boards/PICO/board.json
+++ b/ports/rp2/boards/PICO/board.json
@@ -4,9 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard friendly",
-        "Castellated Pads",
-        "Micro USB"
+        "Dual-core",
+        "External Flash",
+        "USB"
     ],
     "id": "rp2-pico",
     "images": [
diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/PICO_W/board.json
index a85d7e044664..7ee7ef505e4d 100644
--- a/ports/rp2/boards/PICO_W/board.json
+++ b/ports/rp2/boards/PICO_W/board.json
@@ -4,11 +4,11 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard friendly",
-        "Castellated Pads",
-        "Micro USB",
-        "WiFi",
-        "Bluetooth"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "USB",
+        "WiFi"
     ],
     "id": "rp2-pico-w",
     "images": [
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
index 9121154d81ca..c44ea555142c 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
@@ -5,10 +5,9 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
-        "Castellated Pads",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
index 69d8532397a3..cb06c746b62b 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
@@ -5,10 +5,9 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
-        "Castellated Pads",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/board.json b/ports/rp2/boards/PIMORONI_TINY2040/board.json
index 753a25beaed3..207647f6b28f 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/board.json
+++ b/ports/rp2/boards/PIMORONI_TINY2040/board.json
@@ -4,8 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
+        "External Flash",
         "RGB LED",
         "USB-C"
     ],
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
index a0d39165affb..46878a29cd88 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "RGB LED",
-        "STEMMA QT/QWIIC",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
index 871a411b5b95..3eeb39726557 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
@@ -5,13 +5,13 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "Dual-core",
+        "External Flash",
         "Feather",
-        "MicroSD",
+        "JST-SH",
         "RGB LED",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
-        "USB-C"
+        "USB-C",
+        "microSD"
     ],
     "images": [
         "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/board.json b/ports/rp2/boards/W5100S_EVB_PICO/board.json
index 4091b78433e4..daaf1cf8ac8a 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5100S_EVB_PICO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
         "Ethernet",
-        "Micro USB"
+        "External Flash",
+        "USB"
     ],
     "images": [
         "W5100S-EVB-Pico.jpg"
diff --git a/ports/rp2/boards/W5500_EVB_PICO/board.json b/ports/rp2/boards/W5500_EVB_PICO/board.json
index 90b3186cd6b1..93598255599b 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5500_EVB_PICO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
         "Ethernet",
-        "Micro USB"
+        "External Flash",
+        "USB"
     ],
     "images": [
         "W5500-EVB-Pico.jpg"
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
index bac5263627ba..3a3f2f741f8a 100644
--- a/ports/rp2/boards/WEACTSTUDIO/board.json
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -4,8 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "SPI Flash",
+        "Dual-core",
+        "External Flash",
         "USB-C"
     ],
     "images": [
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
index b0cb02cd4f03..22a9ffccba49 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
@@ -5,11 +5,10 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "External Flash",
         "Feather",
-        "Micro USB",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "feather_m0_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
index c8042aa25473..06cd9a4fe4d9 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
@@ -5,11 +5,10 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "External Flash",
         "Feather",
-        "Micro USB",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "feather_m4_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
index f99d19ca87f8..0e423b2b8eeb 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
@@ -4,10 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "itsybitsy_m0_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
index 83db285b4d31..a998529ccde2 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
@@ -4,10 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "itsybitsy_m4_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
index e0a256cf8817..f830ff223f90 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
@@ -4,14 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "Micro USB",
-        "ADC",
+        "BLE",
         "DAC",
+        "External Flash",
         "RGB LED",
-        "QSPI Flash",
-        "WiFi",
-        "BLE",
-        "JLink"
+        "USB",
+        "WiFi"
     ],
     "images": [
         "metro_m4_express_airlift.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
index 9112bc06efe2..d77282db01aa 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
@@ -4,9 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
-        "RGB LED"
+        "RGB LED",
+        "USB"
     ],
     "images": [
         "trinket_m0.jpg"
diff --git a/ports/samd/boards/MINISAM_M4/board.json b/ports/samd/boards/MINISAM_M4/board.json
index 126e0364009f..6489dae863b0 100644
--- a/ports/samd/boards/MINISAM_M4/board.json
+++ b/ports/samd/boards/MINISAM_M4/board.json
@@ -4,9 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Micro USB",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "mini_sam_m4.jpg"
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
index 4d22c42bad58..c59ebc1b7b7b 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "Micro USB",
-        "SPI Flash"
+        "External Flash",
+        "USB"
+    ],
+    "images": [
+        "2033-atsamd21-xpro.jpg"
     ],
-    "images": ["2033-atsamd21-xpro.jpg"],
     "mcu": "samd21",
     "product": "SAMD21 Xplained Pro",
     "thumbnail": "",
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/board.json b/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
index 350ada4c4a82..5300b03808a5 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
@@ -4,14 +4,17 @@
     ],
     "docs": "",
     "features": [
-        "USB-C",
-        "Display",
-        "Grove",
-        "WiFi",
         "BLE",
-        "SDCard"
+        "Display",
+        "External Flash",
+        "JST-PH",
+        "SDCard",
+        "USB-C",
+        "WiFi"
+    ],
+    "images": [
+        "wio-terminal.jpg"
     ],
-    "images": ["wio-terminal.jpg"],
     "mcu": "samd51",
     "product": "Wio Terminal D51R",
     "thumbnail": "",
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/board.json b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
index 4e6217e19e4a..4d19f6b94529 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
@@ -6,7 +6,9 @@
     "features": [
         "USB-C"
     ],
-    "images": ["seeeduino-xiao.jpg"],
+    "images": [
+        "seeeduino-xiao.jpg"
+    ],
     "mcu": "samd21",
     "product": "Seeeduino XIAO (SAMD21)",
     "thumbnail": "",
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
index af643f5c5f3c..ee9ca9d3689b 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -5,10 +5,9 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
-        "Micro USB",
-        "QWIIC",
-        "SPI Flash"
+        "External Flash",
+        "JST-SH",
+        "USB"
     ],
     "images": [
         "sparkfun_samd51_thing_plus.jpg"
diff --git a/ports/stm32/boards/ARDUINO_GIGA/board.json b/ports/stm32/boards/ARDUINO_GIGA/board.json
index f0595d4ad533..53c636c77441 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/board.json
+++ b/ports/stm32/boards/ARDUINO_GIGA/board.json
@@ -4,11 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "8MB SDRAM",
-        "16MB Flash",
-        "Dual-core processor",
-        "USB Full speed",
-        "CYW43 WiFi/BT Module"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00063_01.front_1000x750.jpg"
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json b/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
index 801bc320b555..a4c81d69d427 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
@@ -4,11 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "16MB Flash",
-        "Dual-core processor",
-        "USB High Speed Phy",
-        "CYW43 WiFi/BT Module",
-        "NXP SE050 crypto device"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "Secure Element",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00051_01.iso_1000x750.jpg"
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
index 6467e43bb973..f39d7d4c4792 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
@@ -4,14 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "8MB SDRAM",
-        "16MB Flash",
-        "Dual-core processor",
-        "USB High Speed Phy",
-        "10/100 Ethernet Phy",
-        "CYW43 WiFi/BT Module",
-        "DisplayPort over USB-C",
-        "2x80 pin HD connectors"
+        "BLE",
+        "Dual-core",
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00042_01.iso_1000x750.jpg"
diff --git a/ports/stm32/boards/CERB40/board.json b/ports/stm32/boards/CERB40/board.json
index f80b3f5cab24..e3bd4296badf 100644
--- a/ports/stm32/boards/CERB40/board.json
+++ b/ports/stm32/boards/CERB40/board.json
@@ -8,8 +8,8 @@
         "cerb40.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "CERB40",
+    "product": "Cerb40",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "Fez"
 }
diff --git a/ports/stm32/boards/HYDRABUS/board.json b/ports/stm32/boards/HYDRABUS/board.json
index 32561e652590..20a2ac5eaef7 100644
--- a/ports/stm32/boards/HYDRABUS/board.json
+++ b/ports/stm32/boards/HYDRABUS/board.json
@@ -8,8 +8,8 @@
         "hydrabus.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "HYDRABUS",
+    "product": "HydraBus v1.0",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "HydraBus"
 }
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board.json b/ports/stm32/boards/LEGO_HUB_NO6/board.json
index c11b9f181834..3c602abba137 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board.json
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board.json
@@ -9,5 +9,5 @@
     "product": "Hub No.6",
     "thumbnail": "",
     "url": "",
-    "vendor": "Lego"
+    "vendor": "LEGO"
 }
diff --git a/ports/stm32/boards/LIMIFROG/board.json b/ports/stm32/boards/LIMIFROG/board.json
index 3137350074be..f516963a5bac 100644
--- a/ports/stm32/boards/LIMIFROG/board.json
+++ b/ports/stm32/boards/LIMIFROG/board.json
@@ -8,8 +8,8 @@
         "limifrog.jpg"
     ],
     "mcu": "stm32l4",
-    "product": "LIMIFROG",
+    "product": "LimiFrog",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "LimiFrog"
 }
diff --git a/ports/stm32/boards/MIKROE_QUAIL/board.json b/ports/stm32/boards/MIKROE_QUAIL/board.json
index ccd9b4fdc064..15d8b5fc134b 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/board.json
+++ b/ports/stm32/boards/MIKROE_QUAIL/board.json
@@ -8,7 +8,7 @@
     ],
     "id": "MIKROE-QUAIL",
     "images": [
-            "quail_top.jpg"
+        "quail_top.jpg"
     ],
     "mcu": "stm32f4",
     "product": "MikroE Quail",
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/board.json b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
index 044bc2736b1a..603032ee9883 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/board.json
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
@@ -8,8 +8,8 @@
         "netduino_plus_2.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "NETDUINO_PLUS_2",
+    "product": "Netduino Plus 2",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "Netduino"
 }
diff --git a/ports/stm32/boards/PYBD_SF6/board.json b/ports/stm32/boards/PYBD_SF6/board.json
index 3e689d69bee5..3a39763d5b33 100644
--- a/ports/stm32/boards/PYBD_SF6/board.json
+++ b/ports/stm32/boards/PYBD_SF6/board.json
@@ -4,8 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "BLE"
+        "BLE",
+        "WiFi"
     ],
     "id": "PYBD-SF6",
     "images": [
diff --git a/ports/stm32/boards/STM32F439/board.json b/ports/stm32/boards/STM32F439/board.json
index 140c3474caa6..068a9022d7d9 100644
--- a/ports/stm32/boards/STM32F439/board.json
+++ b/ports/stm32/boards/STM32F439/board.json
@@ -11,5 +11,5 @@
     "product": "STM32F439",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/USBDONGLE_WB55/board.json b/ports/stm32/boards/USBDONGLE_WB55/board.json
index 858e94d10516..6d61f0c280fa 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/board.json
+++ b/ports/stm32/boards/USBDONGLE_WB55/board.json
@@ -11,5 +11,5 @@
     "product": "USBDONGLE_WB55",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "ST Microelectronics"
 }