Merge remote-tracking branch 'upstream/develop'

23 files changed, 36 insertions, 730 deletions

diff --git a/keyboards/kinesis/.noci b/keyboards/kinesis/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kinesis/.noci
+++ /dev/null
diff --git a/keyboards/kinesis/keymaps/carpalx/config.h b/keyboards/kinesis/keymaps/carpalx/config.h
deleted file mode 100644
index 8893d122e0..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/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/carpalx/keymap.c b/keyboards/kinesis/keymaps/carpalx/keymap.c
deleted file mode 100644
index 28d724518a..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _CX 0 // Carpalx layer
-#define _QW 1 // Qwerty layer
-#define _KP 2 // Keypad + Media Layer
-
-// Macro name shortcuts
-#define DVORAK M(_DV)
-#define QWERTY M(_QW)
-#define COLEMAK M(_CM)
-
-/*
-
-        Function Keys on All Layers (Keypad toggles):
-        ,---------------------------------------------------------------.
-        |  L0  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8   |
-        `---------------------------------------------------------------'
-        ,---------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PSCR |  L1  |  L2  |  L2  | QK_BOOT |
-        `---------------------------------------------------------------'
-
-        L0 Carpalx layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   G  |   M  |   L  |   W  ||   B  |   Y  |   U  |   V  |   ;  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   D  |   S  |   T  |   N  |   R  ||   I  |   A  |   E  |   O  |   H  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   F  |   J  ||   K  |   P  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L2) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L1 QWERTY layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L1) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L2 Keypad + Media layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      | Mute | Vol- | Vol+ |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        | Stop | Prev | Play | Next | Sel  ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |   (  |   )  | KP . |KP Ent|      |
-                 `---------------------------'              `----------------------------------'
-                                   ,----------------.,----------------.
-                                   |       |        ||        |       |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |        ||        |       |       |
-                            |      |       |--------||--------|KP Entr| KP 0  |
-                            |      |       |        ||        |       |       |
-                            `-----------------------'`------------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_CX] = LAYOUT(
-           // Left Hand
-           TO(_CX),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_DEL,   KC_1,    KC_3,    KC_5,    KC_7,    KC_9,
-           KC_TAB,   KC_Q,    KC_G,    KC_M,    KC_L,    KC_W,
-           KC_ESC,   KC_D,    KC_S,    KC_T,    KC_N,    KC_R,
-           KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_F,    KC_J,
-                     KC_GRV,  KC_LBRC, KC_LEFT, KC_RGHT,
-           // Left Thumb
-                     KC_LCTL, KC_LALT,
-                              KC_RGUI,
-           KC_BSPC,  KC_ESC,  MO(_KP),
-
-           // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, TO(_QW), TO(_KP), TO(_KP),  QK_BOOT,
-           KC_0,    KC_8,    KC_6,    KC_4,    KC_2,    KC_MINS,
-           KC_B,    KC_Y,    KC_U,    KC_V,    KC_SCLN, KC_EQL,
-           KC_I,    KC_A,    KC_E,    KC_O,    KC_H,    KC_QUOT,
-           KC_K,    KC_P,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_DOWN,   KC_UP, KC_RBRC, KC_BSLS,
-           // Right Thumb
-           KC_RALT, KC_RCTL,
-           KC_RGUI,
-           MO(_KP), KC_ENT,  KC_SPC
-    ),
-
-[_QW] = LAYOUT(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______,  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,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           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, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_KP] = LAYOUT(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-           _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand */
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, 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,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, KC_PENT, KC_P0
-    )
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch(id) {
-    case _CX:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_CX);
-      }
-      break;
-    case _QW:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QW);
-      }
-      break;
-    }
-    return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
diff --git a/keyboards/kinesis/keymaps/carpalx/readme.md b/keyboards/kinesis/keymaps/carpalx/readme.md
deleted file mode 100644
index 2db75c9539..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/readme.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Carpalx Kinesis Keymap
-
-## About this keymap
-
-Carpalx layout (also known as QGMLWBY) is an optimized alternative keyboard layout.
-Learn more about it at:
-[http://mkweb.bcgsc.ca/carpalx/?popular_alternatives](http://mkweb.bcgsc.ca/carpalx/?popular_alternatives)
-
-The layout also includes a QWERTY layer to help with the transition.
- - Scroll Lock: QWERTY layer
- - Esc (Fn row): Carpalx layer
- - Keypad: Keypad and Media layer
-
-## Details mapping
-
-        Function Keys on All Layers (Keypad toggles):
-        ,---------------------------------------------------------------.
-        |  L0  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8   |
-        `---------------------------------------------------------------'
-        ,---------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PSCR |  L1  |  L2  |  L2  | RESET |
-        `---------------------------------------------------------------'
-
-        L0 Carpalx layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   G  |   M  |   L  |   W  ||   B  |   Y  |   U  |   V  |   ;  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   D  |   S  |   T  |   N  |   R  ||   I  |   A  |   E  |   O  |   H  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   F  |   J  ||   K  |   P  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L2) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L1 QWERTY layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L1) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L2 Keypad + Media layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      | Mute | Vol- | Vol+ |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        | Stop | Prev | Play | Next | Sel  ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |   (  |   )  | KP . |KP Ent|      |
-                 `---------------------------'              `----------------------------------'
-                                   ,----------------.,----------------.
-                                   |       |        ||        |       |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |        ||        |       |       |
-                            |      |       |--------||--------|KP Entr| KP 0  |
-                            |      |       |        ||        |       |       |
-                            `-----------------------'`------------------------'
-
diff --git a/keyboards/kinesis/keymaps/carpalx/rules.mk b/keyboards/kinesis/keymaps/carpalx/rules.mk
deleted file mode 100644
index 1c26f881f2..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 = no         # 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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index 9c2f3bcc6b..e0f114902c 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_NO, QK_BOOT,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,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_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
index 913f5dbf84..c790e08945 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_NO,    QK_BOOT,
+    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_SCRL,  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/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index a81ac0cec5..9ebb088cf7 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_NO, QK_BOOT,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
         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,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                   KC_NO,   KC_NO,   KC_TRNS,
        // right hand
        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_POWER,
+       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PWR,
        KC_NO,   KC_VOLU, KC_MS_U, KC_VOLD, KC_NO,   KC_NO,
        KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,   KC_NO,
        KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,
diff --git a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
index a072176f43..b6a4fa2d10 100644
--- a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
@@ -16,7 +16,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_NLCK, KC_POWER,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NUM, KC_PWR,
         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/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c
index 1b6442cac5..393b7c074b 100644
--- a/keyboards/kinesis/keymaps/farmergreg/keymap.c
+++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[_LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
 				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_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,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,
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
index dd02def8c2..53b4b57cf5 100644
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -41,18 +41,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_EQL ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
         KC_TAB ,_______,_______,_______,_______,_______,
         HCTLESC,_______,_______,_______,_______,_______,
-        KC_LSPO,_______,_______,_______,_______,_______,
+        SC_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 ,QK_BOOT,
+        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KEYPAD ,QK_BOOT,
         KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
         _______,_______,_______,_______,_______,KC_BSLS,
         _______,_______,_______,_______,_______,KC_QUOT,
-        _______,_______,_______,_______,_______,KC_RSPC,
+        _______,_______,_______,_______,_______,SC_RSPC,
                 KC_UP  ,KC_DOWN,KC_LBRC,KC_RBRC,
         // RTHUMB
         KC_RCTL,KC_LGUI,
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         // RHAND
         _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,KC_NLCK,KC_PEQL,KC_PSLS,KC_PAST,_______,
+        _______,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,_______,
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 7d39da8397..0888f3f8cd 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -100,11 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_COLEMAK] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_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_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
@@ -136,11 +136,11 @@ 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, NUMPAD,  ADJUST,
+  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_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
@@ -268,7 +268,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_NUMPAD] = LAYOUT_pretty(
   _______, _______, _______, _______,    _______,   _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NLCK, _______, _______,    _______,   _______,                                                         KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_NUM,  _______, _______,    _______,   _______,                                                         KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,                                                           _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
   _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,                                                           _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
   _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
@@ -303,7 +303,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_COLEMAKGM] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_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_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
@@ -339,7 +339,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_QWERTYGM] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_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_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   KC_LCTL, 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/jwon/keymap.c b/keyboards/kinesis/keymaps/jwon/keymap.c
index fa75f95865..fe335e68ac 100644
--- a/keyboards/kinesis/keymaps/jwon/keymap.c
+++ b/keyboards/kinesis/keymaps/jwon/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_SPC,  MACCOPY,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, QWERTY,  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, QWERTY,  QK_BOOT,
            KC_EQL,  KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
            KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS,
            KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
            // Right Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+           _______, 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, _______,
diff --git a/keyboards/kinesis/keymaps/milestogo/config.h b/keyboards/kinesis/keymaps/milestogo/config.h
deleted file mode 100644
index 8893d122e0..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/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/milestogo/keymap.c b/keyboards/kinesis/keymaps/milestogo/keymap.c
deleted file mode 100644
index 710ef97c59..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/keymap.c
+++ /dev/null
@@ -1,365 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mousekey.h"
-
-#define _QWERTY 0 // Base qerty
-#define _SYMB 1// Symbol layer
-#define _MOUSE 2//
-#define _TRANS 3//
-#define _SYMB2 4// old symbol level, more ergodox like
-
-/* Macros */
-enum {
-  NONE = 0,
-  // Diagonal mouse movement
-  A_MUL,
-  A_MUR,
-  A_MDL,
-  A_MDR,
-};
-
-
-//  Train out of using uncomfortable esc  and GUI keys.
-/****************************************************************************************************
-*
-* Keymap: Default Layer in Qwerty
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* | no     |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 |  FN0 |  FN1 |  FN2 |      |  bOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* | `~     |  1!  |  2@  |  3#  |  4$  |  5%  |                           |  6^  |  7&  |  8*  |  9(  |  0)  | -_     |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* | Tab    |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  | \|     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |MouseFN0|   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,<  |  .>  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          | ~`   | ESC  |GUI/L |L1/RT |                                         | L1/UP|GUI/DN| [{   | ]}   |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL | ALT  |         | ALT  | GUI |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Del  |         | PgUp |      |      |
-*                                 | BkSp | BkSp |------|         |------|Return| Space|
-*                                 |      |      | FN0  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT(
-           XXXXXXX, KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8,
-           KC_GRAVE, KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
-           KC_TAB, KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,
-           TT(_MOUSE) ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,
-           KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
-              KC_GRAVE,  KC_ESC, MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
-			   		KC_LCTL,KC_LALT,
-			   		KC_DEL,
-              		KC_BSPC, KC_DEL ,TT(_MOUSE) ,
-        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,TT(_MOUSE) ,TG(_MOUSE)  ,TT(_SYMB), 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,
-	KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-		LT(_SYMB, KC_UP), MT(MOD_LGUI,KC_DOWN),  KC_LBRC ,KC_RBRC,
-           KC_RALT,KC_RGUI,
-           KC_PGUP,
-           KC_PGDN,KC_ENTER ,KC_SPC
-    ),
-
-
-/* _SYMB level, more planck like. Much work to make sequences into multi-finger rolls. eg ([1,0]), !=0
-* Also sorted by frequency / strength of finger.
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |  ^   |   {  |   }  |  @   |  %   |                           |   &  |  [   |   (  |   )  |   _  |   \    |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |  !   |   #  |   0  |   =  |  ~   |                           |   *  |   +  |   1  |  -   |   ]  |  `     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |   6  |  7   |   8  |  9   | pipe |                           |   $  |  2   |   3  |   4  |  5   |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |  :   |GUI/L |L1/RT |                                         | L1/UP|GUI/DN|  \   |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL |      |         | ALT  | GUI |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 | Cut  | Paste|------|         |------|      |      |
-*                                 |      |      |Reset |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-
-
-[_SYMB] = LAYOUT(
-         _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  KC_CIRC,  KC_LCBR, KC_RCBR,  KC_AT,  KC_PERC,
-         _______,  KC_EXLM,  KC_HASH,  KC_0,   KC_EQL,  KC_TILD,
-         _______,   KC_6,   KC_7,   KC_8,  KC_9, KC_PIPE,
-                   _______,  KC_COLON,  MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  QK_BOOT,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         KC_AMPR,  KC_LBRC,  KC_LPRN, KC_RPRN,  KC_UNDS,  _______,
-         KC_ASTR,  KC_PLUS,  KC_1,    KC_MINS,   KC_RBRC,  KC_GRV,
-         KC_DLR,   KC_2,   KC_3,   KC_4,  KC_5, XXXXXXX,
-                   LT(_SYMB, KC_UP), MT(MOD_LGUI,KC_DOWN),   KC_BSLS,  XXXXXXX,
-         _______,  _______,
-         _______,
-         _______,  _______,  _______
-    ),
-
-
-/* _SYMB2ol level, more ergodox like
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* |        |      |   *  |   #  |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |  /   |   <  |   >  |      |      |                           |      |      |   +  |   *  |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  {   |   }  |      |      |                           |      |      |   =  |   -  |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |   =  |  (   |   )  |      |      |                           |      |      |      |   |  |      |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |GUI/L |L1/RT |                                         | L1/UP|GUI/DN|  {   |   }  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL |      |         | ALT  | GUI |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 | BkSp | Del  |------|         |------|Mouse1|Mouse2|
-*                                 |      |      |Reset |         |      |LClick|Rclick|
-*                                 `--------------------'         `--------------------'
-*/
-
-
-
-[_SYMB2] = LAYOUT(
-         _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  _______,  KC_ASTR,  KC_HASH,  _______,  _______,
-         _______,  KC_SLSH,  RSFT(KC_COMM), RSFT(KC_DOT),  _______,  _______,
-         _______,  _______,  RSFT(KC_LBRC),  RSFT(KC_RBRC),   _______,  _______,
-         _______,  KC_EQL,  RSFT(KC_9),  RSFT(KC_0),  _______,  _______,
-                   _______,  _______,  MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  QK_BOOT,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
-         _______,  _______,  _______,  KC_ASTR,  _______,  _______,
-         _______,  _______,  KC_PLUS,  KC_MINS,  _______,  _______,
-         _______,  _______,  KC_EQL,  KC_PIPE,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-                   LT(_SYMB, KC_UP), MT(MOD_LGUI,KC_DOWN),   _______,  _______,
-         _______,  _______,
-         _______,
-         _______,  _______,  _______
-    ),
-/* Keymap: Movement and function layer
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* | Caps   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 |  FN0 |  FN1 |  FN2 |  Tada |  bOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* | =+     |  !   |   @  |   #  |   $  |   %  |                           |  ^   |   &  |   *  |  (   |   )  |MS Fast |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* | Tab    |      |      |      |      |PgUp  |                           | MwU  |MS_UL | MS_U |MS_UR |      | Ms Norm|
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |MouseFN1|GUI_V |GUI X |GUI C |GUI_V |      |                           |      | MS_L |Mouse1| MS_R |      |MS Slow |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |PgDown|                           | MWD  | MDown|MS Dwn|MS_DR  |  ?  |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          | `~   | ESC  |      |      |                                         |      |      |  {  |    }  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL | GUI  |         | ALT  | GUI  |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 | BkSp | Del  |------|         |------|Mouse1|Mouse2|
-*                                 |      |      | End  |         | PgDn |LClick|Rclick|
-*                                 `--------------------'         `--------------------'
-*/
-
-
-[_MOUSE] = LAYOUT(
-         KC_CAPS,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  KC_EXLM  ,KC_AT,    KC_HASH,  KC_DLR   ,KC_PERC   ,
-         _______,  KC_NO,    KC_NO,    KC_UP,    KC_NO,    KC_PGUP,
-         TG(_MOUSE),   LGUI(KC_Z),LGUI(KC_X),LGUI(KC_C),LGUI(KC_V), KC_NO,
-         _______,  KC_NO,    KC_NO,    KC_UP,    KC_NO,    KC_PGDN,
-                   _______,  _______,  KC_NO,  KC_NO,
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE),QK_BOOT,
-         KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_ACL2,
-         KC_WH_U,  M(A_MUL), KC_MS_U,  M(A_MUR), KC_NO,  KC_ACL1,
-         KC_NO,    KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_NO,  KC_ACL0,
-         KC_WH_D,  M(A_MDL), KC_MS_D,  M(A_MDR), RSFT(KC_LBRC), RSFT(KC_RBRC),
-                   KC_LCBR,  KC_RCBR,  KC_NO,  KC_NO,
-         _______,  _______,
-         _______,
-         _______,  KC_BTN1,  KC_BTN2
-    ),
-
-
-
-/* EMPTY
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |  bOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |      |      |                                         |      |      |    |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | Ctrl | Alt  |         | Gui  | Ctrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 | BkSp | Del  |------|         |------|Mouse1|Mouse2|
-*                                 |      |      | End  |         | PgDn |LClick|Rclick|
-*                                 `--------------------'         `--------------------'
-*/
-
-
-
-[_TRANS] = LAYOUT(
-         _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-          _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,
-                   _______,  _______,  _______,  _______,
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-                   _______,  _______,  _______,  _______,
-         _______,  _______,
-         _______,
-         _______,  _______,  _______
-    ),
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-
-	// from  algernon's ErgoDox EZ layout,
-       case A_MUL:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_UP);
-          mousekey_on(KC_MS_LEFT);
-        } else {
-          mousekey_off(KC_MS_UP);
-          mousekey_off(KC_MS_LEFT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MUR:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_UP);
-          mousekey_on(KC_MS_RIGHT);
-        } else {
-          mousekey_off(KC_MS_UP);
-          mousekey_off(KC_MS_RIGHT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MDL:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_DOWN);
-          mousekey_on(KC_MS_LEFT);
-        } else {
-          mousekey_off(KC_MS_DOWN);
-          mousekey_off(KC_MS_LEFT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MDR:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_DOWN);
-          mousekey_on(KC_MS_RIGHT);
-        } else {
-          mousekey_off(KC_MS_DOWN);
-          mousekey_off(KC_MS_RIGHT);
-        }
-        mousekey_send();
-        break;
-     }
-    return MACRO_NONE;
-};
-
-
-void matrix_init_user(void) {
-
-
-}
-
-void matrix_scan_user(void) {
-
-#ifdef ALVICSTEP_CONFIG_H
- int8_t layer = get_highest_layer(layer_state);
-
-        switch (layer) {
-        case 1:
-                if (!(host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK))) {
-                        all_led_off();
-                        caps_lock_led_on();
-                }
-                break;
-
-        case 2:
-                if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) {
-                        all_led_off();
-                        scroll_lock_led_on();
-                }
-        case 0:
-                all_led_off();
-                num_lock_led_on();
-                break;
-        default:
-                break;
-        }
-#endif
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kinesis/keymaps/milestogo/readme.md b/keyboards/kinesis/keymaps/milestogo/readme.md
deleted file mode 100644
index 76356a6871..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# a programmer friendly keymap for the kinesis-advantage
-# not really baked yet. 
diff --git a/keyboards/kinesis/keymaps/milestogo/rules.mk b/keyboards/kinesis/keymaps/milestogo/rules.mk
deleted file mode 100644
index 93e7cd8bb7..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
index c56d3426f1..9bdcb6df31 100644
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ b/keyboards/kinesis/keymaps/peott-fr/keymap.c
@@ -21,8 +21,8 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = 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_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
+	[0] = 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_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
 	[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index 9518c017bc..7757846390 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -57,7 +57,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, MO(1), QK_BOOT,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, MO(1), 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/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
index 89a39c08b4..5fdbbcd902 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
@@ -120,11 +120,11 @@ Colemak
 	                                          `--------------------------'                 `--------------------------'
 */
 [_COLEMAK] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_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_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  HYPER,                     KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
@@ -157,11 +157,11 @@ QWERTY
 	                                          `--------------------------'                 `--------------------------'
 */
 [_QWERTY] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_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_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  HYPER,                     KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
@@ -292,7 +292,7 @@ Numpad layer
 */
 [_NUMPAD] = LAYOUT_pretty(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NLCK, _______, _______, _______, _______,                                                       KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_NUM,  _______, _______, _______, _______,                                                       KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                                                         _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
   _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,                                                         _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
   _______, _______, KC_PDOT, TD_PSPA, TD_MNUN, TD_PPEQ,                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index bfa8027352..0a812aef35 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_NO ,QK_BOOT,
+           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KC_NO ,QK_BOOT,
            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/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index 286d7ca7a7..5e4f7c1e88 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  GUI_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
            KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
            KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  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,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            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,
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
            // Right Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+           _______, 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, _______,
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
index 57e703fd6f..3685e0fe57 100644
--- a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
+++ b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
@@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  MO(_PROGRAM),
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  MO(_PROGRAM),
            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,
@@ -252,7 +252,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______,
 
            // Right Hand
-           _______, _______, _______, _______, _______, KC_POWER, _______, _______, _______,
+           _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
@@ -304,8 +304,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______,
 
            // Right Hand
-           _______,    _______, _______, _______, KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,  _______,
+           _______,    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+           _______, 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,  _______,