diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d0b16e626d..f9c5236fe0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -178,7 +178,11 @@ jobs:
         - "TG-Watch"
         - "adafruit_feather_rp2040"
         - "adafruit_itsybitsy_rp2040"
+        - "adafruit_neokey_trinkey_m0"
+        - "adafruit_proxsense_trinkey_m0"
         - "adafruit_qtpy_rp2040"
+        - "adafruit_rotary_trinkey_m0"
+        - "adafruit_tslide_trinkey_m0"
         - "aloriumtech_evo_m51"
         - "aramcon_badge_2019"
         - "arduino_mkr1300"
@@ -266,7 +270,6 @@ jobs:
         - "monster_m4sk"
         - "ndgarage_ndbit6"
         - "ndgarage_ndbit6_v2"
-        - "neokey_trinkey_m0"
         - "neopixel_trinkey_m0"
         - "nfc_copy_cat"
         - "nice_nano"
@@ -306,7 +309,6 @@ jobs:
         - "raspberry_pi_pico"
         - "raytac_mdbt50q-db-40"
         - "robohatmm1_m4"
-        - "rotary_trinkey_m0"
         - "sam32"
         - "same54_xplained"
         - "seeeduino_wio_terminal"
@@ -316,7 +318,6 @@ jobs:
         - "shirtty"
         - "silicognition-m4-shim"
         - "simmel"
-        - "slide_trinkey_m0"
         - "snekboard"
         - "sparkfun_lumidrive"
         - "sparkfun_nrf52840_micromod"
diff --git a/.gitmodules b/.gitmodules
index 139abdd1b1..da5b5835a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -181,3 +181,6 @@
 	path = data/nvm.toml
 	url = https://github.com/adafruit/nvm.toml.git
 	branch = main
+[submodule "frozen/Adafruit_CircuitPython_MIDI"]
+	path = frozen/Adafruit_CircuitPython_MIDI
+	url = https://github.com/adafruit/Adafruit_CircuitPython_MIDI
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
new file mode 160000
index 0000000000..669ab7b752
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_MIDI
@@ -0,0 +1 @@
+Subproject commit 669ab7b752d6c863577312560faf505656e5e603
diff --git a/ports/atmel-samd/boards/neokey_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c
similarity index 100%
rename from ports/atmel-samd/boards/neokey_trinkey_m0/board.c
rename to ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c
diff --git a/ports/atmel-samd/boards/neokey_trinkey_m0/mpconfigboard.h b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.h
similarity index 100%
rename from ports/atmel-samd/boards/neokey_trinkey_m0/mpconfigboard.h
rename to ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.h
diff --git a/ports/atmel-samd/boards/neokey_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
similarity index 97%
rename from ports/atmel-samd/boards/neokey_trinkey_m0/mpconfigboard.mk
rename to ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
index e145dfdd68..d71388ec44 100644
--- a/ports/atmel-samd/boards/neokey_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x80FF
+USB_PID = 0x8100
 USB_PRODUCT = "NeoKey Trinkey M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/neokey_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c
similarity index 100%
rename from ports/atmel-samd/boards/neokey_trinkey_m0/pins.c
rename to ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c
diff --git a/ports/atmel-samd/boards/rotary_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/board.c
similarity index 100%
rename from ports/atmel-samd/boards/rotary_trinkey_m0/board.c
rename to ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/board.c
diff --git a/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/mpconfigboard.h b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/mpconfigboard.h
new file mode 100644
index 0000000000..20ccffab57
--- /dev/null
+++ b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/mpconfigboard.h
@@ -0,0 +1,58 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit ProxSense Trinkey M0"
+#define MICROPY_HW_MCU_NAME "samd21e18"
+
+#define MICROPY_HW_NEOPIXEL (&pin_PA15)
+
+#define MICROPY_PORT_A        (0)
+#define MICROPY_PORT_B        (0)
+#define MICROPY_PORT_C        (0)
+
+#define IGNORE_PIN_PA01     1
+#define IGNORE_PIN_PA02     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA05     1
+#define IGNORE_PIN_PA06     1
+#define IGNORE_PIN_PA08     1
+#define IGNORE_PIN_PA09     1
+#define IGNORE_PIN_PA10     1
+#define IGNORE_PIN_PA11     1
+#define IGNORE_PIN_PA12     1
+#define IGNORE_PIN_PA13     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA18     1
+#define IGNORE_PIN_PA19     1
+#define IGNORE_PIN_PA20     1
+#define IGNORE_PIN_PA21     1
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1
+#define IGNORE_PIN_PA27     1
+#define IGNORE_PIN_PA28     1
+#define IGNORE_PIN_PA29     1
+#define IGNORE_PIN_PA30     1
+#define IGNORE_PIN_PA31     1
+#define IGNORE_PIN_PB00     1
+#define IGNORE_PIN_PB01     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PB04     1
+#define IGNORE_PIN_PB05     1
+#define IGNORE_PIN_PB06     1
+#define IGNORE_PIN_PB07     1
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PB10     1
+#define IGNORE_PIN_PB11     1
+#define IGNORE_PIN_PB12     1
+#define IGNORE_PIN_PB13     1
+#define IGNORE_PIN_PB14     1
+#define IGNORE_PIN_PB15     1
+#define IGNORE_PIN_PB16     1
+#define IGNORE_PIN_PB17     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PB30     1
+#define IGNORE_PIN_PB31     1
+
+#define DEFAULT_I2C_BUS_SCL (&pin_PA17)
+#define DEFAULT_I2C_BUS_SDA (&pin_PA16)
diff --git a/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/mpconfigboard.mk
new file mode 100644
index 0000000000..8705d7c369
--- /dev/null
+++ b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/mpconfigboard.mk
@@ -0,0 +1,34 @@
+USB_VID = 0x239A
+USB_PID = 0x8104
+USB_PRODUCT = "ProxSense Trinkey M0"
+USB_MANUFACTURER = "Adafruit Industries LLC"
+
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = NONE
+
+CIRCUITPY_ANALOGIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_RTC = 0
+CIRCUITPY_SAMD = 0
+CIRCUITPY_PS2IO = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_BUSIO = 1
+CIRCUITPY_STORAGE = 0
+
+CIRCUITPY_MATH = 1
+CIRCUITPY_PIXELBUF = 1
+CIRCUITPY_USB_MIDI = 1
+CIRCUITPY_TOUCHIO = 1
+CIRCUITPY_FULL_BUILD = 0
+
+SUPEROPT_GC = 0
+SUPEROPT_VM = 0
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
diff --git a/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/pins.c
new file mode 100644
index 0000000000..21410f8ad1
--- /dev/null
+++ b/ports/atmel-samd/boards/adafruit_proxsense_trinkey_m0/pins.c
@@ -0,0 +1,15 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_INTERRUPT), MP_ROM_PTR(&pin_PA00) },
+
+    { MP_ROM_QSTR(MP_QSTR_TOUCH2), MP_ROM_PTR(&pin_PA03) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_PA07) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA16) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA17) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/boards/slide_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/board.c
similarity index 100%
rename from ports/atmel-samd/boards/slide_trinkey_m0/board.c
rename to ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/board.c
diff --git a/ports/atmel-samd/boards/rotary_trinkey_m0/mpconfigboard.h b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.h
similarity index 100%
rename from ports/atmel-samd/boards/rotary_trinkey_m0/mpconfigboard.h
rename to ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.h
diff --git a/ports/atmel-samd/boards/rotary_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
similarity index 100%
rename from ports/atmel-samd/boards/rotary_trinkey_m0/mpconfigboard.mk
rename to ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
diff --git a/ports/atmel-samd/boards/rotary_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c
similarity index 100%
rename from ports/atmel-samd/boards/rotary_trinkey_m0/pins.c
rename to ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c
diff --git a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c
new file mode 100644
index 0000000000..cde441b3d9
--- /dev/null
+++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft 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 "supervisor/board.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "supervisor/shared/board.h"
+#include "hal/include/hal_gpio.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
diff --git a/ports/atmel-samd/boards/slide_trinkey_m0/mpconfigboard.h b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.h
similarity index 96%
rename from ports/atmel-samd/boards/slide_trinkey_m0/mpconfigboard.h
rename to ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.h
index 27e9d4b58f..1d9a4122df 100644
--- a/ports/atmel-samd/boards/slide_trinkey_m0/mpconfigboard.h
+++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit NeoKey Trinkey M0"
+#define MICROPY_HW_BOARD_NAME "Adafruit Slide Trinkey M0"
 #define MICROPY_HW_MCU_NAME "samd21e18"
 
 #define MICROPY_HW_NEOPIXEL (&pin_PA06)
diff --git a/ports/atmel-samd/boards/slide_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
similarity index 97%
rename from ports/atmel-samd/boards/slide_trinkey_m0/mpconfigboard.mk
rename to ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
index fe1e4d9ea1..0a403c1671 100644
--- a/ports/atmel-samd/boards/slide_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8101
+USB_PID = 0x8102
 USB_PRODUCT = "Slide Trinkey M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/slide_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c
similarity index 100%
rename from ports/atmel-samd/boards/slide_trinkey_m0/pins.c
rename to ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c