Move 66% and 68% layouts to data driven (#20293)

2 files changed, 224 insertions, 268 deletions

diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json
index 2fabf5d47b..07d292728b 100644
--- a/keyboards/keebio/tragicforce68/info.json
+++ b/keyboards/keebio/tragicforce68/info.json
@@ -21,238 +21,253 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["68_ansi"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_68_ansi"
+  },
   "layouts": {
     "LAYOUT_68_ansi": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":6, "y":0},
-        {"label":"&", "x":7, "y":0},
-        {"label":"*", "x":8, "y":0},
-        {"label":"(", "x":9, "y":0},
-        {"label":")", "x":10, "y":0},
-        {"label":"_", "x":11, "y":0},
-        {"label":"+", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [4, 0], "x": 8, "y": 0},
+        {"matrix": [4, 1], "x": 9, "y": 0},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 4], "x": 12, "y": 0},
+        {"matrix": [4, 5], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [4, 6], "x": 15.25, "y": 0},
+        {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 1},
+        {"matrix": [5, 7], "x": 16.25, "y": 1},
 
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":" {", "x":11.5, "y":1},
-        {"label":"}", "x":12.5, "y":1},
-        {"label":"|", "x":13.5, "y":1, "w":1.5},
-        {"x":15.25, "y":1},
-        {"x":16.25, "y":1},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [6, 0], "x": 8.75, "y": 2},
+        {"matrix": [6, 1], "x": 9.75, "y": 2},
+        {"matrix": [6, 2], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 4], "x": 12.75, "y": 2, "w": 2.25},
 
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":":", "x":10.75, "y":2},
-        {"label":"\"", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [7, 0], "x": 9.25, "y": 3},
+        {"matrix": [7, 1], "x": 10.25, "y": 3},
+        {"matrix": [7, 2], "x": 11.25, "y": 3},
+        {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
 
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":"<", "x":9.25, "y":3},
-        {"label":">", "x":10.25, "y":3},
-        {"label":"?", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"x":15.25, "y":3},
+        {"matrix": [7, 4], "x": 15.25, "y": 3},
 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":6.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"x":14.25, "y":4},
-        {"x":15.25, "y":4},
-        {"x":16.25, "y":4}
+        {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [8, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [6, 5], "x": 14.25, "y": 4},
+        {"matrix": [6, 6], "x": 15.25, "y": 4},
+        {"matrix": [6, 7], "x": 16.25, "y": 4}
       ]
     },
     "LAYOUT_split_space": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":6, "y":0},
-        {"label":"&", "x":7, "y":0},
-        {"label":"*", "x":8, "y":0},
-        {"label":"(", "x":9, "y":0},
-        {"label":")", "x":10, "y":0},
-        {"label":"_", "x":11, "y":0},
-        {"label":"+", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [4, 0], "x": 8, "y": 0},
+        {"matrix": [4, 1], "x": 9, "y": 0},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 4], "x": 12, "y": 0},
+        {"matrix": [4, 5], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [4, 6], "x": 15.25, "y": 0},
+        {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
 
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":" {", "x":11.5, "y":1},
-        {"label":"}", "x":12.5, "y":1},
-        {"label":"|", "x":13.5, "y":1, "w":1.5},
-        {"x":15.25, "y":1},
-        {"x":16.25, "y":1},
+        {"matrix": [5, 6], "x": 15.25, "y": 1},
+        {"matrix": [5, 7], "x": 16.25, "y": 1},
 
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":":", "x":10.75, "y":2},
-        {"label":"\"", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [6, 0], "x": 8.75, "y": 2},
+        {"matrix": [6, 1], "x": 9.75, "y": 2},
+        {"matrix": [6, 2], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 4], "x": 12.75, "y": 2, "w": 2.25},
 
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":"<", "x":9.25, "y":3},
-        {"label":">", "x":10.25, "y":3},
-        {"label":"?", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"x":15.25, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [7, 0], "x": 9.25, "y": 3},
+        {"matrix": [7, 1], "x": 10.25, "y": 3},
+        {"matrix": [7, 2], "x": 11.25, "y": 3},
+        {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.25},
-        {"x":6, "y":4, "w":1.75},
-        {"x":7.75, "y":4, "w":2.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"x":14.25, "y":4},
-        {"x":15.25, "y":4},
-        {"x":16.25, "y":4}
+        {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+        {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 4], "x": 6, "y": 4, "w": 1.75},
+        {"matrix": [8, 5], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [6, 5], "x": 14.25, "y": 4},
+        {"matrix": [6, 6], "x": 15.25, "y": 4},
+        {"matrix": [6, 7], "x": 16.25, "y": 4}
       ]
     },
     "LAYOUT_split_space_and_backspace": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":6, "y":0},
-        {"label":"&", "x":7, "y":0},
-        {"label":"*", "x":8, "y":0},
-        {"label":"(", "x":9, "y":0},
-        {"label":")", "x":10, "y":0},
-        {"label":"_", "x":11, "y":0},
-        {"label":"+", "x":12, "y":0},
-        {"label":"Del", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [4, 0], "x": 8, "y": 0},
+        {"matrix": [4, 1], "x": 9, "y": 0},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 4], "x": 12, "y": 0},
+        {"matrix": [4, 5], "x": 13, "y": 0},
+        {"matrix": [7, 6], "x": 14, "y": 0},
+
+        {"matrix": [4, 6], "x": 15.25, "y": 0},
+        {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 1},
+        {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [6, 0], "x": 8.75, "y": 2},
+        {"matrix": [6, 1], "x": 9.75, "y": 2},
+        {"matrix": [6, 2], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 4], "x": 12.75, "y": 2, "w": 2.25},
 
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":" {", "x":11.5, "y":1},
-        {"label":"}", "x":12.5, "y":1},
-        {"label":"|", "x":13.5, "y":1, "w":1.5},
-        {"x":15.25, "y":1},
-        {"x":16.25, "y":1},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [7, 0], "x": 9.25, "y": 3},
+        {"matrix": [7, 1], "x": 10.25, "y": 3},
+        {"matrix": [7, 2], "x": 11.25, "y": 3},
+        {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
 
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":":", "x":10.75, "y":2},
-        {"label":"\"", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [7, 4], "x": 15.25, "y": 3},
 
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":"<", "x":9.25, "y":3},
-        {"label":">", "x":10.25, "y":3},
-        {"label":"?", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"x":15.25, "y":3},
+        {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 4], "x": 6, "y": 4, "w": 1.75},
+        {"matrix": [8, 5], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.25},
-        {"x":6, "y":4, "w":1.75},
-        {"x":7.75, "y":4, "w":2.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"x":14.25, "y":4},
-        {"x":15.25, "y":4},
-        {"x":16.25, "y":4}
+        {"matrix": [6, 5], "x": 14.25, "y": 4},
+        {"matrix": [6, 6], "x": 15.25, "y": 4},
+        {"matrix": [6, 7], "x": 16.25, "y": 4}
       ]
     }
   }
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.h b/keyboards/keebio/tragicforce68/tragicforce68.h
deleted file mode 100644
index a177f52816..0000000000
--- a/keyboards/keebio/tragicforce68/tragicforce68.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-    A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6,     E7, E8, \
-    B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6,     F7, F8, \
-    C1,  C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4,    G5, \
-    D1,   D2, D3, D4, D5, D6, D7, D8, H1, H2, H3,      H4,      H5, \
-    J1,  J2,  J3,          J5,           J7,   J8,   H6,    G6, G7, G8 \
-) { \
-    { A1, A2, A3, A4, A5, A6, A7, A8 }, \
-    { B1, B2, B3, B4, B5, B6, B7, B8 }, \
-    { C1, C2, C3, C4, C5, C6, C7, C8 }, \
-    { D1, D2, D3, D4, D5, D6, D7, D8 }, \
-    { E1, E2, E3, E4, E5, E6, E7, E8 }, \
-    { F1, F2, F3, F4, F5, F6, F7, F8 }, \
-    { G1, G2, G3, G4, G5, G6, G7, G8 }, \
-    { H1, H2, H3, H4, H5, H6, KC_NO, KC_NO }, \
-    { J1, J2, J3, KC_NO, J5, KC_NO, J7, J8 } \
-}
-
-#define LAYOUT_split_space( \
-    A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6,     E7, E8, \
-    B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6,     F7, F8, \
-    C1,  C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4,    G5, \
-    D1,   D2, D3, D4, D5, D6, D7, D8, H1, H2, H3,      H4,      H5, \
-    J1,  J2,  J3,    J4,    J5,   J6,    J7,   J8,   H6,    G6, G7, G8 \
-) { \
-    { A1, A2, A3, A4, A5, A6, A7, A8 }, \
-    { B1, B2, B3, B4, B5, B6, B7, B8 }, \
-    { C1, C2, C3, C4, C5, C6, C7, C8 }, \
-    { D1, D2, D3, D4, D5, D6, D7, D8 }, \
-    { E1, E2, E3, E4, E5, E6, E7, E8 }, \
-    { F1, F2, F3, F4, F5, F6, F7, F8 }, \
-    { G1, G2, G3, G4, G5, G6, G7, G8 }, \
-    { H1, H2, H3, H4, H5, H6, KC_NO, KC_NO }, \
-    { J1, J2, J3, J4, J5, J6, J7, J8 } \
-}
-
-#define LAYOUT_split_space_and_backspace( \
-    A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6, H7, E7, E8, \
-    B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6,     F7, F8, \
-    C1,  C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4,    G5, \
-    D1,   D2, D3, D4, D5, D6, D7, D8, H1, H2, H3,      H4,      H5, \
-    J1,  J2,  J3,    J4,    J5,   J6,    J7,   J8,   H6,    G6, G7, G8 \
-) { \
-    { A1, A2, A3, A4, A5, A6, A7, A8 }, \
-    { B1, B2, B3, B4, B5, B6, B7, B8 }, \
-    { C1, C2, C3, C4, C5, C6, C7, C8 }, \
-    { D1, D2, D3, D4, D5, D6, D7, D8 }, \
-    { E1, E2, E3, E4, E5, E6, E7, E8 }, \
-    { F1, F2, F3, F4, F5, F6, F7, F8 }, \
-    { G1, G2, G3, G4, G5, G6, G7, G8 }, \
-    { H1, H2, H3, H4, H5, H6, H7, KC_NO }, \
-    { J1, J2, J3, J4, J5, J6, J7, J8 } \
-}
-
-#define LAYOUT LAYOUT_68_ansi