diff --git a/app/boards/shields/osprette/osprette.overlay b/app/boards/shields/osprette/osprette.overlay
index 546df783..7aee4666 100644
--- a/app/boards/shields/osprette/osprette.overlay
+++ b/app/boards/shields/osprette/osprette.overlay
@@ -30,23 +30,23 @@ RC(0,0) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8)
         diode-direction = "row2col";
 
         col-gpios
-            = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            = <&pro_micro 14 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 3  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 4  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 5  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 6  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 7  GPIO_ACTIVE_HIGH>
             ;
 
         row-gpios
-            = <&pro_micro 16 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 10 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 8 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 9 GPIO_ACTIVE_HIGH>
+            = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             ;
     };
 };
diff --git a/app/boards/shields/shapeshifter4060/shapeshifter4060.keymap b/app/boards/shields/shapeshifter4060/shapeshifter4060.keymap
index 46f8b168..209481df 100644
--- a/app/boards/shields/shapeshifter4060/shapeshifter4060.keymap
+++ b/app/boards/shields/shapeshifter4060/shapeshifter4060.keymap
@@ -9,7 +9,6 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/outputs.h>
 
-
 / {
     keymap {
         compatible = "zmk,keymap";
@@ -24,10 +23,10 @@
 
 
             bindings = <
-                &kp A &kp 1 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &kp L
-                &kp A &kp 2 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &kp L
-                &kp A &kp 3 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &kp L
-                &kp A &kp 4 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &kp L
+                &kp A &kp 1 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &kp M
+                &kp A &kp 2 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &out OUT_USB
+                &kp A &kp 3 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &kp K &out OUT_BLE
+                &kp A &kp 4 &kp B &kp C &kp D &kp E &kp F &kp G &kp H &kp J &bt BT_CLR &out OUT_TOG
             >;
         };
 
diff --git a/app/boards/shields/shapeshifter4060/shapeshifter4060.overlay b/app/boards/shields/shapeshifter4060/shapeshifter4060.overlay
index 056dfad4..0fb21214 100644
--- a/app/boards/shields/shapeshifter4060/shapeshifter4060.overlay
+++ b/app/boards/shields/shapeshifter4060/shapeshifter4060.overlay
@@ -14,6 +14,13 @@
         label = "KSCAN";
         diode-direction = "row2col";
 
+        row-gpios
+            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 0
+            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 1
+            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 2
+            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 3
+            ;
+
         col-gpios
             = <&pro_micro 3 GPIO_ACTIVE_HIGH> // col 0
             , <&pro_micro 2 GPIO_ACTIVE_HIGH> // col 1
@@ -28,12 +35,5 @@
             , <&pro_micro 5 GPIO_ACTIVE_HIGH> // col 10
             , <&pro_micro 4 GPIO_ACTIVE_HIGH> // col 11
             ;
-
-        row-gpios
-            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 0
-            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 1
-            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 2
-            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 3
-            ;
     };
 };