diff --git a/config/klor.keymap b/config/klor.keymap
index 84e702b..abbb1a5 100644
--- a/config/klor.keymap
+++ b/config/klor.keymap
@@ -68,10 +68,10 @@
                                  └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
 
             bindings = <
-         &kp Q  &kp W  &kp E      &kp R        &kp T                          &kp Y    &kp U        &kp I      &kp O    &kp P
-&kp TAB  &kp A  &kp S  &kp D      &hm LSHFT F  &kp G                          &kp H    &hm RSHFT J  &kp K      &kp L    &kp SEMICOLON  &kp SQT
-&kp DEL  &kp Z  &kp X  &kp C      &kp V        &kp B      &trans    &trans    &kp N    &kp M        &kp COMMA  &kp DOT  &kp FSLH       &kp BSLH
-                       &kp LCTRL  &mo 1        &kp SPACE  &kp LALT  &kp LGUI  &kp RET  &mo 2        &kp BSPC
+         &mt LS(Q) Q  &mt LS(W) W  &mt LS(E) E  &mt LS(R) R  &mt LS(T) T                      &mt LS(Y) Y  &mt RS(U) U  &mt RS(I) I  &mt RS(O) O             &mt RS(P) P
+&kp TAB  &hm LS(A) A  &mt LS(S) S  &mt LS(D) D  &hm LS(F) F  &mt LS(G) G                      &mt RS(H) H  &mt RS(J) J  &mt RS(K) K  &mt RS(L) L             &kp SEMICOLON        &kp SQT
+&kp DEL  &mt LS(Z) Z  &mt LS(X) X  &mt LS(C) C  &mt LS(V) V  &mt LS(B) B  &trans    &trans    &mt RS(N) N  &mt RS(M) M  &kp COMMA    &mt RIGHT_SHIFT PERIOD  &mt BACKSLASH SLASH  &kp BSLH
+                                   &kp LCTRL    &mo 1        &kp SPACE    &kp LALT  &kp LGUI  &kp RET      &mo 2        &kp BSPC
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
@@ -124,10 +124,10 @@
                                  └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
 
             bindings = <
-           &trans  &trans     &trans  &trans  &trans                  &trans  &trans  &kp RA(U)  &trans  &trans
-&kp RA(A)  &trans  &kp RA(S)  &trans  &trans  &trans                  &trans  &trans  &trans     &trans  &kp RA(O)  &trans
-&trans     &trans  &trans     &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans     &trans  &trans     &trans
-                              &mo 3   &trans  &trans  &trans  &trans  &trans  &trans  &trans
+           &kp EXCL   &kp AT        &mt UP_ARROW POUND  &kp EXCL   &kp PERCENT                  &kp CARET  &kp AMPS  &kp RA(ASTERISK)  &kp LEFT_PARENTHESIS            &kp RIGHT_PARENTHESIS
+&kp RA(A)  &trans     &kp RA(LEFT)  &kp DOWN            &kp RIGHT  &trans                       &trans     &trans    &trans            &mt DOUBLE_QUOTES SINGLE_QUOTE  &kp RA(O)              &trans
+&trans     &kp LC(Z)  &trans        &kp LC(C)           &kp LC(V)  &trans       &trans  &trans  &trans     &trans    &trans            &trans                          &trans                 &trans
+                                    &mo 3               &trans     &trans       &trans  &trans  &trans     &trans    &trans
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;