diff --git a/README.md b/README.md
index 03e78c6..1ff105d 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,12 @@
 
 This is a CDC/DFU/UF2 bootloader for nRF52 boards.
 
+- [Adafruit CLUE](https://www.adafruit.com/product/4500)
+- [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
 - [Adafruit Feather nRF52832](https://www.adafruit.com/product/3406)
 - [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062)
-- [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
+- [Adafruit Feather nRF52840 Sense](https://www.adafruit.com/product/4516)
+- [Adafruit ItsyBitsy nRF52840 Express](https://www.adafruit.com/product/4481)
 - Adafruit Metro nRF52840 Express
 - [Electronut Labs Papyr](https://docs.electronut.in/papyr/)
 - MakerDiary MDK nRF52840 USB Dongle
diff --git a/src/boards.c b/src/boards.c
index 6c99fe4..fa68ddd 100644
--- a/src/boards.c
+++ b/src/boards.c
@@ -104,7 +104,6 @@ void board_teardown(void)
 #if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN)
   neopixel_teardown();
 #endif
-  // Button
 
   // Stop RTC1 used by app_timer
   NVIC_DisableIRQ(RTC1_IRQn);
@@ -117,12 +116,10 @@ void board_teardown(void)
   NRF_CLOCK->TASKS_LFCLKSTOP = 1UL;
 
   // make sure all pins are back in reset state
-  for (int i = 0; i < 32; ++i)
+  // NUMBER_OF_PINS is defined in nrf_gpio.h
+  for (int i = 0; i < NUMBER_OF_PINS; ++i)
   {
-    NRF_P0->PIN_CNF[i] = 2;
-#ifdef NRF_P1
-    NRF_P1->PIN_CNF[i] = 2;
-#endif
+    nrf_gpio_cfg_default(i);
   }
 }
 
diff --git a/src/boards.h b/src/boards.h
index 852f5fd..595f232 100644
--- a/src/boards.h
+++ b/src/boards.h
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
+#include "nrf.h"
 #include "nrf_gpio.h"
 
 #include "board.h"
diff --git a/src/boards/clue_nrf52840/board.h b/src/boards/clue_nrf52840/board.h
index 804e178..f8d32aa 100644
--- a/src/boards/clue_nrf52840/board.h
+++ b/src/boards/clue_nrf52840/board.h
@@ -57,7 +57,7 @@
 
 // Used as model string in OTA mode
 #define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "Clue nRF52840"
+#define BLEDIS_MODEL          "CLUE nRF52840"
 
 //--------------------------------------------------------------------+
 // USB
@@ -67,9 +67,9 @@
 #define USB_DESC_CDC_ONLY_PID  0x0071
 
 //------------- UF2 -------------//
-#define UF2_PRODUCT_NAME   "Adafruit Clue nRF52840"
+#define UF2_PRODUCT_NAME   "Adafruit CLUE nRF52840"
 #define UF2_VOLUME_LABEL   "CLUEBOOT"
-#define UF2_BOARD_ID       "nRF52840-Clue-revA"
-#define UF2_INDEX_URL      "https://www.adafruit.com/"
+#define UF2_BOARD_ID       "nRF52840-CLUE-revA"
+#define UF2_INDEX_URL      "https://www.adafruit.com/product/4500"
 
 #endif // _CLUE_NRF52840_H