Merge remote-tracking branch 'origin/master' into develop

9 files changed, 512 insertions, 540 deletions

diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h
index f56d960e92..b7b00bef40 100644
--- a/keyboards/mechlovin/infinity87/infinity87.h
+++ b/keyboards/mechlovin/infinity87/infinity87.h
@@ -16,19 +16,3 @@
 #pragma once
 
 #include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,            K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D,  K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,            K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,       K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h
index de623a1cdd..167ed6940a 100644
--- a/keyboards/mechlovin/infinity87/rev1/rev1.h
+++ b/keyboards/mechlovin/infinity87/rev1/rev1.h
@@ -17,11 +17,3 @@
 #pragma once
 
 #include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_infinity87_rev1_rogue87
-    #include "rogue87.h"
-#elif KEYBOARD_mechlovin_infinity87_rev1_rouge87
-    #include "rouge87.h"
-#elif KEYBOARD_mechlovin_infinity87_rev1_standard
-    #include "infinity87.h"
-#endif
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
index b9906b410b..25fa20a9c7 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
@@ -11,92 +11,105 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K03", "x":4, "y":0},
-                {"label":"K04", "x":5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":8.5, "y":0},
-                {"label":"K08", "x":9.5, "y":0},
-                {"label":"K09", "x":11, "y":0},
-                {"label":"K0A", "x":12, "y":0},
-                {"label":"K0B", "x":13, "y":0},
-                {"label":"K0C", "x":14, "y":0},
-                {"label":"K0E", "x":15.25, "y":0},
-                {"label":"K0F", "x":16.25, "y":0},
-                {"label":"K0G", "x":17.25, "y":0},
-                {"label":"K10", "x":0, "y":1.25},
-                {"label":"K11", "x":1, "y":1.25},
-                {"label":"K12", "x":2, "y":1.25},
-                {"label":"K13", "x":3, "y":1.25},
-                {"label":"K14", "x":4, "y":1.25},
-                {"label":"K15", "x":5, "y":1.25},
-                {"label":"K16", "x":6, "y":1.25},
-                {"label":"K17", "x":7, "y":1.25},
-                {"label":"K18", "x":8, "y":1.25},
-                {"label":"K19", "x":9, "y":1.25},
-                {"label":"K1A", "x":10, "y":1.25},
-                {"label":"K1B", "x":11, "y":1.25},
-                {"label":"K1C", "x":12, "y":1.25},
-                {"label":"K1D", "x":13, "y":1.25, "w":2},
-                {"label":"K1E", "x":15.25, "y":1.25},
-                {"label":"K1F", "x":16.25, "y":1.25},
-                {"label":"K1G", "x":17.25, "y":1.25},
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21", "x":1.5, "y":2.25},
-                {"label":"K22", "x":2.5, "y":2.25},
-                {"label":"K23", "x":3.5, "y":2.25},
-                {"label":"K24", "x":4.5, "y":2.25},
-                {"label":"K25", "x":5.5, "y":2.25},
-                {"label":"K26", "x":6.5, "y":2.25},
-                {"label":"K27", "x":7.5, "y":2.25},
-                {"label":"K28", "x":8.5, "y":2.25},
-                {"label":"K29", "x":9.5, "y":2.25},
-                {"label":"K2A", "x":10.5, "y":2.25},
-                {"label":"K2B", "x":11.5, "y":2.25},
-                {"label":"K2C", "x":12.5, "y":2.25},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E", "x":15.25, "y":2.25},
-                {"label":"K2F", "x":16.25, "y":2.25},
-                {"label":"K2G", "x":17.25, "y":2.25},
-                {"label":"K30", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31", "x":1.75, "y":3.25},
-                {"label":"K32", "x":2.75, "y":3.25},
-                {"label":"K33", "x":3.75, "y":3.25},
-                {"label":"K34", "x":4.75, "y":3.25},
-                {"label":"K35", "x":5.75, "y":3.25},
-                {"label":"K36", "x":6.75, "y":3.25},
-                {"label":"K37", "x":7.75, "y":3.25},
-                {"label":"K38", "x":8.75, "y":3.25},
-                {"label":"K39", "x":9.75, "y":3.25},
-                {"label":"K3A", "x":10.75, "y":3.25},
-                {"label":"K3B", "x":11.75, "y":3.25},
-                {"label":"K3C", "x":12.75, "y":3.25},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4.25},
-                {"label":"K42", "x":2.25, "y":4.25},
-                {"label":"K43", "x":3.25, "y":4.25},
-                {"label":"K44", "x":4.25, "y":4.25},
-                {"label":"K45", "x":5.25, "y":4.25},
-                {"label":"K46", "x":6.25, "y":4.25},
-                {"label":"K47", "x":7.25, "y":4.25},
-                {"label":"K48", "x":8.25, "y":4.25},
-                {"label":"K49", "x":9.25, "y":4.25},
-                {"label":"K4A", "x":10.25, "y":4.25},
-                {"label":"K4B", "x":11.25, "y":4.25},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F", "x":16.25, "y":4.25},
-                {"label":"K50", "x":0, "y":5.25, "w":1.5},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"K56", "x":4, "y":5.25, "w":7},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"K5E", "x":15.25, "y":5.25},
-                {"label":"K5F", "x":16.25, "y":5.25},
-                {"label":"K5G", "x":17.25, "y":5.25}
+                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+
+                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+
+                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
+                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
+                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
+                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
+                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+
+                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h b/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
deleted file mode 100644
index 70a50b9620..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,     K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                    \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,               K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D,     K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F,   K0G  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO}, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, K4F,   KC_NO}, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G  }, \
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
index 2957247ad4..983d20fdbf 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
@@ -11,94 +11,107 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K03", "x":4, "y":0},
-                {"label":"K04", "x":5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":8.5, "y":0},
-                {"label":"K08", "x":9.5, "y":0},
-                {"label":"K09", "x":11, "y":0},
-                {"label":"K0A", "x":12, "y":0},
-                {"label":"K0B", "x":13, "y":0},
-                {"label":"K0C", "x":14, "y":0},
-                {"label":"K0E", "x":15.25, "y":0},
-                {"label":"K0F", "x":16.25, "y":0},
-                {"label":"K0G", "x":17.25, "y":0},
-                {"label":"K10", "x":0, "y":1.25},
-                {"label":"K11", "x":1, "y":1.25},
-                {"label":"K12", "x":2, "y":1.25},
-                {"label":"K13", "x":3, "y":1.25},
-                {"label":"K14", "x":4, "y":1.25},
-                {"label":"K15", "x":5, "y":1.25},
-                {"label":"K16", "x":6, "y":1.25},
-                {"label":"K17", "x":7, "y":1.25},
-                {"label":"K18", "x":8, "y":1.25},
-                {"label":"K19", "x":9, "y":1.25},
-                {"label":"K1A", "x":10, "y":1.25},
-                {"label":"K1B", "x":11, "y":1.25},
-                {"label":"K1C", "x":12, "y":1.25},
-                {"label":"K1D", "x":13, "y":1.25, "w":2},
-                {"label":"K1E", "x":15.25, "y":1.25},
-                {"label":"K1F", "x":16.25, "y":1.25},
-                {"label":"K1G", "x":17.25, "y":1.25},
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21", "x":1.5, "y":2.25},
-                {"label":"K22", "x":2.5, "y":2.25},
-                {"label":"K23", "x":3.5, "y":2.25},
-                {"label":"K24", "x":4.5, "y":2.25},
-                {"label":"K25", "x":5.5, "y":2.25},
-                {"label":"K26", "x":6.5, "y":2.25},
-                {"label":"K27", "x":7.5, "y":2.25},
-                {"label":"K28", "x":8.5, "y":2.25},
-                {"label":"K29", "x":9.5, "y":2.25},
-                {"label":"K2A", "x":10.5, "y":2.25},
-                {"label":"K2B", "x":11.5, "y":2.25},
-                {"label":"K2C", "x":12.5, "y":2.25},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E", "x":15.25, "y":2.25},
-                {"label":"K2F", "x":16.25, "y":2.25},
-                {"label":"K2G", "x":17.25, "y":2.25},
-                {"label":"K30", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31", "x":1.75, "y":3.25},
-                {"label":"K32", "x":2.75, "y":3.25},
-                {"label":"K33", "x":3.75, "y":3.25},
-                {"label":"K34", "x":4.75, "y":3.25},
-                {"label":"K35", "x":5.75, "y":3.25},
-                {"label":"K36", "x":6.75, "y":3.25},
-                {"label":"K37", "x":7.75, "y":3.25},
-                {"label":"K38", "x":8.75, "y":3.25},
-                {"label":"K39", "x":9.75, "y":3.25},
-                {"label":"K3A", "x":10.75, "y":3.25},
-                {"label":"K3B", "x":11.75, "y":3.25},
-                {"label":"K3C", "x":12.75, "y":3.25},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4.25},
-                {"label":"K42", "x":2.25, "y":4.25},
-                {"label":"K43", "x":3.25, "y":4.25},
-                {"label":"K44", "x":4.25, "y":4.25},
-                {"label":"K45", "x":5.25, "y":4.25},
-                {"label":"K46", "x":6.25, "y":4.25},
-                {"label":"K47", "x":7.25, "y":4.25},
-                {"label":"K48", "x":8.25, "y":4.25},
-                {"label":"K49", "x":9.25, "y":4.25},
-                {"label":"K4A", "x":10.25, "y":4.25},
-                {"label":"K4B", "x":11.25, "y":4.25},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F", "x":16.25, "y":4.25},
-                {"label":"K50", "x":0, "y":5.25, "w":1.5},
-                {"label":"K51", "x":1.5, "y":5.25},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"K56", "x":4, "y":5.25, "w":7},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5},
-                {"label":"K5C", "x":12.5, "y":5.25},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"K5E", "x":15.25, "y":5.25},
-                {"label":"K5F", "x":16.25, "y":5.25},
-                {"label":"K5G", "x":17.25, "y":5.25}
+                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+
+                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+
+                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
+                {"label":"K51", "x":1.5, "y":5.25, "matrix": [5, 1]},
+                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
+                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
+                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
+                {"label":"K5C", "x":12.5, "y":5.25, "matrix": [5, 12]},
+                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+
+                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h b/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h
deleted file mode 100644
index 67dcefde26..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,     K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                    \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,               K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,     K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F,   K0G  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO}, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, K4F,   KC_NO}, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G  }, \
-}
-
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index e19d4dbe7d..29597cce3f 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -11,97 +11,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":2, "y":0},
-                {"label":"K02 (B0,C0)", "x":3, "y":0},
-                {"label":"K03 (B0,C1)", "x":4, "y":0},
-                {"label":"K04 (B0,C2)", "x":5, "y":0},
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":11, "y":0},
-                {"label":"K0A (B0,D0)", "x":12, "y":0},
-                {"label":"K0B (B0,D1)", "x":13, "y":0},
-                {"label":"K0C (B0,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
+                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+
+                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
+                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+
+                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
+                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
+                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+
+                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index 609f6b1700..62aa3cfeb0 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -11,97 +11,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":2, "y":0},
-                {"label":"K02 (B0,C0)", "x":3, "y":0},
-                {"label":"K03 (B0,C1)", "x":4, "y":0},
-                {"label":"K04 (B0,C2)", "x":5, "y":0},
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":11, "y":0},
-                {"label":"K0A (B0,D0)", "x":12, "y":0},
-                {"label":"K0B (B0,D1)", "x":13, "y":0},
-                {"label":"K0C (B0,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
+                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+
+                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
+                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+
+                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
+                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
+                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+
+                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 0589e3f712..fc308175cf 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -11,97 +11,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":2, "y":0},
-                {"label":"K02 (B0,C0)", "x":3, "y":0},
-                {"label":"K03 (B0,C1)", "x":4, "y":0},
-                {"label":"K04 (B0,C2)", "x":5, "y":0},
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":11, "y":0},
-                {"label":"K0A (B0,D0)", "x":12, "y":0},
-                {"label":"K0B (B0,D1)", "x":13, "y":0},
-                {"label":"K0C (B0,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
+                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+
+                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
+                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+
+                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
+                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
+                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+
+                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }