Move 65% layouts to data driven (#20308)

2 files changed, 362 insertions, 435 deletions

diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/info.json
index c0ff6682a9..a7d6a18e86 100644
--- a/keyboards/flx/lodestone/info.json
+++ b/keyboards/flx/lodestone/info.json
@@ -19,364 +19,384 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0},
-                {"label":"K0E (B3,C6)", "x":14, "y":0},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2C (F0,B5)", "x":12.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":13.75, "y":2, "w":1.25},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F1,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0},
-                {"label":"K0E (B3,C6)", "x":14, "y":0},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2C (F0,B5)", "x":12.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F1,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0},
-                {"label":"K0E (B3,C6)", "x":14, "y":0},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2C (F0,B5)", "x":12.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F1,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/flx/lodestone/lodestone.h b/keyboards/flx/lodestone/lodestone.h
deleted file mode 100644
index 2e05b67deb..0000000000
--- a/keyboards/flx/lodestone/lodestone.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2020 Shaun Mitchell (Flex)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// standard 65% layout ANSI + ISO
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,     K0D,  K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,  K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,  K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,     K0D,  K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}