Move single `LAYOUT`s to data driven (#20365)

6 files changed, 201 insertions, 224 deletions

diff --git a/keyboards/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json
index fd508c1003..5bef38ca0a 100644
--- a/keyboards/keyhive/opus/info.json
+++ b/keyboards/keyhive/opus/info.json
@@ -17,55 +17,55 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Tab", "x": 0, "y": 0.4 },
-                { "label": "Q", "x": 1, "y": 0.4 },
-                { "label": "W", "x": 2, "y": 0.2 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0.4 },
-                { "label": "T", "x": 5, "y": 0.5 },
+                {"matrix": [0, 0], "x": 0, "y": 0.4},
+                {"matrix": [0, 1], "x": 1, "y": 0.4},
+                {"matrix": [0, 2], "x": 2, "y": 0.2},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
 
-                { "label": "Y", "x": 10, "y": 0.5 },
-                { "label": "U", "x": 11, "y": 0.4 },
-                { "label": "I", "x": 12, "y": 0 },
-                { "label": "O", "x": 13, "y": 0.2 },
-                { "label": "P", "x": 14, "y": 0.4 },
-                { "label": "Back Space", "x": 15, "y": 0.4 },
+                {"matrix": [0, 6], "x": 10, "y": 0.5},
+                {"matrix": [0, 7], "x": 11, "y": 0.4},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [0, 9], "x": 13, "y": 0.2},
+                {"matrix": [0, 10], "x": 14, "y": 0.4},
+                {"matrix": [0, 11], "x": 15, "y": 0.4},
 
-                { "label": "Ctrl / Esc", "x": 0, "y": 1.4 },
-                { "label": "A", "x": 1, "y": 1.4 },
-                { "label": "S", "x": 2, "y": 1.2 },
-                { "label": "D", "x": 3, "y": 1 },
-                { "label": "F", "x": 4, "y": 1.4 },
-                { "label": "G", "x": 5, "y": 1.5 },
+                {"matrix": [1, 0], "x": 0, "y": 1.4},
+                {"matrix": [1, 1], "x": 1, "y": 1.4},
+                {"matrix": [1, 2], "x": 2, "y": 1.2},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
 
-                { "label": "H", "x": 10, "y": 1.5 },
-                { "label": "J", "x": 11, "y": 1.4 },
-                { "label": "K", "x": 12, "y": 1 },
-                { "label": "L", "x": 13, "y": 1.2 },
-                { "label": ";", "x": 14, "y": 1.4 },
-                { "label": "'", "x": 15, "y": 1.4 },
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.4},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1.2},
+                {"matrix": [1, 10], "x": 14, "y": 1.4},
+                {"matrix": [1, 11], "x": 15, "y": 1.4},
 
-                { "label": "GUI", "x": 0, "y": 2.4 },
-                { "label": "Z", "x": 1, "y": 2.4 },
-                { "label": "X", "x": 2, "y": 2.2 },
-                { "label": "C", "x": 3, "y": 2 },
-                { "label": "V", "x": 4, "y": 2.4 },
-                { "label": "B", "x": 5, "y": 2.5 },
+                {"matrix": [2, 0], "x": 0, "y": 2.4},
+                {"matrix": [2, 1], "x": 1, "y": 2.4},
+                {"matrix": [2, 2], "x": 2, "y": 2.2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
 
-                { "label": "N", "x": 10, "y": 2.5 },
-                { "label": "M", "x": 11, "y": 2.4 },
-                { "label": ",", "x": 12, "y": 2 },
-                { "label": ".", "x": 13, "y": 2.2 },
-                { "label": "/", "x": 14, "y": 2.4 },
-                { "label": "Enter", "x": 15, "y": 2.4 },
+                {"matrix": [2, 6], "x": 10, "y": 2.5},
+                {"matrix": [2, 7], "x": 11, "y": 2.4},
+                {"matrix": [2, 8], "x": 12, "y": 2},
+                {"matrix": [2, 9], "x": 13, "y": 2.2},
+                {"matrix": [2, 10], "x": 14, "y": 2.4},
+                {"matrix": [2, 11], "x": 15, "y": 2.4},
 
-                { "label": "Lower", "x": 4.8, "y": 3.7 },
-                { "label": "Shift", "x": 5.8, "y": 3.5 },
-                { "label": "Tab", "x": 6.8, "y": 3.6 },
+                {"matrix": [3, 3], "x": 4.8, "y": 3.7},
+                {"matrix": [3, 4], "x": 5.8, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.8, "y": 3.6},
 
-                { "label": "Enter", "x": 8.2, "y": 3.6 },
-                { "label": "Space", "x": 9.2, "y": 3.5 },
-                { "label": "Raise", "x": 10.2, "y": 3.7 }
+                {"matrix": [3, 6], "x": 8.2, "y": 3.6},
+                {"matrix": [3, 7], "x": 9.2, "y": 3.5},
+                {"matrix": [3, 8], "x": 10.2, "y": 3.7}
             ]
         }
     }
diff --git a/keyboards/keyhive/opus/opus.h b/keyboards/keyhive/opus/opus.h
deleted file mode 100644
index ec82c5bc9a..0000000000
--- a/keyboards/keyhive/opus/opus.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * 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( \
-  k00, k01, k02, k03, k04, k05,                  k06, k07, k08, k09, k0a, k0b, \
-  k10, k11, k12, k13, k14, k15,                  k16, k17, k18, k19, k1a, k1b, \
-  k20, k21, k22, k23, k24, k25,                  k26, k27, k28, k29, k2a, k2b, \
-                        k33, k34, k35,     k36, k37, k38 \
-) \
-{ \
-  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-  { KC_NO, KC_NO, KC_NO, k33, k34, k35, k36, k37, k38, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json
index b3134b1771..a5ebe8c588 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
@@ -20,7 +20,71 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"V+", "x":0.5, "y":0}, {"label":"Tab", "x":1.75, "y":0}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":8.25, "y":0}, {"label":"U", "x":9.25, "y":0}, {"label":"I", "x":10.25, "y":0}, {"label":"O", "x":11.25, "y":0}, {"label":"P", "x":12.25, "y":0}, {"label":"[ {", "x":13.25, "y":0}, {"label":"] }", "x":14.25, "y":0}, {"label":"Bcsp", "x":15.25, "y":0}, {"label":"V-", "x":0.25, "y":1}, {"label":"Caps", "x":1.5, "y":1, "w":1.25}, {"label":"A", "x":2.75, "y":1}, {"label":"S", "x":3.75, "y":1}, {"label":"D", "x":4.75, "y":1}, {"label":"F", "x":5.75, "y":1}, {"label":"G", "x":6.75, "y":1}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":": ;", "x":12.75, "y":1}, {"label":", \"", "x":13.75, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.75}, {"label":"V-", "x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.5, "y":2}, {"label":"N", "x":9.5, "y":2}, {"label":"M", "x":10.5, "y":2}, {"label":"<", "x":11.5, "y":2}, {"label":">", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"label":"Up", "x":14.75, "y":2}, {"label":"?", "x":15.75, "y":2}, {"label":"Ctrl", "x":1.25, "y":3}, {"label":"Alt", "x":3, "y":3, "w":1.25}, {"x":4.25, "y":3, "w":2}, {"label":"Win", "x":6.25, "y":3}, {"x":9.5, "y":3, "w":2.75}, {"label":"Fn", "x":12.25, "y":3}, {"label":"left", "x":13.75, "y":3}, {"label":"down", "x":14.75, "y":3}, {"label":"right", "x":15.75, "y":3}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "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": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.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": [1, 14], "x": 14.75, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 8.5, "y": 2},
+                {"matrix": [2, 8], "x": 9.5, "y": 2},
+                {"matrix": [2, 9], "x": 10.5, "y": 2},
+                {"matrix": [2, 10], "x": 11.5, "y": 2},
+                {"matrix": [2, 11], "x": 12.5, "y": 2},
+                {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 13], "x": 14.75, "y": 2},
+                {"matrix": [2, 14], "x": 15.75, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.75, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/keyhive/smallice/smallice.h b/keyboards/keyhive/smallice/smallice.h
deleted file mode 100644
index 12d4356795..0000000000
--- a/keyboards/keyhive/smallice/smallice.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 armastardo / quark
- *
- * 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( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	      K301,       K303,       K305, K306,       K308,       K310,       K312, K313, K314  \
-) \
-{ \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ KC_NO, K301,  KC_NO, K303,  KC_NO, K305,  K306,  KC_NO, K308,  KC_NO, K310,  KC_NO, K312,  K313,  K314 }  \
-}
diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/info.json
index 8228647362..8514a29986 100644
--- a/keyboards/keyhive/southpole/info.json
+++ b/keyboards/keyhive/southpole/info.json
@@ -18,90 +18,100 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Num Lock", "x":0, "y":0},
-        {"label":"/", "x":1, "y":0},
-        {"label":"*", "x":2, "y":0},
-        {"label":"-", "x":3, "y":0},
-        {"label":"Esc", "x":4.5, "y":0},
-        {"label":"1", "x":5.5, "y":0},
-        {"label":"2", "x":6.5, "y":0},
-        {"label":"3", "x":7.5, "y":0},
-        {"label":"4", "x":8.5, "y":0},
-        {"label":"5", "x":9.5, "y":0},
-        {"label":"6", "x":10.5, "y":0},
-        {"label":"7", "x":11.5, "y":0},
-        {"label":"8", "x":12.5, "y":0},
-        {"label":"9", "x":13.5, "y":0},
-        {"label":"0", "x":14.5, "y":0},
-        {"label":"-", "x":15.5, "y":0},
-        {"label":"=", "x":16.5, "y":0},
-        {"label":"\\", "x":17.5, "y":0},
-        {"label":"Delete", "x":18.5, "y":0},
-        {"label":"Insert", "x":19.5, "y":0},
-        {"label":"7", "x":0, "y":1},
-        {"label":"8", "x":1, "y":1},
-        {"label":"9", "x":2, "y":1},
-        {"label":"+", "x":3, "y":1, "h":2},
-        {"label":"Tab", "x":4.5, "y":1, "w":1.5},
-        {"label":"Q", "x":6, "y":1},
-        {"label":"W", "x":7, "y":1},
-        {"label":"E", "x":8, "y":1},
-        {"label":"R", "x":9, "y":1},
-        {"label":"T", "x":10, "y":1},
-        {"label":"Y", "x":11, "y":1},
-        {"label":"U", "x":12, "y":1},
-        {"label":"I", "x":13, "y":1},
-        {"label":"O", "x":14, "y":1},
-        {"label":"P", "x":15, "y":1},
-        {"label":"[", "x":16, "y":1},
-        {"label":"]", "x":17, "y":1},
-        {"label":"Backspace", "x":18, "y":1, "w":1.5},
-        {"label":"Vol +", "x":19.5, "y":1},
-        {"label":"4", "x":0, "y":2},
-        {"label":"5", "x":1, "y":2},
-        {"label":"6", "x":2, "y":2},
-        {"label":"Enter", "x":3, "y":3, "h":2},
-        {"label":"Caps Lock", "x":4.5, "y":2, "w":1.75},
-        {"label":"A", "x":6.25, "y":2},
-        {"label":"S", "x":7.25, "y":2},
-        {"label":"D", "x":8.25, "y":2},
-        {"label":"F", "x":9.25, "y":2},
-        {"label":"G", "x":10.25, "y":2},
-        {"label":"H", "x":11.25, "y":2},
-        {"label":"J", "x":12.25, "y":2},
-        {"label":"K", "x":13.25, "y":2},
-        {"label":"L", "x":14.25, "y":2},
-        {"label":";", "x":15.25, "y":2},
-        {"label":"'", "x":16.25, "y":2},
-        {"label":"Enter", "x":17.25, "y":2, "w":2.25},
-        {"label":"Vol -", "x":19.5, "y":2},
-        {"label":"1", "x":0, "y":3},
-        {"label":"2", "x":1, "y":3},
-        {"label":"3", "x":2, "y":3},
-        {"label":"Shift", "x":4.5, "y":3, "w":2.25},
-        {"label":"Z", "x":6.75, "y":3},
-        {"label":"X", "x":7.75, "y":3},
-        {"label":"C", "x":8.75, "y":3},
-        {"label":"V", "x":9.75, "y":3},
-        {"label":"B", "x":10.75, "y":3},
-        {"label":"N", "x":11.75, "y":3},
-        {"label":"M", "x":12.75, "y":3},
-        {"label":",", "x":13.75, "y":3},
-        {"label":".", "x":14.75, "y":3},
-        {"label":"/", "x":15.75, "y":3},
-        {"label":"Shift", "x":16.75, "y":3, "w":1.75},
-        {"label":"Up", "x":18.5, "y":3},
-        {"label":"Mute", "x":19.5, "y":3},
-        {"label":"0", "x":0, "y":4, "w":2},
-        {"label":".", "x":2, "y":4},
-        {"label":"Ctrl", "x":4.5, "y":4, "w":1.25},
-        {"label":"GUI", "x":5.75, "y":4, "w":1.25},
-        {"label":"Alt", "x":7, "y":4, "w":1.25},
-        {"label":"Space", "x":8.25, "y":4, "w":7},
-        {"label":"Fn", "x":15.25, "y":4, "w":1.5},
-        {"label":"Left", "x":17.5, "y":4},
-        {"label":"Down", "x":18.5, "y":4},
-        {"label":"Right", "x":19.5, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "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": 17.5, "y": 0},
+        {"matrix": [0, 18], "x": 18.5, "y": 0},
+        {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+        {"matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
+        {"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},
+        {"matrix": [1, 16], "x": 17, "y": 1},
+        {"matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
+        {"matrix": [1, 19], "x": 19.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 3, "h": 2},
+
+        {"matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
+        {"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},
+        {"matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25},
+        {"matrix": [2, 19], "x": 19.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 6.75, "y": 3},
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [3, 9], "x": 10.75, "y": 3},
+        {"matrix": [3, 10], "x": 11.75, "y": 3},
+        {"matrix": [3, 11], "x": 12.75, "y": 3},
+        {"matrix": [3, 12], "x": 13.75, "y": 3},
+        {"matrix": [3, 13], "x": 14.75, "y": 3},
+        {"matrix": [3, 14], "x": 15.75, "y": 3},
+        {"matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75},
+        {"matrix": [3, 16], "x": 18.5, "y": 3},
+        {"matrix": [3, 19], "x": 19.5, "y": 3},
+
+        {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+
+        {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 7, "y": 4, "w": 1.25},
+        {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 7},
+        {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.5},
+
+        {"matrix": [4, 15], "x": 17.5, "y": 4},
+        {"matrix": [4, 16], "x": 18.5, "y": 4},
+        {"matrix": [4, 19], "x": 19.5, "y": 4}
       ]
     }
   }
diff --git a/keyboards/keyhive/southpole/southpole.h b/keyboards/keyhive/southpole/southpole.h
deleted file mode 100644
index 99cf2ce7b5..0000000000
--- a/keyboards/keyhive/southpole/southpole.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117,       K119, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,             K219, \
-	K300, K301, K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316,             K319, \
-	      K401, K402,       K404, K405, K406,             K409,                   K413,       K415, K416,             K419  \
-) \
- { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  KC_NO, K119 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  KC_NO, KC_NO, K219 }, \
-	{ K300,  K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  KC_NO, KC_NO, K319 }, \
-	{ KC_NO, K401,  K402,  KC_NO, K404,  K405,  K406,  KC_NO, KC_NO, K409,  KC_NO, KC_NO, KC_NO, K413,  KC_NO, K415,  K416,  KC_NO, KC_NO, K419 }  \
-}