diff --git a/config/splitkb_aurora_corne.keymap b/config/splitkb_aurora_corne.keymap
index 2d3ddac..d92ec1e 100644
--- a/config/splitkb_aurora_corne.keymap
+++ b/config/splitkb_aurora_corne.keymap
@@ -3,9 +3,9 @@
 #include <dt-bindings/zmk/keys.h>
 
 #define DEFAULT 0
-#define RIGHT_   1
-#define LEFT_    2
-#define SHEET_   3
+#define RIGHTH   1
+#define LEFTH    2
+#define SHEET   3
 
 // homerow mods
 ZMK_BEHAVIOR(hm, hold_tap,
@@ -14,7 +14,7 @@ ZMK_BEHAVIOR(hm, hold_tap,
     quick-tap-ms = <125>;
     bindings = <&kp>, <&kp>;
 )
-#include "combos.dtsi"
+// #include "combos.dtsi"
 
 ZMK_LAYER(default_layer,
             // -----------------------------------------------------------------------------------------
@@ -26,7 +26,7 @@ ZMK_LAYER(default_layer,
 &kp LBKT  &kp Q       &kp W       &kp E           &kp R        &kp T      &kp Y     &kp U        &kp I          &kp O       &kp P          &kp RBKT
 &kp BSLH  &hm LGUI A  &hm RALT S  &hm LCTRL D     &hm LSHFT F  &kp G      &kp H     &hm RSHFT J  &hm RCTRL K    &hm RALT L  &hm RGUI SEMI  &kp SQT
 &kp NUBS   &kp Z       &kp X       &kp C           &kp V        &kp B      &kp N     &kp M        &kp COMMA      &kp DOT     &kp FSLH       &kp EQUAL
-                                  &lt RIGHT_ TAB  &kp RET      &kp ESC    &kp BSPC  &kp SPACE    &lt LEFT_ TAB
+                                  &lt RIGHTH TAB  &kp RET      &kp ESC    &kp BSPC  &kp SPACE    &lt LEFTH TAB
         )
 
 ZMK_LAYER(right_layer,
@@ -34,11 +34,11 @@ ZMK_LAYER(right_layer,
             // | BTCLR |     |  mute | vold | volu | printS  |    |  6    |  7  |  8  |  9   |  0   | -    |
             // | BT1  | LGUI | RALT | LCTRL | LSHFT |        |    |  LFT  | DWN |  UP | RGT  |      |      |
             // | BT2  |     |     |     |     |     |        |    |  F7   | F8  |  F9 | F10  |  F11 | F12  |
-            //                             |     |     |     |    | DEL | SPACE | tog SHEET_ |
+            //                             |     |     |     |    | DEL | SPACE | tog SHEET |
 &bt BT_CLR    &trans    &kp C_MUTE  &kp C_VOL_DN  &kp C_VOL_UP  &kp PSCRN    &kp N6    &kp N7     &kp N8       &kp N9     &kp N0   &kp BSPC
 &bt BT_SEL 1  &kp LGUI  &kp RALT    &kp LCTRL     &kp LSHFT     &none        &kp LEFT  &kp DOWN   &kp UP       &kp RIGHT  &none    &none
 &bt BT_SEL 2  &none     &none       &none         &none         &none        &kp F7    &kp F8     &kp F9       &kp F10    &kp F11  &kp F12
-                                    &trans        &trans        &trans       &kp DEL   &kp SPACE  &tog SHEET_
+                                    &trans        &trans        &trans       &kp DEL   &kp SPACE  &tog SHEET
             )
 
 ZMK_LAYER(left_layer,
@@ -46,12 +46,12 @@ ZMK_LAYER(left_layer,
             // |  GRAVE |  1  |  2  |  3  |  4  |  5  |     |    |         |         |        |        | BT3  |
             // |        | \   | {   | [   | ]   | }   |     |    | RSHFT   |  RCTRL  | RALT   |  RGUI  | BT4  |
             // |  F1    |  F2 | F3  |  F4 | F5  | F6  |     |    |         |         |        |        | BT5  |
-            //                      | tog SHEET_  |     |     |    |         |         |        |
+            //                      | tog SHEET  |     |     |    |         |         |        |
 
 &kp TAB     &kp N1      &kp N2      &kp N3      &kp N4         &kp N5           &none      &none      &none     &none     &none  &bt BT_SEL 3
 &kp LA(N6)  &kp LA(N8)  &kp LA(N4)  &kp LA(N5)  &kp LA(MINUS)  &kp LA(EQUAL)    &kp RSHFT  &kp RCTRL  &kp RALT  &kp RGUI  &none  &bt BT_SEL 4
 &kp F1      &kp F2      &kp F3      &kp F4      &kp F5         &kp F6           &none      &none      &none     &none     &none  &bt BT_SEL 5
-                                    &to SHEET_  &none          &none            &none      &none      &trans
+                                    &to SHEET  &none          &none            &none      &none      &trans
             )
 
 ZMK_LAYER(sheet_layer,
@@ -59,10 +59,10 @@ ZMK_LAYER(sheet_layer,
             // | BSPC  |  + |  7  |  8  |  9  |  -  |   |     |     |     |     |     |      |
             // |  DEL  |  ( |  4  |  5  |  6  |  *  |   | LFT | DWN |  UP | RGT |     |      |
             // | NLoc  |  ) |  1  |  2  |  3  |  /  |   |     |     |     |     |     |      |
-            //                    |  0  |  .  | ENT |   | BSPC | SPACE | Tog SHEET_ |
+            //                    |  0  |  .  | ENT |   | BSPC | SPACE | Tog SHEET |
 
 &kp BSPC    &kp KP_PLUS  &kp KP_N7  &kp KP_N8  &kp KP_N9   &kp KP_MINUS       &none     &none      &none        &none      &none  &kp C_SLEEP
 &kp DEL     &kp KP_LPAR  &kp KP_N4  &kp KP_N5  &kp KP_N6   &kp KP_MULTIPLY    &kp LEFT  &kp DOWN   &kp UP       &kp RIGHT  &none  &none
 &kp KP_NUM  &kp KP_RPAR  &kp KP_N1  &kp KP_N2  &kp KP_N3   &kp KP_DIVIDE      &none     &none      &none        &none      &none  &none
-                                    &kp KP_N0  &kp KP_DOT  &kp RET            &kp BSPC  &kp SPACE  &tog SHEET_
+                                    &kp KP_N0  &kp KP_DOT  &kp RET            &kp BSPC  &kp SPACE  &tog SHEET
             )