diff --git a/config/helix.keymap b/config/helix.keymap
index d8d08ff..b878632 100644
--- a/config/helix.keymap
+++ b/config/helix.keymap
@@ -19,23 +19,23 @@
     keymap {
         compatible = "zmk,keymap";
 
-        default_layer {
+        base {
             label = "base";
             bindings = <
-&kp TAB     &kp Q      &kp W          &kp E         &kp R         &kp T                      &kp Y    &kp U  &kp I      &kp O       &kp P      &kp BACKSPACE
-&kp ESCAPE  &kp A      &kp S          &kp D         &kp F         &kp G                      &kp H    &kp J  &kp K      &kp L       &kp SEMI   &kp SQT
-&kp LSHFT   &kp Z      &kp X          &kp C         &kp V         &kp B                      &kp N    &kp M  &kp COMMA  &kp PERIOD  &kp SLASH  &kp EQUAL
-&mo 1       &kp LCTRL  &kp LG(SPACE)  &kp LEFT_ALT  &kp LEFT_GUI  &kp SPACE  &mo 3    &mo 3  &kp RET  &none  &kp LBKT   &kp RBKT    &kp BSLH   &none
+&kp TAB     &kp Q      &kp W          &kp E         &kp R         &kp T                      &kp Y    &kp U      &kp I      &kp O       &kp P      &kp BACKSPACE
+&kp ESCAPE  &kp A      &kp S          &kp D         &kp F         &kp G                      &kp H    &kp J      &kp K      &kp L       &kp SEMI   &kp SQT
+&kp LSHFT   &kp Z      &kp X          &kp C         &kp V         &kp B                      &kp N    &kp M      &kp COMMA  &kp PERIOD  &kp SLASH  &kp EQUAL
+&mo 1       &kp LCTRL  &kp LG(SPACE)  &kp LEFT_ALT  &kp LEFT_GUI  &kp SPACE  &mo 3    &mo 3  &kp RET  &kp RCTRL  &none      &none       &none      &none
             >;
         };
 
-        lower_layer {
+        fn {
             label = "fn";
             bindings = <
-&trans  &trans  &trans                &bt BT_PRV         &trans            &bt BT_NXT                                        &trans          &trans    &trans        &trans     &trans  &kp DELETE
-&trans  &trans  &kp C_BRIGHTNESS_INC  &kp C_PREVIOUS     &kp C_PLAY_PAUSE  &kp C_NEXT                                        &kp LEFT_ARROW  &kp DOWN  &kp UP_ARROW  &kp RIGHT  &trans  &trans
-&trans  &trans  &kp C_BRIGHTNESS_DEC  &kp C_VOLUME_DOWN  &kp K_MUTE        &kp C_VOLUME_UP                                   &trans          &trans    &trans        &trans     &trans  &trans
-&none   &none   &none                 &none              &mo 2             &none            &kp LG(LC(LA(LS(F6))))    &none  &none           &none     &none         &none      &none   &none
+&kp RS(RA(RC(RG(F6))))  &trans  &trans                &bt BT_PRV         &trans            &bt BT_NXT                                   &trans          &trans    &trans        &trans     &kp F10  &kp DELETE
+&trans                  &trans  &kp C_BRIGHTNESS_INC  &kp C_PREVIOUS     &kp C_PLAY_PAUSE  &kp C_NEXT                                   &kp LEFT_ARROW  &kp DOWN  &kp UP_ARROW  &kp RIGHT  &trans   &trans
+&trans                  &trans  &kp C_BRIGHTNESS_DEC  &kp C_VOLUME_DOWN  &kp K_MUTE        &kp C_VOLUME_UP                              &trans          &trans    &trans        &trans     &trans   &trans
+&none                   &trans  &kp LC(LG(SPACE))     &trans             &trans            &trans           &mo 2    &kp LA(LC(LG(C)))  &none           &none     &none         &none      &none    &none
             >;
         };