[Keymap] Added personal keymap to BFO-9000; cleaned up personal files in Kinesis and Rorschach (#5638)

* Added personal keymap to BFO-9000; cleaned up personal Kinesis and Rorschach files

Added personal keymap to BFO-9000; cleaned up personal Kinesis and Rorschach files

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

9 files changed, 499 insertions, 67 deletions

diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
new file mode 100644
index 0000000000..344634063c
--- /dev/null
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
@@ -0,0 +1,42 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#pragma once
+
+/* Use I2C or Serial, not both */
+
+// #define USE_SERIAL
+#define USE_I2C
+
+/* Select hand configuration */
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 150
+#define TAPPING_TOGGLE 2
+
+// #undef RGBLED_NUM
+// #define RGBLIGHT_ANIMATIONS
+// #define RGBLED_NUM 12
+// #define RGBLIGHT_HUE_STEP 8
+// #define RGBLIGHT_SAT_STEP 8
+// #define RGBLIGHT_VAL_STEP 8
\ No newline at end of file
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
new file mode 100644
index 0000000000..d15569ee96
--- /dev/null
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
@@ -0,0 +1,381 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+enum bfo9000_layers {
+  _COLEMAK,   // Colemak (default layer)
+  _QWERTY,    // Qwerty
+  _COLEMAKGM, // Colemak gaming/vanilla (limited dual-role keys with layer access)
+  _QWERTYGM,  // QWERTY gaming/vanilla (limited dual-role keys with layer access)
+  _NUMBERS,   // Numbers & Symbols
+  _NUMBERS2,  // Numbers & Symbols 2 (identical as _NUMBERS; basically used for tri-layer access to _ADJUST)
+  _FUNCTION,  // Function
+  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
+  _NUMPAD,    // Numpad
+  _ADJUST,    // Adjust layer (accessed via tri-layer feature)
+  _ADJUST2    // Second Adjust layer (accessed outside of tri-layer feature)
+};
+
+enum bfo9000_keycodes {
+  COLEMAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAKGM,
+  QWERTYGM,
+  NUMPAD = TG(_NUMPAD),
+  ADJUST = MO(_ADJUST2),
+  SPCFN  = LT(_FUNCTION, KC_SPC),
+  BSPCFN = LT(_FUNCTION2, KC_BSPC),
+  ENTNS  = LT(_NUMBERS, KC_ENT),
+  DELNS  = LT(_NUMBERS2, KC_DEL),
+  CTLESC = CTL_T(KC_ESC),
+  ALTAPP = ALT_T(KC_APP),
+  NKROTG = MAGIC_TOGGLE_NKRO
+};
+
+//Tap Dance Declarations
+enum {
+  ADJ = 0,
+  LBCB,
+  RBCB,
+  EQPL,
+  PLEQ,
+  MNUN,
+  SLAS,
+  GVTL,
+  PPLEQ,
+  PMNUN,
+  PSLPAS
+};
+
+void dance_LAYER_finished(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 2) {
+     layer_on(_ADJUST2);
+     set_oneshot_layer(_ADJUST2, ONESHOT_START);
+  }
+}
+void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 2) {
+     layer_off(_ADJUST2);
+     clear_oneshot_layer_state(ONESHOT_PRESSED);
+  }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer 
+[LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
+[RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
+[EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
+[PLEQ]   = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
+[MNUN]   = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
+[SLAS]   = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
+[GVTL]   = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
+[PPLEQ]  = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
+[PMNUN]  = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
+[PSLPAS] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Colemak
+   (Default layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |   =   |   1   |   2   |   3   |   4   |   5   |       |       |       |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Tab  |   Q   |   W   |   F   |   P   |   G   |       |       |  Home |          | Pause |       |       |   J   |   L   |   U   |   Y   |   ;   |   \   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |Esc/Ctl|   A   |   R   |   S   |   T   |   D   |       |       |  PgUp |          | ScrLck|       |       |   H   |   N   |   E   |   I   |   O   |   '   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |SCShift|   Z   |   X   |   C   |   V   |   B   |Esc/Ctl|App/Alt|  PgDn |          | PrtScr|  RAlt |  RCtl |   K   |   M   |   ,   |   .   |   /   |SCShift|
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/Fn| Ent/NS|  Bspc |  End  |          |       | Enter |Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_COLEMAK] = LAYOUT( \
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, 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_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,    
+  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,  
+  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,   
+  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT 
+),
+
+/* QWERTY
+   (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |   =   |   1   |   2   |   3   |   4   |   5   |       |       |       |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Tab  |   Q   |   W   |   E   |   R   |   T   |       |       |  Home |          | Pause |       |       |   Y   |   U   |   I   |   O   |   P   |   \   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |Esc/Ctl|   A   |   S   |   D   |   F   |   G   |       |       |  PgUp |          | ScrLck|       |       |   H   |   J   |   K   |   L   |   ;   |   '   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |SCShift|   Z   |   X   |   C   |   V   |   B   |Esc/Ctl|App/Alt|  PgDn |          | PrtScr|  RAlt |  RCtl |   N   |   M   |   ,   |   .   |   /   |SCShift|
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/Fn| Ent/NS|  Bspc |  End  |          |       | Enter |Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_QWERTY] = LAYOUT( \
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, 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_HOME,     KC_PAUS, _______, _______, 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_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  
+  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,   
+  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT 
+),
+
+/* Numbers/Symbols layer
+   (Multiple characters: single-tap for first, double-tap for second)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  F12  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          |       |       |       |   F6  |   F7  |   F8  |   F9  |  F10  |  F12  |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |   6   |   7   |   8   |   9   |   0   |       |       |       |          |       |       |       |   ^   |   &   |   *   |   (   |   )   |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |   1   |   2   |   3   |   4   |   5   |       |       |       |          |       |       |       |   !   |   @   |   #   |   $   |   %   |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |   .   |  / *  |  - _  |  + =  |       |       |       |          |       |       |       |  ` ~  |  [ {  |  ] }  |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |   (   |   )   |  [ {  |  ] }  |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_NUMBERS] = LAYOUT( \
+  _______, _______, _______,  _______,  _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______, _______, _______,     _______, _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
+  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     _______, _______, _______,     _______, _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
+  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,     _______, _______, _______,     _______, _______,  _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
+  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ), _______, _______, _______,     _______, _______,  _______,  TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
+  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______
+),
+
+[_NUMBERS2] = LAYOUT( \
+  _______, _______, _______,  _______,  _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______, _______, _______,     _______, _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
+  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     _______, _______, _______,     _______, _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
+  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,     _______, _______, _______,     _______, _______,  _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
+  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ), _______, _______, _______,     _______, _______,  _______,  TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
+  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______
+),
+
+/* Function layer
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  F12  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          |       |       |       |   F6  |   F7  |   F8  |   F9  |  F10  |  F12  |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |       |   Up  |       |       |       |       |       |          |       |       |       |       |       |   Up  | Ctrl+Y|       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       | Ctrl+A|  Left |  Down | Right | C+A+Tb|       |       |       |          |       |       |       |  PgUp | Right |  Down |  Left |  Home |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       | Ctrl+Z| Ctrl+X| Ctrl+C| Ctrl+V|  Bspc |       |       |       |          |       |       |       |  PgDn |  Mute |  Vol- |  Vol+ |  End  |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |  Prev |  Play |  Next |  Stop |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_FUNCTION] = LAYOUT(
+  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,    _______, _______,
+  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,       _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
+  _______, _______,    _______,    KC_UP,      _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
+  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB), _______, _______, _______,     _______, _______, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
+  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,     _______, _______, _______,     _______, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
+  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP
+),
+
+[_FUNCTION2] = LAYOUT(
+  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,    _______, _______,
+  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,       _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
+  _______, _______,    _______,    KC_UP,      _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
+  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB), _______, _______, _______,     _______, _______, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
+  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,     _______, _______, _______,     _______, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
+  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP
+),
+
+/* Numpad layer
+   (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       | NumLk |       |       |       |       |       |       |       |          |       |       |  Tab  | NumLk |  KP / |  KP * |  KP - |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |  KP 6 |  KP 7 |  KP 8 |  KP 9 |  KP 0 |       |       |       |          |       |       |       |  KP 7 |  KP 8 |  KP 9 |  KP + |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |  KP 1 |  KP 2 |  KP 3 |  KP 4 |  KP 5 |       |       |       |          |       |       |       |  KP 4 |  KP 5 |  KP 6 |   =   |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |  KP . |KP/ KP*| KP- _ | KP+ = |       |       |       |          |       |       |       |  KP 1 |  KP 2 |  KP 3 | KP Ent|       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |   (   |   )   |  [ {  |  ] }  |       |       |       |       |       |          |       |       |       |       |  KP 0 |  KP . | KP Ent|       |       |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_NUMPAD] = LAYOUT( \
+  _______, _______, _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  _______, _______, _______, _______, _______, _______,
+  _______, KC_NLCK, _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  KC_TAB,  KC_NLCK, 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, _______,
+  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),  _______,   _______,   _______, _______, _______,     _______, _______,  _______,  _______, _______, KC_P0,   KC_PDOT, KC_PENT, _______
+),
+
+/* Colemak gaming/vanilla
+   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Del/NS2 on right side to access Adjust layer)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |   =   |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Tab  |   Q   |   W   |   F   |   P   |   G   |   J   |   L   |  Home |          | Pause |       |       |   J   |   L   |   U   |   Y   |   ;   |   \   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  LCtl |   A   |   R   |   S   |   T   |   D   |   H   |   N   |  PgUp |          | ScrLck|       |       |   H   |   N   |   E   |   I   |   O   |   '   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  | Shift |   Z   |   X   |   C   |   V   |   B   |  Esc  |  LAlt |  PgDn |          | PrtScr|  RAlt |  RCtl |   K   |   M   |   ,   |   .   |   /   | Shift |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Ins  |   `   |   [   |   ]   |  LAlt | Space | Enter |  Bspc |  End  |          |       | Ent/NS|Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_COLEMAKGM] = LAYOUT( \
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, 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_HOME,     KC_PAUS, _______, _______, 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_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,  
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,  KC_LALT, KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   
+  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, KC_END,      _______, ENTNS,   DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT 
+),
+
+/* QWERTY gaming/vanilla
+   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Del/NS2 on right side to access Adjust layer)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |   =   |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Tab  |   Q   |   W   |   E   |   T   |   Y   |   U   |   I   |  Home |          | Pause |       |       |   Y   |   U   |   I   |   O   |   P   |   \   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  LCtl |   A   |   S   |   D   |   F   |   G   |   H   |   J   |  PgUp |          | ScrLck|       |       |   H   |   J   |   K   |   L   |   ;   |   '   |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  | Shift |   Z   |   X   |   C   |   V   |   B   |  Esc  |  LAlt |  PgDn |          | PrtScr|  RAlt |  RCtl |   N   |   M   |   ,   |   .   |   /   | Shift |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |  Ins  |   `   |   [   |   ]   |  LAlt | Space | Enter |  Bspc |  End  |          |       | Ent/NS|Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_QWERTYGM] = LAYOUT( \
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, 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_HOME,     KC_PAUS, _______, _______, 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_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,  KC_LALT, KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   
+  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, KC_END,      _______, ENTNS,   DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT 
+),
+
+/* Adjust layer
+   (Enter/Number + Delete/Number2 under non-gaming/vanilla layers or press & hold Adjust key on function row; Numpad is a toggle)
+  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------. 
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |Colemak| Qwerty|       |ColmkGM|  QWGM |       |       |       |          |       |       |       | Numpad|       |       |       |       | RESET |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       | NKROTG|       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
+  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
+  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
+*/
+[_ADJUST] = LAYOUT(
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_ADJUST2] = LAYOUT(
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+
+
+uint32_t layer_state_set_user(uint32_t state) {
+  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+	case COLEMAK:
+      if (record->event.pressed) {
+        default_layer_set(1UL << _COLEMAK);
+//        persistent_default_layer_set(1UL << _COLEMAK);
+        layer_off ( _QWERTY);
+        layer_off ( _NUMBERS);
+        layer_off ( _NUMBERS2);
+        layer_off ( _FUNCTION);
+        layer_off ( _FUNCTION2);
+        layer_off ( _NUMPAD);
+        layer_off ( _COLEMAKGM);
+        layer_off ( _QWERTYGM);
+        layer_off ( _ADJUST);
+        layer_off ( _ADJUST2);
+	  }
+      return false;
+      break;
+    case QWERTY:
+      if (record->event.pressed) {
+        default_layer_set(1UL << _QWERTY);
+//        persistent_default_layer_set(1UL << _QWERTY);
+        layer_off ( _COLEMAK);
+        layer_off ( _NUMBERS);
+        layer_off ( _NUMBERS2);
+        layer_off ( _FUNCTION);
+        layer_off ( _FUNCTION2);
+        layer_off ( _NUMPAD);
+        layer_off ( _COLEMAKGM);
+        layer_off ( _QWERTYGM);
+        layer_off ( _ADJUST);
+        layer_off ( _ADJUST2);
+      }
+      return false;
+      break;
+    case COLEMAKGM:
+      if (record->event.pressed) {
+        default_layer_set(1UL << _COLEMAKGM);
+        layer_off ( _QWERTY);
+        layer_off ( _COLEMAK);
+        layer_off ( _NUMBERS);
+        layer_off ( _NUMBERS2);
+        layer_off ( _FUNCTION);
+        layer_off ( _FUNCTION2);
+        layer_off ( _NUMPAD);
+        layer_off ( _QWERTYGM);
+        layer_off ( _ADJUST);
+        layer_off ( _ADJUST2);
+	  }
+      return false;
+      break;
+    case QWERTYGM:
+      if (record->event.pressed) {
+        default_layer_set(1UL << _QWERTYGM);
+        layer_off ( _QWERTY);
+        layer_off ( _COLEMAK);
+        layer_off ( _NUMBERS);
+        layer_off ( _NUMBERS2);
+        layer_off ( _FUNCTION);
+        layer_off ( _FUNCTION2);
+        layer_off ( _NUMPAD);
+        layer_off ( _COLEMAKGM);
+        layer_off ( _ADJUST);
+        layer_off ( _ADJUST2);
+	  }
+      return false;
+      break;
+  }
+  return true;
+}
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/rules.mk b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/rules.mk
new file mode 100644
index 0000000000..cf63c44f4f
--- /dev/null
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/rules.mk
@@ -0,0 +1,19 @@
+# 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       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+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 = yes        # 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
+TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index 2048232c9c..ed948a4b3b 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
@@ -12,7 +12,7 @@
 #define EE_HANDS
 
 #define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_TERM 175
+#define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
 
 // #undef RGBLED_NUM
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
index 81c163a028..e345ce4a38 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
@@ -246,16 +246,11 @@ uint32_t layer_state_set_user(uint32_t state) {
   return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
 }
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case COLEMAK:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL << _COLEMAK);
+        default_layer_set(1UL << _COLEMAK);
         layer_off ( _QWERTY);
         layer_off ( _NUMBERS);
         layer_off ( _NUMBERS2);
@@ -269,7 +264,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case QWERTY:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL << _QWERTY);
+        default_layer_set(1UL << _QWERTY);
         layer_off ( _COLEMAK);
         layer_off ( _NUMBERS);
         layer_off ( _NUMBERS2);
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
index b9e39c0539..cf63c44f4f 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
@@ -4,7 +4,7 @@
 #
 
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
index 9ce094be51..053a291b7c 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
@@ -6,7 +6,7 @@
 
 // place overrides here
 #define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_TERM 175
+#define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
 
 
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 7f328b4f0e..10b0c2cb73 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include QMK_KEYBOARD_H 
 
 extern keymap_config_t keymap_config;
 
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
 ),
 
-/* Number/symbol layer
+/* Numbers/Symbols layer
    (Multiple characters: single-tap for first, double-tap for second)
   ,-----------------------------------------------------------------------------------------------------------.
   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
@@ -256,7 +256,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
   |        |      | KP . |KP/KP*| KP- _| KP+ =|                   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
   `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |   (  |   )  |  [ { |  ] } |                                 | KP 0 |  ,   | KP . |KP Ent|
+	       |   (  |   )  |  [ { |  ] } |                                 |      | KP 0 | KP . |KP Ent|
 	       `---------------------------'                                 `---------------------------'
 	                          ,---------------.                   ,---------------.
 	                          |       |       |                   |       |       |
@@ -272,14 +272,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, 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, _______,
-           KC_LPRN, KC_RPRN, TD(LBCB),   TD(RBCB),                                                                            KC_P0,   KC_COMM, KC_PDOT, KC_PENT,
+           KC_LPRN, KC_RPRN, TD(LBCB),   TD(RBCB),                                                                            _______, KC_P0,   KC_PDOT, KC_PENT,
                                                                _______, _______,                   _______, _______,
                                                                         _______,                   _______,
                                                     _______,   _______, _______,                   _______, _______, _______
 ),
 
 /* Colemak gaming/vanilla
-   (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
   ,-----------------------------------------------------------------------------------------------------------.
   | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
   `-----------------------------------------------------------------------------------------------------------'
@@ -288,18 +288,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
   |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |  Ctrl  |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
+  |  LCtrl |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
   |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
   `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
 	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	       `---------------------------'                                 `---------------------------'
 	                          ,---------------.                   ,---------------.
-	                          |Esc/Ctl|TD(ADJ)|                   |  RAlt |  RCtl |
+	                          |  Esc  |       |                   |  RAlt |  RCtl |
 	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |  LAlt |                   |  RGUI |       |       |
-	                  | Space | Enter |-------|                   |-------| Delete|  Bspc |
-	                  |       |       |Bspc/FN|                   | Ent/NS|       |       |
+	                  |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
+	                  | Space | Enter |-------|                   |-------|   /   |   /   |
+	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
 	                  `-----------------------'                   `-----------------------' 
 */
 [_COLEMAKGM] = LAYOUT_pretty(
@@ -309,13 +309,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        CTLESC,  TD(ADJ),                   KC_RALT, KC_RCTL,
+                                                        KC_ESC,  XXXXXXX,                   KC_RALT, KC_RCTL,
                                                                  KC_LALT,                   KC_RGUI,
-                                               KC_SPC,  KC_ENT,  BSPCFN,                    ENTNS,   KC_DEL,  KC_BSPC
+                                               KC_SPC,  KC_ENT,  KC_BSPC,                   ENTNS,   DELNS,   BSPCFN
 ),
 
 /* QWERTY gaming/vanilla
-   (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
   ,-----------------------------------------------------------------------------------------------------------.
   | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
   `-----------------------------------------------------------------------------------------------------------'
@@ -324,18 +324,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
   |   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |  Ctrl  |   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
+  |  LCtrl |   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
   |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
   `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
 	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	       `---------------------------'                                 `---------------------------'
 	                          ,---------------.                   ,---------------.
-	                          |Esc/Ctl|TD(ADJ)|                   |  RAlt |  RCtl |
+	                          |  Esc  |       |                   |  RAlt |  RCtl |
 	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |  LAlt |                   |  RGUI |       |       |
-	                  | Space | Enter |-------|                   |-------| Delete|  Bspc |
-	                  |       |       |Bspc/FN|                   | Ent/NS|       |       |
+	                  |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
+	                  | Space | Enter |-------|                   |-------|   /   |   /   |
+	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
 	                  `-----------------------'                   `-----------------------' 
 */
 [_QWERTYGM] = LAYOUT_pretty(
@@ -345,9 +345,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        CTLESC,  TD(ADJ),                   KC_RALT, KC_RCTL,
+                                                        KC_ESC,  XXXXXXX,                   KC_RALT, KC_RCTL,
                                                                  KC_LALT,                   KC_RGUI,
-                                               KC_SPC,  KC_ENT,  BSPCFN,                    ENTNS,   KC_DEL,  KC_BSPC
+                                               KC_SPC,  KC_ENT,  KC_BSPC,                   ENTNS,   DELNS,   BSPCFN
 ),
 
 /* Adjust layer
@@ -404,11 +404,6 @@ uint32_t layer_state_set_user(uint32_t state) {
   return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
 }
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
 	case COLEMAK:
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
index 7a146c7a29..4c8fb153c5 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
@@ -1,6 +1,6 @@
 # insertsnideremarks' Kinesis Keymap
 
-These layouts are derived from what I was using on my Kinesis Contoured keyboards with Hasu's TMK converters.  With the move to QMK via Stapelberg replacement controller, I've cleaned up the layouts a bit while adding more functions and layers.
+These layouts are derived from what I was using on my Kinesis Contoured keyboards with Hasu's USB-USB TMK converters.  With the move to QMK via Stapelberg replacement controller, I've cleaned up the layouts a bit while adding more functions and layers.
 
 There are minor changes in the base keywell layout of non-alpha keys (e.g., CapsLock is ESC/Ctl, arrow clusters on one side), while the thumb clusters deviate more from the default layout.
 
@@ -10,36 +10,36 @@ Changes to the thumb clusters include:
 * Backspace have been duplicated on both clusters.
 * The 2u keys serve dual function as momentary layer switchers.
 
-I've largely left the function keys untouched, with the intension of not using them.  They are neither easy to use nor reach due to their locations and size, and, prior to Advantage2, particularly terrible rubber domes were used.  They have since updated the keys with Cherry ML switches on Advantage2, but did not resolve the issues of size or location.  Additionally, leaving the function keys unused here makes it easier for me to adapt the keymaps to my other keyboards, most of which do not have physical function keys.
+I've largely left the function keys untouched, with the intension of not using them.  They are neither easy to use nor reach due to their locations and size, and the rubber domes used were terrible.  They have since replaced the keys with Cherry ML switches on Advantage2, but did not resolve the issues of size or location.  Additionally, leaving the function keys unused here makes it easier for me to adapt the keymaps to my other keyboards, most of which do not have physical function keys.
 
 I use Colemak as my default layout.  I've included QWERTY here as well.
 
-Additionally, I've added gaming/vanilla version of Colemak and QWERTY layouts.  These layouts have limited access to the Function or Numbers layers, and are mainly used for gaming.
+Additionally, I've added gaming/vanilla version of Colemak and QWERTY layouts.  These layouts have limited access to the Function or Numbers/Symbols layers, and are mainly used for gaming.
 
 Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/vanilla Colemak and QWERTY can be set as default layer, but will not be persistent.
 
 ## Future plans
 
-* Add status LEDs to the Stapelberg PCB (usually used for Caps Lock, Num Lock, and Scroll Lock).  May configure it as layer indicator.
+* Add status LEDs to the Stapelberg PCB (usually used for Caps Lock, Num Lock, and Scroll Lock) to use as layer indicators.
 * Add a speaker now that QMK supports additional pins for audio use.
-* Utilize the leftover spots on the key matrix, as well as unused pins on Teensy to run macropad and/or foot pedals.
+* Utilize the leftover spots on the key matrix, as well as unused pins on Teensy++ 2.0 to run macropad and/or foot pedals.
 
 
 ### Colemak
-	(Default layer, keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-	,-----------------------------------------------------------------------------------------------------------.
-	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+    (Default layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+    ,-----------------------------------------------------------------------------------------------------------.
+    | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+    `-----------------------------------------------------------------------------------------------------------'
+    ,-------------------------------------------.                   ,-------------------------------------------.
+    |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
+    |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+    |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
+    |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+    |Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
+    |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+    |SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
+    `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+             |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	         `---------------------------'                                 `---------------------------'
 	                            ,---------------.                   ,---------------.
 	                            |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
@@ -150,7 +150,7 @@ Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/va
 	
 
 ### Colemak gaming/vanilla
-	(Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+    (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
 	,-----------------------------------------------------------------------------------------------------------.
 	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
 	`-----------------------------------------------------------------------------------------------------------'
@@ -159,23 +159,23 @@ Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/va
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
 	|   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  Ctrl  |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
+	|  LCtrl |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
 	|  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
 	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
 	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	         `---------------------------'                                 `---------------------------'
 	                            ,---------------.                   ,---------------.
-	                            |Esc/Ctl|TD(ADJ)|                   |  RAlt |  RCtl |
+	                            |  Esc  |       |                   |  RAlt |  RCtl |
 	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |  LAlt |                   |  RGUI |       |       |
-	                    | Space | Enter |-------|                   |-------| Delete|  Bspc |
-	                    |       |       |Bspc/FN|                   | Ent/NS|       |       |
+	                    |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
+	                    | Space | Enter |-------|                   |-------|   /   |   /   |
+	                    |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
 	                    `-----------------------'                   `-----------------------' 
 	
 
 ### QWERTY gaming/vanilla
-	(Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+    (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
 	,-----------------------------------------------------------------------------------------------------------.
 	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
 	`-----------------------------------------------------------------------------------------------------------'
@@ -184,18 +184,18 @@ Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/va
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
 	|   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  Ctrl  |   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
+	|  LCtrl |   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
 	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
 	|  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
 	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
 	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
 	         `---------------------------'                                 `---------------------------'
 	                            ,---------------.                   ,---------------.
-	                            |Esc/Ctl|TD(ADJ)|                   |  RAlt |  RCtl |
+	                            |  Esc  |       |                   |  RAlt |  RCtl |
 	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |  LAlt |                   |  RGUI |       |       |
-	                    | Space | Enter |-------|                   |-------| Delete|  Bspc |
-	                    |       |       |Bspc/FN|                   | Ent/NS|       |       |
+	                    |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
+	                    | Space | Enter |-------|                   |-------|   /   |   /   |
+	                    |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
 	                    `-----------------------'                   `-----------------------' 
 	
 ### Adjust layer
@@ -221,4 +221,4 @@ Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/va
 	                    |       |       |-------|                   |-------|       |       |
 	                    |       |       |       |                   |       |       |       |
 	                    `-----------------------'                   `-----------------------' 
- 	
\ No newline at end of file
+