Move TKL F13 and FRL layouts to data driven (#20310)

2 files changed, 404 insertions, 518 deletions

diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json
index 021f719740..9d3216ab15 100644
--- a/keyboards/mokey/xox70/info.json
+++ b/keyboards/mokey/xox70/info.json
@@ -19,426 +19,426 @@
     "layouts": {
         "LAYOUT_all": {
             "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":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "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":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "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, "w": 2.25},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
-                {"label":"k31", "x": 1.25, "y": 3},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 1.75},
-                {"label":"k3E", "x": 14, "y": 3},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.5},
-                {"label":"k41", "x": 1.5, "y": 4},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.5},
-                {"label":"k44", "x": 4, "y": 4, "w": 2.5},
-                {"label":"k46", "x": 6.5, "y": 4},
-                {"label":"k48", "x": 7.5, "y": 4, "w": 2.5},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "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.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "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": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "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, "w": 2.25},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.5},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+                {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2.5},
+                {"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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_ansi": {
             "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":"k0E", "x": 13, "y": 0, "w": 2},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "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":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "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, "w": 2.25},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "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": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "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, "w": 2.25},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 16.25, "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, 3], "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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_iso": {
             "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":"k0E", "x": 13, "y": 0, "w": 2},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "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":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "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":"k1E", "x": 12.75, "y": 2},
-                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
-                {"label":"k31", "x": 1.25, "y": 3},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "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, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "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": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 16.25, "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, 3], "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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_ansi_split_bs": {
             "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":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "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":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "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, "w": 2.25},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "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.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "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": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "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, "w": 2.25},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 16.25, "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, 3], "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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_iso_split_bs": {
             "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":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "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":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "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":"k1E", "x": 12.75, "y": 2},
-                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
-                {"label":"k31", "x": 1.25, "y": 3},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "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.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "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, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "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": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 16.25, "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, 3], "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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/xox70/xox70.h b/keyboards/mokey/xox70/xox70.h
deleted file mode 100644
index 3c0f15d2f7..0000000000
--- a/keyboards/mokey/xox70/xox70.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * 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
-
-/*
- *                                                                ┌───────┐
- *                                                                │0E     │ 2u Backspace
- *                                                                └───────┘
- *            ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
- *            │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │0G │0H │
- *            ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤    ┌─────┐
- *            │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │ │1F │1G │1H │    │2D   │
- *            ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐    │ ISO Enter
- *            │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │               │1E │    │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐     ├───┴────┴─┐
- * │30      │ │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │     │3G │     │3D        │
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘
- *            │40  │41  │43  │46                      │4A  │4B  │4D  │4E  │ │4F │4G │4H │
- *            └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *            ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
- *            │40   │41 │43   │46                         │4B   │4D │4E   │
- *            └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- *            ┌─────┐   ┌─────┬───────────┬───┬───────────┬─────┐   ┌─────┐
- *            │40   │   │43   │44         │46 │48         │4B   │   │4E   │
- *            └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E,             k3G, \
-    k40, k41, k43,           k44, k46, k48,           k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,        k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_iso_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,             k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}