Move Alice and Ergodox layouts to data driven (#20340)

2 files changed, 302 insertions, 336 deletions

diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json
index 0f283bc675..a2b3097716 100644
--- a/keyboards/axolstudio/yeti/soldered/info.json
+++ b/keyboards/axolstudio/yeti/soldered/info.json
@@ -19,278 +19,320 @@
   "layouts": {
     "LAYOUT_alice": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w": 2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":1.75},
-        {"x":17.25, "y":3},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [2, 15], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_split_bs": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":1.75},
-        {"x":17.25, "y":3},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [2, 15], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_full_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w":2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 14], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_split_bs_full_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 14], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/axolstudio/yeti/soldered/soldered.h b/keyboards/axolstudio/yeti/soldered/soldered.h
deleted file mode 100644
index 7c3b5cba1d..0000000000
--- a/keyboards/axolstudio/yeti/soldered/soldered.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 kb-elmo
- *
- * 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 LAYOUT_alice( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k14, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45,      k47, \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12, KC_NO,   k14, KC_NO }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44,   k45, KC_NO,   k47 }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
-
-// Equivalent to LAYOUT_all
-#define LAYOUT_alice_split_bs( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45,      k47, \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13, KC_NO,   k15 }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44,   k45, KC_NO,   k47 }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60,      k46,      \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13, KC_NO,   k15 }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44, KC_NO,   k46, KC_NO }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k14, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60,      k46,      \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12, KC_NO,   k14, KC_NO }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44, KC_NO,   k46, KC_NO }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}