Personal keymap updates for the new year (#7871)

* Update keymaps for split ergo boards

* Update keymaps for 60% boards

4 files changed, 37 insertions, 35 deletions

diff --git a/keyboards/crkbd/keymaps/bcat/keymap.c b/keyboards/crkbd/keymaps/bcat/keymap.c
index 59ed00b5d7..c9df7a1e31 100644
--- a/keyboards/crkbd/keymaps/bcat/keymap.c
+++ b/keyboards/crkbd/keymaps/bcat/keymap.c
@@ -23,25 +23,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/c3fba5eaa2cd70fdfbdbc0f9e34d3bc0 */
     [LAYER_LOWER] = LAYOUT(
-        _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
-        _______,  _______,  _______,  KC_PIPE,  KC_TILD,  KC_DEL,                       _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  _______,
-        _______,  _______,  _______,  KC_BSLS,  KC_GRV,   KC_INS,                       _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
+        KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+        _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_INS,   KC_DEL,                       KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  _______,
+        _______,  _______,  _______,  _______,  _______,  KC_APP,                       KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
                                                 _______,  _______,  _______,  _______,  _______,  _______
     ),
 
     /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/08b44355d4ca85d294bad9e2821f91d7 */
     [LAYER_RAISE] = LAYOUT(
-        _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
-        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_HOME,  KC_PGUP,
-        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,                       KC_F11,   KC_F12,   _______,  _______,  KC_END,   KC_PGDN,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   _______,
+        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,                       KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F12,   _______,
                                                 _______,  _______,  _______,  _______,  _______,  _______
     ),
 
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
     [LAYER_ADJUST] = LAYOUT(
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,
-        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_HUI,  RGB_SAI,
-        _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_SPD,  RGB_SPI,  _______,  _______,  RGB_HUD,  RGB_SAD,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                                 _______,  _______,  _______,  RGB_TOG,  _______,  _______
     ),
 };
diff --git a/keyboards/crkbd/keymaps/bcat/readme.md b/keyboards/crkbd/keymaps/bcat/readme.md
index aa2d943d18..e378f64cdd 100644
--- a/keyboards/crkbd/keymaps/bcat/readme.md
+++ b/keyboards/crkbd/keymaps/bcat/readme.md
@@ -13,18 +13,18 @@ more details on the principles that went into the layout.
 
 ## Lower layer
 
-![Lower layer layout](https://i.imgur.com/9ShGkJI.png)
+![Lower layer layout](https://i.imgur.com/v4DjXM6.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/c3fba5eaa2cd70fdfbdbc0f9e34d3bc0))
 
 ## Raise layer
 
-![Raise layer layout](https://i.imgur.com/HcmW99r.png)
+![Raise layer layout](https://i.imgur.com/Wr6Ptyy.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/08b44355d4ca85d294bad9e2821f91d7))
 
 ## Adjust layer
 
-![Adjust layer layout](https://i.imgur.com/53qLnxo.png)
+![Adjust layer layout](https://i.imgur.com/9OtGLCT.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee))
diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
index 9a85a55e1b..b0378d19a7 100644
--- a/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -25,25 +25,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11 */
     [LAYER_LOWER] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
-        _______,  _______,  _______,  KC_PIPE,  KC_TILD,  KC_DEL,                       _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  _______,
-        _______,  _______,  _______,  KC_BSLS,  KC_GRV,   KC_INS,   _______,  _______,  _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
+        KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+        _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_INS,   KC_DEL,                       KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  _______,
+        _______,  _______,  _______,  _______,  _______,  KC_APP,   _______,  _______,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
 
     /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823 */
     [LAYER_RAISE] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
-        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_HOME,  KC_PGUP,
-        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,  _______,  KC_F11,   KC_F12,   _______,  _______,  KC_END,   KC_PGDN,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   _______,
+        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F12,   _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
 
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
     [LAYER_ADJUST] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md
index f90c5110bc..fd3ba9b8ec 100644
--- a/keyboards/lily58/keymaps/bcat/readme.md
+++ b/keyboards/lily58/keymaps/bcat/readme.md
@@ -6,25 +6,26 @@ around the ESDF cluster in the adjust (raise + lower) layer. A few general
 principles went into this layout:
 
 * The number row is optional, as are the outermost bottom row keys and the
-"extra" keys on the innnermost columns below the controllers. This will enable
-easy translation to a Crkbd or similar 40% ortho if I go that route.
+"extra" keys on the innnermost columns below the controllers. This allows me to
+switch between this keyboard and a 40% like the
+[Crkbd](https://github.com/qmk/qmk_firmware/tree/master/keyboards/lily58/keymaps/bcat)
+without breaking muscle memory.
 
-* Space and Enter are on the big thumb keys so they're easy to press
-(particularly with G20 or other low-profile keycaps there).
+* Space and Enter are on the big thumb keys so they're easy to press.
 
-* There are two shift keys because really, Right Shift is important.
+* There are two shift keys because Right Shift is all that important, but just
+because I don't have any better ideas for what to put there.
 
 * Arrow keys are on VIM-style HJKL keys.
 
-* Home/End and Page Up/Page Down are easy to reach and in a square kind of like
-on the HHKB.
+* Home/End and Page Up/Page Down are equivalent to the arrow keys, but
+translated down one row.
 
-* Navigation should be usable with just the right hand, to enable left-handed
-mousing at the same time. Additionally, Web page scrolling (Space, Shift+Space)
-should be possible with just the left hand, for writing at the same time as
-scrolling.
+* Navigation is usable with just the right hand, to enable left-handed mousing
+at the same time. Additionally, Web page scrolling (Space, Shift+Space) is
+possible with just the left hand, for writing at the same time as scrolling.
 
-* Escape is easy to reach because Vim.
+* Escape is easy to reach because Vim is life.
 
 * Since most of the modifiers are on the left half, keys frequently pressed
 together with mods (e.g., numbers, function keys, etc.) are on the Raise layer
@@ -40,8 +41,9 @@ allow typing numbers with thousand separators and decimal points without
 releasing the layer key.
 
 * Brackets and braces are on or near the home row for quick access when coding.
+They're positioned below the parens on the Raise layer for easy recall.
 
-* Other than Right Shift (sorry), modifiers aren't rebound on layers.
+* For consistency, mods aren't rebound on layers (except for the Tab key).
 
 ## Default layer
 
@@ -51,18 +53,18 @@ releasing the layer key.
 
 ## Lower layer
 
-![Lower layer layout](https://i.imgur.com/ytNFySG.png)
+![Lower layer layout](https://i.imgur.com/6ms2ll7.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11))
 
 ## Raise layer
 
-![Raise layer layout](https://i.imgur.com/S7S29G6.png)
+![Raise layer layout](https://i.imgur.com/HBowZ0w.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823))
 
 ## Adjust layer
 
-![Adjust layer layout](https://i.imgur.com/fCIySG2.png)
+![Adjust layer layout](https://i.imgur.com/udhzfON.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7))