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

2 files changed, 205 insertions, 274 deletions

diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
index da406586fd..bf985f6202 100644
--- a/keyboards/rect44/info.json
+++ b/keyboards/rect44/info.json
@@ -21,221 +21,223 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1.5, "y":0},
-                {"label":"W", "x":2.5, "y":0},
-                {"label":"E", "x":3.5, "y":0},
-                {"label":"R", "x":4.5, "y":0},
-                {"label":"T", "x":5.5, "y":0},
-                {"label":"Y", "x":6.5, "y":0},
-                {"label":"U", "x":7.5, "y":0},
-                {"label":"I", "x":8.5, "y":0},
-                {"label":"O", "x":9.5, "y":0},
-                {"label":"P", "x":10.5, "y":0},
-                {"label":"-", "x":11.5, "y":0},
-                {"label":"Backspace", "x":12.5, "y":0, "w":1.5},
-
-                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
-                {"label":"A", "x":1.75, "y":1},
-                {"label":"S", "x":2.75, "y":1},
-                {"label":"D", "x":3.75, "y":1},
-                {"label":"F", "x":4.75, "y":1},
-                {"label":"G", "x":5.75, "y":1},
-                {"label":"H", "x":6.75, "y":1},
-                {"label":"J", "x":7.75, "y":1},
-                {"label":"K", "x":8.75, "y":1},
-                {"label":"L", "x":9.75, "y":1},
-                {"label":";", "x":10.75, "y":1},
-                {"label":"'", "x":11.75, "y":1},
-                {"label":"Enter", "x":12.75, "y":1, "w":1.25},
-
-                {"label":"Shift", "x":0, "y":2, "w":1.25},
-                {"label":"\\", "x":1.25, "y":2},
-                {"label":"Z", "x":2.25, "y":2},
-                {"label":"X", "x":3.25, "y":2},
-                {"label":"C", "x":4.25, "y":2},
-                {"label":"V", "x":5.25, "y":2},
-                {"label":"B", "x":6.25, "y":2},
-                {"label":"N", "x":7.25, "y":2},
-                {"label":"M", "x":8.25, "y":2},
-                {"label":",", "x":9.25, "y":2},
-                {"label":".", "x":10.25, "y":2},
-                {"label":"/", "x":11.25, "y":2},
-                {"label":"Shift", "x":12.25, "y":2, "w":1.75},
-
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":3, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
-                {"label":"Fn1 (2.25u)", "x":3.75, "y":3, "w":1.75},
-                {"label":"6.25u Space", "x":5.5, "y":3, "w":1.5},
-                {"label":"Space (2.75u)", "x":7, "y":3, "w":1.75},
-                {"label":"Alt (1.25u)", "x":8.75, "y":3, "w":1.25},
-                {"label":"Left", "x":10, "y":3},
-                {"label":"Down", "x":11, "y":3},
-                {"label":"Up", "x":12, "y":3},
-                {"label":"Right", "x":13, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.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": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 7, "y": 3, "w": 1.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3}
             ]
         },
         "LAYOUT_ansi_47key": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1.5, "y":0},
-                {"label":"W", "x":2.5, "y":0},
-                {"label":"E", "x":3.5, "y":0},
-                {"label":"R", "x":4.5, "y":0},
-                {"label":"T", "x":5.5, "y":0},
-                {"label":"Y", "x":6.5, "y":0},
-                {"label":"U", "x":7.5, "y":0},
-                {"label":"I", "x":8.5, "y":0},
-                {"label":"O", "x":9.5, "y":0},
-                {"label":"P", "x":10.5, "y":0},
-                {"label":"-", "x":11.5, "y":0},
-                {"label":"Bs", "x":12.5, "y":0, "w":1.5},
-
-                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
-                {"label":"A", "x":1.75, "y":1},
-                {"label":"S", "x":2.75, "y":1},
-                {"label":"D", "x":3.75, "y":1},
-                {"label":"F", "x":4.75, "y":1},
-                {"label":"G", "x":5.75, "y":1},
-                {"label":"H", "x":6.75, "y":1},
-                {"label":"J", "x":7.75, "y":1},
-                {"label":"K", "x":8.75, "y":1},
-                {"label":"L", "x":9.75, "y":1},
-                {"label":";", "x":10.75, "y":1},
-                {"label":"Enter", "x":11.75, "y":1, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":2, "w":2.25},
-                {"label":"Z", "x":2.25, "y":2},
-                {"label":"X", "x":3.25, "y":2},
-                {"label":"C", "x":4.25, "y":2},
-                {"label":"V", "x":5.25, "y":2},
-                {"label":"B", "x":6.25, "y":2},
-                {"label":"N", "x":7.25, "y":2},
-                {"label":"M", "x":8.25, "y":2},
-                {"label":",", "x":9.25, "y":2},
-                {"label":".", "x":10.25, "y":2},
-                {"label":"/", "x":11.25, "y":2},
-                {"label":"Shift", "x":12.25, "y":2, "w":1.75},
-
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
-                {"label":"Gui", "x":1.25, "y":3, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
-                {"label":"Fn1", "x":3.75, "y":3, "w":2.25},
-                {"label":"Space", "x":6, "y":3, "w":2.75},
-                {"label":"Alt", "x":8.75, "y":3, "w":1.25},
-                {"label":"Fn2", "x":10, "y":3},
-                {"label":"\u2190", "x":11, "y":3},
-                {"label":"\u2193", "x":12, "y":3},
-                {"label":"\u2192", "x":13, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.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": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 12], "x": 11.75, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3}
             ]
         },
-
         "LAYOUT_ansi_44key": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1.5, "y":0},
-                {"label":"W", "x":2.5, "y":0},
-                {"label":"E", "x":3.5, "y":0},
-                {"label":"R", "x":4.5, "y":0},
-                {"label":"T", "x":5.5, "y":0},
-                {"label":"Y", "x":6.5, "y":0},
-                {"label":"U", "x":7.5, "y":0},
-                {"label":"I", "x":8.5, "y":0},
-                {"label":"O", "x":9.5, "y":0},
-                {"label":"P", "x":10.5, "y":0},
-                {"label":"-", "x":11.5, "y":0},
-                {"label":"Bs", "x":12.5, "y":0, "w":1.5},
-
-                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
-                {"label":"A", "x":1.75, "y":1},
-                {"label":"S", "x":2.75, "y":1},
-                {"label":"D", "x":3.75, "y":1},
-                {"label":"F", "x":4.75, "y":1},
-                {"label":"G", "x":5.75, "y":1},
-                {"label":"H", "x":6.75, "y":1},
-                {"label":"J", "x":7.75, "y":1},
-                {"label":"K", "x":8.75, "y":1},
-                {"label":"L", "x":9.75, "y":1},
-                {"label":";", "x":10.75, "y":1},
-                {"label":"Enter", "x":11.75, "y":1, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":2, "w":2.25},
-                {"label":"Z", "x":2.25, "y":2},
-                {"label":"X", "x":3.25, "y":2},
-                {"label":"C", "x":4.25, "y":2},
-                {"label":"V", "x":5.25, "y":2},
-                {"label":"B", "x":6.25, "y":2},
-                {"label":"N", "x":7.25, "y":2},
-                {"label":"M", "x":8.25, "y":2},
-                {"label":",", "x":9.25, "y":2},
-                {"label":".", "x":10.25, "y":2},
-                {"label":"Shift", "x":11.25, "y":2, "w":2.75},
-
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
-                {"label":"Gui", "x":1.25, "y":3, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
-                {"label":"Space", "x":3.75, "y":3, "w":6.25},
-                {"label":"\u2190", "x":10, "y":3},
-                {"label":"\u2193", "x":11, "y":3},
-                {"label":"\u2191", "x":12, "y":3},
-                {"label":"\u2192", "x":13, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.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": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 12], "x": 11.75, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 12], "x": 11.25, "y": 2, "w": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3}
             ]
         },
-
         "LAYOUT_iso_48key": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1.5, "y":0},
-                {"label":"W", "x":2.5, "y":0},
-                {"label":"E", "x":3.5, "y":0},
-                {"label":"R", "x":4.5, "y":0},
-                {"label":"T", "x":5.5, "y":0},
-                {"label":"Y", "x":6.5, "y":0},
-                {"label":"U", "x":7.5, "y":0},
-                {"label":"I", "x":8.5, "y":0},
-                {"label":"O", "x":9.5, "y":0},
-                {"label":"P", "x":10.5, "y":0},
-                {"label":"Bs", "x":11.5, "y":0},
-                {"label":"Enter", "x":12.75, "y":0, "w":1.25, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
-                {"label":"A", "x":1.75, "y":1},
-                {"label":"S", "x":2.75, "y":1},
-                {"label":"D", "x":3.75, "y":1},
-                {"label":"F", "x":4.75, "y":1},
-                {"label":"G", "x":5.75, "y":1},
-                {"label":"H", "x":6.75, "y":1},
-                {"label":"J", "x":7.75, "y":1},
-                {"label":"K", "x":8.75, "y":1},
-                {"label":"L", "x":9.75, "y":1},
-                {"label":";", "x":10.75, "y":1},
-                {"label":"'", "x":11.75, "y":1},
-
-                {"label":"Shift", "x":0, "y":2, "w":1.25},
-                {"label":"", "x":1.25, "y":2},
-                {"label":"Z", "x":2.25, "y":2},
-                {"label":"X", "x":3.25, "y":2},
-                {"label":"C", "x":4.25, "y":2},
-                {"label":"V", "x":5.25, "y":2},
-                {"label":"B", "x":6.25, "y":2},
-                {"label":"N", "x":7.25, "y":2},
-                {"label":"M", "x":8.25, "y":2},
-                {"label":",", "x":9.25, "y":2},
-                {"label":".", "x":10.25, "y":2},
-                {"label":"/", "x":11.25, "y":2},
-                {"label":"Shift", "x":12.25, "y":2, "w":1.75},
-
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
-                {"label":"Gui", "x":1.25, "y":3, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
-                {"label":"Fn1", "x":3.75, "y":3, "w":2.25},
-                {"label":"Space", "x":6, "y":3, "w":2.75},
-                {"label":"Alt", "x":8.75, "y":3, "w":1.25},
-                {"label":"Fn2", "x":10, "y":3},
-                {"label":"\u2190", "x":11, "y":3},
-                {"label":"\u2193", "x":12, "y":3},
-                {"label":"\u2192", "x":13, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.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": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [1, 0], "x": 12.75, "y": 0, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 2], "x": 1.75, "y": 1},
+                {"matrix": [1, 3], "x": 2.75, "y": 1},
+                {"matrix": [1, 4], "x": 3.75, "y": 1},
+                {"matrix": [1, 5], "x": 4.75, "y": 1},
+                {"matrix": [1, 6], "x": 5.75, "y": 1},
+                {"matrix": [1, 7], "x": 6.75, "y": 1},
+                {"matrix": [1, 8], "x": 7.75, "y": 1},
+                {"matrix": [1, 9], "x": 8.75, "y": 1},
+                {"matrix": [1, 10], "x": 9.75, "y": 1},
+                {"matrix": [1, 11], "x": 10.75, "y": 1},
+                {"matrix": [1, 12], "x": 11.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3}
             ]
         }
     }
diff --git a/keyboards/rect44/rect44.h b/keyboards/rect44/rect44.h
deleted file mode 100644
index 3de310754f..0000000000
--- a/keyboards/rect44/rect44.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020-2021 koshinoya
- *
- * 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_all( \
-      A00, A01, A02, A03, A04,   A05, A06, A07,   A08, A09, A10, A11, A12, \
-      B00, B01, B02, B03, B04,   B05, B06, B07,   B08, B09, B10, B11, B12, \
-      C00, C01, C02, C03, C04,   C05, C06, C07,   C08, C09, C10, C11, C12, \
-      D00, D01, D02, D03,        D05, D06,        D08, D09, D10, D11, D12 \
-) \
-{ \
-    { A00, A01, A02, A03, A04,   A05, A06, A07,   A08, A09, A10, A11, A12 }, \
-    { B00, B01, B02, B03, B04,   B05, B06, B07,   B08, B09, B10, B11, B12 }, \
-    { C00, C01, C02, C03, C04,   C05, C06, C07,   C08, C09, C10, C11, C12 }, \
-    { D00, D01, D02, D03, KC_NO, D05, D06, KC_NO, D08, D09, D10, D11, D12 } \
-}
-
-#define LAYOUT_ansi_44key( \
-      A00, A01,   A02, A03,   A04,   A05, A06,   A07,   A08,   A09, A10, A11,   A12, \
-      B00, B01,   B02, B03,   B04,   B05, B06,   B07,   B08,   B09, B10,        B12, \
-      C00,        C02, C03,   C04,   C05, C06,   C07,   C08,   C09, C10,        C12, \
-      D00, D01,   D02,               D05,                      D09, D10, D11,   D12 \
-) \
-{ \
-    { A00, A01,   A02, A03,   A04,   A05, A06,   A07,   A08,   A09, A10, A11,   A12 }, \
-    { B00, B01,   B02, B03,   B04,   B05, B06,   B07,   B08,   B09, B10, KC_NO, B12 }, \
-    { C00, KC_NO, C02, C03,   C04,   C05, C06,   C07,   C08,   C09, C10, KC_NO, C12 }, \
-    { D00, D01,   D02, KC_NO, KC_NO, D05, KC_NO, KC_NO, KC_NO, D09, D10, D11,   D12 } \
-}
-
-#define LAYOUT_ansi_47key( \
-      A00, A01,   A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11,   A12, \
-      B00, B01,   B02, B03, B04,   B05,   B06, B07,   B08, B09, B10,        B12, \
-      C00,        C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11,   C12, \
-      D00, D01,   D02, D03,               D06,        D08, D09, D10, D11,   D12 \
-) \
-{ \
-    { A00, A01,   A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11,   A12 }, \
-    { B00, B01,   B02, B03, B04,   B05,   B06, B07,   B08, B09, B10, KC_NO, B12 }, \
-    { C00, KC_NO, C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11,   C12 }, \
-    { D00, D01,   D02, D03, KC_NO, KC_NO, D06, KC_NO, D08, D09, D10, D11,   D12 } \
-}
-
-#define LAYOUT_iso_48key( \
-      A00, A01, A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11,      \
-      B00, B01, B02, B03, B04,   B05,   B06, B07,   B08, B09, B10, B11, B12, \
-      C00, C01, C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11, C12, \
-      D00, D01, D02, D03,               D06,        D08, D09, D10, D11, D12 \
-) \
-{ \
-    { A00, A01, A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11, KC_NO }, \
-    { B00, B01, B02, B03, B04,   B05,   B06, B07,   B08, B09, B10, B11, B12   }, \
-    { C00, C01, C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11, C12   }, \
-    { D00, D01, D02, D03, KC_NO, KC_NO, D06, KC_NO, D08, D09, D10, D11, D12   } \
-}