diff --git a/config/base.keymap b/config/base.keymap
index acf2fe1..a1d38da 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -53,9 +53,8 @@ TODOs and ISSUES
 
 / {
 
-    combos {
-        #include "combos.dtsi"
-    };
+    #include "unicode.dtsi"
+    #include "combos.dtsi"
 
     macros {
         // Windows sleep key
diff --git a/config/combos.dtsi b/config/combos.dtsi
index d8bbb61..14886ef 100644
--- a/config/combos.dtsi
+++ b/config/combos.dtsi
@@ -7,7 +7,7 @@
   ╰───────╮ LH0 LH1 LH2 │ │ RH0 RH1 RH2 ╭───────╯
           ╰─────────────╯ ╰─────────────╯ */
 
-compatible = "zmk,combos";
+
 
 // must be same to avoid #986, possibly related to #905
 #define COMBO_TERM_H 30
@@ -21,47 +21,52 @@ compatible = "zmk,combos";
     layers = <LAYERS>; \
   };
 
-/* Capsword */
-// COMBO(cpwrd, &caps_word,    LM3 RM1, DEF NUM, COMBO_TERM_V)
+combos {
 
-/* Punctuation (horizontal left hand) */
-COMBO(num,   &tog NUM,      LT1 LT3, DEF NUM, COMBO_TERM_H)
-COMBO(all,   &kp LC(A),     LT1 LT2, DEF NUM, COMBO_TERM_H)
-COMBO(app,   &kp LG(SPACE), LT2 LT3, DEF NUM, COMBO_TERM_H)
+    compatible = "zmk,combos";
 
-COMBO(excl,  &kp EXCL,      LM1 LM2, DEF NUM, COMBO_TERM_H)
-COMBO(qmark, &kp QMARK,     LM2 LM3, DEF NUM, COMBO_TERM_H)
+    /* Capsword */
+    // COMBO(cpwrd, &caps_word,    LM3 RM1, DEF NUM, COMBO_TERM_V)
 
-COMBO(cut,   &kp LC(X),     LB1 LB3, DEF NUM, COMBO_TERM_H)
-COMBO(copy,  &kp LC(INS),   LB1 LB2, DEF NUM, COMBO_TERM_H)
-COMBO(paste, &kp LS(INS),   LB2 LB3, DEF NUM, COMBO_TERM_H)
+    /* Punctuation (horizontal left hand) */
+    COMBO(num,   &tog NUM,      LT1 LT3, DEF NUM, COMBO_TERM_H)
+    COMBO(all,   &kp LC(A),     LT1 LT2, DEF NUM, COMBO_TERM_H)
+    COMBO(app,   &kp LG(SPACE), LT2 LT3, DEF NUM, COMBO_TERM_H)
 
-/* Brackets (horizontal right hand) */
-COMBO(lbrc,  &kp LBRC,      RT1 RT2, DEF NUM, COMBO_TERM_H)
-COMBO(rbrc,  &kp RBRC,      RT2 RT3, DEF NUM, COMBO_TERM_H)
-COMBO(lpar,  &kp LPAR,      RM1 RM2, DEF NUM, COMBO_TERM_H)
-COMBO(rpar,  &kp RPAR,      RM2 RM3, DEF NUM, COMBO_TERM_H)
-COMBO(lbrk,  &kp LBKT,      RB1 RB2, DEF NUM, COMBO_TERM_H)
-COMBO(rbrk,  &kp RBKT,      RB2 RB3, DEF NUM, COMBO_TERM_H)
+    COMBO(excl,  &kp EXCL,      LM1 LM2, DEF NUM, COMBO_TERM_H)
+    COMBO(qmark, &kp QMARK,     LM2 LM3, DEF NUM, COMBO_TERM_H)
 
-/* Other symbols (vertical combos) */
-COMBO(at,    &kp AT,        LT1 LM1, DEF NUM, COMBO_TERM_V)
-COMBO(hash,  &kp HASH,      LT2 LM2, DEF NUM, COMBO_TERM_V)
-COMBO(dllr,  &kp DLLR,      LT3 LM3, DEF NUM, COMBO_TERM_V)
-COMBO(prcnt, &kp PRCNT,     LT4 LM4, DEF NUM, COMBO_TERM_V)
+    COMBO(cut,   &kp LC(X),     LB1 LB3, DEF NUM, COMBO_TERM_H)
+    COMBO(copy,  &kp LC(INS),   LB1 LB2, DEF NUM, COMBO_TERM_H)
+    COMBO(paste, &kp LS(INS),   LB2 LB3, DEF NUM, COMBO_TERM_H)
 
-COMBO(caret, &kp CARET,     RT0 RM0, DEF NUM, COMBO_TERM_V)
-COMBO(plus,  &kp PLUS,      RT1 RM1, DEF NUM, COMBO_TERM_V)
-COMBO(star,  &kp STAR,      RT2 RM2, DEF NUM, COMBO_TERM_V)
-COMBO(amps,  &kp AMPS,      RT3 RM3, DEF NUM, COMBO_TERM_V)
+    /* Brackets (horizontal right hand) */
+    COMBO(lbrc,  &kp LBRC,      RT1 RT2, DEF NUM, COMBO_TERM_H)
+    COMBO(rbrc,  &kp RBRC,      RT2 RT3, DEF NUM, COMBO_TERM_H)
+    COMBO(lpar,  &kp LPAR,      RM1 RM2, DEF NUM, COMBO_TERM_H)
+    COMBO(rpar,  &kp RPAR,      RM2 RM3, DEF NUM, COMBO_TERM_H)
+    COMBO(lbrk,  &kp LBKT,      RB1 RB2, DEF NUM, COMBO_TERM_H)
+    COMBO(rbrk,  &kp RBKT,      RB2 RB3, DEF NUM, COMBO_TERM_H)
 
-COMBO(grave, &kp GRAVE,     LM1 LB1, DEF NUM, COMBO_TERM_V)
-COMBO(bslh,  &kp BSLH,      LM2 LB2, DEF NUM, COMBO_TERM_V)
-COMBO(tilde, &kp TILDE,     LM3 LB3, DEF NUM, COMBO_TERM_V)
-COMBO(equal, &kp EQUAL,     LM4 LB4, DEF NUM, COMBO_TERM_V)
+    /* Other symbols (vertical combos) */
+    COMBO(at,    &kp AT,        LT1 LM1, DEF NUM, COMBO_TERM_V)
+    COMBO(hash,  &kp HASH,      LT2 LM2, DEF NUM, COMBO_TERM_V)
+    COMBO(dllr,  &kp DLLR,      LT3 LM3, DEF NUM, COMBO_TERM_V)
+    COMBO(prcnt, &kp PRCNT,     LT4 LM4, DEF NUM, COMBO_TERM_V)
 
-COMBO(under, &kp UNDER,     RM0 RB0, DEF NUM, COMBO_TERM_V)
-COMBO(minus, &kp MINUS,     RM1 RB1, DEF NUM, COMBO_TERM_V)
-COMBO(fslh,  &kp FSLH,      RM2 RB2, DEF NUM, COMBO_TERM_V)
-COMBO(pipe,  &kp PIPE,      RM3 RB3, DEF NUM, COMBO_TERM_V)
+    COMBO(caret, &kp CARET,     RT0 RM0, DEF NUM, COMBO_TERM_V)
+    COMBO(plus,  &kp PLUS,      RT1 RM1, DEF NUM, COMBO_TERM_V)
+    COMBO(star,  &kp STAR,      RT2 RM2, DEF NUM, COMBO_TERM_V)
+    COMBO(amps,  &kp AMPS,      RT3 RM3, DEF NUM, COMBO_TERM_V)
 
+    COMBO(grave, &kp GRAVE,     LM1 LB1, DEF NUM, COMBO_TERM_V)
+    COMBO(bslh,  &kp BSLH,      LM2 LB2, DEF NUM, COMBO_TERM_V)
+    COMBO(tilde, &kp TILDE,     LM3 LB3, DEF NUM, COMBO_TERM_V)
+    COMBO(equal, &kp EQUAL,     LM4 LB4, DEF NUM, COMBO_TERM_V)
+
+    COMBO(under, &kp UNDER,     RM0 RB0, DEF NUM, COMBO_TERM_V)
+    COMBO(minus, &kp MINUS,     RM1 RB1, DEF NUM, COMBO_TERM_V)
+    COMBO(fslh,  &kp FSLH,      RM2 RB2, DEF NUM, COMBO_TERM_V)
+    COMBO(pipe,  &kp PIPE,      RM3 RB3, DEF NUM, COMBO_TERM_V)
+
+};