Move split space/backspace layouts to data driven (#20356)

3 files changed, 325 insertions, 364 deletions

diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json
index be4e1b676a..191621ff47 100644
--- a/keyboards/hineybush/physix/info.json
+++ b/keyboards/hineybush/physix/info.json
@@ -25,294 +25,342 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"~", "x":16.25, "y":0.25},
-                {"label":"Back", "x":17.25, "y":0.25},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2},
-                {"x":11, "y":4.25},
-                {"label":"Right Alt", "x":12, "y":4.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 12], "x": 16.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 17.25, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_split_bksp_275_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"~", "x":16.25, "y":0.25},
-                {"label":"Back", "x":17.25, "y":0.25},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2.75},
-                {"label":"Right Alt", "x":11.75, "y":4.25, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 12], "x": 16.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 17.25, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_full_bksp_275_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"Back", "x":16.25, "y":0.25, "w":2},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2.75},
-                {"label":"Right Alt", "x":11.75, "y":4.25, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_full_bksp_200_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"Back", "x":16.25, "y":0.25, "w":2},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2},
-                {"x":11, "y":4.25},
-                {"label":"Right Alt", "x":12, "y":4.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/hineybush/physix/physix.c b/keyboards/hineybush/physix/physix.c
index 99614aeb78..c118b30d2e 100644
--- a/keyboards/hineybush/physix/physix.c
+++ b/keyboards/hineybush/physix/physix.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "physix.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/hineybush/physix/physix.h b/keyboards/hineybush/physix/physix.h
deleted file mode 100644
index c081a53806..0000000000
--- a/keyboards/hineybush/physix/physix.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2019 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This 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( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k408, k409,       k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, k012, k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,k408, k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_split_bksp_275_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k409,       k410,       k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, k012, k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,KC_NO,k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_full_bksp_275_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011,       k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,             k409, k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, KC_NO,k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,KC_NO,k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_full_bksp_200_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011,       k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k408, k409, k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, KC_NO,k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,k408, k409 ,k410, k411, k412, k413, KC_NO}  \
-}