diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
index 5f8bb80d..43509a47 100644
--- a/app/boards/shields/cradio/Kconfig.defconfig
+++ b/app/boards/shields/cradio/Kconfig.defconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config ZMK_KEYBOARD_NAME
-	default "Cradio"
+	default "cradio"
 
 config ZMK_KSCAN_DIRECT_POLLING
 	default y
diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi
index ab22e929..1f2603c2 100644
--- a/app/boards/shields/cradio/cradio.dtsi
+++ b/app/boards/shields/cradio/cradio.dtsi
@@ -9,9 +9,9 @@
 / {
 	chosen {
 		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
+		 //zmk,matrix_transform = &default_transform;
 	};
-		
+	
 	default_transform: keymap_transform_0 {
 	compatible = "zmk,matrix-transform";
         columns = <34>;
@@ -19,23 +19,13 @@
 		map = <
 	RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) 		RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) 
 	RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) 		RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)   
-	RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) 		RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) 
+	RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) 		RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) 
 	RC(0,15)  RC(0,16) 					RC(0,33) RC(0,32)  
 	>;
 
 	kscan0: kscan {
 		compatible = "zmk,kscan-gpio-direct";
 		label = "KSCAN";
-	};
-	
-	bt_unpair_combo: bt_unpair_combo {
-		compatible = "zmk,bt-unpair-combo";
-	};
-	
-	};	
-	};
-		
-		&kscan0 {
 		input-gpios
 			= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
 			, <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
@@ -55,6 +45,7 @@
 			, <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
 			, <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
 			;
-};
-	
-	
+	};
+	};	
+	};
+
diff --git a/app/boards/shields/cradio/cradio.keymap b/app/boards/shields/cradio/cradio.keymap
index 1d11cfd6..487f6dcf 100644
--- a/app/boards/shields/cradio/cradio.keymap
+++ b/app/boards/shields/cradio/cradio.keymap
@@ -3,23 +3,41 @@
  *
  * SPDX-License-Identifier: MIT
  */
-
-
+ 
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
 
 
 / {
         keymap {
                 compatible = "zmk,keymap";
-
-                default_layer {
+                
+       default_layer {
 		bindings = <
 		&kp Q &kp W &kp E &kp R &kp T 		&kp Y &kp U  &kp I    &kp O   &kp P 
 		&kp A &kp S &kp D &kp F &kp G 		&kp H &kp J  &kp K    &kp L   &kp SCLN 
 		&kp Z &kp X &kp C &kp V &kp B		&kp N &kp M  &kp CMMA &kp DOT &kp FSLH
-			      &kp NUM_1 &kp NUM_2 		&kp NUM_3 &kp NUM_4 
-			      >;
+			 &mo 1 &kp LCTL  		&kp SPC  &mo 2 
+		>;
 		};
+       upper_layer {
+		bindings = <
+		&kp NUM_1    &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5         &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 
+		&bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4	&kp H &kp J  &kp K    &kp L   &kp SCLN 
+		&kp LSFT   &trans       &trans       &trans       &trans       &trans            &trans    &trans    &trans    &trans  
+			 &mo 1 &kp LCTL  		&kp SPC  &mo 2 
+		>;
+		};
+		
+	lower_layer {
+		bindings = <
+		&kp BANG  &kp ATSN  &kp HASH  &kp CURU  &kp PRCT    &kp CRRT  &kp AMPS &kp KMLT &kp LPRN &kp RPRN 
+		&trans    &trans    &trans    &trans    &trans      &kp MINUS &kp EQL  &kp LBKT &kp RBKT &kp PIPE 
+		&trans    &trans    &trans    &trans      &trans    &trans   &trans   &trans   &kp BSLH &kp TILD
+			 &mo 1 &kp LCTL  		&kp SPC  &mo 2 
+		>;
+		};	
+        
 	};
 };
diff --git a/app/boards/shields/cradio/cradio_left.overlay b/app/boards/shields/cradio/cradio_left.overlay
index cac95757..6a3704a7 100644
--- a/app/boards/shields/cradio/cradio_left.overlay
+++ b/app/boards/shields/cradio/cradio_left.overlay
@@ -1,5 +1,7 @@
 /*
- * Copyright (c) 2020 Pete Johanson
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
+ 
+#include "cradio.dtsi"
diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay
index fea59c23..01aa1ab6 100644
--- a/app/boards/shields/cradio/cradio_right.overlay
+++ b/app/boards/shields/cradio/cradio_right.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */