idb 60 Layout Macro Refactor (#15079)

* alias LAYOUT to LAYOUT_all

* move layout alias to info.json

* use XXX for KC_NO in idb_60.h

* remove newline characters from info.json labels

* put LAYOUT_all data first in info.json

Matches the order of idb_60.h.

* friendly-format info.json

* add matrix diagram to idb_60.h

* rename LAYOUT_default to LAYOUT_60_ansi_wkl_split_rshift

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_ansi_tsangan

* add LAYOUT_60_iso_tsangan

* add LAYOUT_60_iso_wkl_split_rshift

* add LAYOUT_60_iso_tsangan_hhkb

* edit Backspace label for LAYOUT_60_ansi_wkl_split_rshift

* use GitHub username in info.json maintainer field

4 files changed, 555 insertions, 78 deletions

diff --git a/keyboards/idb/idb_60/idb_60.h b/keyboards/idb/idb_60/idb_60.h
index 069f4bcf56..5ee07bff36 100644
--- a/keyboards/idb/idb_60/idb_60.h
+++ b/keyboards/idb/idb_60/idb_60.h
@@ -10,42 +10,161 @@ void _idb_60_fn_led_off(void);
 #define _idb_60_esc_led_on() _idb_60_fn_led_on()
 #define _idb_60_esc_led_off() _idb_60_fn_led_off()
 
-#define LAYOUT( \
+#define XXX KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │07 │      │16     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ *              │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36   │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐56  │ ISO Enter
+ *  LShift      │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │56      │     │36 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤
+ * │60      │   │60  │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │76 │   │66        │ 2.75u RShift
+ * └────────┘   ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤   └──────────┘
+ *              │80   │90 │81   │93                         │95   │86 │96   │
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │80   │   │81   │93                         │95   │   │96   │ WKL
+ *              └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+ *                    ┌───┬─────┬───────────────────────────┬─────┬───┐
+ *                    │90 │81   │93                         │95   │86 │ MX HHKB
+ *                    └───┴─────┴───────────────────────────┴─────┴───┘
+ *                    ┌───┬─────┬───────────────────────┬─────┬───┐
+ *                    │90 │81   │93                     │95   │86 │ True HHKB
+ *                    └───┴─────┴───────────────────────┴─────┴───┘
+ */
+
+
+#define LAYOUT_all( \
         K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
         K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
         K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
         K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
         K80, K90, K81,                     K93,                K95, K86, K96 \
 ) { \
-        { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-        { K10,   K11,   K12,   K13,   K14,   K15,   K16        }, \
-        { K20,   K21,   K22,   K23,   K24,   K25,   K26        }, \
-        { K30,   K31,   K32,   K33,   K34,   K35,   K36        }, \
-        { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO      }, \
-        { K50,   K51,   K52,   K53,   K54,   K55,   K56        }, \
-        { K60,   K61,   K62,   K63,   K64,   K65,   K66        }, \
-        { K70,   K71,   K72,   K73,   K74,   K75,   K76        }, \
-        { K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, K86        }, \
-        { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   K96        } \
+        { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { K70, K71, K72, K73, K74, K75, K76, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, K86, XXX }, \
+        { K90, XXX, XXX, K93, XXX, K95, K96, XXX } \
 }
 
-#define LAYOUT_all LAYOUT
+#define LAYOUT_60_ansi_tsangan( \
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
+        K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K66, \
+        K80, K90, K81,                     K93,                K95, K86, K96 \
+) { \
+        { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { XXX, K71, K72, K73, K74, K75, XXX, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, K86, XXX }, \
+        { K90, XXX, XXX, K93, XXX, K95, K96, XXX } \
+}
+
+#define LAYOUT_60_tsangan_hhkb( \
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
+        K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80, K90, K81,                     K93,                K95, K86, K96 \
+) { \
+        { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { XXX, K71, K72, K73, K74, K75, K76, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, K86, XXX }, \
+        { K90, XXX, XXX, K93, XXX, K95, K96, XXX } \
+}
 
-#define LAYOUT_default( \
+#define LAYOUT_60_ansi_wkl_split_rshift( \
         K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
         K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
         K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
         K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
         K80,      K81,                     K93,                K95,      K96 \
 ) { \
-        { K00,   K01,   K02,   K03,   K04,   K05,   K06,	KC_NO }, \
-        { K10,   K11,   K12,   K13,   K14,   K15,   K16        	  }, \
-        { K20,   K21,   K22,   K23,   K24,   K25,   K26           }, \
-        { K30,   K31,   K32,   K33,   K34,   K35,   K36           }, \
-        { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO         }, \
-        { K50,   K51,   K52,   K53,   K54,   K55,   K56           }, \
-        { K60,   K61,   K62,   K63,   K64,   K65,   K66           }, \
-        { KC_NO, K71,   K72,   K73,   K74,   K75,   K76           }, \
-        { K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO         }, \
-        { KC_NO, KC_NO, KC_NO, K93,   KC_NO, K95,   K96           } \
+        { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { XXX, K71, K72, K73, K74, K75, K76, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, XXX, XXX }, \
+        { XXX, XXX, XXX, K93, XXX, K95, K96, XXX } \
+}
+
+#define LAYOUT_60_iso_tsangan( \
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K36, K56, \
+        K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K66, \
+        K80, K90, K81,                     K93,                K95, K86, K96 \
+) { \
+        { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { K70, K71, K72, K73, K74, K75, XXX, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, K86, XXX }, \
+        { K90, XXX, XXX, K93, XXX, K95, K96, XXX } \
+}
+
+#define LAYOUT_60_iso_tsangan_hhkb( \
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K36, K56, \
+        K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80, K90, K81,                     K93,                K95, K86, K96 \
+) { \
+        { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { K70, K71, K72, K73, K74, K75, K76, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, K86, XXX }, \
+        { K90, XXX, XXX, K93, XXX, K95, K96, XXX } \
+}
+
+#define LAYOUT_60_iso_wkl_split_rshift( \
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K36, K56, \
+        K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80,      K81,                     K93,                K95,      K96 \
+) { \
+        { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+        { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+        { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+        { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+        { K40, K41, K42, K43, K44, K45, XXX, XXX }, \
+        { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+        { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+        { K70, K71, K72, K73, K74, K75, K76, XXX }, \
+        { K80, K81, XXX, XXX, XXX, XXX, XXX, XXX }, \
+        { XXX, XXX, XXX, K93, XXX, K95, K96, XXX } \
 }
diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json
index bf40fe160d..d78c848c6d 100644
--- a/keyboards/idb/idb_60/info.json
+++ b/keyboards/idb/idb_60/info.json
@@ -1,24 +1,30 @@
 {
     "keyboard_name": "idb 60",
     "url": "https://idb-keyboards.xyz/60",
-    "maintainer": "pngu",
+    "maintainer": "itspngu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all",
+        "LAYOUT_default": "LAYOUT_60_ansi_wkl_split_rshift"
+    },
     "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT_all": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
-                {"label":"!\n1", "x":1, "y":0},
-                {"label":"@\n2", "x":2, "y":0},
-                {"label":"#\n3", "x":3, "y":0},
-                {"label":"$\n4", "x":4, "y":0},
-                {"label":"%\n5", "x":5, "y":0},
-                {"label":"^\n6", "x":6, "y":0},
-                {"label":"&\n7", "x":7, "y":0},
-                {"label":"*\n8", "x":8, "y":0},
-                {"label":"(\n9", "x":9, "y":0},
-                {"label":")\n0", "x":10, "y":0},
-                {"label":"_\n-", "x":11, "y":0},
-                {"label":"+\n=", "x":12, "y":0},
-                {"label":"BS", "x":13, "y":0, "w":2.0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"BS", "x":13, "y":0},
+                {"label":"`~", "x":14, "y":0},
+
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
                 {"label":"W", "x":2.5, "y":1},
@@ -30,9 +36,10 @@
                 {"label":"I", "x":8.5, "y":1},
                 {"label":"O", "x":9.5, "y":1},
                 {"label":"P", "x":10.5, "y":1},
-                {"label":"{\n[", "x":11.5, "y":1},
-                {"label":"}\n]", "x":12.5, "y":1},
-                {"label":"|\n\\", "x":13.5, "y":1, "w":1.5},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
                 {"label":"A", "x":1.75, "y":2},
                 {"label":"S", "x":2.75, "y":2},
@@ -43,10 +50,12 @@
                 {"label":"J", "x":7.75, "y":2},
                 {"label":"K", "x":8.75, "y":2},
                 {"label":"L", "x":9.75, "y":2},
-                {"label":":\n;", "x":10.75, "y":2},
-                {"label":"\"\n'", "x":11.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
                 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"<>", "x":1.25, "y":3},
                 {"label":"Z", "x":2.25, "y":3},
                 {"label":"X", "x":3.25, "y":3},
                 {"label":"C", "x":4.25, "y":3},
@@ -54,35 +63,107 @@
                 {"label":"B", "x":6.25, "y":3},
                 {"label":"N", "x":7.25, "y":3},
                 {"label":"M", "x":8.25, "y":3},
-                {"label":"<\n,", "x":9.25, "y":3},
-                {"label":">\n.", "x":10.25, "y":3},
-                {"label":"?\n/", "x":11.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
                 {"label":"Fn", "x":14, "y":3},
+
                 {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
                 {"label":"Alt", "x":2.5, "y":4, "w":1.5},
                 {"label":"Space", "x":4, "y":4, "w":7},
                 {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
                 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
             ]
         },
-        "LAYOUT": {
+        "LAYOUT_60_ansi_tsangan": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
-                {"label":"!\n1", "x":1, "y":0},
-                {"label":"@\n2", "x":2, "y":0},
-                {"label":"#\n3", "x":3, "y":0},
-                {"label":"$\n4", "x":4, "y":0},
-                {"label":"%\n5", "x":5, "y":0},
-                {"label":"^\n6", "x":6, "y":0},
-                {"label":"&\n7", "x":7, "y":0},
-                {"label":"*\n8", "x":8, "y":0},
-                {"label":"(\n9", "x":9, "y":0},
-                {"label":")\n0", "x":10, "y":0},
-                {"label":"_\n-", "x":11, "y":0},
-                {"label":"+\n=", "x":12, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
                 {"label":"BS", "x":13, "y":0},
-                {"label":"~\n`", "x":14, "y":0},
+                {"label":"`~", "x":14, "y":0},
+
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
                 {"label":"W", "x":2.5, "y":1},
@@ -94,9 +175,10 @@
                 {"label":"I", "x":8.5, "y":1},
                 {"label":"O", "x":9.5, "y":1},
                 {"label":"P", "x":10.5, "y":1},
-                {"label":"{\n[", "x":11.5, "y":1},
-                {"label":"}\n]", "x":12.5, "y":1},
-                {"label":"|\n\\", "x":13.5, "y":1, "w":1.5},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
                 {"label":"A", "x":1.75, "y":2},
                 {"label":"S", "x":2.75, "y":2},
@@ -107,11 +189,148 @@
                 {"label":"J", "x":7.75, "y":2},
                 {"label":"K", "x":8.75, "y":2},
                 {"label":"L", "x":9.75, "y":2},
-                {"label":":\n;", "x":10.75, "y":2},
-                {"label":"\"\n'", "x":11.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
                 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
                 {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":">\n<\n\n|", "x":1.25, "y":3},
+                {"label":"\\|", "x":1.25, "y":3},
                 {"label":"Z", "x":2.25, "y":3},
                 {"label":"X", "x":3.25, "y":3},
                 {"label":"C", "x":4.25, "y":3},
@@ -119,11 +338,82 @@
                 {"label":"B", "x":6.25, "y":3},
                 {"label":"N", "x":7.25, "y":3},
                 {"label":"M", "x":8.25, "y":3},
-                {"label":"<\n,", "x":9.25, "y":3},
-                {"label":">\n.", "x":10.25, "y":3},
-                {"label":"?\n/", "x":11.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"BS", "x":13, "y":0},
+                {"label":"`~", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
                 {"label":"Fn", "x":14, "y":3},
+
                 {"label":"Ctrl", "x":0, "y":4, "w":1.5},
                 {"label":"Win", "x":1.5, "y":4},
                 {"label":"Alt", "x":2.5, "y":4, "w":1.5},
@@ -132,6 +422,74 @@
                 {"label":"Win", "x":12.5, "y":4},
                 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
             ]
+        },
+        "LAYOUT_60_iso_wkl_split_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c
index 373ff8ceed..60cac7559f 100644
--- a/keyboards/idb/idb_60/keymaps/default/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/default/keymap.c
@@ -2,28 +2,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_default(
+    [0] = LAYOUT_60_ansi_wkl_split_rshift(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
         KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
     ),
-    [1] = LAYOUT_default(
+    [1] = LAYOUT_60_ansi_wkl_split_rshift(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______,                                     _______,                            _______,          _______
     ),
-    [2] = LAYOUT_default(
+    [2] = LAYOUT_60_ansi_wkl_split_rshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______,                                     _______,                            _______,          _______
     ),
-    [3] = LAYOUT_default(
+    [3] = LAYOUT_60_ansi_wkl_split_rshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c
index 373ff8ceed..60cac7559f 100644
--- a/keyboards/idb/idb_60/keymaps/via/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/via/keymap.c
@@ -2,28 +2,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_default(
+    [0] = LAYOUT_60_ansi_wkl_split_rshift(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
         KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
     ),
-    [1] = LAYOUT_default(
+    [1] = LAYOUT_60_ansi_wkl_split_rshift(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______,                                     _______,                            _______,          _______
     ),
-    [2] = LAYOUT_default(
+    [2] = LAYOUT_60_ansi_wkl_split_rshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______,                                     _______,                            _______,          _______
     ),
-    [3] = LAYOUT_default(
+    [3] = LAYOUT_60_ansi_wkl_split_rshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,