diff --git a/keymap.c b/keymap.c
index 9079e48..bc94215 100644
--- a/keymap.c
+++ b/keymap.c
@@ -2,9 +2,11 @@
 #include "version.h"
 
 enum layers {
-    BASE, // default layer
-    SYMB, // symbols
-    MDIA,  // media keys
+    BASE,                       // Default layer
+    SYMNUM,                     // Symbols and numbers
+    MOVEMENT,                   // Movement/Navigation keys
+    UPPER,                      /* Fake capslock */
+    GAME,                       /* Flipped for games */
 };
 
 enum custom_keycodes {
@@ -20,34 +22,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * | ESC    |   1  |   2  |   3  |   4  |   5  |  L4  |           |  L3  |   6  |   7  |   8  |   9  |   0  |  DEL   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |        |   Q  |   W  |   E  |   R  |   T  | APP  |           |      |   Y  |   U  |   I  |   O  |   P  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * | Meh    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | Meh    |
+ * |--------+------+------+------+------+------| TAB  |           | Back |------+------+------+------+------+--------|
+ * | Hyper  |   Z  |   X  |   C  |   V  |   B  |      |           | space|   N  |   M  |   ,  |   .  |   '  | Hyper  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   | ~L1  | ~L2  | LAlt |LShift| LCtrl|                                       | RCtrl|RShift| LAlt | ~L1  | ~L2  |
  *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                        ,-------------.       ,--------------.
+ *                                        | Home | End  |       | Left | Right |
  *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 |      |      | PgUp |       |  Up  |        |      |
+ *                                 | Space| LGui |------|       |------|  RGui  |Enter |
+ *                                 |      |      | PgDn |       | Down |        |      |
  *                                 `--------------------'       `----------------------'
  */
 [BASE] = LAYOUT_ergodox_pretty(
   // left hand
-  KC_EQL,          KC_1,        KC_2,          KC_3,    KC_4,    KC_5,    KC_LEFT,              KC_RGHT,      KC_6,    KC_7,    KC_8,    KC_9,              KC_0,           KC_MINS,
-  KC_DEL,          KC_Q,        KC_W,          KC_E,    KC_R,    KC_T,    TG(SYMB),             TG(SYMB),     KC_Y,    KC_U,    KC_I,    KC_O,              KC_P,           KC_BSLS,
-  KC_BSPC,         KC_A,        KC_S,          KC_D,    KC_F,    KC_G,                                        KC_H,    KC_J,    KC_K,    KC_L,    LT(MDIA, KC_SCLN), GUI_T(KC_QUOT),
-  KC_LSFT,         CTL_T(KC_Z), KC_X,          KC_C,    KC_V,    KC_B,    ALL_T(KC_NO),                  MEH_T(KC_NO), KC_N,    KC_M,    KC_COMM, KC_DOT,           CTL_T(KC_SLSH), KC_RSFT,
-  LT(SYMB,KC_GRV), KC_QUOT,     LALT(KC_LSFT), KC_LEFT, KC_RGHT,                                              KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
-                                                           ALT_T(KC_APP), KC_LGUI,                KC_LALT, CTL_T(KC_ESC),
-                                                                          KC_HOME,                 KC_PGUP,
-                                                         KC_SPC, KC_BSPC, KC_END,                  KC_PGDN, KC_TAB, KC_ENT
+        KC_ESC,        KC_1,     KC_2,       KC_3,      KC_4,     KC_5,  TG(GAME),             TG(UPPER),  KC_6,      KC_7,      KC_8,       KC_9,     KC_0,        KC_DEL,
+       KC_TRNS,        KC_Q,     KC_W,       KC_E,      KC_R,     KC_T,    KC_APP,             KC_TRNS,    KC_Y,      KC_U,      KC_I,       KC_O,     KC_P,        KC_TRNS,
+        KC_MEH,        KC_A,     KC_S,       KC_D,      KC_F,     KC_G,                                    KC_H,      KC_J,      KC_K,       KC_L,     KC_SCLN,     KC_MEH,
+  ALL_T(KC_NO),        KC_Z,     KC_X,       KC_C,      KC_V,     KC_B,    KC_TAB,             KC_BSPC,    KC_N,      KC_M,      KC_COMM,    KC_DOT,   KC_QUOT,     ALL_T(KC_NO),
+  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_RGUI,   KC_ENT
 ),
 /* Keymap 1: Symbol Layer
  *
@@ -70,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[SYMB] = LAYOUT_ergodox_pretty(
+[SYMNUM] = LAYOUT_ergodox_pretty(
   // left hand
   VRSN,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,     KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,     KC_TRNS, KC_UP,   KC_7,    KC_8,    KC_9,    KC_ASTR, KC_F12,
@@ -102,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[MDIA] = LAYOUT_ergodox_pretty(
+[MOVEMENT] = LAYOUT_ergodox_pretty(
   // left hand
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,