Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

2 files changed, 203 insertions, 92 deletions

diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json
index 6a161c0db0..3552435786 100644
--- a/keyboards/terrazzo/info.json
+++ b/keyboards/terrazzo/info.json
@@ -25,34 +25,221 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Control", "x":2.5, "y":1, "w":1.25}, {"label":"A", "x":3.75, "y":1}, {"label":"S", "x":4.75, "y":1}, {"label":"D", "x":5.75, "y":1}, {"label":"F", "x":6.75, "y":1}, {"label":"G", "x":7.75, "y":1}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":"Enter", "x":12.75, "y":1, "w":1.75},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2, "w":1.75}, {"label":"Z", "x":4.25, "y":2}, {"label":"X", "x":5.25, "y":2}, {"label":"C", "x":6.25, "y":2}, {"label":"V", "x":7.25, "y":2}, {"label":"B", "x":8.25, "y":2}, {"label":"N", "x":9.25, "y":2}, {"label":"M", "x":10.25, "y":2}, {"label":"<", "x":11.25, "y":2}, {"label":">", "x":12.25, "y":2}, {"label":"Shift", "x":13.25, "y":2, "w":1.25},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Win", "x":3.5, "y":3}, {"label":"Alt", "x":4.5, "y":3, "w":1.5}, {"label":"Space", "x":6, "y":3, "w":2.25}, {"label":"Space", "x":8.25, "y":3, "w":2.75}, {"label":"Fn", "x":11, "y":3, "w":1.5}, {"label":"Fn1", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 0], "x": 7.5, "y": 0},
+                {"matrix": [7, 1], "x": 8.5, "y": 0},
+                {"matrix": [7, 2], "x": 9.5, "y": 0},
+                {"matrix": [7, 3], "x": 10.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [6, 0], "x": 7.75, "y": 1},
+                {"matrix": [6, 1], "x": 8.75, "y": 1},
+                {"matrix": [6, 2], "x": 9.75, "y": 1},
+                {"matrix": [6, 3], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [5, 5], "x": 12.75, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [5, 0], "x": 8.25, "y": 2},
+                {"matrix": [5, 1], "x": 9.25, "y": 2},
+                {"matrix": [5, 2], "x": 10.25, "y": 2},
+                {"matrix": [5, 3], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 8.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 2], "x": 11, "y": 3, "w": 1.5},
+                {"matrix": [4, 3], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_ortho": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Win", "x":3.5, "y":3}, {"label":"Alt", "x":4.5, "y":3}, {"label":"Lower", "x":5.5, "y":3}, {"label":"Space", "x":6.5, "y":3, "w":2}, {"label":"Space", "x":8.5, "y":3, "w":2}, {"label":"Raise", "x":10.5, "y":3}, {"label":"Nav", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 0], "x": 7.5, "y": 0},
+                {"matrix": [7, 1], "x": 8.5, "y": 0},
+                {"matrix": [7, 2], "x": 9.5, "y": 0},
+                {"matrix": [7, 3], "x": 10.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [4, 3], "x": 11.5, "y": 2},
+                {"matrix": [4, 4], "x": 12.5, "y": 2},
+                {"matrix": [4, 5], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 2},
+                {"matrix": [4, 0], "x": 10.5, "y": 3},
+                {"matrix": [4, 1], "x": 11.5, "y": 3},
+                {"matrix": [4, 2], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_ortho_mit": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Tab", "x":3.5, "y":3}, {"label":"Win", "x":4.5, "y":3}, {"label":"Alt", "x":5.5, "y":3}, {"label":"Lower", "x":6.5, "y":3}, {"label":"Space", "x":7.5, "y":3, "w":2}, {"label":"Raise", "x":9.5, "y":3}, {"label":"Nav", "x":10.5, "y":3}, {"label":"Fn", "x":11.5, "y":3}, {"label":"Del", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 0], "x": 7.5, "y": 0},
+                {"matrix": [7, 1], "x": 8.5, "y": 0},
+                {"matrix": [7, 2], "x": 9.5, "y": 0},
+                {"matrix": [7, 3], "x": 10.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [4, 3], "x": 11.5, "y": 2},
+                {"matrix": [4, 4], "x": 12.5, "y": 2},
+                {"matrix": [4, 5], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [8, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [8, 5], "x": 9.5, "y": 3},
+                {"matrix": [4, 0], "x": 10.5, "y": 3},
+                {"matrix": [4, 1], "x": 11.5, "y": 3},
+                {"matrix": [4, 2], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_ortho_all": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Tab", "x":3.5, "y":3}, {"label":"Win", "x":4.5, "y":3}, {"label":"Alt", "x":5.5, "y":3}, {"label":"Lower", "x":6.5, "y":3}, {"label":"Space", "x":7.5, "y":3}, {"label":"Space", "x":8.5, "y":3}, {"label":"Raise", "x":9.5, "y":3}, {"label":"Nav", "x":10.5, "y":3}, {"label":"Fn", "x":11.5, "y":3}, {"label":"Del", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 0], "x": 7.5, "y": 0},
+                {"matrix": [7, 1], "x": 8.5, "y": 0},
+                {"matrix": [7, 2], "x": 9.5, "y": 0},
+                {"matrix": [7, 3], "x": 10.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [4, 3], "x": 11.5, "y": 2},
+                {"matrix": [4, 4], "x": 12.5, "y": 2},
+                {"matrix": [4, 5], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [8, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 4], "x": 7.5, "y": 3},
+                {"matrix": [3, 5], "x": 8.5, "y": 3},
+                {"matrix": [8, 5], "x": 9.5, "y": 3},
+                {"matrix": [4, 0], "x": 10.5, "y": 3},
+                {"matrix": [4, 1], "x": 11.5, "y": 3},
+                {"matrix": [4, 2], "x": 12.5, "y": 3}
             ]
         }
     }
diff --git a/keyboards/terrazzo/terrazzo.h b/keyboards/terrazzo/terrazzo.h
index 85b35e3050..c27a372088 100644
--- a/keyboards/terrazzo/terrazzo.h
+++ b/keyboards/terrazzo/terrazzo.h
@@ -18,82 +18,6 @@
 
 #include "quantum.h"
 
-/* Default staggered layout
-   Bottom row: 1u 1.5u 2.25u 2.75u 1.5u 1u */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K45, \
-    K30, K31, K32, K33, K40, K42, K43 \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, KC_NO, KC_NO,},\
-    { K40, KC_NO, K42, K43, KC_NO, K45,},\
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, }    \
-}
-
-/* Default ortho layout
-   Bottom row: 1u 1u 1u 2u 2u 1u 1u 1u */
-#define LAYOUT_ortho( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \
-    K30,      K31, K32, K33, K34, K35, K40, K41, K42  \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, K34, K35,},    \
-    { K40, K41, K42, K43, K44, K45,},    \
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, },    \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, } \
-}
-
-/* MIT ortho layout
-   Bottom row: 1u 1u 1u 1u 2u 1u 1u 1u 1u */
-#define LAYOUT_ortho_mit( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \
-    K30,      K31, K32, K33, K84,   K35,    K85, K40, K41, K42  \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, KC_NO, K35,},    \
-    { K40, K41, K42, K43, K44, K45,},    \
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, },    \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K84, K85, } \
-}
-
-/* All 1u ortho layout
-   Bottom row: 1u 1u 1u 1u 1u 1u 1u 1u 1u 1u */
-#define LAYOUT_ortho_all( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \
-    K30,      K31, K32, K33, K84, K34, K35, K85, K40, K41, K42  \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, K34, K35,},    \
-    { K40, K41, K42, K43, K44, K45,},    \
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, },    \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K84, K85, } \
-}
-
-
 enum terrazzo_matrix_effects {
     TERRAZZO_NONE = 0,
 // --------------------------------------