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

3 files changed, 745 insertions, 199 deletions

diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index d6a07150f6..dd89d06aa3 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -27,17 +27,755 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [7, 7], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 1], "x": 17, "y": 0},
+                {"matrix": [1, 2], "x": 18, "y": 0},
+                {"matrix": [1, 3], "x": 19, "y": 0},
+                {"matrix": [1, 4], "x": 20, "y": 0},
+                {"matrix": [1, 5], "x": 21, "y": 0},
+                {"matrix": [6, 0], "x": 22, "y": 0},
+                {"matrix": [6, 1], "x": 23, "y": 0},
+                {"matrix": [6, 2], "x": 24, "y": 0},
+                {"matrix": [6, 3], "x": 25, "y": 0},
+                {"matrix": [6, 4], "x": 26, "y": 0},
+                {"matrix": [6, 5], "x": 27, "y": 0},
+                {"matrix": [6, 6], "x": 28, "y": 0},
+                {"matrix": [6, 7], "x": 29, "y": 0},
+                {"matrix": [8, 7], "x": 30, "y": 0},
+                {"matrix": [4, 5], "x": 31, "y": 0},
+                {"matrix": [2, 0], "x": 32, "y": 0},
+                {"matrix": [2, 1], "x": 33, "y": 0},
+                {"matrix": [2, 2], "x": 34, "y": 0},
+                {"matrix": [2, 3], "x": 35, "y": 0},
+                {"matrix": [2, 4], "x": 36, "y": 0},
+                {"matrix": [2, 5], "x": 37, "y": 0},
+                {"matrix": [7, 0], "x": 38, "y": 0},
+                {"matrix": [7, 1], "x": 39, "y": 0},
+                {"matrix": [7, 2], "x": 40, "y": 0},
+                {"matrix": [7, 3], "x": 41, "y": 0},
+                {"matrix": [7, 4], "x": 42, "y": 0},
+                {"matrix": [7, 5], "x": 43, "y": 0},
+                {"matrix": [7, 6], "x": 44, "y": 0},
+                {"matrix": [9, 7], "x": 45, "y": 0},
+                {"matrix": [4, 6], "x": 46, "y": 0},
+                {"matrix": [3, 0], "x": 47, "y": 0},
+                {"matrix": [4, 1], "x": 48, "y": 0},
+                {"matrix": [3, 1], "x": 49, "y": 0},
+                {"matrix": [3, 2], "x": 50, "y": 0},
+                {"matrix": [3, 3], "x": 51, "y": 0},
+                {"matrix": [3, 4], "x": 52, "y": 0},
+                {"matrix": [3, 5], "x": 53, "y": 0},
+                {"matrix": [9, 6], "x": 54, "y": 0},
+                {"matrix": [8, 0], "x": 55, "y": 0},
+                {"matrix": [8, 1], "x": 56, "y": 0},
+                {"matrix": [8, 2], "x": 57, "y": 0},
+                {"matrix": [8, 3], "x": 58, "y": 0},
+                {"matrix": [8, 4], "x": 59, "y": 0},
+                {"matrix": [8, 5], "x": 60, "y": 0},
+                {"matrix": [8, 6], "x": 61, "y": 0},
+                {"matrix": [4, 7], "x": 62, "y": 0},
+                {"matrix": [4, 0], "x": 63, "y": 0},
+                {"matrix": [4, 2], "x": 64, "y": 0},
+                {"matrix": [4, 3], "x": 65, "y": 0},
+                {"matrix": [4, 4], "x": 66, "y": 0},
+                {"matrix": [9, 0], "x": 67, "y": 0},
+                {"matrix": [9, 1], "x": 68, "y": 0},
+                {"matrix": [9, 2], "x": 69, "y": 0},
+                {"matrix": [9, 3], "x": 70, "y": 0},
+                {"matrix": [9, 4], "x": 71, "y": 0},
+                {"matrix": [9, 5], "x": 72, "y": 0}
+            ]
+        },
+        "LAYOUT_ansi_lspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "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": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"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": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_lspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "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": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"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": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
         "LAYOUT_ansi_rspace_2u_bksp": {
-            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "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": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"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": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
         },
         "LAYOUT_ansi_rspace_split_bksp": {
-            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "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": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"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": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
         },
-        "LAYOUT_ansi_lspace_2u_bksp": {
-            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+        "LAYOUT_iso_lspace_2u_bksp": {
+            "layout": [
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 7], "x": 13, "y": 0},
+                {"matrix": [7, 7], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [6, 0], "x": 21, "y": 0},
+                {"matrix": [6, 1], "x": 22, "y": 0},
+                {"matrix": [6, 2], "x": 23, "y": 0},
+                {"matrix": [6, 3], "x": 24, "y": 0},
+                {"matrix": [6, 4], "x": 25, "y": 0},
+                {"matrix": [6, 5], "x": 26, "y": 0},
+                {"matrix": [6, 6], "x": 27, "y": 0},
+                {"matrix": [6, 7], "x": 28, "y": 0},
+                {"matrix": [8, 7], "x": 29, "y": 0},
+                {"matrix": [4, 5], "x": 30, "y": 0},
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 1], "x": 32, "y": 0},
+                {"matrix": [2, 2], "x": 33, "y": 0},
+                {"matrix": [2, 3], "x": 34, "y": 0},
+                {"matrix": [2, 4], "x": 35, "y": 0},
+                {"matrix": [2, 5], "x": 36, "y": 0},
+                {"matrix": [7, 0], "x": 37, "y": 0},
+                {"matrix": [7, 1], "x": 38, "y": 0},
+                {"matrix": [7, 2], "x": 39, "y": 0},
+                {"matrix": [7, 3], "x": 40, "y": 0},
+                {"matrix": [7, 4], "x": 41, "y": 0},
+                {"matrix": [7, 5], "x": 42, "y": 0},
+                {"matrix": [7, 6], "x": 43, "y": 0},
+                {"matrix": [9, 7], "x": 44, "y": 0},
+                {"matrix": [4, 6], "x": 45, "y": 0},
+                {"matrix": [3, 0], "x": 46, "y": 0},
+                {"matrix": [4, 1], "x": 47, "y": 0},
+                {"matrix": [3, 1], "x": 48, "y": 0},
+                {"matrix": [3, 2], "x": 49, "y": 0},
+                {"matrix": [3, 3], "x": 50, "y": 0},
+                {"matrix": [3, 4], "x": 51, "y": 0},
+                {"matrix": [3, 5], "x": 52, "y": 0},
+                {"matrix": [9, 6], "x": 53, "y": 0},
+                {"matrix": [8, 0], "x": 54, "y": 0},
+                {"matrix": [8, 1], "x": 55, "y": 0},
+                {"matrix": [8, 2], "x": 56, "y": 0},
+                {"matrix": [8, 3], "x": 57, "y": 0},
+                {"matrix": [8, 4], "x": 58, "y": 0},
+                {"matrix": [8, 5], "x": 59, "y": 0},
+                {"matrix": [8, 6], "x": 60, "y": 0},
+                {"matrix": [4, 7], "x": 61, "y": 0},
+                {"matrix": [4, 0], "x": 62, "y": 0},
+                {"matrix": [4, 2], "x": 63, "y": 0},
+                {"matrix": [4, 4], "x": 64, "y": 0},
+                {"matrix": [4, 3], "x": 65, "y": 0},
+                {"matrix": [9, 0], "x": 66, "y": 0},
+                {"matrix": [9, 1], "x": 67, "y": 0},
+                {"matrix": [9, 2], "x": 68, "y": 0},
+                {"matrix": [9, 3], "x": 69, "y": 0},
+                {"matrix": [9, 4], "x": 70, "y": 0},
+                {"matrix": [9, 5], "x": 71, "y": 0}
+            ]
         },
-        "LAYOUT_ansi_lspace_split_bksp": {
-            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+        "LAYOUT_iso_lspace_split_bksp": {
+            "layout": [
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [7, 7], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 1], "x": 17, "y": 0},
+                {"matrix": [1, 2], "x": 18, "y": 0},
+                {"matrix": [1, 3], "x": 19, "y": 0},
+                {"matrix": [1, 4], "x": 20, "y": 0},
+                {"matrix": [1, 5], "x": 21, "y": 0},
+                {"matrix": [6, 0], "x": 22, "y": 0},
+                {"matrix": [6, 1], "x": 23, "y": 0},
+                {"matrix": [6, 2], "x": 24, "y": 0},
+                {"matrix": [6, 3], "x": 25, "y": 0},
+                {"matrix": [6, 4], "x": 26, "y": 0},
+                {"matrix": [6, 5], "x": 27, "y": 0},
+                {"matrix": [6, 6], "x": 28, "y": 0},
+                {"matrix": [6, 7], "x": 29, "y": 0},
+                {"matrix": [8, 7], "x": 30, "y": 0},
+                {"matrix": [4, 5], "x": 31, "y": 0},
+                {"matrix": [2, 0], "x": 32, "y": 0},
+                {"matrix": [2, 1], "x": 33, "y": 0},
+                {"matrix": [2, 2], "x": 34, "y": 0},
+                {"matrix": [2, 3], "x": 35, "y": 0},
+                {"matrix": [2, 4], "x": 36, "y": 0},
+                {"matrix": [2, 5], "x": 37, "y": 0},
+                {"matrix": [7, 0], "x": 38, "y": 0},
+                {"matrix": [7, 1], "x": 39, "y": 0},
+                {"matrix": [7, 2], "x": 40, "y": 0},
+                {"matrix": [7, 3], "x": 41, "y": 0},
+                {"matrix": [7, 4], "x": 42, "y": 0},
+                {"matrix": [7, 5], "x": 43, "y": 0},
+                {"matrix": [7, 6], "x": 44, "y": 0},
+                {"matrix": [9, 7], "x": 45, "y": 0},
+                {"matrix": [4, 6], "x": 46, "y": 0},
+                {"matrix": [3, 0], "x": 47, "y": 0},
+                {"matrix": [4, 1], "x": 48, "y": 0},
+                {"matrix": [3, 1], "x": 49, "y": 0},
+                {"matrix": [3, 2], "x": 50, "y": 0},
+                {"matrix": [3, 3], "x": 51, "y": 0},
+                {"matrix": [3, 4], "x": 52, "y": 0},
+                {"matrix": [3, 5], "x": 53, "y": 0},
+                {"matrix": [9, 6], "x": 54, "y": 0},
+                {"matrix": [8, 0], "x": 55, "y": 0},
+                {"matrix": [8, 1], "x": 56, "y": 0},
+                {"matrix": [8, 2], "x": 57, "y": 0},
+                {"matrix": [8, 3], "x": 58, "y": 0},
+                {"matrix": [8, 4], "x": 59, "y": 0},
+                {"matrix": [8, 5], "x": 60, "y": 0},
+                {"matrix": [8, 6], "x": 61, "y": 0},
+                {"matrix": [4, 7], "x": 62, "y": 0},
+                {"matrix": [4, 0], "x": 63, "y": 0},
+                {"matrix": [4, 2], "x": 64, "y": 0},
+                {"matrix": [4, 4], "x": 65, "y": 0},
+                {"matrix": [4, 3], "x": 66, "y": 0},
+                {"matrix": [9, 0], "x": 67, "y": 0},
+                {"matrix": [9, 1], "x": 68, "y": 0},
+                {"matrix": [9, 2], "x": 69, "y": 0},
+                {"matrix": [9, 3], "x": 70, "y": 0},
+                {"matrix": [9, 4], "x": 71, "y": 0},
+                {"matrix": [9, 5], "x": 72, "y": 0}
+            ]
+        },
+        "LAYOUT_iso_rspace_2u_bksp": {
+            "layout": [
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 7], "x": 13, "y": 0},
+                {"matrix": [7, 7], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [6, 0], "x": 21, "y": 0},
+                {"matrix": [6, 1], "x": 22, "y": 0},
+                {"matrix": [6, 2], "x": 23, "y": 0},
+                {"matrix": [6, 3], "x": 24, "y": 0},
+                {"matrix": [6, 4], "x": 25, "y": 0},
+                {"matrix": [6, 5], "x": 26, "y": 0},
+                {"matrix": [6, 6], "x": 27, "y": 0},
+                {"matrix": [6, 7], "x": 28, "y": 0},
+                {"matrix": [8, 7], "x": 29, "y": 0},
+                {"matrix": [4, 5], "x": 30, "y": 0},
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 1], "x": 32, "y": 0},
+                {"matrix": [2, 2], "x": 33, "y": 0},
+                {"matrix": [2, 3], "x": 34, "y": 0},
+                {"matrix": [2, 4], "x": 35, "y": 0},
+                {"matrix": [2, 5], "x": 36, "y": 0},
+                {"matrix": [7, 0], "x": 37, "y": 0},
+                {"matrix": [7, 1], "x": 38, "y": 0},
+                {"matrix": [7, 2], "x": 39, "y": 0},
+                {"matrix": [7, 3], "x": 40, "y": 0},
+                {"matrix": [7, 4], "x": 41, "y": 0},
+                {"matrix": [7, 5], "x": 42, "y": 0},
+                {"matrix": [7, 6], "x": 43, "y": 0},
+                {"matrix": [9, 7], "x": 44, "y": 0},
+                {"matrix": [4, 6], "x": 45, "y": 0},
+                {"matrix": [3, 0], "x": 46, "y": 0},
+                {"matrix": [4, 1], "x": 47, "y": 0},
+                {"matrix": [3, 1], "x": 48, "y": 0},
+                {"matrix": [3, 2], "x": 49, "y": 0},
+                {"matrix": [3, 3], "x": 50, "y": 0},
+                {"matrix": [3, 4], "x": 51, "y": 0},
+                {"matrix": [3, 5], "x": 52, "y": 0},
+                {"matrix": [9, 6], "x": 53, "y": 0},
+                {"matrix": [8, 0], "x": 54, "y": 0},
+                {"matrix": [8, 1], "x": 55, "y": 0},
+                {"matrix": [8, 2], "x": 56, "y": 0},
+                {"matrix": [8, 3], "x": 57, "y": 0},
+                {"matrix": [8, 4], "x": 58, "y": 0},
+                {"matrix": [8, 5], "x": 59, "y": 0},
+                {"matrix": [8, 6], "x": 60, "y": 0},
+                {"matrix": [4, 7], "x": 61, "y": 0},
+                {"matrix": [4, 0], "x": 62, "y": 0},
+                {"matrix": [4, 2], "x": 63, "y": 0},
+                {"matrix": [4, 3], "x": 64, "y": 0},
+                {"matrix": [4, 4], "x": 65, "y": 0},
+                {"matrix": [9, 0], "x": 66, "y": 0},
+                {"matrix": [9, 1], "x": 67, "y": 0},
+                {"matrix": [9, 2], "x": 68, "y": 0},
+                {"matrix": [9, 3], "x": 69, "y": 0},
+                {"matrix": [9, 4], "x": 70, "y": 0},
+                {"matrix": [9, 5], "x": 71, "y": 0}
+            ]
+        },
+        "LAYOUT_iso_rspace_split_bksp": {
+            "layout": [
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [7, 7], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 1], "x": 17, "y": 0},
+                {"matrix": [1, 2], "x": 18, "y": 0},
+                {"matrix": [1, 3], "x": 19, "y": 0},
+                {"matrix": [1, 4], "x": 20, "y": 0},
+                {"matrix": [1, 5], "x": 21, "y": 0},
+                {"matrix": [6, 0], "x": 22, "y": 0},
+                {"matrix": [6, 1], "x": 23, "y": 0},
+                {"matrix": [6, 2], "x": 24, "y": 0},
+                {"matrix": [6, 3], "x": 25, "y": 0},
+                {"matrix": [6, 4], "x": 26, "y": 0},
+                {"matrix": [6, 5], "x": 27, "y": 0},
+                {"matrix": [6, 6], "x": 28, "y": 0},
+                {"matrix": [6, 7], "x": 29, "y": 0},
+                {"matrix": [8, 7], "x": 30, "y": 0},
+                {"matrix": [4, 5], "x": 31, "y": 0},
+                {"matrix": [2, 0], "x": 32, "y": 0},
+                {"matrix": [2, 1], "x": 33, "y": 0},
+                {"matrix": [2, 2], "x": 34, "y": 0},
+                {"matrix": [2, 3], "x": 35, "y": 0},
+                {"matrix": [2, 4], "x": 36, "y": 0},
+                {"matrix": [2, 5], "x": 37, "y": 0},
+                {"matrix": [7, 0], "x": 38, "y": 0},
+                {"matrix": [7, 1], "x": 39, "y": 0},
+                {"matrix": [7, 2], "x": 40, "y": 0},
+                {"matrix": [7, 3], "x": 41, "y": 0},
+                {"matrix": [7, 4], "x": 42, "y": 0},
+                {"matrix": [7, 5], "x": 43, "y": 0},
+                {"matrix": [7, 6], "x": 44, "y": 0},
+                {"matrix": [9, 7], "x": 45, "y": 0},
+                {"matrix": [4, 6], "x": 46, "y": 0},
+                {"matrix": [3, 0], "x": 47, "y": 0},
+                {"matrix": [4, 1], "x": 48, "y": 0},
+                {"matrix": [3, 1], "x": 49, "y": 0},
+                {"matrix": [3, 2], "x": 50, "y": 0},
+                {"matrix": [3, 3], "x": 51, "y": 0},
+                {"matrix": [3, 4], "x": 52, "y": 0},
+                {"matrix": [3, 5], "x": 53, "y": 0},
+                {"matrix": [9, 6], "x": 54, "y": 0},
+                {"matrix": [8, 0], "x": 55, "y": 0},
+                {"matrix": [8, 1], "x": 56, "y": 0},
+                {"matrix": [8, 2], "x": 57, "y": 0},
+                {"matrix": [8, 3], "x": 58, "y": 0},
+                {"matrix": [8, 4], "x": 59, "y": 0},
+                {"matrix": [8, 5], "x": 60, "y": 0},
+                {"matrix": [8, 6], "x": 61, "y": 0},
+                {"matrix": [4, 7], "x": 62, "y": 0},
+                {"matrix": [4, 0], "x": 63, "y": 0},
+                {"matrix": [4, 2], "x": 64, "y": 0},
+                {"matrix": [4, 3], "x": 65, "y": 0},
+                {"matrix": [4, 4], "x": 66, "y": 0},
+                {"matrix": [9, 0], "x": 67, "y": 0},
+                {"matrix": [9, 1], "x": 68, "y": 0},
+                {"matrix": [9, 2], "x": 69, "y": 0},
+                {"matrix": [9, 3], "x": 70, "y": 0},
+                {"matrix": [9, 4], "x": 71, "y": 0},
+                {"matrix": [9, 5], "x": 72, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/merge/uma/uma.c b/keyboards/merge/uma/uma.c
index 565a09fb27..35c91b8a6e 100644
--- a/keyboards/merge/uma/uma.c
+++ b/keyboards/merge/uma/uma.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "uma.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 void suspend_power_down_user(void) {
diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h
deleted file mode 100644
index 3e2b5fa264..0000000000
--- a/keyboards/merge/uma/uma.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright 2021 duoshock 
- * 
- * 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"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_ansi_rspace_split_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_ansi_rspace_2u_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_ansi_lspace_2u_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_ansi_lspace_split_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_iso_rspace_split_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_iso_rspace_2u_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_iso_lspace_2u_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}
-
-#define LAYOUT_iso_lspace_split_bksp( \
-            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
-            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
-    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
-    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
-}