Updated keymaps (#3056)

* Updated info and fixed minor errors

* Updated folder name; overdue updates to keymap and readme files

Updated folder name; overdue updates to keymap and readme files

* Updated tri-layer feature

* Revert "Updated tri-layer feature"

This reverts commit 59b8b85761740e24f671e10fceea869f06a33ade.

* Updated tri-layer on keymap

* Fixed typos

* Updated keymaps

3 files changed, 266 insertions, 344 deletions

diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
index 38d08b20c8..02eed310a1 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
@@ -7,6 +7,7 @@
 // place overrides here
 #define PREVENT_STUCK_MODIFIERS
 #define TAPPING_TERM 175
+#define TAPPING_TOGGLE 2
 
 
 #endif
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 999e76ca3f..b318e1bea0 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -5,30 +5,32 @@
 extern keymap_config_t keymap_config;
 
 enum kinesis_layers {
-  _CMODDH,    // Colemak Mod-DH Matrix (default layer)
+  _COLEMAK,   // Colemak (default layer)
   _QWERTY,    // Qwerty
-  _COLEMAK,   // Colemak
   _NUMBERS,   // Numbers & Symbols
   _NUMBERS2,  // Numbers & Symbols 2 (identical as _NUMBERS; basically used for tri-layer access to _ADJUST)
   _FUNCTION,  // Function
   _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
   _NUMPAD,    // Numpad
-  _CMODDHGM,  // Colemak Mod-DH Matrix gaming/vanilla (no dual-role keys with layer access)
+  _COLEMAKGM, // Colemak gaming/vanilla (no dual-role keys with layer access)
   _QWERTYGM,  // QWERTY gaming/vanilla (no dual-role keys with layer access)
-  _ADJUST     // Adjust layer
+  _ADJUST,    // Adjust layer, accessed via tri-layer feature)
+  _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
 };
 
 enum kinesis_keycodes {
-  CMODDH = SAFE_RANGE,
+  COLEMAK = SAFE_RANGE,
   QWERTY,
-  COLEMAK,
-  CMODDHGM,
+  COLEMAKGM,
   QWERTYGM,
+  NUMPAD = TG(_NUMPAD),
+  ADJUST = MO(_ADJUST2),
   SPCFN  = LT(_FUNCTION, KC_SPC),
   BSPCFN = LT(_FUNCTION2, KC_BSPC),
   ENTNS  = LT(_NUMBERS, KC_ENT),
   DELNS  = LT(_NUMBERS2, KC_DEL),
   CTLESC = CTL_T(KC_ESC),
+  ALTAPP = ALT_T(KC_APP),
   NKROTG = MAGIC_TOGGLE_NKRO
 };
 
@@ -52,13 +54,13 @@ enum {
 
 void dance_LAYER_finished(qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-     layer_on(_ADJUST);
-     set_oneshot_layer(_ADJUST, ONESHOT_START);
+     layer_on(_ADJUST2);
+     set_oneshot_layer(_ADJUST2, ONESHOT_START);
   }
 }
 void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-     layer_off(_ADJUST);
+     layer_off(_ADJUST2);
      clear_oneshot_layer_state(ONESHOT_PRESSED);
   }
 }
@@ -78,82 +80,83 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak Mod-DH Matrix
-*  (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+/* 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|
 *  `-----------------------------------------------------------------------------------------------------------'
-*  ,-------------------------------------------.                   ,-------------------------------------------.
-*  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |   Tab  |   Q  |   W  |   F  |   P  |   B  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |Esc/Ctrl|   A  |   R  |   S  |   T  |   G  |                   |   M  |   N  |   E  |   I  |   O  |   '    |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |SC Shift|   Z  |   X  |   C  |   D  |   V  |                   |   K  |   H  |   ,  |   .  |   /  |SC Shift|
-*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-*           |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-*           `---------------------------'                                 `---------------------------'
-*                              ,---------------.                   ,---------------.
-*                              |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
-*                      |   /   |   /   |-------|                   |-------|   /   |   /   |
-*                      |  Fn   | Number|  Bspc |                   |  Tab  |Number2|  Fn2  |
-*                      `-----------------------'                   `-----------------------' 
 */
-[_CMODDH] = KEYMAP(
+
+/* 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  |
+*                      `-----------------------'   `-----------------------' 
+*/
+[_COLEMAK] = KEYMAP(
   // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,       KC_F8,
+  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_B,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,
+  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),
-                                               ALT_T(KC_APP),
+                                               ALTAPP,
                              SPCFN,   ENTNS,   KC_BSPC,
   //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NUMPAD), MO(_ADJUST),
+  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_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  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_TAB,  DELNS,   BSPCFN
+  KC_ENT,  DELNS,   BSPCFN
 ),
 
 /* QWERTY
 *  (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 |                   |  Tab  |Number2|  Fn2  |
-*                      `-----------------------'                   `-----------------------' 
+*  ,-------------------------------------------.   ,-------------------------------------------.
+*  |    =   |   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] = KEYMAP(
   // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,       KC_F8,
+  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,
@@ -161,11 +164,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,
   //Left Thumb                         
                                       CTLESC,  ALL_T(KC_NO),
-                                               ALT_T(KC_APP),
+                                               ALTAPP,
                              SPCFN,   ENTNS,   KC_BSPC,
 
   //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NUMPAD), MO(_ADJUST),
+  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,
@@ -174,81 +177,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //Right Thumb
   KC_RALT, KC_RCTL,
   KC_RGUI,
-  KC_TAB,  DELNS,   BSPCFN
-),
-
-/* Colemak
-*  (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 |                   |  Tab  |Number2|  Fn2  |
-*                      `-----------------------'                   `-----------------------' 
-*/
-[_COLEMAK] = KEYMAP(
-  // 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),
-                                               ALT_T(KC_APP),
-                             SPCFN,   ENTNS,   KC_BSPC,
-  //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NUMPAD), MO(_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_TAB,  DELNS,   BSPCFN
+  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  |                   |   !  |   @  |   #  |   $  |   %  |        |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |        |      |   .  |  / * |  - _ |  + = |                   |  ` ~ |  [ { |  ] } |      |      |        |
-*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-*           |   (  |   )  |  [ { |  ] } |                                 |      |      |      |      |
-*           `---------------------------'                                 `---------------------------'
-*                              ,---------------.                   ,---------------.
-*                              |       |       |                   |       |       |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      |       |       |       |                   |       |       |       |
-*                      |       |       |-------|                   |-------|       |       |
-*                      |       |       |       |                   |       |       |       |
-*                      `-----------------------'                   `-----------------------' 
+*  ,-------------------------------------------.   ,-------------------------------------------.
+*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
+*  |        |   6  |   7  |   8  |   9  |   0  |   |   ^  |   &  |   *  |   (  |   )  |        |
+*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
+*  |        |   1  |   2  |   3  |   4  |   5  |   |   !  |   @  |   #  |   $  |   %  |        |
+*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
+*  |        |      |   .  |  / * |  - _ |  + = |   |  ` ~ |  [ { |  ] } |      |      |        |
+*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
+*           |   (  |   )  |  [ { |  ] } |                 |      |      |      |      |
+*           `---------------------------'                 `---------------------------'
+*                              ,---------------.   ,---------------.
+*                              |       |       |   |       |       |
+*                      ,-------|-------|-------|   |-------+-------+-------.
+*                      |       |       |       |   |       |       |       |
+*                      |       |       |-------|   |-------|       |       |
+*                      |       |       |       |   |       |       |       |
+*                      `-----------------------'   `-----------------------' 
 */
 [_NUMBERS] = KEYMAP(
   // Left Hand
@@ -301,27 +252,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 /* 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 |
-*           `---------------------------'                                 `---------------------------'
-*                              ,---------------.                   ,---------------.
-*                              |       |       |                   |       |       |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      |       |       |       |                   |       |       |       |
-*                      |       |       |-------|                   |-------|       |       |
-*                      |       |       |       |                   |C+A+Tab|       |       |
-*                      `-----------------------'                   `-----------------------' 
+*  ,-------------------------------------------.   ,-------------------------------------------.
+*  |   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] = KEYMAP(
   // Left Hand
@@ -343,9 +291,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PGDN, KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_END,     _______,
            KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MSTP,
   // Right Thumb
-  _______,     _______,
+  _______, _______,
   _______,
-  LCA(KC_TAB), _______, _______
+  _______, _______, _______
 ),
 
 [_FUNCTION2] = KEYMAP(
@@ -368,34 +316,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PGDN, KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_END,     _______,
            KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MSTP,
   // Right Thumb
-  _______,     _______,
+  _______, _______,
   _______,
-  LCA(KC_TAB), _______, _______
+  _______, _______, _______
 ),
 
 /* 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|
-*           `---------------------------'                                 `---------------------------'
-*                              ,---------------.                   ,---------------.
-*                              |       |       |                   |       |       |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      |       |       |       |                   |       |       |       |
-*                      |       |       |-------|                   |-------|       |       |
-*                      |       |       |       |                   |       |       |       |
-*                      `-----------------------'                   `-----------------------' 
+*  ,-------------------------------------------.   ,-------------------------------------------.
+*  |        | 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|       |       |
+*                      `-----------------------'   `-----------------------' 
 */
 [_NUMPAD] = KEYMAP(
   // Left Hand
@@ -422,82 +367,76 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______
 ),
 
-/* Colemak Mod-DH Matrix gaming/vanilla
-*  (No access to Function or Numbers layers; mainly used for gaming; double-tap the 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  |   B  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |  Ctrl  |   A  |   R  |   S  |   T  |   G  |                   |   M  |   N  |   E  |   I  |   O  |   '    |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |  Shift |   Z  |   X  |   C  |   D  |   V  |                   |   K  |   H  |   ,  |   .  |   /  |  Shift |
-*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-*           |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-*           `---------------------------'                                 `---------------------------'
-*                              ,---------------.                   ,---------------.
-*                              |Esc/Ctl|TD(ADJ)|                   |  RAlt |  RCtl |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      |       |       |  LAlt |                   |  RGUI |       |       |
-*                      | Space | Enter |-------|                   |-------| Delete|  Bspc |
-*                      |       |       |  Bspc |                   |  Tab  |       |       |
-*                      `-----------------------'                   `-----------------------' 
+/* Colemak gaming/vanilla
+*  (No 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 |   | Enter |       |       |
+*                      `-----------------------'   `-----------------------' 
 */
-[_CMODDHGM] = KEYMAP(
+[_COLEMAKGM] = KEYMAP(
   // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  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_B,
-  KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,
+  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,  KC_BSPC,
   //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NUMPAD), MO(_ADJUST),
+  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_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  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,
-  KC_TAB,  KC_DEL,  KC_BSPC
+  KC_ENT,  KC_DEL,  KC_BSPC
 ),
 
 /* QWERTY gaming/vanilla
-*  (No access to Function or Numbers layers; mainly used for gaming; double-tap the 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  |   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)|                   |  RAlt |  RCtl |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      |       |       |  LAlt |                   |  RGUI |       |       |
-*                      | Space | Enter |-------|                   |-------| Delete|  Bspc |
-*                      |       |       |  Bspc |                   |  Tab  |       |       |
-*                      `-----------------------'                   `-----------------------' 
+*  (No 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)|   |  RAlt |  RCtl |
+*                      ,-------|-------|-------|   |-------+-------+-------.
+*                      |       |       |  LAlt |   |  RGUI |       |       |
+*                      | Space | Enter |-------|   |-------| Delete|  Bspc |
+*                      |       |       |  Bspc |   | Enter |       |       |
+*                      `-----------------------'   `-----------------------' 
 */
 [_QWERTYGM] = KEYMAP(
   // Left Hand
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  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,
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
@@ -508,7 +447,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                KC_LALT,
                              KC_SPC,  KC_ENT,  KC_BSPC,
   //Right Hand
-  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NUMPAD), MO(_ADJUST),
+  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,
@@ -517,52 +456,74 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //Right Thumb
   KC_RALT, KC_RCTL,
   KC_RGUI,
-  KC_TAB,  KC_DEL,  KC_BSPC
+  KC_ENT,  KC_DEL,  KC_BSPC
 ),
 
 /* Adjust layer
-*  (Enter/Number + Delete/Number2 under non-gaming/vanilla layers)
-*  ,-----------------------------------------------------------------------------------------------------------.
-*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-*  `-----------------------------------------------------------------------------------------------------------'
-*  ,-------------------------------------------.                   ,-------------------------------------------.
-*  |        |CModDH|Qwerty|Colmak|CMoDGM| QWGM |                   |Numpad|      |      |      |      | RESET  |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |        |      |      |      |      |      |                   |      |NKROTG|      |      |      |        |
-*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
-*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-*           |      |      |      |      |                                 |      |      |      |      |
-*           `---------------------------'                                 `---------------------------'
-*                              ,---------------.                   ,---------------.
-*                              |       |       |                   |       |       |
-*                      ,-------|-------|-------|                   |-------+-------+-------.
-*                      |       |       |       |                   |       |       |       |
-*                      |       |       |-------|                   |-------|       |       |
-*                      |       |       |       |                   |       |       |       |
-*                      `-----------------------'                   `-----------------------' 
+*  (Enter/Number + Delete/Number2 under non-gaming/vanilla layers; Numpad is a toggle)
+*  ,-------------------------------------------.   ,-------------------------------------------.
+*  |        |Colmak|Qwerty|      |ClmkGM| QWGM |   |Numpad|      |      |      |      |  RESET |
+*  |--------+------+------+------+------+------|