Move miscellaneous layouts to data driven (#20516)

2 files changed, 570 insertions, 776 deletions

diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json
index 2dcc257e62..f069e415d9 100644
--- a/keyboards/rominronin/katana60/rev2/info.json
+++ b/keyboards/rominronin/katana60/rev2/info.json
@@ -18,572 +18,604 @@
     "layouts": {
         "LAYOUT_7u_a": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k41","x":0,"y":4,"w":1.5},
-                {"label":"k42","x":1.5,"y":4},
-                {"label":"k43","x":2.5,"y":4,"w":1.5},
-                {"label":"k47","x":4,"y":4,"w":7},
-                {"label":"k4b","x":11,"y":4},
-                {"label":"k4c","x":12,"y":4},
-                {"label":"k4d","x":13,"y":4},
-                {"label":"k4e","x":14,"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_7u_b": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k41","x":0,"y":4,"w":1.5},
-                {"label":"k42","x":1.5,"y":4},
-                {"label":"k43","x":2.5,"y":4,"w":1.5},
-                {"label":"k47","x":4,"y":4,"w":7},
-                {"label":"k17","x":11,"y":4,"w":1.5},
-                {"label":"k27","x":12.5,"y":4},
-                {"label":"k48","x":13.5,"y":4,"w":1.5}
+                {"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [1, 7], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 12.5, "y": 4},
+                {"matrix": [4, 8], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_1_a": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k40","x":0,"y":4},
-                {"label":"k41","x":1,"y":4,"w":1.25},
-                {"label":"k42","x":2.25,"y":4,"w":1.25},
-                {"label":"k43","x":3.5,"y":4,"w":1.25},
-                {"label":"k44","x":4.75,"y":4,"w":2.25},
-                {"label":"k47","x":7,"y":4},
-                {"label":"k49","x":8,"y":4,"w":2},
-                {"label":"k4a","x":10,"y":4},
-                {"label":"k4b","x":11,"y":4},
-                {"label":"k4c","x":12,"y":4},
-                {"label":"k4d","x":13,"y":4},
-                {"label":"k4e","x":14,"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_1_b": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k40","x":0,"y":4},
-                {"label":"k41","x":1,"y":4,"w":1.25},
-                {"label":"k42","x":2.25,"y":4,"w":1.25},
-                {"label":"k43","x":3.5,"y":4,"w":1.25},
-                {"label":"k44","x":4.75,"y":4,"w":2.25},
-                {"label":"k47","x":7,"y":4},
-                {"label":"k49","x":8,"y":4,"w":2.75},
-                {"label":"k17","x":10.75,"y":4,"w":2},
-                {"label":"k48","x":12.75,"y":4,"w":2.25}
+                {"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 2.75},
+                {"matrix": [1, 7], "x": 10.75, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
             ]
         },
         "LAYOUT_1_c": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k40","x":0,"y":4},
-                {"label":"k41","x":1,"y":4,"w":1.25},
-                {"label":"k42","x":2.25,"y":4,"w":1.25},
-                {"label":"k43","x":3.5,"y":4,"w":1.25},
-                {"label":"k44","x":4.75,"y":4,"w":2.25},
-                {"label":"k47","x":7,"y":4},
-                {"label":"k49","x":8,"y":4,"w":2},
-                {"label":"k45","x":10,"y":4,"w":1.5},
-                {"label":"k27","x":11.5,"y":4,"w":1.25},
-                {"label":"k48","x":12.75,"y":4,"w":2.25}
+                {"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
             ]
         },
         "LAYOUT_2_a": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k41","x":0,"y":4,"w":1.5},
-                {"label":"k42","x":1.5,"y":4,"w":1.25},
-                {"label":"k43","x":2.75,"y":4,"w":1.5},
-                {"label":"k44","x":4.25,"y":4,"w":2.75},
-                {"label":"k47","x":7,"y":4},
-                {"label":"k49","x":8,"y":4,"w":2},
-                {"label":"k4a","x":10,"y":4},
-                {"label":"k4b","x":11,"y":4},
-                {"label":"k4c","x":12,"y":4},
-                {"label":"k4d","x":13,"y":4},
-                {"label":"k4e","x":14,"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_2_b": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k41","x":0,"y":4,"w":1.5},
-                {"label":"k42","x":1.5,"y":4,"w":1.25},
-                {"label":"k43","x":2.75,"y":4,"w":1.5},
-                {"label":"k44","x":4.25,"y":4,"w":2.75},
-                {"label":"k47","x":7,"y":4},
-                {"label":"k49","x":8,"y":4,"w":2.75},
-                {"label":"k17","x":10.75,"y":4,"w":2},
-                {"label":"k48","x":12.75,"y":4,"w":2.25}
+                {"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 2.75},
+                {"matrix": [1, 7], "x": 10.75, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
             ]
         },
         "LAYOUT_2_c": {
             "layout": [
-                {"label":"k00","x":0,"y":0},
-                {"label":"k01","x":1,"y":0},
-                {"label":"k02","x":2,"y":0},
-                {"label":"k03","x":3,"y":0},
-                {"label":"k04","x":4,"y":0},
-                {"label":"k05","x":5,"y":0},
-                {"label":"k06","x":6,"y":0},
-                {"label":"k07","x":7,"y":0},
-                {"label":"k08","x":8,"y":0},
-                {"label":"k09","x":9,"y":0},
-                {"label":"k0a","x":10,"y":0},
-                {"label":"k0b","x":11,"y":0},
-                {"label":"k0c","x":12,"y":0},
-                {"label":"k0d","x":13,"y":0},
-                {"label":"k0e","x":14,"y":0},
-                {"label":"k10","x":0,"y":1,"w":1.5},
-                {"label":"k11","x":1.5,"y":1},
-                {"label":"k12","x":2.5,"y":1},
-                {"label":"k13","x":3.5,"y":1},
-                {"label":"k14","x":4.5,"y":1},
-                {"label":"k15","x":5.5,"y":1},
-                {"label":"k16","x":6.5,"y":1},
-                {"label":"k18","x":7.5,"y":1},
-                {"label":"k19","x":8.5,"y":1},
-                {"label":"k1a","x":9.5,"y":1},
-                {"label":"k1b","x":10.5,"y":1},
-                {"label":"k1c","x":11.5,"y":1},
-                {"label":"k1d","x":12.5,"y":1},
-                {"label":"k1e","x":13.5,"y":1,"w":1.5},
-                {"label":"k20","x":0,"y":2,"w":1.25},
-                {"label":"k21","x":1.25,"y":2},
-                {"label":"k22","x":2.25,"y":2},
-                {"label":"k23","x":3.25,"y":2},
-                {"label":"k24","x":4.25,"y":2},
-                {"label":"k25","x":5.25,"y":2},
-                {"label":"k26","x":6.25,"y":2},
-                {"label":"k28","x":7.75,"y":2},
-                {"label":"k29","x":8.75,"y":2},
-                {"label":"k2a","x":9.75,"y":2},
-                {"label":"k2b","x":10.75,"y":2},
-                {"label":"k2c","x":11.75,"y":2},
-                {"label":"k2d","x":12.75,"y":2},
-                {"label":"k2e","x":13.75,"y":2,"w":1.25},
-                {"label":"k30","x":0,"y":3},
-                {"label":"k31","x":1,"y":3},
-                {"label":"k32","x":2,"y":3},
-                {"label":"k33","x":3,"y":3},
-                {"label":"k34","x":4,"y":3},
-                {"label":"k35","x":5,"y":3},
-                {"label":"k36","x":6,"y":3},
-                {"label":"k37","x":7,"y":3},
-                {"label":"k38","x":8,"y":3},
-                {"label":"k39","x":9,"y":3},
-                {"label":"k3a","x":10,"y":3},
-                {"label":"k3b","x":11,"y":3},
-                {"label":"k3c","x":12,"y":3},
-                {"label":"k3d","x":13,"y":3},
-                {"label":"k3e","x":14,"y":3},
-                {"label":"k41","x":0,"y":4,"w":1.5},
-                {"label":"k42","x":1.5,"y":4,"w":1.25},
-                {"label":"k43","x":2.75,"y":4,"w":1.5},
-                {"label":"k44","x":4.25,"y":4,"w":2.75},
-                {"label":"k47","x":7,"y":4},
-                {"label":"k49","x":8,"y":4,"w":2},
-                {"label":"k45","x":10,"y":4,"w":1.5},
-                {"label":"k27","x":11.5,"y":4,"w":1.25},
-                {"label":"k48","x":12.75,"y":4,"w":2.25}
+                {"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": [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, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
             ]
         }
     }
diff --git a/keyboards/rominronin/katana60/rev2/rev2.h b/keyboards/rominronin/katana60/rev2/rev2.h
deleted file mode 100644
index 35a45b438a..0000000000
--- a/keyboards/rominronin/katana60/rev2/rev2.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * 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 XXX KC_NO
-
-/* LAYOUT_7u_a
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴─┬─┴───┼───┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┤
- * │41   │42 │43   │            47             │4B │4C │4D │4E │
- * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
- */
-#define LAYOUT_7u_a( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q41, Q42, Q43,                  Q47,                   Q4B, Q4C, Q4D, Q4E  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { XXX, Q41, Q42, Q43, XXX, XXX, XXX, Q47, XXX, XXX, XXX, Q4B, Q4C, Q4D, Q4E }  \
-}
-
-/* LAYOUT_7u_b
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴─┬─┴───┼───┴───┴───┴───┴───┴───┴───┼───┴─┬─┴─┬─┴───┤
- * │41   │42 │43   │            47             │17   │27 │48   │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-#define LAYOUT_7u_b( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q41, Q42, Q43,                  Q47,                        Q17, Q27, Q48  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { XXX, Q41, Q42, Q43, XXX, XXX, XXX, Q47, Q48, XXX, XXX, XXX, XXX, XXX, XXX }  \
-}
-
-/* LAYOUT_1_a
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┼───┼───┼───┼───┼───┤
- * │40 │41  │42  │43  │   44   │47 │  49   │4A │4B │4C │4D │4E │
- * └───┴────┴────┴────┴────────┴───┴───────┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_1_a( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q40, Q41,  Q42,  Q43,     Q44,     Q47,   Q49,    Q4A, Q4B, Q4C, Q4D, Q4E  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { Q40, Q41, Q42, Q43, Q44, XXX, XXX, Q47, XXX, Q49, Q4A, Q4B, Q4C, Q4D, Q4E }  \
-}
-
-/* LAYOUT_1_b
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┴──┬┴───┴──┬┴───┴───┤
- * │40 │41  │42  │43  │   44   │47 │    49    │17     │48      │
- * └───┴────┴────┴────┴────────┴───┴──────────┴───────┴────────┘
- */
-#define LAYOUT_1_b( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q40, Q41,  Q42,  Q43,     Q44,     Q47,        Q49,        Q17,       Q48  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { Q40, Q41, Q42, Q43, Q44, XXX, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX }  \
-}
-
-/* LAYOUT_1_c
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┼───┴─┬─┴──┬┴───┴───┤
- * │40 │41  │42  │43  │   44   │47 │  49   │45   │27  │48      │
- * └───┴────┴────┴────┴────────┴───┴───────┴─────┴────┴────────┘
- */
-#define LAYOUT_1_c( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q40, Q41,  Q42,  Q43,     Q44,     Q47,    Q49,     Q45,   Q27,       Q48  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { Q40, Q41, Q42, Q43, Q44, Q45, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX }  \
-}
-
-
-/* LAYOUT_2_a
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴──┬┴───┴┬──┴───┴───┼───┼───┴───┼───┼───┼───┼───┼───┤
- * │41   │42  │43   │    44    │47 │  49   │4A │4B │4C │4D │4E │
- * └─────┴────┴─────┴──────────┴───┴───────┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_2_a( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q41,   Q42,  Q43,         Q44,     Q47,   Q49,    Q4A, Q4B, Q4C, Q4D, Q4E  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { XXX, Q41, Q42, Q43, Q44, XXX, XXX, Q47, XXX, Q49, Q4A, Q4B, Q4C, Q4D, Q4E }  \
-}
-
-
-
-/* LAYOUT_2_b
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴──┬┴───┴┬──┴───┴───┼───┼───┴───┴──┬┴───┴──┬┴───┴───┤
- * │41   │42  │43   │    44    │47 │    49    │17     │48      │
- * └─────┴────┴─────┴──────────┴───┴──────────┴───────┴────────┘
- */
-#define LAYOUT_2_b( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q41,   Q42,  Q43,         Q44,     Q47,        Q49,        Q17,       Q48  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { XXX, Q41, Q42, Q43, Q44, XXX, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX }  \
-}
-
-/* LAYOUT_2_c
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E   │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20  │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E  │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┼───┴─┬─┴──┬┴───┴───┤
- * │40 │41  │42  │43  │   44   │47 │  49   │45   │27  │48      │
- * └───┴────┴────┴────┴────────┴───┴───────┴─────┴────┴────────┘
- */
-#define LAYOUT_2_c( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
-    Q10,   Q11, Q12, Q13, Q14, Q15, Q16,  Q18, Q19, Q1A, Q1B, Q1C, Q1D,   Q1E, \
-    Q20,  Q21, Q22, Q23, Q24, Q25, Q26,    Q28, Q29, Q2A, Q2B, Q2C, Q2D,  Q2E, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
-    Q41,   Q42,  Q43,         Q44,     Q47,    Q49,     Q45,   Q27,       Q48  \
-) { \
-    { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
-    { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
-    { Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
-    { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
-    { XXX, Q41, Q42, Q43, Q44, Q45, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX }  \
-}