diff --git a/boards/um_bling.json b/boards/um_bling.json
new file mode 100644
index 000000000..aeeabadfe
--- /dev/null
+++ b/boards/um_bling.json
@@ -0,0 +1,51 @@
+{
+  "build": {
+    "arduino":{
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_BLING",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+	  "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0X303A",
+        "0x817F"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "um_bling"
+  },
+  "connectivity": [
+    "bluetooth",
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker BLING!",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://unexpectedmaker.com/shop/bling",
+  "vendor": "Unexpected Maker"
+}
diff --git a/boards/um_feathers3.json b/boards/um_feathers3.json
index 1a851fab5..9c39ea916 100644
--- a/boards/um_feathers3.json
+++ b/boards/um_feathers3.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s3_out.ld",
       "partitions": "default_16MB.csv",
       "memory_type": "qio_qspi"
     },
@@ -10,6 +9,7 @@
       "-DARDUINO_FEATHERS3",
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
+	  "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
diff --git a/boards/um_feathers3_neo.json b/boards/um_feathers3_neo.json
new file mode 100644
index 000000000..0849ee390
--- /dev/null
+++ b/boards/um_feathers3_neo.json
@@ -0,0 +1,51 @@
+{
+  "build": {
+    "arduino":{
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_FEATHERS3NEO",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+	  "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0X303A",
+        "0x81FB"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "um_feathers3neo"
+  },
+  "connectivity": [
+    "bluetooth",
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker FeatherS3 Neo",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://unexpectedmaker.com/shop/feathers3neo",
+  "vendor": "Unexpected Maker"
+}
diff --git a/boards/um_nanos3.json b/boards/um_nanos3.json
index 921a36e3f..742c0ac7d 100644
--- a/boards/um_nanos3.json
+++ b/boards/um_nanos3.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "esp32s3_out.ld",
       "partitions": "default_8MB.csv",
       "memory_type": "qio_qspi"
     },
@@ -10,6 +9,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_NANOS3",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
+	  "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
diff --git a/boards/um_omgs3.json b/boards/um_omgs3.json
new file mode 100644
index 000000000..55994d4a1
--- /dev/null
+++ b/boards/um_omgs3.json
@@ -0,0 +1,51 @@
+{
+  "build": {
+    "arduino":{
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_OMGS3",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+	  "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0X303A",
+        "0x8224"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "um_omgs3"
+  },
+  "connectivity": [
+    "bluetooth",
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker OMGS3",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://unexpectedmaker.com/shop/omgs3",
+  "vendor": "Unexpected Maker"
+}
diff --git a/boards/um_pros3.json b/boards/um_pros3.json
index 8edcefac3..484c0247b 100644
--- a/boards/um_pros3.json
+++ b/boards/um_pros3.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "esp32s3_out.ld",
       "partitions": "default_16MB.csv",
       "memory_type": "qio_qspi"
     },
@@ -10,6 +9,7 @@
       "-DARDUINO_PROS3",
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
+	  "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
diff --git a/boards/um_tinyc6.json b/boards/um_tinyc6.json
new file mode 100644
index 000000000..f34eee9cd
--- /dev/null
+++ b/boards/um_tinyc6.json
@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino":{
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_TINYC6"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32c6",
+    "variant": "um_tinyc6"
+  },
+  "connectivity": [
+    "bluetooth",
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32c6.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker TinyC6",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://unexpectedmaker.com/shop/tinyc6",
+  "vendor": "Unexpected Maker"
+}
diff --git a/boards/um_tinys2.json b/boards/um_tinys2.json
index 8a57216ac..7ca5ca4b4 100644
--- a/boards/um_tinys2.json
+++ b/boards/um_tinys2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "esp32s2_out.ld"
+	"partitions": "default_4MB.csv",
+      "memory_type": "qio_qspi"
     },
     "core": "esp32",
     "extra_flags": [
diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json
index ed7b2a028..cac1514fe 100644
--- a/boards/um_tinys3.json
+++ b/boards/um_tinys3.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s3_out.ld",
       "partitions": "default_8MB.csv",
       "memory_type": "qio_qspi"
     },
@@ -10,6 +9,7 @@
       "-DARDUINO_TINYS3",
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
@@ -46,6 +46,6 @@
     "require_upload_port": true,
     "speed": 460800
   },
-  "url": "https://unexpectedmaker.com/shop/ttinys3-esp32s3",
+  "url": "https://unexpectedmaker.com/shop/tinys3",
   "vendor": "Unexpected Maker"
 }