Move 65% layouts to data driven (#20308)

2 files changed, 272 insertions, 347 deletions

diff --git a/keyboards/kkatano/bakeneko65/rev2/info.json b/keyboards/kkatano/bakeneko65/rev2/info.json
index 103efeef4e..fa20fc0fe2 100644
--- a/keyboards/kkatano/bakeneko65/rev2/info.json
+++ b/keyboards/kkatano/bakeneko65/rev2/info.json
@@ -19,306 +19,306 @@
     "layouts": {
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs_2_right_mods": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.5 },
-                { "x":11.5, "y":4, "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_2_right_mods": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.5 },
-                { "x":11.5, "y":4, "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kkatano/bakeneko65/rev2/rev2.h b/keyboards/kkatano/bakeneko65/rev2/rev2.h
deleted file mode 100644
index db2d5c14a6..0000000000
--- a/keyboards/kkatano/bakeneko65/rev2/rev2.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * 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_65_ansi_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409, k410, k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  k410,  k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409, k410, k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  k410,  k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi_split_bs_2_right_mods( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409,       k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi_2_right_mods( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409,       k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
-}