diff --git a/keymap.c b/keymap.c
index 642a9a7..15e2c11 100644
--- a/keymap.c
+++ b/keymap.c
@@ -1,6 +1,12 @@
 #include QMK_KEYBOARD_H
 #include "version.h"
 
+#define TG_GAME TG(GAME)
+#define TG_UPPER TG(UPPER)
+
+#define MO_MOV MO(MOVEMENT)
+#define MO_SYM MO(SYMNUM)
+
 enum layers {
   BASE,     // Default layer
   SYMNUM,   // Symbols and numbers
@@ -42,15 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                 `--------------------'       `----------------------'
    */
   [BASE] = LAYOUT_ergodox_pretty(
-  // left hand                                                                                                               right hand
-        KC_ESC,  KC_LBRACKET,  KC_LEFT_CURLY_BRACE,  KC_RIGHT_CURLY_BRACE,  KC_LEFT_PAREN,  KC_EQUAL,  TG(GAME),             TG(UPPER),  KC_ASTERISK,  KC_RIGHT_PAREN,  KC_PLUS,    KC_RBRACKET,  KC_EXCLAIM,  KC_DEL,
-       KC_TRNS,         KC_Q,                 KC_W,                  KC_F,           KC_P,      KC_G,    KC_APP,             KC_TRNS,    KC_J,         KC_L,            KC_U,       KC_Y,         KC_SCLN,     KC_TRNS,
-        KC_MEH,         KC_A,                 KC_R,                  KC_S,           KC_T,      KC_D,                                    KC_H,         KC_N,            KC_E,       KC_I,         KC_O,        KC_MEH,
-       KC_RGUI,         KC_Z,                 KC_X,                  KC_C,           KC_V,      KC_B,    KC_TAB,             KC_BSPC,    KC_K,         KC_M,            KC_COMM,    KC_DOT,       KC_QUOT,     KC_RGUI,
-  MO(MOVEMENT),   MO(SYMNUM),              KC_LALT,             KC_LSHIFT,       KC_LCTRL,                                                             KC_RCTRL,        KC_RSHIFT,  KC_LALT,      MO(SYMNUM),  MO(MOVEMENT),
-                                                                                             KC_HOME,    KC_END,             KC_LEFT,    KC_RIGHT,
-                                                                                                        KC_PGUP,             KC_UP,
-                                                                                   KC_SPC,   KC_LGUI,   KC_PGDN,             KC_DOWN,    KC_LGUI,      KC_ENT
+  //                                                     left hand \\             // right hand
+  KC_ESC,  KC_LBRC,  KC_LCBR,  KC_RCBR,  KC_LPRN,   KC_EQL,  TG_GAME,             TG_UPPER,  KC_ASTR,  KC_RPRN,  KC_PLUS,  KC_RBRC,  KC_EXLM,  KC_DEL,
+   KC_NO,     KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,   KC_APP,             KC_NO,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_NO,
+  KC_MEH,     KC_A,     KC_R,     KC_S,     KC_T,     KC_D,                                  KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_MEH,
+ KC_RGUI,     KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,   KC_TAB,             KC_BSPC,   KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_QUOT,  KC_RGUI,
+  MO_MOV,   MO_SYM,  KC_LALT,  KC_LSFT,  KC_LCTL,                                                      KC_RCTL,  KC_RSFT,  KC_LALT,  MO_SYM,   MO_MOV,
+                                                   KC_HOME,   KC_END,             KC_LEFT,   KC_RGHT,
+                                                             KC_PGUP,             KC_UP,
+                                          KC_SPC,  KC_LGUI,  KC_PGDN,             KC_DOWN,   KC_LGUI,  KC_ENT
   ),
   /* Keymap 1: Symbol and numbers layer
    *