diff --git a/config/corne.keymap b/config/corne.keymap
index 6cb560f..abdf61a 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -27,158 +27,6 @@
             bindings = <&kp LGUI>, <&sl 2>;
         };
     };
-    macros {
-        mc_i3ws0: macro_i3_workspace_0 {
-            label = "ZM_macro_i3_workspace_0";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_0>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws1: macro_i3_workspace_1 {
-            label = "ZM_macro_i3_workspace_1";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_1>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws2: macro_i3_workspace_2 {
-            label = "ZM_macro_i3_workspace_2";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_2>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws3: macro_i3_workspace_3 {
-            label = "ZM_macro_i3_workspace_3";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_3>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws4: macro_i3_workspace_4 {
-            label = "ZM_macro_i3_workspace_4";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_4>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws5: macro_i3_workspace_5 {
-            label = "ZM_macro_i3_workspace_5";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_5>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws6: macro_i3_workspace_6 {
-            label = "ZM_macro_i3_workspace_6";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_6>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws7: macro_i3_workspace_7 {
-            label = "ZM_macro_i3_workspace_7";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_7>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws8: macro_i3_workspace_8 {
-            label = "ZM_macro_i3_workspace_8";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_8>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3ws9: macro_i3_workspace_9 {
-            label = "ZM_macro_i3_workspace_9";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp NUMBER_9>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3up: macro_i3_up {
-            label = "ZM_macro_i3_up";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp UP>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3down: macro_i3_down {
-            label = "ZM_macro_i3_down";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp DOWN>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3left: macro_i3_left {
-            label = "ZM_macro_i3_left";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp LEFT>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3right: macro_i3_right {
-            label = "ZM_macro_i3_right";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp RIGHT>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-        mc_i3enter: macro_i3_enter {
-            label = "ZM_macro_i3_enter";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&macro_press &kp LGUI>
-                , <&macro_tap &kp ENTER>
-                , <&macro_release &kp LGUI>
-                ;
-        };
-    };
     keymap {
         compatible = "zmk,keymap";
 
@@ -187,7 +35,7 @@
   &kp ESC  &kp Q  &kp W     &kp E      &kp R      &kp T       &kp Y     &kp U      &kp I    &kp O     &kp P  &kp LBKT
  &sk CAPS  &kp A  &kp S     &kp D      &kp F      &kp G       &kp H     &kp J      &kp K    &kp L  &kp SEMI  &kp SQT
 &sk LSHFT  &kp Z  &kp X     &kp C      &kp V      &kp B       &kp N     &kp M  &kp COMMA  &kp DOT  &kp FSLH  &mo 1
-                            &td_i3 &sk LCTRL  &kp SPACE       &kp LC(BSPC)  &sk RALT  &sk RSHIFT
+                            &td_i3 &sk LCTRL  &kp SPACE       &kp LC(BSPC)  &sl 2  &sk RSHIFT
             >;
         };
 
@@ -199,12 +47,12 @@
                                               &trans    &trans    &none        &none        &trans        &none
             >;
         };
-        i3_layer {
+        neo_layer_4 {
             bindings = <
-&none      &none  &none      &mc_i3up    &none       &none       &none  &mc_i3ws7  &mc_i3ws8  &mc_i3ws9  &none  &none
-&none      &none  &mc_i3left &mc_i3down  &mc_i3right &none       &none  &mc_i3ws4  &mc_i3ws5  &mc_i3ws6  &none  &none
-&sk LSHFT  &none  &none      &none       &mc_i3enter &none       &none  &mc_i3ws1  &mc_i3ws2  &mc_i3ws3  &none  &none
-                               &none  &sk LCTRL  &mc_i3ws0       &none    &trans     &sk RSHFT
+&none      &kp PG_UP &kp BSPC &kp UP     &kp DEL   &kp PG_DN      &none  &kp N7  &kp N8  &kp N9  &none  &none
+&none      &kp HOME  &kp LEFT &kp DOWN   &kp RIGHT &kp END        &none  &kp N4  &kp N5  &kp N6  &none  &none
+&sk LSHFT  &kp ESC   &kp TAB  &kp INSERT &kp ENTER &kp K_UNDO     &none  &kp N1  &kp N2  &kp N3  &none  &none
+                                  &kp LGUI  &sk LCTRL  &kp N0     &none    &trans     &sk RSHFT
             >;
         };
     };