Move miscellaneous layouts to data driven (#20516)

2 files changed, 183 insertions, 222 deletions

diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json
index 8a2c4d109a..b6ebf87311 100644
--- a/keyboards/sck/m0116b/info.json
+++ b/keyboards/sck/m0116b/info.json
@@ -21,175 +21,194 @@
   "layouts": {
     "LAYOUT_m0116_ansi": {
       "layout": [
-        {"label":"K06 (D1,B2)", "x":5, "y":0, "w":2},
-        {"label":"K10 (F0,D5)", "x":0, "y":1.25},
-        {"label":"K11 (F0,D3)", "x":1, "y":1.25},
-        {"label":"K12 (F0,D2)", "x":2, "y":1.25},
-        {"label":"K13 (F0,D0)", "x":3, "y":1.25},
-        {"label":"K14 (F0,B7)", "x":4, "y":1.25},
-        {"label":"K15 (F0,B3)", "x":5, "y":1.25},
-        {"label":"K16 (F0,B2)", "x":6, "y":1.25},
-        {"label":"K17 (F0,B1)", "x":7, "y":1.25},
-        {"label":"K18 (F0,B0)", "x":8, "y":1.25},
-        {"label":"K19 (F0,B5)", "x":9, "y":1.25},
-        {"label":"K1A (F0,B6)", "x":10, "y":1.25},
-        {"label":"K1B (F0,C6)", "x":11, "y":1.25},
-        {"label":"K1C (F0,C7)", "x":12, "y":1.25},
-        {"label":"K1D (F0,F7)", "x":13, "y":1.25, "w":1.5},
-        {"label":"K1E (F0,D4)", "x":15.5, "y":1.25},
-        {"label":"K1F (F0,D6)", "x":16.5, "y":1.25},
-        {"label":"K1G (F0,D7)", "x":17.5, "y":1.25},
-        {"label":"K1H (F0,B4)", "x":18.5, "y":1.25},
-        {"label":"K20 (F1,D5)", "x":0, "y":2.25, "w":1.5},
-        {"label":"K21 (F1,D3)", "x":1.5, "y":2.25},
-        {"label":"K22 (F1,D2)", "x":2.5, "y":2.25},
-        {"label":"K23 (F1,D0)", "x":3.5, "y":2.25},
-        {"label":"K24 (F1,B7)", "x":4.5, "y":2.25},
-        {"label":"K25 (F1,B3)", "x":5.5, "y":2.25},
-        {"label":"K26 (F1,B2)", "x":6.5, "y":2.25},
-        {"label":"K27 (F1,B1)", "x":7.5, "y":2.25},
-        {"label":"K28 (F1,B0)", "x":8.5, "y":2.25},
-        {"label":"K29 (F1,B5)", "x":9.5, "y":2.25},
-        {"label":"K2A (F1,B6)", "x":10.5, "y":2.25},
-        {"label":"K2B (F1,C6)", "x":11.5, "y":2.25},
-        {"label":"K2C (F1,C7)", "x":12.5, "y":2.25},
-        {"label":"K2D (F1,F7)", "x":13.5, "y":2.25, "h":2},
-        {"label":"K2E (F1,D4)", "x":15.5, "y":2.25},
-        {"label":"K2F (F1,D6)", "x":16.5, "y":2.25},
-        {"label":"K2G (F1,D7)", "x":17.5, "y":2.25},
-        {"label":"K2H (F1,B4)", "x":18.5, "y":2.25},
-        {"label":"K30 (F4,D5)", "x":0, "y":3.25, "w":1.75},
-        {"label":"K31 (F4,D3)", "x":1.75, "y":3.25},
-        {"label":"K32 (F4,D2)", "x":2.75, "y":3.25},
-        {"label":"K33 (F4,D0)", "x":3.75, "y":3.25},
-        {"label":"K34 (F4,B7)", "x":4.75, "y":3.25},
-        {"label":"K35 (F4,B3)", "x":5.75, "y":3.25},
-        {"label":"K36 (F4,B2)", "x":6.75, "y":3.25},
-        {"label":"K37 (F4,B1)", "x":7.75, "y":3.25},
-        {"label":"K38 (F4,B0)", "x":8.75, "y":3.25},
-        {"label":"K39 (F4,B5)", "x":9.75, "y":3.25},
-        {"label":"K3A (F4,B6)", "x":10.75, "y":3.25},
-        {"label":"K3B (F4,C6)", "x":11.75, "y":3.25},
-        {"label":"K3C (F4,D4)", "x":15.5, "y":3.25},
-        {"label":"K3D (F4,D6)", "x":16.5, "y":3.25},
-        {"label":"K3E (F4,D7)", "x":17.5, "y":3.25},
-        {"label":"K3F (F4,B4)", "x":18.5, "y":3.25},
-        {"label":"K40 (F5,D5)", "x":0, "y":4.25, "w":2.25},
-        {"label":"K42 (F5,D2)", "x":2.25, "y":4.25},
-        {"label":"K43 (F5,D0)", "x":3.25, "y":4.25},
-        {"label":"K44 (F5,B7)", "x":4.25, "y":4.25},
-        {"label":"K45 (F5,B3)", "x":5.25, "y":4.25},
-        {"label":"K46 (F5,B2)", "x":6.25, "y":4.25},
-        {"label":"K47 (F5,B1)", "x":7.25, "y":4.25},
-        {"label":"K48 (F5,B0)", "x":8.25, "y":4.25},
-        {"label":"K49 (F5,B5)", "x":9.25, "y":4.25},
-        {"label":"K4A (F5,B6)", "x":10.25, "y":4.25},
-        {"label":"K4B (F5,C6)", "x":11.25, "y":4.25},
-        {"label":"K4C (F5,C7)", "x":12.25, "y":4.25, "w":2.25},
-        {"label":"K4E (F5,D4)", "x":15.5, "y":4.25},
-        {"label":"K4F (F5,D6)", "x":16.5, "y":4.25},
-        {"label":"K4G (F5,D7)", "x":17.5, "y":4.25},
-        {"label":"K4H (F4,B4)", "x":18.5, "y":4.25, "h":2},
-        {"label":"K50 (F6,D5)", "x":0, "y":5.25},
-        {"label":"K51 (F6,D3)", "x":1, "y":5.25},
-        {"label":"K52 (F6,D2)", "x":2, "y":5.25, "w":1.75},
-        {"label":"K53 (F6,D0)", "x":3.75, "y":5.25},
-        {"label":"K56 (F6,B2)", "x":4.75, "y":5.25, "w":4.75},
-        {"label":"K59 (F6,B5)", "x":9.5, "y":5.25},
-        {"label":"K5A (F6,B6)", "x":10.5, "y":5.25},
-        {"label":"K5B (F6,C6)", "x":11.5, "y":5.25},
-        {"label":"K5C (F6,C7)", "x":12.5, "y":5.25},
-        {"label":"K5D (F6,F7)", "x":13.5, "y":5.25},
-        {"label":"K5E (F6,D4)", "x":15.5, "y":5.25, "w":2},
-        {"label":"K5G (F6,D7)", "x":17.5, "y":5.25}
+        {"matrix": [0, 6], "x": 5, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 1.5},
+
+        {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+        {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "h": 2},
+
+        {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+        {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+
+        {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+        {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+        {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+        {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.25},
+
+        {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+        {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+        {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+        {"matrix": [4, 17], "x": 18.5, "y": 4.25, "h": 2},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25},
+        {"matrix": [5, 1], "x": 1, "y": 5.25},
+        {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 1.75},
+        {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+        {"matrix": [5, 6], "x": 4.75, "y": 5.25, "w": 4.75},
+        {"matrix": [5, 9], "x": 9.5, "y": 5.25},
+        {"matrix": [5, 10], "x": 10.5, "y": 5.25},
+        {"matrix": [5, 11], "x": 11.5, "y": 5.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25},
+
+        {"matrix": [5, 14], "x": 15.5, "y": 5.25, "w": 2},
+        {"matrix": [5, 16], "x": 17.5, "y": 5.25}
       ]
     },
     "LAYOUT_m0118_iso": {
       "layout": [
-        {"label":"K06 (D1,B2)", "x":5, "y":0, "w":2},
-        {"label":"K10 (F0,D5)", "x":0, "y":1.25},
-        {"label":"K11 (F0,D3)", "x":1, "y":1.25},
-        {"label":"K12 (F0,D2)", "x":2, "y":1.25},
-        {"label":"K13 (F0,D0)", "x":3, "y":1.25},
-        {"label":"K14 (F0,B7)", "x":4, "y":1.25},
-        {"label":"K15 (F0,B3)", "x":5, "y":1.25},
-        {"label":"K16 (F0,B2)", "x":6, "y":1.25},
-        {"label":"K17 (F0,B1)", "x":7, "y":1.25},
-        {"label":"K18 (F0,B0)", "x":8, "y":1.25},
-        {"label":"K19 (F0,B5)", "x":9, "y":1.25},
-        {"label":"K1A (F0,B6)", "x":10, "y":1.25},
-        {"label":"K1B (F0,C6)", "x":11, "y":1.25},
-        {"label":"K1C (F0,C7)", "x":12, "y":1.25},
-        {"label":"K1D (F0,F7)", "x":13, "y":1.25, "w":1.5},
-        {"label":"K1E (F0,D4)", "x":15.5, "y":1.25},
-        {"label":"K1F (F0,D6)", "x":16.5, "y":1.25},
-        {"label":"K1G(F0,D7)", "x":17.5, "y":1.25},
-        {"label":"K1H (F0,B4)", "x":18.5, "y":1.25},
-        {"label":"K20 (F1,D5)", "x":0, "y":2.25, "w":1.5},
-        {"label":"K21 (F1,D3)", "x":1.5, "y":2.25},
-        {"label":"K22 (F1,D2)", "x":2.5, "y":2.25},
-        {"label":"K23 (F1,D0)", "x":3.5, "y":2.25},
-        {"label":"K24 (F1,B7)", "x":4.5, "y":2.25},
-        {"label":"K25 (F1,B3)", "x":5.5, "y":2.25},
-        {"label":"K26 (F1,B2)", "x":6.5, "y":2.25},
-        {"label":"K27 (F1,B1)", "x":7.5, "y":2.25},
-        {"label":"K28 (F1,B0)", "x":8.5, "y":2.25},
-        {"label":"K29 (F1,B5)", "x":9.5, "y":2.25},
-        {"label":"K2A (F1,B6)", "x":10.5, "y":2.25},
-        {"label":"K2B (F1,C6)", "x":11.5, "y":2.25},
-        {"label":"K2C (F1,C7)", "x":12.5, "y":2.25},
-        {"label":"K2D (F1,F7)", "x":13.75, "y":2.25, "w":0.75, "h":2},
-        {"label":"K2E (F1,D4)", "x":15.5, "y":2.25},
-        {"label":"K2F (F1,D6)", "x":16.5, "y":2.25},
-        {"label":"K2G (F1,D7)", "x":17.5, "y":2.25},
-        {"label":"K2H (F1,B4)", "x":18.5, "y":2.25},
-        {"label":"K30 (F4,D5)", "x":0, "y":3.25, "w":1.75},
-        {"label":"K31 (F4,D3)", "x":1.75, "y":3.25},
-        {"label":"K32 (F4,D2)", "x":2.75, "y":3.25},
-        {"label":"K33 (F4,D0)", "x":3.75, "y":3.25},
-        {"label":"K34 (F4,B7)", "x":4.75, "y":3.25},
-        {"label":"K35 (F4,B3)", "x":5.75, "y":3.25},
-        {"label":"K36 (F4,B2)", "x":6.75, "y":3.25},
-        {"label":"K37 (F4,B1)", "x":7.75, "y":3.25},
-        {"label":"K38 (F4,B0)", "x":8.75, "y":3.25},
-        {"label":"K39 (F4,B5)", "x":9.75, "y":3.25},
-        {"label":"K3A (F4,B6)", "x":10.75, "y":3.25},
-        {"label":"K3B (F4,C6)", "x":11.75, "y":3.25},
-        {"label":"K3C (F4,C7)", "x":12.75, "y":3.25},
-        {"label":"K3E (F4,D4)", "x":15.5, "y":3.25},
-        {"label":"K3F (F4,D6)", "x":16.5, "y":3.25},
-        {"label":"K3G (F4,D7)", "x":17.5, "y":3.25},
-        {"label":"K3H (F4,B4)", "x":18.5, "y":3.25},
-        {"label":"K40 (F5,D5)", "x":0, "y":4.25, "w":1.25},
-        {"label":"K41 (F5,D3)", "x":1.25, "y":4.25},
-        {"label":"K42 (F5,D2)", "x":2.25, "y":4.25},
-        {"label":"K43 (F5,D0)", "x":3.25, "y":4.25},
-        {"label":"K44 (F5,B7)", "x":4.25, "y":4.25},
-        {"label":"K45 (F5,B3)", "x":5.25, "y":4.25},
-        {"label":"K46 (F5,B2)", "x":6.25, "y":4.25},
-        {"label":"K47 (F5,B1)", "x":7.25, "y":4.25},
-        {"label":"K48 (F5,B0)", "x":8.25, "y":4.25},
-        {"label":"K49 (F5,B5)", "x":9.25, "y":4.25},
-        {"label":"K4A (F5,B6)", "x":10.25, "y":4.25},
-        {"label":"K4B (F5,C6)", "x":11.25, "y":4.25},
-        {"label":"K4C (F5,C7)", "x":12.25, "y":4.25, "w":1.25},
-        {"label":"K4D (F5,F7)", "x":13.5, "y":4.25},
-        {"label":"K4E (F5,D4)", "x":15.5, "y":4.25},
-        {"label":"K4F (F5,D6)", "x":16.5, "y":4.25},
-        {"label":"K4G (F5,D7)", "x":17.5, "y":4.25},
-        {"label":"K4H (F5,B4)", "x":18.5, "y":4.25, "h":2},
-        {"label":"K50 (F6,D5)", "x":0, "y":5.25, "w":1.25},
-        {"label":"K51 (F6,D3)", "x":1.25, "y":5.25, "w":1.5},
-        {"label":"K52 (F6,D2)", "x":2.75, "y":5.25, "w":1.75},
-        {"label":"K56 (F6,B2)", "x":4.5, "y":5.25, "w":5.25},
-        {"label":"K5A (F6,B6)", "x":9.75, "y":5.25, "w":1.75},
-        {"label":"K5B (F6,C6)", "x":11.5, "y":5.25},
-        {"label":"K5C (F6,C7)", "x":12.5, "y":5.25},
-        {"label":"K5D (F6,F7)", "x":13.5, "y":5.25},
-        {"label":"K5E (F6,D4)", "x":15.5, "y":5.25, "w":2},
-        {"label":"K5G (F6,D7)", "x":17.5, "y":5.25}
+        {"matrix": [0, 6], "x": 5, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 1.5},
+
+        {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+        {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 0.75, "h": 2},
+
+        {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+        {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+
+        {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+        {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+        {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+        {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+
+        {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+        {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+        {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+        {"matrix": [4, 17], "x": 18.5, "y": 4.25, "h": 2},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.75},
+        {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 5.25},
+        {"matrix": [5, 10], "x": 9.75, "y": 5.25, "w": 1.75},
+        {"matrix": [5, 11], "x": 11.5, "y": 5.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25},
+
+        {"matrix": [5, 14], "x": 15.5, "y": 5.25, "w": 2},
+        {"matrix": [5, 16], "x": 17.5, "y": 5.25}
       ]
     }
   }
-
 }
diff --git a/keyboards/sck/m0116b/m0116b.h b/keyboards/sck/m0116b/m0116b.h
deleted file mode 100644
index e315925121..0000000000
--- a/keyboards/sck/m0116b/m0116b.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_m0116_ansi( \
-                                        K06,                                                                   \
-    K10,  K11,  K12,  K13,  K14,  K15,  K16, K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  K1E,  K1F,  K1G,  K1H,  \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26, K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F,  K2G,  K2H,  \
-    K30,  K31,  K32,  K33,  K34,  K35,  K36, K37,  K38,  K39,  K3A,  K3B,              K3E,  K3F,  K3G,  K3H,  \
-    K40,        K42,  K43,  K44,  K45,  K46, K47,  K48,  K49,  K4A,  K4B,  K4C,        K4E,  K4F,  K4G,  K4H,  \
-    K50,  K51,  K52,  K53,              K56,             K59,  K5A,  K5B,  K5C,  K5D,  K5E,        K5G         \
-) { \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   K1H   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   K2H   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B,   KC_NO, KC_NO, K3E,   K3F,   K3G,   K3H   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46, K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, K4E,   K4F,   K4G,   K4H   }, \
-    { K50,   K51,   K52,   K53,   KC_NO, KC_NO, K56, KC_NO, KC_NO, K59,   K5A,   K5B,   K5C,   K5D,   K5E,   KC_NO, K5G,   KC_NO }, \
-    }
-
-#define LAYOUT_m0118_iso( \
-                                        K06,                                                                   \
-    K10,  K11,  K12,  K13,  K14,  K15,  K16, K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  K1E,  K1F,  K1G,  K1H,  \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26, K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F,  K2G,  K2H,  \
-    K30,  K31,  K32,  K33,  K34,  K35,  K36, K37,  K38,  K39,  K3A,  K3B,  K3C,        K3E,  K3F,  K3G,  K3H,  \
-    K40,  K41,  K42,  K43,  K44,  K45,  K46, K47,  K48,  K49,  K4A,  K4B,  K4C,  K4D,  K4E,  K4F,  K4G,  K4H,  \
-    K50,  K51,  K52,                    K56,                   K5A,  K5B,  K5C,  K5D,  K5E,        K5G         \
-) { \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   K1H   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   K2H   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F,   K3G,   K3H   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46, K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G,   K4H   }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   KC_NO, K5G,   KC_NO }, \
-    }