Move TKL layouts to data driven (#20337)

2 files changed, 300 insertions, 330 deletions

diff --git a/keyboards/kineticlabs/emu/soldered/info.json b/keyboards/kineticlabs/emu/soldered/info.json
index 513287aede..dad20cc868 100644
--- a/keyboards/kineticlabs/emu/soldered/info.json
+++ b/keyboards/kineticlabs/emu/soldered/info.json
@@ -19,275 +19,314 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kineticlabs/emu/soldered/soldered.h b/keyboards/kineticlabs/emu/soldered/soldered.h
deleted file mode 100644
index 3c11c1a513..0000000000
--- a/keyboards/kineticlabs/emu/soldered/soldered.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                   k510, k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, k510, k511, ____, k513, k514, k515, k516, k517 }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114,       k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                   k510, k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, ____, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, k510, k511, ____, k513, k514, k515, k516, k517 }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114,       k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                         k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, ____, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, ____, k511, ____, k513, k514, k515, k516, k517 }  \
-}