diff --git a/zmk/app/boards/shields/tidbit/tidbit.keymap b/zmk/app/boards/shields/tidbit/tidbit.keymap
index 4ab4b60d..2a506ddd 100644
--- a/zmk/app/boards/shields/tidbit/tidbit.keymap
+++ b/zmk/app/boards/shields/tidbit/tidbit.keymap
@@ -20,26 +20,26 @@
         
         default_layer {
             bindings = <
-                                &kp KP_NUMLOCK  &kp KP_ASERISK  &kp KP_MINUS
-                &kp KP_NUBMER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_PLUS
+                                &kp KP_NUMLOCK  &kp KP_ASTERISK  &kp KP_MINUS
+                &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_PLUS
                 &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp &none
                 &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &lt 1 KP_ENTER
                 &none           &kp KP_NUMBER_0 &kp KP_DOT      &none
             >;
 
-            sensor-bindings = <&inc_dec_kp K_VOLUME_UP K_VOLUME_DOWN>;
+            sensor-bindings = <&inc_dec_kp K_VOLUME_UP K_VOLUME_DOWN &inc_dec_kp &none &none &inc_dec_kp &none &none &inc_dec_kp &none &none &inc_dec_kp &none &none>;
         };
 
          func_layer {
              bindings = <
                             &none           &rgb_ug RGB_TOG &none
                 &none       &bt BT_CLR_CMD  &rgb_ug RGB_EFF &out OUT_TOG
-                &none       &bt BT_NEXT_CMD &rgb_ug RGB_HUI &out OUT_BLE
+                &none       &bt BT_NXT_CMD  &rgb_ug RGB_HUI &out OUT_BLE
                 &reset      &bt BT_PRV_CMD  &rgb_ug RGB_SAI &out OUT_USB
                 &bootloader &bt BT_SEL_CMD  &rgb_ug RGB_BRI &tog 0
              >;
 
-             sensor-bindings = <&inc_dec_kp K_VOLUME_UP K_VOLUME_DOWN>;
+             sensor-bindings = <&inc_dec_kp K_VOLUME_UP K_VOLUME_DOWN &inc_dec_kp &none &none &inc_dec_kp &none &none &inc_dec_kp &none &none &inc_dec_kp &none &none>;
          };
     };
 };
diff --git a/zmk/app/boards/shields/tidbit/tidbit.overlay b/zmk/app/boards/shields/tidbit/tidbit.overlay
index 610bc342..92cead8e 100644
--- a/zmk/app/boards/shields/tidbit/tidbit.overlay
+++ b/zmk/app/boards/shields/tidbit/tidbit.overlay
@@ -7,25 +7,6 @@
 #include <dt-bindings/zmk/matrix-transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
-
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <4>;
-		rows = <5>;
-
-		map = <
-                    RC(0,1) RC(0,2) RC(0,3)
-            RC(1,0) RC(1,1) RC(1,2) RC(1,3)
-            RC(2,0) RC(2,1) RC(2,2) RC(2,3)
-            RC(3,0) RC(3,1) RC(3,2) RC(3,3)
-            RC(4,0) RC(4,1) RC(4,2) RC(4,3)
-		>;
-	};
-
 	kscan0: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
 		label = "KSCAN";
@@ -49,6 +30,20 @@
 
 	};
 
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <4>;
+		rows = <5>;
+
+		map = <
+                    RC(0,1) RC(0,2) RC(0,3)
+            RC(1,0) RC(1,1) RC(1,2) RC(1,3)
+            RC(2,0) RC(2,1) RC(2,2) RC(2,3)
+            RC(3,0) RC(3,1) RC(3,2) RC(3,3)
+            RC(4,0) RC(4,1) RC(4,2) RC(4,3)
+		>;
+	};
+
 	encoder_1_top_row: encoder_1_top_row {
 		compatible = "alps,ec11";
 		label = "Top Row Encoder";
@@ -94,6 +89,11 @@
 		status = "disabled";
 	};
 
+    chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
 	sensors {
 		compatible = "zmk,keymap-sensors";
 		sensors = <&encoder_1_top_row &encoder_1 &encoder_2 &encoder_3 &encoder_4>;