diff --git a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
index 56cbede39f..f8aaaf7563 100644
--- a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
@@ -29,6 +29,8 @@ CIRCUITPY_FULL_BUILD = 0
 SUPEROPT_GC = 0
 SUPEROPT_VM = 0
 
+CIRCUITPY_PIXELBUF = 1
+
 # 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_proxlight_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk
index 92e7a17f3e..419b5baa90 100644
--- a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk
@@ -8,26 +8,24 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
+CIRCUITPY_FULL_BUILD = 0
 
 CIRCUITPY_ANALOGIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_BUSIO = 1
+CIRCUITPY_PS2IO = 0
+CIRCUITPY_PIXELBUF = 1
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 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 = 1
-
-CIRCUITPY_MATH = 1
-CIRCUITPY_PIXELBUF = 0
-CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 1
-CIRCUITPY_FULL_BUILD = 0
+CIRCUITPY_USB_MIDI = 1
 
 SUPEROPT_GC = 0
 SUPEROPT_VM = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
index 188d4df29d..9d76d1109e 100644
--- a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
@@ -26,6 +26,8 @@ CIRCUITPY_USB_MIDI = 1
 SUPEROPT_GC = 0
 SUPEROPT_VM = 0
 
+CIRCUITPY_PIXELBUF = 1
+
 # 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_slide_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
index 2bc2def52e..182f6e4737 100644
--- a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
@@ -29,6 +29,8 @@ CIRCUITPY_FULL_BUILD = 0
 SUPEROPT_GC = 0
 SUPEROPT_VM = 0
 
+CIRCUITPY_PIXELBUF = 1
+
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleMath
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk
index 0f90dba6a1..d11f306605 100644
--- a/ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk
@@ -9,22 +9,20 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 
+CIRCUITPY_FULL_BUILD = 0
+
 CIRCUITPY_ANALOGIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_BUSIO = 0
+CIRCUITPY_PIXELBUF = 1
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PS2IO = 0
+CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
-CIRCUITPY_PS2IO = 0
-CIRCUITPY_PULSEIO = 0
-CIRCUITPY_PWMIO = 0
-CIRCUITPY_AUDIOCORE = 0
-CIRCUITPY_BUSIO = 0
-CIRCUITPY_STORAGE = 1
-
-CIRCUITPY_MATH = 1
-CIRCUITPY_PIXELBUF = 1
-CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 1
-CIRCUITPY_FULL_BUILD = 0
+CIRCUITPY_USB_MIDI = 1
 
 SUPEROPT_GC = 0
 SUPEROPT_VM = 0