Migrate some more layouts to data driven (#19889)

8 files changed, 736 insertions, 758 deletions

diff --git a/keyboards/cannonkeys/db60/db60.c b/keyboards/cannonkeys/db60/db60.c
deleted file mode 100644
index 25344360bc..0000000000
--- a/keyboards/cannonkeys/db60/db60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "db60.h"
diff --git a/keyboards/cannonkeys/db60/db60.h b/keyboards/cannonkeys/db60/db60.h
deleted file mode 100644
index b0d5105e9f..0000000000
--- a/keyboards/cannonkeys/db60/db60.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* Copyright 2021 Andrew Kannan
-  *
-  * 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/>.
-  */
-
-#if defined(KEYBOARD_cannonkeys_db60_j02)
-    #include "j02.h"
-#elif defined(KEYBOARD_cannonkeys_db60_hotswap)
-    #include "hotswap.h"
-#else
-    #include "rev2.h"
-#endif
diff --git a/keyboards/cannonkeys/db60/hotswap/hotswap.h b/keyboards/cannonkeys/db60/hotswap/hotswap.h
deleted file mode 100644
index 84e3528fd0..0000000000
--- a/keyboards/cannonkeys/db60/hotswap/hotswap.h
+++ /dev/null
@@ -1,63 +0,0 @@
- /* Copyright 2021 Andrew Kannan
-  *
-  * 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 KNO KC_NO
-
-#define LAYOUT_60_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
-  K40, K41,  K42,              K46,                 K4A, K4B, K4C,      K4E \
-) { \
-  {  K00,  K01,  K02,  K03,  K04,    K05,    K06,    K07,    K08,    K09,  K0A,  K0B,  K0C,  KNO,  K0E}, \
-  {  K10,  K11,  K12,  K13,  K14,    K15,    K16,    K17,    K18,    K19,  K1A,  K1B,  K1C,  KNO,  K1E   }, \
-  {  K20,  K21,  K22,  K23,  K24,    K25,    K26,    K27,    K28,    K29,  K2A,  K2B,  KNO,  KNO,  K2E  }, \
-  {  K30,  KNO,  K32,  K33,  K34,    K35,    K36,    K37,    K38,    K39,  K3A,  K3B,  K3C,  KNO,  KNO  }, \
-  {  K40,  K41,  K42,  KNO,  KNO,    KNO,    K46,    KNO,    KNO,    KNO,  K4A,  K4B,  K4C,  KNO,  K4E  }  \
-}
-
-#define LAYOUT_60_tsangan_hhkb( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,\
-  K40, K41,  K42,              K46,                      K4B, K4C,      K4E \
-) { \
-  {  K00,  K01,  K02,  K03,  K04,    K05,    K06,    K07,    K08,    K09,  K0A,  K0B,  K0C,  K0D,  K0E}, \
-  {  K10,  K11,  K12,  K13,  K14,    K15,    K16,    K17,    K18,    K19,  K1A,  K1B,  K1C,  KNO,  K1E   }, \
-  {  K20,  K21,  K22,  K23,  K24,    K25,    K26,    K27,    K28,    K29,  K2A,  K2B,  KNO,  KNO,  K2E  }, \
-  {  K30,  KNO,  K32,  K33,  K34,    K35,    K36,    K37,    K38,    K39,  K3A,  K3B,  K3C,  KNO,  K3E  }, \
-  {  K40,  K41,  K42,  KNO,  KNO,    KNO,    K46,    KNO,    KNO,    KNO,  KNO,  K4B,  K4C,  KNO,  K4E  }  \
-}
-
-#define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,\
-  K40, K41,  K42,              K46,                 K4A, K4B, K4C,      K4E \
-) { \
-  {  K00,  K01,  K02,  K03,  K04,    K05,    K06,    K07,    K08,    K09,  K0A,  K0B,  K0C,  K0D,  K0E}, \
-  {  K10,  K11,  K12,  K13,  K14,    K15,    K16,    K17,    K18,    K19,  K1A,  K1B,  K1C,  KNO,  K1E   }, \
-  {  K20,  K21,  K22,  K23,  K24,    K25,    K26,    K27,    K28,    K29,  K2A,  K2B,  K2C,  KNO,  K2E  }, \
-  {  K30,  K31,  K32,  K33,  K34,    K35,    K36,    K37,    K38,    K39,  K3A,  K3B,  K3C,  KNO,  K3E  }, \
-  {  K40,  K41,  K42,  KNO,  KNO,    KNO,    K46,    KNO,    KNO,    KNO,  K4A,  K4B,  K4C,  KNO,  K4E  }  \
-}
diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/info.json
index 8a590a8bb3..61a7ccb56c 100644
--- a/keyboards/cannonkeys/db60/hotswap/info.json
+++ b/keyboards/cannonkeys/db60/hotswap/info.json
@@ -7,141 +7,214 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "w":2, "matrix": [0, 14]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
+                {"x":2.25, "y":3, "matrix": [3, 2]},
+                {"x":3.25, "y":3, "matrix": [3, 3]},
+                {"x":4.25, "y":3, "matrix": [3, 4]},
+                {"x":5.25, "y":3, "matrix": [3, 5]},
+                {"x":6.25, "y":3, "matrix": [3, 6]},
+                {"x":7.25, "y":3, "matrix": [3, 7]},
+                {"x":8.25, "y":3, "matrix": [3, 8]},
+                {"x":9.25, "y":3, "matrix": [3, 9]},
+                {"x":10.25, "y":3, "matrix": [3, 10]},
+                {"x":11.25, "y":3, "matrix": [3, 11]},
+                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Win", "x":11.25, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
+                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
+                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
+                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
+                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
+                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
+                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "matrix": [0, 13]},
+                {"x":14, "y":0, "matrix": [0, 14]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
+                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
+                {"x":2.25, "y":3, "matrix": [3, 2]},
+                {"x":3.25, "y":3, "matrix": [3, 3]},
+                {"x":4.25, "y":3, "matrix": [3, 4]},
+                {"x":5.25, "y":3, "matrix": [3, 5]},
+                {"x":6.25, "y":3, "matrix": [3, 6]},
+                {"x":7.25, "y":3, "matrix": [3, 7]},
+                {"x":8.25, "y":3, "matrix": [3, 8]},
+                {"x":9.25, "y":3, "matrix": [3, 9]},
+                {"x":10.25, "y":3, "matrix": [3, 10]},
+                {"x":11.25, "y":3, "matrix": [3, 11]},
+                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
+                {"x":14, "y":3, "matrix": [3, 14]},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Win", "x":12.5, "y":4},
-                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
+                {"x":1.5, "y":4, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
+                {"x":4, "y":4, "w":7, "matrix": [4, 6]},
+                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
+                {"x":12.5, "y":4, "matrix": [4, 12]},
+                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "matrix": [0, 13]},
+                {"x":14, "y":0, "matrix": [0, 14]},
+
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "matrix": [2, 12]},
+                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+
+                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
+                {"x":1.25, "y":3, "matrix": [3, 1]},
+                {"x":2.25, "y":3, "matrix": [3, 2]},
+                {"x":3.25, "y":3, "matrix": [3, 3]},
+                {"x":4.25, "y":3, "matrix": [3, 4]},
+                {"x":5.25, "y":3, "matrix": [3, 5]},
+                {"x":6.25, "y":3, "matrix": [3, 6]},
+                {"x":7.25, "y":3, "matrix": [3, 7]},
+                {"x":8.25, "y":3, "matrix": [3, 8]},
+                {"x":9.25, "y":3, "matrix": [3, 9]},
+                {"x":10.25, "y":3, "matrix": [3, 10]},
+                {"x":11.25, "y":3, "matrix": [3, 11]},
+                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
+                {"x":14, "y":3, "matrix": [3, 14]},
+
+                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
+                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
+                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
+                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
+                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
+                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
+                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/info.json
index 21fde584ae..a08f843483 100644
--- a/keyboards/cannonkeys/db60/j02/info.json
+++ b/keyboards/cannonkeys/db60/j02/info.json
@@ -7,211 +7,284 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Win", "x":11.25, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+
+                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
+                {"x":2.25, "y":3, "matrix": [3, 2]},
+                {"x":3.25, "y":3, "matrix": [3, 3]},
+                {"x":4.25, "y":3, "matrix": [3, 4]},
+                {"x":5.25, "y":3, "matrix": [3, 5]},
+                {"x":6.25, "y":3, "matrix": [3, 6]},
+                {"x":7.25, "y":3, "matrix": [3, 7]},
+                {"x":8.25, "y":3, "matrix": [3, 8]},
+                {"x":9.25, "y":3, "matrix": [3, 9]},
+                {"x":10.25, "y":3, "matrix": [3, 10]},
+                {"x":11.25, "y":3, "matrix": [3, 11]},
+                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
+
+                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
+                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
+                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
+                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
+                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
+                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
+                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Win", "x":12.5, "y":4},
-                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "matrix": [0, 13]},
+                {"x":14, "y":0, "matrix": [0, 14]},
+
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+
+                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
+                {"x":2.25, "y":3, "matrix": [3, 2]},
+                {"x":3.25, "y":3, "matrix": [3, 3]},
+                {"x":4.25, "y":3, "matrix": [3, 4]},
+                {"x":5.25, "y":3, "matrix": [3, 5]},
+                {"x":6.25, "y":3, "matrix": [3, 6]},
+                {"x":7.25, "y":3, "matrix": [3, 7]},
+                {"x":8.25, "y":3, "matrix": [3, 8]},
+                {"x":9.25, "y":3, "matrix": [3, 9]},
+                {"x":10.25, "y":3, "matrix": [3, 10]},
+                {"x":11.25, "y":3, "matrix": [3, 11]},
+                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
+                {"x":14, "y":3, "matrix": [3, 14]},
+
+                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
+                {"x":1.5, "y":4, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
+                {"x":4, "y":4, "w":7, "matrix": [4, 5]},
+                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
+                {"x":12.5, "y":4, "matrix": [4, 12]},
+                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"label":"\u00ac", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"\u00a3", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},