3 files changed, 386 insertions(+), 465 deletions(-)

M keyboards/kinesis/keymaps/salty/keymap.c
A keyboards/kinesis/keymaps/salty/readme.md
M keyboards/kinesis/keymaps/salty/rules.mk

@@ 2,16 2,14 @@
 #include "action_layer.h"
 #include "eeconfig.h"
 
-#define _CMD   0 // Base Colemak Mod-DH
-#define _QW    1 // Base QWERTY
-#define _CG    2 // Colemak Mod-DH gaming layer
-#define _QG    3 // QWERTY gaming layer
-#define _NM    4 // Number layer
-#define _MD    5 // Media Layer
-#define _KP    6 // KP layer
-#define _LY    7 // Layer switcher
-#define _FN    8 // Function layer
-#define _FN2   9 // Function layer (identical as _FN; used to deal with minor key interaction issue)
+#define _QW    0 // Base QWERTY
+#define _CM    1 // Colemak
+#define _QG    2 // QWERTY gaming
+#define _NS    3 // Number/Symbol
+#define _NP    4 // Numpad
+#define _LY    5 // Layer switcher
+#define _FN    6 // Function
+#define _FN2   7 // Function 2 (identical as _FN; used to deal with minor key interaction issue)
 
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO


@@ 27,466 25,371 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 [RPN_RBC] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_RBRC)
 };
 
-/*
-
-        Function Keys on All Layers (Keypad toggles):
-	,-----------------------------------------------------------------.
-	|  ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7   |  F8   |
- 	`-----------------------------------------------------------------'
-	,---------------------------------------------------------------- --------------.
-	|  F9  |  F10 |  F11 |  F12 | PScr | SLck | Paus | Keypad | Layer/              |
-	|      |      |      |      |      |      |      |        | RESET (in Fn layer) |
-	`-------------------------------------------------------------------------------'
-
-        Colemak Mod-DH layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   B  ||   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   R  |   S  |   T  |   G  ||   M  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| (    [ |   Z  |   X  |   C  |   D  |   V  ||   K  |   H  |   ,  |   .  |   /  | )    ] |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |  /Fn | LShift| Bspc || Media| RShift|  /Fn  |
-	                      `---------------------'`----------------------' 
-
-
-        QWERTY layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| (    [ |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | )    ] |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |  /Fn | LShift| Bspc || Media| RShift|  /Fn  |
-	                      `---------------------'`----------------------' 
-
-
-        Colemak Mod-DH Gaming layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   B  ||   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   R  |   S  |   T  |   G  ||   M  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   D  |   V  ||   K  |   H  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |      | LShift| Bspc || Media| RShift|       |
-	                      `---------------------'`----------------------'
-
-
-         QWERTY Gaming layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |      | LShift| Bspc || Media| RShift|       |
-	                      `---------------------'`----------------------'
-
-
-        Media layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Mute | Vol- | Vol+ |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Prev | Play | Next | Stop ||      |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |      |      |      |              |      |      |      |      |
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      |      |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-        Keypad layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|        |      |      |      |      |      ||      |      | KP = | KP / | KP * |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |  Up  |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Left | Down | Right|      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      | INS  |      |      |              |      |      | KP . |KP Ent|
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      | KP 0 |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-        Layer switch layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|        |Col DH|QWERTY|Col GM|QW GM |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |      |      |      |              |      |      |      |      |
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      |      |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-        Function layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   F11  |  F1  |  F2  |  F3  |  F4  |  F5  ||  F6  |  F7  |  F8  |  F9  |  F10 |  F12   |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |  Up  |      |      ||      | Home |  Up  |  End |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Left | Down | Right|      || PgUp | Right| Down | Left |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      || PgDn |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |  INS |      |      |              |      |      |      |      |
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      |      |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-
-*/
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_CMD] = 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_B,
-           CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
-           TD(LPN_LBC),   KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           LT(_FN, KC_SPC),        LSFT_T(KC_ENT),   KC_BSPC,
-
-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           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, TD(RPN_RBC),
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   LT(_FN2, KC_BSPC)
-    ),
-
+/* QWERTY
+*  (Keys separated by /: tap for first, hold for second)
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Layer|
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   =    |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |   Esc  |   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |   `  |      |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+*           `---------------------------'                                 `---------------------------'
+*                               ,--------------.                   ,--------------.
+*                               |  LCtl | LAlt |                   | RAlt | RCtl  |
+*                        ,------|-------|------|                   |------+-------+------.
+*                        | Space| Enter |  App |                   | RGUI | Delete| Bspc |
+*                        |   /  |   /   |------|                   |------|   /   |   /  |
+*                        |  Fn  | Number| Bspc |                   | Enter| Number|  Fn2 |
+*                        `---------------------'                   `---------------------' 
+*/
 [_QW] = 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_E,    KC_R,    KC_T,
-           CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           TD(LPN_LBC),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-           
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           LT(_FN, KC_SPC),        LSFT_T(KC_ENT),   KC_BSPC,
-
-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_Y,          KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-           KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-           KC_N,          KC_M,    KC_COMM, KC_DOT,  KC_SLSH, TD(RPN_RBC),
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   LT(_FN2, KC_BSPC)
-
-    ),
-
-[_CG] = 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_B,
-           CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
-           KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           KC_SPC,                 LSFT_T(KC_ENT),   KC_BSPC,
-
-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           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_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   KC_BSPC
-    ),
-
+  // Left Hand
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+           KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  //Left Thumb
+                             KC_LCTL,          KC_LALT,
+                                               KC_APP,
+           LT(_FN, KC_SPC),  LT(_NS, KC_ENT),  KC_BSPC,
+  //Right Hand
+  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NP), MO(_LY),
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+  //Right Thumb
+  KC_RALT, KC_RCTL,
+  KC_RGUI,
+  KC_ENT,  LT(_NS, KC_DEL),  LT(_FN2, KC_BSPC)
+),
+
+/* Colemak
+*  (Keys separated by /: tap for first, hold for second)
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Layer|
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   =    |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |   Esc  |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |   `  |      |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+*           `---------------------------'                                 `---------------------------'
+*                               ,--------------.                   ,--------------.
+*                               |  LCtl | LAlt |                   | RAlt | RCtl  |
+*                        ,------|-------|------|                   |------+-------+------.
+*                        | Space| Enter |  App |                   | RGUI | Delete| Bspc |
+*                        |   /  |   /   |------|                   |------|   /   |   /  |
+*                        |  Fn  | Number| Bspc |                   | Enter| Number|  Fn2 |
+*                        `---------------------'                   `---------------------' 
+*/
+[_CM] = 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,
+  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+           KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  //Left Thumb
+                             KC_LCTL,          KC_LALT,
+                                               KC_APP,
+           LT(_FN, KC_SPC),  LT(_NS, KC_ENT),  KC_BSPC,
+  //Right Hand
+  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NP), MO(_LY),
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+  KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+  //Right Thumb
+  KC_RALT, KC_RCTL,
+  KC_RGUI,
+  KC_ENT,  LT(_NS, KC_DEL),  LT(_FN2, KC_BSPC)
+),
+
+/* QWERTY Gaming
+*  (Keys separated by /: tap for first, hold for second; no access to Fn layer)
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Layer|
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   =    |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |   Esc  |   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |   `  |      |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+*           `---------------------------'                                 `---------------------------'
+*                               ,--------------.                   ,--------------.
+*                               |  LCtl | LAlt |                   | RAlt | RCtl  |
+*                        ,------|-------|------|                   |------+-------+------.
+*                        |      | Enter |      |                   | RGUI | Delete|      |
+*                        | Space|   /   |------|                   |------|   /   | Bspc |
+*                        |      | Number| Bspc |                   | Enter| Number|      |
+*                        `---------------------'                   `---------------------' 
+*/
 [_QG] = 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_E,    KC_R,    KC_T,
-           CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           KC_SPC,                 LSFT_T(KC_ENT),   KC_BSPC,
-
-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_Y,          KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-           KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-           KC_N,          KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   KC_BSPC
-    ),
-
-[_NM] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_MD] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-           _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                    _______, _______, _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_KP] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, KC_UP,   _______, _______,
-           _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, KC_PEQL, KC_PSLS, KC_PAST, _______,
-           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                    _______, _______, KC_PDOT, KC_PENT,
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, KC_P0
-    ),
-
+  // Left Hand
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+           KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  //Left Thumb
+                             KC_LCTL,          KC_LALT,
+                                               XXXXXXX,
+           KC_SPC,           LT(_NS, KC_ENT),  KC_BSPC,
+  //Right Hand
+  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NP), MO(_LY),
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+  //Right Thumb
+  KC_RALT, KC_RCTL,
+  KC_RGUI,
+  KC_ENT,  LT(_NS, KC_DEL),  KC_BSPC
+),
+
+/* Number/symbol layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |   !  |   @  |   #  |   $  |   %  |                   |   ^  |   &  |   *  |   `  |   ~  |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |   =  |   {  |   [  |   (  |   +  |                   |   _  |   )  |   ]  |   }  |   -  |        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      |      |      |      |                                 |      |      |      |      |
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      |      |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
+[_NS] = KEYMAP(
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  _______, KC_EQL,  KC_LCBR, KC_LBRC, KC_LPRN, KC_PLUS,
+           _______, _______, _______, _______,
+  // Left Thumb
+                             _______,          _______,
+                                               _______,
+                    _______, _______,          _______,
+  // Right Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_CIRC, KC_AMPR, KC_ASTR, KC_GRV,  KC_TILD, _______, 
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, 
+  KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_MINS, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),
+
+/* Numpad layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |        |      |      |      |      |      |                   | NumLk|  Tab | KP / |  kP *| KP - |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |  Up  |      |      |                   |      | KP 7 | KP 8 | KP 9 | KP + |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      | Left | Down | Right|      |                   |      | KP 4 | KP 5 | KP 6 | KP = |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      | INS  |      |      |                                 |      | KP , | KP . |KP Ent|
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      | KP 0 |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
+[_NP] = KEYMAP(
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, KC_UP,   _______, _______,
+  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+  _______, _______, _______, _______, _______, _______,
+           _______, KC_INS,  _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_NLCK, KC_TAB,  KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
+  _______, KC_P4,   KC_P5,   KC_P6,   KC_PEQL, _______,
+  _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
+           _______, KC_PCMM, KC_PDOT, KC_PENT,
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, KC_P0
+),
+
+/* Layer switch layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |        |QWERTY|Colemk|QW GM |      |      |                   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      |      |      |      |                                 |      |      |      |      |
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      |      |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
 [_LY] = KEYMAP(
-           // Left Hand
-           _______, _______,  _______, _______, _______, _______, _______, _______, _______,
-           _______, DF(_CMD), DF(_QW), DF(_CG), DF(_QG), _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-                    _______,  _______, _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______,  _______, _______, _______, _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-                    _______,  _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______,  _______
-    ),
-
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, DF(_QW), DF(_CM), DF(_QG), _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+           _______, _______,  _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),
+
+/* Function layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |RESET|     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |  Up  |      |Alt+Tb|                   |      | Home |  Up  |  End |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      | Left | Down | Right|      |                   | PgUp | Right| Down | Left |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      | Prev | Play | Next | Stop |                   | PgDn | Mute | Vol- | Vol+ |      |        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      |  INS |      |      |                                 |      |      |      |      |
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      |      |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
 [_FN] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-           _______, _______, _______, KC_UP,   _______, _______,
-           _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-           _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
-           KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-           KC_PGDN, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+  _______, _______, _______, KC_UP,   _______, LALT(KC_TAB),
+  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
+           _______, KC_INS,  _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  RESET,   _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
+  KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+  KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),
 
 [_FN2] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-           _______, _______, _______, KC_UP,   _______, _______,
-           _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-           _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
-           KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-           KC_PGDN, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    )
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+  _______, _______, _______, KC_UP,   _______, LALT(KC_TAB),
+  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
+           _______, KC_INS,  _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  RESET,   _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
+  KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+  KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+)
 
 };
 


@@ 525,3 428,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 void led_set_user(uint8_t usb_led) {
 
 }
+
+
+

@@ 0,0 1,14 @@
+# Salty's Kinesis Keymap
+
+These layouts are derived from what I was using on my Kinesis Contoured keyboards through TMK converters.  With the move to QMK through Stapelberg replacement controller, I've cleaned up the layouts a bit while adding number/symbol layer.
+
+There are only minor changes in the base keywell layout (e.g., CapsLock is ESC, arrow clusters on one side), while the thumb clusters deviate more from the default layout.
+
+Changes to the thumb clusters include: 
+* The navigations keys moved to Fn layers.
+* The function of 2u keys have been reversed - I've always used space with my left thumb, and I find it more helpful to have access to Space and Enter while using my mouse/trackball.
+* Enter and Backspace have been duplicated on both clusters.
+* The 2u keys serve dual function as momentary layer switchers.
+
+I'm frequently fiddle around with the layouts as I find certain things I want to try out.
+

@@ 2,7 2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)


@@ 11,11 11,12 @@ NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: ht
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
+UNICODE_ENABLE = yes        # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes
+TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
+KEY_LOCK_ENABLE = yes       # Enable key lock
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile