Move remaining `LAYOUT_all`s to data driven (#20463)

4 files changed, 335 insertions, 416 deletions

diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index 8bc527606f..6a45c26306 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -31,153 +31,178 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":11.25, "y":0},
-                {"label":"*", "x":12.25, "y":0},
-                {"label":"(", "x":13.25, "y":0},
-                {"label":")", "x":14.25, "y":0},
-                {"label":"_", "x":15.25, "y":0},
-                {"label":"+", "x":16.25, "y":0},
-                {"label":"|", "x":17.25, "y":0},
-                {"label":"~", "x":18.25, "y":0},
-                {"label":"Del", "x":19.75, "y":0},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.75, "y":1, "w":1.5},
-                {"label":"Q", "x":3.25, "y":1},
-                {"label":"W", "x":4.25, "y":1},
-                {"label":"E", "x":5.25, "y":1},
-                {"label":"R", "x":6.25, "y":1},
-                {"label":"T", "x":7.25, "y":1},
-                {"label":"Y", "x":10.75, "y":1},
-                {"label":"U", "x":11.75, "y":1},
-                {"label":"I", "x":12.75, "y":1},
-                {"label":"O", "x":13.75, "y":1},
-                {"label":"P", "x":14.75, "y":1},
-                {"label":"{", "x":15.75, "y":1},
-                {"label":"}", "x":16.75, "y":1},
-                {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
-                {"label":"A", "x":3.5, "y":2},
-                {"label":"S", "x":4.5, "y":2},
-                {"label":"D", "x":5.5, "y":2},
-                {"label":"F", "x":6.5, "y":2},
-                {"label":"G", "x":7.5, "y":2},
-                {"label":"H", "x":11, "y":2},
-                {"label":"J", "x":12, "y":2},
-                {"label":"K", "x":13, "y":2},
-                {"label":"L", "x":14, "y":2},
-                {"label":":", "x":15, "y":2},
-                {"label":"\"", "x":16, "y":2},
-                {"label":"Enter", "x":17, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":1.75, "y":3, "w":2.25},
-                {"label":"Z", "x":4, "y":3},
-                {"label":"X", "x":5, "y":3},
-                {"label":"C", "x":6, "y":3},
-                {"label":"V", "x":7, "y":3},
-                {"label":"B", "x":8, "y":3},
-                {"label":"B", "x":10.5, "y":3},
-                {"label":"N", "x":11.5, "y":3},
-                {"label":"M", "x":12.5, "y":3},
-                {"label":"<", "x":13.5, "y":3},
-                {"label":">", "x":14.5, "y":3},
-                {"label":"?", "x":15.5, "y":3},
-                {"label":"Shift", "x":16.5, "y":3, "w":1.75},
-                {"label":"Up", "x":18.25, "y":3},
-
-                {"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"x":6, "y":4, "w":2.25},
-                {"label":"Win", "x":8.25, "y":4},
-                {"x":10.5, "y":4, "w":2.75},
-                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
-                {"label":"Left", "x":17.25, "y":4},
-                {"label":"Down", "x":18.25, "y":4},
-                {"label":"Right", "x":19.25, "y":4}]
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
         },
         "LAYOUT_full_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":11.25, "y":0},
-                {"label":"*", "x":12.25, "y":0},
-                {"label":"(", "x":13.25, "y":0},
-                {"label":")", "x":14.25, "y":0},
-                {"label":"_", "x":15.25, "y":0},
-                {"label":"+", "x":16.25, "y":0},
-                {"label":"Backspace", "x":17.25, "y":0, "w":2},
-                {"label":"Del", "x":19.75, "y":0},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.75, "y":1, "w":1.5},
-                {"label":"Q", "x":3.25, "y":1},
-                {"label":"W", "x":4.25, "y":1},
-                {"label":"E", "x":5.25, "y":1},
-                {"label":"R", "x":6.25, "y":1},
-                {"label":"T", "x":7.25, "y":1},
-                {"label":"Y", "x":10.75, "y":1},
-                {"label":"U", "x":11.75, "y":1},
-                {"label":"I", "x":12.75, "y":1},
-                {"label":"O", "x":13.75, "y":1},
-                {"label":"P", "x":14.75, "y":1},
-                {"label":"{", "x":15.75, "y":1},
-                {"label":"}", "x":16.75, "y":1},
-                {"label":"|", "x":17.75, "y":1, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
-                {"label":"A", "x":3.5, "y":2},
-                {"label":"S", "x":4.5, "y":2},
-                {"label":"D", "x":5.5, "y":2},
-                {"label":"F", "x":6.5, "y":2},
-                {"label":"G", "x":7.5, "y":2},
-                {"label":"H", "x":11, "y":2},
-                {"label":"J", "x":12, "y":2},
-                {"label":"K", "x":13, "y":2},
-                {"label":"L", "x":14, "y":2},
-                {"label":":", "x":15, "y":2},
-                {"label":"\"", "x":16, "y":2},
-                {"label":"Enter", "x":17, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":1.75, "y":3, "w":2.25},
-                {"label":"Z", "x":4, "y":3},
-                {"label":"X", "x":5, "y":3},
-                {"label":"C", "x":6, "y":3},
-                {"label":"V", "x":7, "y":3},
-                {"label":"B", "x":8, "y":3},
-                {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3},
-                {"label":"M", "x":12.5, "y":3},
-                {"label":"<", "x":13.5, "y":3},
-                {"label":">", "x":14.5, "y":3},
-                {"label":"?", "x":15.5, "y":3},
-                {"label":"Shift", "x":16.5, "y":3, "w":1.75},
-                {"label":"Up", "x":18.25, "y":3},
-
-                {"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"x":6, "y":4, "w":2.25},
-                {"label":"Win", "x":8.25, "y":4},
-                {"x":10.5, "y":4, "w":2.75},
-                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
-                {"label":"Left", "x":17.25, "y":4},
-                {"label":"Down", "x":18.25, "y":4},
-                {"label":"Right", "x":19.25, "y":4}]
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0, "w": 2},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/jacky_studio/bear_65/rev1/rev1.h b/keyboards/jacky_studio/bear_65/rev1/rev1.h
deleted file mode 100644
index 872436fcd4..0000000000
--- a/keyboards/jacky_studio/bear_65/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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( \
-      K31, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K4E, \
-     K1E,  K10, K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, K1B, K1C, K1D,        \
-    K2E,   K20, K21, K22, K23, K24, K25,           K26, K27, K28, K29,  K2A,  K2B,   K2D,         \
-           K30,   K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C,   K3D, K3E,      \
-           K40,     K43,    K45,      K46,               K48,     K4A,             K4B, K4C, K4D  \
-) { \
-    { 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,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, KC_NO, K43,   KC_NO, K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_full_bs( \
-      K31, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C,   K0D,      K4E, \
-     K1E,  K10, K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, K1B, K1C, K1D,        \
-    K2E,   K20, K21, K22, K23, K24, K25,           K26, K27, K28, K29,  K2A,  K2B,   K2D,         \
-           K30,   K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C,   K3D, K3E,      \
-           K40,     K43,    K45,      K46,               K48,     K4A,             K4B, K4C, K4D  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, KC_NO, K43,   KC_NO, K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index 148086c0e6..cc0c91dadc 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -28,158 +28,176 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K0F (B0,E6)", "x":0, "y":0},
-                {"label":"K00 (B0,D0)", "x":1.25, "y":0},
-                {"label":"K01 (B0,D1)", "x":2.25, "y":0},
-                {"label":"K02 (B0,D2)", "x":3.25, "y":0},
-                {"label":"K03 (B0,D3)", "x":4.25, "y":0},
-                {"label":"K04 (B0,D5)", "x":5.25, "y":0},
-                {"label":"K05 (B0,D4)", "x":6.25, "y":0},
-                {"label":"K06 (B0,D6)", "x":7.25, "y":0},
-                {"label":"K07 (B0,D7)", "x":8.25, "y":0},
-                {"label":"K08 (B0,B4)", "x":9.25, "y":0},
-                {"label":"K09 (B0,F7)", "x":10.25, "y":0},
-                {"label":"K0A (B0,F6)", "x":11.25, "y":0},
-                {"label":"K0B (B0,F5)", "x":12.25, "y":0},
-                {"label":"K0C (B0,F4)", "x":13.25, "y":0},
-                {"label":"K0D (B0,F1)", "x":14.25, "y":0},
-                {"label":"K0E (B0,F0)", "x":15.25, "y":0},
-                {"label":"K4E (B7,F0)", "x":16.25, "y":0},
-                {"label":"K1F (B1,E6)", "x":0, "y":1},
-                {"label":"K10 (B1,D0)", "x":1.25, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":2.75, "y":1},
-                {"label":"K12 (B1,D2)", "x":3.75, "y":1},
-                {"label":"K13 (B1,D3)", "x":4.75, "y":1},
-                {"label":"K14 (B1,D5)", "x":5.75, "y":1},
-                {"label":"K15 (B1,D4)", "x":6.75, "y":1},
-                {"label":"K16 (B1,D6)", "x":7.75, "y":1},
-                {"label":"K17 (B1,D7)", "x":8.75, "y":1},
-                {"label":"K18 (B1,B4)", "x":9.75, "y":1},
-                {"label":"K19 (B1,F7)", "x":10.75, "y":1},
-                {"label":"K1A (B1,F6)", "x":11.75, "y":1},
-                {"label":"K1B (B1,F5)", "x":12.75, "y":1},
-                {"label":"K1C (B1,F4)", "x":13.75, "y":1},
-                {"label":"K2C (B2,F4)", "x":14.75, "y":1, "w":1.5},
-                {"label":"K1E (B1,F0)", "x":16.25, "y":1},
-                {"label":"K2F (B2,E6)", "x":0, "y":2},
-                {"label":"K20 (B2,D0)", "x":1.25, "y":2, "w":1.75},
-                {"label":"K21 (B2,D1)", "x":3, "y":2},
-                {"label":"K22 (B2,D2)", "x":4, "y":2},
-                {"label":"K23 (B2,D3)", "x":5, "y":2},
-                {"label":"K24 (B2,D5)", "x":6, "y":2},
-                {"label":"K25 (B2,D4)", "x":7, "y":2},
-                {"label":"K26 (B2,D6)", "x":8, "y":2},
-                {"label":"K27 (B2,D7)", "x":9, "y":2},
-                {"label":"K28 (B2,B4)", "x":10, "y":2},
-                {"label":"K29 (B2,F7)", "x":11, "y":2},
-                {"label":"K2A (B2,F6)", "x":12, "y":2},
-                {"label":"K2B (B2,F5)", "x":13, "y":2},
-                {"label":"K1D (B1,F1)", "x":14, "y":2, "w":2.25},
-                {"label":"K2E (B2,F0)", "x":16.25, "y":2},
-                {"label":"K3F (B3,E6)", "x":0, "y":3},
-                {"label":"K30 (B3,D0)", "x":1.25, "y":3, "w":1.25},
-                {"label":"K31 (B3,D1)", "x":2.5, "y":3},
-                {"label":"K32 (B3,D2)", "x":3.5, "y":3},
-                {"label":"K33 (B3,D3)", "x":4.5, "y":3},
-                {"label":"K34 (B3,D5)", "x":5.5, "y":3},
-                {"label":"K35 (B3,D4)", "x":6.5, "y":3},
-                {"label":"K36 (B3,D6)", "x":7.5, "y":3},
-                {"label":"K37 (B3,D7)", "x":8.5, "y":3},
-                {"label":"K38 (B3,B4)", "x":9.5, "y":3},
-                {"label":"K39 (B3,F7)", "x":10.5, "y":3},
-                {"label":"K3A (B3,F6)", "x":11.5, "y":3},
-                {"label":"K3B (B3,F5)", "x":12.5, "y":3},
-                {"label":"K3C (B3,F4)", "x":13.5, "y":3, "w":1.75},
-                {"label":"K3D (B3,F1)", "x":15.25, "y":3},
-                {"label":"K3E (B3,F0)", "x":16.25, "y":3},
-                {"label":"K4F (B7,E6)", "x":0, "y":4},
-                {"label":"K40 (B7,D0)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K41 (B7,D1)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K42 (B7,D2)", "x":3.75, "y":4, "w":1.25},
-                {"label":"K46 (B7,D6)", "x":5, "y":4, "w":6.25},
-                {"label":"K48 (B7,B4)", "x":11.25, "y":4},
-                {"label":"K49 (B7,F7)", "x":12.25, "y":4},
-                {"label":"K4A (B7,F6)", "x":13.25, "y":4},
-                {"label":"K4B (B7,F5)", "x":14.25, "y":4},
-                {"label":"K4C (B7,F4)", "x":15.25, "y":4},
-                {"label":"K4D (B7,F1)", "x":16.25, "y":4}
+                {"matrix": [0, 15], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [4, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 15], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.75, "y": 1},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [2, 12], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 15], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7, "y": 2},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [1, 13], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.25, "y": 2},
+
+                {"matrix": [3, 15], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 15], "x": 0, "y": 4},
+
+                {"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": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4},
+                {"matrix": [4, 9], "x": 12.25, "y": 4},
+                {"matrix": [4, 10], "x": 13.25, "y": 4},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_ansi_1u": {
             "layout": [
-                {"label":"K0F", "x":0, "y":0},
-                {"label":"K00", "x":1.25, "y":0},
-                {"label":"K01", "x":2.25, "y":0},
-                {"label":"K02", "x":3.25, "y":0},
-                {"label":"K03", "x":4.25, "y":0},
-                {"label":"K04", "x":5.25, "y":0},
-                {"label":"K05", "x":6.25, "y":0},
-                {"label":"K06", "x":7.25, "y":0},
-                {"label":"K07", "x":8.25, "y":0},
-                {"label":"K08", "x":9.25, "y":0},
-                {"label":"K09", "x":10.25, "y":0},
-                {"label":"K0A", "x":11.25, "y":0},
-                {"label":"K0B", "x":12.25, "y":0},
-                {"label":"K0C", "x":13.25, "y":0},
-                {"label":"K0E", "x":14.25, "y":0, "w":2},
-                {"label":"K4E", "x":16.25, "y":0},
-                {"label":"K1F", "x":0, "y":1},
-                {"label":"K10", "x":1.25, "y":1, "w":1.5},
-                {"label":"K11", "x":2.75, "y":1},
-                {"label":"K12", "x":3.75, "y":1},
-                {"label":"K13", "x":4.75, "y":1},
-                {"label":"K14", "x":5.75, "y":1},
-                {"label":"K15", "x":6.75, "y":1},
-                {"label":"K16", "x":7.75, "y":1},
-                {"label":"K17", "x":8.75, "y":1},
-                {"label":"K18", "x":9.75, "y":1},
-                {"label":"K19", "x":10.75, "y":1},
-                {"label":"K1A", "x":11.75, "y":1},
-                {"label":"K1B", "x":12.75, "y":1},
-                {"label":"K1C", "x":13.75, "y":1},
-                {"label":"K2C", "x":14.75, "y":1, "w":1.5},
-                {"label":"K1E", "x":16.25, "y":1},
-                {"label":"K2F", "x":0, "y":2},
-                {"label":"K20", "x":1.25, "y":2, "w":1.75},
-                {"label":"K21", "x":3, "y":2},
-                {"label":"K22", "x":4, "y":2},
-                {"label":"K23", "x":5, "y":2},
-                {"label":"K24", "x":6, "y":2},
-                {"label":"K25", "x":7, "y":2},
-                {"label":"K26", "x":8, "y":2},
-                {"label":"K27", "x":9, "y":2},
-                {"label":"K28", "x":10, "y":2},
-                {"label":"K29", "x":11, "y":2},
-                {"label":"K2A", "x":12, "y":2},
-                {"label":"K2B", "x":13, "y":2},
-                {"label":"K1D", "x":14, "y":2, "w":2.25},
-                {"label":"K2E", "x":16.25, "y":2},
-                {"label":"K3F", "x":0, "y":3},
-                {"label":"K30", "x":1.25, "y":3, "w":2.25},
-                {"label":"K32", "x":3.5, "y":3},
-                {"label":"K33", "x":4.5, "y":3},
-                {"label":"K34", "x":5.5, "y":3},
-                {"label":"K35", "x":6.5, "y":3},
-                {"label":"K36", "x":7.5, "y":3},
-                {"label":"K37", "x":8.5, "y":3},
-                {"label":"K38", "x":9.5, "y":3},
-                {"label":"K39", "x":10.5, "y":3},
-                {"label":"K3A", "x":11.5, "y":3},
-                {"label":"K3B", "x":12.5, "y":3},
-                {"label":"K3C", "x":13.5, "y":3, "w":1.75},
-                {"label":"K3D", "x":15.25, "y":3},
-                {"label":"K3E", "x":16.25, "y":3},
-                {"label":"K4F", "x":0, "y":4},
-                {"label":"K40", "x":1.25, "y":4, "w":1.25},
-                {"label":"K41", "x":2.5, "y":4, "w":1.25},
-                {"label":"K42", "x":3.75, "y":4, "w":1.25},
-                {"label":"K46", "x":5, "y":4, "w":6.25},
-                {"label":"K48", "x":11.25, "y":4},
-                {"label":"K49", "x":12.25, "y":4},
-                {"label":"K4A", "x":13.25, "y":4},
-                {"label":"K4B", "x":14.25, "y":4},
-                {"label":"K4C", "x":15.25, "y":4},
-                {"label":"K4D", "x":16.25, "y":4}
+                {"matrix": [0, 15], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 15], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.75, "y": 1},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [2, 12], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 15], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7, "y": 2},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [1, 13], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.25, "y": 2},
+
+                {"matrix": [3, 15], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 15], "x": 0, "y": 4},
+
+                {"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": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4},
+                {"matrix": [4, 9], "x": 12.25, "y": 4},
+                {"matrix": [4, 10], "x": 13.25, "y": 4},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rev2.h b/keyboards/jacky_studio/s7_elephant/rev2/rev2.h
deleted file mode 100644
index 28decbc98a..0000000000
--- a/keyboards/jacky_studio/s7_elephant/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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 ___ KC_NO
-
-/* ALL: This is an odd layout that the JSON file comes preloaded with. Split left-shift and ansi enter
- * ,------.   ,-------------------------------------------------------------------------------------------------.
- * |      |   |       |     |     |     |     |     |     |     |     |     |     |     |     |           |     |
- * |------|   |-------------------------------------------------------------------------------------------------|
-   |      |   |        |     |     |     |     |     |     |     |     |     |     |     |     |          |     |
- * |------|   |-------------------------------------------------------------------------------------------------|
- * |      |   |         |     |     |     |     |     |     |     |     |     |     |     |               |     |
- * |------|   |-------------------------------------------------------------------------------------------------|
- * |      |   |      |    |     |     |     |     |     |     |     |     |     |     |             |     |     |
- * |------|   |-------------------------------------------------------------------------------------------------|
- * |      |   |      |       |       |                                   |      |      |     |      |     |     |
- * `------'   `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_all( \
-    K0F,  K00,  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E,  \
-    K1F,  K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E,  \
-    K2F,  K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D,           K2E,  \
-    K3F,  K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E,  \
-    K4F,  K40,  K41, K42,                K46,                K48, K49, K4A, K4B, K4C, K4D   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   ___,   K2E,   K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \
-    { K40,   K41,   K42,   ___,   ___,   ___,   K46,   ___,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }  \
-}
-
-/* ANSI
- * ,---.   ,---------------------------------------------------------------.
- * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |       |   |
- * |---|   |---------------------------------------------------------------|
- * |   |   |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
- * |---|   |---------------------------------------------------------------|
- * |   |   |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
- * |---|   |---------------------------------------------------------------|
- * |   |   |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
- * |---|   |---------------------------------------------------------------|
- * |   |   |    |    |    |                        |   |   |   |   |   |   |
- * `---'   `---------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_1u( \
-    K0F,  K00,  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E,  \
-    K1F,  K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E,  \
-    K2F,  K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D,           K2E,  \
-    K3F,    K30,     K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E,  \
-    K4F,  K40,  K41, K42,                K46,                K48, K49, K4A, K4B, K4C, K4D   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   ___,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   ___,   K2E,   K2F   }, \
-    { K30,   ___,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \
-    { K40,   K41,   K42,   ___,   ___,   ___,   K46,   ___,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }  \
-}