diff --git a/config/keymap/behaviors.dtsi b/config/keymap/behaviors.dtsi
index d82b6af..a849065 100644
--- a/config/keymap/behaviors.dtsi
+++ b/config/keymap/behaviors.dtsi
@@ -187,7 +187,7 @@
         sel_word: sel_word {
             compatible = "zmk,behavior-tri-state";
             #binding-cells = <0>;
-            bindings = <&sel_word_base>, <&kp LC(RIGHT)>, <&kt LSHIFT>;
+            bindings = <&sel_word_base>, <&kp LS(LC(RIGHT))>, <&none>;
             timeout-ms = <5000>;
         };
     };
@@ -196,7 +196,7 @@
         sel_line: sel_line {
             compatible = "zmk,behavior-tri-state";
             #binding-cells = <0>;
-            bindings = <&sel_line_base>, <&sel_line_next>, <&kt LSHIFT>;
+            bindings = <&sel_line_base>, <&sel_line_next>, <&none>;
             timeout-ms = <5000>;
         };
     };
diff --git a/config/keymap/macros.dtsi b/config/keymap/macros.dtsi
index 0b32967..26bf3bf 100644
--- a/config/keymap/macros.dtsi
+++ b/config/keymap/macros.dtsi
@@ -30,7 +30,6 @@
             tap-ms = <1>;
             bindings
                 = <&kp LC(RIGHT)>
-                , <&kt LSHIFT>
                 , <&kp LC(LEFT)>;
         )
 
@@ -39,16 +38,15 @@
             tap-ms = <1>;
             bindings
                 = <&kp HOME>
-                , <&kt LSHIFT>
-                , <&kp END>;
+                , <&kp LS(END)>;
         )
 
         ZMK_MACRO(sel_line_next,
             wait-ms = <1>;
             tap-ms = <1>;
             bindings
-                = <&kp DOWN>
-                , <&kp HOME>;
+                = <&kp LS(DOWN)>
+                , <&kp LS(HOME)>;
         ) 
 
         ZMK_MACRO1(bts,