diff --git a/config/corne.keymap b/config/corne.keymap
index 8ac930d..e5df796 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -35,6 +35,12 @@
 #define DE_PLUS       &kp RBKT       // +
 #define DE_GRAVE      &kp PLUS       // `
 #define DE_HASH       &kp BSLH       // #
+#define DE_TILDE      LA(DE_PLUS)    // ~
+#define DE_PIPE       LA(GRAVE)      // "|"
+#define DE_BSLH       LA(DE_SS)      // \
+#define DE_QUESTION   LS(DE_SS)      // ?
+#define DE_AT         LA(Q)          // @
+#define DE_AMPS       &kp CARET      // &
 // &kp PLUS =  `
 // &kp GRAVE = <
 // &kp RPAR = =
@@ -85,7 +91,7 @@
          //                             '--------------------------------'       '--------------------------------'
          bindings = <
             &kp N0     &kp N1   &kp N2   &kp N3    DE_MINS   DE_PLUS                                DE_SS     DE_UDIA      DE_ADIA         DE_ODIA     &none   &kp BSPC
-            &kp CAPS   &kp N4   &kp N5   &kp N6    DE_FSLH    DE_STAR                                &kp HASH  &kp TILDE  &kp QUESTION  &none     &none   &none
+            &kp CAPS   &kp N4   &kp N5   &kp N6    DE_FSLH    DE_STAR                                DE_HASH  DE_TILDE  DE_QUESTION  &none     &none   &none
             &kp LSHFT  &kp N7   &kp N8   &kp N9    &kp PRCNT   DE_EQUAL                               &kp DOT   &none      DE_GRAVE     &none     &none   &none
             &kp LCTRL  &kp LGUI        &kp SPACE     &none     &kp LSHFT &kp RALT
             >;
@@ -103,9 +109,9 @@
          //                           |  CTRL    |  CMD       | SPACE  |       |  ENTER | ALTGR |          CTRL |
          //                           '--------------------------------'       '--------------------------------'
          bindings = <
-            &kp DLLR   &kp LPAR  &kp RPAR   &kp LBKT  &kp RBKT    &kp TILDE             &none     &kp GRAVE  &none    &none     &none   &none
-            &kp PRCNT  &kp LBRC  &kp RBRC   &kp CARET &kp PG_UP   &kp HASH              &kp AMPS  &kp PIPE   &none    &kp AT    &none   &none
-            &kp LSHFT  &kp LT    &kp GT     &kp HOME  &kp PG_DN   &kp END               &kp TILDE &kp APOS   &none    &none     &none   &none
+            &kp DLLR   &kp LPAR  &kp RPAR   &kp LBKT  &kp RBKT    DE_TILDE             &none     &kp GRAVE  &none    &none     &none   &none
+            &kp PRCNT  &kp LBRC  &kp RBRC   &kp CARET &kp PG_UP   DE_HASH              DE_AMPS  DE_PIPE   &none    DE_AT    &none   &none
+            &kp LSHFT  &kp LT    &kp GT     &kp HOME  &kp PG_DN   &kp END               DE_PIPE &kp APOS   &none    &none     &none   &none
                                     &kp LCTRL  &kp LGUI  &kp SPACE                      &kp RET     &kp RALT &kp LCTRL
             >;
       };
@@ -124,7 +130,7 @@
          // LCTL(LGUI(KC_D)), LCTL(LGUI(KC_SPC))
          bindings = <
             &kp F1 &kp F2   &kp F3 &kp F4 &kp LC(LG(D)) &kp LS(LA(T)) &none   &none &none &none &none &none
-            &kp F5 &kp F6   &kp F7 &kp F8 &kp BSLH &kp LA(LG(G)) &kp LC(LA(DEL))    &none   &none          &none  &kp C_BRI_UP  &none
+            &kp F5 &kp F6   &kp F7 &kp F8 DE_BSLH &kp LA(LG(G)) &kp LC(LA(DEL))    &none   &none          &none  &kp C_BRI_UP  &none
             &kp F9 &kp F10  &kp F11  &kp F12 &kp LA(LG(V)) &kp LC(LG(SPACE)) &kp LSHIFT    &kp LSHIFT   &kp RSHIFT          &none  &kp C_BRI_DN  &none
                                     &kp LCTRL  &kp LGUI  &kp LALT                      &kp TAB     &kp GRAVE &kp LCTRL
                                  >;
@@ -154,7 +160,7 @@
       // ### mouse_layer {{{
       mouse_layer {
          //   .------------------------------------------------.         TODO:           .-------------------------------------------------.
-         //   |        |       |       |OUT_USB|OUT_TOG|OUT_BLE|                         |       |       |WH_LEFT|WH_RIGH|WH_DOWN| WH_UP   |
+         //   |        |       |       |OUT_USB|OUT_BLE|OUT_TOG|                         |       |       |WH_LEFT|WH_RIGH|WH_DOWN| WH_UP   |
          //   |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
          //   |        |CLICK_1|CLICK_2|BT_CLR |BT_PRV | BT_NXT|                         |       |       |       |CLICK_1| UP    |CLICK_2  |
          //   |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|