diff --git a/app/boards/shields/duckboard/duck.uf2 b/app/boards/shields/duckboard/duck.uf2
new file mode 100644
index 00000000..8be54069
Binary files /dev/null and b/app/boards/shields/duckboard/duck.uf2 differ
diff --git a/app/boards/shields/duckboard/duckboard.conf b/app/boards/shields/duckboard/duckboard.conf
index c77c69fc..79a0fe1d 100644
--- a/app/boards/shields/duckboard/duckboard.conf
+++ b/app/boards/shields/duckboard/duckboard.conf
@@ -12,6 +12,9 @@ CONFIG_ZMK_RGB_UNDERGLOW=y
 # Use the STRIP config specific to the LEDs you're using
 CONFIG_WS2812_STRIP=y
 
+# Increase BT radio power
+CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
+
 # USB debugging settings
 
 # Turn on logging, and set ZMK logging to debug output
diff --git a/app/boards/shields/duckboard/duckboard.keymap b/app/boards/shields/duckboard/duckboard.keymap
index 50d19b09..6803678c 100644
--- a/app/boards/shields/duckboard/duckboard.keymap
+++ b/app/boards/shields/duckboard/duckboard.keymap
@@ -20,7 +20,7 @@
 		
 		default_layer {
 			bindings = <
-				&none		&tog FUNC	&kp KP_SLASH	&kp KP_ASTERISK	&kp KP_MINUS
+				&none		&to FUNC	&kp KP_SLASH	&kp KP_ASTERISK	&kp KP_MINUS
 				&none		&kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &none
 				&none		&kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp KP_PLUS
 				&kp K_MUTE	&kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &none
@@ -32,7 +32,7 @@
 
 		 func_layer {
 			 bindings = <
-				&none			&tog RGB_BT	&trans     	&trans 		&trans
+				&none			&to RGB_BT	&trans     	&trans 		&trans
 				&none			&kp HOME    	&kp UP    	&kp PG_UP    	&none
 				&none			&kp LEFT    	&none      	&kp RIGHT      	&trans
 				&ext_power EP_TOG	&kp END    	&kp DOWN    	&kp PG_DN    	&none
@@ -44,7 +44,7 @@
 
 		 rgb_bt_layer {
                          bindings = <
-                                &none          	&tog 0    	&rgb_ug RGB_TOG &rgb_ug RGB_EFF	&none
+                                &none          	&to DEFAULT    	&rgb_ug RGB_TOG &rgb_ug RGB_EFF	&none
                                 &none  	   	&rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_BRI &none
                              	&none	        &rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD &none
                                 &bootloader     &none  	 	&bt BT_CLR 	&bt BT_NXT      &none
diff --git a/app/boards/shields/duckboard/settings_clear.uf2 b/app/boards/shields/duckboard/settings_clear.uf2
new file mode 100644
index 00000000..b4199ddd
Binary files /dev/null and b/app/boards/shields/duckboard/settings_clear.uf2 differ
diff --git a/zmk b/zmk
deleted file mode 160000
index 2233f457..00000000
--- a/zmk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2233f457b2ce5fbf77dbc18c14525559dc452aba