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

6 files changed, 277 insertions, 225 deletions

diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
index c30614b640..c71f91016d 100644
--- a/keyboards/kakunpc/angel64/rev1/info.json
+++ b/keyboards/kakunpc/angel64/rev1/info.json
@@ -15,7 +15,76 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "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":2}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":":", "x":11, "y":2}, {"label":"\"", "x":12, "y":2}, {"label":"Enter", "x":13, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":2.5}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":"<", "x":9.5, "y":3}, {"label":">", "x":10.5, "y":3}, {"label":"?", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Alt", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":2.75, "y":4, "w":1.5}, {"x":4.25, "y":4}, {"x":5.25, "y":4, "w":1.5}, {"x":6.75, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Menu", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+                {"matrix": [6, 0], "x": 6, "y": 0},
+                {"matrix": [7, 0], "x": 7, "y": 0},
+                {"matrix": [8, 0], "x": 8, "y": 0},
+                {"matrix": [9, 0], "x": 9, "y": 0},
+                {"matrix": [10, 0], "x": 10, "y": 0},
+                {"matrix": [11, 0], "x": 11, "y": 0},
+                {"matrix": [0, 1], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [4, 1], "x": 2.5, "y": 1},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [6, 1], "x": 4.5, "y": 1},
+                {"matrix": [7, 1], "x": 5.5, "y": 1},
+                {"matrix": [8, 1], "x": 6.5, "y": 1},
+                {"matrix": [9, 1], "x": 7.5, "y": 1},
+                {"matrix": [10, 1], "x": 8.5, "y": 1},
+                {"matrix": [11, 1], "x": 9.5, "y": 1},
+                {"matrix": [0, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 2], "x": 11.5, "y": 1},
+                {"matrix": [2, 2], "x": 12.5, "y": 1},
+                {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 2], "x": 0, "y": 2, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 2},
+                {"matrix": [6, 2], "x": 3, "y": 2},
+                {"matrix": [7, 2], "x": 4, "y": 2},
+                {"matrix": [8, 2], "x": 5, "y": 2},
+                {"matrix": [9, 2], "x": 6, "y": 2},
+                {"matrix": [10, 2], "x": 7, "y": 2},
+                {"matrix": [11, 2], "x": 8, "y": 2},
+                {"matrix": [0, 3], "x": 9, "y": 2},
+                {"matrix": [1, 3], "x": 10, "y": 2},
+                {"matrix": [2, 3], "x": 11, "y": 2},
+                {"matrix": [3, 3], "x": 12, "y": 2},
+                {"matrix": [4, 3], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.5},
+                {"matrix": [6, 3], "x": 2.5, "y": 3},
+                {"matrix": [7, 3], "x": 3.5, "y": 3},
+                {"matrix": [8, 3], "x": 4.5, "y": 3},
+                {"matrix": [9, 3], "x": 5.5, "y": 3},
+                {"matrix": [10, 3], "x": 6.5, "y": 3},
+                {"matrix": [11, 3], "x": 7.5, "y": 3},
+                {"matrix": [0, 4], "x": 8.5, "y": 3},
+                {"matrix": [1, 4], "x": 9.5, "y": 3},
+                {"matrix": [2, 4], "x": 10.5, "y": 3},
+                {"matrix": [3, 4], "x": 11.5, "y": 3},
+                {"matrix": [4, 4], "x": 12.5, "y": 3, "w": 2.5},
+
+                {"matrix": [5, 4], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 4], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [7, 4], "x": 2.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 4.25, "y": 4},
+                {"matrix": [9, 4], "x": 5.25, "y": 4, "w": 1.5},
+                {"matrix": [10, 4], "x": 6.75, "y": 4, "w": 1.5},
+                {"matrix": [11, 4], "x": 8.25, "y": 4, "w": 1.5},
+                {"matrix": [0, 5], "x": 9.75, "y": 4},
+                {"matrix": [1, 5], "x": 10.75, "y": 4, "w": 1.5},
+                {"matrix": [2, 5], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 5], "x": 13.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kakunpc/angel64/rev1/rev1.h b/keyboards/kakunpc/angel64/rev1/rev1.h
deleted file mode 100644
index f4335601a9..0000000000
--- a/keyboards/kakunpc/angel64/rev1/rev1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 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( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, \
-    k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, \
-    k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
-    k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64\
-) \
-{ \
-    { k01, k13, k25, k37, k49, k61 }, \
-    { k02, k14, k26, k38, k50, k62 }, \
-    { k03, k15, k27, k39, k51, k63 }, \
-    { k04, k16, k28, k40, k52, k64 }, \
-    { k05, k17, k29, k41, k53, KC_NO }, \
-    { k06, k18, k30, k42, k54, KC_NO }, \
-    { k07, k19, k31, k43, k55, KC_NO }, \
-    { k08, k20, k32, k44, k56, KC_NO }, \
-    { k09, k21, k33, k45, k57, KC_NO }, \
-    { k10, k22, k34, k46, k58, KC_NO }, \
-    { k11, k23, k35, k47, k59, KC_NO }, \
-    { k12, k24, k36, k48, k60, KC_NO } \
-}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
index 02ac7d54b7..68dfe8edff 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/info.json
@@ -24,79 +24,86 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0.41, "y": 0},
-                {"x": 1.41, "y": 0},
-                {"x": 2.72, "y": 0},
-                {"x": 3.72, "y": 0},
-                {"x": 4.72, "y": 0},
-                {"x": 5.72, "y": 0},
-                {"x": 6.72, "y": 0},
-                {"x": 9.62, "y": 0},
-                {"x": 10.62, "y": 0},
-                {"x": 11.62, "y": 0},
-                {"x": 12.62, "y": 0},
-                {"x": 14.07, "y": 0},
-                {"x": 15.07, "y": 0},
-                {"x": 16.07, "y": 0},
-                {"x": 17.07, "y": 0},
+                {"matrix": [0, 0], "x": 0.41, "y": 0},
+                {"matrix": [0, 1], "x": 1.41, "y": 0},
+                {"matrix": [0, 2], "x": 2.72, "y": 0},
+                {"matrix": [0, 3], "x": 3.72, "y": 0},
+                {"matrix": [0, 4], "x": 4.72, "y": 0},
+                {"matrix": [0, 5], "x": 5.72, "y": 0},
+                {"matrix": [0, 6], "x": 6.72, "y": 0},
 
-                {"x": 0.28, "y": 1, "w": 1.5},
-                {"x": 1.78, "y": 1},
-                {"x": 3.22, "y": 1},
-                {"x": 4.22, "y": 1},
-                {"x": 5.22, "y": 1},
-                {"x": 6.22, "y": 1},
-                {"x": 7.22, "y": 1},
-                {"x": 9.12, "y": 1},
-                {"x": 10.12, "y": 1},
-                {"x": 11.12, "y": 1},
-                {"x": 12.12, "y": 1},
-                {"x": 13.72, "y": 1},
-                {"x": 14.72, "y": 1},
-                {"x": 15.72, "y": 1},
-                {"x": 16.72, "y": 1, "w": 1.5},
+                {"matrix": [5, 0], "x": 9.62, "y": 0},
+                {"matrix": [5, 1], "x": 10.62, "y": 0},
+                {"matrix": [5, 2], "x": 11.62, "y": 0},
+                {"matrix": [5, 3], "x": 12.62, "y": 0},
+                {"matrix": [5, 4], "x": 14.07, "y": 0},
+                {"matrix": [5, 5], "x": 15.07, "y": 0},
+                {"matrix": [5, 6], "x": 16.07, "y": 0},
+                {"matrix": [5, 7], "x": 17.07, "y": 0},
 
-                {"x": 0.14, "y": 2, "w": 1.75},
-                {"x": 1.89, "y": 2},
-                {"x": 3.47, "y": 2},
-                {"x": 4.47, "y": 2},
-                {"x": 5.47, "y": 2},
-                {"x": 6.47, "y": 2},
-                {"x": 7.47, "y": 2},
-                {"x": 9.37, "y": 2},
-                {"x": 10.37, "y": 2},
-                {"x": 11.37, "y": 2},
-                {"x": 12.37, "y": 2},
-                {"x": 14.09, "y": 2},
-                {"x": 15.09, "y": 2},
-                {"x": 16.09, "y": 2, "w": 2.25},
+                {"matrix": [1, 0], "x": 0.28, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.78, "y": 1},
+                {"matrix": [1, 2], "x": 3.22, "y": 1},
+                {"matrix": [1, 3], "x": 4.22, "y": 1},
+                {"matrix": [1, 4], "x": 5.22, "y": 1},
+                {"matrix": [1, 5], "x": 6.22, "y": 1},
+                {"matrix": [1, 6], "x": 7.22, "y": 1},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.97, "y": 3},
-                {"x": 4.97, "y": 3},
-                {"x": 5.97, "y": 3},
-                {"x": 6.97, "y": 3},
-                {"x": 8.87, "y": 3},
-                {"x": 9.87, "y": 3},
-                {"x": 10.87, "y": 3},
-                {"x": 11.87, "y": 3},
-                {"x": 13.72, "y": 3},
-                {"x": 14.72, "y": 3},
-                {"x": 15.72, "y": 3},
-                {"x": 16.72, "y": 3},
-                {"x": 18, "y": 3.25},
+                {"matrix": [6, 0], "x": 9.12, "y": 1},
+                {"matrix": [6, 1], "x": 10.12, "y": 1},
+                {"matrix": [6, 2], "x": 11.12, "y": 1},
+                {"matrix": [6, 3], "x": 12.12, "y": 1},
+                {"matrix": [6, 4], "x": 13.72, "y": 1},
+                {"matrix": [6, 5], "x": 14.72, "y": 1},
+                {"matrix": [6, 6], "x": 15.72, "y": 1},
+                {"matrix": [6, 7], "x": 16.72, "y": 1, "w": 1.5},
 
-                {"x": 0.25, "y": 4, "w": 1.25},
-                {"x": 1.5, "y": 4, "w": 1.25},
-                {"x": 4.47, "y": 4},
-                {"x": 5.47, "y": 4, "w": 2},
-                {"x": 7.47, "y": 4},
-                {"x": 9.35, "y": 4, "w": 2.75},
-                {"x": 12.1, "y": 4},
-                {"x": 17, "y": 4.25},
-                {"x": 18, "y": 4.25},
-                {"x": 19, "y": 4.25}
+                {"matrix": [2, 0], "x": 0.14, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.89, "y": 2},
+                {"matrix": [2, 2], "x": 3.47, "y": 2},
+                {"matrix": [2, 3], "x": 4.47, "y": 2},
+                {"matrix": [2, 4], "x": 5.47, "y": 2},
+                {"matrix": [2, 5], "x": 6.47, "y": 2},
+                {"matrix": [4, 5], "x": 7.47, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.37, "y": 2},
+                {"matrix": [7, 1], "x": 10.37, "y": 2},
+                {"matrix": [7, 2], "x": 11.37, "y": 2},
+                {"matrix": [7, 3], "x": 12.37, "y": 2},
+                {"matrix": [7, 4], "x": 14.09, "y": 2},
+                {"matrix": [7, 5], "x": 15.09, "y": 2},
+                {"matrix": [7, 6], "x": 16.09, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.97, "y": 3},
+                {"matrix": [3, 3], "x": 4.97, "y": 3},
+                {"matrix": [3, 4], "x": 5.97, "y": 3},
+                {"matrix": [3, 5], "x": 6.97, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.87, "y": 3},
+                {"matrix": [8, 1], "x": 9.87, "y": 3},
+                {"matrix": [8, 2], "x": 10.87, "y": 3},
+                {"matrix": [8, 3], "x": 11.87, "y": 3},
+                {"matrix": [8, 4], "x": 13.72, "y": 3},
+                {"matrix": [8, 5], "x": 14.72, "y": 3},
+                {"matrix": [8, 6], "x": 15.72, "y": 3},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [9, 0], "x": 18, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.47, "y": 4},
+                {"matrix": [4, 3], "x": 5.47, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 7.47, "y": 4},
+
+                {"matrix": [9, 1], "x": 9.35, "y": 4, "w": 2.75},
+                {"matrix": [9, 2], "x": 12.1, "y": 4},
+
+                {"matrix": [9, 3], "x": 17, "y": 4.25},
+                {"matrix": [9, 4], "x": 18, "y": 4.25},
+                {"matrix": [9, 5], "x": 19, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h
deleted file mode 100644
index 8065fdfeb9..0000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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( \
-     L00, L01, L02, L03, L04, L05, L06,          R00, R01, R02, R03, R04, R05, R06, R07, \
-       L10, L11, L12, L13, L14, L15, L16,       R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26,      \
-             L30, L31, L32, L33, L34, L35,     R30, R31, R32, R33, R34, R35, R36, R37, R38, \
-     L40, L41,          L42,    L43,   L44,       R40,      R41,                  R42, R43, R44 \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06, KC_NO  }, \
-    { L10, L11, L12, L13, L14, L15, L16, KC_NO  }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \
-    { L40, L41, L42, L43, L44, L26, KC_NO, KC_NO }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, KC_NO }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R38, R40, R41, R42, R43, R44, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
index f511fbc77e..1579f25aa1 100644
--- a/keyboards/kakunpc/thedogkeyboard/info.json
+++ b/keyboards/kakunpc/thedogkeyboard/info.json
@@ -15,7 +15,137 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"1", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"13", "x":3, "y":0}, {"label":"19", "x":4, "y":0}, {"label":"24", "x":5, "y":0}, {"label":"29", "x":6.5, "y":0}, {"label":"35", "x":7.5, "y":0}, {"label":"40", "x":8.5, "y":0}, {"label":"45", "x":9.5, "y":0}, {"label":"50", "x":11, "y":0}, {"label":"56", "x":12, "y":0}, {"label":"62", "x":13, "y":0}, {"label":"66", "x":14, "y":0}, {"label":"70", "x":15.25, "y":0}, {"label":"76", "x":16.25, "y":0}, {"label":"82", "x":17.25, "y":0}, {"label":"2", "x":0, "y":1.5}, {"label":"8", "x":1, "y":1.5}, {"label":"14", "x":2, "y":1.5}, {"label":"20", "x":3, "y":1.5}, {"label":"25", "x":4, "y":1.5}, {"label":"30", "x":5, "y":1.5}, {"label":"36", "x":6, "y":1.5}, {"label":"41", "x":7, "y":1.5}, {"label":"46", "x":8, "y":1.5}, {"label":"51", "x":9, "y":1.5}, {"label":"57", "x":10, "y":1.5}, {"label":"63", "x":11, "y":1.5}, {"label":"67", "x":12, "y":1.5}, {"label":"71", "x":13, "y":1.5, "w":2}, {"label":"77", "x":15.25, "y":1.5}, {"label":"84", "x":16.25, "y":1.5}, {"label":"83", "x":17.25, "y":1.5}, {"label":"88", "x":18.5, "y":1.5}, {"label":"93", "x":19.5, "y":1.5}, {"label":"97", "x":20.5, "y":1.5}, {"label":"102", "x":21.5, "y":1.5}, {"label":"3", "x":0, "y":2.5, "w":1.5}, {"label":"9", "x":1.5, "y":2.5}, {"label":"15", "x":2.5, "y":2.5}, {"label":"21", "x":3.5, "y":2.5}, {"label":"26", "x":4.5, "y":2.5}, {"label":"31", "x":5.5, "y":2.5}, {"label":"37", "x":6.5, "y":2.5}, {"label":"42", "x":7.5, "y":2.5}, {"label":"47", "x":8.5, "y":2.5}, {"label":"52", "x":9.5, "y":2.5}, {"label":"58", "x":10.5, "y":2.5}, {"label":"64", "x":11.5, "y":2.5}, {"label":"68", "x":12.5, "y":2.5}, {"label":"72", "x":13.5, "y":2.5, "w":1.5}, {"label":"78", "x":15.25, "y":2.5}, {"label":"86", "x":16.25, "y":2.5}, {"label":"85", "x":17.25, "y":2.5}, {"label":"89", "x":18.5, "y":2.5}, {"label":"94", "x":19.5, "y":2.5}, {"label":"98", "x":20.5, "y":2.5}, {"label":"103", "x":21.5, "y":2.5}, {"label":"4", "x":0, "y":3.5, "w":1.75}, {"label":"10", "x":1.75, "y":3.5}, {"label":"16", "x":2.75, "y":3.5}, {"label":"22", "x":3.75, "y":3.5}, {"label":"27", "x":4.75, "y":3.5}, {"label":"32", "x":5.75, "y":3.5}, {"label":"38", "x":6.75, "y":3.5}, {"label":"43", "x":7.75, "y":3.5}, {"label":"48", "x":8.75, "y":3.5}, {"label":"53", "x":9.75, "y":3.5}, {"label":"59", "x":10.75, "y":3.5}, {"label":"65", "x":11.75, "y":3.5}, {"label":"73", "x":12.75, "y":3.5, "w":2.25}, {"label":"90", "x":18.5, "y":3.5}, {"label":"95", "x":19.5, "y":3.5}, {"label":"99", "x":20.5, "y":3.5}, {"label":"110", "x":21.5, "y":3.5}, {"label":"5", "x":0, "y":4.5, "w":2.25}, {"label":"11", "x":2.25, "y":4.5}, {"label":"17", "x":3.25, "y":4.5}, {"label":"23", "x":4.25, "y":4.5}, {"label":"28", "x":5.25, "y":4.5}, {"label":"33", "x":6.25, "y":4.5}, {"label":"39", "x":7.25, "y":4.5}, {"label":"44", "x":8.25, "y":4.5}, {"label":"49", "x":9.25, "y":4.5}, {"label":"54", "x":10.25, "y":4.5}, {"label":"60", "x":11.25, "y":4.5}, {"label":"74", "x":12.25, "y":4.5, "w":2.75}, {"label":"87", "x":16.25, "y":4.5}, {"label":"91", "x":18.5, "y":4.5}, {"label":"96", "x":19.5, "y":4.5}, {"label":"100", "x":20.5, "y":4.5}, {"label":"104", "x":21.5, "y":4.5}, {"label":"6", "x":0, "y":5.5, "w":1.25}, {"label":"12", "x":1.25, "y":5.5, "w":1.25}, {"label":"18", "x":2.5, "y":5.5, "w":1.25}, {"label":"105", "x":3.75, "y":5.5, "w":1.25}, {"label":"106", "x":5, "y":5.5, "w":1.25}, {"label":"34", "x":6.25, "y":5.5, "w":1.25}, {"label":"107", "x":7.5, "y":5.5, "w":1.25}, {"label":"108", "x":8.75, "y":5.5, "w":1.25}, {"label":"55", "x":10, "y":5.5, "w":1.25}, {"label":"61", "x":11.25, "y":5.5, "w":1.25}, {"label":"69", "x":12.5, "y":5.5, "w":1.25}, {"label":"75", "x":13.75, "y":5.5, "w":1.25}, {"label":"79", "x":15.25, "y":5.5}, {"label":"80", "x":16.25, "y":5.5}, {"label":"81", "x":17.25, "y":5.5}, {"label":"92", "x":18.5, "y":5.5}, {"label":"109", "x":19.5, "y":5.5}, {"label":"101", "x":20.5, "y":5.5}, {"label":"111", "x":21.5, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [2, 0], "x": 3, "y": 0},
+                {"matrix": [3, 0], "x": 4, "y": 0},
+                {"matrix": [4, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 0], "x": 7.5, "y": 0},
+                {"matrix": [7, 0], "x": 8.5, "y": 0},
+                {"matrix": [8, 0], "x": 9.5, "y": 0},
+
+                {"matrix": [9, 0], "x": 11, "y": 0},
+                {"matrix": [10, 0], "x": 12, "y": 0},
+                {"matrix": [11, 0], "x": 13, "y": 0},
+                {"matrix": [12, 0], "x": 14, "y": 0},
+
+                {"matrix": [13, 0], "x": 15.25, "y": 0},
+                {"matrix": [14, 0], "x": 16.25, "y": 0},
+                {"matrix": [15, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [4, 1], "x": 4, "y": 1.5},
+                {"matrix": [5, 1], "x": 5, "y": 1.5},
+                {"matrix": [6, 1], "x": 6, "y": 1.5},
+                {"matrix": [7, 1], "x": 7, "y": 1.5},
+                {"matrix": [8, 1], "x": 8, "y": 1.5},
+                {"matrix": [9, 1], "x": 9, "y": 1.5},
+                {"matrix": [10, 1], "x": 10, "y": 1.5},
+                {"matrix": [11, 1], "x": 11, "y": 1.5},
+                {"matrix": [12, 1], "x": 12, "y": 1.5},
+                {"matrix": [13, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [14, 1], "x": 15.25, "y": 1.5},
+                {"matrix": [15, 2], "x": 16.25, "y": 1.5},
+                {"matrix": [15, 1], "x": 17.25, "y": 1.5},
+
+                {"matrix": [16, 0], "x": 18.5, "y": 1.5},
+                {"matrix": [17, 0], "x": 19.5, "y": 1.5},
+                {"matrix": [18, 0], "x": 20.5, "y": 1.5},
+                {"matrix": [19, 0], "x": 21.5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [7, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 8.5, "y": 2.5},
+                {"matrix": [9, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [10, 2], "x": 10.5, "y": 2.5},
+                {"matrix": [11, 2], "x": 11.5, "y": 2.5},
+                {"matrix": [12, 2], "x": 12.5, "y": 2.5},
+                {"matrix": [13, 2], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [14, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [15, 4], "x": 16.25, "y": 2.5},
+                {"matrix": [15, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [16, 1], "x": 18.5, "y": 2.5},
+                {"matrix": [17, 1], "x": 19.5, "y": 2.5},
+                {"matrix": [18, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [19, 1], "x": 21.5, "y": 2.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.5},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [10, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [11, 3], "x": 11.75, "y": 3.5},
+                {"matrix": [13, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [16, 2], "x": 18.5, "y": 3.5},
+                {"matrix": [17, 2], "x": 19.5, "y": 3.5},
+                {"matrix": [18, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [19, 3], "x": 21.5, "y": 3.5},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 4], "x": 2.25, "y": 4.5},
+                {"matrix": [2, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [3, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 4], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 4], "x": 11.25, "y": 4.5},
+                {"matrix": [13, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [15, 5], "x": 16.25, "y": 4.5},
+
+                {"matrix": [16, 3], "x": 18.5, "y": 4.5},
+                {"matrix": [17, 3], "x": 19.5, "y": 4.5},
+                {"matrix": [18, 3], "x": 20.5, "y": 4.5},
+                {"matrix": [19, 2], "x": 21.5, "y": 4.5},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 6.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 7.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 5], "x": 8.75, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [12, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [13, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [14, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [14, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [14, 5], "x": 17.25, "y": 5.5},
+
+                {"matrix": [16, 4], "x": 18.5, "y": 5.5},
+                {"matrix": [17, 4], "x": 19.5, "y": 5.5},
+                {"matrix": [18, 4], "x": 20.5, "y": 5.5},
+                {"matrix": [19, 4], "x": 21.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h
deleted file mode 100644
index 3f4b72c2be..0000000000
--- a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 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( \
-    k01,   k07,k13,k19,k24,   k29,k35,k40,k45,   k50,k56,k62,k66,   k70,k76,k82,\
-    \
-    k02,k08,k14,k20,k25,k30,k36,k41,k46,k51,k57,k63,k67,       k71,   k77,k84,k83,   k88,k93,k97,k102,   \
-    k03,   k09,k15,k21,k26,k31,k37,k42,k47,k52,k58,k64,k68,    k72,   k78,k86,k85,   k89,k94,k98,k103,   \
-    k04,    k10,k16,k22,k27,k32,k38,k43,k48,k53,k59,k65,       k73,                  k90,k95,k99,k110,   \
-    k05,     k11,k17,k23,k28,k33,k39,k44,k49,k54,k60,          k74,       k87,       k91,k96,k100,k104,  \
-    k06, k12, k18, k105, k106, k34, k107, k108, k55, k61, k69, k75,   k79,k80,k81,   k92,k109,k101,k111  \
-    \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06 }, \
-    { k07, k08, k09, k10, k11, k12 }, \
-    { k13, k14, k15, k16, k17, k18 }, \
-    { k19, k20, k21, k22, k23, k105 }, \
-    { k24, k25, k26, k27, k28, k106 }, \
-    { k29, k30, k31, k32, k33, k34 }, \
-    { k35, k36, k37, k38, k39, k107 }, \
-    { k40, k41, k42, k43, k44, k108 }, \
-    { k45, k46, k47, k48, k49, KC_NO }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k56, k57, k58, k59, k60, k61 }, \
-    { k62, k63, k64, k65, KC_NO, KC_NO }, \
-    { k66, k67, k68, k69, KC_NO, KC_NO }, \
-    { k70, k71, k72, k73, k74, k75 }, \
-    { k76, k77, k78, k79, k80, k81 }, \
-    { k82, k83, k84, k85, k86, k87 }, \
-    { k88, k89, k90, k91, k92, KC_NO }, \
-    { k93, k94, k95, k96, k109, KC_NO }, \
-    { k97, k98, k99, k100, k101, KC_NO }, \
-    { k102, k103, k104, k110, k111, KC_NO } \
-}