Merge branch 'develop'

4 files changed, 445 insertions, 724 deletions

diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index 731309b6fa..62b31cf95b 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/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 { C6, C7, F7, F6, F5, F4, F1, F0, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, E6, B0, B1, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #   define RGBLIGHT_EFFECT_BREATHING
 #   define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #   define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGBLIGHT_SAT_STEP 8
 #   define RGBLIGHT_VAL_STEP 8
 #   define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
index e9ab25aedb..add2f077fe 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0602",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"],
+        "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -19,495 +27,495 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2},
-                {"x": 13.75,  "y": 2, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
 
-                {"x": 0,      "y": 3, "w": 1.25},
-                {"x": 1.25,   "y": 3},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0, "w": 2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x": 0,      "y": 3, "w": 2.25},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 2.75},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x": 0,      "y": 3, "w": 2.25},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_hhkb": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x": 0,      "y": 3, "w": 2.25},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x": 1.5,    "y": 4},
-                {"x": 2.5,    "y": 4, "w": 1.5},
-                {"x": 4,      "y": 4, "w": 7},
-                {"x": 11,     "y": 4, "w": 1.5},
-                {"x": 12.5,   "y": 4}
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0, "w": 2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2},
-                {"x": 13.75,  "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x": 0,      "y": 3, "w": 1.25},
-                {"x": 1.25,   "y": 3},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 2.75},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso_split_bs_rshift": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2},
-                {"x": 13.75,  "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x": 0,      "y": 3, "w": 1.25},
-                {"x": 1.25,   "y": 3},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x": 0,      "y": 3, "w": 2.25},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.5},
-                {"x": 1.5,    "y": 4},
-                {"x": 2.5,    "y": 4, "w": 1.5},
-                {"x": 4,      "y": 4, "w": 7},
-                {"x": 11,     "y": 4, "w": 1.5},
-                {"x": 12.5,   "y": 4},
-                {"x": 13.5,   "y": 4, "w": 1.5}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/chlx/str_merro60/str_merro60.c b/keyboards/chlx/str_merro60/str_merro60.c
deleted file mode 100644
index fd4f843d74..0000000000
--- a/keyboards/chlx/str_merro60/str_merro60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
-Copyright 2021 Alexander Lee <chlx.bsmt@gmail.com> 
-
-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 "str_merro60.h"
diff --git a/keyboards/chlx/str_merro60/str_merro60.h b/keyboards/chlx/str_merro60/str_merro60.h
deleted file mode 100644
index 6ca2023f71..0000000000
--- a/keyboards/chlx/str_merro60/str_merro60.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* 
-Copyright 2022 Alexander Lee <chlx.bsmt@gmail.com> 
-
-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"
-
-// Corresponding changes to the layout names and/or definitions must also be made to info.json
-
-#define XXX KC_NO
-
-/* //////////////////// LAYOUT_all ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │    │    │    │    (6.25u)             │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-
-#define LAYOUT_all( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k96, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,      \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,      \
-    k80, k90,           k82, k92,                k94, k85, k95, k86            \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, k36 }, \
-    { k40, k41, k42, k43, k44, k45, k46 }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { k70, k71, k72, k73, k74, k75, k76 }, \
-    { k80, XXX, k82, XXX, XXX, k85, k86 }, \
-    { k90, XXX, k92, XXX, k94, k95, k96 }  \
-}
-
-/* //////////////////// LAYOUT_60_ansi ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │   │   │   │   │   │   │   │   │   │   │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │    (6.25u)             │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-#define LAYOUT_60_ansi( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,      \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      \
-    k60,      k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66,           \
-    k80, k90,           k82, k92,                k94, k85, k95, k86            \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, k36 }, \
-    { k40, k41, k42, k43, k44, k45, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { XXX, k71, k72, k73, k74, k75, XXX }, \
-    { k80, XXX, k82, XXX, XXX, k85, k86 }, \
-    { k90, XXX, k92, XXX, k94, k95, XXX }  \
-}
-
-/* //////////////////// LAYOUT_60_ansi_split_bs_rshift ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │    │    │    │    (6.25u)             │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-#define LAYOUT_60_ansi_split_bs_rshift( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k96, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      \
-    k60,      k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,      \
-    k80, k90,           k82, k92,                k94, k85, k95, k86            \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, k36 }, \
-    { k40, k41, k42, k43, k44, k45, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { XXX, k71, k72, k73, k74, k75, k76 }, \
-    { k80, XXX, k82, XXX, XXX, k85, k86 }, \
-    { k90, XXX, k92, XXX, k94, k95, k96 }  \
-}
-
-/* //////////////////// LAYOUT_60_hhkb ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
- * │▓▓▓▓▓│   │     │   (7u)                    │     │   │▓▓▓▓▓│
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
-*/
-#define LAYOUT_60_hhkb( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k96, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      \
-    k60,      k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,      \
-         k90,           k82, k92,                     k85, k95                 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, k36 }, \
-    { k40, k41, k42, k43, k44, k45, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { XXX, k71, k72, k73, k74, k75, k76 }, \
-    { XXX, XXX, k82, XXX, XXX, k85, XXX }, \
-    { k90, XXX, k92, XXX, XXX, k95, k96 }  \
-}
-
-/* //////////////////// LAYOUT_60_iso ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │    (6.25u)             │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-#define LAYOUT_60_iso( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,      \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,           \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,      \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66,           \
-    k80, k90,           k82, k92,                k94, k85, k95, k86            \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46 }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { k70, k71, k72, k73, k74, k75, XXX }, \
-    { k80, XXX, k82, XXX, XXX, k85, k86 }, \
-    { k90, XXX, k92, XXX, k94, k95, XXX }  \
-}
-
-/* //////////////////// LAYOUT_60_iso_split_bs_rshift ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │    │    │    │    (6.25u)             │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-#define LAYOUT_60_iso_split_bs_rshift( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k96, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,           \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,      \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,      \
-    k80, k90,           k82, k92,                k94, k85, k95, k86            \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46 }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { k70, k71, k72, k73, k74, k75, k76 }, \
-    { k80, XXX, k82, XXX, XXX, k85, k86 }, \
-    { k90, XXX, k92, XXX, k94, k95, k96 }  \
-}
-
-/* //////////////////// LAYOUT_60_tsangan_hhkb ////////////////////
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
- * │     │   │     │   (7u)                    │     │   │     │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
-*/
-#define LAYOUT_60_tsangan_hhkb( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k96, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      \
-    k60,      k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,      \
-    k80, k90,           k82, k92,                     k85, k95, k86            \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25, k26 }, \
-    { k30, k31, k32, k33, k34, k35, k36 }, \
-    { k40, k41, k42, k43, k44, k45, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56 }, \
-    { k60, k61, k62, k63, k64, k65, k66 }, \
-    { XXX, k71, k72, k73, k74, k75, k76 }, \
-    { k80, XXX, k82, XXX, XXX, k85, k86 }, \
-    { k90, XXX, k92, XXX, XXX, k95, k96 }  \
-}