diff --git a/config/charybdis.keymap b/config/charybdis.keymap
index 1e31f69..e31e4e7 100644
--- a/config/charybdis.keymap
+++ b/config/charybdis.keymap
@@ -1,7 +1,7 @@
 /*
  * eXsoR's Charybdis Nano Keymap
  * with trackball.
- * 
+ *
 */
 
 // Includes
@@ -11,15 +11,14 @@
 #include <dt-bindings/zmk/pointing.h>
 #include <dt-bindings/zmk/outputs.h>
 
-
 // Layer Defenitions
-#define BASE 0
-#define NAV_L 1
-#define SYM_L 2
-#define FUN_L 3
-#define MOU_L 4
-#define SCR_L 5
-#define SNI_L 6
+#define DEF 0
+#define NAV 1
+#define SMN 2
+#define FUN 3
+#define MOU 4
+#define SCR 5
+#define SNI 6
 
 // Layer-Tap and Mod-Tap Config Preferences
 &lt {
@@ -35,7 +34,7 @@
     require-prior-idle-ms = <250>;
 };
 
-// Selecting 5 Coloumn Transform  &five_column_transform 
+// Selecting 5 Coloumn Transform
 / {
     chosen { zmk,matrix_transform = &five_column_transform; };
 };
@@ -54,6 +53,17 @@
 */
 
 / {
+    behaviors {
+        Shift_Enter: Shift_Enter {
+            compatible = "zmk,behavior-hold-tap";
+            label = "SHIFT_ENTER";
+            bindings = <&kp>, <&kp>;
+            #binding-cells = <2>;
+            hold-trigger-key-positions = <34>;
+            tapping-term-ms = <150>;
+        };
+    };
+    
     combos {
         compatible = "zmk,combos";
 
@@ -108,32 +118,21 @@
         };
     };
 
-    behaviors {
-        Shift_Enter: Shift_Enter {
-            compatible = "zmk,behavior-hold-tap";
-            label = "SHIFT_ENTER";
-            bindings = <&kp>, <&kp>;
-            #binding-cells = <2>;
-            hold-trigger-key-positions = <34>;
-            tapping-term-ms = <150>;
-        };
-    };
-
     keymap {
         compatible = "zmk,keymap";
 
-        BASE { // Layer 0
-            display-name = "Base";
+        default_layer {
+            display-name = "DEF";
             bindings = <
-        &kp Q              &kp W                &kp F             &kp P             &kp B                 &kp J                &kp L             &kp U           &kp Y       &kp APOS
-        &mt LEFT_SHIFT A   &mt LEFT_CONTROL R   &mt LEFT_ALT S    &mt LEFT_GUI T    &kp G                 &kp M                &kp N             &kp E           &kp I       &kp O
-        &lt MOU_L Z        &kp X                &kp C             &kp D             &kp V                 &kp K                &kp H             &kp COMMA       &kp DOT     &kp SLASH
-                                                &mo SCR_L         &kp SPACE         &lt NAV_L TAB         &lt SYM_L BACKSPACE  &Shift_Enter RIGHT_SHIFT ENTER
+        &kp Q              &kp W                &kp F             &kp P             &kp B               &kp J                &kp L             &kp U           &kp Y       &kp APOS
+        &mt LEFT_SHIFT A   &mt LEFT_CONTROL R   &mt LEFT_ALT S    &mt LEFT_GUI T    &kp G               &kp M                &kp N             &kp E           &kp I       &kp O
+        &mo MOU Z          &kp X                &kp C             &kp D             &kp V               &kp K                &kp H             &kp COMMA       &kp DOT     &kp SLASH
+                                                &mo SCR           &kp SPACE         &lt NAV TAB         &lt SMN BACKSPACE    &Shift_Enter RIGHT_SHIFT ENTER
             >;
         };
 
-        NAV { // Layer 1
-            display-name = "Nav";
+        nav_layer {
+            display-name = "NAV";
             bindings = <
         &kp LA(F4)  &kp LG(UP_ARROW)  &kp LG(LEFT)     &kp LG(RIGHT)        &kp LC(W)    &kp PRINTSCREEN  &kp BACKSPACE     &kp ENTER          &kp DELETE    &trans
         &kp LC(Z)   &kp RC(RS(T))     &kp LS(LC(TAB))  &kp LC(TAB)          &kp LC(A)    &kp ENTER        &kp LEFT          &kp DOWN           &kp UP_ARROW  &kp RIGHT
@@ -142,8 +141,8 @@
             >;
         };
 
-        SYMNUM { // Layer 2
-            display-name = "Sym & Num";
+        symnum_layer {
+            display-name = "SNM";
             bindings = <
         &kp LBRC   &kp AMPERSAND  &kp STAR    &kp LPAR  &kp RBRC      &kp MINUS &kp N7  &kp N8  &kp N9  &kp N0
         &kp COLON  &kp DOLLAR     &kp PERCENT &kp CARET &kp PLUS      &kp SEMI  &kp N4  &kp N5  &kp N6  &kp EQUAL
@@ -152,8 +151,8 @@
             >;
         };
 
-        FUN { // Layer 3
-            display-name = "Fun";
+        function_layer {
+            display-name = "FUN";
             bindings = <
         &kp ESC  &kp F1  &kp F2  &kp F3  &kp F10    &bt BT_SEL 0  &bt BT_SEL 1      &bt BT_SEL 2       &bt BT_SEL 3     &bt BT_SEL 4
         &kp F12  &kp F4  &kp F5  &kp F6  &kp F11    &out OUT_TOG  &kp K_PLAY_PAUSE  &kp C_VOLUME_DOWN  &kp C_VOLUME_UP  &bt BT_CLR
@@ -162,18 +161,18 @@
             >;
         };
 
-        MOUSE { // Layer 4
-            display-name = "Mouse";
+        mouse_layer {
+            display-name = "MOU";
             bindings = <
         &trans  &trans    &trans    &trans   &trans    &trans   &trans  &trans  &trans  &trans
         &trans  &trans    &trans    &trans   &trans    &trans   &trans  &trans  &trans  &trans
-        &trans  &mo SCR_L &mo SNI_L &trans   &trans    &trans   &trans  &trans  &trans  &trans
+        &trans  &mo SCR   &mo SNI   &trans   &trans    &trans   &trans  &trans  &trans  &trans
                     &mkp MB1  &mkp MB2 &trans    &mkp MB1 &mkp MB2
             >;
         };
 
-        SCROLL { // Layer 5
-            display-name = "Scroll";
+        scroll_layer {
+            display-name = "SCR";
             bindings = <
         &trans  &trans  &trans  &trans  &trans    &trans  &trans  &trans  &trans  &trans
         &trans  &trans  &trans  &trans  &trans    &trans  &trans  &trans  &trans  &trans
@@ -181,8 +180,9 @@
                         &trans  &trans  &trans    &trans  &trans
             >;
         };
-        SNIPE { // Layer 6
-            display-name = "Snipe";
+        
+        snipe_layer {
+            display-name = "SNI";
             bindings = <
         &trans  &trans  &trans  &trans  &trans    &trans  &trans  &trans  &trans  &trans
         &trans  &trans  &trans  &trans  &trans    &trans  &trans  &trans  &trans  &trans