Merge branch 'develop'

7 files changed, 416 insertions, 493 deletions

diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index d2103b03c6..7928ebcd35 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -17,30 +17,10 @@ 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 { D2, D3, D5, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
 #    define RGBLIGHT_HUE_STEP 12
 #    define RGBLIGHT_SAT_STEP 25
 #    define RGBLIGHT_VAL_STEP 12
-//   #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 */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -52,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ktec/daisy/daisy.c b/keyboards/ktec/daisy/daisy.c
deleted file mode 100644
index 98b7ac84b3..0000000000
--- a/keyboards/ktec/daisy/daisy.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020
- *
- * 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 "daisy.h"
diff --git a/keyboards/ktec/daisy/daisy.h b/keyboards/ktec/daisy/daisy.h
deleted file mode 100644
index b78c604649..0000000000
--- a/keyboards/ktec/daisy/daisy.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2020
- *
- * 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 is 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( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1A, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
-    K30, K31, K32,      K34,           K35,      K37, K38, K39 \
-) { \
-    { K00, K01, K02, K03,   K04, K05, K06,   K07, K08, K09, K0A }, \
-    { K10, K11, K12, K13,   K14, K15, K16,   K17, K18, K19, K1A }, \
-    { K20, K21, K22, K23,   K24, K25, K26,   K27, K28, K29, K2A }, \
-    { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A }  \
-}
-
-#define LAYOUT_625_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1A, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
-    K30, K31, K32,                K35,                K38, K39 \
-) { \
-    { K00, K01, K02, K03,   K04,   K05, K06,   K07,   K08, K09, K0A }, \
-    { K10, K11, K12, K13,   K14,   K15, K16,   K17,   K18, K19, K1A }, \
-    { K20, K21, K22, K23,   K24,   K25, K26,   K27,   K28, K29, K2A }, \
-    { K30, K31, K32, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39, K3A } \
-}
diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index 6901774b23..ddd45dae05 100644
--- a/keyboards/ktec/daisy/info.json
+++ b/keyboards/ktec/daisy/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD7DC",
         "device_version": "5.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D0",
         "levels": 6
@@ -16,103 +21,106 @@
         "caps_lock": "C6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "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},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"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, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3, "w": 1.25},
-                {"x": 3.5, "y": 3, "w": 2.25},
-                {"x": 5.75, "y": 3, "w": 2.75},
-                {"x": 8.5, "y": 3, "w": 1.25},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3, "w": 1.25}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_625_space": {
             "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},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"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, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.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, "w": 6.25},
-                {"x": 9.5, "y": 3, "w": 1.25},
-                {"x": 10.75, "y": 3, "w": 1.25}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/info.json
index e2b2d4305a..3c9b0208bb 100644
--- a/keyboards/ktec/ergodone/info.json
+++ b/keyboards/ktec/ergodone/info.json
@@ -24,330 +24,330 @@
     "layouts": {
       "LAYOUT_ergodox": {
           "layout": [
-              { "label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
-              { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-              { "label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
-              { "label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "k55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "k56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "k54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "k53", "matrix": [5, 3], "w": 1, "x": 5, "y": 6, "h": 2 },
-              { "label": "k52", "matrix": [5, 2], "w": 1, "x": 6, "y": 6, "h": 2 },
-              { "label": "k51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "k07", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "k08", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "k09", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
-              { "label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
-              { "label": "k17", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "k18", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "k19", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
-              { "label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
-              { "label": "k28", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "k29", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
-              { "label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
-              { "label": "k37", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "k38", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "k39", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
-              { "label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "k49", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "k57", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "k58", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "k59", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "k5C", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "k5B", "matrix": [5, 11], "w": 1, "x": 10, "y": 6, "h": 2 },
-              { "label": "k5A", "matrix": [5, 10], "w": 1, "x": 11, "y": 6, "h": 2 }
+              {"label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375},
+              {"label": "k01", "matrix": [0, 1], "x": 1.5, "y": 0.375},
+              {"label": "k02", "matrix": [0, 2], "x": 2.5, "y": 0.125},
+              {"label": "k03", "matrix": [0, 3], "x": 3.5, "y": 0},
+              {"label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0.125},
+              {"label": "k05", "matrix": [0, 5], "x": 5.5, "y": 0.25},
+              {"label": "k06", "matrix": [0, 6], "x": 6.5, "y": 0.25},
+              {"label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375},
+              {"label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1.375},
+              {"label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1.125},
+              {"label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1},
+              {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1.125},
+              {"label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1.25},
+              {"label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+              {"label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375},
+              {"label": "k21", "matrix": [2, 1], "x": 1.5, "y": 2.375},
+              {"label": "k22", "matrix": [2, 2], "x": 2.5, "y": 2.125},
+              {"label": "k23", "matrix": [2, 3], "x": 3.5, "y": 2},
+              {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2.125},
+              {"label": "k25", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+              {"label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375},
+              {"label": "k31", "matrix": [3, 1], "x": 1.5, "y": 3.375},
+              {"label": "k32", "matrix": [3, 2], "x": 2.5, "y": 3.125},
+              {"label": "k33", "matrix": [3, 3], "x": 3.5, "y": 3},
+              {"label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3.125},
+              {"label": "k35", "matrix": [3, 5], "x": 5.5, "y": 3.25},
+              {"label": "k36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+              {"label": "k40", "matrix": [4, 0], "x": 0.5, "y": 4.375},
+              {"label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4.375},
+              {"label": "k42", "matrix": [4, 2], "x": 2.5, "y": 4.125},
+              {"label": "k43", "matrix": [4, 3], "x": 3.5, "y": 4},
+              {"label": "k44", "matrix": [4, 4], "x": 4.5, "y": 4.125},
+              {"label": "k55", "matrix": [5, 5], "x": 6, "y": 5},
+              {"label": "k56", "matrix": [5, 6], "x": 7, "y": 5},
+              {"label": "k54", "matrix": [5, 4], "x": 7, "y": 6},
+              {"label": "k53", "matrix": [5, 3], "x": 5, "y": 6, "h": 2},
+              {"label": "k52", "matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+              {"label": "k51", "matrix": [5, 1], "x": 7, "y": 7},
+              {"label": "k07", "matrix": [0, 7], "x": 9.5, "y": 0.25},
+              {"label": "k08", "matrix": [0, 8], "x": 10.5, "y": 0.25},
+              {"label": "k09", "matrix": [0, 9], "x": 11.5, "y": 0.125},
+              {"label": "k0A", "matrix": [0, 10], "x": 12.5, "y": 0},
+              {"label": "k0B", "matrix": [0, 11], "x": 13.5, "y": 0.125},
+              {"label": "k0C", "matrix": [0, 12], "x": 14.5, "y": 0.375},
+              {"label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375},
+              {"label": "k17", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+              {"label": "k18", "matrix": [1, 8], "x": 10.5, "y": 1.25},
+              {"label": "k19", "matrix": [1, 9], "x": 11.5, "y": 1.125},
+              {"label": "k1A", "matrix": [1, 10], "x": 12.5, "y": 1},
+              {"label": "k1B", "matrix": [1, 11], "x": 13.5, "y": 1.125},
+              {"label": "k1C", "matrix": [1, 12], "x": 14.5, "y": 1.375},
+              {"label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375},
+              {"label": "k28", "matrix": [2, 8], "x": 10.5, "y": 2.25},
+              {"label": "k29", "matrix": [2, 9], "x": 11.5, "y": 2.125},
+              {"label": "k2A", "matrix": [2, 10], "x": 12.5, "y": 2},
+              {"label": "k2B", "matrix": [2, 11], "x": 13.5, "y": 2.125},
+              {"label": "k2C", "matrix": [2, 12], "x": 14.5, "y": 2.375},
+              {"label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375},
+              {"label": "k37", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+              {"label": "k38", "matrix": [3, 8], "x": 10.5, "y": 3.25},
+              {"label": "k39", "matrix": [3, 9], "x": 11.5, "y": 3.125},
+              {"label": "k3A", "matrix": [3, 10], "x": 12.5, "y": 3},
+              {"label": "k3B", "matrix": [3, 11], "x": 13.5, "y": 3.125},
+              {"label": "k3C", "matrix": [3, 12], "x": 14.5, "y": 3.375},
+              {"label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375},
+              {"label": "k49", "matrix": [4, 9], "x": 11.5, "y": 4.125},
+              {"label": "k4A", "matrix": [4, 10], "x": 12.5, "y": 4},
+              {"label": "k4B", "matrix": [4, 11], "x": 13.5, "y": 4.125},
+              {"label": "k4C", "matrix": [4, 12], "x": 14.5, "y": 4.375},
+              {"label": "k4D", "matrix": [4, 13], "x": 15.5, "y": 4.375},
+              {"label": "k57", "matrix": [5, 7], "x": 9, "y": 5},
+              {"label": "k58", "matrix": [5, 8], "x": 10, "y": 5},
+              {"label": "k59", "matrix": [5, 9], "x": 9, "y": 6},
+              {"label": "k5C", "matrix": [5, 12], "x": 9, "y": 7},
+              {"label": "k5B", "matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+              {"label": "k5A", "matrix": [5, 10], "x": 11, "y": 6, "h": 2}
           ]
       },
       "LAYOUT_ergodox_80": {
           "layout": [
-              { "label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
-              { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-              { "label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
-              { "label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "k55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "k56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 6 },
-              { "label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 6 },
-              { "label": "k54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "k53", "matrix": [5, 3], "w": 1, "x": 5, "y": 7 },
-              { "label": "k52", "matrix": [5, 2], "w": 1, "x": 6, "y": 7 },
-              { "label": "k51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "k07", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "k08", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "k09", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
-              { "label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
-              { "label": "k17", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "k18", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "k19", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
-              { "label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
-              { "label": "k28", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "k29", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
-              { "label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
-              { "label": "k37", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "k38", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "k39", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
-              { "label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "k49", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "k57", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "k58", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "k59", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "k47", "matrix": [4, 7], "w": 1, "x": 10, "y": 6 },
-              { "label": "k48", "matrix": [4, 8], "w": 1, "x": 11, "y": 6 },
-              { "label": "k5C", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "k5B", "matrix": [5, 11], "w": 1, "x": 10, "y": 7 },
-              { "label": "k5A", "matrix": [5, 10], "w": 1, "x": 11, "y": 7 }
+              {"label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375},
+              {"label": "k01", "matrix": [0, 1], "x": 1.5, "y": 0.375},
+              {"label": "k02", "matrix": [0, 2], "x": 2.5, "y": 0.125},
+              {"label": "k03", "matrix": [0, 3], "x": 3.5, "y": 0},
+              {"label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0.125},
+              {"label": "k05", "matrix": [0, 5], "x": 5.5, "y": 0.25},
+              {"label": "k06", "matrix": [0, 6], "x": 6.5, "y": 0.25},
+              {"label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375},
+              {"label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1.375},
+              {"label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1.125},
+              {"label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1},
+              {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1.125},
+              {"label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1.25},
+              {"label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+              {"label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375},
+              {"label": "k21", "matrix": [2, 1], "x": 1.5, "y": 2.375},
+              {"label": "k22", "matrix": [2, 2], "x": 2.5, "y": 2.125},
+              {"label": "k23", "matrix": [2, 3], "x": 3.5, "y": 2},
+              {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2.125},
+              {"label": "k25", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+              {"label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375},
+              {"label": "k31", "matrix": [3, 1], "x": 1.5, "y": 3.375},
+              {"label": "k32", "matrix": [3, 2], "x": 2.5, "y": 3.125},
+              {"label": "k33", "matrix": [3, 3], "x": 3.5, "y": 3},
+              {"label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3.125},
+              {"label": "k35", "matrix": [3, 5], "x": 5.5, "y": 3.25},
+              {"label": "k36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+              {"label": "k40", "matrix": [4, 0], "x": 0.5, "y": 4.375},
+              {"label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4.375},
+              {"label": "k42", "matrix": [4, 2], "x": 2.5, "y": 4.125},
+              {"label": "k43", "matrix": [4, 3], "x": 3.5, "y": 4},
+              {"label": "k44", "matrix": [4, 4], "x": 4.5, "y": 4.125},
+              {"label": "k55", "matrix": [5, 5], "x": 6, "y": 5},
+              {"label": "k56", "matrix": [5, 6], "x": 7, "y": 5},
+              {"label": "k45", "matrix": [4, 5], "x": 5, "y": 6},
+              {"label": "k46", "matrix": [4, 6], "x": 6, "y": 6},
+              {"label": "k54", "matrix": [5, 4], "x": 7, "y": 6},
+              {"label": "k53", "matrix": [5, 3], "x": 5, "y": 7},
+              {"label": "k52", "matrix": [5, 2], "x": 6, "y": 7},
+              {"label": "k51", "matrix": [5, 1], "x": 7, "y": 7},
+              {"label": "k07", "matrix": [0, 7], "x": 9.5, "y": 0.25},
+              {"label": "k08", "matrix": [0, 8], "x": 10.5, "y": 0.25},
+              {"label": "k09", "matrix": [0, 9], "x": 11.5, "y": 0.125},
+              {"label": "k0A", "matrix": [0, 10], "x": 12.5, "y": 0},
+              {"label": "k0B", "matrix": [0, 11], "x": 13.5, "y": 0.125},
+              {"label": "k0C", "matrix": [0, 12], "x": 14.5, "y": 0.375},
+              {"label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375},
+              {"label": "k17", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+              {"label": "k18", "matrix": [1, 8], "x": 10.5, "y": 1.25},
+              {"label": "k19", "matrix": [1, 9], "x": 11.5, "y": 1.125},
+              {"label": "k1A", "matrix": [1, 10], "x": 12.5, "y": 1},
+              {"label": "k1B", "matrix": [1, 11], "x": 13.5, "y": 1.125},
+              {"label": "k1C", "matrix": [1, 12], "x": 14.5, "y": 1.375},
+              {"label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375},
+              {"label": "k28", "matrix": [2, 8], "x": 10.5, "y": 2.25},
+              {"label": "k29", "matrix": [2, 9], "x": 11.5, "y": 2.125},
+              {"label": "k2A", "matrix": [2, 10], "x": 12.5, "y": 2},
+              {"label": "k2B", "matrix": [2, 11], "x": 13.5, "y": 2.125},
+              {"label": "k2C", "matrix": [2, 12], "x": 14.5, "y": 2.375},
+              {"label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375},
+              {"label": "k37", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+              {"label": "k38", "matrix": [3, 8], "x": 10.5, "y": 3.25},
+              {"label": "k39", "matrix": [3, 9], "x": 11.5, "y": 3.125},
+              {"label": "k3A", "matrix": [3, 10], "x": 12.5, "y": 3},
+              {"label": "k3B", "matrix": [3, 11], "x": 13.5, "y": 3.125},
+              {"label": "k3C", "matrix": [3, 12], "x": 14.5, "y": 3.375},
+              {"label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375},
+              {"label": "k49", "matrix": [4, 9], "x": 11.5, "y": 4.125},
+              {"label": "k4A", "matrix": [4, 10], "x": 12.5, "y": 4},
+              {"label": "k4B", "matrix": [4, 11], "x": 13.5, "y": 4.125},
+              {"label": "k4C", "matrix": [4, 12], "x": 14.5, "y": 4.375},
+              {"label": "k4D", "matrix": [4, 13], "x": 15.5, "y": 4.375},
+              {"label": "k57", "matrix": [5, 7], "x": 9, "y": 5},
+              {"label": "k58", "matrix": [5, 8], "x": 10, "y": 5},
+              {"label": "k59", "matrix": [5, 9], "x": 9, "y": 6},
+              {"label": "k47", "matrix": [4, 7], "x": 10, "y": 6},
+              {"label": "k48", "matrix": [4, 8], "x": 11, "y": 6},
+              {"label": "k5C", "matrix": [5, 12], "x": 9, "y": 7},
+              {"label": "k5B", "matrix": [5, 11], "x": 10, "y": 7},
+              {"label": "k5A", "matrix": [5, 10], "x": 11, "y": 7}
           ]
       },
       "LAYOUT_ergodox_pretty": {
           "layout": [
-              { "label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "L05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "L06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
-              { "label": "R00", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "R01", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "R02", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "R03", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "R04", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "R05", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
-              { "label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
-              { "label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "L15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "L16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-              { "label": "R10", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "R11", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "R12", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "R13", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "R14", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "R15", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
-              { "label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
-              { "label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "L25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
-              { "label": "R21", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "R22", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "R23", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "R24", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "R25", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
-              { "label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
-              { "label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "L35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "L36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "R30", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "R31", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "R32", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "R33", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "R34", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "R35", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
-              { "label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "L40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "L41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "L42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "L43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "L44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "R42", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "R43", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "R44", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "R45", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "R46", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "L55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "L56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "R50", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "R51", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "L54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "R52", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "L53", "matrix": [5, 3], "w": 1, "x": 5, "y": 6,"h": 2 },
-              { "label": "L52", "matrix": [5, 2], "w": 1, "x": 6, "y": 6,"h": 2 },
-              { "label": "L51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "R55", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "R54", "matrix": [5, 11], "w": 1, "x": 10, "y": 6, "h": 2 },
-              { "label": "R53", "matrix": [5, 10], "w": 1, "x": 11, "y": 6, "h": 2 }
+              {"label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375},
+              {"label": "L01", "matrix": [0, 1], "x": 1.5, "y": 0.375},
+              {"label": "L02", "matrix": [0, 2], "x": 2.5, "y": 0.125},
+              {"label": "L03", "matrix": [0, 3], "x": 3.5, "y": 0},
+              {"label": "L04", "matrix": [0, 4], "x": 4.5, "y": 0.125},
+              {"label": "L05", "matrix": [0, 5], "x": 5.5, "y": 0.25},
+              {"label": "L06", "matrix": [0, 6], "x": 6.5, "y": 0.25},
+              {"label": "R00", "matrix": [0, 7], "x": 9.5, "y": 0.25},
+              {"label": "R01", "matrix": [0, 8], "x": 10.5, "y": 0.25},
+              {"label": "R02", "matrix": [0, 9], "x": 11.5, "y": 0.125},
+              {"label": "R03", "matrix": [0, 10], "x": 12.5, "y": 0},
+              {"label": "R04", "matrix": [0, 11], "x": 13.5, "y": 0.125},
+              {"label": "R05", "matrix": [0, 12], "x": 14.5, "y": 0.375},
+              {"label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375},
+              {"label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375},
+              {"label": "L11", "matrix": [1, 1], "x": 1.5, "y": 1.375},
+              {"label": "L12", "matrix": [1, 2], "x": 2.5, "y": 1.125},
+              {"label": "L13", "matrix": [1, 3], "x": 3.5, "y": 1},
+              {"label": "L14", "matrix": [1, 4], "x": 4.5, "y": 1.125},
+              {"label": "L15", "matrix": [1, 5], "x": 5.5, "y": 1.25},
+              {"label": "L16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+              {"label": "R10", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+              {"label": "R11", "matrix": [1, 8], "x": 10.5, "y": 1.25},
+              {"label": "R12", "matrix": [1, 9], "x": 11.5, "y": 1.125},
+              {"label": "R13", "matrix": [1, 10], "x": 12.5, "y": 1},
+              {"label": "R14", "matrix": [1, 11], "x": 13.5, "y": 1.125},
+              {"label": "R15", "matrix": [1, 12], "x": 14.5, "y": 1.375},
+              {"label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375},
+              {"label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375},
+              {"label": "L21", "matrix": [2, 1], "x": 1.5, "y": 2.375},
+              {"label": "L22", "matrix": [2, 2], "x": 2.5, "y": 2.125},
+              {"label": "L23", "matrix": [2, 3], "x": 3.5, "y": 2},
+              {"label": "L24", "matrix": [2, 4], "x": 4.5, "y": 2.125},
+              {"label": "L25", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+              {"label": "R21", "matrix": [2, 8], "x": 10.5, "y": 2.25},
+              {"label": "R22", "matrix": [2, 9], "x": 11.5, "y": 2.125},
+              {"label": "R23", "matrix": [2, 10], "x": 12.5, "y": 2},
+              {"label": "R24", "matrix": [2, 11], "x": 13.5, "y": 2.125},
+              {"label": "R25", "matrix": [2, 12], "x": 14.5, "y": 2.375},
+              {"label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375},
+              {"label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375},
+              {"label": "L31", "matrix": [3, 1], "x": 1.5, "y": 3.375},
+              {"label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.125},
+              {"label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3},
+              {"label": "L34", "matrix": [3, 4], "x": 4.5, "y": 3.125},
+              {"label": "L35", "matrix": [3, 5], "x": 5.5, "y": 3.25},
+              {"label": "L36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+              {"label": "R30", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+              {"label": "R31", "matrix": [3, 8], "x": 10.5, "y": 3.25},
+              {"label": "R32", "matrix": [3, 9], "x": 11.5, "y": 3.125},
+              {"label": "R33", "matrix": [3, 10], "x": 12.5, "y": 3},
+              {"label": "R34", "matrix": [3, 11], "x": 13.5, "y": 3.125},
+              {"label": "R35", "matrix": [3, 12], "x": 14.5, "y": 3.375},
+              {"label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375},
+              {"label": "L40", "matrix": [4, 0], "x": 0.5, "y": 4.375},
+              {"label": "L41", "matrix": [4, 1], "x": 1.5, "y": 4.375},
+              {"label": "L42", "matrix": [4, 2], "x": 2.5, "y": 4.125},
+              {"label": "L43", "matrix": [4, 3], "x": 3.5, "y": 4},
+              {"label": "L44", "matrix": [4, 4], "x": 4.5, "y": 4.125},
+              {"label": "R42", "matrix": [4, 9], "x": 11.5, "y": 4.125},
+              {"label": "R43", "matrix": [4, 10], "x": 12.5, "y": 4},
+              {"label": "R44", "matrix": [4, 11], "x": 13.5, "y": 4.125},
+              {"label": "R45", "matrix": [4, 12], "x": 14.5, "y": 4.375},
+              {"label": "R46", "matrix": [4, 13], "x": 15.5, "y": 4.375},
+              {"label": "L55", "matrix": [5, 5], "x": 6, "y": 5},
+              {"label": "L56", "matrix": [5, 6], "x": 7, "y": 5},
+              {"label": "R50", "matrix": [5, 7], "x": 9, "y": 5},
+              {"label": "R51", "matrix": [5, 8], "x": 10, "y": 5},
+              {"label": "L54", "matrix": [5, 4], "x": 7, "y": 6},
+              {"label": "R52", "matrix": [5, 9], "x": 9, "y": 6},
+              {"label": "L53", "matrix": [5, 3], "x": 5, "y": 6, "h": 2},
+              {"label": "L52", "matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+              {"label": "L51", "matrix": [5, 1], "x": 7, "y": 7},
+              {"label": "R55", "matrix": [5, 12], "x": 9, "y": 7},
+              {"label": "R54", "matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+              {"label": "R53", "matrix": [5, 10], "x": 11, "y": 6, "h": 2}
           ]
       },
       "LAYOUT_ergodox_pretty_80": {
           "layout": [
-              { "label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "L05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "L06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
-              { "label": "R00", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "R01", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "R02", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "R03", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "R04", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "R05", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
-              { "label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
-              { "label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "L15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "L16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-              { "label": "R10", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "R11", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "R12", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "R13", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "R14", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "R15", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
-              { "label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
-              { "label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "L25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
-              { "label": "R21", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "R22", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "R23", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "R24", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "R25", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
-              { "label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
-              { "label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "L35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "L36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "R30", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "R31", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "R32", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "R33", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "R34", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "R35", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
-              { "label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "L40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "L41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "L42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "L43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "L44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "R42", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "R43", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "R44", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "R45", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "R46", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "L55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "L56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "R50", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "R51", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "L45", "matrix": [4, 5], "w": 1, "x": 5, "y": 6 },
-              { "label": "L46", "matrix": [4, 6], "w": 1, "x": 6, "y": 6 },
-              { "label": "L54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "R52", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "R40", "matrix": [4, 7], "w": 1, "x": 10, "y": 6 },
-              { "label": "R41", "matrix": [4, 8], "w": 1, "x": 11, "y": 6 },
-              { "label": "L53", "matrix": [5, 3], "w": 1, "x": 5, "y": 7 },
-              { "label": "L52", "matrix": [5, 2], "w": 1, "x": 6, "y": 7 },
-              { "label": "L51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "R55", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "R54", "matrix": [5, 11], "w": 1, "x": 10, "y": 7 },
-              { "label": "R53", "matrix": [5, 10], "w": 1, "x": 11, "y": 7 }
+              {"label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375},
+              {"label": "L01", "matrix": [0, 1], "x": 1.5, "y": 0.375},
+              {"label": "L02", "matrix": [0, 2], "x": 2.5, "y": 0.125},
+              {"label": "L03", "matrix": [0, 3], "x": 3.5, "y": 0},
+              {"label": "L04", "matrix": [0, 4], "x": 4.5, "y": 0.125},
+              {"label": "L05", "matrix": [0, 5], "x": 5.5, "y": 0.25},
+              {"label": "L06", "matrix": [0, 6], "x": 6.5, "y": 0.25},
+              {"label": "R00", "matrix": [0, 7], "x": 9.5, "y": 0.25},
+              {"label": "R01", "matrix": [0, 8], "x": 10.5, "y": 0.25},
+              {"label": "R02", "matrix": [0, 9], "x": 11.5, "y": 0.125},
+              {"label": "R03", "matrix": [0, 10], "x": 12.5, "y": 0},
+              {"label": "R04", "matrix": [0, 11], "x": 13.5, "y": 0.125},
+              {"label": "R05", "matrix": [0, 12], "x": 14.5, "y": 0.375},
+              {"label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375},
+              {"label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375},
+              {"label": "L11", "matrix": [1, 1], "x": 1.5, "y": 1.375},
+              {"label": "L12", "matrix": [1, 2], "x": 2.5, "y": 1.125},
+              {"label": "L13", "matrix": [1, 3], "x": 3.5, "y": 1},
+              {"label": "L14", "matrix": [1, 4], "x": 4.5, "y": 1.125},
+              {"label": "L15", "matrix": [1, 5], "x": 5.5, "y": 1.25},
+              {"label": "L16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+              {"label": "R10", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+              {"label": "R11", "matrix": [1, 8], "x": 10.5, "y": 1.25},
+              {"label": "R12", "matrix": [1, 9], "x": 11.5, "y": 1.125},
+              {"label": "R13", "matrix": [1, 10], "x": 12.5, "y": 1},
+              {"label": "R14", "matrix": [1, 11], "x": 13.5, "y": 1.125},
+              {"label": "R15", "matrix": [1, 12], "x": 14.5, "y": 1.375},
+              {"label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375},
+              {"label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375},
+              {"label": "L21", "matrix": [2, 1], "x": 1.5, "y": 2.375},
+              {"label": "L22", "matrix": [2, 2], "x": 2.5, "y": 2.125},
+              {"label": "L23", "matrix": [2, 3], "x": 3.5, "y": 2},
+              {"label": "L24", "matrix": [2, 4], "x": 4.5, "y": 2.125},
+              {"label": "L25", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+              {"label": "R21", "matrix": [2, 8], "x": 10.5, "y": 2.25},
+              {"label": "R22", "matrix": [2, 9], "x": 11.5, "y": 2.125},
+              {"label": "R23", "matrix": [2, 10], "x": 12.5, "y": 2},
+              {"label": "R24", "matrix": [2, 11], "x": 13.5, "y": 2.125},
+              {"label": "R25", "matrix": [2, 12], "x": 14.5, "y": 2.375},
+              {"label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375},
+              {"label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375},
+              {"label": "L31", "matrix": [3, 1], "x": 1.5, "y": 3.375},
+              {"label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.125},
+              {"label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3},
+              {"label": "L34", "matrix": [3, 4], "x": 4.5, "y": 3.125},
+              {"label": "L35", "matrix": [3, 5], "x": 5.5, "y": 3.25},
+              {"label": "L36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+              {"label": "R30", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+              {"label": "R31", "matrix": [3, 8], "x": 10.5, "y": 3.25},
+              {"label": "R32", "matrix": [3, 9], "x": 11.5, "y": 3.125},
+              {"label": "R33", "matrix": [3, 10], "x": 12.5, "y": 3},
+              {"label": "R34", "matrix": [3, 11], "x": 13.5, "y": 3.125},
+              {"label": "R35", "matrix": [3, 12], "x": 14.5, "y": 3.375},
+              {"label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375},
+              {"label": "L40", "matrix": [4, 0], "x": 0.5, "y": 4.375},
+              {"label": "L41", "matrix": [4, 1], "x": 1.5, "y": 4.375},
+              {"label": "L42", "matrix": [4, 2], "x": 2.5, "y": 4.125},
+              {"label": "L43", "matrix": [4, 3], "x": 3.5, "y": 4},
+              {"label": "L44", "matrix": [4, 4], "x": 4.5, "y": 4.125},
+              {"label": "R42", "matrix": [4, 9], "x": 11.5, "y": 4.125},
+              {"label": "R43", "matrix": [4, 10], "x": 12.5, "y": 4},
+              {"label": "R44", "matrix": [4, 11], "x": 13.5, "y": 4.125},
+              {"label": "R45", "matrix": [4, 12], "x": 14.5, "y": 4.375},
+              {"label": "R46", "matrix": [4, 13], "x": 15.5, "y": 4.375},
+              {"label": "L55", "matrix": [5, 5], "x": 6, "y": 5},
+              {"label": "L56", "matrix": [5, 6], "x": 7, "y": 5},
+              {"label": "R50", "matrix": [5, 7], "x": 9, "y": 5},
+              {"label": "R51", "matrix": [5, 8], "x": 10, "y": 5},
+              {"label": "L45", "matrix": [4, 5], "x": 5, "y": 6},
+              {"label": "L46", "matrix": [4, 6], "x": 6, "y": 6},
+              {"label": "L54", "matrix": [5, 4], "x": 7, "y": 6},
+              {"label": "R52", "matrix": [5, 9], "x": 9, "y": 6},
+              {"label": "R40", "matrix": [4, 7], "x": 10, "y": 6},
+              {"label": "R41", "matrix": [4, 8], "x": 11, "y": 6},
+              {"label": "L53", "matrix": [5, 3], "x": 5, "y": 7},
+              {"label": "L52", "matrix": [5, 2], "x": 6, "y": 7},
+              {"label": "L51", "matrix": [5, 1], "x": 7, "y": 7},
+              {"label": "R55", "matrix": [5, 12], "x": 9, "y": 7},
+              {"label": "R54", "matrix": [5, 11], "x": 10, "y": 7},
+              {"label": "R53", "matrix": [5, 10], "x": 11, "y": 7}
           ]
       }
   }
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index 23c362c0aa..31f2930ac1 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define RGB_DI_PIN C6
 #define RGBLED_NUM 1     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -28,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_LIMIT_VAL 200
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index 02189fecf7..3600de0c35 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "Staryu", 
+    "keyboard_name": "Staryu",
     "manufacturer": "K.T.E.C.",
-    "url": "", 
-    "maintainer": "qmk", 
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
         "vid": "0x1209",
         "pid": "0x2328",
@@ -15,6 +15,12 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "ws2812": {
+        "pin": "C6"
+    },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "processor": "atmega32u2",
     "bootloader": "lufa-dfu",
     "matrix_pins": {
@@ -26,11 +32,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }