diff --git a/config/corne.keymap b/config/corne.keymap
index 22c559c..28a6bee 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -29,56 +29,9 @@
 
   combos {
     compatible = "zmk,combos";
-
-    tab {
-      bindings = <&trans>;
-      key-positions = <2 3>;
-    };
-
-    ctrl {
-      bindings = <&kp LCTRL>;
-      key-positions = <26 27>;
-    };
-
-    cmd {
-      bindings = <&kp LCMD>;
-      key-positions = <37 38>;
-    };
-
-    alt {
-      bindings = <&kp LEFT_ALT>;
-      key-positions = <39 40>;
-    };
-
-    shift {
-      bindings = <&kp LSHIFT>;
-      key-positions = <8 9>;
-    };
-
-    caps_word {
-      bindings = <&caps_word>;
-      key-positions = <17 18>;
-    };
-
-    delete {
-      bindings = <&kp DEL>;
-      key-positions = <32 33>;
-    };
   };
 
   macros {
-    zed_em_kay: zed_em_kay {
-      compatible = "zmk,behavior-macro";
-      label = "ZM_zed_em_kay";
-      #binding-cells = <0>;
-      bindings =
-        <&macro_press>,
-        <&kp LSHFT>,
-        <&macro_tap>,
-        <&kp Z &kp M &kp K>,
-        <&macro_release>,
-        <&kp LSHFT>;
-    };
   };
 
   keymap {
@@ -86,38 +39,38 @@
 
     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 BSLH
- &kp LCTRL  &hm LGUI A  &hm LALT S  &hm LCTRL D  &hm LSHIFT F      &kp G            &kp H  &hm RSHIFT J  &hm RCTRL K  &hm RALT L  &hm RGUI SEMI  &kp APOS
- &kp LSHFT       &kp Z       &kp X        &kp C         &kp V      &kp B            &kp N         &kp M    &kp COMMA     &kp DOT       &kp FSLH   &kp ESC
-                                       &kp LGUI         &mo 1  &kp SPACE          &kp RET         &mo 2     &kp RALT
+      &kp TAB  &kp Q  &kp W     &kp F  &kp P      &kp G      &kp J  &kp L      &kp U    &kp Y  &kp SEMI  &kp ESCAPE
+&kp BACKSPACE  &kp A  &kp R     &kp S  &kp T      &kp D      &kp H  &kp N      &kp E    &kp I     &kp O     &kp DEL
+    &kp LSHFT  &kp Z  &kp X     &kp C  &kp V      &kp B      &kp K  &kp M  &kp COMMA  &kp DOT  &kp FSLH   &kp RSHFT
+                             &kp LGUI  &mo 1  &kp SPACE    &kp RET  &mo 2   &kp RALT
       >;
     };
 
     raise {
       bindings = <
- &trans  &kp N1  &kp N2  &kp N3  &kp N4  &kp N5          &kp N6  &kp N7  &kp N8  &kp N9  &kp N0  &trans
- &trans  &trans  &trans  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans  &trans
-                         &trans  &trans  &trans          &trans   &mo 3  &trans
+&trans  &kp END  &kp PAGE_DOWN    &kp UP  &kp PAGE_UP  &kp HOME    &kp KP_NUMBER_7  &kp KP_NUMBER_8  &kp KP_NUMBER_9      &kp KP_PLUS   &kp KP_MINUS  &trans
+&trans   &trans       &kp LEFT  &kp DOWN    &kp RIGHT    &trans    &kp KP_NUMBER_4  &kp KP_NUMBER_5  &kp KP_NUMBER_6  &kp KP_MULTIPLY  &kp KP_DIVIDE  &trans
+&trans   &trans         &trans    &trans       &trans    &trans    &kp KP_NUMBER_1  &kp KP_NUMBER_2  &kp KP_NUMBER_3     &kp KP_COMMA     &kp KP_DOT  &trans
+                                  &trans       &trans    &trans    &kp KP_NUMBER_0            &mo 3     &kp KP_EQUAL
       >;
     };
 
     lower {
       bindings = <
- &trans  &kp EXCL  &kp AT  &kp HASH  &kp DLLR  &kp PRCNT          &kp CARET   &kp AMPS  &kp KP_MULTIPLY  &kp LPAR  &kp RPAR     &trans
- &trans    &trans  &trans    &trans    &trans     &trans          &kp MINUS  &kp EQUAL         &kp LBKT  &kp RBKT  &kp BSLH  &kp GRAVE
- &trans    &trans  &trans    &trans    &trans     &trans          &kp UNDER   &kp PLUS         &kp LBRC  &kp RBRC  &kp PIPE  &kp TILDE
-                             &trans     &mo 3     &trans             &trans     &trans           &trans
+&trans  &kp EXCL  &kp DOUBLE_QUOTES  &kp NON_US_HASH  &kp DLLR  &kp PRCNT    &kp CARET   &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR     &trans
+&trans    &trans             &trans           &trans    &trans     &trans    &kp MINUS  &kp EQUAL  &kp LBKT  &kp RBKT  &kp BSLH  &kp GRAVE
+&trans    &trans             &trans           &trans    &trans     &trans    &kp UNDER   &kp PLUS  &kp LBRC  &kp RBRC  &kp PIPE  &kp TILDE
+                                              &trans     &mo 3     &trans       &trans     &trans    &trans
       >;
     };
 
     both {
       bindings = <
- &trans  &trans  &trans  &trans  &trans  &bt BT_SEL 0          &bt BT_SEL 3  &trans  &trans  &trans  &trans    &rgb_ug RGB_COLOR_HSB(0,60,50)
- &trans  &trans  &trans  &trans  &trans  &bt BT_SEL 1          &bt BT_SEL 4  &trans  &trans  &trans  &trans  &rgb_ug RGB_COLOR_HSB(120,60,50)
- &trans  &trans  &trans  &trans  &trans  &bt BT_SEL 2            &bt BT_CLR  &trans  &trans  &trans  &trans  &rgb_ug RGB_COLOR_HSB(240,60,50)
-                         &trans  &trans        &trans                &trans  &trans  &trans
+&trans  &trans  &trans  &trans  &trans  &bt BT_SEL 0    &bt BT_SEL 3  &trans  &trans  &trans  &trans    &rgb_ug RGB_COLOR_HSB(0,60,50)
+&trans  &trans  &trans  &trans  &trans  &bt BT_SEL 1    &bt BT_SEL 4  &trans  &trans  &trans  &trans  &rgb_ug RGB_COLOR_HSB(120,60,50)
+&trans  &trans  &trans  &trans  &trans  &bt BT_SEL 2      &bt BT_CLR  &trans  &trans  &trans  &trans  &rgb_ug RGB_COLOR_HSB(240,60,50)
+                        &trans  &trans        &trans          &trans  &trans  &trans
       >;
     };
   };
-};
\ No newline at end of file
+};