Move split space/backspace layouts to data driven (#20356)

3 files changed, 400 insertions, 470 deletions

diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/info.json
index 410d22512e..2d2ca47305 100644
--- a/keyboards/sthlmkb/lagom/info.json
+++ b/keyboards/sthlmkb/lagom/info.json
@@ -21,379 +21,409 @@
      },
     "layouts": {
         "LAYOUT_base": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0, "w":2},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "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":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "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},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"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":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_splits": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "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":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "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},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_iso": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0, "w":2},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "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":15, "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":"|", "x":12.75, "y":2},
-                     {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 14], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 15], "x": 12.5, "y": 1},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "|", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_split_space": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "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":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "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},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":2.25},
-                     {"label":"Super", "x":6, "y":4, "w":1.25},
-                     {"label":"Space", "x":7.25, "y":4, "w":2.75},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
-        "LAYOUT_7u_space": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "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":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "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},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                     {"label":"Alt", "x":1.5, "y":4},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.5},
-                     {"label":"Space", "x":4, "y":4, "w":7},
-                     {"label":"Cmd", "x":11, "y":4, "w":1.5},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             }
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Super", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Cmd", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    },
     "encoder": {
         "rotary": [
             { "pin_a": "D4", "pin_b": "C6" },
diff --git a/keyboards/sthlmkb/lagom/lagom.c b/keyboards/sthlmkb/lagom/lagom.c
index d26fd1e7f4..10ad6c0c32 100644
--- a/keyboards/sthlmkb/lagom/lagom.c
+++ b/keyboards/sthlmkb/lagom/lagom.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lagom.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/sthlmkb/lagom/lagom.h b/keyboards/sthlmkb/lagom/lagom.h
deleted file mode 100644
index c27c90bd2e..0000000000
--- a/keyboards/sthlmkb/lagom/lagom.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2022 mohoyt
- *
- * 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 ___ KC_NO
-
-/* 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.
- */
-
-
-#define LAYOUT_base( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_splits( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_iso( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_split_space( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_7u_space( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                     K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, K4D, K4E, ___, }  \
-}