From 27e3458f44ee9b06ec84431b9d4e861668ace563 Mon Sep 17 00:00:00 2001
From: Xyverz <xyverz@gmail.com>
Date: Fri, 18 May 2018 15:32:50 -0700
Subject: Updating my maps in upstream master (#2987)

* Adding Rama M10-A Macropad

* ch-ch-ch changes...

* Major overhaul based on SMT's keymap.

* more changes.

* Moved the FKeys to the ADJUST layer.

* More rearranging.

* Alias in Atreus62 keymap to make it more legible
Added config.h to fix tapping_term issue for Caps Lock key in OSX

* Added OrthoDox layout.

* More layout changes.

* Fixing things with the keyboard.

* Finishing touches.

Set left-hand master in config.h
Embedded the arrow keys in keymap.c

* Revised keymap making this easier to use.

* additions and changes.

* changes to various keymaps.

* Minor adjustments to OrthoDox layout.

* Added Eco keymap. Updated Let's Split keymap.

* Added gherkin

* Removed my M10A keymap

* Planck Keymap Updates

Updated my Planck keymap and created a simple keymap for Seph's Preonic.

* Added readme

* readme fixes

* Update readme.md

more clarification

* Keymap Tweaks

Removed the Power button setting from the keymap. It was in a
horrible location. I'll work on getting it setup somewhere else
sometime later.

* Added Readme

I finally got around to adding a readme to this keymap. I've also added minor changes to the layout.

* Fixed Keymap Error

* Fixed Readme

* adding iris and levinson keymaps

* Tweaks to keymap

* added youngJZ keymap

* Changes to keymap
Added a readme.md

* Levinson changes

Added the readme.md and rules.mk files.
Configured RGB underglow and backlighting.

* fixed readme

* changes to keymaps

* Updated keymap

* Updated readme.md

* Updated Readme (again)

* Updated Readme

Fixed formatting. Again.

* Updated readme

This is the last readme update for this keyboard update. I hope.

* Added Contra keymap

* Kinesis Keymap Update

* Updated Keymaps

I've updated my Kinesis (Stapelberg) layout and my Clueboard 66 layout.
I've also updated my Kinesis Readme.

* Clueboard Keymap update

Added media keys to my Clueboard 66 Rev2 layout.

* Added keymap

Added Minidox keymap & rules.
Added user function to Let's Split keymap that turns off the red
 LEDs on the Pro Micros.

* New Zen keymap

Added Zen keyboard to my list of keyboards, so had to generate a new
keymap for it.

Also adding some changes to my MiniDox keymap and config.h, as well
as my Levinson's config.h.

The config.h file changes enable ee_hands.

* A few changes for useability

I made a few changes to the Minidox keymap to see if I can't make it more useable.

I'm also working on streamlining the Zen keyboard keymap to reduce layers.

* Re-vamped Iris keymap.

* changes

* minor keymap change

This was a minor keymap change to use mod_tap for the backspace key:
ALT when held, BSPC when tapped.

* Added Fourier keymap

* Keymap Cleanup

Moved KC_ESC to KC_CAPS, and changed KC_ESC to KC_GRV
This is because of muscle memory, I kept hitting ESC when trying to hit TAB.

* Keymap Adjustments

Swapped Caps/Esc, put Caps in Raise/Lower layers, put Grv in normal
Esc position. Adjusted the readme.md to reflect these changes.

* minor tweaks

Added code to disable red ProMicro LEDs after flashing.

* Clean-up

* Corrections to keymap.

Fixed a foul-up in the Zen keymap where the lctrl was where the LOWER
should have been.

* Changes to make this fall in line with the new Layout features

* Moving to LAYOUTs for 4x12 boards

* fixed config.h file

* standardization changes

* Reverted Atreus62 keymap to LAYOUT format

* Switch Preonic and Nyquist to ortho_5x12

* Corrections to config.h

* config.h file tweaks

* config.h file tweaks
---
 keyboards/kinesis/keymaps/xyverz/keymap.c  | 34 +++++++++++++++++++++++-------
 keyboards/kinesis/keymaps/xyverz/readme.md |  4 +++-
 keyboards/kinesis/stapelberg/stapelberg.c  | 12 +++++++++++
 3 files changed, 41 insertions(+), 9 deletions(-)

(limited to 'keyboards/kinesis')

diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index fa181e0390..4b4ad95cfd 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -1,4 +1,4 @@
-#include "kinesis.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "eeconfig.h"
 
@@ -132,7 +132,7 @@ extern keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_DV] = KEYMAP(
+[_DV] = LAYOUT (
            // Left Hand
            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
            KC_RBRC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
@@ -158,10 +158,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_PGDN, LT(_KP, KC_ENT),  KC_SPC
     ),
 
-[_QW] = KEYMAP(
+[_QW] = LAYOUT (
            // Left Hand
            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+           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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
@@ -184,10 +184,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_PGDN, LT(_KP, KC_ENT),  KC_SPC
     ),
 
-[_CM] = KEYMAP(
+[_CM] = LAYOUT (
            // Left Hand
            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+           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_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
@@ -210,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_PGDN, LT(_KP, KC_ENT),  KC_SPC
     ),
 
-[_MD] = KEYMAP(
+[_MD] = LAYOUT (
            // Left Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
            KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
@@ -236,7 +236,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______
     ),
 
-[_KP] = KEYMAP(
+[_KP] = LAYOUT (
            // Left Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
            KC_PWR,  _______, _______, _______, _______, _______,
@@ -300,3 +300,21 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 void matrix_init_user(void) {
 
 };
+
+void led_set_user(uint8_t usb_led) {
+    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+        PORTF |= (1<<2);
+    } else {
+        PORTF &= ~(1<<2);
+    }
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        PORTF |= (1<<3);
+    } else {
+        PORTF &= ~(1<<3);
+    }
+    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
+        PORTF |= (1<<1);
+    } else {
+        PORTF &= ~(1<<1);
+    }
+}
diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md
index a10d7c2ba8..12320996ed 100644
--- a/keyboards/kinesis/keymaps/xyverz/readme.md
+++ b/keyboards/kinesis/keymaps/xyverz/readme.md
@@ -4,6 +4,8 @@
 
 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 QMK Kinesis.
 
+~~After a year of using a planck, I've become accustomed to my / and ? being above the - key, so I've decided to move my [, ], and = to the normal Advantage location and set the two keys above the - to new locations. I'll play with it for a while and see how I like it.~~ I didn't like it, so I've switched back.
+
 The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. 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.
@@ -31,7 +33,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t
 	|--------+------+------+------+------+------||------+------+------+------+------+--------|
 	| LShift |   Z  |   X  |   C  |   V  |   X  ||   B  |   M  |   W  |   V  |   Z  | RShift |
 	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  Ins | Left | Rght |              |  Up  |  Dn  |   /  |   =  |
+	         |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   /  |   =  |
 	         `---------------------------'              `---------------------------'
 	                             ,--------------.,--------------.
 	                             | LCtl  | LAlt || RGUI | RCtl  |
diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c
index 111db81feb..e551dacc4e 100644
--- a/keyboards/kinesis/stapelberg/stapelberg.c
+++ b/keyboards/kinesis/stapelberg/stapelberg.c
@@ -25,4 +25,16 @@ void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
 	led_set_user(usb_led);
+
+inline void kinesis_keypad_led_on(void)    { DDRF |=  (1<<0); PORTF |=  (1<<0); }
+inline void kinesis_scroll_led_on(void)    { DDRF |=  (1<<1); PORTF |=  (1<<1); }
+inline void kinesis_num_led_on(void)    { DDRF |=  (1<<2); PORTF |=  (1<<2); }
+inline void kinesis_caps_led_on(void)    { DDRF |=  (1<<3); PORTF |=  (1<<3); }
+
+inline void kinesis_keypad_led_off(void)   { DDRF &= ~(1<<0); PORTF &= ~(1<<0); }
+inline void kinesis_scroll_led_off(void)   { DDRF &= ~(1<<1); PORTF &= ~(1<<1); }
+inline void kinesis_num_led_off(void)   { DDRF &= ~(1<<2); PORTF &= ~(1<<2); }
+inline void kinesis_caps_led_off(void)   { DDRF &= ~(1<<3); PORTF &= ~(1<<3); }
+
+
 }
-- 
cgit v1.2.3


From 6e867a7ecc3953c5ca2e97df986446e31ac96f03 Mon Sep 17 00:00:00 2001
From: Salt-Peanuts <hajimeokuda@gmail.com>
Date: Sat, 26 May 2018 11:54:38 -0400
Subject: 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
---
 .../kinesis/keymaps/insertsnideremarks/config.h    |   1 +
 .../kinesis/keymaps/insertsnideremarks/keymap.c    | 554 ++++++++++-----------
 .../kinesis/keymaps/insertsnideremarks/readme.md   |  55 +-
 3 files changed, 266 insertions(+), 344 deletions(-)

(limited to 'keyboards/kinesis')

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 |
+*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |   |      |NKROTG|      |      |      |        |
+*  |--------+------+------+------+------+------|   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |   |      |      |      |      |      |        |
+*  `--------+------+------+------+------+------'   `------+------+------+------+------+--------'
+*           |      |      |      |      |                 |      |      |      |      |
+*           `---------------------------'                 `---------------------------'
+*                              ,---------------.   ,---------------.
+*                              |       |       |   |       |       |
+*                      ,-------|-------|-------|   |-------+-------+-------.
+*                      |       |       |       |   |       |       |       |
+*                      |       |       |-------|   |-------|       |       |
+*                      |       |       |       |   |       |       |       |
+*                      `-----------------------'   `-----------------------' 
 */
 [_ADJUST] = KEYMAP(
   // Left Hand
-  _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
-  _______, CMODDH,  QWERTY,  COLEMAK, CMODDHGM, QWERTYGM,
-  _______, _______, _______, _______, _______,  _______,
-  _______, _______, _______, _______, _______,  _______,
-  _______, _______, _______, _______, _______,  _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,
+  _______, _______, _______, _______, _______,   _______,
+  _______, _______, _______, _______, _______,   _______,
+  _______, _______, _______, _______, _______,   _______,
+           _______, _______, _______, _______,
+  // Left Thumb
+                                      _______,   _______,
+                                                 _______,
+                             _______, _______,   _______,
+  // Right Hand
+  _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, _______, _______, _______, _______, _______,
+  _______, NKROTG,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),
+
+[_ADJUST2] = KEYMAP(
+  // Left Hand
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,
+  _______, _______, _______, _______, _______,   _______,
+  _______, _______, _______, _______, _______,   _______,
+  _______, _______, _______, _______, _______,   _______,
            _______, _______, _______, _______,
   // Left Thumb
-                                      _______,  _______,
-                                                _______,
-                             _______, _______,  _______,
+                                      _______,   _______,
+                                                 _______,
+                             _______, _______,   _______,
   // Right Hand
-  _______,     _______, _______, _______, _______,  _______,  _______, _______, _______,
-  TG(_NUMPAD), _______, _______, _______, _______,  RESET,
-  _______,     _______, _______, _______, _______,  _______,
-  _______,     NKROTG,  _______, _______, _______,  _______,
-  _______,     _______, _______, _______, _______,  _______,
-               _______, _______, _______, _______, 
+  _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, _______, _______, _______, _______, _______,
+  _______, NKROTG,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, 
   // Right Thumb
   _______, _______,
   _______,
@@ -582,58 +543,42 @@ void persistent_default_layer_set(uint16_t default_layer) {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case CMODDH:
+    case COLEMAK:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL << _CMODDH);
+        persistent_default_layer_set(1UL << _COLEMAK);
         layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
         layer_off ( _NUMBERS);
         layer_off ( _NUMBERS2);
         layer_off ( _FUNCTION);
         layer_off ( _FUNCTION2);
         layer_off ( _NUMPAD);
-        layer_off ( _CMODDHGM);
+        layer_off ( _COLEMAKGM);
         layer_off ( _QWERTYGM);
         layer_off ( _ADJUST);
-      }
+        layer_off ( _ADJUST2);
+	  }
       return false;
       break;
     case QWERTY:
       if (record->event.pressed) {
         persistent_default_layer_set(1UL << _QWERTY);
-        layer_off ( _CMODDH);
         layer_off ( _COLEMAK);
         layer_off ( _NUMBERS);
         layer_off ( _NUMBERS2);
         layer_off ( _FUNCTION);
         layer_off ( _FUNCTION2);
         layer_off ( _NUMPAD);
-        layer_off ( _CMODDHGM);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL << _COLEMAK);
-        layer_off ( _CMODDH);
-        layer_off ( _QWERTY);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _CMODDHGM);
+        layer_off ( _COLEMAKGM);
         layer_off ( _QWERTYGM);
         layer_off ( _ADJUST);
+        layer_off ( _ADJUST2);
+
       }
       return false;
       break;
-    case CMODDHGM:
+    case COLEMAKGM:
       if (record->event.pressed) {
-        default_layer_set(1UL << _CMODDHGM);
-        layer_off ( _CMODDH);
+        default_layer_set(1UL << _COLEMAKGM);
         layer_off ( _QWERTY);
         layer_off ( _COLEMAK);
         layer_off ( _NUMBERS);
@@ -643,13 +588,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         layer_off ( _NUMPAD);
         layer_off ( _QWERTYGM);
         layer_off ( _ADJUST);
-      }
+        layer_off ( _ADJUST2);
+	  }
       return false;
       break;
     case QWERTYGM:
       if (record->event.pressed) {
         default_layer_set(1UL << _QWERTYGM);
-        layer_off ( _CMODDH);
         layer_off ( _QWERTY);
         layer_off ( _COLEMAK);
         layer_off ( _NUMBERS);
@@ -657,9 +602,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         layer_off ( _FUNCTION);
         layer_off ( _FUNCTION2);
         layer_off ( _NUMPAD);
-        layer_off ( _CMODDHGM);
+        layer_off ( _COLEMAKGM);
         layer_off ( _ADJUST);
-      }
+        layer_off ( _ADJUST2);
+	  }
       return false;
       break;
   }
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
index b3c573b625..353fca0775 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
@@ -12,11 +12,11 @@ Changes to the thumb clusters include:
 
 I've largely left the function keys untouched, with the intension of not using them.  They are neither easy to use nor reach due to their locations and size, and, prior to Advantage2, particularly terrible rubber domes were used.  They have since updated the keys with Cherry ML switches on Advantage2, but did not resolve the issues of size or location.  Additionally, leaving the function keys unused here makes it easier for me to adapt the keymaps to my other keyboards, most of which do not have physical function keys.
 
-I use Colemak Mod-DH Matrix as my default layout.  There are QWERTY and regular Colemak layouts as well.
+I use Colemak as my default layout.  I've included QWERTY here as well.
 
-Additionally, I've added gaming/vanilla version of Colemak Mod-DH Matrix and QWERTY layouts.  These layouts have no access to the Function or Numbers layers, thus no dual-role keys with layer access, and are mainly used for gaming.
+Additionally, I've added gaming/vanilla version of Colemak and QWERTY layouts.  These layouts have no access to the Function or Numbers layers, thus no dual-role keys with layer access, and are mainly used for gaming.
 
-Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and Colemak.  The gaming/vanilla Colemak Mod-DH Matrix and QWERTY can be set as default layer, but will not be persistent.
+Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/vanilla Colemak and QWERTY can be set as default layer, but will not be persistent.
 
 ## Future plans
 
@@ -25,7 +25,7 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 * Utilize the leftover spots on the key matrix, as well as unused pins on Teensy to run macropad and/or foot pedals.
 
 
-### Colemak Mod-DH Matrix
+### Colemak
 	(Default 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|
@@ -33,11 +33,11 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	,-------------------------------------------.                   ,-------------------------------------------.
 	|    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|   Tab  |   Q  |   W  |   F  |   P  |   B  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
+	|   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|Esc/Ctrl|   A  |   R  |   S  |   T  |   G  |                   |   M  |   N  |   E  |   I  |   O  |   '    |
+	|Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|SC Shift|   Z  |   X  |   C  |   D  |   V  |                   |   K  |   H  |   ,  |   .  |   /  |SC Shift|
+	|SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
 	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
 	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	         `---------------------------'                                 `---------------------------'
@@ -49,7 +49,7 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	                    |  Fn   | Number|  Bspc |                   |  Tab  |Number2|  Fn2  |
 	                    `-----------------------'                   `-----------------------' 
 	
-
+	
 ### QWERTY
 	(Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
 	,-----------------------------------------------------------------------------------------------------------.
@@ -75,31 +75,6 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	                    `-----------------------'                   `-----------------------' 
 	
 
-### 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  |
-	                    `-----------------------'                   `-----------------------' 
-	
-	
 ### Numbers & Symbols layer
 	(Multiple characters: single-tap for first, double-tap for second)
 	,-----------------------------------------------------------------------------------------------------------.
@@ -155,7 +130,7 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 	`-----------------------------------------------------------------------------------------------------------'
 	,-------------------------------------------.                   ,-------------------------------------------.
-	|        | NumLk|      |      |      |      |                   |  Tab | NumLk| KP / |  kP *| KP - |        |
+	|        | NumLk|      |      |      |      |                   |  Tab | NumLk| KP / | KP * | KP - |        |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
 	|        | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 |                   |      | KP 7 | KP 8 | KP 9 | KP + |        |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
@@ -174,7 +149,7 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	                    `-----------------------'                   `-----------------------' 
 	
 
-### Colemak Mod-DH Matrix gaming/vanilla
+### Colemak gaming/vanilla
 	(No access to Function or Numbers layers; mainly used for gaming; double-tap TD(ADJ) for one shot access to Adjust layer)
 	,-----------------------------------------------------------------------------------------------------------.
 	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
@@ -182,11 +157,11 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	,-------------------------------------------.                   ,-------------------------------------------.
 	|    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|   Tab  |   Q  |   W  |   F  |   P  |   B  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
+	|   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  Ctrl  |   A  |   R  |   S  |   T  |   G  |                   |   M  |   N  |   E  |   I  |   O  |   '    |
+	|  Ctrl  |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  Shift |   Z  |   X  |   C  |   D  |   V  |                   |   K  |   H  |   ,  |   .  |   /  |  Shift |
+	|  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
 	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
 	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	         `---------------------------'                                 `---------------------------'
@@ -228,8 +203,8 @@ Persistent default layer has been enabled for Colemak Mod-DH Matrix, QWERTY, and
 	,-----------------------------------------------------------------------------------------------------------.
 	|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,------------------------------------------
-	|        |CModDH|Qwerty|Colmak|CMoDGM| QWGM |                   |Numpad|      |      |      |      | RESET  |
+	,-------------------------------------------.                   ,-------------------------------------------.
+	|        |Colmak|Qwerty|      |ClmkGM| QWGM |                   |Numpad|      |      |      |      | RESET  |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
 	|        |      |      |      |      |      |                   |      |      |      |      |      |        |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-- 
cgit v1.2.3