Changes to my Ergodox & Planck keymaps (#8622)

* Changes to my Ergodox & Planck keymaps

* Fixed Typos

Corrected some typos and omissions to my Ergodox layout and readme

* Fixed Typos

Fixed some typos in my ErgoDox Readme and keymap.c files

4 files changed, 204 insertions, 254 deletions

diff --git a/layouts/community/ergodox/xyverz/keymap.c b/layouts/community/ergodox/xyverz/keymap.c
index 3131c3064..c77920bb1 100644
--- a/layouts/community/ergodox/xyverz/keymap.c
+++ b/layouts/community/ergodox/xyverz/keymap.c
@@ -1,9 +1,11 @@
 /*
  * About this keymap:
- *
- * The Dvorak layout shown herestems from my early Kinesis years, using the Contour PS/2 with a Dvorak
+ * 
+ * The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak
  * software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner
- * keys. I've decided to continue using this layout with my ErgoDox.
+ * keys. When I originally set up this keymap, I'd decided to continue using this layout with my ErgoDox.
+ * I've since modified my layout to be more effective for me and to more closely match my other ortho
+ * keyboard layouts
  *
  * The QWERTY layout shown here is based entirely on the Kinesis Advantage layout, with the additional
  * keys as shown in the diagrams. The Colemak layout is merely an adaptation of that.
@@ -11,39 +13,47 @@
  * I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck
  * layouts.
  *
+ * What's New:
+ * 
+ * I've overhauled this Dvorak layout a bit to more match what I've got on my other Ortho boards. For
+ * some keys, I'm moving away from my old Kinesis keymap and adding the brackets and braces to the
+ * inner column vertical keys. I figure this will help me have better ease of use. In this update, I
+ * have also removed the keypad layer since I no longer use that at all, and have remapped the MEDIA
+ * layer a bit.
+ *
  */
 
 #include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "eeconfig.h"
 
-extern keymap_config_t keymap_config;
+enum layer_names {
+    _DVORAK,
+    _QWERTY,
+    _COLEMAK,
+    _MEDIA,
+};
 
-#define _DV 0 // Dvorak layer
-#define _QW 1 // Qwerty layer
-#define _CM 2 // Colemak layer
-#define _MD 3 // Media Layer
-#define _KP 4 // Keypad Layer
+enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK };
 
-// Macro name shortcuts
-#define DVORAK M(_DV)
-#define QWERTY M(_QW)
-#define COLEMAK M(_CM)
+// Aliases to make the keymap more uniform
+#define GUI_END GUI_T(KC_END)
+#define MEDIA MO(_MEDIA)
+#define MACLOCK LGUI(LCTL(KC_Q))
+
+// clang-format off
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Layer 0 : Dvorak
  * ,--------------------------------------------------. ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | ESC  | | ESC  |   6  |   7  |   8  |   9  |   0  |   /    |
+ * | ESC    |   1  |   2  |   3  |   4  |   5  |      | |      |   6  |   7  |   8  |   9  |   0  |  ~     |
  * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
  * | Tab    |   '  |   ,  |   .  |   P  |   Y  |      | |      |   F  |   G  |   C  |   R  |   L  |   \    |
- * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  [   | |   ]  |------+------+------+------+------+--------|
  * | CapsLk |   A  |   O  |   E  |   U  |   I  |------| |------|   D  |   H  |   T  |   N  |   S  |   -    |
- * |--------+------+------+------+------+------| _MD  | | _KP  |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  {   | |   }  |------+------+------+------+------+--------|
  * | LShift |   ;  |   Q  |   J  |   K  |   X  |      | |      |   B  |   M  |   W  |   V  |   Z  | RShift |
  * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- *   | LGUI |   `  |  INS | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | RGUI |
+ *   |MEDIA |   `  |   ~  | Left | Rght |                             |  Up  |  Dn  |   /  |   =  | MEDIA|
  *   `----------------------------------'                             `----------------------------------'
  *                                      ,-------------. ,-------------.
  *                                      | LCTL | LALT | | RALT | RCTL |
@@ -54,65 +64,69 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               `--------------------' `--------------------'
  *
  */
-[_DV] = LAYOUT_ergodox(
+
+[_DVORAK] = LAYOUT_ergodox(
         // left hand
-        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_ESC,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    XXXXXXX,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX,
+        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC,
         KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    MO(_MD),
-        KC_LGUI, KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_LCBR,
+        MEDIA,   KC_GRV,  KC_TILD, KC_LEFT, KC_RGHT,
+        // left thumb
                                             KC_LCTL, KC_LALT,
                                                      KC_HOME,
-                                   KC_BSPC, KC_DEL,  KC_END,
+                                   KC_BSPC, KC_DEL,  GUI_END,
         // right hand
-        KC_ESC,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
-        XXXXXXX, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS,
+        XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+        KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS,
                  KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-        MO(_KP), KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, KC_RGUI,
-        KC_RALT, KC_RCTL,
+        KC_RCBR, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
+                          KC_UP,   KC_DOWN, KC_SLSH, KC_EQL,  MEDIA,
+        // right thumb
+        KC_RGUI, KC_RCTL,
         KC_PGUP,
         KC_PGDN, KC_ENT,  KC_SPC
   ),
 
-
 /* Layer 1: QWERTY
  * ,--------------------------------------------------. ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | ESC  | | ESC  |   6  |   7  |   8  |   9  |   0  |   -    |
+ * | ESC    |   1  |   2  |   3  |   4  |   5  |      | |      |   6  |   7  |   8  |   9  |   0  |   -    |
  * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
  * | Tab    |   Q  |   W  |   E  |   R  |   T  |      | |      |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  [   | |   ]  |------+------+------+------+------+--------|
  * | CapsLk |   A  |   S  |   D  |   F  |   G  |------| |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------| _MD  | | _KP  |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  {   | |   }  |------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      | |      |   N  |   M  |   ,  |   .  |   /  | RShift |
  * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- *   | LGUI |   `  |  INS | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | RGUI |
+ *   |MEDIA |   `  |   =  | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | MEDIA|
  *   `----------------------------------'                             `----------------------------------'
  *                                      ,-------------. ,-------------.
- *                                      | LCTL | LALT | | RALT | RCTL |
+ *                                      | LCTL | LALT | | RGUI | RCTL |
  *                               ,------|------|------| |------+------+------.
  *                               |      |      | Home | | PgUp |      |      |
  *                               | BkSp | Del  |------| |------| Enter| Space|
  *                               |      |      | End  | | PgDn |      |      |
  *                               `--------------------' `--------------------'
  */
-[_QW] = LAYOUT_ergodox(
+[_QWERTY] = LAYOUT_ergodox(
         // left hand
-        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LEFT,
-        KC_DEL,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX,
-        KC_BSPC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(_MD),
-        KC_LGUI, KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,
+        MEDIA,   KC_GRV,  KC_EQL,  KC_LEFT, KC_RGHT,
+        // left thumb
                                             KC_LCTL, KC_LALT,
                                                      KC_HOME,
                                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_ESC,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-        XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+        KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
                  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        MO(_KP), KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, KC_RGUI,
-        KC_LALT, KC_LCTL,
+        KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, MEDIA,
+        // right thumb
+        KC_RGUI, KC_RCTL,
         KC_PGUP,
         KC_PGDN, KC_ENT, KC_SPC
   ),
@@ -120,41 +134,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Layer 2 : Colemak
  * ,--------------------------------------------------. ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | ESC  | | ESC  |   6  |   7  |   8  |   9  |   0  |   -    |
+ * | ESC    |   1  |   2  |   3  |   4  |   5  |      | |      |   6  |   7  |   8  |   9  |   0  |   -    |
  * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
  * | Tab    |   Q  |   W  |   F  |   P  |   G  |      | |      |   J  |   L  |   U  |   Y  |   ;  |   \    |
- * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  [   | |   ]  |------+------+------+------+------+--------|
  * | BkSpc  |   A  |   R  |   S  |   T  |   D  |------| |------|   H  |   N  |   E  |   I  |   O  |   '    |
- * |--------+------+------+------+------+------| _MD  | | _KP  |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  {   | |   }  |------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      | |      |   K  |   M  |   ,  |   .  |   /  | RShift |
  * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- *   | LGUI |   `  |  INS | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | RGUI |
+ *   | MEDIA|   `  |   =  | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | MEDIA|
  *   `----------------------------------'                             `----------------------------------'
  *                                      ,-------------. ,-------------.
- *                                      | LCTL | LALT | | RALT | RCTL |
+ *                                      | LCTL | LALT | | RGUI | RCTL |
  *                               ,------|------|------| |------+------+------.
  *                               |      |      | Home | | PgUp |      |      |
  *                               | BkSp | Del  |------| |------| Enter| Space|
  *                               |      |      | End  | | PgDn |      |      |
  *                               `--------------------' `--------------------'
  */
-[_CM] = LAYOUT_ergodox(
+[_COLEMAK] = LAYOUT_ergodox(
         // left hand
-        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LEFT,
-        KC_DEL,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    XXXXXXX,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX,
+        KC_DEL,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_LBRC,
         KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(_MD),
-        KC_LGUI, KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,
+        MEDIA,   KC_GRV,  KC_EQL,  KC_LEFT, KC_RGHT,
+        // left thumb
                                             KC_LCTL, KC_LALT,
                                                      KC_HOME,
                                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_ESC,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-        XXXXXXX, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+        XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
                  KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-        MO(_KP), KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, KC_RGUI,
-        KC_LALT, KC_LCTL,
+        KC_RCBR, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, MEDIA,
+        // right thumb
+        KC_RGUI, KC_RCTL,
         KC_PGUP,
         KC_PGDN, KC_ENT, KC_SPC
   ),
@@ -162,115 +178,64 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Layer 3 : Media layer
  * ,--------------------------------------------------. ,--------------------------------------------------.
- * | TEENSY |  F1  |  F2  |  F3  |  F4  |  F5  | F11  | |  F12 |  F6  |  F7  |  F8  |  F9  |  F10 |        |
+ * |   F11  |  F1  |  F2  |  F3  |  F4  |  F5  |TEENSY| |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F11   |
  * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * |        |      | PrSc | ScLk | Paus |      |      | |      |      | Mute | Vol- | Vol+ |      |        |
+ * |        |      |      |      |      |      |      | |      |      | PrSc | ScLk | Paus |      |        |
  * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------| |------| Stop | Prev | Play | Next | Sel  |        |
+ * | CapsLk |      | Mute | Vol- | Vol+ |      |------| |------|      |Dvorak|Qwerty|Colmak|      |        |
  * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
- * |        |      |Dvorak|Qwerty|Colemk|      |      | |      |      |      |      |      |      |        |
+ * |        | Stop | Prev | Play | Next | Sel  |      | |      |      |      |      |      |      |        |
  * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                             |      |      |      |      |      |
  *   `----------------------------------'                             `----------------------------------'
  *                                      ,-------------. ,-------------.
- *                                      |      |      | |      |      |
+ *                                      |      |MacLck| |MacLck|      |
  *                               ,------|------|------| |------+------+------.
  *                               |      |      |      | |      |      |      |
  *                               |      |      |------| |------|      |      |
  *                               |      |      |      | |      |      |      |
  *                               `--------------------' `--------------------'
  */
-[_MD] = LAYOUT_ergodox(
+[_MEDIA] = LAYOUT_ergodox(
         // left hand
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
-        _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
-        _______, _______, _______, _______, _______, _______,
-        _______, _______, DVORAK,  QWERTY,  COLEMAK, _______, _______,
+        KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   RESET,
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+        KC_CAPS, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______,
         _______, _______, _______, _______, _______,
-                                            _______, _______,
+                                            _______, MACLOCK,
                                                      _______,
                                    _______, _______, _______,
         // right hand
-        KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-        _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                 KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______,
+        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
+        _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+                 _______, DVORAK,  QWERTY,  COLEMAK, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,
                           _______, _______, _______, _______, _______,
-        _______, _______,
-        _______,
-        _______, _______, _______
-  ),
-
-
-/* Layer 4 : Keypad layer
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | Power  |      |      |      |      |      |      | |      |      | NmLk | KP = | KP / | KP * |        |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Sleep  |      |      |      |      |      |      | |      |      | KP 7 | KP 8 | KP 9 | KP - |        |
- * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
- * | Wake   |      |      |      |      |      |------| |------|      | KP 4 | KP 5 | KP 6 | KP + |        |
- * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      | |      |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                             | KP 0 |      | KP . |KP Ent|      |
- *   `----------------------------------'                             `----------------------------------'
- *                                      ,-------------. ,-------------.
- *                                      |      |      | |      |      |
- *                               ,------|------|------| |------+------+------.
- *                               |      |      |      | |      |      |      |
- *                               |      |      |------| |------|      |      |
- *                               |      |      |      | |      |      |      |
- *                               `--------------------' `--------------------'
- */
-[_KP] = LAYOUT_ergodox(
-        // left hand
-        KC_PWR,  _______, _______, _______, _______, _______, _______,
-        KC_SLEP, _______, _______, _______, _______, _______, _______,
-        KC_WAKE, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,
-                                            _______, _______,
-                                                     _______,
-                                   _______, _______, _______,
-        // right hand
-        _______, _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
-        _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-                 _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-        _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                          KC_P0,   _______, KC_PDOT, KC_PENT, _______,
-        _______, _______,
+        MACLOCK, _______,
         _______,
-        _______, _______, _______
+        _______, _______, KC_INS
   ),
 
 };
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
+// clang-format on
 
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case _DV:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_DV);
-          }
-          break;
-        case _QW:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_QW);
-          }
-          break;
-        case _CM:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_CM);
-          }
-          break;
-      }
-    return MACRO_NONE;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case DVORAK:
+                set_single_persistent_default_layer(_DVORAK);
+                return false;
+            case QWERTY:
+                set_single_persistent_default_layer(_QWERTY);
+                return false;
+            case COLEMAK:
+                set_single_persistent_default_layer(_COLEMAK);
+                return false;
+        }
+    }
+    return true;
 };
 
 // Runs just one time when the keyboard initializes.
diff --git a/layouts/community/ergodox/xyverz/readme.md b/layouts/community/ergodox/xyverz/readme.md
index 134fb50af..51315803b 100644
--- a/layouts/community/ergodox/xyverz/readme.md
+++ b/layouts/community/ergodox/xyverz/readme.md
@@ -2,12 +2,16 @@
 
 ## About this keymap:
 
-The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. ~~Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my ErgoDox.~~ I've decided do give the normal placing of the SLSH, EQL, and xBRC keys a try, after using a different keyboard for a while...
+The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. When I originally set up this keymap, I had decided to continue using this layout with my ErgoDox. I've since modified my layout to be more effective for me and to more closely match my other ortholinear keyboard layouts
 
 The QWERTY layout shown here is based entirely on the Kinesis Advantage layout, with the additional keys as shown in the diagrams. The Colemak layout is merely an adaptation of that.
 
 I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
 
+## What's New:
+
+* I've overhauled this Dvorak layout a bit to more match what I've got on my other Ortho boards. For some keys, I'm moving away from my old Kinesis keymap and adding the brackets and braces to the inner column vertical keys. I figure this will help me have better ease of use. In this update, I have also removed the keypad layer since I no longer use that at all, and have remapped the MEDIA layer a bit.
+
 ## Still to do:
 
  * Need to figure out a better position for the ESC key.
@@ -16,107 +20,84 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t
 
 ### Layer 0: Dvorak layer
 
-	,--------------------------------------------------.,--------------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  | ESC  || ESC  |   6  |   7  |   8  |   9  |   0  |   /    |
-	|--------+------+------+------+------+-------------||------+------+------+------+------+------+--------|
-	| Tab    |   '  |   ,  |   .  |   P  |   Y  |      ||      |   F  |   G  |   C  |   R  |   L  |   \    |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	| CapsLk |   A  |   O  |   E  |   U  |   I  |------||------|   D  |   H  |   T  |   N  |   S  |   -    |
-	|--------+------+------+------+------+------| _MD  || _KP  |------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   X  |      ||      |   B  |   M  |   W  |   V  |   Z  | RShift |
-	`--------+------+------+------+------+-------------'`-------------+------+------+------+------+--------'
-	  | LGUI |   `  |  INS | Left | Rght |                            |  Up  |  Dn  |   [  |   ]  | RGUI |
-	  `----------------------------------'                            `----------------------------------'
-	                                     ,-------------.,-------------.
-	                                     | LCtr | LAlt || Ralt | RCtr |
-	                              ,------|------|------||------+------+------.
-	                              |      |      | Home || PgUp |      |      |
-	                              | BkSp | Del  |------||------| Enter| Space|
-	                              |      |      | End  || PgDn |      |      |
-	                              `--------------------'`--------------------'
+ 	,--------------------------------------------------. ,--------------------------------------------------.
+ 	| ESC    |   1  |   2  |   3  |   4  |   5  |      | |      |   6  |   7  |   8  |   9  |   0  |  ~     |
+ 	|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ 	| Tab    |   '  |   ,  |   .  |   P  |   Y  |      | |      |   F  |   G  |   C  |   R  |   L  |   \    |
+ 	|--------+------+------+------+------+------|  [   | |   ]  |------+------+------+------+------+--------|
+ 	| CapsLk |   A  |   O  |   E  |   U  |   I  |------| |------|   D  |   H  |   T  |   N  |   S  |   -    |
+ 	|--------+------+------+------+------+------|  {   | |   }  |------+------+------+------+------+--------|
+ 	| LShift |   ;  |   Q  |   J  |   K  |   X  |      | |      |   B  |   M  |   W  |   V  |   Z  | RShift |
+ 	`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+	  |MEDIA |   `  |   ~  | Left | Rght |                             |  Up  |  Dn  |   /  |   =  | MEDIA|
+ 	  `----------------------------------'                             `----------------------------------'
+ 	                                     ,-------------. ,-------------.
+ 	                                     | LCTL | LALT | | RGUI | RCTL |
+ 	                              ,------|------|------| |------+------+------.
+ 	                              |      |      | Home | | PgUp |      |      |
+ 	                              | BkSp | Del  |------| |------| Enter| Space|
+ 	                              |      |      | End  | | PgDn |      |      |
+ 	                              `--------------------' `--------------------'
 
 ### Layer 1: QWERTY layer
 
-	,--------------------------------------------------.,--------------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  | ESC  || ESC  |   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+-------------||------+------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  |      ||      |   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	| CapsLk |   A  |   S  |   D  |   F  |   G  |------||------|   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------| _MD  || _KP  |------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  |      ||      |   N  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+-------------'`-------------+------+------+------+------+--------'
-	  | LGUI |   `  |  INS | Left | Rght |                            |  Up  |  Dn  |   [  |   ]  | RGUI |
-	  `----------------------------------'                            `----------------------------------'
-	                                     ,-------------.,-------------.
-	                                     | LCtr | LAlt || Ralt | RCtr |
-	                              ,------|------|------||------+------+------.
-	                              |      |      | Home || PgUp |      |      |
-	                              | BkSp | Del  |------||------| Enter| Space|
-	                              |      |      | End  || PgDn |      |      |
-	                              `--------------------'`--------------------'
+ 	,--------------------------------------------------. ,--------------------------------------------------.
+ 	| ESC    |   1  |   2  |   3  |   4  |   5  |      | |      |   6  |   7  |   8  |   9  |   0  |   -    |
+ 	|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ 	| Tab    |   Q  |   W  |   E  |   R  |   T  |      | |      |   Y  |   U  |   I  |   O  |   P  |   \    |
+ 	|--------+------+------+------+------+------|  [   | |   ]  |------+------+------+------+------+--------|
+ 	| CapsLk |   A  |   S  |   D  |   F  |   G  |------| |------|   H  |   J  |   K  |   L  |   ;  |   '    |
+ 	|--------+------+------+------+------+------|  {   | |   }  |------+------+------+------+------+--------|
+ 	| LShift |   Z  |   X  |   C  |   V  |   B  |      | |      |   N  |   M  |   ,  |   .  |   /  | RShift |
+ 	`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ 	  |MEDIA |   `  |   =  | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | MEDIA|
+ 	  `----------------------------------'                             `----------------------------------'
+ 	                                     ,-------------. ,-------------.
+ 	                                     | LCTL | LALT | | RGUI | RCTL |
+ 	                              ,------|------|------| |------+------+------.
+ 	                              |      |      | Home | | PgUp |      |      |
+ 	                              | BkSp | Del  |------| |------| Enter| Space|
+ 	                              |      |      | End  | | PgDn |      |      |
+ 	                              `--------------------' `--------------------'
 	 
 ### Keymap 2: Colemak layer
 
-	,--------------------------------------------------.,--------------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  | ESC  || ESC  |   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+-------------||------+------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   G  |      ||      |   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	| BkSpc  |   A  |   R  |   S  |   T  |   D  |------||------|   H  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------| _MD  || _KP  |------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  |      ||      |   K  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+-------------'`-------------+------+------+------+------+--------'
-	  | LGUI |   `  |  INS | Left | Rght |                            |  Up  |  Dn  |   [  |   ]  | RGUI |
-	  `----------------------------------'                            `----------------------------------'
-	                                     ,-------------.,-------------.
-	                                     | LCtr | LAlt || Ralt | RCtr |
-	                              ,------|------|------||------+------+------.
-	                              |      |      | Home || PgUp |      |      |
-	                              | BkSp | Del  |------||------| Enter| Space|
-	                              |      |      | End  || PgDn |      |      |
-	                              `--------------------'`--------------------'
+	,--------------------------------------------------. ,--------------------------------------------------.
+ 	| ESC    |   1  |   2  |   3  |   4  |   5  |      | |      |   6  |   7  |   8  |   9  |   0  |   -    |
+ 	|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+	| Tab    |   Q  |   W  |   F  |   P  |   G  |      | |      |   J  |   L  |   U  |   Y  |   ;  |   \    |
+ 	|--------+------+------+------+------+------|  [   | |   ]  |------+------+------+------+------+--------|
+ 	| BkSpc  |   A  |   R  |   S  |   T  |   D  |------| |------|   H  |   N  |   E  |   I  |   O  |   '    |
+ 	|--------+------+------+------+------+------|  {   | |   }  |------+------+------+------+------+--------|
+ 	| LShift |   Z  |   X  |   C  |   V  |   B  |      | |      |   K  |   M  |   ,  |   .  |   /  | RShift |
+ 	`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ 	  | MEDIA|   `  |   =  | Left | Rght |                             |  Up  |  Dn  |   [  |   ]  | MEDIA|
+ 	  `----------------------------------'                             `----------------------------------'
+ 	                                     ,-------------. ,-------------.
+ 	                                     | LCTL | LALT | | RGUI | RCTL |
+ 	                              ,------|------|------| |------+------+------.
+ 	                              |      |      | Home | | PgUp |      |      |
+ 	                              | BkSp | Del  |------| |------| Enter| Space|
+ 	                              |      |      | End  | | PgDn |      |      |
+ 	                              `--------------------' `--------------------'
 
 ### layer 3 : Media layer
 
-	,--------------------------------------------------.,--------------------------------------------------.
-	| TEENSY |  F1  |  F2  |  F3  |  F4  |  F5  | F11  ||  F12 |  F6  |  F7  |  F8  |  F9  |  F10 |        |
-	|--------+------+------+------+------+-------------||------+------+------+------+------+------+--------|
-	|        |      | PrSc | ScLk | Paus |      |      ||      |      | Mute | Vol- | Vol+ |      |        |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	|        |      |      |      |      |      |------||------| Stop | Prev | Play | Next | Sel  |        |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	|        |      |Dvorak|Qwerty|Colemk|      |      ||      |      |      |      |      |      |        |
-	`--------+------+------+------+------+-------------'`-------------+------+------+------+------+--------'
-	  |      |      |      |      |      |                            |      |      |      |      |      |
-	  `----------------------------------'                            `----------------------------------'
-	                                     ,-------------.,-------------.
-	                                     |      |      ||      |      |
-	                              ,------|------|------||------+------+------.
-	                              |      |      |      ||      |      |      |
-	                              |      |      |------||------|      |      |
-	                              |      |      |      ||      |      |      |
-	                              `--------------------'`--------------------'
-
-
-
-### Keymap 4: Keypad layer
-
-	,--------------------------------------------------.,--------------------------------------------------.
-	| Power  |      |      |      |      |      |      ||      |      | NmLk | KP = | KP / | KP * |        |
-	|--------+------+------+------+------+-------------||------+------+------+------+------+------+--------|
-	| Sleep  |      |      |      |      |      |      ||      |      | KP 7 | KP 8 | KP 9 | KP - |        |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	| Wake   |      |      |      |      |      |------||------|      | KP 4 | KP 5 | KP 6 | KP + |        |
-	|--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
-	|        |      |      |      |      |      |      ||      |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-	`--------+------+------+------+------+-------------'`-------------+------+------+------+------+--------'
-	  |      |      |      |      |      |                            | KP 0 |      | KP . |KP Ent|      |
-	  `----------------------------------'                            `----------------------------------'
-	                                     ,-------------.,-------------.
-	                                     |      |      ||      |      |
-	                              ,------|------|------||------+------+------.
-	                              |      |      |      ||      |      |      |
-	                              |      |      |------||------|      |      |
-	                              |      |      |      ||      |      |      |
-	                              `--------------------'`--------------------'
+ 	,--------------------------------------------------. ,--------------------------------------------------.
+ 	|   F11  |  F1  |  F2  |  F3  |  F4  |  F5  |TEENSY| |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F11   |
+ 	|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ 	|        |      |      |      |      |      |      | |      |      | PrSc | ScLk | Paus |      |        |
+ 	|--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
+ 	| CapsLk |      | Mute | Vol- | Vol+ |      |------| |------|      |Dvorak|Qwerty|Colmak|      |        |
+ 	|--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
+ 	|        | Stop | Prev | Play | Next | Sel  |      | |      |      |      |      |      |      |        |
+ 	`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ 	  |      |      |      |      |      |                             |      |      |      |      |      |
+ 	  `----------------------------------'                             `----------------------------------'
+	                                     ,-------------. ,-------------.
+ 	                                     |      |MacLck| |MacLck|      |
+ 	                              ,------|------|------| |------+------+------.
+ 	                              |      |      |      | |      |      |      |
+ 	                              |      |      |------| |------|      |      |
+ 	                              |      |      |      | |      |      |      |
+ 	                              `--------------------' `--------------------'
\ No newline at end of file
diff --git a/layouts/community/ortho_4x12/xyverz/keymap.c b/layouts/community/ortho_4x12/xyverz/keymap.c
index c9811ea4b..de270b469 100644
--- a/layouts/community/ortho_4x12/xyverz/keymap.c
+++ b/layouts/community/ortho_4x12/xyverz/keymap.c
@@ -8,6 +8,7 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUS
 #define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped.
 #define RGB_SWR RGB_M_SW        // Swirl Animation alias
 #define RGB_SNK RGB_M_SN        // Snake Animation alias
+#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -78,8 +79,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_ortho_4x12 ( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-  KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
+  KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, \
   BL_STEP, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______ \
   ),
@@ -96,8 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_ortho_4x12 ( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
-  KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
+  KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, \
   BL_STEP, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______ \
   ),
@@ -110,14 +111,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |RGB ON| MODE |RGB SW|RGB KN|RGB GR| HUE- | HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |      |      |      |      |      |MacLck|      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12 ( \
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 , \
   _______, RESET,   RGB_M_P, RGB_M_B, RGB_M_R, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+  _______, _______, _______, _______, MACLOCK, _______, _______, _______, _______, _______, _______, _______ \
   )
 };
 // clang-format on
diff --git a/layouts/community/ortho_4x12/xyverz/readme.md b/layouts/community/ortho_4x12/xyverz/readme.md
index d6614d956..2ee86792e 100644
--- a/layouts/community/ortho_4x12/xyverz/readme.md
+++ b/layouts/community/ortho_4x12/xyverz/readme.md
@@ -6,9 +6,12 @@ I'm moving all my 4x12s to the same keymap since I pretty much use it across all
 
 This revision includes this documentation and introduction of the individual RGB mode keys in the `ADJUST` layer.
 
+## What's New?
+ * Added the Mac Lock macro of CMD+CTRL+Q to lock the screen on my mac.
+ * Changed the location of the `pipe` and `backslash` keys to match my other layouts.
+
 ## Still to do:
 
- * Update layout files to match current standards.
  * Enjoy this revision; figure out new things later.
 
 ### Qwerty layer
@@ -57,9 +60,9 @@ This revision includes this documentation and introduction of the individual RGB
 
 ```
     ,-----------------------------------------------------------------------------------.
-    |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
+    |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  |   |
     |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Caps |      | Mute | Vol- | Vol+ |      |      |   _  |   +  |   {  |   }  |  |   |
+    | Caps |      | Mute | Vol- | Vol+ |      |      |   _  |   +  |   {  |   }  |      |
     |------+------+------+------+------+------|------+------+------+------+------+------|
     |      |      | Prev | Play | Next |      |      |      |      |      |      |      |
     |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -71,9 +74,9 @@ This revision includes this documentation and introduction of the individual RGB
 
 ```
     ,-----------------------------------------------------------------------------------.
-    |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
+    |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  \   |
     |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Caps |      | Mute | Vol- | Vol+ |      |      |   -  |   =  |   [  |   ]  |  \   |
+    | Caps |      | Mute | Vol- | Vol+ |      |      |   -  |   =  |   [  |   ]  |      |
     |------+------+------+------+------+------|------+------+------+------+------+------|
     |      |      | Prev | Play | Next |      |      |      |      |      |      |      |
     |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -91,6 +94,6 @@ This revision includes this documentation and introduction of the individual RGB
     |------+------+------+------+------+------|------+------+------+------+------+------|
     |RGB ON| MODE |RGB SW|RGB KN|RGB GR| HUE- | HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- |
     |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |      |      |
+    |      |      |      |      |      |MacLck|      |      |      |      |      |      |
     `-----------------------------------------------------------------------------------'
  ```