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

2 files changed, 271 insertions, 108 deletions

diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 4cccec757c..13eacf7190 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -25,19 +25,283 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
-        },
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 8], "x": 7, "y": 0},
+                {"matrix": [7, 8], "x": 8, "y": 0},
+                {"matrix": [7, 1], "x": 9, "y": 0},
+                {"matrix": [4, 9], "x": 10, "y": 0},
+                {"matrix": [4, 8], "x": 11, "y": 0},
+                {"matrix": [4, 7], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [4, 10], "x": 14, "y": 0},
 
-        "LAYOUT_60_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [6, 2], "x": 6.5, "y": 1},
+                {"matrix": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [7, 7], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [3, 9], "x": 10.5, "y": 1},
+                {"matrix": [3, 8], "x": 11.5, "y": 1},
+                {"matrix": [3, 7], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"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": [6, 3], "x": 6.75, "y": 2},
+                {"matrix": [6, 6], "x": 7.75, "y": 2},
+                {"matrix": [7, 6], "x": 8.75, "y": 2},
+                {"matrix": [7, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "y": 3},
+                {"matrix": [1, 1], "x": 2.25, "y": 3},
+                {"matrix": [1, 2], "x": 3.25, "y": 3},
+                {"matrix": [1, 3], "x": 4.25, "y": 3},
+                {"matrix": [1, 4], "x": 5.25, "y": 3},
+                {"matrix": [1, 5], "x": 6.25, "y": 3},
+                {"matrix": [6, 4], "x": 7.25, "y": 3},
+                {"matrix": [6, 10], "x": 8.25, "y": 3},
+                {"matrix": [7, 10], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [1, 9], "x": 11.25, "y": 3},
+                {"matrix": [1, 8], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 4], "x": 14, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [0, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [0, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 9], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 5], "x": 13.75, "y": 4, "w": 1.25}
+            ]
         },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 8], "x": 7, "y": 0},
+                {"matrix": [7, 8], "x": 8, "y": 0},
+                {"matrix": [7, 1], "x": 9, "y": 0},
+                {"matrix": [4, 9], "x": 10, "y": 0},
+                {"matrix": [4, 8], "x": 11, "y": 0},
+                {"matrix": [4, 7], "x": 12, "y": 0},
+                {"matrix": [4, 10], "x": 13, "y": 0, "w": 2},
 
-        "LAYOUT_60_hhkb": {
-            "layout": [{"label":"Esc", "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"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":"Delete", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "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}, {"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":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Os", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Os", "x":12.5, "y":4}]
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [6, 2], "x": 6.5, "y": 1},
+                {"matrix": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [7, 7], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [3, 9], "x": 10.5, "y": 1},
+                {"matrix": [3, 8], "x": 11.5, "y": 1},
+                {"matrix": [3, 7], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"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": [6, 3], "x": 6.75, "y": 2},
+                {"matrix": [6, 6], "x": 7.75, "y": 2},
+                {"matrix": [7, 6], "x": 8.75, "y": 2},
+                {"matrix": [7, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 3},
+                {"matrix": [1, 2], "x": 3.25, "y": 3},
+                {"matrix": [1, 3], "x": 4.25, "y": 3},
+                {"matrix": [1, 4], "x": 5.25, "y": 3},
+                {"matrix": [1, 5], "x": 6.25, "y": 3},
+                {"matrix": [6, 4], "x": 7.25, "y": 3},
+                {"matrix": [6, 10], "x": 8.25, "y": 3},
+                {"matrix": [7, 10], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [1, 9], "x": 11.25, "y": 3},
+                {"matrix": [1, 8], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [0, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [0, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 9], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 5], "x": 13.75, "y": 4, "w": 1.25}
+            ]
         },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 8], "x": 7, "y": 0},
+                {"matrix": [7, 8], "x": 8, "y": 0},
+                {"matrix": [7, 1], "x": 9, "y": 0},
+                {"matrix": [4, 9], "x": 10, "y": 0},
+                {"matrix": [4, 8], "x": 11, "y": 0},
+                {"matrix": [4, 7], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [4, 10], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [6, 2], "x": 6.5, "y": 1},
+                {"matrix": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [7, 7], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [3, 9], "x": 10.5, "y": 1},
+                {"matrix": [3, 8], "x": 11.5, "y": 1},
+                {"matrix": [3, 7], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"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": [6, 3], "x": 6.75, "y": 2},
+                {"matrix": [6, 6], "x": 7.75, "y": 2},
+                {"matrix": [7, 6], "x": 8.75, "y": 2},
+                {"matrix": [7, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
 
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 3},
+                {"matrix": [1, 2], "x": 3.25, "y": 3},
+                {"matrix": [1, 3], "x": 4.25, "y": 3},
+                {"matrix": [1, 4], "x": 5.25, "y": 3},
+                {"matrix": [1, 5], "x": 6.25, "y": 3},
+                {"matrix": [6, 4], "x": 7.25, "y": 3},
+                {"matrix": [6, 10], "x": 8.25, "y": 3},
+                {"matrix": [7, 10], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [1, 9], "x": 11.25, "y": 3},
+                {"matrix": [1, 8], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 4], "x": 14, "y": 3},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 4},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [7, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 9], "x": 12.5, "y": 4}
+            ]
+        },
         "LAYOUT_60_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 8], "x": 7, "y": 0},
+                {"matrix": [7, 8], "x": 8, "y": 0},
+                {"matrix": [7, 1], "x": 9, "y": 0},
+                {"matrix": [4, 9], "x": 10, "y": 0},
+                {"matrix": [4, 8], "x": 11, "y": 0},
+                {"matrix": [4, 7], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [4, 10], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [6, 2], "x": 6.5, "y": 1},
+                {"matrix": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [7, 7], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [3, 9], "x": 10.5, "y": 1},
+                {"matrix": [3, 8], "x": 11.5, "y": 1},
+                {"matrix": [3, 7], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"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": [6, 3], "x": 6.75, "y": 2},
+                {"matrix": [6, 6], "x": 7.75, "y": 2},
+                {"matrix": [7, 6], "x": 8.75, "y": 2},
+                {"matrix": [7, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 3},
+                {"matrix": [1, 2], "x": 3.25, "y": 3},
+                {"matrix": [1, 3], "x": 4.25, "y": 3},
+                {"matrix": [1, 4], "x": 5.25, "y": 3},
+                {"matrix": [1, 5], "x": 6.25, "y": 3},
+                {"matrix": [6, 4], "x": 7.25, "y": 3},
+                {"matrix": [6, 10], "x": 8.25, "y": 3},
+                {"matrix": [7, 10], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [1, 9], "x": 11.25, "y": 3},
+                {"matrix": [1, 8], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 4], "x": 14, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 4},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [7, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 9], "x": 12.5, "y": 4},
+                {"matrix": [0, 5], "x": 13.5, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.h b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.h
deleted file mode 100644
index 44c02c8600..0000000000
--- a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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 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.
- */
-
-// LAYOUT_all ignores the key often coded as ~# to the left of Enter on ISO layouts. 
-// This is done as it shares the same row AND col as the pipe key. 
-#define LAYOUT_all( \
-    k50, k41, k42, k43, k44, k45, k61, k68, k78, k71, k49, k48, k47, k52, k4A, \
-    k30, k31, k32, k33, k34, k35, k62, k67, k77, k72, k39, k38, k37, k36,      \
-    k20, k21, k22, k23, k24, k25, k63, k66, k76, k73, k29, k28, k26,           \
-    k10, k53, k11, k12, k13, k14, k15, k64, k6A, k7A, k74, k19, k18, k54,      \
-    k00, k01, k02, k75, k04, k08, k09, k05                                     \
-) \
-{ \
-    { k00,   k01,   k02,   KC_NO, k04, k05,   KC_NO, KC_NO, k08,   k09,   KC_NO }, \
-    { k10,   k11,   k12,   k13,   k14, k15,   KC_NO, KC_NO, k18,   k19,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24, k25,   k26,   KC_NO, k28,   k29,   KC_NO }, \
-    { k30,   k31,   k32,   k33,   k34, k35,   k36,   k37,   k38,   k39,   KC_NO }, \
-    { KC_NO, k41,   k42,   k43,   k44, k45,   KC_NO, k47,   k48,   k49,   k4A   }, \
-    { k50,   KC_NO, k52,   k53,   k54, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61,   k62,   k63,   k64, KC_NO, k66,   k67,   k68,   KC_NO, k6A   }, \
-    { KC_NO, k71,   k72,   k73,   k74, k75,   k76,   k77,   k78,   KC_NO, k7A   }, \
-}
-
-#define LAYOUT_60_ansi( \
-    k50, k41, k42, k43, k44, k45, k61, k68, k78, k71, k49, k48, k47, k4A, \
-    k30, k31, k32, k33, k34, k35, k62, k67, k77, k72, k39, k38, k37, k36, \
-    k20, k21, k22, k23, k24, k25, k63, k66, k76, k73, k29, k28, k26,      \
-    k10, k11, k12, k13, k14, k15, k64, k6A, k7A, k74, k19, k18,           \
-    k00, k01, k02, k75, k04, k08, k09, k05                                \
-) \
-{ \
-    { k00,   k01,   k02,   KC_NO, k04,   k05,   KC_NO, KC_NO, k08,   k09,   KC_NO }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   KC_NO, KC_NO, k18,   k19,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   KC_NO, k28,   k29,   KC_NO }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   KC_NO }, \
-    { KC_NO, k41,   k42,   k43,   k44,   k45,   KC_NO, k47,   k48,   k49,   k4A   }, \
-    { k50,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61,   k62,   k63,   k64,   KC_NO, k66,   k67,   k68,   KC_NO, k6A   }, \
-    { KC_NO, k71,   k72,   k73,   k74,   k75,   k76,   k77,   k78,   KC_NO, k7A   }, \
-}
-
-#define LAYOUT_60_hhkb( \
-    k50, k41, k42, k43, k44, k45, k61, k68, k78, k71, k49, k48, k47, k52, k4A, \
-    k30, k31, k32, k33, k34, k35, k62, k67, k77, k72, k39, k38, k37, k36,      \
-    k20, k21, k22, k23, k24, k25, k63, k66, k76, k73, k29, k28, k26,           \
-    k10, k11, k12, k13, k14, k15, k64, k6A, k7A, k74, k19, k18, k54,           \
-    k01, k02, k75, k08, k09                                                    \
-) \
-{ \
-    { KC_NO, k01,   k02,   KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, k08,   k09,   KC_NO }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   KC_NO, KC_NO, k18,   k19,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   KC_NO, k28,   k29,   KC_NO }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   KC_NO }, \
-    { KC_NO, k41,   k42,   k43,   k44,   k45,   KC_NO, k47,   k48,   k49,   k4A   }, \
-    { k50,   KC_NO, k52,   KC_NO, k54,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61,   k62,   k63,   k64,   KC_NO, k66,   k67,   k68,   KC_NO, k6A   }, \
-    { KC_NO, k71,   k72,   k73,   k74,   k75,   k76,   k77,   k78,   KC_NO, k7A   }, \
-}
-
-#define LAYOUT_60_tsangan( \
-    k50, k41, k42, k43, k44, k45, k61, k68, k78, k71, k49, k48, k47, k52, k4A, \
-    k30, k31, k32, k33, k34, k35, k62, k67, k77, k72, k39, k38, k37, k36,      \
-    k20, k21, k22, k23, k24, k25, k63, k66, k76, k73, k29, k28, k26,           \
-    k10, k11, k12, k13, k14, k15, k64, k6A, k7A, k74, k19, k18, k54,           \
-    k00, k01, k02, k75, k08, k09, k05                                          \
-) \
-{ \
-    { k00,   k01,   k02,   KC_NO, KC_NO, k05,   KC_NO, KC_NO, k08,   k09,   KC_NO }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   KC_NO, KC_NO, k18,   k19,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   KC_NO, k28,   k29,   KC_NO }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   KC_NO }, \
-    { KC_NO, k41,   k42,   k43,   k44,   k45,   KC_NO, k47,   k48,   k49,   k4A   }, \
-    { k50,   KC_NO, k52,   KC_NO, k54,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61,   k62,   k63,   k64,   KC_NO, k66,   k67,   k68,   KC_NO, k6A   }, \
-    { KC_NO, k71,   k72,   k73,   k74,   k75,   k76,   k77,   k78,   KC_NO, k7A   }, \
-}