Merge branch 'develop'

16 files changed, 545 insertions, 520 deletions

diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index f4961f2242..c95d84b30d 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C4, C5, D1 }
-#define MATRIX_COL_PINS { B4, B5, B6, B7, C7, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,7 +8,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sck/gtm/gtm.c b/keyboards/sck/gtm/gtm.c
deleted file mode 100644
index 6adb9b39b6..0000000000
--- a/keyboards/sck/gtm/gtm.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gtm.h"
diff --git a/keyboards/sck/gtm/gtm.h b/keyboards/sck/gtm/gtm.h
deleted file mode 100644
index 47625f417f..0000000000
--- a/keyboards/sck/gtm/gtm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14, K25 \
-) { \
-	{ K00,    K01,    K02,    K03,    K04,    KC_NO }, \
-	{ K10,    K11,    K12,    K13,    K14,    KC_NO }, \
-    { KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K25 }, \
-}
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index 3f254f2c77..422fb0c0f1 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6090",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "C7", "D0"],
+        "rows": ["C4", "C5", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3", "resolution": 1}
@@ -18,18 +26,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K15", "x":4, "y":0},
+                {"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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K16", "x":5.5, "y":0.5}
+                {"matrix": [2, 5], "x": 5.5, "y": 0.5}
             ]
         }
     }
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index f76b93ff68..a3c400ab47 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D0, B3, B2, B1, B0, E6, B5, B6, C6, C7, F7, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json
index 8588e9d605..b6ebf87311 100644
--- a/keyboards/sck/m0116b/info.json
+++ b/keyboards/sck/m0116b/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D5", "D3", "D2", "D0", "B3", "B2", "B1", "B0", "E6", "B5", "B6", "C6", "C7", "F7", "D4", "D6", "D7", "B4"],
+    "rows": ["D1", "F0", "F1", "F4", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "bootmagic": {
     "matrix": [0, 6]
   },
@@ -16,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.c b/keyboards/sck/m0116b/m0116b.c
deleted file mode 100644
index 368bc3eafd..0000000000
--- a/keyboards/sck/m0116b/m0116b.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "m0116b.h"
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 }, \
-    }
diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h
index 21a4f0d60c..a3c400ab47 100644
--- a/keyboards/sck/neiso/config.h
+++ b/keyboards/sck/neiso/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F4 }
-#define MATRIX_COL_PINS \
-    { B3, D2, F5, F7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json
index 3140669af5..c7b75dbbc3 100644
--- a/keyboards/sck/neiso/info.json
+++ b/keyboards/sck/neiso/info.json
@@ -8,11 +8,22 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "D2", "F5", "F7", "B4"],
+        "rows": ["F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}]
+            "layout": [
+                {"matrix": [0, 1], "x": 0.25, "y": 0, "w": 2, "h": 1.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25, "w": 1.25, "h": 2},
+                {"matrix": [0, 0], "x": 1.5, "y": 1.5},
+                {"matrix": [0, 3], "x": 0, "y": 1.75, "w": 1.25, "h": 2},
+                {"matrix": [0, 4], "x": 1.75, "y": 2.75, "w": 2, "h": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/sck/neiso/neiso.c b/keyboards/sck/neiso/neiso.c
deleted file mode 100644
index 8fe008e28b..0000000000
--- a/keyboards/sck/neiso/neiso.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "neiso.h"
diff --git a/keyboards/sck/neiso/neiso.h b/keyboards/sck/neiso/neiso.h
deleted file mode 100644
index 7058fab5bf..0000000000
--- a/keyboards/sck/neiso/neiso.h
+++ /dev/null
@@ -1,34 +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( \
-              k01,      k02, \
-                   k00,      \
-              k03,      k04  \
-) \
-    { {k00, k01, k02, k03, k04} }
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 801a7fdc16..cc6739122e 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -17,32 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-   #define RGB_DI_PIN D4
-   #ifdef RGB_DI_PIN
    #define RGBLED_NUM 9
    #define RGBLIGHT_HUE_STEP 10
    #define RGBLIGHT_SAT_STEP 17
    #define RGBLIGHT_VAL_STEP 17
-   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-   #endif
 
 /*
  * Feature disable options
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json
index c919d3b6e8..ae63add062 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -8,26 +8,346 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6",
         "num_lock": "C7",
         "scroll_lock": "B6"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_split_right_shift": "LAYOUT_alice"
+    },
     "layouts": {
-    "LAYOUT_default_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+        "LAYOUT_default_ansi": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_split_backspace": {
-            "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 0], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice_split_bs": {
-            "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 0], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c
deleted file mode 100644
index 7f144035e5..0000000000
--- a/keyboards/sck/osa/osa.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "osa.h"
diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h
deleted file mode 100644
index d6ac51c7be..0000000000
--- a/keyboards/sck/osa/osa.h
+++ /dev/null
@@ -1,120 +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.
- */
-
-/* LAYOUT
- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐┌────────┐
- * │10 │ │00 │01 │02 │03 │04 │05 │06 │         │56 │55 │54 │53 │52 │51 │50 │57 ││57      │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤└────────┘
- * │20 │ │11   │12 │13 │14 │15 │16 │         │66 │65 │64 │63 │62 │61 │60 │67   │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │30 │ │21    │22 │23 │24 │25 │26 │         │76 │75 │74 │73 │72 │71 │77      │
- * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌──────────┐
- *       │31      │32 │33 │34 │35 │36 │     │86 │85 │84 │83 │82 │81 │80    │87 ││87        │
- *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤└──────────┘
- *       │41   │     │43   │45     │46  │   │95        │93   │           │90   │
- *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_default_ansi( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81,      K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_split_backspace( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81,      K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_alice( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81, K80, K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_alice_split_bs( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81, K80, K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-
-#define LAYOUT_split_right_shift LAYOUT_alice
-#define LAYOUT_all LAYOUT_alice_split_bs