Merge branch 'master' into taamas

32 files changed, 877 insertions, 249 deletions

diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 169012faf5..053698770a 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -1,80 +1,77 @@
-#ifndef KINESIS_ALVICSTEP_H
-#define KINESIS_ALVICSTEP_H
+#pragma once
 
 #include "../kinesis.h"
 
 #define ___ KC_NO
 
-#define LAYOUT(                                    \
-    k02, k22, k12, k01, k21, k11, k00, k20, k10,   \
-    k80, k70, k60, k50, k40, k30,                  \
-    k81, k71, k61, k51, k41, k31,                  \
-    k82, k72, k62, k52, k42, k32,                  \
-    k83, k73, k63, k53, k43, k33,                  \
-         k74, k64, k54, k34,                       \
-                             k36, k35,             \
-                                  k55,             \
-                        k56, k46, k75,             \
-                                                   \
-    k03, k23, k13, k04, k24, k14, k05, k85, k84,   \
-                   k94, kA4, kB4, kD4, kE4, kF4,   \
-                   k95, kA5, kB5, kD5, kE5, kF5,   \
-                   k96, kA6, kB6, kD6, kE6, kF6,   \
-                   k97, kA7, kB7, kD7, kE7, kF7,   \
-                        k93, kB3, kD3, kE3,        \
-              k47, k66,                            \
-              k67,                                 \
-              k87, k76, k86                        \
-) {                                                \
-    { k00,  k01,  k02,  k03,  k04,  k05,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  ___,  ___,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  ___ }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46,  k47 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56,  ___ }, \
-    { k60,  k61,  k62,  k63,  k64,  ___,  k66,  k67 }, \
-    { k70,  k71,  k72,  k73,  k74,  k75,  k76,  ___ }, \
-    { k80,  k81,  k82,  k83,  k84,  k85,  k86,  k87 }, \
-    { ___,  ___,  ___,  k93,  k94,  k95,  k96,  k97 }, \
-    { ___,  ___,  ___,  ___,  kA4,  kA5,  kA6,  kA7 }, \
-    { ___,  ___,  ___,  kB3,  kB4,  kB5,  kB6,  kB7 }, \
-    { ___,  ___,  ___,  ___,  ___,  ___,  ___,  ___ }, \
-    { ___,  ___,  ___,  kD3,  kD4,  kD5,  kD6,  kD7 }, \
-    { ___,  ___,  ___,  kE3,  kE4,  kE5,  kE6,  kE7 }, \
-    { ___,  ___,  ___,  ___,  kF4,  kF5,  kF6,  kF7 }  \
+#define LAYOUT( \
+    k02, k22, k12, k01, k21, k11, k00, k20, k10, \
+    k80, k70, k60, k50, k40, k30, \
+    k81, k71, k61, k51, k41, k31, \
+    k82, k72, k62, k52, k42, k32, \
+    k83, k73, k63, k53, k43, k33, \
+         k74, k64, k54, k34, \
+                             k36, k35, \
+                                  k55, \
+                        k56, k46, k75, \
+\
+    k03, k23, k13, k04, k24, k14, k05, k85, k84, \
+                   k94, kA4, kB4, kD4, kE4, kF4, \
+                   k95, kA5, kB5, kD5, kE5, kF5, \
+                   k96, kA6, kB6, kD6, kE6, kF6, \
+                   k97, kA7, kB7, kD7, kE7, kF7, \
+                        k93, kB3, kD3, kE3, \
+              k47, k66, \
+              k67, \
+              k87, k76, k86 \
+) { \
+    { k00, k01, k02, k03, k04, k05, ___, ___ }, \
+    { k10, k11, k12, k13, k14, ___, ___, ___ }, \
+    { k20, k21, k22, k23, k24, ___, ___, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+    { k40, k41, k42, k43, ___, ___, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, ___ }, \
+    { k60, k61, k62, k63, k64, ___, k66, k67 }, \
+    { k70, k71, k72, k73, k74, k75, k76, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { ___, ___, ___, k93, k94, k95, k96, k97 }, \
+    { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
+    { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
+    { ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
+    { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
+    { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
 }
 
-/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty(                                                                           \
-    k02, k22, k12, k01, k21, k11, k00, k20, k10,   k03, k23, k13, k04, k24, k14, k05, k85, k84,  \
-    k80, k70, k60, k50, k40, k30,                                 k94, kA4, kB4, kD4, kE4, kF4,  \
-    k81, k71, k61, k51, k41, k31,                                 k95, kA5, kB5, kD5, kE5, kF5,  \
-    k82, k72, k62, k52, k42, k32,                                 k96, kA6, kB6, kD6, kE6, kF6,  \
-    k83, k73, k63, k53, k43, k33,                                 k97, kA7, kB7, kD7, kE7, kF7,  \
-         k74, k64, k54, k34,                                           k93, kB3, kD3, kE3,       \
-                             k36, k35,                       k47, k66,                           \
-                                  k55,                       k67,                                \
-                        k56, k46, k75,                       k87, k76, k86                       \
-) {                                                    \
-    { k00,  k01,  k02,  k03,  k04,  k05,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  ___,  ___,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  ___ }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46,  k47 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56,  ___ }, \
-    { k60,  k61,  k62,  k63,  k64,  ___,  k66,  k67 }, \
-    { k70,  k71,  k72,  k73,  k74,  k75,  k76,  ___ }, \
-    { k80,  k81,  k82,  k83,  k84,  k85,  k86,  k87 }, \
-    { ___,  ___,  ___,  k93,  k94,  k95,  k96,  k97 }, \
-    { ___,  ___,  ___,  ___,  kA4,  kA5,  kA6,  kA7 }, \
-    { ___,  ___,  ___,  kB3,  kB4,  kB5,  kB6,  kB7 }, \
-    { ___,  ___,  ___,  ___,  ___,  ___,  ___,  ___ }, \
-    { ___,  ___,  ___,  kD3,  kD4,  kD5,  kD6,  kD7 }, \
-    { ___,  ___,  ___,  kE3,  kE4,  kE5,  kE6,  kE7 }, \
-    { ___,  ___,  ___,  ___,  kF4,  kF5,  kF6,  kF7 }  \
+#define LAYOUT_pretty( \
+    k02, k22, k12, k01, k21, k11, k00, k20, k10,   k03, k23, k13, k04, k24, k14, k05, k85, k84, \
+    k80, k70, k60, k50, k40, k30,                                 k94, kA4, kB4, kD4, kE4, kF4, \
+    k81, k71, k61, k51, k41, k31,                                 k95, kA5, kB5, kD5, kE5, kF5, \
+    k82, k72, k62, k52, k42, k32,                                 k96, kA6, kB6, kD6, kE6, kF6, \
+    k83, k73, k63, k53, k43, k33,                                 k97, kA7, kB7, kD7, kE7, kF7, \
+         k74, k64, k54, k34,                                           k93, kB3, kD3, kE3, \
+                             k36, k35,                       k47, k66, \
+                                  k55,                       k67, \
+                        k56, k46, k75,                       k87, k76, k86 \
+) { \
+    { k00, k01, k02, k03, k04, k05, ___, ___ }, \
+    { k10, k11, k12, k13, k14, ___, ___, ___ }, \
+    { k20, k21, k22, k23, k24, ___, ___, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+    { k40, k41, k42, k43, ___, ___, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, ___ }, \
+    { k60, k61, k62, k63, k64, ___, k66, k67 }, \
+    { k70, k71, k72, k73, k74, k75, k76, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { ___, ___, ___, k93, k94, k95, k96, k97 }, \
+    { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
+    { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
+    { ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
+    { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
+    { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
 }
 
-
 /*
   Row pin configuration
 
@@ -97,5 +94,3 @@
   PB6   col6  |        |        |        | LCtrl  | Delete | Bksp   | RCtrl  | Enter  | Space  | H      | J      | K      |        | L      | ;:     | '"
   PB7   col7  |        |        |        |        | RGUI   |        | PageUp |        | PageDn | N      | M      | ,<     |        | .>     | /?     | RShift
 */
-
-#endif
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index 02c7725cec..8a656264ee 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -1,5 +1,4 @@
-#ifndef ALVICSTEP_CONFIG_H
-#define ALVICSTEP_CONFIG_H
+#pragma once
 
 #include "../config.h"
 #include "config_common.h"
@@ -31,6 +30,3 @@
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
- 
-
-#endif
diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c
index 71619f8167..5636418849 100644
--- a/keyboards/kinesis/alvicstep/matrix.c
+++ b/keyboards/kinesis/alvicstep/matrix.c
@@ -136,12 +136,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
@@ -164,15 +158,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 static matrix_row_t read_row(uint8_t row)
 {
 	_delay_us(30);  // without this wait read unstable value.
diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h
index ecedf9bbff..63b296a528 100644
--- a/keyboards/kinesis/config.h
+++ b/keyboards/kinesis/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
@@ -76,7 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/kinesis/keymaps/default/config.h b/keyboards/kinesis/keymaps/default/config.h
deleted file mode 100644
index 271f48d001..0000000000
--- a/keyboards/kinesis/keymaps/default/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index 2d43aad077..9c2f3bcc6b 100644
--- a/keyboards/kinesis/keymaps/default/keymap.c
+++ b/keyboards/kinesis/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   KC_LCTL,KC_LALT,
                                     KC_HOME,
                            KC_BSPC,KC_DEL ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_FN0, RESET,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_NO, QK_BOOT,
 	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,
diff --git a/keyboards/kinesis/keymaps/default/rules.mk b/keyboards/kinesis/keymaps/default/rules.mk
index 418f54602d..adb07adf7d 100644
--- a/keyboards/kinesis/keymaps/default/rules.mk
+++ b/keyboards/kinesis/keymaps/default/rules.mk
@@ -1,15 +1,9 @@
-# Build Options
-#   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 = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/keymaps/default_pretty/config.h b/keyboards/kinesis/keymaps/default_pretty/config.h
deleted file mode 100644
index 8893d122e0..0000000000
--- a/keyboards/kinesis/keymaps/default_pretty/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
index 9c01b222a7..913f5dbf84 100644
--- a/keyboards/kinesis/keymaps/default_pretty/keymap.c
+++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c
@@ -32,7 +32,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [QWERTY] = LAYOUT_pretty(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,         KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_FN0,   RESET,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,         KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_NO,    QK_BOOT,
     KC_EQL,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                                                                      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                                                                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                                                                      KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk
index 418f54602d..adb07adf7d 100644
--- a/keyboards/kinesis/keymaps/default_pretty/rules.mk
+++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk
@@ -1,15 +1,9 @@
-# Build Options
-#   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 = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/keymaps/dvorak/config.h b/keyboards/kinesis/keymaps/dvorak/config.h
deleted file mode 100644
index 8893d122e0..0000000000
--- a/keyboards/kinesis/keymaps/dvorak/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index 3c532628ef..6f4d63a7d4 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      KC_HOME,
                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, RESET,
         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
diff --git a/keyboards/kinesis/keymaps/ericgebhart/keymap.c b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
new file mode 100644
index 0000000000..731e257b05
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,53 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "keymap_bepo.h"
+#include "ericgebhart.h"
+
+#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
+
+#define Kinesis_base(...)        Base_4x6_4_6(__VA_ARGS__)
+#define Kinesis_bepo_base(...)   Base_bepo_4x6_4_6(__VA_ARGS__)
+#define Kinesis_bepo_base6(...)  Base_bepo6_4x6_4_6(__VA_ARGS__)
+#define Kinesis_transient(...)   Transient6_4x6_4_6(__VA_ARGS__)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  // Qwerty Base layers
+  [_DVORAK]  = Kinesis_base(___NUMS___, ___DVORAK___),
+  [_QWERTY]  = Kinesis_base(___NUMS___, ___QWERTY___),
+  [_COLEMAK] = Kinesis_base(___NUMS___, ___COLEMAK_DH___),
+  [_BEAKL]   = Kinesis_base(___BKLNUMS___, ___BEAKL15___),
+  // Bepo Base layers
+  [_DVORAK_BP] = Kinesis_bepo_base(___NUMS_BP___, ___DVORAK_FR___),
+  [_BEAKL_BP]  = Kinesis_bepo_base(___BKLNUMS_BP___,   ___BEAKL15_FR___),
+
+  [_BEPO]      = Kinesis_bepo_base6(___BEPO6___),
+
+  // transient layers.
+  // Switch to using a transient layer macro
+  [_SYMB]    = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___),
+  [_SYMB_BP] = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___),
+
+  [_TOPROWS]    = Kinesis_transient(___12___, ___TOPROWS_3x12___),
+  [_TOPROWS_BP] = Kinesis_transient(___12___, ___TOPROWS_BP_3x12___),
+
+  [_NAV]    = Kinesis_transient(___12___, ___NAV_3x12___),
+  [_LAYERS] = Kinesis_transient(___12___, ___LAYERS_3x12___),
+  [_ADJUST] = Kinesis_transient(___12___, ___ADJUST_3x12___),
+  //[_RGB]    = Kinesis_transient(___12___, ___RGB_3x12___),
+};
diff --git a/keyboards/kinesis/keymaps/ericgebhart/readme.md b/keyboards/kinesis/keymaps/ericgebhart/readme.md
new file mode 100644
index 0000000000..3a47968596
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/readme.md
@@ -0,0 +1,5 @@
+Overview
+========
+
+These are my keymaps. There isn't much here. Go take a look at my Userspace readme.
+That's where all the code is.
diff --git a/keyboards/kinesis/keymaps/ericgebhart/rules.mk b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
new file mode 100644
index 0000000000..61115e927a
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
@@ -0,0 +1,16 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+
diff --git a/keyboards/kinesis/keymaps/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c
new file mode 100644
index 0000000000..c861233691
--- /dev/null
+++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2022 Gregory L. Dietsche <gregory.dietsche@cuw.edu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * To build this layout run:
+ * qmk compile -kb kinesis/kint41 -km farmergreg
+ *
+ * Layout Details:
+ * PROGM + F9 to RESET and load new firmware.
+ * Colemak (default / PROGM+C), Dvorak (PROGM + F4) and QWERTY (PROGM+F3) layouts are available for use
+ * CAPS LOCK is ESC (for use in VIM). Double tap to activate CAPS Lock
+ * UP and DOWN arrows are swapped to be more like VIM
+ * [] and {} are swapped to make programming easier
+ */
+
+#include QMK_KEYBOARD_H
+
+
+enum {
+	_COLEMAK,
+	_DVORAK,
+	_QWERTY,
+	_QWERTY_GAME,
+	_KEYPAD,
+	_PROGM,
+	_LAYER_COUNT,
+};
+
+/*
+ * Tap Dances
+ */
+enum tap_dances {
+	TD_CAPS,	// ESC on tap, CAPS on double tap
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
+};
+
+/*
+ * Key Overrides
+ */
+const key_override_t lcurlytobracket = ko_make_basic(MOD_MASK_SHIFT, KC_LEFT_BRACKET, KC_LEFT_BRACKET);
+const key_override_t rcurlytobracket = ko_make_basic(MOD_MASK_SHIFT, KC_RIGHT_BRACKET, KC_RIGHT_BRACKET);
+const key_override_t lbrackettocurly = ko_make_basic(0, KC_LEFT_BRACKET, KC_LEFT_CURLY_BRACE);
+const key_override_t rbrackettocurly = ko_make_basic(0, KC_RIGHT_BRACKET, KC_RIGHT_CURLY_BRACE);
+
+const key_override_t **key_overrides = (const key_override_t *[]){
+	&lcurlytobracket,
+	&rcurlytobracket,
+	&lbrackettocurly,
+	&rbrackettocurly,
+	NULL
+};
+
+/*
+ * Key Maps
+ */
+const uint16_t PROGMEM keymaps[_LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
+[_COLEMAK] = LAYOUT(
+	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   ,
+	TD(TD_CAPS), KC_A  ,KC_R   ,KC_S   ,KC_T   ,KC_D   ,
+	KC_LSFT    ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
+		    KC_GRV ,KC_BSLS,KC_LEFT,KC_RGHT,
+
+			KC_LCTL,KC_LALT,
+				KC_HOME,
+			KC_BSPC,KC_DEL ,KC_END,
+
+	KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, TG(_KEYPAD), MO(_PROGM),	// I would prefer OSL(_PROGM) but MO emulates what Kinesis does in their firmware.
+	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_DOWN,KC_UP  ,KC_LBRC,KC_RBRC,
+
+			KC_RGUI,KC_RCTL,
+				KC_PGUP,
+			KC_PGDN,KC_ENT ,KC_SPC
+	)
+,[_DVORAK] = LAYOUT(
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,KC_QUOT,KC_COMM,KC_DOT ,KC_P   ,KC_Y   ,
+	_______,KC_A   ,KC_O   ,KC_E   ,KC_U   ,KC_I   ,
+	_______,KC_SCLN,KC_Q   ,KC_J   ,KC_K   ,KC_X   ,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______,
+
+	_______,_______,_______,_______,_______,_______,_______,_______, _______,
+	_______,_______,_______,_______,_______,_______,
+	KC_F   ,KC_G   ,KC_C   ,KC_R   ,KC_L   ,KC_SLSH,
+	KC_D   ,KC_H   ,KC_T   ,KC_N   ,KC_S   ,KC_QUOT,
+	KC_B   ,KC_M   ,KC_W   ,KC_V   ,KC_Z   ,_______,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______
+	)
+,[_QWERTY] = LAYOUT(
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,KC_Q  ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,
+	_______,KC_A  ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,
+	_______,KC_Z  ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
+		    _______,_______,_______,_______,
+			_______,_______,
+				_______,
+			_______,_______,_______,
+
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______,
+	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,_______,
+	KC_N   ,KC_M   ,_______,_______,_______,_______,
+		_______,_______,_______,_______,
+			_______,_______,
+				_______,
+			_______,_______,_______
+	)
+,[_QWERTY_GAME] = LAYOUT( // Shift WASD over to ESDF (QWERTY). Also move T and G
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,KC_T   ,KC_Q   , KC_W  ,KC_E   ,KC_R   ,
+	_______,KC_G   ,KC_A   , KC_S  ,KC_D   ,KC_F   ,
+	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			KC_SPC ,_______,_______, // BACKSPACE becomes SPACE
+
+	_______,_______,_______,_______,_______,_______,_______, _______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,KC_BSPC // SPACE becomes BACKSPACE
+	)
+,[_KEYPAD] = LAYOUT(
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+		_______,KC_INS ,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______,
+
+	_______,_______,_______ ,_______,KC_MUTE,KC_VOLD,KC_VOLU,TG(_KEYPAD), _______,
+	_______,KC_NUM  ,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,
+
+			_______,_______,
+				_______,
+			_______,_______,KC_P0
+	)
+	,[_PROGM] = LAYOUT(
+	_______,_______,_______,DF(_QWERTY),DF(_DVORAK),_______         ,_______,_______,_______,
+	_______,_______,_______,_______     ,_______    ,_______         ,
+	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	// The G in Colemak
+	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	// The G in QWERTY
+	_______,_______,_______,DF(_COLEMAK),_______    ,_______,
+		_______,_______,_______     ,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______,
+
+	RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______
+	)
+/*
+	,[_TEMPLATE] = LAYOUT(
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______,
+
+	_______,_______,_______,_______,_______,_______,_______,_______, _______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______,_______,
+
+			_______,_______,
+				_______,
+			_______,_______,_______
+	)
+*/
+};
diff --git a/keyboards/kinesis/keymaps/farmergreg/readme.md b/keyboards/kinesis/keymaps/farmergreg/readme.md
new file mode 100644
index 0000000000..f27ee19023
--- /dev/null
+++ b/keyboards/kinesis/keymaps/farmergreg/readme.md
@@ -0,0 +1 @@
+[farmergreg](https://github.com/farmergreg)'s kinesis advantage 2 kint41 layout
diff --git a/keyboards/kinesis/keymaps/farmergreg/rules.mk b/keyboards/kinesis/keymaps/farmergreg/rules.mk
new file mode 100644
index 0000000000..f6bd054e78
--- /dev/null
+++ b/keyboards/kinesis/keymaps/farmergreg/rules.mk
@@ -0,0 +1,5 @@
+BOOTMAGIC_ENABLE = no
+COMMAND_ENABLE = yes
+NKRO_ENABLE = yes
+KEY_OVERRIDE_ENABLE = yes
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
new file mode 100644
index 0000000000..1f49c4622c
--- /dev/null
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -0,0 +1,228 @@
+/* Copyright 2022 Nicholas Granado <ngranado@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _DEFAULT,
+    _QWERTY,
+    _COLEMAK_MOD_DH,
+    _WORKMAN,
+    _KEYPAD,
+    _LAYERS,
+};
+
+#define DEFAULT DF(_DEFAULT)
+#define QWERTY  TO(_QWERTY)
+#define CMMDH   TO(_COLEMAK_MOD_DH)
+#define WM      TO(_WORKMAN)
+#define KEYPAD  TO(_KEYPAD)
+#define LAYERS  OSL(_LAYERS)
+#define HCTLESC CTL_T(KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_DEFAULT] = LAYOUT(
+        // LHAND
+        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 ,_______,_______,_______,_______,_______,
+        HCTLESC,_______,_______,_______,_______,_______,
+        KC_LSPO,_______,_______,_______,_______,_______,
+                KC_GRV ,LAYERS ,KC_LEFT,KC_RGHT,
+        // LTHUMB
+                KC_LALT,KC_LCTL,
+                        KC_HOME,
+        KC_BSPC,KC_DEL ,KC_END ,
+        // RHAND
+        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KEYPAD ,RESET  ,
+        KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
+        _______,_______,_______,_______,_______,KC_BSLS,
+        _______,_______,_______,_______,_______,KC_QUOT,
+        _______,_______,_______,_______,_______,KC_RSPC,
+                KC_UP  ,KC_DOWN,KC_LBRC,KC_RBRC,
+        // RTHUMB
+        KC_RCTL,KC_LGUI,
+        KC_PGUP,
+        KC_PGDN,KC_ENT ,KC_SPC
+    ),
+
+    [_QWERTY] = LAYOUT(
+        // LHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,
+        _______,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,
+        _______,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
+                _______,_______,_______,_______,
+        // LTHUMB
+                _______,_______,
+                        _______,
+        _______,_______,_______,
+        // RHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______,
+        KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,_______,
+        KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
+                _______,_______,_______,_______,
+        // RTHUMB
+        _______,_______,
+        _______,
+        _______,_______,_______
+    ),
+
+    [_COLEMAK_MOD_DH] = LAYOUT(
+        // LHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_B,
+        _______,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_G,
+        _______,KC_Z   ,KC_X   ,KC_C   ,KC_D   ,KC_V,
+                _______,_______,_______,_______,
+        // LTHUMB
+                _______,_______,
+                        _______,
+        _______,_______,_______,
+        // RHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_SCLN,_______,
+        KC_M   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,_______,
+        KC_K   ,KC_H   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
+                _______,_______,_______,_______,
+        // RTHUMB
+        _______,_______,
+        _______,
+        _______,_______,_______
+    ),
+
+    [_WORKMAN] = LAYOUT(
+        // LHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,KC_Q   ,KC_D   ,KC_R   ,KC_W   ,KC_B,
+        _______,KC_A   ,KC_S   ,KC_H   ,KC_T   ,KC_G,
+        _______,KC_Z   ,KC_X   ,KC_M   ,KC_C   ,KC_V,
+                _______,_______,_______,_______,
+        // LTHUMB
+                _______,_______,
+                        _______,
+        _______,_______,_______,
+        // RHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        KC_J   ,KC_F   ,KC_U   ,KC_P   ,KC_SCLN,_______,
+        KC_Y   ,KC_N   ,KC_E   ,KC_O   ,KC_I   ,_______,
+        KC_K   ,KC_L   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
+                _______,_______,_______,_______,
+        // RTHUMB
+        _______,_______,
+        _______,
+        _______,_______,_______
+    ),
+
+    [_KEYPAD] = LAYOUT (
+        // LHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,
+        _______,KC_MSTP,KC_MPRV,KC_MPLY,KC_MNXT,KC_MSEL,
+        _______,_______,_______,_______,_______,_______,
+                _______,_______,_______,_______,
+        // LTHUMB
+                _______,_______,
+                        _______,
+        _______,_______,_______,
+
+        // RHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,KC_NLCK,KC_PEQL,KC_PSLS,KC_PAST,_______,
+        _______,KC_P7,  KC_P8,  KC_P9,  KC_PMNS,_______,
+        _______,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,_______,
+        _______,KC_P1,  KC_P2,  KC_P3,  KC_PENT,_______,
+                KC_LPRN,KC_RPRN,KC_PDOT,KC_PENT,
+        // RTHUMB
+        _______,_______,
+        _______,
+        _______,KC_PENT,KC_P0
+    ),
+
+    [_LAYERS] = LAYOUT (
+        // LHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,QWERTY ,CMMDH  ,WM     ,KEYPAD ,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+                _______,_______,_______,_______,
+        // LTHUMB
+                _______,_______,
+                        _______,
+        _______,_______,_______,
+
+        // RHAND
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,
+                _______,_______,_______,_______,
+        // RTHUMB
+        _______,_______,
+        _______,
+        _______,_______,_______
+    ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePinHigh(LED_NUM_LOCK_PIN);
+    writePinHigh(LED_SCROLL_LOCK_PIN);
+    writePinHigh(LED_COMPOSE_PIN);
+    writePinHigh(LED_CAPS_LOCK_PIN);
+    switch (get_highest_layer(state)) {
+        case _QWERTY:
+            // Caps Lock Lit
+            writePinLow(LED_CAPS_LOCK_PIN);
+            break;
+        case _COLEMAK_MOD_DH:
+            // Num Lock Lit
+            writePinLow(LED_NUM_LOCK_PIN);
+            break;
+        case _WORKMAN:
+            // Scroll Lock Lit
+            writePinLow(LED_SCROLL_LOCK_PIN);
+            break;
+        case _KEYPAD:
+            // Compose Lit
+            writePinLow(LED_COMPOSE_PIN);
+            break;
+        case _LAYERS:
+            // All LEDs Lit
+            writePinLow(LED_SCROLL_LOCK_PIN);
+            writePinLow(LED_NUM_LOCK_PIN);
+            writePinLow(LED_CAPS_LOCK_PIN);
+            writePinLow(LED_COMPOSE_PIN);
+            break;
+    }
+  return state;
+}
+
+bool led_update_user(led_t led_state) {
+    // disable led_update_kb() so that we do not override layer indicators
+    return false;
+}
+
diff --git a/keyboards/kinesis/keymaps/heatxsink/readme.md b/keyboards/kinesis/keymaps/heatxsink/readme.md
new file mode 100644
index 0000000000..83a2b55854
--- /dev/null
+++ b/keyboards/kinesis/keymaps/heatxsink/readme.md
@@ -0,0 +1,165 @@
+# heatxsink's keymap for kinesis advantage w/ kinx
+
+## my keymap has three objectives ...
+1. Make it easy to add keyboard layouts (layers).
+2. Easy to swap between keyboard layouts (layers).
+3. Use LED indicators on the kinX controller to provide feedback as to what layer is selected.
+
+## layer description
+0. DEFAULT (function key row, number row, left/right gutter keys, and thumb keys)
+1. QWERTY
+2. CMMDH [Colemak Mod-DH](https://colemakmods.github.io/mod-dh/)
+3. WM    [Workman](https://workmanlayout.org/)
+3. Keypad (number pad on the right, media keys on the left)
+
+## layers
+```
+Keymap: DEFAULT
+Description: keys separated by "/" tap for first, hold for second; uses Space Cadet Shifts
+
+ ,-------------------------------------------------------------------------------------------------------------------.
+ | Esc    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 | PSCR | SLCK | PAUS |KEYPAD|  BOOT  |
+ |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
+ | =+     |  1!  |  2@  |  3#  |  4$  |  5%  |                           |  6^  |  7&  |  8*  |  9(  |  0)  | -_     |
+ |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
+ | Tab    |      |      |      |      |      |                           |      |      |      |      |      | \|     |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |ESC/CTRL|      |      |      |      |      |                           |      |      |      |      |      | '"     |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |SC_Shift|      |      |      |      |      |                           |      |      |      |      |      |SC_Shift|
+ `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+          | `~   |LAYERS| Left | Right|                                         | Up   | Down |  [{  |  ]}  |
+          `---------------------------'                                         `---------------------------'
+                                        ,-------------.         ,-------------.
+                                        | ALT  | CTRL |         | CTRL  | GUI |
+                                 ,------|------|------|         |------+------+------.
+                                 |      |      | Home |         | PgUp |      |      |
+                                 | BkSp | Del  |------|         |------|Return| Space|
+                                 |      |      | End  |         | PgDn |      |      |
+                                 `--------------------'         `--------------------'
+
+Keymap: LAYERS 
+Description: OSL that allows for easy switching between layers.
+
+ ,-------------------------------------------------------------------------------------------------------------------.
+ |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
+ |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
+ |        |QWERTY|CMMDH |WM    |KEYPAD|      |                           |      |      |      |      |      |        |
+ |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+ `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+          |      |      |      |      |                                         |      |      |      |      |
+          `---------------------------'                                         `---------------------------'
+                                        ,-------------.         ,-------------.
+                                        |      |      |         |      |      |
+                                 ,------|------|------|         |------+------+------.
+                                 |      |      |      |         |      |      |      |
+                                 |      |      |------|         |------|      |      |
+                                 |      |      |      |         |      |      |      |
+                                 `--------------------'         `--------------------'
+
+Keymap: QWERTY
+
+ ,-------------------------------------------------------------------------------------------------------------------.
+ |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
+ |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+ |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
+ |        |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,.  |  .>  |  /?  |        |
+ `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+          |      |      |      |      |                                         |      |      |      |      |
+          `---------------------------'                                         `---------------------------'
+                                        ,-------------.         ,-------------.
+                                        |      |      |         |      |      |
+                                 ,------|------|------|         |------+------+------.
+                                 |      |      |      |         |      |      |      |
+                                 |      |      |------|         |------|      |      |
+                                 |      |      |      |         |      |      |      |
+                                 `--------------------'         `--------------------'
+
+Keymap: CMMDH (Colemak Mod-DH)
+
+ ,-------------------------------------------------------------------------------------------------------------------.
+ |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
+ |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+ |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
+ |        |   Q  |   W  |   F  |   P  |   B  |                           |   J  |   L  |   U  |   Y  |  ;:  |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |   A  |   R  |   S  |   T  |   G  |                           |   M  |   N  |   E  |   I  |  O   |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |   Z  |   X  |   C  |   D  |   V  |                           |   K  |   H  |  ,.  |  .>  |  /?  |        |
+ `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+          |      |      |      |      |                                         |      |      |      |      |
+          `---------------------------'                                         `---------------------------'
+                                        ,-------------.         ,-------------.
+                                        |      |      |         |      |      |
+                                 ,------|------|------|         |------+------+------.
+                                 |      |      |      |         |      |      |      |
+                                 |      |      |------|         |------|      |      |
+                                 |      |      |      |         |      |      |      |
+                                 `--------------------'         `--------------------'
+
+Keymap: WM (Workman)
+
+ ,-------------------------------------------------------------------------------------------------------------------.
+ |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
+ |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+ |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
+ |        |   Q  |   D  |   R  |   W  |   B  |                           |   J  |   F  |   U  |   P  |  ;:  |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |   A  |   S  |   H  |   T  |   G  |                           |   Y  |   N  |   E  |   O  |  I   |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |   Z  |   X  |   M  |   C  |   V  |                           |   K  |   L  |  ,.  |  .>  |  /?  |        |
+ `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+          |      |      |      |      |                                         |      |      |      |      |
+          `---------------------------'                                         `---------------------------'
+                                        ,-------------.         ,-------------.
+                                        |      |      |         |      |      |
+                                 ,------|------|------|         |------+------+------.
+                                 |      |      |      |         |      |      |      |
+                                 |      |      |------|         |------|      |      |
+                                 |      |      |      |         |      |      |      |
+                                 `--------------------'         `--------------------'
+
+Keymap: KEYPAD
+
+ ,-------------------------------------------------------------------------------------------------------------------.
+ |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
+ |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |NUMLCK|  =   |  /   |PASTE |        |
+ |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
+ |        |      | MUTE | VOL- | VOL+ |      |                           |      |   7  |   8  |   9  |  -   |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        | STOP | PREV | PLAY | NEXT |SELECT|                           |      |   4  |   5  |   6  |  +   |        |
+ |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+ |        |      |      |      |      |      |                           |      |   1  |   2  |   3  | ENTER|        |
+ `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+          |      |      |      |      |                                         |   (  |   )  |   .  | ENTER|
+          `---------------------------'                                         `---------------------------'
+                                        ,-------------.         ,-------------.
+                                        |      |      |         |      |      |
+                                 ,------|------|------|         |------+------+------.
+                                 |      |      |      |         |      |      |      |
+                                 |      |      |------|         |------|ENTER |  0   |
+                                 |      |      |      |         |      |      |      |
+                                 `--------------------'         `--------------------'
+```
+## requirements
+* K500 or K600 Kinesis Advantage MPC or Advantage 2.
+* [kinx project / stapelberg controller](https://github.com/kinx-project/kint)
+
+## shoutout(s)
+* `stapelberg` self explanitory
+* `jwon` for his LED indicator code
+* `tuesdayjohn` for how he did layers
+
diff --git a/keyboards/kinesis/keymaps/heatxsink/rules.mk b/keyboards/kinesis/keymaps/heatxsink/rules.mk
new file mode 100644
index 0000000000..f8c1a24cca
--- /dev/null
+++ b/keyboards/kinesis/keymaps/heatxsink/rules.mk
@@ -0,0 +1,5 @@
+BOOTMAGIC_ENABLE = no
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = yes
+NKRO_ENABLE = yes
+SLEEP_LED_ENABLE = yes
diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index c62ffbbccf..d7a0a5e5c2 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   KC_LCTL,KC_LALT,
                                     KC_LGUI,
                            KC_BSPC,KC_ESC ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_FN0, RESET,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_NO, RESET,
 	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,
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index c94f06bbb9..e7a6ffd6e9 100644
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    KC_RCTL,KC_LALT,
                    KC_HOME,
                    KC_SPC ,KC_LSFT,KC_BSPC ,
-           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_FN0 ,RESET,
+           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_NO ,RESET,
            KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,DE_SS  ,
            KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_ADIA,
            KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_ODIA,
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
index 1635c34436..54cf6b81a7 100644
--- a/keyboards/kinesis/kinesis.h
+++ b/keyboards/kinesis/kinesis.h
@@ -1,35 +1,24 @@
-#ifndef KINESIS_H
-#define KINESIS_H
+#pragma once
 
-#ifdef KEYBOARD_kinesis_alvicstep
-	#include "alvicstep.h"
-#endif
-#ifdef KEYBOARD_kinesis_stapelberg
-	#include "stapelberg.h"
-#endif
-#ifdef KEYBOARD_kinesis_kint2pp
-	#include "kint2pp.h"
-#endif
-#ifdef KEYBOARD_kinesis_nguyenvietyen
-	#include "nguyenvietyen.h"
-#endif
-#ifdef KEYBOARD_kinesis_kint36
-	#include "kint36.h"
-#endif
-#ifdef KEYBOARD_kinesis_kint41
-	#include "kint41.h"
+#if defined(KEYBOARD_kinesis_alvicstep)
+#    include "alvicstep.h"
+#elif defined(KEYBOARD_kinesis_stapelberg)
+#    include "stapelberg.h"
+#elif defined(KEYBOARD_kinesis_kint2pp)
+#    include "kint2pp.h"
+#elif defined(KEYBOARD_kinesis_nguyenvietyen)
+#    include "nguyenvietyen.h"
+#elif defined(KEYBOARD_kinesis_kint36)
+#    include "kint36.h"
+#elif defined(KEYBOARD_kinesis_kint41)
+#    include "kint41.h"
 #endif
 
 #include "quantum.h"
 
-
 void all_led_off(void);
 void all_led_on(void);
 void num_lock_led_on(void);
 void caps_lock_led_on(void);
 void scroll_lock_led_on(void);
 void keypad_led_on(void);
-
-
-
-#endif
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index a5530bc2f7..54ba07d3d6 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -41,6 +41,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
+// The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
+// per https://www.pjrc.com/teensy/low_power.html
+#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index ab34daa7b8..188c83345d 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -59,9 +59,9 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
+// The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
+// https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
+#define USB_MAX_POWER_CONSUMPTION 100
 
 #define LED_PIN_ON_STATE 0
 #define LED_NUM_LOCK_PIN A14
diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk
index 4f33583124..c50225ad8a 100644
--- a/keyboards/kinesis/kint36/rules.mk
+++ b/keyboards/kinesis/kint36/rules.mk
@@ -1,5 +1,5 @@
-BOARD = PJRC_TEENSY_3_6
-MCU   = MK66F18
+# MCU name
+MCU = MK66FX1M0
 
 # Debounce eagerly (report change immediately), keep per-key timers. We can use
 # this because the kinT does not have to deal with noise.
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 349d3ee364..3e13e84606 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -86,9 +86,9 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 125μs minimum that USB 2.x (High Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
+// The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
+// as per https://www.pjrc.com/store/teensy41.html
+#define USB_MAX_POWER_CONSUMPTION 100
 
 /* We use the i.MX RT1060 high-speed GPIOs (GPIO6-9) which are connected to the
  * AHB bus (AHB_CLK_ROOT), which runs at the same speed as the ARM Core Clock,
diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk
index 8ed5c746f2..65018bc3cc 100644
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/rules.mk
@@ -7,11 +7,11 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 COMMAND_ENABLE = yes
-NKRO_ENABLE = yes
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk
index 9722f13046..129e08635d 100644
--- a/keyboards/kinesis/rules.mk
+++ b/keyboards/kinesis/rules.mk
@@ -7,15 +7,12 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 8f920c19c1..fe44131adb 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -1,5 +1,4 @@
-#ifndef STAPELBERG_CONFIG_H
-#define STAPELBERG_CONFIG_H
+#pragma once
 
 #include "../config.h"
 #include "config_common.h"
@@ -46,5 +45,3 @@
 */
 
 #define IGNORE_MOD_TAP_INTERRUPT
-
-#endif
diff --git a/keyboards/kinesis/stapelberg/stapelberg.h b/keyboards/kinesis/stapelberg/stapelberg.h
index e35e2f5db8..f478c493fd 100644
--- a/keyboards/kinesis/stapelberg/stapelberg.h
+++ b/keyboards/kinesis/stapelberg/stapelberg.h
@@ -1,5 +1,4 @@
-#ifndef KINESIS_STAPELBERG_H
-#define KINESIS_STAPELBERG_H
+#pragma once
 
 #include "quantum.h"
 
@@ -9,71 +8,70 @@
 // The first section contains all of the arguments as on the physical keyboard
 // The second converts the arguments into the 2-D scanned array
 
-#define LAYOUT(                                   \
-    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,  \
-    k00, k10, k20, k30, k40, k50,                 \
-    k01, k11, k21, k31, k41, k51,                 \
-    k02, k12, k22, k32, k42, k52,                 \
-    k03, k13, k23, k33, k43, k53,                 \
-         k14, k24, k34, k54,                      \
-                             k56, k55,            \
-                                  k35,            \
-                        k36, k46, k25,            \
-                                                  \
-    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \
-                   k60, k70, k80, k90, kA0, kB0,  \
-                   k61, k71, k81, k91, kA1, kB1,  \
-                   k62, k72, k82, k92, kA2, kB2,  \
-                   k63, k73, k83, k93, kA3, kB3,  \
-                        k64, k84, k94, kA4,       \
-              k96, k85,                           \
-              k86,                                \
-              k66, k75, k65                       \
-) {                                              \
-    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \
-    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \
-    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \
-    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \
-    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \
-    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \
-    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \
-    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \
-    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \
-    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ } \
+#define LAYOUT( \
+    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
+    k00, k10, k20, k30, k40, k50, \
+    k01, k11, k21, k31, k41, k51, \
+    k02, k12, k22, k32, k42, k52, \
+    k03, k13, k23, k33, k43, k53, \
+         k14, k24, k34, k54, \
+                             k56, k55, \
+                                  k35, \
+                        k36, k46, k25, \
+\
+    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
+                   k60, k70, k80, k90, kA0, kB0, \
+                   k61, k71, k81, k91, kA1, kB1, \
+                   k62, k72, k82, k92, kA2, kB2, \
+                   k63, k73, k83, k93, kA3, kB3, \
+                        k64, k84, k94, kA4, \
+              k96, k85, \
+              k86, \
+              k66, k75, k65 \
+) { \
+    { k00, k01, k02, k03, ___, ___, ___ }, \
+    { k10, k11, k12, k13, k14, ___, ___ }, \
+    { k20, k21, k22, k23, k24, k25, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36 }, \
+    { k40, k41, k42, k43, ___, ___, k46 }, \
+    { k50, k51, k52, k53, k54, k55, k56 }, \
+    { k60, k61, k62, k63, k64, k65, k66 }, \
+    { k70, k71, k72, k73, ___, k75, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86 }, \
+    { k90, k91, k92, k93, k94, ___, k96 }, \
+    { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
+    { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
+    { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
+    { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
+    { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
 }
 
-/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty(                                                                           \
-    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \
-    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0,       \
-    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1,       \
-    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2,       \
-    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3,       \
-         k14, k24, k34, k54,                                      k64, k84, k94, kA4,            \
-                             k56, k55,                  k96, k85,                                \
-                                  k35,                  k86,                                     \
-                        k36, k46, k25,                  k66, k75, k65                            \
-) {                                              \
-    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \
-    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \
-    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \
-    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \
-    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \
-    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \
-    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \
-    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \
-    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \
-    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }  \
+#define LAYOUT_pretty( \
+    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
+    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0, \
+    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1, \
+    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2, \
+    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3, \
+         k14, k24, k34, k54,                                      k64, k84, k94, kA4, \
+                             k56, k55,                  k96, k85, \
+                                  k35,                  k86, \
+                        k36, k46, k25,                  k66, k75, k65 \
+) { \
+    { k00, k01, k02, k03, ___, ___, ___ }, \
+    { k10, k11, k12, k13, k14, ___, ___ }, \
+    { k20, k21, k22, k23, k24, k25, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36 }, \
+    { k40, k41, k42, k43, ___, ___, k46 }, \
+    { k50, k51, k52, k53, k54, k55, k56 }, \
+    { k60, k61, k62, k63, k64, k65, k66 }, \
+    { k70, k71, k72, k73, ___, k75, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86 }, \
+    { k90, k91, k92, k93, k94, ___, k96 }, \
+    { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
+    { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
+    { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
+    { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
+    { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
 }
 
 /*
@@ -98,7 +96,3 @@ PC4 kCx Row: ESC F3  F6  F9  F12 PAU --
 PC5 kDx Row: F1  F4  F7  F10 PRT PRG --
 PC6 kEx Row: F2  F5  F8  F11 SLK KEY --
 */
-
-
-
-#endif