diff --git a/app/boards/shields/wing36/wing36.conf b/app/boards/shields/wing36/wing36.conf
index 0146bdab..5bbcdbf4 100644
--- a/app/boards/shields/wing36/wing36.conf
+++ b/app/boards/shields/wing36/wing36.conf
@@ -1,2 +1,2 @@
 # wing36.conf
-CONFIG_ZMK_SLEEP=y
\ No newline at end of file
+# CONFIG_ZMK_SLEEP=y
diff --git a/app/boards/shields/wing36/wing36.keymap b/app/boards/shields/wing36/wing36.keymap
index 70a7115f..8c21dc31 100644
--- a/app/boards/shields/wing36/wing36.keymap
+++ b/app/boards/shields/wing36/wing36.keymap
@@ -12,10 +12,10 @@
     //               | SW6  | SW9  | SW12 | SW15 |                              | SW23 | SW27 | SW30 | SW33 |              
     //                                    | SW16 | SW17 | SW18 |  | SW19 | SW20 | SW24 |   
     bindings = <
-          &kp Q &kp W &kp E &kp R &kp T 						  &kp T &kp R &kp E &kp W &kp Q 
-    &kp A &kp S &kp D &kp F &kp G &kp H			        	      &kp H &kp G &kp F &kp D &kp S &kp A
-                &kp Z &kp X &kp C &kp V				              &kp V &kp C &kp X &kp Z 
-                                  &kp B &kp N &kp M	  &kp M &kp N &kp B 
+               &kp Q &kp W &kp E &kp R &kp T 						                                      &kp T &kp R &kp E &kp W &kp Q 
+    &bt BT_CLR &kp S &kp D &kp F &kp G &kp H			        	                                  &kp H &kp G &kp F &kp D &kp S &bt BT_CLR
+                     &kp Z &kp X &kp C &kp V				                                          &kp V &kp C &kp X &kp Z 
+                                 &bt BT_NXT &bt BT_PRV &bt BT_SEL 1	  &bt BT_SEL 1 &bt BT_PRV &bt BT_NXT 
     >;
 
     };
diff --git a/app/boards/shields/wing36/wing36_left.conf b/app/boards/shields/wing36/wing36_left.conf
index 0152ee96..2863382d 100644
--- a/app/boards/shields/wing36/wing36_left.conf
+++ b/app/boards/shields/wing36/wing36_left.conf
@@ -1,2 +1,3 @@
 # wing36_left.conf
-# CONFIG_ZMK_SLEEP=y
\ No newline at end of file
+# CONFIG_ZMK_SLEEP=y
+# CONFIG_ZMK_USB_LOGGING=y
\ No newline at end of file
diff --git a/app/boards/shields/wing36/wing36_right.conf b/app/boards/shields/wing36/wing36_right.conf
index 058aa216..657aa3eb 100644
--- a/app/boards/shields/wing36/wing36_right.conf
+++ b/app/boards/shields/wing36/wing36_right.conf
@@ -1,2 +1,3 @@
 # wing36_right.conf
-# CONFIG_ZMK_SLEEP=y
\ No newline at end of file
+# CONFIG_ZMK_SLEEP=y
+# CONFIG_ZMK_USB_LOGGING=y
\ No newline at end of file
diff --git a/app/boards/shields/wing36/wing36_right.overlay b/app/boards/shields/wing36/wing36_right.overlay
index f264812e..13707291 100644
--- a/app/boards/shields/wing36/wing36_right.overlay
+++ b/app/boards/shields/wing36/wing36_right.overlay
@@ -1,5 +1,9 @@
 #include "wing36.dtsi"
 
+&default_transform {
+	col-offset = <18>;
+};
+
 &kscan0 {
   input-gpios
   = <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>