Merge remote-tracking branch 'origin/master' into develop

4 files changed, 359 insertions, 16 deletions

diff --git a/keyboards/mechlovin/hex4b/hex4b.h b/keyboards/mechlovin/hex4b/hex4b.h
index efee2ec7ee..17e2da910f 100644
--- a/keyboards/mechlovin/hex4b/hex4b.h
+++ b/keyboards/mechlovin/hex4b/hex4b.h
@@ -18,7 +18,28 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define XXX KC_NO
+
+/*
+ * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+ * │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │
+ * ├───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┼───┼───┼───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┤   ┌───────┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │1E │   │1D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │3E │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───────┼───┤
+ * │50  │51  │52  │56                      │5A  │5B  │ │5C │5D │5E │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │50   │51 │52   │56                         │5B   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
+#define LAYOUT_split_bs( \
     K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E,      \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
@@ -26,13 +47,58 @@
     K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
     K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E       \
 ) { \
-    { K00,   K01,   K02,   K03,   K04,   KC_NO, K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E   }, \
+    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \
+}
+
+#define LAYOUT_2u_bs( \
+    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E  \
+) { \
+    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \
+}
+
+#define LAYOUT_tsangan_split_bs( \
+    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E,      \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E       \
+) { \
+    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \
 }
 
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
\ No newline at end of file
+#define LAYOUT_tsangan_2u_bs( \
+    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E  \
+) { \
+    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \
+}
diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json
index 2a1e02d6a6..686d79cc0e 100644
--- a/keyboards/mechlovin/hex4b/info.json
+++ b/keyboards/mechlovin/hex4b/info.json
@@ -2,8 +2,12 @@
     "keyboard_name": "Hex4B",
     "url": "",
     "maintainer": "Hex-Keyboard&Mechlovin",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_bs",
+        "LAYOUT_all": "LAYOUT_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_bs": {
             "layout": [
                 {"label":"K00 (B0,B6)", "x":0, "y":0},
                 {"label":"K01 (B0,B7)", "x":1.5, "y":0},
@@ -19,6 +23,7 @@
                 {"label":"K0C (B0,D2)", "x":12.5, "y":0},
                 {"label":"K0D (B0,D3)", "x":13.5, "y":0},
                 {"label":"K0E (B0,D4)", "x":15, "y":0},
+
                 {"label":"K10 (B1,B6)", "x":0, "y":1},
                 {"label":"K11 (B1,B7)", "x":1, "y":1},
                 {"label":"K12 (B1,C0)", "x":2, "y":1},
@@ -35,6 +40,7 @@
                 {"label":"K1D (B1,D3)", "x":13, "y":1},
                 {"label":"K3C (B3,D2)", "x":14, "y":1},
                 {"label":"K1E (B1,D4)", "x":15, "y":1},
+
                 {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
                 {"label":"K21 (B2,B7)", "x":1.5, "y":2},
                 {"label":"K22 (B2,C0)", "x":2.5, "y":2},
@@ -50,6 +56,7 @@
                 {"label":"K2C (B2,D2)", "x":12.5, "y":2},
                 {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
                 {"label":"K2E (B2,D4)", "x":15, "y":2},
+
                 {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
                 {"label":"K31 (B3,B7)", "x":1.75, "y":3},
                 {"label":"K32 (B3,C0)", "x":2.75, "y":3},
@@ -64,6 +71,7 @@
                 {"label":"K3B (B3,D1)", "x":11.75, "y":3},
                 {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
                 {"label":"K3E (B3,D4)", "x":15, "y":3},
+
                 {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
                 {"label":"K42 (B4,C0)", "x":2.25, "y":4},
                 {"label":"K43 (B4,C1)", "x":3.25, "y":4},
@@ -78,6 +86,7 @@
                 {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
                 {"label":"K4D (B4,D3)", "x":14, "y":4},
                 {"label":"K4E (B4,D4)", "x":15, "y":4},
+
                 {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25},
                 {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25},
                 {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25},
@@ -88,7 +97,275 @@
                 {"label":"K5D (B5,D3)", "x":14, "y":5},
                 {"label":"K5E (B5,D4)", "x":15, "y":5}
             ]
+        },
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"label":"K00 (B0,B6)", "x":0, "y":0},
+                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
+                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
+                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
+                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
+                {"label":"K06 (B0,C4)", "x":6, "y":0},
+                {"label":"K07 (B0,C5)", "x":7, "y":0},
+                {"label":"K08 (B0,C6)", "x":8, "y":0},
+                {"label":"K09 (B0,C7)", "x":9, "y":0},
+                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
+                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
+                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
+                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
+                {"label":"K0E (B0,D4)", "x":15, "y":0},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1},
+                {"label":"K11 (B1,B7)", "x":1, "y":1},
+                {"label":"K12 (B1,C0)", "x":2, "y":1},
+                {"label":"K13 (B1,C1)", "x":3, "y":1},
+                {"label":"K14 (B1,C2)", "x":4, "y":1},
+                {"label":"K15 (B1,C3)", "x":5, "y":1},
+                {"label":"K16 (B1,C4)", "x":6, "y":1},
+                {"label":"K17 (B1,C5)", "x":7, "y":1},
+                {"label":"K18 (B1,C6)", "x":8, "y":1},
+                {"label":"K19 (B1,C7)", "x":9, "y":1},
+                {"label":"K1A (B1,D0)", "x":10, "y":1},
+                {"label":"K1B (B1,D1)", "x":11, "y":1},
+                {"label":"K1C (B1,D2)", "x":12, "y":1},
+                {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2},
+                {"label":"K1E (B1,D4)", "x":15, "y":1},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
+                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
+                {"label":"K2E (B2,D4)", "x":15, "y":2},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
+                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
+                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
+                {"label":"K3E (B3,D4)", "x":15, "y":3},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
+                {"label":"K4D (B4,D3)", "x":14, "y":4},
+                {"label":"K4E (B4,D4)", "x":15, "y":4},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25},
+                {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25},
+                {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25},
+                {"label":"K5C (B5,D2)", "x":13, "y":5},
+                {"label":"K5D (B5,D3)", "x":14, "y":5},
+                {"label":"K5E (B5,D4)", "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_tsangan_split_bs": {
+            "layout": [
+                {"label":"K00 (B0,B6)", "x":0, "y":0},
+                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
+                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
+                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
+                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
+                {"label":"K06 (B0,C4)", "x":6, "y":0},
+                {"label":"K07 (B0,C5)", "x":7, "y":0},
+                {"label":"K08 (B0,C6)", "x":8, "y":0},
+                {"label":"K09 (B0,C7)", "x":9, "y":0},
+                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
+                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
+                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
+                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
+                {"label":"K0E (B0,D4)", "x":15, "y":0},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1},
+                {"label":"K11 (B1,B7)", "x":1, "y":1},
+                {"label":"K12 (B1,C0)", "x":2, "y":1},
+                {"label":"K13 (B1,C1)", "x":3, "y":1},
+                {"label":"K14 (B1,C2)", "x":4, "y":1},
+                {"label":"K15 (B1,C3)", "x":5, "y":1},
+                {"label":"K16 (B1,C4)", "x":6, "y":1},
+                {"label":"K17 (B1,C5)", "x":7, "y":1},
+                {"label":"K18 (B1,C6)", "x":8, "y":1},
+                {"label":"K19 (B1,C7)", "x":9, "y":1},
+                {"label":"K1A (B1,D0)", "x":10, "y":1},
+                {"label":"K1B (B1,D1)", "x":11, "y":1},
+                {"label":"K1C (B1,D2)", "x":12, "y":1},
+                {"label":"K1D (B1,D3)", "x":13, "y":1},
+                {"label":"K3C (B3,D2)", "x":14, "y":1},
+                {"label":"K1E (B1,D4)", "x":15, "y":1},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
+                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
+                {"label":"K2E (B2,D4)", "x":15, "y":2},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
+                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
+                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
+                {"label":"K3E (B3,D4)", "x":15, "y":3},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
+                {"label":"K4D (B4,D3)", "x":14, "y":4},
+                {"label":"K4E (B4,D4)", "x":15, "y":4},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
+                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
+                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
+                {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5},
+                {"label":"K5C (B5,D2)", "x":13, "y":5},
+                {"label":"K5D (B5,D3)", "x":14, "y":5},
+                {"label":"K5E (B5,D4)", "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_tsangan_2u_bs": {
+            "layout": [
+                {"label":"K00 (B0,B6)", "x":0, "y":0},
+                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
+                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
+                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
+                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
+                {"label":"K06 (B0,C4)", "x":6, "y":0},
+                {"label":"K07 (B0,C5)", "x":7, "y":0},
+                {"label":"K08 (B0,C6)", "x":8, "y":0},
+                {"label":"K09 (B0,C7)", "x":9, "y":0},
+                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
+                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
+                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
+                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
+                {"label":"K0E (B0,D4)", "x":15, "y":0},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1},
+                {"label":"K11 (B1,B7)", "x":1, "y":1},
+                {"label":"K12 (B1,C0)", "x":2, "y":1},
+                {"label":"K13 (B1,C1)", "x":3, "y":1},
+                {"label":"K14 (B1,C2)", "x":4, "y":1},
+                {"label":"K15 (B1,C3)", "x":5, "y":1},
+                {"label":"K16 (B1,C4)", "x":6, "y":1},
+                {"label":"K17 (B1,C5)", "x":7, "y":1},
+                {"label":"K18 (B1,C6)", "x":8, "y":1},
+                {"label":"K19 (B1,C7)", "x":9, "y":1},
+                {"label":"K1A (B1,D0)", "x":10, "y":1},
+                {"label":"K1B (B1,D1)", "x":11, "y":1},
+                {"label":"K1C (B1,D2)", "x":12, "y":1},
+                {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2},
+                {"label":"K1E (B1,D4)", "x":15, "y":1},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
+                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
+                {"label":"K2E (B2,D4)", "x":15, "y":2},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
+                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
+                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
+                {"label":"K3E (B3,D4)", "x":15, "y":3},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
+                {"label":"K4D (B4,D3)", "x":14, "y":4},
+                {"label":"K4E (B4,D4)", "x":15, "y":4},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
+                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
+                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
+                {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5},
+                {"label":"K5C (B5,D2)", "x":13, "y":5},
+                {"label":"K5D (B5,D3)", "x":14, "y":5},
+                {"label":"K5E (B5,D4)", "x":15, "y":5}
+            ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/mechlovin/hex4b/keymaps/default/keymap.c b/keyboards/mechlovin/hex4b/keymaps/default/keymap.c
index 17c80ec55c..d298473263 100644
--- a/keyboards/mechlovin/hex4b/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/hex4b/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_split_bs(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,
         KC_GRV,  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_SPC,  KC_HOME,
         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_PGUP,
diff --git a/keyboards/mechlovin/hex4b/keymaps/via/keymap.c b/keyboards/mechlovin/hex4b/keymaps/via/keymap.c
index d44a24f124..dc20ae1365 100644
--- a/keyboards/mechlovin/hex4b/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/hex4b/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_split_bs(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,
         KC_GRV,  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_SPC,  KC_HOME,
         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_PGUP,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_split_bs(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_split_bs(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_split_bs(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,