diff --git a/config/lily58.keymap b/config/lily58.keymap
index 9f92302..93a79c4 100644
--- a/config/lily58.keymap
+++ b/config/lily58.keymap
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <dt-bindings/zmk/mouse.h>
 #include <dt-bindings/zmk/mouse.h>
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/mouse.h>
 #include <dt-bindings/zmk/outputs.h>
+#include <dt-bindings/zmk/pointing.h>
 
 &mt {
     flavor = "tap-preferred";
@@ -95,7 +96,7 @@
 &trans  &trans  &trans  &trans  &trans  &trans                                                       &kp STAR       &kp N7        &kp N8        &kp N9        &kp MINUS  &trans
 &trans  &trans  &trans  &trans  &trans  &trans                                                       &kp KP_DIVIDE  &kp NUMBER_4  &kp N5        &kp N6        &kp PLUS   &trans
 &trans  &trans  &trans  &trans  &trans  &trans        &kp LEFT_PARENTHESIS    &kp RIGHT_PARENTHESIS  &kp CARET      &kp NUMBER_1  &kp NUMBER_2  &kp NUMBER_3  &kp ENTER  &trans
-                        &trans  &trans  &tap_layer_1  &trans                  &kp N0                 &kp PERIOD     &trans        &tog 0
+                        &trans  &trans  &tap_layer_1  &trans                  &kp N0                 &kp PERIOD     &trans        &to 0
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
@@ -114,7 +115,7 @@
 &trans  &trans  &msc SCRL_UP    &mmv MOVE_UP    &msc SCRL_DOWN   &trans                          &trans    &kp HOME  &kp PAGE_UP    &trans     &trans  &trans
 &trans  &trans  &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT  &trans                          &kp LEFT  &kp DOWN  &kp UP_ARROW   &kp RIGHT  &trans  &trans
 &trans  &trans  &trans          &trans          &trans           &trans  &mkp LCLK    &mkp RCLK  &trans    &kp END   &kp PAGE_DOWN  &trans     &trans  &trans
-                                &trans          &trans           &trans  &trans       &trans     &trans    &trans    &tog 0
+                                &trans          &trans           &trans  &trans       &trans     &trans    &trans    &to 0
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
@@ -126,7 +127,7 @@
 &trans  &trans  &trans  &trans  &trans  &trans                    &out OUT_USB  &trans        &trans        &trans        &trans        &trans
 &trans  &trans  &trans  &trans  &trans  &trans                    &out OUT_TOG  &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4
 &trans  &trans  &trans  &trans  &trans  &trans  &trans    &trans  &out OUT_BLE  &trans        &trans        &trans        &trans        &trans
-                        &trans  &trans  &trans  &trans    &trans  &trans        &trans        &tog 0
+                        &trans  &trans  &trans  &trans    &trans  &trans        &trans        &to 0
             >;
         };
 
@@ -136,7 +137,7 @@
 &kp TAB    &kp Q   &kp W   &kp E   &kp R   &kp T                           &kp Y            &kp U                    &kp I                  &kp O                  &kp P                              &kp BACKSLASH
 &kp F2     &kp A   &kp S   &kp D   &kp F   &kp G                           &kp H            &hm_right RIGHT_SHIFT J  &hm_right RIGHT_ALT K  &hm_right RIGHT_GUI L  &hm_right RIGHT_CONTROL SEMICOLON  &kp SQT
 &kp F1     &kp Z   &kp X   &kp C   &kp V   &kp B   &kp LBKT     &kp RBKT   &kp N            &kp M                    &kp COMMA              &kp DOT                &kp FSLH                           &kp EQUAL
-                           &kp J   &kp H   &kp Y   &kp ENTER    &kp SPACE  &lt 2 BACKSPACE  &kp MINUS                &tog 0
+                           &kp J   &kp H   &kp Y   &kp ENTER    &kp SPACE  &lt 2 BACKSPACE  &kp MINUS                &to 0
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;