Move single `LAYOUT_all`s to data driven (#20430)

4 files changed, 196 insertions, 162 deletions

diff --git a/keyboards/prototypist/allison/allison.h b/keyboards/prototypist/allison/allison.h
deleted file mode 100644
index e9078a82a1..0000000000
--- a/keyboards/prototypist/allison/allison.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-         K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K0E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
-    K50, K51, K52, K53,                     K58,                K5C, K5D, K5E  \
-) \
-{ \
-    { 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,   K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34,   K35,   K36,   K37,   K38, K39,   K3A,   K3B,   K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44,   K45,   K46,   K47,   K48, K49,   K4A,   K4B,   K4C, K4D, K4E }, \
-    { K50, K51, K52, K53, KC_NO, KC_NO, KC_NO, KC_NO, K58, KC_NO, KC_NO, KC_NO, K5C, K5D, K5E }  \
-}
diff --git a/keyboards/prototypist/allison/info.json b/keyboards/prototypist/allison/info.json
index d37ffbcaf4..b269d28973 100644
--- a/keyboards/prototypist/allison/info.json
+++ b/keyboards/prototypist/allison/info.json
@@ -22,7 +22,105 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":1.25, "y":0}, {"label":"0,1", "x":2.5, "y":0}, {"label":"0,2", "x":3.5, "y":0}, {"label":"0,3", "x":4.5, "y":0}, {"label":"0,4", "x":5.5, "y":0}, {"label":"0,5", "x":6.75, "y":0}, {"label":"0,6", "x":7.75, "y":0}, {"label":"0,7", "x":8.75, "y":0}, {"label":"0,8", "x":9.75, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,13", "x":15.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1.25, "y":1.25}, {"label":"1,2", "x":2.25, "y":1.25}, {"label":"1,3", "x":3.25, "y":1.25}, {"label":"1,4", "x":4.25, "y":1.25}, {"label":"1,5", "x":5.25, "y":1.25}, {"label":"1,6", "x":6.25, "y":1.25}, {"label":"1,7", "x":7.25, "y":1.25}, {"label":"1,8", "x":8.25, "y":1.25}, {"label":"1,9", "x":9.25, "y":1.25}, {"label":"1,10", "x":10.25, "y":1.25}, {"label":"1,11", "x":11.25, "y":1.25}, {"label":"1,12", "x":12.25, "y":1.25}, {"label":"1,13", "x":13.25, "y":1.25}, {"label":"1,14", "x":14.25, "y":1.25}, {"label":"0,14", "x":15.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25}, {"label":"2,1", "x":1.25, "y":2.25, "w":1.5}, {"label":"2,2", "x":2.75, "y":2.25}, {"label":"2,3", "x":3.75, "y":2.25}, {"label":"2,4", "x":4.75, "y":2.25}, {"label":"2,5", "x":5.75, "y":2.25}, {"label":"2,6", "x":6.75, "y":2.25}, {"label":"2,7", "x":7.75, "y":2.25}, {"label":"2,8", "x":8.75, "y":2.25}, {"label":"2,9", "x":9.75, "y":2.25}, {"label":"2,10", "x":10.75, "y":2.25}, {"label":"2,11", "x":11.75, "y":2.25}, {"label":"2,12", "x":12.75, "y":2.25}, {"label":"2,13", "x":13.75, "y":2.25}, {"label":"2,14", "x":14.75, "y":2.25, "w":1.5}, {"label":"3,0", "x":0, "y":3.25}, {"label":"3,1", "x":1.25, "y":3.25, "w":1.75}, {"label":"3,2", "x":3, "y":3.25}, {"label":"3,3", "x":4, "y":3.25}, {"label":"3,4", "x":5, "y":3.25}, {"label":"3,5", "x":6, "y":3.25}, {"label":"3,6", "x":7, "y":3.25}, {"label":"3,7", "x":8, "y":3.25}, {"label":"3,8", "x":9, "y":3.25}, {"label":"3,9", "x":10, "y":3.25}, {"label":"3,10", "x":11, "y":3.25}, {"label":"3,11", "x":12, "y":3.25}, {"label":"3,12", "x":13, "y":3.25}, {"label":"3,13", "x":14, "y":3.25}, {"label":"3,14", "x":15, "y":3.25, "w":1.25}, {"label":"4,0", "x":0, "y":4.25}, {"label":"4,1", "x":1.25, "y":4.25, "w":1.25}, {"label":"4,2", "x":2.5, "y":4.25}, {"label":"4,3", "x":3.5, "y":4.25}, {"label":"4,4", "x":4.5, "y":4.25}, {"label":"4,5", "x":5.5, "y":4.25}, {"label":"4,6", "x":6.5, "y":4.25}, {"label":"4,7", "x":7.5, "y":4.25}, {"label":"4,8", "x":8.5, "y":4.25}, {"label":"4,9", "x":9.5, "y":4.25}, {"label":"4,10", "x":10.5, "y":4.25}, {"label":"4,11", "x":11.5, "y":4.25}, {"label":"4,12", "x":12.5, "y":4.25}, {"label":"4,13", "x":13.5, "y":4.25, "w":1.75}, {"label":"4,14", "x":15.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.5}, {"label":"5,2", "x":2.75, "y":5.25}, {"label":"5,3", "x":3.75, "y":5.25, "w":1.5}, {"label":"5,8", "x":5.25, "y":5.25, "w":7}, {"label":"5,12", "x":12.25, "y":5.25, "w":1.5}, {"label":"5,13", "x":13.75, "y":5.25}, {"label":"5,14", "x":14.75, "y":5.25, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+                {"matrix": [0, 7], "x": 8.75, "y": 0},
+                {"matrix": [0, 8], "x": 9.75, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.75, "y": 5.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 8], "x": 5.25, "y": 5.25, "w": 7},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.75, "y": 5.25, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/prototypist/j01/info.json b/keyboards/prototypist/j01/info.json
index 513e923190..12452226c4 100644
--- a/keyboards/prototypist/j01/info.json
+++ b/keyboards/prototypist/j01/info.json
@@ -22,88 +22,103 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B3,B1)", "x":0, "y":0},
-                {"label":"K01 (B3,F0)", "x":1, "y":0},
-                {"label":"K02 (B3,F7)", "x":2.5, "y":0},
-                {"label":"K03 (B3,F1)", "x":3.5, "y":0},
-                {"label":"K04 (B3,F4)", "x":4.5, "y":0},
-                {"label":"K05 (B3,C7)", "x":5.5, "y":0},
-                {"label":"K06 (B3,C6)", "x":6.5, "y":0},
-                {"label":"K07 (B3,B6)", "x":7.5, "y":0},
-                {"label":"K08 (B3,B5)", "x":8.5, "y":0},
-                {"label":"K09 (B3,B4)", "x":9.5, "y":0},
-                {"label":"K0A (B3,D7)", "x":10.5, "y":0},
-                {"label":"K0B (B3,D6)", "x":11.5, "y":0},
-                {"label":"K0C (B3,D4)", "x":12.5, "y":0},
-                {"label":"K0D (B3,D5)", "x":13.5, "y":0},
-                {"label":"K0E (B3,D3)", "x":14.5, "y":0},
-                {"label":"K0F (B3,D2)", "x":15.5, "y":0},
-                {"label":"K0G (B3,D1)", "x":16.5, "y":0},
-                {"label":"K0H (B3,D0)", "x":18, "y":0},
-                {"label":"K10 (B2,B1)", "x":0, "y":1},
-                {"label":"K11 (B2,F0)", "x":1, "y":1},
-                {"label":"K12 (B2,F7)", "x":2.5, "y":1, "w":1.5},
-                {"label":"K13 (B2,F1)", "x":4, "y":1},
-                {"label":"K14 (B2,F4)", "x":5, "y":1},
-                {"label":"K15 (B2,C7)", "x":6, "y":1},
-                {"label":"K16 (B2,C6)", "x":7, "y":1},
-                {"label":"K17 (B2,B6)", "x":8, "y":1},
-                {"label":"K18 (B2,B5)", "x":9, "y":1},
-                {"label":"K19 (B2,B4)", "x":10, "y":1},
-                {"label":"K1A (B2,D7)", "x":11, "y":1},
-                {"label":"K1B (B2,D6)", "x":12, "y":1},
-                {"label":"K1C (B2,D4)", "x":13, "y":1},
-                {"label":"K1D (B2,D5)", "x":14, "y":1},
-                {"label":"K1E (B2,D3)", "x":15, "y":1},
-                {"label":"K1F (B2,D2)", "x":16, "y":1, "w":1.5},
-                {"label":"K1H (B2,D0)", "x":18, "y":1},
-                {"label":"K20 (B0,B1)", "x":0, "y":2},
-                {"label":"K21 (B0,F0)", "x":1, "y":2},
-                {"label":"K22 (B0,F7)", "x":2.5, "y":2, "w":1.75},
-                {"label":"K23 (B0,F1)", "x":4.25, "y":2},
-                {"label":"K24 (B0,F4)", "x":5.25, "y":2},
-                {"label":"K25 (B0,C7)", "x":6.25, "y":2},
-                {"label":"K26 (B0,C6)", "x":7.25, "y":2},
-                {"label":"K27 (B0,B6)", "x":8.25, "y":2},
-                {"label":"K28 (B0,B5)", "x":9.25, "y":2},
-                {"label":"K29 (B0,B4)", "x":10.25, "y":2},
-                {"label":"K2A (B0,D7)", "x":11.25, "y":2},
-                {"label":"K2B (B0,D6)", "x":12.25, "y":2},
-                {"label":"K2C (B0,D4)", "x":13.25, "y":2},
-                {"label":"K2D (B0,D5)", "x":14.25, "y":2},
-                {"label":"K2E (B0,D3)", "x":15.25, "y":2},
-                {"label":"K2F (B0,D2)", "x":16.25, "y":2, "w":1.25},
-                {"label":"K2H (B0,D0)", "x":18, "y":2},
-                {"label":"K30 (F6,B1)", "x":0, "y":3},
-                {"label":"K31 (F6,F0)", "x":1, "y":3},
-                {"label":"K32 (F6,F7)", "x":2.5, "y":3, "w":1.25},
-                {"label":"K33 (F6,F1)", "x":3.75, "y":3},
-                {"label":"K34 (F6,F4)", "x":4.75, "y":3},
-                {"label":"K35 (F6,C7)", "x":5.75, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.75, "y":3},
-                {"label":"K37 (F6,B6)", "x":7.75, "y":3},
-                {"label":"K38 (F6,B5)", "x":8.75, "y":3},
-                {"label":"K39 (F6,B4)", "x":9.75, "y":3},
-                {"label":"K3A (F6,D7)", "x":10.75, "y":3},
-                {"label":"K3B (F6,D6)", "x":11.75, "y":3},
-                {"label":"K3C (F6,D4)", "x":12.75, "y":3},
-                {"label":"K3D (F6,D5)", "x":13.75, "y":3},
-                {"label":"K3E (F6,D3)", "x":14.75, "y":3, "w":1.75},
-                {"label":"K3G (F6,D1)", "x":16.75, "y":3.25},
-                {"label":"K3H (F6,D0)", "x":18, "y":3},
-                {"label":"K40 (F5,B1)", "x":0, "y":4},
-                {"label":"K41 (F5,F0)", "x":1, "y":4},
-                {"label":"K42 (F5,F7)", "x":2.5, "y":4, "w":1.5},
-                {"label":"K43 (F5,F1)", "x":4, "y":4},
-                {"label":"K44 (F5,F4)", "x":5, "y":4, "w":1.5},
-                {"label":"K46 (F5,C6)", "x":6.5, "y":4, "w":2.25},
-                {"label":"K48 (F5,B5)", "x":8.75, "y":4, "w":2.75},
-                {"label":"K4B (F5,D6)", "x":11.5, "y":4, "w":1.5},
-                {"label":"K4C (F5,D4)", "x":13, "y":4},
-                {"label":"K4D (F5,D5)", "x":14, "y":4, "w":1.5},
-                {"label":"K4F (F5,D2)", "x":15.75, "y":4.25},
-                {"label":"K4G (F5,D1)", "x":16.75, "y":4.25},
-                {"label":"K4H (F5,D0)", "x":17.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+
+                {"matrix": [0, 17], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 17], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+                {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 1.25},
+
+                {"matrix": [2, 17], "x": 18, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 16], "x": 16.75, "y": 3.25},
+
+                {"matrix": [3, 17], "x": 18, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 8.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.75, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.75, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/prototypist/j01/j01.h b/keyboards/prototypist/j01/j01.h
deleted file mode 100644
index 1edb9d7812..0000000000
--- a/keyboards/prototypist/j01/j01.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Shaun Mitchell (Flexerm)
- *
- * 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
-
-#define LAYOUT_all( \
-    K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,    K0H,   \
-    K10, K11,   K12,    K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,      K1H,   \
-    K20, K21,   K22,     K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F,     K2H,   \
-    K30, K31,   K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      K3G,   K3H,   \
-    K40, K41,   K42,    K43, K44,   K46,       K48,          K4B,    K4C, K4D,    K4F, K4G, K4H      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   ___,   K1H   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   ___,   K2H   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   ___,   K3G,   K3H   }, \
-    { K40,   K41,   K42,   K43,   K44,   ___,   K46,   ___,   K48,   ___,   ___,   K4B,   K4C,   K4D,   ___,   K4F,   K4G,   K4H   }, \
-}