Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 503 insertions, 577 deletions

diff --git a/keyboards/mysticworks/wyvern/info.json b/keyboards/mysticworks/wyvern/info.json
index 2150a691a8..406a9d3eba 100644
--- a/keyboards/mysticworks/wyvern/info.json
+++ b/keyboards/mysticworks/wyvern/info.json
@@ -18,470 +18,525 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.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":18.25, "y":0},
-                {"x":19.75, "y":0},
-                
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4.25, "y":1, "w":1.5},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":7.75, "y":1},
-                {"x":8.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},
-                {"x":17.75, "y":1, "w":1.5},
-                {"x":19.75, "y":1},
-                
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4.25, "y":2, "w":1.75},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "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},
-                {"x":17, "y":2},
-                {"x":18, "y":2, "w":1.25},
-                {"x":19.75, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4.25, "y":3, "w":1.25},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":8.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},
-                {"x":16.5, "y":3, "w":1.75},
-                {"x":18.5, "y":3.25},
-                {"x":19.75, "y":3},
-                
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4.25, "y":4, "w":1.25},
-                {"x":5.5, "y":4, "w":1.25},
-                {"x":6.75, "y":4, "w":1.25},
-                {"x":8, "y":4, "w":6.25},
-                {"x":14.25, "y":4, "w":1.5},
-                {"x":15.75, "y":4, "w":1.5},
-                {"x":17.5, "y":4.25},
-                {"x":18.5, "y":4.25},
-                {"x":19.5, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+                {"matrix": [0, 9], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 8], "x": 16.75, "y": 1},
+                {"matrix": [2, 9], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [5, 8], "x": 17, "y": 2},
+                {"matrix": [4, 9], "x": 18, "y": 2, "w": 1.25},
+
+                {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+                {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+                {"matrix": [9, 1], "x": 3, "y": 4},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+                {"matrix": [8, 7], "x": 14.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 15.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25}
             ]
         },
         "LAYOUT_ansi_numpad_right": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.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, "w":2},
-                {"x":19.75, "y":0},
-                
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1, "h":2},
-                {"x":4.25, "y":1, "w":1.5},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":7.75, "y":1},
-                {"x":8.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},
-                {"x":17.75, "y":1, "w":1.5},
-                {"x":19.75, "y":1},
-                
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":4.25, "y":2, "w":1.75},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "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},
-                {"x":17, "y":2, "w":2.25},
-                {"x":19.75, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "h":2},
-                {"x":4.25, "y":3, "w":2.25},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":8.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},
-                {"x":16.5, "y":3, "w":1.75},
-                {"x":18.5, "y":3.25},
-                {"x":19.75, "y":3},
-                
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":4.25, "y":4, "w":1.25},
-                {"x":5.5, "y":4, "w":1.25},
-                {"x":6.75, "y":4, "w":1.25},
-                {"x":8, "y":4, "w":6.25},
-                {"x":14.25, "y":4, "w":1.5},
-                {"x":15.75, "y":4, "w":1.5},
-                {"x":17.5, "y":4.25},
-                {"x":18.5, "y":4.25},
-                {"x":19.5, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 9], "x": 17.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 8], "x": 16.75, "y": 1},
+                {"matrix": [2, 9], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [4, 9], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+                {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+                {"matrix": [8, 7], "x": 14.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 15.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25}
             ]
         },
         "LAYOUT_ansi_numpad_left": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.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, "w":2},
-                {"x":19.75, "y":0},
-                
-                {"x":0, "y":1, "h":2},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4.25, "y":1, "w":1.5},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":7.75, "y":1},
-                {"x":8.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},
-                {"x":17.75, "y":1, "w":1.5},
-                {"x":19.75, "y":1},
-                
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4.25, "y":2, "w":1.75},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "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},
-                {"x":17, "y":2, "w":2.25},
-                {"x":19.75, "y":2},
-                
-                {"x":0, "y":3, "h":2},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4.25, "y":3, "w":2.25},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":8.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},
-                {"x":16.5, "y":3, "w":1.75},
-                {"x":18.5, "y":3.25},
-                {"x":19.75, "y":3},
-                
-                {"x":1, "y":4},
-                {"x":2, "y":4, "w":2},
-                {"x":4.25, "y":4, "w":1.25},
-                {"x":5.5, "y":4, "w":1.25},
-                {"x":6.75, "y":4, "w":1.25},
-                {"x":8, "y":4, "w":6.25},
-                {"x":14.25, "y":4, "w":1.5},
-                {"x":15.75, "y":4, "w":1.5},
-                {"x":17.5, "y":4.25},
-                {"x":18.5, "y":4.25},
-                {"x":19.5, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 9], "x": 17.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "h": 2},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 8], "x": 16.75, "y": 1},
+                {"matrix": [2, 9], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [4, 9], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+                {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [9, 1], "x": 2, "y": 4, "w": 2},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+                {"matrix": [8, 7], "x": 14.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 15.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25}
             ]
         },
         "LAYOUT_iso_numpad_right": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.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, "w":2},
-                {"x":19.75, "y":0},
-                
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1, "h":2},
-                {"x":4.25, "y":1, "w":1.5},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":7.75, "y":1},
-                {"x":8.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},
-                {"x":19.75, "y":1},
-                
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":4.25, "y":2, "w":1.75},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "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},
-                {"x":17, "y":2},
-                {"x":18, "y":1, "w":1.25, "h":2},
-                {"x":19.75, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "h":2},
-                {"x":4.25, "y":3, "w":1.25},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":8.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},
-                {"x":16.5, "y":3, "w":1.75},
-                {"x":18.5, "y":3.25},
-                {"x":19.75, "y":3},
-                
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":4.25, "y":4, "w":1.25},
-                {"x":5.5, "y":4, "w":1.25},
-                {"x":6.75, "y":4, "w":1.25},
-                {"x":8, "y":4, "w":6.25},
-                {"x":14.25, "y":4, "w":1.5},
-                {"x":15.75, "y":4, "w":1.5},
-                {"x":17.5, "y":4.25},
-                {"x":18.5, "y":4.25},
-                {"x":19.5, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 9], "x": 17.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 8], "x": 16.75, "y": 1},
+
+                {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [5, 8], "x": 17, "y": 2},
+                {"matrix": [4, 9], "x": 18, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+                {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+                {"matrix": [8, 7], "x": 14.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 15.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25}
             ]
         },
         "LAYOUT_iso_numpad_left": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.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, "w":2},
-                {"x":19.75, "y":0},
-                
-                {"x":0, "y":1, "h":2},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4.25, "y":1, "w":1.5},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":7.75, "y":1},
-                {"x":8.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},
-                {"x":19.75, "y":1},
-                
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4.25, "y":2, "w":1.75},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "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},
-                {"x":17, "y":2},
-                {"x":18, "y":1, "w":1.25, "h":2},
-                {"x":19.75, "y":2},
-                
-                {"x":0, "y":3, "h":2},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4.25, "y":3, "w":1.25},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":8.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},
-                {"x":16.5, "y":3, "w":1.75},
-                {"x":18.5, "y":3.25},
-                {"x":19.75, "y":3},
-                
-                {"x":1, "y":4},
-                {"x":2, "y":4, "w":2},
-                {"x":4.25, "y":4, "w":1.25},
-                {"x":5.5, "y":4, "w":1.25},
-                {"x":6.75, "y":4, "w":1.25},
-                {"x":8, "y":4, "w":6.25},
-                {"x":14.25, "y":4, "w":1.5},
-                {"x":15.75, "y":4, "w":1.5},
-                {"x":17.5, "y":4.25},
-                {"x":18.5, "y":4.25},
-                {"x":19.5, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 9], "x": 17.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "h": 2},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 8], "x": 16.75, "y": 1},
+
+                {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [5, 8], "x": 17, "y": 2},
+                {"matrix": [4, 9], "x": 18, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+                {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [9, 1], "x": 2, "y": 4, "w": 2},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+                {"matrix": [8, 7], "x": 14.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 15.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/mysticworks/wyvern/wyvern.h b/keyboards/mysticworks/wyvern/wyvern.h
deleted file mode 100644
index ea5b4b305e..0000000000
--- a/keyboards/mysticworks/wyvern/wyvern.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2020 Albert Dong <albert@mysticworks.xyz>
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00, k10, k01, k11,   k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, k09, k19, \
-    k20, k30, k21, k31,   k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28,      k29, k39, \
-    k40, k50, k41, k51,   k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57,      k58, k49, k59, \
-    k60, k70, k61, k71,   k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68,      k69, k79, \
-    k80, k90, k81, k91,   k82, k92, k83,                k85,                k87, k97,      k98, k89, k99  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, XXX, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, XXX, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX, k79 }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, XXX, k89 }, \
-    { k90, k91, k92, XXX, XXX, XXX, XXX, k97, k98, k99 }  \
-}
-
-#define LAYOUT_ansi_numpad_right( \
-    k00, k10, k01, k11,   k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k09, k19, \
-    k20, k30, k21, k31,   k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k29, k39, \
-    k40, k50, k41,        k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57,      k49, k59, \
-    k60, k70, k61, k71,   k62,      k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k69, k79, \
-    k80,      k81,        k82, k92, k83,                k85,                k87, k97, k98, k89, k99  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, XXX, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, XXX, k49 }, \
-    { k50, XXX, k52, k53, k54, k55, k56, k57, XXX, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX, k79 }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, XXX, k89 }, \
-    { XXX, XXX, k92, XXX, XXX, XXX, XXX, k97, k98, k99 }  \
-}
-
-#define LAYOUT_ansi_numpad_left( \
-    k00, k10, k01, k11,   k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k09, k19, \
-    k20, k30, k21, k31,   k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k29, k39, \
-         k50, k41, k51,   k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57,      k49, k59, \
-    k60, k70, k61, k71,   k62,      k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k69, k79, \
-         k90,      k91,   k82, k92, k83,                k85,                k87, k97, k98, k89, k99  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, XXX, k39 }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47, XXX, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, XXX, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, XXX, k73, k74, k75, k76, k77, XXX, k79 }, \
-    { XXX, XXX, k82, k83, XXX, k85, XXX, k87, XXX, k89 }, \
-    { k90, k91, k92, XXX, XXX, XXX, XXX, k97, k98, k99 }  \
-}
-
-#define LAYOUT_iso_numpad_right( \
-    k00, k10, k01, k11,   k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k09, k19, \
-    k20, k30, k21, k31,   k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28,      k39, \
-    k40, k50, k41,        k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k58, k49, k59, \
-    k60, k70, k61, k71,   k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k69, k79, \
-    k80,      k81,        k82, k92, k83,                k85,                k87, k97, k98, k89, k99  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, XXX, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, XXX, k49 }, \
-    { k50, XXX, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX, k79 }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, XXX, k89 }, \
-    { XXX, XXX, k92, XXX, XXX, XXX, XXX, k97, k98, k99 }  \
-}
-
-#define LAYOUT_iso_numpad_left( \
-    k00, k10, k01, k11,   k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k09, k19, \
-    k20, k30, k21, k31,   k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28,      k39, \
-         k50, k41, k51,   k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k58, k49, k59, \
-    k60, k70, k61, k71,   k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k69, k79, \
-         k90,      k91,   k82, k92, k83,                k85,                k87, k97, k98, k89, k99  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, XXX, k39 }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47, XXX, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX, k79 }, \
-    { XXX, XXX, k82, k83, XXX, k85, XXX, k87, XXX, k89 }, \
-    { k90, k91, k92, XXX, XXX, XXX, XXX, k97, k98, k99 }  \
-}