diff --git a/config/lily58.keymap b/config/lily58.keymap
index 42be338..58ca6df 100644
--- a/config/lily58.keymap
+++ b/config/lily58.keymap
@@ -23,6 +23,13 @@
             #binding-cells = <0>;
             bindings = <&mo 1>, <&tog 1>;
         };
+
+        tap_dance_tab: tap_dance_tab {
+            compatible = "zmk,behavior-tap-dance";
+            label = "TAP_DANCE_TAB";
+            #binding-cells = <0>;
+            bindings = <&kp TAB>, <&kp RA(TAB)>;
+        };
     };
 
     keymap {
@@ -37,11 +44,11 @@
             //                     | ALT  | GUI  | LOWER|  SPACE |  | ENTER | RAISE| BSPC  | GUI   |
 
             bindings = <
-&kp GRAVE  &kp N1            &kp N2              &kp N3    &kp N4    &kp N5                                &kp N6        &kp N7    &kp N8     &kp N9               &kp N0                     &kp DELETE
-&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 LCTRL  &mt LEFT_SHIFT A  &mt LEFT_CONTROL S  &kp D     &kp F     &kp G                                 &kp H         &kp J     &kp K      &mt RIGHT_CONTROL L  &mt RIGHT_SHIFT SEMICOLON  &kp SQT
-&mo 3      &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 RSHFT
-                                                 &kp LALT  &kp LGUI  &tap_layer_1  &kp ENTER    &kp SPACE  &tap_layer_2  &kp BSPC  &kp RGUI
+&kp GRAVE       &kp N1            &kp N2              &kp N3    &kp N4    &kp N5                                &kp N6        &kp N7    &kp N8     &kp N9               &kp N0                     &kp DELETE
+&tap_dance_tab  &kp Q             &kp W               &kp E     &kp R     &kp T                                 &kp Y         &kp U     &kp I      &kp O                &kp P                      &kp BACKSLASH
+&kp CAPSLOCK    &mt LEFT_SHIFT A  &mt LEFT_CONTROL S  &kp D     &kp F     &kp G                                 &kp H         &kp J     &kp K      &mt RIGHT_CONTROL L  &mt RIGHT_SHIFT SEMICOLON  &kp SQT
+&mo 3           &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 LALT  &kp LGUI  &tap_layer_1  &kp ENTER    &kp SPACE  &tap_layer_2  &kp BSPC  &kp RGUI
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
@@ -56,11 +63,11 @@
             //                     |      |      |      |        |  |       |      |       |       |
 
             bindings = <
-&kp F1  &kp F2  &kp F3  &kp F4  &kp F5  &kp F6                    &kp F7         &kp F8        &kp F9        &kp F10       &kp F11    &kp F12
-&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  &trans    &trans  &kp CARET      &kp NUMBER_1  &kp NUMBER_2  &kp NUMBER_3  &kp ENTER  &trans
-                        &trans  &trans  &trans  &trans    &kp N0  &kp PERIOD     &trans        &trans
+&kp F1  &kp F2  &kp F3  &kp F4  &kp F5  &kp F6                                                 &kp F7         &kp F8        &kp F9        &kp F10       &kp F11    &kp F12
+&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  &trans  &trans                  &kp N0                 &kp PERIOD     &trans        &trans
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;