Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 180 insertions, 216 deletions

diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index f4d6c5749b..baa1cec9a7 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -21,179 +21,194 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_7u_space"
+    },
     "layouts": {
         "LAYOUT_7u_space": {
             "layout": [
-                {"label":"K00 (F0,B7)", "x":0, "y":0},
-                {"label":"K01 (F0,B6)", "x":1, "y":0},
-                {"label":"K02 (F0,B5)", "x":2, "y":0},
-                {"label":"K03 (F0,B4)", "x":3, "y":0},
-                {"label":"K04 (F0,C7)", "x":4, "y":0},
-                {"label":"K05 (F0,C6)", "x":5, "y":0},
-                {"label":"K06 (F0,D0)", "x":6, "y":0},
-                {"label":"K07 (F0,D1)", "x":7, "y":0},
-                {"label":"K08 (F0,D2)", "x":8, "y":0},
-                {"label":"K09 (F0,D3)", "x":9, "y":0},
-                {"label":"K0A (F0,D4)", "x":10, "y":0},
-                {"label":"K0B (F0,D5)", "x":11, "y":0},
-                {"label":"K0C (F0,D6)", "x":12, "y":0},
-                {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2},
-                {"label":"K2D (F4,D7)", "x":15.5, "y":0},
-                {"label":"K3D (F5,D7)", "x":16.5, "y":0},
-                {"label":"K4D (F6,D7)", "x":17.5, "y":0},
-
-                {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5},
-                {"label":"K11 (F1,B6)", "x":1.5, "y":1.25},
-                {"label":"K12 (F1,B5)", "x":2.5, "y":1.25},
-                {"label":"K13 (F1,B4)", "x":3.5, "y":1.25},
-                {"label":"K14 (F1,C7)", "x":4.5, "y":1.25},
-                {"label":"K15 (F1,C6)", "x":5.5, "y":1.25},
-                {"label":"K16 (F1,D0)", "x":6.5, "y":1.25},
-                {"label":"K17 (F1,D1)", "x":7.5, "y":1.25},
-                {"label":"K18 (F1,D2)", "x":8.5, "y":1.25},
-                {"label":"K19 (F1,D3)", "x":9.5, "y":1.25},
-                {"label":"K1A (F1,D4)", "x":10.5, "y":1.25},
-                {"label":"K1B (F1,D5)", "x":11.5, "y":1.25},
-                {"label":"K1C (F1,D6)", "x":12.5, "y":1.25},
-                {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5},
-                {"label":"K56 (F7,D0)", "x":15.5, "y":1.25},
-                {"label":"K57 (F7,D1)", "x":16.5, "y":1.25},
-                {"label":"K58 (F7,D2)", "x":17.5, "y":1.25},
-
-                {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75},
-                {"label":"K21 (F4,B6)", "x":1.75, "y":2.25},
-                {"label":"K22 (F4,B5)", "x":2.75, "y":2.25},
-                {"label":"K23 (F4,B4)", "x":3.75, "y":2.25},
-                {"label":"K24 (F4,C7)", "x":4.75, "y":2.25},
-                {"label":"K25 (F4,C6)", "x":5.75, "y":2.25},
-                {"label":"K26 (F4,D0)", "x":6.75, "y":2.25},
-                {"label":"K27 (F4,D1)", "x":7.75, "y":2.25},
-                {"label":"K28 (F4,D2)", "x":8.75, "y":2.25},
-                {"label":"K29 (F4,D3)", "x":9.75, "y":2.25},
-                {"label":"K2A (F4,D4)", "x":10.75, "y":2.25},
-                {"label":"K2B (F4,D5)", "x":11.75, "y":2.25},
-                {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25},
-                {"label":"K53 (F7,B4)", "x":15.5, "y":2.25},
-                {"label":"K54 (F7,C7)", "x":16.5, "y":2.25},
-                {"label":"K55 (F7,C6)", "x":17.5, "y":2.25},
-
-                {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25},
-                {"label":"K31 (F5,B6)", "x":2.25, "y":3.25},
-                {"label":"K32 (F5,B5)", "x":3.25, "y":3.25},
-                {"label":"K33 (F5,B4)", "x":4.25, "y":3.25},
-                {"label":"K34 (F5,C7)", "x":5.25, "y":3.25},
-                {"label":"K35 (F5,C6)", "x":6.25, "y":3.25},
-                {"label":"K36 (F5,D0)", "x":7.25, "y":3.25},
-                {"label":"K37 (F5,D1)", "x":8.25, "y":3.25},
-                {"label":"K38 (F5,D2)", "x":9.25, "y":3.25},
-                {"label":"K39 (F5,D3)", "x":10.25, "y":3.25},
-                {"label":"K3A (F5,D4)", "x":11.25, "y":3.25},
-                {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75},
-                {"label":"K3C (F5,D6)", "x":14.25, "y":3.5},
-                {"label":"K50 (F7,B7)", "x":15.5, "y":3.25},
-                {"label":"K51 (F7,B6)", "x":16.5, "y":3.25},
-                {"label":"K52 (F7,B5)", "x":17.5, "y":3.25},
-
-                {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.5},
-                {"label":"K41 (F6,B6)", "x":1.5, "y":4.25},
-                {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.5},
-                {"label":"K45 (F6,C6)", "x":4, "y":4.25, "w":7},
-                {"label":"K48 (F6,D2)", "x":11, "y":4.25},
-                {"label":"K49 (F6,D3)", "x":12, "y":4.25},
-                {"label":"K4A (F6,D4)", "x":13.25, "y":4.5},
-                {"label":"K4B (F6,D5)", "x":14.25, "y":4.5},
-                {"label":"K4C (F6,D6)", "x":15.25, "y":4.5},
-                {"label":"K59 (F7,D3)", "x":16.5, "y":4.25},
-                {"label":"K5A (F7,D4)", "x":17.5, "y":4.25}
-            ]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [3, 13], "x": 16.5, "y": 0},
+                {"matrix": [4, 13], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [5, 6], "x": 15.5, "y": 1.25},
+                {"matrix": [5, 7], "x": 16.5, "y": 1.25},
+                {"matrix": [5, 8], "x": 17.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [5, 3], "x": 15.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 16.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 17.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 12], "x": 14.25, "y": 3.5},
+
+                {"matrix": [5, 0], "x": 15.5, "y": 3.25},
+                {"matrix": [5, 1], "x": 16.5, "y": 3.25},
+                {"matrix": [5, 2], "x": 17.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4.25, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+
+                {"matrix": [4, 10], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
 
+                {"matrix": [5, 9], "x": 16.5, "y": 4.25},
+                {"matrix": [5, 10], "x": 17.5, "y": 4.25}
+            ]
         },
         "LAYOUT_6_25u_space": {
             "layout": [
-                {"label":"K00 (F0,B7)", "x":0, "y":0},
-                {"label":"K01 (F0,B6)", "x":1, "y":0},
-                {"label":"K02 (F0,B5)", "x":2, "y":0},
-                {"label":"K03 (F0,B4)", "x":3, "y":0},
-                {"label":"K04 (F0,C7)", "x":4, "y":0},
-                {"label":"K05 (F0,C6)", "x":5, "y":0},
-                {"label":"K06 (F0,D0)", "x":6, "y":0},
-                {"label":"K07 (F0,D1)", "x":7, "y":0},
-                {"label":"K08 (F0,D2)", "x":8, "y":0},
-                {"label":"K09 (F0,D3)", "x":9, "y":0},
-                {"label":"K0A (F0,D4)", "x":10, "y":0},
-                {"label":"K0B (F0,D5)", "x":11, "y":0},
-                {"label":"K0C (F0,D6)", "x":12, "y":0},
-                {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2},
-                {"label":"K2D (F4,D7)", "x":15.5, "y":0},
-                {"label":"K3D (F5,D7)", "x":16.5, "y":0},
-                {"label":"K4D (F6,D7)", "x":17.5, "y":0},
-
-                {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5},
-                {"label":"K11 (F1,B6)", "x":1.5, "y":1.25},
-                {"label":"K12 (F1,B5)", "x":2.5, "y":1.25},
-                {"label":"K13 (F1,B4)", "x":3.5, "y":1.25},
-                {"label":"K14 (F1,C7)", "x":4.5, "y":1.25},
-                {"label":"K15 (F1,C6)", "x":5.5, "y":1.25},
-                {"label":"K16 (F1,D0)", "x":6.5, "y":1.25},
-                {"label":"K17 (F1,D1)", "x":7.5, "y":1.25},
-                {"label":"K18 (F1,D2)", "x":8.5, "y":1.25},
-                {"label":"K19 (F1,D3)", "x":9.5, "y":1.25},
-                {"label":"K1A (F1,D4)", "x":10.5, "y":1.25},
-                {"label":"K1B (F1,D5)", "x":11.5, "y":1.25},
-                {"label":"K1C (F1,D6)", "x":12.5, "y":1.25},
-                {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5},
-                {"label":"K56 (F7,D0)", "x":15.5, "y":1.25},
-                {"label":"K57 (F7,D1)", "x":16.5, "y":1.25},
-                {"label":"K58 (F7,D2)", "x":17.5, "y":1.25},
-
-                {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75},
-                {"label":"K21 (F4,B6)", "x":1.75, "y":2.25},
-                {"label":"K22 (F4,B5)", "x":2.75, "y":2.25},
-                {"label":"K23 (F4,B4)", "x":3.75, "y":2.25},
-                {"label":"K24 (F4,C7)", "x":4.75, "y":2.25},
-                {"label":"K25 (F4,C6)", "x":5.75, "y":2.25},
-                {"label":"K26 (F4,D0)", "x":6.75, "y":2.25},
-                {"label":"K27 (F4,D1)", "x":7.75, "y":2.25},
-                {"label":"K28 (F4,D2)", "x":8.75, "y":2.25},
-                {"label":"K29 (F4,D3)", "x":9.75, "y":2.25},
-                {"label":"K2A (F4,D4)", "x":10.75, "y":2.25},
-                {"label":"K2B (F4,D5)", "x":11.75, "y":2.25},
-                {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25},
-                {"label":"K53 (F7,B4)", "x":15.5, "y":2.25},
-                {"label":"K54 (F7,C7)", "x":16.5, "y":2.25},
-                {"label":"K55 (F7,C6)", "x":17.5, "y":2.25},
-
-                {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25},
-                {"label":"K31 (F5,B6)", "x":2.25, "y":3.25},
-                {"label":"K32 (F5,B5)", "x":3.25, "y":3.25},
-                {"label":"K33 (F5,B4)", "x":4.25, "y":3.25},
-                {"label":"K34 (F5,C7)", "x":5.25, "y":3.25},
-                {"label":"K35 (F5,C6)", "x":6.25, "y":3.25},
-                {"label":"K36 (F5,D0)", "x":7.25, "y":3.25},
-                {"label":"K37 (F5,D1)", "x":8.25, "y":3.25},
-                {"label":"K38 (F5,D2)", "x":9.25, "y":3.25},
-                {"label":"K39 (F5,D3)", "x":10.25, "y":3.25},
-                {"label":"K3A (F5,D4)", "x":11.25, "y":3.25},
-                {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75},
-                {"label":"K3C (F5,D6)", "x":14.25, "y":3.5},
-                {"label":"K50 (F7,B7)", "x":15.5, "y":3.25},
-                {"label":"K51 (F7,B6)", "x":16.5, "y":3.25},
-                {"label":"K52 (F7,B5)", "x":17.5, "y":3.25},
-
-                {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (F6,B6)", "x":1.25, "y":4.25, "w":1.25},
-                {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.25},
-                {"label":"K45 (F6,C6)", "x":3.75, "y":4.25, "w":6.25},
-                {"label":"K47 (F6,D1)", "x":10, "y":4.25},
-                {"label":"K48 (F6,D2)", "x":11, "y":4.25},                
-                {"label":"K49 (F6,D3)", "x":12, "y":4.25},
-                {"label":"K4A (F6,D4)", "x":13.25, "y":4.5},
-                {"label":"K4B (F6,D5)", "x":14.25, "y":4.5},
-                {"label":"K4C (F6,D6)", "x":15.25, "y":4.5},
-                {"label":"K59 (F7,D3)", "x":16.5, "y":4.25},
-                {"label":"K5A (F7,D4)", "x":17.5, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [3, 13], "x": 16.5, "y": 0},
+                {"matrix": [4, 13], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [5, 6], "x": 15.5, "y": 1.25},
+                {"matrix": [5, 7], "x": 16.5, "y": 1.25},
+                {"matrix": [5, 8], "x": 17.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [5, 3], "x": 15.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 16.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 17.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 12], "x": 14.25, "y": 3.5},
+
+                {"matrix": [5, 0], "x": 15.5, "y": 3.25},
+                {"matrix": [5, 1], "x": 16.5, "y": 3.25},
+                {"matrix": [5, 2], "x": 17.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4.25},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+
+                {"matrix": [4, 10], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 9], "x": 16.5, "y": 4.25},
+                {"matrix": [5, 10], "x": 17.5, "y": 4.25}
             ]
-            
         }
     }
 }
diff --git a/keyboards/sam/sg81m/sg81m.h b/keyboards/sam/sg81m/sg81m.h
deleted file mode 100644
index d128adf746..0000000000
--- a/keyboards/sam/sg81m/sg81m.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * 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 LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,     K2D, K3D, K4D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K56, K57, K58, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K53, K54, K55, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K50, K51, K52, \
-    K40, K41, K42,                K45,                K48, K49,   K4A, K4B, K4C,   K59, K5A  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, KC_NO, K48,   K49,   K4A,   K4B,   K4C,   K4D   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_6_25u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,     K2D, K3D, K4D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K56, K57, K58, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K53, K54, K55, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K50, K51, K52, \
-    K40, K41, K42,                K45,           K47, K48, K49,   K4A, K4B, K4C,   K59, K5A  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_7u_space