diff --git a/.github/actions/deps/ports/nordic/action.yml b/.github/actions/deps/ports/nordic/action.yml
index 5f08b17ca7a68..96754be9507c5 100644
--- a/.github/actions/deps/ports/nordic/action.yml
+++ b/.github/actions/deps/ports/nordic/action.yml
@@ -5,7 +5,7 @@ runs:
   steps:
     - name: Get nrfutil 7+
       run: |
-        wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
+        wget https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-unknown-linux-gnu/nrfutil
         chmod +x nrfutil
         ./nrfutil install nrf5sdk-tools
         mkdir -p $HOME/.local/bin
diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests
index aa034280ebfed..020121e90c630 160000
--- a/frozen/Adafruit_CircuitPython_FakeRequests
+++ b/frozen/Adafruit_CircuitPython_FakeRequests
@@ -1 +1 @@
-Subproject commit aa034280ebfed80c245827ff1d49a098ace64b03
+Subproject commit 020121e90c6306147f91b8079b75f3d14ff86138
diff --git a/frozen/Adafruit_CircuitPython_HTTPServer b/frozen/Adafruit_CircuitPython_HTTPServer
index b70106b17bbfa..c43147a016ffd 160000
--- a/frozen/Adafruit_CircuitPython_HTTPServer
+++ b/frozen/Adafruit_CircuitPython_HTTPServer
@@ -1 +1 @@
-Subproject commit b70106b17bbfa0070f8573e1e06e384d9d4577de
+Subproject commit c43147a016ffd13c57a0923730bc6a83afefb4ad
diff --git a/frozen/Adafruit_CircuitPython_LED_Animation b/frozen/Adafruit_CircuitPython_LED_Animation
index 5d13d0966a775..8af05705962e8 160000
--- a/frozen/Adafruit_CircuitPython_LED_Animation
+++ b/frozen/Adafruit_CircuitPython_LED_Animation
@@ -1 +1 @@
-Subproject commit 5d13d0966a775369eca5b137cfef9583dfa8bb42
+Subproject commit 8af05705962e8bb7d2f8003e6a70916a9a51b863
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
index 3dce5bca3bcd2..c87f120723e9f 160000
--- a/frozen/Adafruit_CircuitPython_PortalBase
+++ b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit 3dce5bca3bcd27354becc6d3ecf82244f1e26ffe
+Subproject commit c87f120723e9fa742e3da25eaf33f3be1ae33715
diff --git a/frozen/Adafruit_CircuitPython_SSD1680 b/frozen/Adafruit_CircuitPython_SSD1680
index b7d511711c8f5..d6aa01c4f8fa1 160000
--- a/frozen/Adafruit_CircuitPython_SSD1680
+++ b/frozen/Adafruit_CircuitPython_SSD1680
@@ -1 +1 @@
-Subproject commit b7d511711c8f5557082d9c4307a89ecdec608727
+Subproject commit d6aa01c4f8fa1004430bfcdd4db2219183425693
diff --git a/frozen/Adafruit_CircuitPython_UC8151D b/frozen/Adafruit_CircuitPython_UC8151D
index 776b932ebf769..4ebf9c2854376 160000
--- a/frozen/Adafruit_CircuitPython_UC8151D
+++ b/frozen/Adafruit_CircuitPython_UC8151D
@@ -1 +1 @@
-Subproject commit 776b932ebf76937e464ab2656834e7a1c1e3434b
+Subproject commit 4ebf9c2854376a06766a6ae4732a4537a766fb75
diff --git a/lib/tinyusb b/lib/tinyusb
index 542e5b4550a01..5fb3c09963bca 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 542e5b4550a01d034b78308d77c408ed89427513
+Subproject commit 5fb3c09963bca362e535788e289d4b3518da5973
diff --git a/locale/es.po b/locale/es.po
index fa7377b5b53d5..85a03408b7517 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2025-07-17 04:01+0000\n"
-"Last-Translator: Jean Serrano <yeanse@aol.com>\n"
+"PO-Revision-Date: 2025-08-03 08:01+0000\n"
+"Last-Translator: MAE <martin-aehle@hotmail.de>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -1803,10 +1803,9 @@ msgid "PWM slice channel A already in use"
 msgstr "Segmento del PWM canal A ya esta en uso"
 
 #: shared-bindings/spitarget/SPITarget.c
-#, fuzzy
 msgid "Packet buffers for an SPI transfer must have the same length."
 msgstr ""
-"Búferes de paquetes para transferencia SPI deben de ser de igual longitud"
+"Búferes de paquetes para transferencia SPI deben de ser de igual longitud."
 
 #: shared-module/jpegio/JpegDecoder.c
 msgid "Parameter error"
diff --git a/locale/fr.po b/locale/fr.po
index 3a53a97e8fa09..f871c669f93ed 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2025-06-30 16:01+0000\n"
+"PO-Revision-Date: 2025-08-03 08:01+0000\n"
 "Last-Translator: MAE <martin-aehle@hotmail.de>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -49,7 +49,7 @@ msgid ""
 "Press reset to exit safe mode.\n"
 msgstr ""
 "\n"
-"Pour quitter le mode sans échec, appuyez sur reset.\n"
+"Appuyer sur reset pour sortir du mode sans échec.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -57,7 +57,7 @@ msgid ""
 "You are in safe mode because:\n"
 msgstr ""
 "\n"
-"Le mode sans échec est actif , car:\n"
+"Le mode sans échec est actif pour cette raison:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -1879,15 +1879,15 @@ msgstr "Plus tout autres modules présents sur le système de fichiers\n"
 
 #: shared-module/vectorio/Polygon.c
 msgid "Polygon needs at least 3 points"
-msgstr "Polygon a besoin d'au moins 3 points"
+msgstr "Un polygone a besoin d'au moins 3 points"
 
 #: supervisor/shared/safe_mode.c
 msgid "Power dipped. Make sure you are providing enough power."
-msgstr "Chute de puissance.Apportez plus d'énergie."
+msgstr "Chute de puissance. Assurez-vous de fournir assez de puissance."
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Prefix buffer must be on the heap"
-msgstr "Le tampon de préfixe doit être sur la pile"
+msgstr "Le tampon de préfixe doit être sur le tas"
 
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
@@ -1919,11 +1919,12 @@ msgstr "Programme trop long"
 
 #: shared-bindings/rclcpy/Publisher.c
 msgid "Publishers can only be created from a parent node"
-msgstr "Les Publishers ne peuvent etre crées que du noeud parent"
+msgstr "Les Publishers ne peuvent être créés qu'à partir du nœud parent"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
-msgstr "Le tirage 'pull' n'est pas utilisé quand la direction est 'output'."
+msgstr ""
+"L'attribut \"pull\" n'est pas utilisé quand la direction est \"output\"."
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "RISE_AND_FALL not available on this chip"
@@ -2024,7 +2025,7 @@ msgstr "Format correct mais non supporté"
 
 #: main.c
 msgid "Running in safe mode! Not running saved code.\n"
-msgstr "Mode sans- échec ! Le code sauvegardé n'est pas éxecuté.\n"
+msgstr "Mode sans échec ! Le code sauvegardé n'est pas éxecuté.\n"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "SD card CSD format not supported"
@@ -3971,7 +3972,7 @@ msgstr "seules les tranches avec 'step=1' (cad None) sont supportées"
 
 #: py/vm.c
 msgid "opcode"
-msgstr "opcode"
+msgstr ""
 
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c
 #: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
diff --git a/locale/pl.po b/locale/pl.po
index 9b20c513e7a09..2e55f983e0027 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2025-07-23 09:07+0000\n"
-"Last-Translator: MuskoM <muskomatt@outlook.com>\n"
+"PO-Revision-Date: 2025-08-06 18:01+0000\n"
+"Last-Translator: MAE <martin-aehle@hotmail.de>\n"
 "Language-Team: pl\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -90,8 +90,8 @@ msgstr "%%c wymaga int lub char"
 msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
-"%d pinów adresowalnych, %d pinów rgb oraz %d  płytek wskazują na wysokość "
-"%d, nie %d"
+"%d pinów adresowalnych, %d pinów rgb oraz %d płytek wskazują na wysokość %d, "
+"nie %d"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -204,7 +204,7 @@ msgstr ""
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr ""
+msgstr "%q musi być >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
diff --git a/ports/analog/Makefile b/ports/analog/Makefile
index 08b245c5897e3..ce9082c5e255a 100644
--- a/ports/analog/Makefile
+++ b/ports/analog/Makefile
@@ -2,6 +2,7 @@
 #
 # SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
 # SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+# SPDX-FileCopyrightText: Copyright (c) 2025 Peggy Zhu, Analog Devices, Inc.
 #
 # SPDX-License-Identifier: MIT
 
@@ -83,7 +84,8 @@ INC += \
 	-I$(PERIPH_SRC)/ICC \
 	-I$(PERIPH_SRC)/TMR \
 	-I$(PERIPH_SRC)/RTC \
-	-I$(PERIPH_SRC)/UART
+	-I$(PERIPH_SRC)/UART \
+	-I$(PERIPH_SRC)/TRNG
 
 INC += -I$(CMSIS_ROOT)/Device/Maxim/$(MCU_VARIANT_UPPER)/Source/GCC
 
@@ -116,7 +118,9 @@ SRC_MAX32 += \
 	$(PERIPH_SRC)/TMR/tmr_$(DIE_TYPE).c \
 	$(PERIPH_SRC)/UART/uart_common.c \
 	$(PERIPH_SRC)/UART/uart_$(DIE_TYPE).c \
-	$(PERIPH_SRC)/UART/uart_revb.c
+	$(PERIPH_SRC)/UART/uart_revb.c \
+	$(PERIPH_SRC)/TRNG/trng_revb.c \
+	$(PERIPH_SRC)/TRNG/trng_$(DIE_TYPE).c
 
 SRC_C += $(SRC_MAX32) \
 			boards/$(BOARD)/board.c \
diff --git a/ports/analog/common-hal/os/__init__.c b/ports/analog/common-hal/os/__init__.c
index 7b607cf6b3c4b..508b40798e22b 100644
--- a/ports/analog/common-hal/os/__init__.c
+++ b/ports/analog/common-hal/os/__init__.c
@@ -2,6 +2,7 @@
 //
 // SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
 // SPDX-FileCopyrightText: Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2025 Peggy Zhu, Analog Devices, Inc.
 //
 // SPDX-License-Identifier: MIT
 
@@ -15,9 +16,14 @@
 
 // #include "peripherals/periph.h"
 
+// true random number generator, TRNG
+#include "trng.h"
+
 bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
     #if (HAS_TRNG)
-    // todo (low prior): implement
+    // get a random number of "length" number of bytes
+    MXC_TRNG_Random(buffer, length);
+    return true;
     #else
     #endif
     return false;
diff --git a/ports/analog/mpconfigport.mk b/ports/analog/mpconfigport.mk
index 1729a284a3f47..67f1f79fb8121 100644
--- a/ports/analog/mpconfigport.mk
+++ b/ports/analog/mpconfigport.mk
@@ -2,6 +2,7 @@
 #
 # SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
 # SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+# SPDX-FileCopyrightText: Copyright (c) 2025 Peggy Zhu, Analog Devices, Inc.
 #
 # SPDX-License-Identifier: MIT
 
@@ -51,7 +52,7 @@ CIRCUITPY_BITBANGIO ?= 1
 # Requires Microcontroller
 CIRCUITPY_TOUCHIO ?= 1
 # Requires OS
-CIRCUITPY_RANDOM ?= 0
+CIRCUITPY_RANDOM ?= 1
 # Requires busio.UART
 CIRCUITPY_CONSOLE_UART ?= 0
 # Does nothing without I2C
diff --git a/ports/analog/supervisor/port.c b/ports/analog/supervisor/port.c
index ad003c12ed9e0..ff05ff2d28709 100644
--- a/ports/analog/supervisor/port.c
+++ b/ports/analog/supervisor/port.c
@@ -44,6 +44,9 @@
 #include "mxc_delay.h"
 #include "rtc.h"
 
+// true random number generator, TRNG
+#include "trng.h"
+
 // msec to RTC subsec ticks (4 kHz)
 /* Converts a time in milleseconds to equivalent RSSA register value */
 #define MSEC_TO_SS_ALARM(x) (0 - ((x * 4096) / 1000))
@@ -112,9 +115,18 @@ safe_mode_t port_init(void) {
     }
     ;
 
+    // enable TRNG (true random number generator)
+    #ifdef CIRCUITPY_RANDOM
+    MXC_TRNG_Init();
+    #endif
+
     return SAFE_MODE_NONE;
 }
 
+void TRNG_IRQHandler(void) {
+    MXC_TRNG_Handler();
+}
+
 void RTC_IRQHandler(void) {
     // Read flags to clear
     int flags = MXC_RTC_GetFlags();
diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
index 004181148415a..783e2cb565783 100644
--- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
@@ -10,4 +10,5 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
index 4958581056e68..f780ea4aa3d0f 100644
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_VECTORIO = 0
 
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk
index 3dbef7c576a13..76c60b4464639 100644
--- a/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk
@@ -16,6 +16,7 @@ CIRCUITPY_EPAPERDISPLAY = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_I2CDISPLAYBUS = 0
 CIRCUITPY_I2CTARGET = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_SHARPDISPLAY = 0
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
index 27bf8c165da88..be22cb94fae92 100644
--- a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
@@ -10,11 +10,13 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY__EVE = 1
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_GIFIO = 0
 CIRCUITPY_JPEGIO = 0
-CIRCUITPY_TILEPALETTEMAPPER = 0
+CIRCUITPY_MSGPACK = 0
+CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_VECTORIO = 0
 
 CIRCUITPY_BITBANG_APA102 = 1
 
diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
index d758d6878fb7f..d4801359cf8c5 100644
--- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@@ -11,4 +11,5 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_CODEOP = 0
+CIRCUITPY_ERRNO = 0
 CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
index 69cd5b0e2863e..cb7e690c6c02d 100644
--- a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
@@ -11,9 +11,13 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 0
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_VECTORIO = 0
+
 
 # We don't have room for the fonts for terminalio for certain languages,
 # so turn off terminalio, and if it's off and displayio is on,
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
index 55a307ed4e308..d5aef01a0374f 100644
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_VECTORIO = 0
 
diff --git a/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk b/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk
index 73c56fb5fbab3..8fae53c0101f9 100644
--- a/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk
@@ -10,9 +10,13 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxM, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY__EVE = 1
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_VECTORIO = 0
 
 CIRCUITPY_BITBANG_APA102 = 1
 
diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
index 3ad2e162ecf3c..95027e817e8b8 100644
--- a/ports/atmel-samd/boards/openbook_m4/board.c
+++ b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -76,6 +76,7 @@ void board_init(void) {
         NO_COMMAND, // write_color_ram_command (can add this for grayscale eventually)
         false, // color_bits_inverted
         0x000000, // highlight_color
+        0x000000, // highlight_color2
         refresh_sequence, // refresh_display_sequence
         sizeof(refresh_sequence),
         40, // refresh_time
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
index dd8afd51f6e60..4ade6a148315d 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
@@ -9,6 +9,14 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY__EVE = 1
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_SHARPDISPLAY = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_VECTORIO = 0
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
index 64049e8d5981c..b34dfb3d2e624 100755
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@@ -11,4 +11,5 @@ EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_CODEOP = 0
+CIRCUITPY_ERRNO = 0
 CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h
index 42b51434edfd3..f2ec187abde63 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
 #define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
 
-#define DEFAULT_UART_BUS_RX (&pin_GPIO34)
-#define DEFAULT_UART_BUS_TX (&pin_GPIO35)
+#define DEFAULT_UART_BUS_RX (&pin_GPIO38)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO39)
 
 #define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
index 06a1bf706d345..a0be8c7a5ca0a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
@@ -13,3 +13,6 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
+# Already have a display.
+CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
index e69de29bb2d1d..e962866216039 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
@@ -0,0 +1,14 @@
+#
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
+# LWIP
+#
+# end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h
index c11780faf41ea..5053a1b2b589b 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
 #define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
 
-#define DEFAULT_UART_BUS_RX (&pin_GPIO34)
-#define DEFAULT_UART_BUS_TX (&pin_GPIO35)
+#define DEFAULT_UART_BUS_RX (&pin_GPIO38)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO39)
 
 #define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
index 6d4fcbf135e14..c4311474f6061 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -239,6 +239,7 @@ void board_init(void) {
             0x26,  // write_color_ram_command
             false,  // color_bits_inverted
             0x000000,  // highlight_color
+            0x000000,  // highlight_color2
             ssd1680_display_refresh_sequence, sizeof(ssd1680_display_refresh_sequence),
             1.0,  // refresh_time
             &pin_GPIO5,  // busy_pin
@@ -273,6 +274,7 @@ void board_init(void) {
             0x13,  // write_color_ram_command
             false,  // color_bits_inverted
             0x000000,  // highlight_color
+            0x000000,  // highlight_color2
             il0373_display_refresh_sequence, sizeof(il0373_display_refresh_sequence),
             1.0,  // refresh_time
             &pin_GPIO5,  // busy_pin
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
index 515b6da5c07c4..9ca2eee157748 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -9,4 +9,6 @@ CIRCUITPY_ESP_FLASH_SIZE = 2MB
 
 CIRCUITPY_DUALBANK = 0
 
+CIRCUITPY_JPEGIO = 0
+
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
diff --git a/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c b/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c
index 88150dd401b97..b7f8bc50e714a 100644
--- a/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c
+++ b/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c
@@ -88,6 +88,7 @@ void board_init(void) {
         0x26, // write_color_ram_command
         false, // color_bits_inverted
         0x000000, // highlight_color
+        0x000000, // highlight_color2
         refresh_sequence, sizeof(refresh_sequence), // refresh_display_command
         1.0, // refresh_time
         &pin_GPIO48, // busy_pin
diff --git a/ports/espressif/boards/heltec_vision_master_e290/board.c b/ports/espressif/boards/heltec_vision_master_e290/board.c
index e392f65a76432..5911506ae2c3c 100644
--- a/ports/espressif/boards/heltec_vision_master_e290/board.c
+++ b/ports/espressif/boards/heltec_vision_master_e290/board.c
@@ -86,6 +86,7 @@ void board_init(void) {
         0x26, // write_color_ram_command
         false, // color_bits_inverted
         0xFF0000, // highlight_color
+        0x000000, // highlight_color2
         refresh_sequence, sizeof(refresh_sequence), // refresh_display_command
         1.0, // refresh_time
         &pin_GPIO6, // busy_pin
diff --git a/ports/espressif/boards/heltec_wireless_paper/board.c b/ports/espressif/boards/heltec_wireless_paper/board.c
index 28fb6ae41b9a1..89e7a054b50c2 100644
--- a/ports/espressif/boards/heltec_wireless_paper/board.c
+++ b/ports/espressif/boards/heltec_wireless_paper/board.c
@@ -126,6 +126,7 @@ void board_init(void) {
         0x10, // write_color_ram_command
         false, // color_bits_inverted
         0x000000, // highlight_color
+        0x000000, // highlight_color2
         refresh_sequence, sizeof(refresh_sequence), // refresh_display_command
         1.0, // refresh_time
         &pin_GPIO7, // busy_pin
diff --git a/ports/espressif/boards/sqfmi_watchy/board.c b/ports/espressif/boards/sqfmi_watchy/board.c
index 393b8b759028a..535a3e11006fe 100644
--- a/ports/espressif/boards/sqfmi_watchy/board.c
+++ b/ports/espressif/boards/sqfmi_watchy/board.c
@@ -182,6 +182,7 @@ void board_init(void) {
         0x26,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
+        0x000000,  // highlight_color2
         refresh_sequence, sizeof(refresh_sequence),
         (double)1.0,  // refresh_time
         &pin_GPIO19,  // busy_pin
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index 45f676fa5993f..8e3e46785f2e7 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -108,7 +108,17 @@ mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void) {
 
     #ifdef SOC_PM_SUPPORT_EXT0_WAKEUP
     if (cause == ESP_SLEEP_WAKEUP_EXT0) {
-        pin_number = REG_GET_FIELD(RTC_IO_EXT_WAKEUP0_REG, RTC_IO_EXT_WAKEUP0_SEL);
+        int rtc_io_pin_number = REG_GET_FIELD(RTC_IO_EXT_WAKEUP0_REG, RTC_IO_EXT_WAKEUP0_SEL);
+        // Look up the GPIO equivalent pin for this RTC GPIO pin. On ESP32, the numbering
+        // is different for RTC_GPIO and regular GPIO, and there's no mapping table.
+        // The RTC and GPIO pin numbers match for all other current chips, so we could skip this
+        // for those chips, but it's not expensive, and maybe there will be another mismatch in the future.
+        for (gpio_num_t gpio_num = 0; gpio_num < SOC_GPIO_PIN_COUNT; gpio_num++) {
+            if (rtc_io_number_get(gpio_num) == rtc_io_pin_number) {
+                pin_number = gpio_num;
+                break;
+            }
+        }
     } else {
     #endif
     #ifdef SOC_PM_SUPPORT_EXT1_WAKEUP
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index f05df8c07c87a..42bf3418f9639 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -61,7 +61,7 @@ CIRCUITPY_ALARM_TOUCH ?= 0
 CIRCUITPY_ANALOGBUFIO ?= 1
 CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
-CIRCUITPY_AUDIOIO ?= 0
+CIRCUITPY_AUDIOIO ?= 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BLEIO_NATIVE ?= 1
 CIRCUITPY_CANIO ?= 1
@@ -89,11 +89,11 @@ CIRCUITPY_WATCHDOG ?= 1
 CIRCUITPY_WIFI ?= 1
 CIRCUITPY_SOCKETPOOL_IPV6 ?= 1
 
-# Conditionally turn off modules/features
+# Conditionally turn off modules/features per chip type
+#### esp32 ############################################################
 ifeq ($(IDF_TARGET),esp32)
 # Modules
 CIRCUITPY_ALARM_TOUCH = 1
-CIRCUITPY_AUDIOIO ?= 1
 CIRCUITPY_RGBMATRIX = 0
 
 # SDMMC not supported yet
@@ -102,6 +102,7 @@ CIRCUITPY_SDIOIO = 0
 # Has no USB
 CIRCUITPY_USB_DEVICE = 0
 
+#### esp32c2 ##########################################################
 else ifeq ($(IDF_TARGET),esp32c2)
 
 # C2 ROM spits out the UART at 74880 when connected to a 26mhz crystal!
@@ -128,6 +129,9 @@ CIRCUITPY_ANALOGBUFIO = 0
 # No I2S
 CIRCUITPY_AUDIOBUSIO = 0
 
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
 # No RMT
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PULSEIO = 0
@@ -142,6 +146,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
 
+#### esp32c3 ##########################################################
 else ifeq ($(IDF_TARGET),esp32c3)
 # Modules
 CIRCUITPY_ESPCAMERA = 0
@@ -151,6 +156,9 @@ CIRCUITPY_MEMORYMAP = 0
 # No I80 support from the IDF
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
 # No PCNT peripheral
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_COUNTIO = 0
@@ -165,6 +173,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
 
+#### esp32c6 ##########################################################
 else ifeq ($(IDF_TARGET),esp32c6)
 # Modules
 CIRCUITPY_ESPCAMERA = 0
@@ -172,6 +181,9 @@ CIRCUITPY_ESPULP = 0
 CIRCUITPY_MEMORYMAP = 0
 CIRCUITPY_RGBMATRIX = 0
 
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
 # No space for this
 CIRCUITPY_AUDIOBUSIO = 0
 
@@ -187,6 +199,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
 
+#### esp32h2 ##########################################################
 else ifeq ($(IDF_TARGET),esp32h2)
 # Modules
 CIRCUITPY_ESPCAMERA = 0
@@ -194,6 +207,9 @@ CIRCUITPY_ESPULP = 0
 CIRCUITPY_MEMORYMAP = 0
 CIRCUITPY_RGBMATRIX = 0
 
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
 # No I80 support from the IDF
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 
@@ -210,8 +226,12 @@ CIRCUITPY_WIFI = 0
 
 CIRCUITPY_MAX3421E = 0
 
+#### esp32p4 ##########################################################
 else ifeq ($(IDF_TARGET),esp32p4)
 
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
 # No wifi
 # TODO: Support ESP32-C6 coprocessor on some boards.
 CIRCUITPY_BLEIO_NATIVE = 0
@@ -246,10 +266,12 @@ CIRCUITPY_PARALLELDISPLAYBUS = 0
 # Library doesn't support P4 yet it seems
 CIRCUITPY_ESPCAMERA = 0
 
+#### esp32s2 ##########################################################
 else ifeq ($(IDF_TARGET),esp32s2)
 # Modules
-CIRCUITPY_ALARM_TOUCH = 1
+CIRCUITPY_ALARM_TOUCH = $(CIRCUITPY_ALARM)
 CIRCUITPY_AUDIOIO ?= 1
+
 # No BLE in hw
 CIRCUITPY_BLEIO_NATIVE = 0
 
@@ -258,12 +280,19 @@ CIRCUITPY_SDIOIO = 0
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
 
+#### esp32s3 ##########################################################
 else ifeq ($(IDF_TARGET),esp32s3)
+
 # Modules
-CIRCUITPY_ALARM_TOUCH = 1
+CIRCUITPY_ALARM_TOUCH = $(CIRCUITPY_ALARM)
 CIRCUITPY_AUDIOBUSIO_PDMIN = 1
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
+
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
 endif
+#### end chip-specific choices ########################################
 
 # No room for large modules on 2MB boards
 # 2MB boards have a single firmware partition, and can't do dualbank.
diff --git a/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c b/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c
index 19e18bd544bee..b7e75a475fd09 100644
--- a/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c
+++ b/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c
@@ -273,6 +273,7 @@ void board_init(void) {
             SSD_WRITE_RAM_RED,                                                                              // write_color_ram_command
             false,                                                                                          // color_bits_inverted
             0xFF0000,                                                                                       // highlight_color (RED for tri-color display)
+            0x000000,                                                                                       // highlight_color2
             _refresh_sequence_ssd1681, sizeof(_refresh_sequence_ssd1681),                                   // refresh_display_command
             refresh_time,                                                                                   // refresh_time
             &pin_GPIO9, // DEFAULT_SPI_BUS_BUSY,                                                            // busy_pin
@@ -307,6 +308,7 @@ void board_init(void) {
             NO_COMMAND,                                                                                     // write_color_ram_command
             false,                                                                                          // color_bits_inverted
             0x000000,                                                                                       // highlight_color (RED for tri-color display)
+            0x000000,                                                                                       // highlight_color2
             _refresh_sequence_ssd1608, sizeof(_refresh_sequence_ssd1608),                                   // refresh_display_command
             refresh_time,                                                                                   // refresh_time
             &pin_GPIO9, // DEFAULT_SPI_BUS_BUSY,                                                            // busy_pin
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
index 5950d11da8a11..392a57cdc0c1b 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
@@ -295,6 +295,7 @@ void board_init(void) {
         DTM1,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
+        0x000000,  // highlight_color2
         refresh_sequence, sizeof(refresh_sequence),  // refresh_display_command
         1.0,  // refresh_time
         &pin_GPIO26,  // busy_pin
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/board.c b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
index 7dc11af01eca3..01c448cd7ad52 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
@@ -295,6 +295,7 @@ void board_init(void) {
         DTM1,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
+        0x000000,  // highlight_color2
         refresh_sequence, sizeof(refresh_sequence),  // refresh_display_command
         1.0,  // refresh_time
         &pin_GPIO26,  // busy_pin
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
index 7969143ec6621..c7901b8649d78 100644
--- a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
@@ -89,6 +89,7 @@ void board_init(void) {
         NO_COMMAND,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
+        0x000000,  // highlight_color2
         refresh_sequence, sizeof(refresh_sequence),
         28.0,  // refresh_time
         NULL,  // busy_pin
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c
index 7c71e03b4281d..764c85ecb6bcf 100644
--- a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c
@@ -148,6 +148,7 @@ void board_init(void) {
         NO_COMMAND,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
+        0x000000,  // highlight_color2
         refresh_sequence, sizeof(refresh_sequence),
         28.0,  // refresh_time
         NULL,  // busy_pin
diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
index 79ec315d497e4..2dc19558314cb 100644
--- a/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
+++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
@@ -54,15 +54,15 @@
 #define SYNC_V1_H1 (TMDS_CTRL_11 | (TMDS_CTRL_00 << 10) | (TMDS_CTRL_00 << 20))
 
 #define MODE_720_H_SYNC_POLARITY 0
-#define MODE_720_H_FRONT_PORCH   24
-#define MODE_720_H_SYNC_WIDTH    64
-#define MODE_720_H_BACK_PORCH    88
+#define MODE_720_H_FRONT_PORCH   8
+#define MODE_720_H_SYNC_WIDTH    32
+#define MODE_720_H_BACK_PORCH    40
 #define MODE_720_H_ACTIVE_PIXELS 720
 
 #define MODE_720_V_SYNC_POLARITY 0
 #define MODE_720_V_FRONT_PORCH   3
 #define MODE_720_V_SYNC_WIDTH    4
-#define MODE_720_V_BACK_PORCH    13
+#define MODE_720_V_BACK_PORCH    218
 #define MODE_720_V_ACTIVE_LINES  400
 
 #define MODE_640_H_SYNC_POLARITY 0
@@ -74,7 +74,7 @@
 #define MODE_640_V_SYNC_POLARITY 0
 #define MODE_640_V_FRONT_PORCH   10
 #define MODE_640_V_SYNC_WIDTH    2
-#define MODE_640_V_BACK_PORCH    33
+#define MODE_640_V_BACK_PORCH    133
 #define MODE_640_V_ACTIVE_LINES  480
 
 #define MODE_720_V_TOTAL_LINES  ( \
diff --git a/ports/raspberrypi/lib/Pico-PIO-USB b/ports/raspberrypi/lib/Pico-PIO-USB
index 032a469e79f6a..675543bcc9baa 160000
--- a/ports/raspberrypi/lib/Pico-PIO-USB
+++ b/ports/raspberrypi/lib/Pico-PIO-USB
@@ -1 +1 @@
-Subproject commit 032a469e79f6a4ba40760d7868e6db26e15002d7
+Subproject commit 675543bcc9baa8170f868ab7ba316d418dbcf41f
diff --git a/py/gc.c b/py/gc.c
index 338803dc245cc..2cf4dbb64a83b 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -311,8 +311,9 @@ void gc_add(void *start, void *end) {
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 // CIRCUITPY-CHANGE: Added function to compute heap size with selective collect table
 static size_t compute_heap_size(size_t total_blocks) {
-    // Add two blocks to account for allocation alignment.
-    total_blocks += 2;
+    // Round up to the nearest multiple of BLOCKS_PER_ATB. Partial ATB blocks aren't supported and
+    // will result in a heap that is too small.
+    total_blocks = ((total_blocks + BLOCKS_PER_ATB - 1) / BLOCKS_PER_ATB) * BLOCKS_PER_ATB;
     size_t atb_bytes = (total_blocks + BLOCKS_PER_ATB - 1) / BLOCKS_PER_ATB;
     size_t ftb_bytes = 0;
     size_t ctb_bytes = 0;
@@ -326,12 +327,13 @@ static size_t compute_heap_size(size_t total_blocks) {
 
     // Compute bytes needed to build a heap with total_blocks blocks.
     size_t total_heap =
-        atb_bytes
+        sizeof(mp_state_mem_area_t)
+        + atb_bytes
+        + ALLOC_TABLE_GAP_BYTE
         + ftb_bytes
         + ctb_bytes
         + pool_bytes
-        + ALLOC_TABLE_GAP_BYTE
-        + sizeof(mp_state_mem_area_t);
+        + BYTES_PER_BLOCK; // Extra block of bytes to account for end pointer alignment
 
     // Round up size to the nearest multiple of BYTES_PER_BLOCK.
     total_heap = (total_heap + BYTES_PER_BLOCK - 1) / BYTES_PER_BLOCK;
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index fc292d4ea2f68..128c214d447f8 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -114,6 +114,31 @@ MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj,
     (mp_obj_t)&audiomixer_mixervoice_get_level_obj,
     (mp_obj_t)&audiomixer_mixervoice_set_level_obj);
 
+//|     panning: synthio.BlockInput
+//|     """Defines the channel(s) in which the voice appears, as a floating point number between
+//|     -1 and 1. If your board does not support synthio, this property will only accept a float
+//|     value. This property is ignored if ``audiomixer.Mixer.channel_count=1``.
+//|
+//|     -1 is left channel only, 0 is both channels, and 1 is right channel. For fractional values,
+//|     the note plays at full amplitude in one channel and partial amplitude in the other channel.
+//|     For instance -.5 plays at full amplitude in the left channel and 1/2 amplitude in the right
+//|     channel."""
+static mp_obj_t audiomixer_mixervoice_obj_get_panning(mp_obj_t self_in) {
+    return common_hal_audiomixer_mixervoice_get_panning(self_in);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_panning_obj, audiomixer_mixervoice_obj_get_panning);
+
+static mp_obj_t audiomixer_mixervoice_obj_set_panning(mp_obj_t self_in, mp_obj_t panning_in) {
+    audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_audiomixer_mixervoice_set_panning(self, panning_in);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(audiomixer_mixervoice_set_panning_obj, audiomixer_mixervoice_obj_set_panning);
+
+MP_PROPERTY_GETSET(audiomixer_mixervoice_panning_obj,
+    (mp_obj_t)&audiomixer_mixervoice_get_panning_obj,
+    (mp_obj_t)&audiomixer_mixervoice_set_panning_obj);
+
 //|     loop: bool
 //|     """Get or set the loop status of the currently playing sample."""
 static mp_obj_t audiomixer_mixervoice_obj_get_loop(mp_obj_t self_in) {
@@ -158,6 +183,7 @@ static const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = {
     // Properties
     { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audiomixer_mixervoice_playing_obj) },
     { MP_ROM_QSTR(MP_QSTR_level), MP_ROM_PTR(&audiomixer_mixervoice_level_obj) },
+    { MP_ROM_QSTR(MP_QSTR_panning), MP_ROM_PTR(&audiomixer_mixervoice_panning_obj) },
     { MP_ROM_QSTR(MP_QSTR_loop), MP_ROM_PTR(&audiomixer_mixervoice_loop_obj) },
 };
 static MP_DEFINE_CONST_DICT(audiomixer_mixervoice_locals_dict, audiomixer_mixervoice_locals_dict_table);
diff --git a/shared-bindings/audiomixer/MixerVoice.h b/shared-bindings/audiomixer/MixerVoice.h
index fe350eb1a7592..d60820f7f5734 100644
--- a/shared-bindings/audiomixer/MixerVoice.h
+++ b/shared-bindings/audiomixer/MixerVoice.h
@@ -18,6 +18,8 @@ void common_hal_audiomixer_mixervoice_stop(audiomixer_mixervoice_obj_t *self);
 void common_hal_audiomixer_mixervoice_end(audiomixer_mixervoice_obj_t *self);
 mp_obj_t common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self);
 void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, mp_obj_t gain);
+mp_obj_t common_hal_audiomixer_mixervoice_get_panning(audiomixer_mixervoice_obj_t *self);
+void common_hal_audiomixer_mixervoice_set_panning(audiomixer_mixervoice_obj_t *self, mp_obj_t value);
 
 bool common_hal_audiomixer_mixervoice_get_playing(audiomixer_mixervoice_obj_t *self);
 
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 5f1d301b675be..4714c3ee0733a 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -368,14 +368,14 @@ static mp_obj_t busio_uart_obj_reset_input_buffer(mp_obj_t self_in) {
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_reset_input_buffer_obj, busio_uart_obj_reset_input_buffer);
-//| class Parity:
-//|     """Enum-like class to define the parity used to verify correct data transfer."""
+//|     class Parity:
+//|         """Enum-like class to define the parity used to verify correct data transfer."""
 //|
-//|     ODD: int
-//|     """Total number of ones should be odd."""
+//|         ODD: int
+//|         """Total number of ones should be odd."""
 //|
-//|     EVEN: int
-//|     """Total number of ones should be even."""
+//|         EVEN: int
+//|         """Total number of ones should be even."""
 //|
 //|
 const mp_obj_type_t busio_uart_parity_type;
diff --git a/shared-bindings/epaperdisplay/EPaperDisplay.c b/shared-bindings/epaperdisplay/EPaperDisplay.c
index 5d72df815d0a7..9f261d599ada9 100644
--- a/shared-bindings/epaperdisplay/EPaperDisplay.c
+++ b/shared-bindings/epaperdisplay/EPaperDisplay.c
@@ -54,6 +54,7 @@
 //|         write_color_ram_command: Optional[int] = None,
 //|         color_bits_inverted: bool = False,
 //|         highlight_color: int = 0x000000,
+//|         highlight_color2: int = 0x000000,
 //|         refresh_display_command: Union[int, circuitpython_typing.ReadableBuffer],
 //|         refresh_time: float = 40,
 //|         busy_pin: Optional[microcontroller.Pin] = None,
@@ -97,6 +98,7 @@
 //|         :param int write_color_ram_command: Command used to write pixels values into the update region
 //|         :param bool color_bits_inverted: True if 0 bits are used to show the color. Otherwise, 1 means to show color.
 //|         :param int highlight_color: RGB888 of source color to highlight with third ePaper color.
+//|         :param int highlight_color2: RGB888 of source color to highlight with fourth ePaper color.
 //|         :param int refresh_display_command: Command used to start a display refresh. Single int or byte-packed command sequence
 //|         :param float refresh_time: Time it takes to refresh the display before the stop_sequence should be sent. Ignored when busy_pin is provided.
 //|         :param microcontroller.Pin busy_pin: Pin used to signify the display is busy
@@ -117,7 +119,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
            ARG_ram_width, ARG_ram_height, ARG_colstart, ARG_rowstart, ARG_rotation,
            ARG_set_column_window_command, ARG_set_row_window_command, ARG_set_current_column_command,
            ARG_set_current_row_command, ARG_write_black_ram_command, ARG_black_bits_inverted,
-           ARG_write_color_ram_command, ARG_color_bits_inverted, ARG_highlight_color,
+           ARG_write_color_ram_command, ARG_color_bits_inverted, ARG_highlight_color, ARG_highlight_color2,
            ARG_refresh_display_command,  ARG_refresh_time, ARG_busy_pin, ARG_busy_state,
            ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper, ARG_spectra6,
            ARG_two_byte_sequence_length, ARG_start_up_time, ARG_address_little_endian };
@@ -141,6 +143,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
         { MP_QSTR_write_color_ram_command, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
         { MP_QSTR_color_bits_inverted, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_highlight_color, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0x000000} },
+        { MP_QSTR_highlight_color2, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0x000000} },
         { MP_QSTR_refresh_display_command, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_refresh_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(40)} },
         { MP_QSTR_busy_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
@@ -181,6 +184,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
 
     mp_int_t write_color_ram_command = NO_COMMAND;
     mp_int_t highlight_color = args[ARG_highlight_color].u_int;
+    mp_int_t highlight_color2 = args[ARG_highlight_color2].u_int;
     if (args[ARG_write_color_ram_command].u_obj != mp_const_none) {
         write_color_ram_command = mp_obj_get_int(args[ARG_write_color_ram_command].u_obj);
     }
@@ -216,7 +220,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
         args[ARG_set_column_window_command].u_int, args[ARG_set_row_window_command].u_int,
         args[ARG_set_current_column_command].u_int, args[ARG_set_current_row_command].u_int,
         args[ARG_write_black_ram_command].u_int, args[ARG_black_bits_inverted].u_bool, write_color_ram_command,
-        args[ARG_color_bits_inverted].u_bool, highlight_color, refresh_buf, refresh_buf_len, refresh_time,
+        args[ARG_color_bits_inverted].u_bool, highlight_color, highlight_color2, refresh_buf, refresh_buf_len, refresh_time,
         busy_pin, args[ARG_busy_state].u_bool, seconds_per_frame,
         args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool, args[ARG_spectra6].u_bool,
         two_byte_sequence_length, args[ARG_address_little_endian].u_bool
diff --git a/shared-bindings/epaperdisplay/EPaperDisplay.h b/shared-bindings/epaperdisplay/EPaperDisplay.h
index 016a07f1490c5..afa90a514e2a5 100644
--- a/shared-bindings/epaperdisplay/EPaperDisplay.h
+++ b/shared-bindings/epaperdisplay/EPaperDisplay.h
@@ -23,7 +23,7 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
     uint16_t set_column_window_command, uint16_t set_row_window_command,
     uint16_t set_current_column_command, uint16_t set_current_row_command,
     uint16_t write_black_ram_command, bool black_bits_inverted,
-    uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
+    uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, uint32_t highlight_color2,
     const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
     const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
     bool always_toggle_chip_select, bool grayscale, bool acep, bool spectra6, bool two_byte_sequence_length,
diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index 9add8f1745c83..db75a543c613d 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -115,6 +115,27 @@ static void check_for_deinit(synthio_miditrack_obj_t *self) {
 //|     """32 bit value that tells how quickly samples are played in Hertz (cycles per second)."""
 //|
 
+//|     tempo: int
+//|     """Tempo of the streamed events, in MIDI ticks per second."""
+//|
+static mp_obj_t synthio_miditrack_obj_get_tempo(mp_obj_t self_in) {
+    synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_int(common_hal_synthio_miditrack_get_tempo(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_get_tempo_obj, synthio_miditrack_obj_get_tempo);
+
+static mp_obj_t synthio_miditrack_obj_set_tempo(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_synthio_miditrack_set_tempo(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_miditrack_set_tempo_obj, synthio_miditrack_obj_set_tempo);
+MP_PROPERTY_GETSET(synthio_miditrack_tempo_obj,
+    (mp_obj_t)&synthio_miditrack_get_tempo_obj,
+    (mp_obj_t)&synthio_miditrack_set_tempo_obj);
+
 //|     error_location: Optional[int]
 //|     """Offset, in bytes within the midi data, of a decoding error"""
 //|
@@ -141,6 +162,7 @@ static const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = {
 
     // Properties
     { MP_ROM_QSTR(MP_QSTR_error_location), MP_ROM_PTR(&synthio_miditrack_error_location_obj) },
+    { MP_ROM_QSTR(MP_QSTR_tempo), MP_ROM_PTR(&synthio_miditrack_tempo_obj) },
     AUDIOSAMPLE_FIELDS,
 };
 static MP_DEFINE_CONST_DICT(synthio_miditrack_locals_dict, synthio_miditrack_locals_dict_table);
diff --git a/shared-bindings/synthio/MidiTrack.h b/shared-bindings/synthio/MidiTrack.h
index 72b217e9613b1..cb154d3996b1a 100644
--- a/shared-bindings/synthio/MidiTrack.h
+++ b/shared-bindings/synthio/MidiTrack.h
@@ -15,3 +15,6 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self, const
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self);
 mp_int_t common_hal_synthio_miditrack_get_error_location(synthio_miditrack_obj_t *self);
+
+mp_int_t common_hal_synthio_miditrack_get_tempo(synthio_miditrack_obj_t *self);
+void common_hal_synthio_miditrack_set_tempo(synthio_miditrack_obj_t *self, mp_int_t value);
diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index 7c9c354e4de10..a4a0e8680e531 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -98,7 +98,7 @@ static mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
     const uint16_t usage_page = usage_page_arg;
 
     const mp_int_t usage_arg = args[ARG_usage].u_int;
-    mp_arg_validate_int_range(usage_arg, 1, 0xFFFF, MP_QSTR_usage);
+    mp_arg_validate_int_range(usage_arg, 0, 0xFFFF, MP_QSTR_usage);
     const uint16_t usage = usage_arg;
 
     mp_obj_t report_ids = args[ARG_report_ids].u_obj;
diff --git a/shared-module/audiocore/__init__.c b/shared-module/audiocore/__init__.c
index bf80403137996..2ee683d75e1cd 100644
--- a/shared-module/audiocore/__init__.c
+++ b/shared-module/audiocore/__init__.c
@@ -196,12 +196,12 @@ void audiosample_convert_s16s_u8s(uint8_t *buffer_out, const int16_t *buffer_in,
     }
 }
 
-void audiosample_must_match(audiosample_base_t *self, mp_obj_t other_in) {
+void audiosample_must_match(audiosample_base_t *self, mp_obj_t other_in, bool allow_mono_to_stereo) {
     const audiosample_base_t *other = audiosample_check(other_in);
     if (other->sample_rate != self->sample_rate) {
         mp_raise_ValueError_varg(MP_ERROR_TEXT("The sample's %q does not match"), MP_QSTR_sample_rate);
     }
-    if (other->channel_count != self->channel_count) {
+    if ((!allow_mono_to_stereo || (allow_mono_to_stereo && self->channel_count != 2)) && other->channel_count != self->channel_count) {
         mp_raise_ValueError_varg(MP_ERROR_TEXT("The sample's %q does not match"), MP_QSTR_channel_count);
     }
     if (other->bits_per_sample != self->bits_per_sample) {
diff --git a/shared-module/audiocore/__init__.h b/shared-module/audiocore/__init__.h
index 875ac90ecc5c1..920fe752c3822 100644
--- a/shared-module/audiocore/__init__.h
+++ b/shared-module/audiocore/__init__.h
@@ -89,7 +89,7 @@ static inline void audiosample_get_buffer_structure_checked(mp_obj_t self_in, bo
     audiosample_get_buffer_structure(audiosample_check(self_in), single_channel_output, single_buffer, samples_signed, max_buffer_length, spacing);
 }
 
-void audiosample_must_match(audiosample_base_t *self, mp_obj_t other);
+void audiosample_must_match(audiosample_base_t *self, mp_obj_t other, bool allow_mono_to_stereo);
 
 void audiosample_convert_u8m_s16s(int16_t *buffer_out, const uint8_t *buffer_in, size_t nframes);
 void audiosample_convert_u8s_s16s(int16_t *buffer_out, const uint8_t *buffer_in, size_t nframes);
diff --git a/shared-module/audiodelays/Chorus.c b/shared-module/audiodelays/Chorus.c
index 1609cc5f94684..9262c6b4de195 100644
--- a/shared-module/audiodelays/Chorus.c
+++ b/shared-module/audiodelays/Chorus.c
@@ -166,7 +166,7 @@ bool common_hal_audiodelays_chorus_get_playing(audiodelays_chorus_obj_t *self) {
 }
 
 void common_hal_audiodelays_chorus_play(audiodelays_chorus_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiodelays/Echo.c b/shared-module/audiodelays/Echo.c
index 78764d9099a1c..0ca5fc8a7502e 100644
--- a/shared-module/audiodelays/Echo.c
+++ b/shared-module/audiodelays/Echo.c
@@ -204,7 +204,7 @@ bool common_hal_audiodelays_echo_get_playing(audiodelays_echo_obj_t *self) {
 }
 
 void common_hal_audiodelays_echo_play(audiodelays_echo_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiodelays/MultiTapDelay.c b/shared-module/audiodelays/MultiTapDelay.c
index 7b702ecf1154a..9c33a5eaee750 100644
--- a/shared-module/audiodelays/MultiTapDelay.c
+++ b/shared-module/audiodelays/MultiTapDelay.c
@@ -285,7 +285,7 @@ bool common_hal_audiodelays_multi_tap_delay_get_playing(audiodelays_multi_tap_de
 }
 
 void common_hal_audiodelays_multi_tap_delay_play(audiodelays_multi_tap_delay_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiodelays/PitchShift.c b/shared-module/audiodelays/PitchShift.c
index ac349da0dd50a..3b8c1a07c7b16 100644
--- a/shared-module/audiodelays/PitchShift.c
+++ b/shared-module/audiodelays/PitchShift.c
@@ -143,7 +143,7 @@ bool common_hal_audiodelays_pitch_shift_get_playing(audiodelays_pitch_shift_obj_
 }
 
 void common_hal_audiodelays_pitch_shift_play(audiodelays_pitch_shift_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofilters/Distortion.c b/shared-module/audiofilters/Distortion.c
index ec5fe084e56d3..c4b6b7566ad0d 100644
--- a/shared-module/audiofilters/Distortion.c
+++ b/shared-module/audiofilters/Distortion.c
@@ -141,7 +141,7 @@ bool common_hal_audiofilters_distortion_get_playing(audiofilters_distortion_obj_
 }
 
 void common_hal_audiofilters_distortion_play(audiofilters_distortion_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofilters/Filter.c b/shared-module/audiofilters/Filter.c
index 19b567532eb8e..4cedc810abad6 100644
--- a/shared-module/audiofilters/Filter.c
+++ b/shared-module/audiofilters/Filter.c
@@ -143,7 +143,7 @@ bool common_hal_audiofilters_filter_get_playing(audiofilters_filter_obj_t *self)
 }
 
 void common_hal_audiofilters_filter_play(audiofilters_filter_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofilters/Phaser.c b/shared-module/audiofilters/Phaser.c
index 81d9c0bea3083..01b938c3a0027 100644
--- a/shared-module/audiofilters/Phaser.c
+++ b/shared-module/audiofilters/Phaser.c
@@ -130,7 +130,7 @@ bool common_hal_audiofilters_phaser_get_playing(audiofilters_phaser_obj_t *self)
 }
 
 void common_hal_audiofilters_phaser_play(audiofilters_phaser_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofreeverb/Freeverb.c b/shared-module/audiofreeverb/Freeverb.c
index d910536013604..28779bdcc84b2 100644
--- a/shared-module/audiofreeverb/Freeverb.c
+++ b/shared-module/audiofreeverb/Freeverb.c
@@ -195,7 +195,7 @@ bool common_hal_audiofreeverb_freeverb_get_playing(audiofreeverb_freeverb_obj_t
 }
 
 void common_hal_audiofreeverb_freeverb_play(audiofreeverb_freeverb_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
index 2c727a5c0cdde..b27eafb71a98c 100644
--- a/shared-module/audiomixer/Mixer.c
+++ b/shared-module/audiomixer/Mixer.c
@@ -92,22 +92,23 @@ static inline uint32_t add16signed(uint32_t a, uint32_t b) {
 }
 
 __attribute__((always_inline))
-static inline uint32_t mult16signed(uint32_t val, int32_t mul) {
+static inline uint32_t mult16signed(uint32_t val, int32_t mul[2]) {
     #if (defined(__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))
-    mul <<= 16;
+    mul[0] <<= 16;
+    mul[1] <<= 16;
     int32_t hi, lo;
     enum { bits = 16 }; // saturate to 16 bits
     enum { shift = 15 }; // shift is done automatically
-    asm volatile ("smulwb %0, %1, %2" : "=r" (lo) : "r" (mul), "r" (val));
-    asm volatile ("smulwt %0, %1, %2" : "=r" (hi) : "r" (mul), "r" (val));
+    asm volatile ("smulwb %0, %1, %2" : "=r" (lo) : "r" (mul[0]), "r" (val));
+    asm volatile ("smulwt %0, %1, %2" : "=r" (hi) : "r" (mul[1]), "r" (val));
     asm volatile ("ssat %0, %1, %2, asr %3" : "=r" (lo) : "I" (bits), "r" (lo), "I" (shift));
     asm volatile ("ssat %0, %1, %2, asr %3" : "=r" (hi) : "I" (bits), "r" (hi), "I" (shift));
     asm volatile ("pkhbt %0, %1, %2, lsl #16" : "=r" (val) : "r" (lo), "r" (hi)); // pack
     return val;
     #else
     uint32_t result = 0;
-    float mod_mul = (float)mul / (float)((1 << 15) - 1);
     for (int8_t i = 0; i < 2; i++) {
+        float mod_mul = (float)mul[i] / (float)((1 << 15) - 1);
         int16_t ai = (val >> (sizeof(uint16_t) * 8 * i));
         int32_t intermediate = (int32_t)(ai * mod_mul);
         if (intermediate > SHRT_MAX) {
@@ -154,9 +155,32 @@ static inline uint32_t pack8(uint32_t val) {
     return ((val & 0xff000000) >> 16) | ((val & 0xff00) >> 8);
 }
 
+static inline uint32_t copy16lsb(uint32_t val) {
+    val &= 0x0000ffff;
+    return val | (val << 16);
+}
+
+static inline uint32_t copy16msb(uint32_t val) {
+    val &= 0xffff0000;
+    return val | (val >> 16);
+}
+
+static inline uint32_t copy8lsb(uint32_t val) {
+    val &= 0x00ff;
+    return val | (val << 8);
+}
+
+static inline uint32_t copy8msb(uint32_t val) {
+    val &= 0xff00;
+    return val | (val >> 8);
+}
+
+#define ALMOST_ONE (MICROPY_FLOAT_CONST(32767.) / 32768)
+
 static void mix_down_one_voice(audiomixer_mixer_obj_t *self,
     audiomixer_mixervoice_obj_t *voice, bool voices_active,
     uint32_t *word_buffer, uint32_t length) {
+    audiosample_base_t *sample = MP_OBJ_TO_PTR(voice->sample);
     while (length != 0) {
         if (voice->buffer_length == 0) {
             if (!voice->more_data) {
@@ -179,75 +203,163 @@ static void mix_down_one_voice(audiomixer_mixer_obj_t *self,
         uint32_t *src = voice->remaining_buffer;
 
         #if CIRCUITPY_SYNTHIO
-        uint32_t n = MIN(MIN(voice->buffer_length, length), SYNTHIO_MAX_DUR * self->base.channel_count);
+        uint32_t n;
+        if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+            n = MIN(MIN(voice->buffer_length, length), SYNTHIO_MAX_DUR * self->base.channel_count);
+        } else {
+            n = MIN(MIN(voice->buffer_length << 1, length), SYNTHIO_MAX_DUR * self->base.channel_count);
+        }
 
         // Get the current level from the BlockInput. These may change at run time so you need to do bounds checking if required.
         shared_bindings_synthio_lfo_tick(self->base.sample_rate, n / self->base.channel_count);
         uint16_t level = (uint16_t)(synthio_block_slot_get_limited(&voice->level, MICROPY_FLOAT_CONST(0.0), MICROPY_FLOAT_CONST(1.0)) * (1 << 15));
+        int16_t panning = synthio_block_slot_get_scaled(&voice->panning, -ALMOST_ONE, ALMOST_ONE);
         #else
-        uint32_t n = MIN(voice->buffer_length, length);
+        uint32_t n;
+        if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+            n = MIN(voice->buffer_length, length);
+        } else {
+            n = MIN(voice->buffer_length << 1, length);
+        }
         uint16_t level = voice->level;
+        int16_t panning = voice->panning;
         #endif
 
+        uint16_t left_panning_scaled = 32768, right_panning_scaled = 32768;
+        if (MP_LIKELY(self->base.channel_count == 2)) {
+            if (panning >= 0) {
+                right_panning_scaled = 32767 - panning;
+            } else {
+                left_panning_scaled = 32767 + panning;
+            }
+        }
+
+        int32_t loudness[2] = { level, level };
+        if (MP_LIKELY(self->base.channel_count == 2)) {
+            loudness[0] = (left_panning_scaled * loudness[0]) >> 15;
+            loudness[1] = (right_panning_scaled * loudness[1]) >> 15;
+        }
+
         // First active voice gets copied over verbatim.
         if (!voices_active) {
             if (MP_LIKELY(self->base.bits_per_sample == 16)) {
                 if (MP_LIKELY(self->base.samples_signed)) {
-                    for (uint32_t i = 0; i < n; i++) {
-                        uint32_t v = src[i];
-                        word_buffer[i] = mult16signed(v, level);
+                    if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+                        for (uint32_t i = 0; i < n; i++) {
+                            uint32_t v = src[i];
+                            word_buffer[i] = mult16signed(v, loudness);
+                        }
+                    } else {
+                        for (uint32_t i = 0; i < n; i += 2) {
+                            uint32_t v = src[i >> 1];
+                            word_buffer[i] = mult16signed(copy16lsb(v), loudness);
+                            word_buffer[i + 1] = mult16signed(copy16msb(v), loudness);
+                        }
                     }
                 } else {
-                    for (uint32_t i = 0; i < n; i++) {
-                        uint32_t v = src[i];
-                        v = tosigned16(v);
-                        word_buffer[i] = mult16signed(v, level);
+                    if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+                        for (uint32_t i = 0; i < n; i++) {
+                            uint32_t v = src[i];
+                            v = tosigned16(v);
+                            word_buffer[i] = mult16signed(v, loudness);
+                        }
+                    } else {
+                        for (uint32_t i = 0; i + 1 < n; i += 2) {
+                            uint32_t v = src[i >> 1];
+                            v = tosigned16(v);
+                            word_buffer[i] = mult16signed(copy16lsb(v), loudness);
+                            word_buffer[i + 1] = mult16signed(copy16msb(v), loudness);
+                        }
                     }
                 }
             } else {
                 uint16_t *hword_buffer = (uint16_t *)word_buffer;
                 uint16_t *hsrc = (uint16_t *)src;
-                for (uint32_t i = 0; i < n * 2; i++) {
-                    uint32_t word = unpack8(hsrc[i]);
-                    if (MP_LIKELY(!self->base.samples_signed)) {
-                        word = tosigned16(word);
+                if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+                    for (uint32_t i = 0; i < n * 2; i++) {
+                        uint32_t word = unpack8(hsrc[i]);
+                        if (MP_LIKELY(!self->base.samples_signed)) {
+                            word = tosigned16(word);
+                        }
+                        word = mult16signed(word, loudness);
+                        hword_buffer[i] = pack8(word);
+                    }
+                } else {
+                    for (uint32_t i = 0; i + 1 < n * 2; i += 2) {
+                        uint32_t word = unpack8(hsrc[i >> 1]);
+                        if (MP_LIKELY(!self->base.samples_signed)) {
+                            word = tosigned16(word);
+                        }
+                        hword_buffer[i] = pack8(mult16signed(copy16lsb(word), loudness));
+                        hword_buffer[i + 1] = pack8(mult16signed(copy16msb(word), loudness));
                     }
-                    word = mult16signed(word, level);
-                    hword_buffer[i] = pack8(word);
                 }
             }
         } else {
             if (MP_LIKELY(self->base.bits_per_sample == 16)) {
                 if (MP_LIKELY(self->base.samples_signed)) {
-                    for (uint32_t i = 0; i < n; i++) {
-                        uint32_t word = src[i];
-                        word_buffer[i] = add16signed(mult16signed(word, level), word_buffer[i]);
+                    if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+                        for (uint32_t i = 0; i < n; i++) {
+                            uint32_t word = src[i];
+                            word_buffer[i] = add16signed(mult16signed(word, loudness), word_buffer[i]);
+                        }
+                    } else {
+                        for (uint32_t i = 0; i + 1 < n; i += 2) {
+                            uint32_t word = src[i >> 1];
+                            word_buffer[i] = add16signed(mult16signed(copy16lsb(word), loudness), word_buffer[i]);
+                            word_buffer[i + 1] = add16signed(mult16signed(copy16msb(word), loudness), word_buffer[i + 1]);
+                        }
                     }
                 } else {
-                    for (uint32_t i = 0; i < n; i++) {
-                        uint32_t word = src[i];
-                        word = tosigned16(word);
-                        word_buffer[i] = add16signed(mult16signed(word, level), word_buffer[i]);
+                    if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+                        for (uint32_t i = 0; i < n; i++) {
+                            uint32_t word = src[i];
+                            word = tosigned16(word);
+                            word_buffer[i] = add16signed(mult16signed(word, loudness), word_buffer[i]);
+                        }
+                    } else {
+                        for (uint32_t i = 0; i + 1 < n; i += 2) {
+                            uint32_t word = src[i >> 1];
+                            word = tosigned16(word);
+                            word_buffer[i] = add16signed(mult16signed(copy16lsb(word), loudness), word_buffer[i]);
+                            word_buffer[i + 1] = add16signed(mult16signed(copy16msb(word), loudness), word_buffer[i + 1]);
+                        }
                     }
                 }
             } else {
                 uint16_t *hword_buffer = (uint16_t *)word_buffer;
                 uint16_t *hsrc = (uint16_t *)src;
-                for (uint32_t i = 0; i < n * 2; i++) {
-                    uint32_t word = unpack8(hsrc[i]);
-                    if (MP_LIKELY(!self->base.samples_signed)) {
-                        word = tosigned16(word);
+                if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+                    for (uint32_t i = 0; i < n * 2; i++) {
+                        uint32_t word = unpack8(hsrc[i]);
+                        if (MP_LIKELY(!self->base.samples_signed)) {
+                            word = tosigned16(word);
+                        }
+                        word = mult16signed(word, loudness);
+                        word = add16signed(word, unpack8(hword_buffer[i]));
+                        hword_buffer[i] = pack8(word);
+                    }
+                } else {
+                    for (uint32_t i = 0; i + 1 < n * 2; i += 2) {
+                        uint32_t word = unpack8(hsrc[i >> 1]);
+                        if (MP_LIKELY(!self->base.samples_signed)) {
+                            word = tosigned16(word);
+                        }
+                        hword_buffer[i] = pack8(add16signed(mult16signed(copy16lsb(word), loudness), unpack8(hword_buffer[i])));
+                        hword_buffer[i + 1] = pack8(add16signed(mult16signed(copy16msb(word), loudness), unpack8(hword_buffer[i + 1])));
                     }
-                    word = mult16signed(word, level);
-                    word = add16signed(word, unpack8(hword_buffer[i]));
-                    hword_buffer[i] = pack8(word);
                 }
             }
         }
         length -= n;
         word_buffer += n;
-        voice->remaining_buffer += n;
-        voice->buffer_length -= n;
+        if (MP_LIKELY(self->base.channel_count == sample->channel_count)) {
+            voice->remaining_buffer += n;
+            voice->buffer_length -= n;
+        } else {
+            voice->remaining_buffer += n >> 1;
+            voice->buffer_length -= n >> 1;
+        }
     }
 
     if (length && !voices_active) {
diff --git a/shared-module/audiomixer/MixerVoice.c b/shared-module/audiomixer/MixerVoice.c
index e0be869aa8e44..6c23a39215cbc 100644
--- a/shared-module/audiomixer/MixerVoice.c
+++ b/shared-module/audiomixer/MixerVoice.c
@@ -16,6 +16,7 @@
 void common_hal_audiomixer_mixervoice_construct(audiomixer_mixervoice_obj_t *self) {
     self->sample = NULL;
     common_hal_audiomixer_mixervoice_set_level(self, mp_obj_new_float(1.0));
+    common_hal_audiomixer_mixervoice_set_panning(self, mp_obj_new_float(0.0));
 }
 
 void common_hal_audiomixer_mixervoice_set_parent(audiomixer_mixervoice_obj_t *self, audiomixer_mixer_obj_t *parent) {
@@ -38,6 +39,22 @@ void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *sel
     #endif
 }
 
+mp_obj_t common_hal_audiomixer_mixervoice_get_panning(audiomixer_mixervoice_obj_t *self) {
+    #if CIRCUITPY_SYNTHIO
+    return self->panning.obj;
+    #else
+    return mp_obj_new_float((mp_float_t)self->panning / ((1 << 15) - 1));
+    #endif
+}
+
+void common_hal_audiomixer_mixervoice_set_panning(audiomixer_mixervoice_obj_t *self, mp_obj_t arg) {
+    #if CIRCUITPY_SYNTHIO
+    synthio_block_assign_slot(arg, &self->panning, MP_QSTR_panning);
+    #else
+    self->panning = (uint16_t)(mp_arg_validate_obj_float_range(arg, -1, 1, MP_QSTR_panning) * ((1 << 15) - 1));
+    #endif
+}
+
 bool common_hal_audiomixer_mixervoice_get_loop(audiomixer_mixervoice_obj_t *self) {
     return self->loop;
 }
@@ -47,7 +64,7 @@ void common_hal_audiomixer_mixervoice_set_loop(audiomixer_mixervoice_obj_t *self
 }
 
 void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t *self, mp_obj_t sample_in, bool loop) {
-    audiosample_must_match(&self->parent->base, sample_in);
+    audiosample_must_match(&self->parent->base, sample_in, true);
     // cast is safe, checked by must_match
     audiosample_base_t *sample = MP_OBJ_TO_PTR(sample_in);
     self->sample = sample;
diff --git a/shared-module/audiomixer/MixerVoice.h b/shared-module/audiomixer/MixerVoice.h
index dd9095515459a..75e7d47faa33d 100644
--- a/shared-module/audiomixer/MixerVoice.h
+++ b/shared-module/audiomixer/MixerVoice.h
@@ -23,7 +23,9 @@ typedef struct {
     uint32_t buffer_length;
     #if CIRCUITPY_SYNTHIO
     synthio_block_slot_t level;
+    synthio_block_slot_t panning;
     #else
     uint16_t level;
+    int16_t panning;
     #endif
 } audiomixer_mixervoice_obj_t;
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index ae7d3f02d5127..d4e64ee286eb8 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -163,8 +163,13 @@ uint8_t displayio_colorconverter_compute_sevencolor(uint32_t color_rgb888) {
     }
 }
 
-void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint32_t *color) {
-
+void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_chroma, uint8_t pixel_hue, uint32_t *color) {
+    if (pixel_chroma <= 16) {
+        if (!colorspace->grayscale) {
+            *color = 0;
+        }
+        return;
+    }
     int16_t hue_diff = colorspace->tricolor_hue - pixel_hue;
     if ((-10 <= hue_diff && hue_diff <= 10) || hue_diff <= -220 || hue_diff >= 220) {
         if (colorspace->grayscale) {
@@ -177,6 +182,21 @@ void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *co
     }
 }
 
+void displayio_colorconverter_compute_fourcolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_chroma, uint8_t pixel_hue, uint32_t *color) {
+    *color >>= 1;
+    if (pixel_chroma <= 16) {
+        return;
+    }
+    int16_t hue_diff = colorspace->tricolor_hue - pixel_hue;
+    if ((-10 <= hue_diff && hue_diff <= 10) || hue_diff <= -220 || hue_diff >= 220) {
+        *color = 2;
+    }
+    int16_t hue_diff2 = colorspace->fourcolor_hue - pixel_hue;
+    if ((-10 <= hue_diff2 && hue_diff2 <= 10) || hue_diff2 <= -220 || hue_diff2 >= 220) {
+        *color = 3;
+    }
+}
+
 void common_hal_displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t *colorspace, uint32_t input_color, uint32_t *output_color) {
     displayio_input_pixel_t input_pixel;
     input_pixel.pixel = input_color;
@@ -313,18 +333,17 @@ void displayio_convert_color(const _displayio_colorspace_t *colorspace, bool dit
         output_color->pixel = packed;
         output_color->opaque = true;
         return;
-    } else if (colorspace->tricolor) {
+    } else if (colorspace->tricolor || colorspace->fourcolor) {
         uint8_t luma = displayio_colorconverter_compute_luma(pixel);
+        uint8_t pixel_chroma = displayio_colorconverter_compute_chroma(pixel);
         output_color->pixel = luma >> (8 - colorspace->depth);
-        if (displayio_colorconverter_compute_chroma(pixel) <= 16) {
-            if (!colorspace->grayscale) {
-                output_color->pixel = 0;
-            }
-            output_color->opaque = true;
-            return;
-        }
         uint8_t pixel_hue = displayio_colorconverter_compute_hue(pixel);
-        displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, &output_color->pixel);
+        if (colorspace->tricolor) {
+            displayio_colorconverter_compute_tricolor(colorspace, pixel_chroma, pixel_hue, &output_color->pixel);
+        } else if (colorspace->fourcolor) {
+            displayio_colorconverter_compute_fourcolor(colorspace, pixel_chroma, pixel_hue, &output_color->pixel);
+        }
+        output_color->opaque = true;
         return;
     } else if (colorspace->grayscale && colorspace->depth <= 8) {
         uint8_t luma = displayio_colorconverter_compute_luma(pixel);
diff --git a/shared-module/displayio/ColorConverter.h b/shared-module/displayio/ColorConverter.h
index d3dbedfe160ab..304004d566a95 100644
--- a/shared-module/displayio/ColorConverter.h
+++ b/shared-module/displayio/ColorConverter.h
@@ -43,4 +43,5 @@ uint8_t displayio_colorconverter_compute_chroma(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_hue(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_sixcolor(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_sevencolor(uint32_t color_rgb888);
-void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint32_t *color);
+void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_chroma, uint8_t pixel_hue, uint32_t *color);
+void displayio_colorconverter_compute_fourcolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_chroma, uint8_t pixel_hue, uint32_t *color);
diff --git a/shared-module/displayio/Palette.h b/shared-module/displayio/Palette.h
index bb87a93d98133..24ae5c4b7a525 100644
--- a/shared-module/displayio/Palette.h
+++ b/shared-module/displayio/Palette.h
@@ -15,10 +15,11 @@ typedef struct {
     uint8_t depth;
     uint8_t bytes_per_cell;
     uint8_t tricolor_hue;
-    uint8_t tricolor_luma;
+    uint8_t fourcolor_hue;
     uint8_t grayscale_bit; // The lowest grayscale bit. Normally 8 - depth.
     bool grayscale;
     bool tricolor;
+    bool fourcolor;
     bool sixcolor; // Spectra6 e-ink screens.
     bool sevencolor; // Acep e-ink screens.
     bool pixels_in_byte_share_row;
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 4b467b75589d1..f3444241b3cca 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -198,6 +198,7 @@ void reset_displays(void) {
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
         mp_const_obj_t display_bus_type = display_buses[i].bus_base.type;
         if (display_bus_type == NULL || display_bus_type == &mp_type_NoneType) {
+            display_buses[i].bus_base.type = &mp_type_NoneType;
             continue;
         #if CIRCUITPY_FOURWIRE
         } else if (display_bus_type == &fourwire_fourwire_type) {
diff --git a/shared-module/epaperdisplay/EPaperDisplay.c b/shared-module/epaperdisplay/EPaperDisplay.c
index a5a303d82ae75..e1f0a07f467ee 100644
--- a/shared-module/epaperdisplay/EPaperDisplay.c
+++ b/shared-module/epaperdisplay/EPaperDisplay.c
@@ -33,7 +33,7 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
     uint16_t set_column_window_command, uint16_t set_row_window_command,
     uint16_t set_current_column_command, uint16_t set_current_row_command,
     uint16_t write_black_ram_command, bool black_bits_inverted,
-    uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
+    uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, uint32_t highlight_color2,
     const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
     const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
     bool chip_select, bool grayscale, bool acep, bool spectra6, bool two_byte_sequence_length, bool address_little_endian) {
@@ -42,10 +42,16 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
     if (highlight_color != 0x000000) {
         self->core.colorspace.tricolor = true;
         self->core.colorspace.tricolor_hue = displayio_colorconverter_compute_hue(highlight_color);
-        self->core.colorspace.tricolor_luma = displayio_colorconverter_compute_luma(highlight_color);
     } else {
         self->core.colorspace.tricolor = false;
     }
+    if (highlight_color != 0x000000 && highlight_color2 != 0x000000) {
+        self->core.colorspace.tricolor = false;
+        self->core.colorspace.fourcolor = true;
+        self->core.colorspace.fourcolor_hue = displayio_colorconverter_compute_hue(highlight_color2);
+    } else {
+        self->core.colorspace.fourcolor = false;
+    }
     self->acep = acep || spectra6;
     self->core.colorspace.sixcolor = spectra6;
     self->core.colorspace.sevencolor = acep;
@@ -54,6 +60,11 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
         grayscale = false;
         core_grayscale = false;
     }
+    if ((highlight_color != 0x000000 || highlight_color2 != 0x000000) && write_color_ram_command == NO_COMMAND) {
+        color_depth = 2;
+        core_grayscale = false;
+        grayscale = false;
+    }
 
     displayio_display_core_construct(&self->core, width, height, rotation, color_depth, core_grayscale, true, 1, true, true);
     displayio_display_bus_construct(&self->bus, bus, ram_width, ram_height,
@@ -90,7 +101,7 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
     }
 
     // Clear the color memory if it isn't in use.
-    if (highlight_color == 0x00 && write_color_ram_command != NO_COMMAND) {
+    if (highlight_color == 0x00 && highlight_color2 == 0x00 && write_color_ram_command != NO_COMMAND) {
         // TODO: Clear
     }
 
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 94430289bda10..1cccd440fad9e 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -116,6 +116,16 @@ mp_int_t common_hal_synthio_miditrack_get_error_location(synthio_miditrack_obj_t
     return self->error_location;
 }
 
+mp_int_t common_hal_synthio_miditrack_get_tempo(synthio_miditrack_obj_t *self) {
+    return self->tempo;
+}
+
+void common_hal_synthio_miditrack_set_tempo(synthio_miditrack_obj_t *self, mp_int_t value) {
+    mp_int_t val = mp_arg_validate_int_min(value, 1, MP_QSTR_tempo);
+    self->synth.span.dur = (uint32_t)self->synth.span.dur * self->tempo / val;
+    self->tempo = val;
+}
+
 void synthio_miditrack_reset_buffer(synthio_miditrack_obj_t *self,
     bool single_channel_output, uint8_t channel) {
     synthio_synth_reset_buffer(&self->synth, single_channel_output, channel);