diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
index 348028c0f7..2b8707ad08 100644
--- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
+++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
@@ -27,48 +27,24 @@
 
 //https://github.com/Teknikio/TKInventionBuilderFramework
 
+
 #include "nrfx/hal/nrf_gpio.h"
 
-#define MICROPY_HW_BOARD_NAME       "Adafruit Circuit Playground Bluefruit"
+#define MICROPY_HW_BOARD_NAME       "Teknikio Bluebird"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "CircuitPlaygroundBluefruit"
-
-#define FLASH_SIZE                  (0x100000)
-#define FLASH_PAGE_SIZE             (4096)
-
-#define MICROPY_HW_LED_STATUS       (&pin_P1_14)
-
-// Unusually, board does not have a 32 kHz xtal. Nearly all boards do.
-#define BOARD_HAS_32KHZ_XTAL (0)
-
-#if QSPI_FLASH_FILESYSTEM
-#define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(0, 21)
-#define MICROPY_QSPI_DATA1                NRF_GPIO_PIN_MAP(0, 23)
-#define MICROPY_QSPI_DATA2                NRF_GPIO_PIN_MAP(1, 00)
-#define MICROPY_QSPI_DATA3                NRF_GPIO_PIN_MAP(0, 22)
-#define MICROPY_QSPI_SCK                  NRF_GPIO_PIN_MAP(0, 19)
-#define MICROPY_QSPI_CS                   NRF_GPIO_PIN_MAP(0, 15)
-#endif
-
-#if SPI_FLASH_FILESYSTEM
-#define SPI_FLASH_MOSI_PIN &pin_P0_21
-#define SPI_FLASH_MISO_PIN &pin_P0_23
-#define SPI_FLASH_SCK_PIN &pin_P0_19
-#define SPI_FLASH_CS_PIN &pin_P0_15
-#endif
 
 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
+#define MICROPY_HW_NEOPIXEL         (&pin_P0_26)
 
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
+#define DEFAULT_I2C_BUS_SCL         (&pin_P0_27)
+#define DEFAULT_I2C_BUS_SDA         (&pin_P0_26)
 
-#define DEFAULT_I2C_BUS_SCL         (&pin_P0_04)
-#define DEFAULT_I2C_BUS_SDA         (&pin_P0_05)
+#define DEFAULT_SPI_BUS_SCK         (&pin_P1_15)
+#define DEFAULT_SPI_BUS_MOSI        (&pin_P1_13)
+#define DEFAULT_SPI_BUS_MISO        (&pin_P1_14)
 
-#define DEFAULT_SPI_BUS_SCK         (&pin_P0_05)
-#define DEFAULT_SPI_BUS_MOSI        (&pin_P1_03)
-#define DEFAULT_SPI_BUS_MISO        (&pin_P0_29)
+#define DEFAULT_UART_BUS_RX         (&pin_P1_07)
+#define DEFAULT_UART_BUS_TX         (&pin_P1_08)
 
-#define DEFAULT_UART_BUS_RX         (&pin_P0_30)
-#define DEFAULT_UART_BUS_TX         (&pin_P0_14)
+#define BOARD_HAS_CRYSTAL 1  // according to the schematic we do
\ No newline at end of file
diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
index dbb32629c6..833a6faa82 100644
--- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
+++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x8046
-USB_PRODUCT = "Circuit Playground Bluefruit"
-USB_MANUFACTURER = "Adafruit Industries LLC"
+USB_PRODUCT = "Bluebird"
+USB_MANUFACTURER = "Teknikio"
 
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
@@ -21,6 +21,30 @@ endif
 
 NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
 
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 1
-EXTERNAL_FLASH_DEVICES = "GD25Q16C"
+INTERNAL_FLASH_FILESYSTEM = 1
+
+
+USB_VID = 0x239A
+USB_PID = 0x802A
+USB_PRODUCT = "PCA10059"
+USB_MANUFACTURER = "Nordic Semiconductor"
+
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+MCU_CHIP = nrf52840
+SD ?= s140
+SOFTDEV_VERSION ?= 6.1.0
+
+BOOT_SETTING_ADDR = 0xFF000
+BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140
+
+ifeq ($(SD),)
+	LD_FILE = boards/nrf52840_1M_256k.ld
+else
+	LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
+	CIRCUITPY_BLEIO = 1
+endif
+
+NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
+
diff --git a/ports/nrf/boards/teknikio_bluebird/pins.c b/ports/nrf/boards/teknikio_bluebird/pins.c
index e8e5f4110d..b41d9c2fce 100644
--- a/ports/nrf/boards/teknikio_bluebird/pins.c
+++ b/ports/nrf/boards/teknikio_bluebird/pins.c
@@ -1,71 +1,11 @@
 #include "shared-bindings/board/__init__.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_AUDIO), MP_ROM_PTR(&pin_P0_26) },
-    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_26) },
-    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P0_26) },
 
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_02) },
-    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P0_02) },
-    { MP_ROM_QSTR(MP_QSTR_SCK),  MP_ROM_PTR(&pin_P0_02) },
 
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_29) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_29) },
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_29) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_03) },
-    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P0_03) },
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_03) },
-
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_04) },
-    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P0_04) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_04) },
-
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_05) },
-    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_05) },
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_05) },
-
-    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_P0_30) },
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_30) },
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_30) },
-
-    // This cannot be A7, as it is on CPX. We don't have enough analog inputs.
-    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_14) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_14) },
-
-    { MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_P0_28) },
-    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_P0_28) },
-
-    { MP_ROM_QSTR(MP_QSTR_TEMPERATURE), MP_ROM_PTR(&pin_P0_31) },
-    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_P0_31) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_P1_02) },
-    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P1_02) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_P1_15) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_15) },
-
-    { MP_ROM_QSTR(MP_QSTR_SLIDE_SWITCH), MP_ROM_PTR(&pin_P1_06) },
-    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_P1_06) },
-
-    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P1_14) },
-    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_14) },
-
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_13) },
-    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_P0_13) },
-
-    { MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_P0_17) },
-    { MP_ROM_QSTR(MP_QSTR_MICROPHONE_DATA), MP_ROM_PTR(&pin_P0_16) },
-
-    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P1_13) },
-    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA),   MP_ROM_PTR(&pin_P1_10) },
-    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL),   MP_ROM_PTR(&pin_P1_12) },
-
-    { MP_ROM_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_P1_04) },
-
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P1_10) },
+    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA),       MP_ROM_PTR(&pin_P1_12) },
+    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL),       MP_ROM_PTR(&pin_P1_11) },
 };
 
-MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
\ No newline at end of file