Move `default` layouts to data driven (#20349)

9 files changed, 356 insertions, 529 deletions

diff --git a/keyboards/qpockets/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
deleted file mode 100644
index 4d4c4a1241..0000000000
--- a/keyboards/qpockets/eggman/eggman.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_default( \
-				        K02,      K04, \
-	K10, K00, K11, K01, K12, K13, K14, K05, K15, K06, K16, \
-	K30, K20, K31, K21, K32, K33, K34, K25, K35, K26, K36, \
-	K50, K40, K51, K41, K52, K53, K54, K45, K55, K46, K56, \
-              K61, K62,      K64, K65 \
-) \
-{ \
-{ K00, K01, K02, XXX, K04, K05, K06 }, \
-{ K10, K11, K12, K13, K14, K15, K16 }, \
-{ K20, K21, XXX, XXX, XXX, K25, K26 }, \
-{ K30, K31, K32, K33, K34, K35, K36 }, \
-{ K40, K41, XXX, XXX, XXX, K45, K46 }, \
-{ K50, K51, K52, K53, K54, K55, K56 }, \
-{ XXX, K61, K62, XXX, K64, K65, XXX }, \
-}
-
diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json
index 58d2975169..1dbf27825c 100644
--- a/keyboards/qpockets/eggman/info.json
+++ b/keyboards/qpockets/eggman/info.json
@@ -24,45 +24,51 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-			{"label":"RE", "x":4.25, "y":0}, 
-			{"label":"RE", "x":6.25, "y":0}, 
-			{"label":"Q", "x":0, "y":0.75}, 
-			{"label":"W", "x":1, "y":0.5}, 
-			{"label":"E", "x":2, "y":0.25}, 
-			{"label":"R", "x":3, "y":0.75}, 
-			{"label":"T", "x":4, "y":1}, 
-			{"label":"Delete", "x":5, "y":1, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":1}, 
-			{"label":"U", "x":7.5, "y":0.75}, 
-			{"label":"I", "x":8.5, "y":0.25}, 
-			{"label":"O", "x":9.5, "y":0.5}, 
-			{"label":"P", "x":10.5, "y":0.75}, 
-			{"label":"A", "x":0, "y":1.75}, 
-			{"label":"S", "x":1, "y":1.5},  
-			{"label":"D", "x":2, "y":1.25}, 
-			{"label":"F", "x":3, "y":1.75}, 
-			{"label":"G", "x":4, "y":2}, 
-			{"label":"Tab", "x":5, "y":2, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":2}, 
-			{"label":"J", "x":7.5, "y":1.75}, 
-			{"label":"K", "x":8.5, "y":1.25}, 
-			{"label":"L", "x":9.5, "y":1.5}, 
-			{"label":"\"", "x":10.5, "y":1.75}, 
-			{"label":"Z", "x":0, "y":2.75}, 
-			{"label":"X", "x":1, "y":2.5}, 
-			{"label":"C", "x":2, "y":2.25}, 
-			{"label":"V", "x":3, "y":2.75}, 
-			{"label":"B", "x":4, "y":3}, 
-			{"label":"Shift", "x":5, "y":3, "w":1.5},  
-			{"label":"N", "x":6.5, "y":3}, 
-			{"label":"M", "x":7.5, "y":2.75}, 
-			{"label":"<", "x":8.5, "y":2.25}, 
-			{"label":">", "x":9.5, "y":2.5}, 
-			{"label":"?", "x":10.5, "y":2.75}, 
-			{"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, 
-			{"label":"Backspace", "x":3.75, "y":4, "w":2}, 
-			{"label":"Space", "x":5.75, "y":4, "w":2}, 
-			{"label":"Alt", "x":7.75, "y":4, "w":1.25}] 
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 0], "x": 1, "y": 0.5},
+                {"matrix": [1, 1], "x": 2, "y": 0.25},
+                {"matrix": [0, 1], "x": 3, "y": 0.75},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1, "w": 1.5},
+                {"matrix": [1, 4], "x": 6.5, "y": 1},
+                {"matrix": [0, 5], "x": 7.5, "y": 0.75},
+                {"matrix": [1, 5], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 9.5, "y": 0.5},
+                {"matrix": [1, 6], "x": 10.5, "y": 0.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 1.75},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [2, 1], "x": 3, "y": 1.75},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [3, 3], "x": 5, "y": 2, "w": 1.5},
+                {"matrix": [3, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 1.75},
+                {"matrix": [3, 5], "x": 8.5, "y": 1.25},
+                {"matrix": [2, 6], "x": 9.5, "y": 1.5},
+                {"matrix": [3, 6], "x": 10.5, "y": 1.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.75},
+                {"matrix": [4, 0], "x": 1, "y": 2.5},
+                {"matrix": [5, 1], "x": 2, "y": 2.25},
+                {"matrix": [4, 1], "x": 3, "y": 2.75},
+                {"matrix": [5, 2], "x": 4, "y": 3},
+                {"matrix": [5, 3], "x": 5, "y": 3, "w": 1.5},
+                {"matrix": [5, 4], "x": 6.5, "y": 3},
+                {"matrix": [4, 5], "x": 7.5, "y": 2.75},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 10.5, "y": 2.75},
+
+                {"matrix": [6, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 4, "w": 2},
+                {"matrix": [6, 4], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [6, 5], "x": 7.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index 5b4806e832..32d744c0a9 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -24,86 +24,92 @@
   "debounce": 7,
   "layouts": {
     "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+      "layout": [
+        {"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, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"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": [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},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     },
-	    "LAYOUT_big_space": {
+    "LAYOUT_big_space": {
       "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+        {"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, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"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": [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},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/qpockets/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
deleted file mode 100644
index e56068ec42..0000000000
--- a/keyboards/qpockets/space_space/rev1/rev1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-}
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 6c70d42f42..949b80bd3b 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -26,86 +26,92 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+      "layout": [
+        {"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, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"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": [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},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     },
-	    "LAYOUT_big_space": {
+    "LAYOUT_big_space": {
       "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+        {"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, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"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": [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},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/qpockets/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
index 07b93b36aa..e6053afb75 100644
--- a/keyboards/qpockets/space_space/rev2/rev2.c
+++ b/keyboards/qpockets/space_space/rev2/rev2.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/qpockets/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h
deleted file mode 100644
index 99362b900f..0000000000
--- a/keyboards/qpockets/space_space/rev2/rev2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-} \
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) \
-{ \
-   {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-   {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-   {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-   {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
-
-
diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json
index f9c2841a58..4cb26a4365 100644
--- a/keyboards/qpockets/wanten/info.json
+++ b/keyboards/qpockets/wanten/info.json
@@ -25,148 +25,155 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-			{"label":"Play", "x":0, "y":0}, 
-			{"label":"q", "x":1, "y":0}, 
-			{"label":"w", "x":2, "y":0}, 
-			{"label":"e", "x":3, "y":0}, 
-			{"label":"r", "x":4, "y":0}, 
-			{"label":"t", "x":5, "y":0}, 
-			{"label":"Del", "x":6, "y":0, "w":1.75}, 
-			{"label":"y", "x":7.75, "y":0}, 
-			{"label":"u", "x":8.75, "y":0}, 
-			{"label":"i", "x":9.75, "y":0}, 
-			{"label":"o", "x":10.75, "y":0}, 
-			{"label":"p", "x":11.75, "y":0}, 
-			{"label":"Next", "x":0, "y":1}, 
-			{"label":"a", "x":1, "y":1}, 
-			{"label":"s", "x":2, "y":1}, 
-			{"label":"d", "x":3, "y":1}, 
-			{"label":"f", "x":4, "y":1}, 
-			{"label":"g", "x":5, "y":1}, 
-			{"label":"Tab", "x":6, "y":1, "w":1.75}, 
-			{"label":"h", "x":7.75, "y":1}, 
-			{"label":"j", "x":8.75, "y":1}, 
-			{"label":"k", "x":9.75, "y":1}, 
-			{"label":"l", "x":10.75, "y":1}, 
-			{"label":"\"", "x":11.75, "y":1}, 
-			{"label":"Prev", "x":0, "y":2}, 
-			{"label":"z", "x":1, "y":2}, 
-			{"label":"x", "x":2, "y":2}, 
-			{"label":"c", "x":3, "y":2}, 
-			{"label":"v", "x":4, "y":2}, 
-			{"label":"b", "x":5, "y":2}, 
-			{"label":"Shift", "x":6, "y":2, "w":1.75}, 
-			{"label":"n", "x":7.75, "y":2}, 
-			{"label":"m", "x":8.75, "y":2}, 
-			{"label":"<", "x":9.75, "y":2}, 
-			{"label":">", "x":10.75, "y":2}, 
-			{"label":"?", "x":11.75, "y":2}, 
-			{"label":"LCtrl", "x":0, "y":3, "w":1.25}, 
-			{"label":"LGui", "x":1.25, "y":3, "w":1.25}, 
-			{"label":"LAlt", "x":2.5, "y":3, "w":1.25}, 
-			{"label":"Back", "x":3.75, "y":3, "w":3}, 
-			{"label":"Space", "x":6.75, "y":3, "w":3}, 
-			{"label":"RCtrl", "x":9.75, "y":3}, 
-			{"label":"RGui", "x":10.75, "y":3}, 
-			{"label":"RAlt", "x":11.75, "y":3}
-			]
+                {"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, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0, "w": 1.75},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "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},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1, "w": 1.75},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "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": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2, "w": 1.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 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}
+            ]
         },
-		
-		"LAYOUT_2u_bars": {
+        "LAYOUT_2u_bars": {
             "layout": [
-			{"label":"Play", "x":0, "y":0}, 
-			{"label":"q", "x":1, "y":0}, 
-			{"label":"w", "x":2, "y":0}, 
-			{"label":"e", "x":3, "y":0}, 
-			{"label":"r", "x":4, "y":0}, 
-			{"label":"t", "x":5, "y":0}, 
-			{"label":"Del", "x":6, "y":0, "w":1.75}, 
-			{"label":"y", "x":7.75, "y":0}, 
-			{"label":"u", "x":8.75, "y":0}, 
-			{"label":"i", "x":9.75, "y":0}, 
-			{"label":"o", "x":10.75, "y":0}, 
-			{"label":"p", "x":11.75, "y":0}, 
-			{"label":"Next", "x":0, "y":1}, 
-			{"label":"a", "x":1, "y":1}, 
-			{"label":"s", "x":2, "y":1}, 
-			{"label":"d", "x":3, "y":1}, 
-			{"label":"f", "x":4, "y":1}, 
-			{"label":"g", "x":5, "y":1}, 
-			{"label":"Tab", "x":6, "y":1, "w":1.75}, 
-			{"label":"h", "x":7.75, "y":1}, 
-			{"label":"j", "x":8.75, "y":1}, 
-			{"label":"k", "x":9.75, "y":1}, 
-			{"label":"l", "x":10.75, "y":1}, 
-			{"label":"\"", "x":11.75, "y":1}, 
-			{"label":"Prev", "x":0, "y":2}, 
-			{"label":"z", "x":1, "y":2}, 
-			{"label":"x", "x":2, "y":2}, 
-			{"label":"c", "x":3, "y":2}, 
-			{"label":"v", "x":4, "y":2}, 
-			{"label":"b", "x":5, "y":2}, 
-			{"label":"Shift", "x":6, "y":2, "w":1.75}, 
-			{"label":"n", "x":7.75, "y":2}, 
-			{"label":"m", "x":8.75, "y":2}, 
-			{"label":"<", "x":9.75, "y":2}, 
-			{"label":">", "x":10.75, "y":2}, 
-			{"label":"?", "x":11.75, "y":2}, 
-			{"label":"PSCR", "x":0, "y":3, "w":1.25}, 
-			{"label":"LAlt", "x":1.25, "y":3, "w":1.25}, 
-			{"label":"LGui", "x":2.5, "y":3, "w":1.25}, 
-			{"label":"LCtl", "x":3.75, "y":3}, 
-			{"label":"Back", "x":4.75, "y":3, "w":2}, 
-			{"label":"Space", "x":6.75, "y":3, "w":2.25}, 
-			{"label":"RCtrl", "x":9, "y":3}, 
-			{"label":"RGui", "x":10, "y":3, "w":1.25}, 
-			{"label":"RAlt", "x":11.25, "y":3, "w":1.5}
-			]
+                {"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, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0, "w": 1.75},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "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},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1, "w": 1.75},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "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": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2, "w": 1.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+            ]
         },
-		
         "LAYOUT_625_bar": {
             "layout": [
-			{"label":"Play", "x":0, "y":0},
-			{"label":"q", "x":1, "y":0},
-			{"label":"w", "x":2, "y":0},
-			{"label":"e", "x":3, "y":0},
-			{"label":"r", "x":4, "y":0},
-			{"label":"t", "x":5, "y":0},
-			{"label":"Del", "x":6, "y":0, "w":1.75},
-			{"label":"y", "x":7.75, "y":0},
-			{"label":"u", "x":8.75, "y":0},
-			{"label":"i", "x":9.75, "y":0},
-			{"label":"o", "x":10.75, "y":0},
-			{"label":"p", "x":11.75, "y":0},
-			{"label":"Next", "x":0, "y":1},
-			{"label":"a", "x":1, "y":1},
-			{"label":"s", "x":2, "y":1},
-			{"label":"d", "x":3, "y":1},
-			{"label":"f", "x":4, "y":1},
-			{"label":"g", "x":5, "y":1},
-			{"label":"Tab", "x":6, "y":1, "w":1.75},
-			{"label":"h", "x":7.75, "y":1},
-			{"label":"j", "x":8.75, "y":1},
-			{"label":"k", "x":9.75, "y":1},
-			{"label":"l", "x":10.75, "y":1},
-			{"label":"\"", "x":11.75, "y":1},
-			{"label":"Prev", "x":0, "y":2},
-			{"label":"z", "x":1, "y":2},
-			{"label":"x", "x":2, "y":2},
-			{"label":"c", "x":3, "y":2},
-			{"label":"v", "x":4, "y":2},
-			{"label":"b", "x":5, "y":2},
-			{"label":"Shift", "x":6, "y":2, "w":1.75},
-			{"label":"n", "x":7.75, "y":2},
-			{"label":"m", "x":8.75, "y":2},
-			{"label":"<", "x":9.75, "y":2},
-			{"label":">", "x":10.75, "y":2},
-			{"label":"?", "x":11.75, "y":2},
-			{"label":"LAlt", "x":0, "y":3, "w":1.25},
-			{"label":"LGui", "x":1.25, "y":3, "w":1.25},
-			{"label":"LCtrl", "x":2.5, "y":3, "w":1.25},
-			{"label":"Space", "x":3.75, "y":3, "w":6.25},
-			{"label":"RAlt", "x":10, "y":3, "w":1.25},
-			{"label":"RCtrl", "x":11.25, "y":3, "w":1.5}
-			]
+                {"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, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0, "w": 1.75},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "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},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1, "w": 1.75},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "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": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2, "w": 1.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/qpockets/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h
deleted file mode 100644
index e6db44fea6..0000000000
--- a/keyboards/qpockets/wanten/wanten.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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 XXX KC_NO
-
-/* 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_default( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
-	k30, k31, k32,           k35,      k37,      k39, k80, k81  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
-	{ k30, k31, k32, XXX, XXX, k35, XXX, k37, XXX, k39, k80, k81, } \
-}
-
-#define LAYOUT_625_bar( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
-	k30, k31, k32,                k36,           k39,      k81  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
-	{ k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k81, } \
-}
-
-#define LAYOUT_2u_bars( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
-	k30, k31, k32,      k34, k35,      k37, k38, k39,      k81  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
-	{ k30, k31, k32, XXX, k34, k35, XXX, k37, k38, k39, XXX, k81, } \
-}