Move miscellaneous layouts to data driven (#20516)

2 files changed, 262 insertions, 301 deletions

diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index 9fe24951e4..71d6d94542 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -27,246 +27,272 @@
     "layouts": {
         "LAYOUT_lh": {
             "layout": [
-                {"x":0, "y":0.125},
-                {"x":1, "y":0.125},
-                {"x":2, "y":0.125},
-                {"x":3, "y":0.125},
-                {"x":5, "y":0.125},
-                {"x":6.5, "y":0.125},
-                {"x":7.5, "y":0.125},
-                {"x":8.5, "y":0.125},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0.125},
-                {"x":11.5, "y":0.25},
-                {"x":14.75, "y":0.25},
-                {"x":15.75, "y":0.125},
-                {"x":16.75, "y":0},
-                {"x":17.75, "y":0.125},
-                {"x":18.75, "y":0.125},
-                {"x":19.75, "y":0.125},
-                {"x":21, "y":0.125},
-                {"x":22, "y":0.125},
-                {"x":23, "y":0.125},
-                {"x":24, "y":0.125},
-
-                {"x":0, "y":1.375},
-                {"x":1, "y":1.375},
-                {"x":2, "y":1.375},
-                {"x":3, "y":1.375},
-                {"x":6.25, "y":1.375},
-                {"x":7.25, "y":1.375},
-                {"x":8.5, "y":1.375},
-                {"x":9.5, "y":1.25},
-                {"x":10.5, "y":1.375},
-                {"x":11.5, "y":1.5},
-                {"x":14.75, "y":1.5},
-                {"x":15.75, "y":1.375},
-                {"x":16.75, "y":1.25},
-                {"x":17.75, "y":1.375},
-                {"x":19, "y":1.375},
-                {"x":20, "y":1.375},
-                {"x":21, "y":1.375},
-                {"x":22, "y":1.375},
-                {"x":23, "y":1.375},
-
-                {"x":0, "y":2.375},
-                {"x":1, "y":2.375},
-                {"x":2, "y":2.375},
-                {"x":3, "y":2.375},
-                {"x":5.5, "y":2.375, "w":1.5},
-                {"x":7, "y":2.375},
-                {"x":8.5, "y":2.375},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.375},
-                {"x":11.5, "y":2.5},
-                {"x":14.75, "y":2.5},
-                {"x":15.75, "y":2.375},
-                {"x":16.75, "y":2.25},
-                {"x":17.75, "y":2.375},
-                {"x":19.25, "y":2.375},
-                {"x":20.25, "y":2.375},
-                {"x":21.25, "y":2.375},
-                {"x":22.25, "y":2.375, "w":1.5},
-
-                {"x":0, "y":3.375},
-                {"x":1, "y":3.375},
-                {"x":2, "y":3.375},
-                {"x":3, "y":3.375},
-                {"x":5, "y":3.375, "w":1.75},
-                {"x":6.75, "y":3.375},
-                {"x":8.5, "y":3.375},
-                {"x":9.5, "y":3.25},
-                {"x":10.5, "y":3.375},
-                {"x":11.5, "y":3.5},
-                {"x":14.75, "y":3.5},
-                {"x":15.75, "y":3.375},
-                {"x":16.75, "y":3.25},
-                {"x":17.75, "y":3.375},
-                {"x":19.5, "y":3.375},
-                {"x":20.5, "y":3.375},
-                {"x":21.5, "y":3.375},
-                {"x":22.5, "y":3.375, "w":1.25},
-
-                {"x":0, "y":4.375},
-                {"x":1, "y":4.375},
-                {"x":2, "y":4.375},
-                {"x":3, "y":4.375},
-                {"x":4.25, "y":4.375, "w":1.25},
-                {"x":5.25, "y":4.375},
-                {"x":6.25, "y":4.375},
-                {"x":8.5, "y":4.375},
-                {"x":9.5, "y":4.25},
-                {"x":10.5, "y":4.375},
-                {"x":11.5, "y":4.5},
-                {"x":12.5, "y":4.5},
-                {"x":13.75, "y":4.5},
-                {"x":14.75, "y":4.5},
-                {"x":15.75, "y":4.375},
-                {"x":16.75, "y":4.25},
-                {"x":17.75, "y":4.375},
-                {"x":19.75, "y":4.375},
-                {"x":20.75, "y":4.375},
-                {"x":21.75, "y":4.375, "w":1.25},
-                {"x":23, "y":4.375},
-
-                {"x":0, "y":5.375},
-                {"x":1, "y":5.375},
-                {"x":2, "y":5.375},
-                {"x":3, "y":5.375},
-                {"x":4.75, "y":5.375, "w":1.25},
-                {"x":6, "y":5.375, "w":1.25},
-                {"x":9, "y":5.375, "w":1.25},
-                {"x":10.25, "y":5.375, "w":1.25},
-                {"x":11.5, "y":5.5, "w":2},
-                {"x":13.75, "y":5.5, "w":2.75},
-                {"x":16.5, "y":5.375, "w":1.25},
-                {"x":19.5, "y":5.375, "w":1.25},
-                {"x":20.75, "y":5.375, "w":1.25},
-                {"x":22, "y":5.375},
-                {"x":23, "y":5.375},
-                {"x":24, "y":5.375}
+                {"matrix": [0, 0], "x": 0, "y": 0.125},
+                {"matrix": [1, 0], "x": 1, "y": 0.125},
+                {"matrix": [0, 1], "x": 2, "y": 0.125},
+                {"matrix": [1, 1], "x": 3, "y": 0.125},
+
+                {"matrix": [0, 2], "x": 5, "y": 0.125},
+
+                {"matrix": [1, 2], "x": 6.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 7.5, "y": 0.125},
+                {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+                {"matrix": [1, 4], "x": 10.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 11.5, "y": 0.25},
+
+                {"matrix": [1, 5], "x": 14.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 15.75, "y": 0.125},
+                {"matrix": [1, 6], "x": 16.75, "y": 0},
+                {"matrix": [0, 7], "x": 17.75, "y": 0.125},
+                {"matrix": [1, 7], "x": 18.75, "y": 0.125},
+                {"matrix": [0, 8], "x": 19.75, "y": 0.125},
+                {"matrix": [1, 8], "x": 21, "y": 0.125},
+                {"matrix": [0, 9], "x": 22, "y": 0.125},
+                {"matrix": [1, 9], "x": 23, "y": 0.125},
+                {"matrix": [5, 9], "x": 24, "y": 0.125},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.375},
+                {"matrix": [3, 0], "x": 1, "y": 1.375},
+                {"matrix": [2, 1], "x": 2, "y": 1.375},
+                {"matrix": [3, 1], "x": 3, "y": 1.375},
+
+                {"matrix": [3, 2], "x": 6.25, "y": 1.375},
+                {"matrix": [2, 3], "x": 7.25, "y": 1.375},
+                {"matrix": [3, 3], "x": 8.5, "y": 1.375},
+                {"matrix": [2, 4], "x": 9.5, "y": 1.25},
+                {"matrix": [3, 4], "x": 10.5, "y": 1.375},
+                {"matrix": [2, 5], "x": 11.5, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 14.75, "y": 1.5},
+                {"matrix": [2, 6], "x": 15.75, "y": 1.375},
+                {"matrix": [3, 6], "x": 16.75, "y": 1.25},
+                {"matrix": [2, 7], "x": 17.75, "y": 1.375},
+                {"matrix": [3, 7], "x": 19, "y": 1.375},
+                {"matrix": [2, 8], "x": 20, "y": 1.375},
+                {"matrix": [3, 8], "x": 21, "y": 1.375},
+                {"matrix": [2, 9], "x": 22, "y": 1.375},
+                {"matrix": [3, 9], "x": 23, "y": 1.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.375},
+                {"matrix": [5, 0], "x": 1, "y": 2.375},
+                {"matrix": [4, 1], "x": 2, "y": 2.375},
+                {"matrix": [5, 1], "x": 3, "y": 2.375},
+
+                {"matrix": [5, 2], "x": 5.5, "y": 2.375, "w": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 2.375},
+                {"matrix": [5, 3], "x": 8.5, "y": 2.375},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 10.5, "y": 2.375},
+                {"matrix": [4, 5], "x": 11.5, "y": 2.5},
+
+                {"matrix": [5, 5], "x": 14.75, "y": 2.5},
+                {"matrix": [4, 6], "x": 15.75, "y": 2.375},
+                {"matrix": [5, 6], "x": 16.75, "y": 2.25},
+                {"matrix": [4, 7], "x": 17.75, "y": 2.375},
+                {"matrix": [5, 7], "x": 19.25, "y": 2.375},
+                {"matrix": [4, 8], "x": 20.25, "y": 2.375},
+                {"matrix": [5, 8], "x": 21.25, "y": 2.375},
+                {"matrix": [4, 9], "x": 22.25, "y": 2.375, "w": 1.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.375},
+                {"matrix": [7, 0], "x": 1, "y": 3.375},
+                {"matrix": [6, 1], "x": 2, "y": 3.375},
+                {"matrix": [7, 1], "x": 3, "y": 3.375},
+
+                {"matrix": [7, 2], "x": 5, "y": 3.375, "w": 1.75},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.375},
+                {"matrix": [7, 3], "x": 8.5, "y": 3.375},
+                {"matrix": [6, 4], "x": 9.5, "y": 3.25},
+                {"matrix": [7, 4], "x": 10.5, "y": 3.375},
+                {"matrix": [6, 5], "x": 11.5, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 14.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 15.75, "y": 3.375},
+                {"matrix": [7, 6], "x": 16.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 17.75, "y": 3.375},
+                {"matrix": [7, 7], "x": 19.5, "y": 3.375},
+                {"matrix": [6, 8], "x": 20.5, "y": 3.375},
+                {"matrix": [7, 8], "x": 21.5, "y": 3.375},
+                {"matrix": [7, 9], "x": 22.5, "y": 3.375, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.375},
+                {"matrix": [9, 0], "x": 1, "y": 4.375},
+                {"matrix": [8, 1], "x": 2, "y": 4.375},
+                {"matrix": [9, 1], "x": 3, "y": 4.375},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4.375, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.375},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.375},
+                {"matrix": [9, 3], "x": 8.5, "y": 4.375},
+                {"matrix": [8, 4], "x": 9.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.5, "y": 4.375},
+                {"matrix": [8, 5], "x": 11.5, "y": 4.5},
+                {"matrix": [10, 5], "x": 12.5, "y": 4.5},
+
+                {"matrix": [11, 5], "x": 13.75, "y": 4.5},
+                {"matrix": [9, 5], "x": 14.75, "y": 4.5},
+                {"matrix": [8, 6], "x": 15.75, "y": 4.375},
+                {"matrix": [9, 6], "x": 16.75, "y": 4.25},
+                {"matrix": [8, 7], "x": 17.75, "y": 4.375},
+                {"matrix": [9, 7], "x": 19.75, "y": 4.375},
+                {"matrix": [8, 8], "x": 20.75, "y": 4.375},
+                {"matrix": [9, 8], "x": 21.75, "y": 4.375, "w": 1.25},
+                {"matrix": [8, 9], "x": 23, "y": 4.375},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.375},
+                {"matrix": [11, 0], "x": 1, "y": 5.375},
+                {"matrix": [10, 1], "x": 2, "y": 5.375},
+                {"matrix": [11, 1], "x": 3, "y": 5.375},
+
+                {"matrix": [11, 2], "x": 4.75, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 3], "x": 6, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 3], "x": 9, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 4], "x": 10.25, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 4], "x": 11.5, "y": 5.5, "w": 2},
+
+                {"matrix": [10, 6], "x": 13.75, "y": 5.5, "w": 2.75},
+                {"matrix": [11, 6], "x": 16.5, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 7], "x": 19.5, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 8], "x": 20.75, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 8], "x": 22, "y": 5.375},
+                {"matrix": [10, 9], "x": 23, "y": 5.375},
+                {"matrix": [11, 9], "x": 24, "y": 5.375}
             ]
         },
         "LAYOUT_rh": {
             "layout": [
-                {"x":0.75, "y":0.125},
-                {"x":2.25, "y":0.125},
-                {"x":3.25, "y":0.125},
-                {"x":4.25, "y":0.125},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0.125},
-                {"x":7.25, "y":0.25},
-                {"x":10.5, "y":0.25},
-                {"x":11.5, "y":0.125},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0.125},
-                {"x":14.5, "y":0.125},
-                {"x":15.5, "y":0.125},
-                {"x":16.75, "y":0.125},
-                {"x":17.75, "y":0.125},
-                {"x":18.75, "y":0.125},
-                {"x":19.75, "y":0.125},
-                {"x":21, "y":0.125},
-                {"x":22, "y":0.125},
-                {"x":23, "y":0.125},
-                {"x":24, "y":0.125},
-
-                {"x":2, "y":1.375},
-                {"x":3, "y":1.375},
-                {"x":4.25, "y":1.375},
-                {"x":5.25, "y":1.25},
-                {"x":6.25, "y":1.375},
-                {"x":7.25, "y":1.5},
-                {"x":10.5, "y":1.5},
-                {"x":11.5, "y":1.375},
-                {"x":12.5, "y":1.25},
-                {"x":13.5, "y":1.375},
-                {"x":14.75, "y":1.375},
-                {"x":15.75, "y":1.375},
-                {"x":16.75, "y":1.375},
-                {"x":17.75, "y":1.375},
-                {"x":18.75, "y":1.375},
-                {"x":21, "y":1.375},
-                {"x":22, "y":1.375},
-                {"x":23, "y":1.375},
-                {"x":24, "y":1.375},
-
-                {"x":1.25, "y":2.375, "w":1.5},
-                {"x":2.75, "y":2.375},
-                {"x":4.25, "y":2.375},
-                {"x":5.25, "y":2.25},
-                {"x":6.25, "y":2.375},
-                {"x":7.25, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.375},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.375},
-                {"x":15, "y":2.375},
-                {"x":16, "y":2.375},
-                {"x":17, "y":2.375},
-                {"x":18, "y":2.375, "w":1.5},
-                {"x":21, "y":2.375},
-                {"x":22, "y":2.375},
-                {"x":23, "y":2.375},
-                {"x":24, "y":2.375},
-
-                {"x":0.75, "y":3.375, "w":1.75},
-                {"x":2.5, "y":3.375},
-                {"x":4.25, "y":3.375},
-                {"x":5.25, "y":3.25},
-                {"x":6.25, "y":3.375},
-                {"x":7.25, "y":3.5},
-                {"x":10.5, "y":3.5},
-                {"x":11.5, "y":3.375},
-                {"x":12.5, "y":3.25},
-                {"x":13.5, "y":3.375},
-                {"x":15.25, "y":3.375},
-                {"x":16.25, "y":3.375},
-                {"x":17.25, "y":3.375},
-                {"x":18.25, "y":3.375, "w":1.25},
-                {"x":21, "y":3.375},
-                {"x":22, "y":3.375},
-                {"x":23, "y":3.375},
-                {"x":24, "y":3.375},
-
-                {"x":0, "y":4.375, "w":1.25},
-                {"x":1.25, "y":4.375},
-                {"x":2.25, "y":4.375},
-                {"x":4.25, "y":4.375},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.375},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.5, "y":4.5},
-                {"x":10.5, "y":4.5},
-                {"x":11.5, "y":4.375},
-                {"x":12.5, "y":4.25},
-                {"x":13.5, "y":4.375},
-                {"x":15.5, "y":4.375},
-                {"x":16.5, "y":4.375},
-                {"x":17.5, "y":4.375, "w":1.25},
-                {"x":18.75, "y":4.375},
-                {"x":21, "y":4.375},
-                {"x":22, "y":4.375},
-                {"x":23, "y":4.375},
-                {"x":24, "y":4.375},
-
-                {"x":0.5, "y":5.375, "w":1.25},
-                {"x":1.75, "y":5.375, "w":1.25},
-                {"x":4.75, "y":5.375, "w":1.25},
-                {"x":6, "y":5.375, "w":1.25},
-                {"x":7.25, "y":5.5, "w":2},
-                {"x":9.5, "y":5.5, "w":2.75},
-                {"x":12.25, "y":5.375, "w":1.25},
-                {"x":15.25, "y":5.375, "w":1.25},
-                {"x":16.5, "y":5.375, "w":1.25},
-                {"x":17.75, "y":5.375},
-                {"x":18.75, "y":5.375},
-                {"x":19.75, "y":5.375},
-                {"x":21, "y":5.375},
-                {"x":22, "y":5.375},
-                {"x":23, "y":5.375},
-                {"x":24, "y":5.375}
+                {"matrix": [0, 2], "x": 0.75, "y": 0.125},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.125},
+                {"matrix": [1, 3], "x": 4.25, "y": 0.125},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [1, 4], "x": 6.25, "y": 0.125},
+                {"matrix": [0, 5], "x": 7.25, "y": 0.25},
+
+                {"matrix": [1, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 11.5, "y": 0.125},
+                {"matrix": [1, 6], "x": 12.5, "y": 0},
+                {"matrix": [0, 7], "x": 13.5, "y": 0.125},
+                {"matrix": [1, 7], "x": 14.5, "y": 0.125},
+                {"matrix": [0, 8], "x": 15.5, "y": 0.125},
+                {"matrix": [1, 8], "x": 16.75, "y": 0.125},
+                {"matrix": [0, 9], "x": 17.75, "y": 0.125},
+                {"matrix": [1, 9], "x": 18.75, "y": 0.125},
+                {"matrix": [5, 9], "x": 19.75, "y": 0.125},
+
+                {"matrix": [0, 0], "x": 21, "y": 0.125},
+                {"matrix": [1, 0], "x": 22, "y": 0.125},
+                {"matrix": [0, 1], "x": 23, "y": 0.125},
+                {"matrix": [1, 1], "x": 24, "y": 0.125},
+
+                {"matrix": [3, 2], "x": 2, "y": 1.375},
+                {"matrix": [2, 3], "x": 3, "y": 1.375},
+                {"matrix": [3, 3], "x": 4.25, "y": 1.375},
+                {"matrix": [2, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 1.375},
+                {"matrix": [2, 5], "x": 7.25, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 10.5, "y": 1.5},
+                {"matrix": [2, 6], "x": 11.5, "y": 1.375},
+                {"matrix": [3, 6], "x": 12.5, "y": 1.25},
+                {"matrix": [2, 7], "x": 13.5, "y": 1.375},
+                {"matrix": [3, 7], "x": 14.75, "y": 1.375},
+                {"matrix": [2, 8], "x": 15.75, "y": 1.375},
+                {"matrix": [3, 8], "x": 16.75, "y": 1.375},
+                {"matrix": [2, 9], "x": 17.75, "y": 1.375},
+                {"matrix": [3, 9], "x": 18.75, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 21, "y": 1.375},
+                {"matrix": [3, 0], "x": 22, "y": 1.375},
+                {"matrix": [2, 1], "x": 23, "y": 1.375},
+                {"matrix": [3, 1], "x": 24, "y": 1.375},
+
+                {"matrix": [5, 2], "x": 1.25, "y": 2.375, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.75, "y": 2.375},
+                {"matrix": [5, 3], "x": 4.25, "y": 2.375},
+                {"matrix": [4, 4], "x": 5.25, "y": 2.25},
+                {"matrix": [5, 4], "x": 6.25, "y": 2.375},
+                {"matrix": [4, 5], "x": 7.25, "y": 2.5},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.375},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.375},
+                {"matrix": [5, 7], "x": 15, "y": 2.375},
+                {"matrix": [4, 8], "x": 16, "y": 2.375},
+                {"matrix": [5, 8], "x": 17, "y": 2.375},
+                {"matrix": [4, 9], "x": 18, "y": 2.375, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 21, "y": 2.375},
+                {"matrix": [5, 0], "x": 22, "y": 2.375},
+                {"matrix": [4, 1], "x": 23, "y": 2.375},
+                {"matrix": [5, 1], "x": 24, "y": 2.375},
+
+                {"matrix": [7, 2], "x": 0.75, "y": 3.375, "w": 1.75},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.375},
+                {"matrix": [7, 3], "x": 4.25, "y": 3.375},
+                {"matrix": [6, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [7, 4], "x": 6.25, "y": 3.375},
+                {"matrix": [6, 5], "x": 7.25, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 10.5, "y": 3.5},
+                {"matrix": [6, 6], "x": 11.5, "y": 3.375},
+                {"matrix": [7, 6], "x": 12.5, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.5, "y": 3.375},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.375},
+                {"matrix": [6, 8], "x": 16.25, "y": 3.375},
+                {"matrix": [7, 8], "x": 17.25, "y": 3.375},
+                {"matrix": [7, 9], "x": 18.25, "y": 3.375, "w": 1.25},
+
+                {"matrix": [6, 0], "x": 21, "y": 3.375},
+                {"matrix": [7, 0], "x": 22, "y": 3.375},
+                {"matrix": [6, 1], "x": 23, "y": 3.375},
+                {"matrix": [7, 1], "x": 24, "y": 3.375},
+
+                {"matrix": [8, 2], "x": 0, "y": 4.375, "w": 1.25},
+                {"matrix": [9, 2], "x": 1.25, "y": 4.375},
+                {"matrix": [8, 3], "x": 2.25, "y": 4.375},
+                {"matrix": [9, 3], "x": 4.25, "y": 4.375},
+                {"matrix": [8, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 6.25, "y": 4.375},
+                {"matrix": [8, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [10, 5], "x": 8.25, "y": 4.5},
+
+                {"matrix": [11, 5], "x": 9.5, "y": 4.5},
+                {"matrix": [9, 5], "x": 10.5, "y": 4.5},
+                {"matrix": [8, 6], "x": 11.5, "y": 4.375},
+                {"matrix": [9, 6], "x": 12.5, "y": 4.25},
+                {"matrix": [8, 7], "x": 13.5, "y": 4.375},
+                {"matrix": [9, 7], "x": 15.5, "y": 4.375},
+                {"matrix": [8, 8], "x": 16.5, "y": 4.375},
+                {"matrix": [9, 8], "x": 17.5, "y": 4.375, "w": 1.25},
+                {"matrix": [8, 9], "x": 18.75, "y": 4.375},
+
+                {"matrix": [8, 0], "x": 21, "y": 4.375},
+                {"matrix": [9, 0], "x": 22, "y": 4.375},
+                {"matrix": [8, 1], "x": 23, "y": 4.375},
+                {"matrix": [9, 1], "x": 24, "y": 4.375},
+
+                {"matrix": [11, 2], "x": 0.5, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 3], "x": 1.75, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 3], "x": 4.75, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 4], "x": 6, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 4], "x": 7.25, "y": 5.5, "w": 2},
+
+                {"matrix": [10, 6], "x": 9.5, "y": 5.5, "w": 2.75},
+                {"matrix": [11, 6], "x": 12.25, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 7], "x": 15.25, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 8], "x": 16.5, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 8], "x": 17.75, "y": 5.375},
+                {"matrix": [10, 9], "x": 18.75, "y": 5.375},
+                {"matrix": [11, 9], "x": 19.75, "y": 5.375},
+
+                {"matrix": [10, 0], "x": 21, "y": 5.375},
+                {"matrix": [11, 0], "x": 22, "y": 5.375},
+                {"matrix": [10, 1], "x": 23, "y": 5.375},
+                {"matrix": [11, 1], "x": 24, "y": 5.375}
             ]
         }
     }
diff --git a/keyboards/nopunin10did/jabberwocky/v2/v2.h b/keyboards/nopunin10did/jabberwocky/v2/v2.h
deleted file mode 100644
index f319eb2240..0000000000
--- a/keyboards/nopunin10did/jabberwocky/v2/v2.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
- *
- * 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_lh( \
-    K0000, K0001, K0100, K0101, K0200, K0201, K0300, K0301, K0400, K0401, K0500,               K0501, K0600, K0601, K0700, K0701, K0800, K0801, K0900, K0901, K0905,    \
-    K0002, K0003, K0102, K0103,        K0203, K0302, K0303, K0402, K0403, K0502,               K0503, K0602, K0603, K0702, K0703, K0802, K0803, K0902, K0903,           \
-    K0004, K0005, K0104, K0105,        K0205, K0304, K0305, K0404, K0405, K0504,               K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904,                  \
-    K0006, K0007, K0106, K0107,        K0207, K0306, K0307, K0406, K0407, K0506,               K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0907,                  \
-    K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0408, K0409, K0508, K0510, K0511, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908,                  \
-    K0010, K0011, K0110, K0111,        K0211, K0310,        K0311, K0410, K0411,               K0610,        K0611,        K0711, K0810, K0811, K0910, K0911            \
-) \
-{ \
-    { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
-    { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
-    { K0002, K0102, KC_NO, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
-    { K0003, K0103, K0203, K0303, K0403, K0503, K0603, K0703, K0803, K0903 }, \
-    { K0004, K0104, KC_NO, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
-    { K0005, K0105, K0205, K0305, K0405, K0505, K0605, K0705, K0805, K0905 }, \
-    { K0006, K0106, KC_NO, K0306, K0406, K0506, K0606, K0706, K0806, KC_NO }, \
-    { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
-    { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
-    { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, KC_NO }, \
-    { K0010, K0110, KC_NO, K0310, K0410, K0510, K0610, KC_NO, K0810, K0910 }, \
-    { K0011, K0111, K0211, K0311, K0411, K0511, K0611, K0711, K0811, K0911 }  \
-}
-
-#define LAYOUT_rh( \
-    K0200, K0201, K0300, K0301, K0400, K0401, K0500,               K0501, K0600, K0601, K0700, K0701, K0800, K0801, K0900, K0901, K0905, K0000, K0001, K0100, K0101,     \
-           K0203, K0302, K0303, K0402, K0403, K0502,               K0503, K0602, K0603, K0702, K0703, K0802, K0803, K0902, K0903,        K0002, K0003, K0102, K0103,     \
-           K0205, K0304, K0305, K0404, K0405, K0504,               K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904,               K0004, K0005, K0104, K0105,     \
-           K0207, K0306, K0307, K0406, K0407, K0506,               K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0907,               K0006, K0007, K0106, K0107,     \
-    K0208, K0209, K0308, K0309, K0408, K0409, K0508, K0510, K0511, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908,               K0008, K0009, K0108, K0109,     \
-           K0211, K0310,        K0311, K0410, K0411,               K0610,        K0611,        K0711, K0810, K0811, K0910, K0911,        K0010, K0011, K0110, K0111      \
-) \
-{ \
-    { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
-    { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
-    { K0002, K0102, KC_NO, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
-    { K0003, K0103, K0203, K0303, K0403, K0503, K0603, K0703, K0803, K0903 }, \
-    { K0004, K0104, KC_NO, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
-    { K0005, K0105, K0205, K0305, K0405, K0505, K0605, K0705, K0805, K0905 }, \
-    { K0006, K0106, KC_NO, K0306, K0406, K0506, K0606, K0706, K0806, KC_NO }, \
-    { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
-    { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
-    { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, KC_NO }, \
-    { K0010, K0110, KC_NO, K0310, K0410, K0510, K0610, KC_NO, K0810, K0910 }, \
-    { K0011, K0111, K0211, K0311, K0411, K0511, K0611, K0711, K0811, K0911 }  \
-}