Move TKL layouts to data driven (#20337)

2 files changed, 303 insertions, 359 deletions

diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json
index 24b25114f5..a23e8756aa 100644
--- a/keyboards/evyd13/nt750/info.json
+++ b/keyboards/evyd13/nt750/info.json
@@ -22,293 +22,317 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6.5, "y":0},
-                {"label":"k07", "x":7.5, "y":0},
-                {"label":"k08", "x":8.5, "y":0},
-                {"label":"k09", "x":9.5, "y":0},
-                {"label":"k0a", "x":11, "y":0},
-                {"label":"k0b", "x":12, "y":0},
-                {"label":"k0c", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15.25, "y":0},
-                {"label":"k0f", "x":16.25, "y":0},
-                {"label":"k0g", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.5},
-                {"label":"k13", "x":3, "y":1.5},
-                {"label":"k14", "x":4, "y":1.5},
-                {"label":"k15", "x":5, "y":1.5},
-                {"label":"k16", "x":6, "y":1.5},
-                {"label":"k17", "x":7, "y":1.5},
-                {"label":"k18", "x":8, "y":1.5},
-                {"label":"k19", "x":9, "y":1.5},
-                {"label":"k1a", "x":10, "y":1.5},
-                {"label":"k1b", "x":11, "y":1.5},
-                {"label":"k1c", "x":12, "y":1.5},
-                {"label":"k1d", "x":13, "y":1.5, "w":2},
-                {"label":"k1e", "x":15.25, "y":1.5},
-                {"label":"k1f", "x":16.25, "y":1.5},
-                {"label":"k1g", "x":17.25, "y":1.5},
-                
-                {"label":"k20", "x":0, "y":2.5, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.5},
-                {"label":"k22", "x":2.5, "y":2.5},
-                {"label":"k23", "x":3.5, "y":2.5},
-                {"label":"k24", "x":4.5, "y":2.5},
-                {"label":"k25", "x":5.5, "y":2.5},
-                {"label":"k26", "x":6.5, "y":2.5},
-                {"label":"k27", "x":7.5, "y":2.5},
-                {"label":"k28", "x":8.5, "y":2.5},
-                {"label":"k29", "x":9.5, "y":2.5},
-                {"label":"k2a", "x":10.5, "y":2.5},
-                {"label":"k2b", "x":11.5, "y":2.5},
-                {"label":"k2c", "x":12.5, "y":2.5},
-                {"label":"k2d", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"k2e", "x":15.25, "y":2.5},
-                {"label":"k2f", "x":16.25, "y":2.5},
-                {"label":"k2g", "x":17.25, "y":2.5},
-                
-                {"label":"k30", "x":0, "y":3.5, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.5},
-                {"label":"k32", "x":2.75, "y":3.5},
-                {"label":"k33", "x":3.75, "y":3.5},
-                {"label":"k34", "x":4.75, "y":3.5},
-                {"label":"k35", "x":5.75, "y":3.5},
-                {"label":"k36", "x":6.75, "y":3.5},
-                {"label":"k37", "x":7.75, "y":3.5},
-                {"label":"k38", "x":8.75, "y":3.5},
-                {"label":"k39", "x":9.75, "y":3.5},
-                {"label":"k3a", "x":10.75, "y":3.5},
-                {"label":"k3b", "x":11.75, "y":3.5},
-                {"label":"k3c", "x":12.75, "y":3.5},
-                {"label":"k3d", "x":13.75, "y":3.5, "w":1.25},
-                
-                {"label":"k40", "x":0, "y":4.5, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4.5},
-                {"label":"k42", "x":2.25, "y":4.5},
-                {"label":"k43", "x":3.25, "y":4.5},
-                {"label":"k44", "x":4.25, "y":4.5},
-                {"label":"k45", "x":5.25, "y":4.5},
-                {"label":"k46", "x":6.25, "y":4.5},
-                {"label":"k47", "x":7.25, "y":4.5},
-                {"label":"k48", "x":8.25, "y":4.5},
-                {"label":"k49", "x":9.25, "y":4.5},
-                {"label":"k4a", "x":10.25, "y":4.5},
-                {"label":"k4b", "x":11.25, "y":4.5},
-                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"k4f", "x":16.25, "y":4.5},
-                
-                {"label":"k50", "x":0, "y":5.5, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
-                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"k5e", "x":15.25, "y":5.5},
-                {"label":"k5f", "x":16.25, "y":5.5},
-                {"label":"k5g", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6.5, "y":0},
-                {"label":"k07", "x":7.5, "y":0},
-                {"label":"k08", "x":8.5, "y":0},
-                {"label":"k09", "x":9.5, "y":0},
-                {"label":"k0a", "x":11, "y":0},
-                {"label":"k0b", "x":12, "y":0},
-                {"label":"k0c", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15.25, "y":0},
-                {"label":"k0f", "x":16.25, "y":0},
-                {"label":"k0g", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.5},
-                {"label":"k13", "x":3, "y":1.5},
-                {"label":"k14", "x":4, "y":1.5},
-                {"label":"k15", "x":5, "y":1.5},
-                {"label":"k16", "x":6, "y":1.5},
-                {"label":"k17", "x":7, "y":1.5},
-                {"label":"k18", "x":8, "y":1.5},
-                {"label":"k19", "x":9, "y":1.5},
-                {"label":"k1a", "x":10, "y":1.5},
-                {"label":"k1b", "x":11, "y":1.5},
-                {"label":"k1c", "x":12, "y":1.5},
-                {"label":"k1d", "x":13, "y":1.5, "w":2},
-                {"label":"k1e", "x":15.25, "y":1.5},
-                {"label":"k1f", "x":16.25, "y":1.5},
-                {"label":"k1g", "x":17.25, "y":1.5},
-                
-                {"label":"k20", "x":0, "y":2.5, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.5},
-                {"label":"k22", "x":2.5, "y":2.5},
-                {"label":"k23", "x":3.5, "y":2.5},
-                {"label":"k24", "x":4.5, "y":2.5},
-                {"label":"k25", "x":5.5, "y":2.5},
-                {"label":"k26", "x":6.5, "y":2.5},
-                {"label":"k27", "x":7.5, "y":2.5},
-                {"label":"k28", "x":8.5, "y":2.5},
-                {"label":"k29", "x":9.5, "y":2.5},
-                {"label":"k2a", "x":10.5, "y":2.5},
-                {"label":"k2b", "x":11.5, "y":2.5},
-                {"label":"k2c", "x":12.5, "y":2.5},
-                {"label":"k2e", "x":15.25, "y":2.5},
-                {"label":"k2f", "x":16.25, "y":2.5},
-                {"label":"k2g", "x":17.25, "y":2.5},
-                
-                {"label":"k30", "x":0, "y":3.5, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.5},
-                {"label":"k32", "x":2.75, "y":3.5},
-                {"label":"k33", "x":3.75, "y":3.5},
-                {"label":"k34", "x":4.75, "y":3.5},
-                {"label":"k35", "x":5.75, "y":3.5},
-                {"label":"k36", "x":6.75, "y":3.5},
-                {"label":"k37", "x":7.75, "y":3.5},
-                {"label":"k38", "x":8.75, "y":3.5},
-                {"label":"k39", "x":9.75, "y":3.5},
-                {"label":"k3a", "x":10.75, "y":3.5},
-                {"label":"k3b", "x":11.75, "y":3.5},
-                {"label":"k3c", "x":12.75, "y":3.5},
-                {"label":"k3d", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                
-                {"label":"k40", "x":0, "y":4.5, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4.5},
-                {"label":"k42", "x":2.25, "y":4.5},
-                {"label":"k43", "x":3.25, "y":4.5},
-                {"label":"k44", "x":4.25, "y":4.5},
-                {"label":"k45", "x":5.25, "y":4.5},
-                {"label":"k46", "x":6.25, "y":4.5},
-                {"label":"k47", "x":7.25, "y":4.5},
-                {"label":"k48", "x":8.25, "y":4.5},
-                {"label":"k49", "x":9.25, "y":4.5},
-                {"label":"k4a", "x":10.25, "y":4.5},
-                {"label":"k4b", "x":11.25, "y":4.5},
-                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"k4f", "x":16.25, "y":4.5},
-                
-                {"label":"k50", "x":0, "y":5.5, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
-                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"k5e", "x":15.25, "y":5.5},
-                {"label":"k5f", "x":16.25, "y":5.5},
-                {"label":"k5g", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6.5, "y":0},
-                {"label":"k07", "x":7.5, "y":0},
-                {"label":"k08", "x":8.5, "y":0},
-                {"label":"k09", "x":9.5, "y":0},
-                {"label":"k0a", "x":11, "y":0},
-                {"label":"k0b", "x":12, "y":0},
-                {"label":"k0c", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15.25, "y":0},
-                {"label":"k0f", "x":16.25, "y":0},
-                {"label":"k0g", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.5},
-                {"label":"k13", "x":3, "y":1.5},
-                {"label":"k14", "x":4, "y":1.5},
-                {"label":"k15", "x":5, "y":1.5},
-                {"label":"k16", "x":6, "y":1.5},
-                {"label":"k17", "x":7, "y":1.5},
-                {"label":"k18", "x":8, "y":1.5},
-                {"label":"k19", "x":9, "y":1.5},
-                {"label":"k1a", "x":10, "y":1.5},
-                {"label":"k1b", "x":11, "y":1.5},
-                {"label":"k1c", "x":12, "y":1.5},
-                {"label":"k1d", "x":13, "y":1.5, "w":2},
-                {"label":"k1e", "x":15.25, "y":1.5},
-                {"label":"k1f", "x":16.25, "y":1.5},
-                {"label":"k1g", "x":17.25, "y":1.5},
-                
-                {"label":"k20", "x":0, "y":2.5, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.5},
-                {"label":"k22", "x":2.5, "y":2.5},
-                {"label":"k23", "x":3.5, "y":2.5},
-                {"label":"k24", "x":4.5, "y":2.5},
-                {"label":"k25", "x":5.5, "y":2.5},
-                {"label":"k26", "x":6.5, "y":2.5},
-                {"label":"k27", "x":7.5, "y":2.5},
-                {"label":"k28", "x":8.5, "y":2.5},
-                {"label":"k29", "x":9.5, "y":2.5},
-                {"label":"k2a", "x":10.5, "y":2.5},
-                {"label":"k2b", "x":11.5, "y":2.5},
-                {"label":"k2c", "x":12.5, "y":2.5},
-                {"label":"k2d", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"k2e", "x":15.25, "y":2.5},
-                {"label":"k2f", "x":16.25, "y":2.5},
-                {"label":"k2g", "x":17.25, "y":2.5},
-                
-                {"label":"k30", "x":0, "y":3.5, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.5},
-                {"label":"k32", "x":2.75, "y":3.5},
-                {"label":"k33", "x":3.75, "y":3.5},
-                {"label":"k34", "x":4.75, "y":3.5},
-                {"label":"k35", "x":5.75, "y":3.5},
-                {"label":"k36", "x":6.75, "y":3.5},
-                {"label":"k37", "x":7.75, "y":3.5},
-                {"label":"k38", "x":8.75, "y":3.5},
-                {"label":"k39", "x":9.75, "y":3.5},
-                {"label":"k3a", "x":10.75, "y":3.5},
-                {"label":"k3b", "x":11.75, "y":3.5},
-                {"label":"k3d", "x":12.75, "y":3.5, "w":2.25},
-                
-                {"label":"k40", "x":0, "y":4.5, "w":2.25},
-                {"label":"k42", "x":2.25, "y":4.5},
-                {"label":"k43", "x":3.25, "y":4.5},
-                {"label":"k44", "x":4.25, "y":4.5},
-                {"label":"k45", "x":5.25, "y":4.5},
-                {"label":"k46", "x":6.25, "y":4.5},
-                {"label":"k47", "x":7.25, "y":4.5},
-                {"label":"k48", "x":8.25, "y":4.5},
-                {"label":"k49", "x":9.25, "y":4.5},
-                {"label":"k4a", "x":10.25, "y":4.5},
-                {"label":"k4b", "x":11.25, "y":4.5},
-                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"k4f", "x":16.25, "y":4.5},
-                
-                {"label":"k50", "x":0, "y":5.5, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
-                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"k5e", "x":15.25, "y":5.5},
-                {"label":"k5f", "x":16.25, "y":5.5},
-                {"label":"k5g", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/nt750/nt750.h b/keyboards/evyd13/nt750/nt750.h
deleted file mode 100644
index 15b6e459b9..0000000000
--- a/keyboards/evyd13/nt750/nt750.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is 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 LAYOUT_all( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,                \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}