Move fullsize layouts to data driven (#20317)

2 files changed, 249 insertions, 66 deletions

diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
index 75d126eb50..659c6f3267 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/info.json
@@ -19,10 +19,257 @@
   "community_layouts": ["fullsize_ansi"],
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     },
     "LAYOUT_fullsize_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.h b/keyboards/bpiphany/tiger_lily/tiger_lily.h
deleted file mode 100644
index b1a872e215..0000000000
--- a/keyboards/bpiphany/tiger_lily/tiger_lily.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-
-/*
-  Matrix col/row mapping
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------. ,-------------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 | | K1 | L1 | Q1 | Q0 |
-  |-------------------------------------------------------------------------| |--------------| |-------------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 | | K5 | L5 | Q5 | O5 |
-  |-------------------------------------------------------------------------| '--------------' |--------------     |
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |                  | K2 | L2 | Q2 |    |
-  |-------------------------------------------------------------------------|      ,----.      |-------------------|
-  | N2      | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |      | K3 | L3 | Q3 | O3 |
-  |-------------------------------------------------------------------------| ,--------------. |--------------     |
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6      | Q6 |    |
-  `-------------------------------------------------------------------------' `--------------' `-------------------'
-*/
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}