diff --git a/boards/tinypico.json b/boards/tinypico.json
index 754a987..9f3deea 100644
--- a/boards/tinypico.json
+++ b/boards/tinypico.json
@@ -4,12 +4,17 @@
       "ldscript": "esp32_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DARDUINO_TINYPICO -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
+    "extra_flags": [
+      "-DARDUINO_TINYPICO",
+      "-DBOARD_HAS_PSRAM",
+      "-mfix-esp32-psram-cache-issue",
+      "-mfix-esp32-psram-cache-strategy=memw"
+    ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
-    "flash_mode": "qio",
+    "flash_mode": "dio",
     "mcu": "esp32",
-    "variant": "pico32"
+    "variant": "um_tinypico"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/um_feathers2.json b/boards/um_feathers2.json
new file mode 100644
index 0000000..7434f19
--- /dev/null
+++ b/boards/um_feathers2.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_FEATHERS2",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [
+      [
+        "0x239A",
+        "0x80AB"
+      ]
+    ],
+    "mcu": "esp32s2",
+    "variant": "um_feathers2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker FeatherS2",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://feathers2.io",
+  "vendor": "Unexpected Maker"
+}
diff --git a/boards/um_feathers2_neo.json b/boards/um_feathers2_neo.json
new file mode 100644
index 0000000..7277d45
--- /dev/null
+++ b/boards/um_feathers2_neo.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_FEATHERS2NEO",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x80B4"
+      ]
+    ],
+    "mcu": "esp32s2",
+    "variant": "um_feathers2neo"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker FeatherS2 Neo",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://unexpectedmaker.com/feathers2-neo",
+  "vendor": "Unexpected Maker"
+}
diff --git a/boards/um_tinys2.json b/boards/um_tinys2.json
new file mode 100644
index 0000000..8a57216
--- /dev/null
+++ b/boards/um_tinys2.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_TINYS2",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x8001"
+      ]
+    ],
+    "mcu": "esp32s2",
+    "variant": "um_tinys2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Unexpected Maker TinyS2",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://tinys2.io",
+  "vendor": "Unexpected Maker"
+}