Keymap: Updated keymap with the "pretty" layout (#3812)

3 files changed, 295 insertions, 422 deletions

diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index bf75327f1b..78defea237 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -78,454 +78,327 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Fundtion Row Keys
-/  (Identical across layers, unless otherwise noted; Numpad is a toggle; Adjust is mometary)
-*  ,-----------------------------------------------------------------------------------------------------------.
-*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-*  `-----------------------------------------------------------------------------------------------------------'
-*/
-
 /* Colemak
-*  (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |    =   |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   -    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |   Tab  |   Q  |   W  |   F  |   P  |   G  |   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |   |   H  |   N  |   E  |   I  |   O  |   '    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |SC Shift|   Z  |   X  |   C  |   V  |   B  |   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |  Ins |   `  |   [  |   ]  |                 | Left | Down |  Up  | Right|
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |Esc/Ctl| Hyper |   |  RAlt |  RCtl |
-*                      ,-------|-------|-------|   |-------+-------+-------.
-*                      | Space | Enter |App/Alt|   |  RGUI | Delete|  Bspc |
-*                      |   /   |   /   |-------|   |-------|   /   |   /   |
-*                      |  Fn   | Number|  Bspc |   | Enter |Number2|  Fn2  |
-*                      `-----------------------'   `-----------------------' 
+   (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+  ,-----------------------------------------------------------------------------------------------------------.
+  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+  `-----------------------------------------------------------------------------------------------------------'
+  ,-------------------------------------------.                   ,-------------------------------------------.
+  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
+  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+           |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+	       `---------------------------'                                 `---------------------------'
+	                          ,---------------.                   ,---------------.
+	                          |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
+	                  ,-------|-------|-------|                   |-------+-------+-------.
+	                  | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
+	                  |   /   |   /   |-------|                   |-------|   /   |   /   |
+	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
+	                  `-----------------------'                   `-----------------------' 
 */
-[_COLEMAK] = LAYOUT(
-  // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,
-  //Left Thumb
-                                      CTLESC,  ALL_T(KC_NO),
-                                               ALTAPP,
-                             SPCFN,   ENTNS,   KC_BSPC,
-  //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
-  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
-  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-  //Right Thumb
-  KC_RALT, KC_RCTL,
-  KC_RGUI,
-  KC_ENT,  DELNS,   BSPCFN
+[_COLEMAK] = LAYOUT_pretty(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+                                                        CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
+                                                                 ALTAPP,                    KC_RGUI,
+                                               SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
 ),
 
 /* QWERTY
-*  (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |    =   |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   -    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |   Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |   \    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |Esc/Ctrl|   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |   ;  |   '    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |SC Shift|   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |   ,  |   .  |   /  |SC Shift|
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |  Ins |   `  |   [  |   ]  |                 | Left | Down |  Up  | Right|
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |Esc/Ctl| Hyper |   |  RAlt |  RCtl |
-*                      ,-------|-------|-------|   |-------+-------+-------.
-*                      | Space | Enter |App/Alt|   |  RGUI | Delete|  Bspc |
-*                      |   /   |   /   |-------|   |-------|   /   |   /   |
-*                      |  Fn   | Number|  Bspc |   | Enter |Number2|  Fn2  |
-*                      `-----------------------'   `-----------------------' 
+   (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+  ,-----------------------------------------------------------------------------------------------------------.
+  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+  `-----------------------------------------------------------------------------------------------------------'
+  ,-------------------------------------------.                   ,-------------------------------------------.
+  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |Esc/Ctrl|   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |SC Shift|
+  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+	       `---------------------------'                                 `---------------------------'
+	                          ,---------------.                   ,---------------.
+	                          |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
+	                  ,-------|-------|-------|                   |-------+-------+-------.
+	                  | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
+	                  |   /   |   /   |-------|                   |-------|   /   |   /   |
+	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
+	                  `-----------------------'                   `-----------------------' 
 */
-[_QWERTY] = LAYOUT(
-  // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,
-  //Left Thumb                         
-                                      CTLESC,  ALL_T(KC_NO),
-                                               ALTAPP,
-                             SPCFN,   ENTNS,   KC_BSPC,
-
-  //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
-  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
-  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-  //Right Thumb
-  KC_RALT, KC_RCTL,
-  KC_RGUI,
-  KC_ENT,  DELNS,   BSPCFN
+[_QWERTY] = LAYOUT_pretty(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+                                                        CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
+                                                                 ALTAPP,                    KC_RGUI,
+                                               SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
 ),
 
 /* Number/symbol layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |   6  |   7  |   8  |   9  |   0  |   |   ^  |   &  |   *  |   (  |   )  |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |   1  |   2  |   3  |   4  |   5  |   |   !  |   @  |   #  |   $  |   %  |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |      |   .  |  / * |  - _ |  + = |   |  ` ~ |  [ { |  ] } |      |      |        |
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |   (  |   )  |  [ { |  ] } |                 |      |      |      |      |
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |       |       |   |       |       |
-*                      ,-------|-------|-------|   |-------+-------+-------.
-*                      |       |       |       |   |       |       |       |
-*                      |       |       |-------|   |-------|       |       |
-*                      |       |       |       |   |       |       |       |
-*                      `-----------------------'   `-----------------------' 
+   (Multiple characters: single-tap for first, double-tap for second)
+  ,-----------------------------------------------------------------------------------------------------------.
+  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+  `-----------------------------------------------------------------------------------------------------------'
+  ,-------------------------------------------.                   ,-------------------------------------------.
+  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |   6  |   7  |   8  |   9  |   0  |                   |   ^  |   &  |   *  |   (  |   )  |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |   1  |   2  |   3  |   4  |   5  |                   |   !  |   @  |   #  |   $  |   %  |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |      |   .  |  / * |  - _ |  + = |                   |  ` ~ |  [ { |  ] } |      |      |        |
+  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+	       |   (  |   )  |  [ { |  ] } |                                 |      |      |      |      |
+	       `---------------------------'                                 `---------------------------'
+	                          ,---------------.                   ,---------------.
+	                          |       |       |                   |       |       |
+	                  ,-------|-------|-------|                   |-------+-------+-------.
+	                  |       |       |       |                   |       |       |       |
+	                  |       |       |-------|                   |-------|       |       |
+	                  |       |       |       |                   |       |       |       |
+	                  `-----------------------'                   `-----------------------' 
 */
-[_NUMBERS] = LAYOUT(
-  // Left Hand
-  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-  KC_F12,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
-  _______,  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
-  _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
-  _______,  _______,  KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),
-            KC_LPRN,  KC_RPRN,  TD(LBCB), TD(RBCB),
-  // Left Thumb
-                                          _______,  _______,
-                                                    _______,
-                                _______,  _______,  _______,
-  // Right Hand
-  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______, 
-  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  _______, 
-  TD(GVTL), TD(LBCB), TD(RBCB), _______,  _______,  _______,
-            _______,  _______,  _______,  _______, 
-  // Right Thumb
-  _______,  _______,
-  _______,
-  _______,  _______,  _______
+[_NUMBERS] = LAYOUT_pretty(
+  _______, _______, _______, _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,                                                          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
+  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______, 
+  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______, 
+  _______, _______, KC_DOT,  TD(SLAS), TD(MNUN), TD(PLEQ),                                                       TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
+           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______, 
+                                                           _______, _______,                   _______, _______,
+                                                                    _______,                   _______,
+                                                 _______,  _______, _______,                   _______, _______, _______
 ),
 
-[_NUMBERS2] = LAYOUT(
-  // Left Hand
-  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-  KC_F12,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
-  _______,  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
-  _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
-  _______,  _______,  KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),
-            KC_LPRN,  KC_RPRN,  TD(LBCB), TD(RBCB),
-  // Left Thumb
-                                          _______,  _______,
-                                                    _______,
-                                _______,  _______,  _______,
-  // Right Hand
-  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______, 
-  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  _______, 
-  TD(GVTL), TD(LBCB), TD(RBCB), _______,  _______,  _______,
-            _______,  _______,  _______,  _______, 
-  // Right Thumb
-  _______,  _______,
-  _______,
-  _______,  _______,  _______
+[_NUMBERS2] = LAYOUT_pretty(
+  _______, _______, _______, _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,                                                          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
+  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______, 
+  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______, 
+  _______, _______, KC_DOT,  TD(SLAS), TD(MNUN), TD(PLEQ),                                                       TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
+           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______, 
+                                                           _______, _______,                   _______, _______,
+                                                                    _______,                   _______,
+                                                 _______,  _______, _______,                   _______, _______, _______
 ),
 
 /* Function layer
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |      |      |  Up  |      |      |   |      |      |  Up  |Ctrl+Y|      |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |Ctrl+A| Left | Down | Right|C+A+Tb|   | PgUp | Right| Down | Left | Home |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc |   | PgDn | Mute | Vol- | Vol+ |  End |        |
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |      |      |      |      |                 | Prev | Play | Next | Stop |
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |       |       |   |       |       |
-*                      ,-------|-------|-------|   |-------+-------+-------.
-*                      |       |       |       |   |       |       |       |
-*                      |       |       |-------|   |-------|       |       |
-*                      |       |       |       |   |       |       |       |
-*                      `-----------------------'   `-----------------------' 
+  ,-----------------------------------------------------------------------------------------------------------.
+  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+  `-----------------------------------------------------------------------------------------------------------'
+  ,-------------------------------------------.                   ,-------------------------------------------.
+  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |      |      |  Up  |      |      |                   |      |      |  Up  |Ctrl+Y|      |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |Ctrl+A| Left | Down | Right|C+A+Tb|                   | PgUp | Right| Down | Left | Home |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc |                   | PgDn | Mute | Vol- | Vol+ |  End |        |
+  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+	       |      |      |      |      |                                 | Prev | Play | Next | Stop |
+	       `---------------------------'                                 `---------------------------'
+	                          ,---------------.                   ,---------------.
+	                          |       |       |                   |       |       |
+	                  ,-------|-------|-------|                   |-------+-------+-------.
+	                  |       |       |       |                   |       |       |       |
+	                  |       |       |-------|                   |-------|       |       |
+	                  |       |       |       |                   |       |       |       |
+	                  `-----------------------'                   `-----------------------' 
 */
-[_FUNCTION] = LAYOUT(
-  // Left Hand
-  _______, _______,    _______,    _______,    _______,    _______, _______, _______, _______,
-  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,
-  _______, _______,    _______,    KC_UP,      _______,    _______, 
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,
-           _______,    _______,    _______,    _______,
-  // Left Thumb
-                                               _______,    _______,
-                                                           _______,
-                                   _______,    _______,    _______,
-  // Right Hand  
-  _______, _______,    _______,    _______,    _______,    _______, _______, _______, _______,
-  KC_F6,   KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,
-  _______, _______,    KC_UP,      LCTL(KC_Y), _______,    _______,
-  KC_PGUP, KC_LEFT,    KC_DOWN,    KC_RGHT,    KC_HOME,    _______,
-  KC_PGDN, KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_END,     _______,
-           KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MSTP,
-  // Right Thumb
-  _______, _______,
-  _______,
-  _______, _______, _______
+[_FUNCTION] = LAYOUT_pretty(
+  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
+  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                                                             KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
+  _______, _______,    _______,    KC_UP,      _______,    _______,                                                           _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
+  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                                                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
+  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                                                           KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
+           _______,    _______,    _______,    _______,                                                                                KC_MPRV, KC_MPLY, KC_MNXT,    KC_MSTP,
+                                                                        _______, _______,                   _______, _______,
+                                                                                 _______,                   _______,
+                                                           _______,     _______, _______,                   _______, _______, _______
 ),
 
-[_FUNCTION2] = LAYOUT(
-  // Left Hand
-  _______, _______,    _______,    _______,    _______,    _______, _______, _______, _______,
-  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,
-  _______, _______,    _______,    KC_UP,      _______,    _______, 
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,
-           _______,    _______,    _______,    _______,
-  // Left Thumb
-                                               _______,    _______,
-                                                           _______,
-                                   _______,    _______,    _______,
-  // Right Hand  
-  _______, _______,    _______,    _______,    _______,    _______, _______, _______, _______,
-  KC_F6,   KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,
-  _______, _______,    KC_UP,      LCTL(KC_Y), _______,    _______,
-  KC_PGUP, KC_LEFT,    KC_DOWN,    KC_RGHT,    KC_HOME,    _______,
-  KC_PGDN, KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_END,     _______,
-           KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MSTP,
-  // Right Thumb
-  _______, _______,
-  _______,
-  _______, _______, _______
+[_FUNCTION2] = LAYOUT_pretty(
+  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
+  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                                                             KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
+  _______, _______,    _______,    KC_UP,      _______,    _______,                                                           _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
+  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                                                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
+  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                                                           KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
+           _______,    _______,    _______,    _______,                                                                                KC_MPRV, KC_MPLY, KC_MNXT,    KC_MSTP,
+                                                                        _______, _______,                   _______, _______,
+                                                                                 _______,                   _______,
+                                                           _______,     _______, _______,                   _______, _______, _______
 ),
 
 /* Numpad layer
-*  (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |        | NumLk|      |      |      |      |   |  Tab | NumLk| KP / | KP * | KP - |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 |   |      | KP 7 | KP 8 | KP 9 | KP + |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        | KP 1 | KP 2 | KP 3 | KP 4 | KP 5 |   |      | KP 4 | KP 5 | KP 6 |  =   |        |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |        |      | KP . |KP/KP*| KP- _| KP+ =|   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |   (  |   )  |  [ { |  ] } |                 | KP 0 |  ,   | KP . |KP Ent|
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |       |       |   |       |       |
-*                      ,-------|-------|-------|   |-------+-------+-------.
-*                      |       |       |       |   |       |       |       |
-*                      |       |       |-------|   |-------|       |       |
-*                      |       |       |       |   | KP Ent|       |       |
-*                      `-----------------------'   `-----------------------' 
+   (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
+  ,-----------------------------------------------------------------------------------------------------------.
+  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+  `-----------------------------------------------------------------------------------------------------------'
+  ,-------------------------------------------.                   ,-------------------------------------------.
+  |        | NumLk|      |      |      |      |                   |  Tab | NumLk| KP / | KP * | KP - |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 |                   |      | KP 7 | KP 8 | KP 9 | KP + |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        | KP 1 | KP 2 | KP 3 | KP 4 | KP 5 |                   |      | KP 4 | KP 5 | KP 6 |  =   |        |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |        |      | KP . |KP/KP*| KP- _| KP+ =|                   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
+  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+	       |   (  |   )  |  [ { |  ] } |                                 | KP 0 |  ,   | KP . |KP Ent|
+	       `---------------------------'                                 `---------------------------'
+	                          ,---------------.                   ,---------------.
+	                          |       |       |                   |       |       |
+	                  ,-------|-------|-------|                   |-------+-------+-------.
+	                  |       |       |       |                   |       |       |       |
+	                  |       |       |-------|                   |-------|       |       |
+	                  |       |       |       |                   |       |       |       |
+	                  `-----------------------'                   `-----------------------' 
 */
-[_NUMPAD] = LAYOUT(
-  // Left Hand
-  _______, _______, _______, _______,    _______,   _______, _______, _______, _______,
-  _______, KC_NLCK, _______, _______,    _______,   _______,
-  _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,
-  _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,
-  _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ),
-           KC_LPRN, KC_RPRN, TD(LBCB),   TD(RBCB),
-  // Left Thumb
-                                         _______,   _______,
-                                                    _______,
-                             _______,    _______,   _______,
-  // Right Hand
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
-  _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
-  _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
-  _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-           KC_P0,   KC_COMM, KC_PDOT, KC_PENT,
-  // Right Thumb
-  _______, _______,
-  _______,
-  _______, _______, _______
+[_NUMPAD] = LAYOUT_pretty(
+  _______, _______, _______, _______,    _______,   _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_NLCK, _______, _______,    _______,   _______,                                                         KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,                                                           _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
+  _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,                                                           _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
+  _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
+           KC_LPRN, KC_RPRN, TD(LBCB),   TD(RBCB),                                                                            KC_P0,   KC_COMM, KC_PDOT, KC_PENT,
+                                                               _______, _______,                   _______, _______,
+                                                                        _______,                   _______,
+                                                    _______,   _______, _______,                   _______, _______, _______
 ),
 
 /* Colemak gaming/vanilla
-*  (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |    =   |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   -    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |   Tab  |   Q  |   W  |   F  |   P  |   G  |   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |  Ctrl  |   A  |   R  |   S  |   T  |   D  |   |   H  |   N  |   E  |   I  |   O  |   '    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |  Shift |   Z  |   X  |   C  |   V  |   B  |   |   K  |   M  |   ,  |   .  |   /  |  Shift |
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |  Ins |   `  |   [  |   ]  |                 | Left | Down |  Up  | Right|
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |Esc/Ctl|TD(ADJ)|   |  RAlt |  RCtl |
-*                      ,-------|-------|-------|   |-------+-------+-------.
-*                      |       |       |  LAlt |   |  RGUI |       |       |
-*                      | Space | Enter |-------|   |-------| Delete|  Bspc |
-*                      |       |       |Bspc/FN|   | Ent/NS|       |       |
-*                      `-----------------------'   `-----------------------' 
+   (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+  ,-----------------------------------------------------------------------------------------------------------.
+  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+  `-----------------------------------------------------------------------------------------------------------'
+  ,-------------------------------------------.                   ,-------------------------------------------.
+  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |  Ctrl  |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
+  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
+  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+	       `---------------------------'                                 `---------------------------'
+	                          ,---------------.                   ,---------------.
+	                          |Esc/Ctl|TD(ADJ)|                   |  RAlt |  RCtl |
+	                  ,-------|-------|-------|                   |-------+-------+-------.
+	                  |       |       |  LAlt |                   |  RGUI |       |       |
+	                  | Space | Enter |-------|                   |-------| Delete|  Bspc |
+	                  |       |       |Bspc/FN|                   | Ent/NS|       |       |
+	                  `-----------------------'                   `-----------------------' 
 */
-[_COLEMAKGM] = LAYOUT(
-  // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,
-  KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,
-  //Left Thumb
-                                      CTLESC,  TD(ADJ),
-                                               KC_LALT,
-                             KC_SPC,  KC_ENT,  BSPCFN,
-  //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
-  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-  //Right Thumb
-  KC_RALT, KC_RCTL,
-  KC_RGUI,
-  ENTNS,   KC_DEL,  KC_BSPC
+[_COLEMAKGM] = LAYOUT_pretty(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+  KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+                                                        CTLESC,  TD(ADJ),                   KC_RALT, KC_RCTL,
+                                                                 KC_LALT,                   KC_RGUI,
+                                               KC_SPC,  KC_ENT,  BSPCFN,                    ENTNS,   KC_DEL,  KC_BSPC
 ),
 
 /* QWERTY gaming/vanilla
-*  (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
-*  ,-------------------------------------------.   ,-------------------------------------------.
-*  |    =   |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   -    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |   Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |   \    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |  Ctrl  |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |   ;  |   '    |
-*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
-*  |  Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |   ,  |   .  |   /  |  Shift |
-*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
-*           |  Ins |   `  |   [  |   ]  |                 | Left | Down |  Up  | Right|
-*           `---------------------------'                 `---------------------------'
-*                              ,---------------.   ,---------------.
-*                              |Esc/Ctl|TD(ADJ)|