diff --git a/keyboard/ergodox_ez/keymaps/keymap_typematrix.c b/keyboard/ergodox_ez/keymaps/keymap_typematrix.c
index 1b201c223..fd7c020bf 100644
--- a/keyboard/ergodox_ez/keymaps/keymap_typematrix.c
+++ b/keyboard/ergodox_ez/keymaps/keymap_typematrix.c
@@ -20,15 +20,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | \/Shift|
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl | ~L1  | LGui | Play | App  |                                       | Left |Right |   -  |   =  |RCtrl |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,--------------.       ,---------------.
- *                                        |Esc/Alt|  L1  |       | Home |Ctrl/End|
- *                                 ,------+-------+------|       |------+--------+------.
- *                                 |Space | Space | PgUp |       |  Up  |        |      |
- *                                 |  /   |   /   |------|       |------|  RAlt  |Space |
- *                                 | Alt  |  Alt  | PgDn |       | Down |        |      |
- *                                 `---------------------'       `----------------------'
+ *   |LCtrl | ~L1  | LGui | Play |App/Alt|                                      | RAlt |   -  | Home |   =  |End/Ctl|
+ *   `-----------------------------------'                                      `-----------------------------------'
+ *                                       ,--------------.       ,-------------.
+ *                                       |Esc/Alt|  L1  |       | Left |Right |
+ *                                ,------+-------+------|       |------+------+------.
+ *                                |      |       | PgUp |       |  Up  |      |      |
+ *                                |Space | Space |------|       |------|Space |Space |
+ *                                |      |       | PgDn |       | Down |      |      |
+ *                                `---------------------'       `--------------------'
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
@@ -38,22 +38,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_BSPC,
         KC_LSFT,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_ENT,
-        KC_LCTL,        KC_FN1,       KC_LGUI,KC_MPLY,KC_APP,
+        KC_LCTL,        KC_FN1,       KC_LGUI,KC_MPLY,ALT_T(KC_APP),
 
                                               ALT_T(KC_ESC),  TG(1),
                                                               KC_PGUP,
-                               ALT_T(KC_SPC), ALT_T(KC_SPC),  KC_PGDN,
+                                             KC_SPC, KC_SPC,  KC_PGDN,
 
         // right hand
              KC_DELT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_RBRC,
              KC_BSPC,     KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_LBRC,
                           KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),SFT_T(KC_QUOT),
              KC_ENT,      KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          SFT_T(KC_BSLS),
-                                  KC_LEFT,KC_RGHT,KC_MINS,KC_EQL,           KC_RCTL,
+                                  KC_RALT,KC_MINS,KC_HOME,KC_EQL,           CTL_T(KC_END),
 
-             KC_HOME, CTL_T(KC_END),
+             KC_LEFT, KC_RGHT,
              KC_UP,
-             KC_DOWN, KC_RALT,        KC_SPC
+             KC_DOWN, KC_SPC,  KC_SPC
     ),
 /* Keymap 1: Symbol Layer
  *
@@ -71,9 +71,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |n.lock|c.lock|
  *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 | Mute |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
+ *                                 | Mute |      |      |       |      |      |      |
+ *                                 |  /   |      |------|       |------|      |      |
+ *                                 | Alt  |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
                                        KC_TRNS,KC_TRNS,
                                                KC_TRNS,
-                               KC_MUTE,KC_TRNS,KC_TRNS,
+                        ALT_T(KC_MUTE),KC_TRNS,KC_TRNS,
        // right hand
        KC_INS,  KC_F6,   KC_F7,   KC_TAB,  KC_PSLS, KC_PAST, KC_PMNS,
        KC_HOME, KC_UP,   KC_END,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,