Krush60 Solder Refactor (#16029)

* solder.h: add matrix diagram

* solder.h: remove unnecessary comments

* rework LAYOUT_60_iso to LAYOUT_60_isoenter_split_bs

True ISO layouts are not supported on this keyboard because the PCB lacks support for split Left Shift. Renames the `iso` to `isoenter` to specify this.

- denotes use of Split Backspace
- move Backslash keycode to home row

* info.json: remove trailing whitespace

* info.json: clean up

Sort the layout trees into the same order as `solder.h`, and remove the `LAYOUT_60_all` tree (doesn't exist in source).

* solder.h: align positional arguments

Helps me proof-read the layouts at a glance. No logic change.

* fix syntax errors in keymaps

* remove ISO layouts

As previously noted, ISO layouts are not supported due to the PCB's lack of support for split Left Shift.

* rename LAYOUT_60_ansi_tsangan_split_bs to LAYOUT_60_tsangan_hhkb

Also renames `60_tsangan_splt_bs` keymap to `60_tsangan_hhkb`.

* rename LAYOUT_60_ansi_tsangan to LAYOUT_60_ansi_tsangan_split_rshift

Also renames `60_tsangan` keymap to `60_ansi_tsangan_split_rshift`.

* rename LAYOUT_60_ansi_arrow_split_bs_7u_spc to LAYOUT_60_ansi_arrow_tsangan_split_bs

Also rename `60_ansi_arrow_splt_bs_7u` to `60_ansi_arrow_tsangan_split_bs`.

* rename LAYOUT_60_ansi_arrow_7u_spc to LAYOUT_60_ansi_arrow_tsangan

Also renames `60_ansi_arrow_7u` keymap to `60_ansi_arrow_tsangan`.

* rename keymaps based on layout macro used

Making this easier to track in my head while I work on it.

* info.json: fix syntax errors

* rename LAYOUT_60_ansi_split_bs_7u_spc to LAYOUT_60_ansi_tsangan_split_bs

- renames `60_ansi_split_bs_7u_spc` keymap to `60_ansi_tsangan_split_bs`
- removes `layout_aliases` entry from `info.json` (creates incompatible data conflict)

* rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan

- renames `60_ansi_7u_spc` keymap to `60_ansi_tsangan`

* info.json: remove LAYOUT_60_ansi_tsangan layout_aliases entry

Causes an incompatible data conflict.

* add second layer to 60_ansi keymap

* update via keymap

Now matches the behaviour of the default keymap.

* fix syntax errors in keymaps, take 2

* add RGB and Navigation keycodes

Adds RGB and Navigation keycodes to the `60_isoenter_split_bs`, `default` and `via` keymaps.

1 files changed, 102 insertions, 81 deletions

diff --git a/keyboards/sawnsprojects/krush/krush60/solder/solder.h b/keyboards/sawnsprojects/krush/krush60/solder/solder.h
index ede9c07452..9fb7f834f2 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/solder.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/solder.h
@@ -17,14 +17,44 @@
 #pragma once
 
 #include "quantum.h"
+
 #define XXX KC_NO
-//x
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │      │26     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46   │        │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐47  │ ISO Enter
+ * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │     │46 │    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤                ┌──────┬───┬───┐
+ * │60      │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │66    │77 │   │66        │ 2.75u RShift   │75    │66 │77 │ 1.75/1/1u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤   └──────────┘                └──────┴───┴───┘
+ * │80  │90  │81  │82      │92  │84        │94 │85 │86 │95 │97 │ Split Space Arrow
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬────────┬────┬──────────┬────┬────┬────┬────┐
+ * │80  │90  │81  │82      │92  │84        │94  │85  │95  │97  │ Split Space
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ * ┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┐
+ * │80  │90  │81  │92                      │94 │85 │86 │95 │97 │ 6.25u Arrow
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+ * │80  │90  │81  │92                      │94  │85  │95  │97  │ Standard
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+ * │80   │90 │81   │92                         │85 │86 │95 │97 │ 7u Arrow
+ * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │80   │90 │81   │92                         │85   │95 │97   │ 7u Tsangan/WKL/HHKB
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_all( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36,      K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,           K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, \
+    K80, K90, K81,           K82, K92, K84,           K94, K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -38,14 +68,12 @@
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
 
-//LAYOUT_60_ansi
-//x
 #define LAYOUT_60_ansi( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -58,14 +86,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_iso
-//x
-#define LAYOUT_60_iso(\
+
+#define LAYOUT_60_isoenter_split_bs(\
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K94, K85, K95, K97  \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36,      \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -78,13 +105,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_bs
+
 #define LAYOUT_60_ansi_split_bs( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -97,13 +124,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_spc
+
 #define LAYOUT_60_ansi_split_spc( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,           K82, K92, K84,           K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -116,13 +143,13 @@
     { K80, K81, K82, XXX, K84, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_bs_spc
+
 #define LAYOUT_60_ansi_split_bs_spc( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,           K82, K92, K84,           K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -135,13 +162,13 @@
     { K80, K81, K82, XXX, K84, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_7u_spc
-#define LAYOUT_60_ansi_7u_spc( \
+
+#define LAYOUT_60_ansi_tsangan( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -154,13 +181,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_7u_spc
-#define LAYOUT_60_ansi_split_bs_7u_spc( \
+
+#define LAYOUT_60_ansi_tsangan_split_bs( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -173,13 +200,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_arrow_split_bs
+
 #define LAYOUT_60_ansi_arrow_split_bs( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K94, K85, K86, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,           K94, K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -192,13 +219,13 @@
     { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_arrow_split_spc
+
 #define LAYOUT_60_ansi_arrow_split_spc( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,           K82, K92, K84,      K94, K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -211,13 +238,13 @@
     { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_arrow_split_bs_spc
+
 #define LAYOUT_60_ansi_arrow_split_bs_spc( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,           K82, K92, K84,      K94, K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -230,13 +257,13 @@
     { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_arrow_7u_spc
-#define LAYOUT_60_ansi_arrow_7u_spc( \
+
+#define LAYOUT_60_ansi_arrow_tsangan( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K85, K86, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,                K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -249,14 +276,13 @@
     { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_arrow
-//x
+
 #define LAYOUT_60_ansi_arrow( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K94, K85, K86, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,           K94, K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -269,14 +295,13 @@
     { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//x
-//LAYOUT_60_ansi_arrow_split_bs_7u_spc
-#define LAYOUT_60_ansi_arrow_split_bs_7u_spc( \
+
+#define LAYOUT_60_ansi_arrow_tsangan_split_bs( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K85, K86, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,                K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -289,13 +314,13 @@
     { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_tsangan
-#define LAYOUT_60_ansi_tsangan( \
+
+#define LAYOUT_60_ansi_tsangan_split_rshift( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
-    K80, K90, K81, K92, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -308,13 +333,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_tsangan_split_bs
-#define LAYOUT_60_ansi_tsangan_split_bs( \
+
+#define LAYOUT_60_tsangan_hhkb( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
-    K80, K90, K81, K92, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -327,7 +352,3 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_iso_tsangan
-#define LAYOUT_60_iso_tsangan  LAYOUT_60_ansi_tsangan
-//LAYOUT_60_iso_tsangan_split_bs
-#define LAYOUT_60_iso_tsangan_split_bs  LAYOUT_60_ansi_tsangan_split_bs