diff --git a/software/boards/RPI_PICO_W/manifest.py b/software/boards/RPI_PICO_W/manifest.py
index eb25825..db382dd 100644
--- a/software/boards/RPI_PICO_W/manifest.py
+++ b/software/boards/RPI_PICO_W/manifest.py
@@ -5,8 +5,7 @@ require("bundle-networking")
 # Bluetooth
 require("aioble")
 
-module("rp2_neopixel.py", "../../modules")
-require("sdcard")
+# AsyncIO REPL
 require("aiorepl")
 
 # Third party modules
@@ -15,3 +14,4 @@ module("microdot.py", "../../lib/microdot/src/microdot/")
 
 # TonberryPico modules
 module("audiocore.py", "../../modules/audiocore")
+module("rp2_neopixel.py", "../../modules")
diff --git a/software/boards/RPI_PICO_W/mpconfigboard.cmake b/software/boards/RPI_PICO_W/mpconfigboard.cmake
index 74b4e20..b589490 100644
--- a/software/boards/RPI_PICO_W/mpconfigboard.cmake
+++ b/software/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -10,6 +10,8 @@ set(MICROPY_PY_BLUETOOTH ON)
 set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
+set(MICROPY_PY_BTREE ON)
+
 # Board specific version of the frozen manifest
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
 
@@ -18,3 +20,5 @@ set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
 
 add_link_options("-Wl,--print-memory-usage")
 set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
+
+set(MICROPY_C_HEAP_SIZE 8192)
diff --git a/software/boards/RPI_PICO_W/mpconfigboard.h b/software/boards/RPI_PICO_W/mpconfigboard.h
index 130d54a..dd85766 100644
--- a/software/boards/RPI_PICO_W/mpconfigboard.h
+++ b/software/boards/RPI_PICO_W/mpconfigboard.h
@@ -1,12 +1,12 @@
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W"
+#define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico W"
 
 // todo: We need something to check our binary size
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (848 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_BYTES (848 * 1024)
 
 // Enable networking.
 #define MICROPY_PY_NETWORK 1
-#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "PicoW"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "PicoW"
 
 // CYW43 driver configuration.
 #define CYW43_USE_SPI (1)
@@ -18,10 +18,10 @@
 // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
 // #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
 
-#define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
+#define MICROPY_HW_PIN_EXT_COUNT CYW43_WL_GPIO_COUNT
 
 // If this returns true for a pin then its irq will not be disabled on a soft reboot
 int mp_hal_is_pin_reserved(int n);
 #define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
 
-#define MICROPY_PY_THREAD                       (0)
+#define MICROPY_PY_THREAD (0)
diff --git a/software/lib/micropython b/software/lib/micropython
index a792c8f..ccdecf2 160000
--- a/software/lib/micropython
+++ b/software/lib/micropython
@@ -1 +1 @@
-Subproject commit a792c8f3bfee8f1f11bc7d797b728bee449eeafa
+Subproject commit ccdecf255dbd34b42f4b45a384bfdb9049881e29
diff --git a/software/update-submodules.sh b/software/update-submodules.sh
index a528ef8..a158f39 100755
--- a/software/update-submodules.sh
+++ b/software/update-submodules.sh
@@ -3,6 +3,8 @@
 set -eu
 
 git submodule update --init lib
-git -C lib/micropython submodule update --init lib/pico-sdk lib/mbedtls lib/micropython-lib lib/tinyusb lib/btstack lib/cyw43-driver lib/lwip
+git -C lib/micropython submodule update --init \
+    lib/pico-sdk lib/mbedtls lib/micropython-lib lib/tinyusb lib/btstack lib/cyw43-driver lib/lwip \
+    lib/berkeley-db-1.xx
 git -C lib/micropython/lib/pico-sdk submodule update --init lib
 git submodule update --init --recursive tools/mklittlefs