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

8 files changed, 173 insertions, 323 deletions

diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json
index addfdf057c..d5dfa7061a 100644
--- a/keyboards/reviung/reviung33/info.json
+++ b/keyboards/reviung/reviung33/info.json
@@ -24,42 +24,42 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-              
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-              
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-              
-                {"x":0, "y":3},
-                {"x":2, "y":3, "w":6},
-                {"x":9, "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},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "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},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3, "w": 6},
+                {"matrix": [3, 2], "x": 9, "y": 3}
             ]
         }
     }
diff --git a/keyboards/reviung/reviung33/reviung33.h b/keyboards/reviung/reviung33/reviung33.h
deleted file mode 100644
index 3f054eaa79..0000000000
--- a/keyboards/reviung/reviung33/reviung33.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 gtips
- *
- * 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( \
-    K00, 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  \
-) \
-{ \
-    {   K00,   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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/reviung/reviung39/info.json b/keyboards/reviung/reviung39/info.json
index fbb2861f51..5c2b3445d9 100644
--- a/keyboards/reviung/reviung39/info.json
+++ b/keyboards/reviung/reviung39/info.json
@@ -21,51 +21,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0.54},
-                {"label":"K01", "x":1, "y":0.36},
-                {"label":"K02", "x":2, "y":0.18},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0.18},
-                {"label":"K05", "x":5, "y":0.36},
+                {"matrix": [0, 0], "x": 0, "y": 0.54},
+                {"matrix": [0, 1], "x": 1, "y": 0.36},
+                {"matrix": [0, 2], "x": 2, "y": 0.18},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.18},
+                {"matrix": [0, 5], "x": 5, "y": 0.36},
 
-                {"label":"K30", "x":7, "y":0.36},
-                {"label":"K31", "x":8, "y":0.18},
-                {"label":"K32", "x":9, "y":0},
-                {"label":"K33", "x":10, "y":0.18},
-                {"label":"K34", "x":11, "y":0.36},
-                {"label":"K35", "x":12, "y":0.54},
+                {"matrix": [3, 0], "x": 7, "y": 0.36},
+                {"matrix": [3, 1], "x": 8, "y": 0.18},
+                {"matrix": [3, 2], "x": 9, "y": 0},
+                {"matrix": [3, 3], "x": 10, "y": 0.18},
+                {"matrix": [3, 4], "x": 11, "y": 0.36},
+                {"matrix": [3, 5], "x": 12, "y": 0.54},
 
-                {"label":"K10", "x":0, "y":1.54},
-                {"label":"K11", "x":1, "y":1.36},
-                {"label":"K12", "x":2, "y":1.18},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1.18},
-                {"label":"K15", "x":5, "y":1.36},
+                {"matrix": [1, 0], "x": 0, "y": 1.54},
+                {"matrix": [1, 1], "x": 1, "y": 1.36},
+                {"matrix": [1, 2], "x": 2, "y": 1.18},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.18},
+                {"matrix": [1, 5], "x": 5, "y": 1.36},
 
-                {"label":"K40", "x":7, "y":1.36},
-                {"label":"K41", "x":8, "y":1.18},
-                {"label":"K42", "x":9, "y":1},
-                {"label":"K43", "x":10, "y":1.18},
-                {"label":"K44", "x":11, "y":1.36},
-                {"label":"K45", "x":12, "y":1.54},
+                {"matrix": [4, 0], "x": 7, "y": 1.36},
+                {"matrix": [4, 1], "x": 8, "y": 1.18},
+                {"matrix": [4, 2], "x": 9, "y": 1},
+                {"matrix": [4, 3], "x": 10, "y": 1.18},
+                {"matrix": [4, 4], "x": 11, "y": 1.36},
+                {"matrix": [4, 5], "x": 12, "y": 1.54},
 
-                {"label":"K20", "x":0, "y":2.54},
-                {"label":"K21", "x":1, "y":2.36},
-                {"label":"K22", "x":2, "y":2.18},
-                {"label":"K23", "x":3, "y":2},
-                {"label":"K24", "x":4, "y":2.18},
-                {"label":"K25", "x":5, "y":2.36},
+                {"matrix": [2, 0], "x": 0, "y": 2.54},
+                {"matrix": [2, 1], "x": 1, "y": 2.36},
+                {"matrix": [2, 2], "x": 2, "y": 2.18},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.18},
+                {"matrix": [2, 5], "x": 5, "y": 2.36},
 
-                {"label":"K50", "x":7, "y":2.36},
-                {"label":"K51", "x":8, "y":2.18},
-                {"label":"K52", "x":9, "y":2},
-                {"label":"K53", "x":10, "y":2.18},
-                {"label":"K54", "x":11, "y":2.36},
-                {"label":"K55", "x":12, "y":2.54},
+                {"matrix": [5, 0], "x": 7, "y": 2.36},
+                {"matrix": [5, 1], "x": 8, "y": 2.18},
+                {"matrix": [5, 2], "x": 9, "y": 2},
+                {"matrix": [5, 3], "x": 10, "y": 2.18},
+                {"matrix": [5, 4], "x": 11, "y": 2.36},
+                {"matrix": [5, 5], "x": 12, "y": 2.54},
 
-                {"label":"K60", "x":4.125, "y":3.54, "w":1.25},
-                {"label":"K61", "x":5.375, "y":3.54, "w":2.25},
-                {"label":"K62", "x":7.625, "y":3.54, "w":1.25}
+                {"matrix": [6, 0], "x": 4.125, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 1], "x": 5.375, "y": 3.54, "w": 2.25},
+                {"matrix": [6, 2], "x": 7.625, "y": 3.54, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/reviung/reviung39/reviung39.h b/keyboards/reviung/reviung39/reviung39.h
deleted file mode 100644
index 1315624507..0000000000
--- a/keyboards/reviung/reviung39/reviung39.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 gtips
- *
- * 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,      K30, K31, K32, K33, K34, K35, \
-    K10, K11, K12, K13, K14, K15,      K40, K41, K42, K43, K44, K45, \
-    K20, K21, K22, K23, K24, K25,      K50, K51, K52, K53, K54, K55, \
-                             K60, K61, K62 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05 }, \
-    { K10, K11, K12, K13, K14, K15 }, \
-    { K20, K21, K22, K23, K24, K25 }, \
-    { K30, K31, K32, K33, K34, K35 }, \
-    { K40, K41, K42, K43, K44, K45 }, \
-    { K50, K51, K52, K53, K54, K55 }, \
-    { K60, K61, K62, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json
index a138636dc0..6344a3e53e 100644
--- a/keyboards/reviung/reviung41/info.json
+++ b/keyboards/reviung/reviung41/info.json
@@ -24,53 +24,53 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0.54},
-                {"label":"K01", "x":1, "y":0.36},
-                {"label":"K02", "x":2, "y":0.18},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0.18},
-                {"label":"K05", "x":5, "y":0.36},
+                {"matrix": [0, 0], "x": 0, "y": 0.54},
+                {"matrix": [0, 1], "x": 1, "y": 0.36},
+                {"matrix": [0, 2], "x": 2, "y": 0.18},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.18},
+                {"matrix": [0, 5], "x": 5, "y": 0.36},
 
-                {"label":"K30", "x":7, "y":0.36},
-                {"label":"K31", "x":8, "y":0.18},
-                {"label":"K32", "x":9, "y":0},
-                {"label":"K33", "x":10, "y":0.18},
-                {"label":"K34", "x":11, "y":0.36},
-                {"label":"K35", "x":12, "y":0.54},
+                {"matrix": [3, 0], "x": 7, "y": 0.36},
+                {"matrix": [3, 1], "x": 8, "y": 0.18},
+                {"matrix": [3, 2], "x": 9, "y": 0},
+                {"matrix": [3, 3], "x": 10, "y": 0.18},
+                {"matrix": [3, 4], "x": 11, "y": 0.36},
+                {"matrix": [3, 5], "x": 12, "y": 0.54},
 
-                {"label":"K10", "x":0, "y":1.54},
-                {"label":"K11", "x":1, "y":1.36},
-                {"label":"K12", "x":2, "y":1.18},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1.18},
-                {"label":"K15", "x":5, "y":1.36},
+                {"matrix": [1, 0], "x": 0, "y": 1.54},
+                {"matrix": [1, 1], "x": 1, "y": 1.36},
+                {"matrix": [1, 2], "x": 2, "y": 1.18},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.18},
+                {"matrix": [1, 5], "x": 5, "y": 1.36},
 
-                {"label":"K40", "x":7, "y":1.36},
-                {"label":"K41", "x":8, "y":1.18},
-                {"label":"K42", "x":9, "y":1},
-                {"label":"K43", "x":10, "y":1.18},
-                {"label":"K44", "x":11, "y":1.36},
-                {"label":"K45", "x":12, "y":1.54},
+                {"matrix": [4, 0], "x": 7, "y": 1.36},
+                {"matrix": [4, 1], "x": 8, "y": 1.18},
+                {"matrix": [4, 2], "x": 9, "y": 1},
+                {"matrix": [4, 3], "x": 10, "y": 1.18},
+                {"matrix": [4, 4], "x": 11, "y": 1.36},
+                {"matrix": [4, 5], "x": 12, "y": 1.54},
 
-                {"label":"K20", "x":0, "y":2.54},
-                {"label":"K21", "x":1, "y":2.36},
-                {"label":"K22", "x":2, "y":2.18},
-                {"label":"K23", "x":3, "y":2},
-                {"label":"K24", "x":4, "y":2.18},
-                {"label":"K25", "x":5, "y":2.36},
+                {"matrix": [2, 0], "x": 0, "y": 2.54},
+                {"matrix": [2, 1], "x": 1, "y": 2.36},
+                {"matrix": [2, 2], "x": 2, "y": 2.18},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.18},
+                {"matrix": [2, 5], "x": 5, "y": 2.36},
 
-                {"label":"K50", "x":7, "y":2.36},
-                {"label":"K51", "x":8, "y":2.18},
-                {"label":"K52", "x":9, "y":2},
-                {"label":"K53", "x":10, "y":2.18},
-                {"label":"K54", "x":11, "y":2.36},
-                {"label":"K55", "x":12, "y":2.54},
+                {"matrix": [5, 0], "x": 7, "y": 2.36},
+                {"matrix": [5, 1], "x": 8, "y": 2.18},
+                {"matrix": [5, 2], "x": 9, "y": 2},
+                {"matrix": [5, 3], "x": 10, "y": 2.18},
+                {"matrix": [5, 4], "x": 11, "y": 2.36},
+                {"matrix": [5, 5], "x": 12, "y": 2.54},
 
-                {"label":"K60", "x":2.875, "y":3.54, "w":1.25},
-                {"label":"K61", "x":4.125, "y":3.54, "w":1.25},
-                {"label":"K62", "x":5.375, "y":3.54, "w":2.25},
-                {"label":"K63", "x":7.625, "y":3.54, "w":1.25},
-                {"label":"K64", "x":8.875, "y":3.54, "w":1.25}
+                {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
+                {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/reviung/reviung41/reviung41.h b/keyboards/reviung/reviung41/reviung41.h
deleted file mode 100644
index a1b7f14a0a..0000000000
--- a/keyboards/reviung/reviung41/reviung41.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 gtips
- *
- * 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,      K30, K31, K32, K33, K34, K35, \
-    K10, K11, K12, K13, K14, K15,      K40, K41, K42, K43, K44, K45, \
-    K20, K21, K22, K23, K24, K25,      K50, K51, K52, K53, K54, K55, \
-                        K60, K61, K62, K63, K64 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05 }, \
-    { K10, K11, K12, K13, K14, K15 }, \
-    { K20, K21, K22, K23, K24, K25 }, \
-    { K30, K31, K32, K33, K34, K35 }, \
-    { K40, K41, K42, K43, K44, K45 }, \
-    { K50, K51, K52, K53, K54, K55 }, \
-    { K60, K61, K62, K63, K64, KC_NO } \
-}
diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json
index 4d3b7c1354..bf398b82c8 100644
--- a/keyboards/reviung/reviung53/info.json
+++ b/keyboards/reviung/reviung53/info.json
@@ -24,64 +24,68 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k02", "x":2.25,  "y":0},
-                {"label": "k03", "x":3.5,   "y":0},
-                {"label": "k04", "x":4.5,   "y":0},
-                {"label": "k05", "x":5.5,   "y":0},
-                {"label": "k06", "x":6.5,   "y":0},
-                {"label": "k07", "x":7.75,  "y":0},
-                {"label": "k40", "x":8.75,  "y":0},
-                {"label": "k41", "x":9.75,  "y":0},
-                {"label": "k42", "x":10.75, "y":0},
-                {"label": "k43", "x":12,    "y":0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
 
-                {"label": "k10", "x":0,     "y":1.25, "w":1.5},
-                {"label": "k11", "x":1.5,   "y":1.25},
-                {"label": "k12", "x":2.5,   "y":1.25},
-                {"label": "k13", "x":3.5,   "y":1.25},
-                {"label": "k14", "x":4.5,   "y":1.25},
-                {"label": "k15", "x":5.5,   "y":1.25},
-                {"label": "k16", "x":6.5,   "y":1.25},
-                {"label": "k17", "x":7.5,   "y":1.25},
-                {"label": "k44", "x":8.5,   "y":1.25},
-                {"label": "k45", "x":9.5,   "y":1.25},
-                {"label": "k46", "x":10.5,  "y":1.25},
-                {"label": "k47", "x":11.5,  "y":1.25, "w":1.5},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
 
-                {"label": "k20", "x":0,     "y":2.25, "w":1.75},
-                {"label": "k21", "x":1.75,  "y":2.25},
-                {"label": "k22", "x":2.75,  "y":2.25},
-                {"label": "k23", "x":3.75,  "y":2.25},
-                {"label": "k24", "x":4.75,  "y":2.25},
-                {"label": "k25", "x":5.75,  "y":2.25},
-                {"label": "k26", "x":6.75,  "y":2.25},
-                {"label": "k27", "x":7.75,  "y":2.25},
-                {"label": "k50", "x":8.75,  "y":2.25},
-                {"label": "k51", "x":9.75,  "y":2.25},
-                {"label": "k52", "x":10.75, "y":2.25},
-                {"label": "k53", "x":11.75, "y":2.25, "w":1.25},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [4, 0], "x": 8.75, "y": 0},
+                {"matrix": [4, 1], "x": 9.75, "y": 0},
+                {"matrix": [4, 2], "x": 10.75, "y": 0},
 
-                {"label": "k30", "x":0,     "y":3.25, "w":2.25},
-                {"label": "k31", "x":2.25,  "y":3.25},
-                {"label": "k32", "x":3.25,  "y":3.25},
-                {"label": "k33", "x":4.25,  "y":3.25},
-                {"label": "k34", "x":5.25,  "y":3.25},
-                {"label": "k35", "x":6.25,  "y":3.25},
-                {"label": "k36", "x":7.25,  "y":3.25},
-                {"label": "k37", "x":8.25,  "y":3.25},
-                {"label": "k54", "x":9.25,  "y":3.25},
-                {"label": "k55", "x":10.25, "y":3.25},
-                {"label": "k56", "x":11.25, "y":3.25, "w":1.75},
+                {"matrix": [4, 3], "x": 12, "y": 0},
 
-                {"label": "k60", "x":0,     "y":4.25, "w":1.5},
-                {"label": "k61", "x":1.5,   "y":4.25, "w":1.25},
-                {"label": "k62", "x":2.75,  "y":4.25, "w":1.25},
-                {"label": "k63", "x":4,     "y":4.25, "w":2.75},
-                {"label": "k64", "x":6.75,  "y":4.25, "w":2.25},
-                {"label": "k65", "x":9,     "y":4.25, "w":1.25},
-                {"label": "k66", "x":10.25, "y":4.25, "w":1.25},
-                {"label": "k67", "x":11.5,  "y":4.25, "w":1.5}
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 1.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 1.25},
+                {"matrix": [4, 6], "x": 10.5, "y": 1.25},
+                {"matrix": [4, 7], "x": 11.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [5, 0], "x": 8.75, "y": 2.25},
+                {"matrix": [5, 1], "x": 9.75, "y": 2.25},
+                {"matrix": [5, 2], "x": 10.75, "y": 2.25},
+                {"matrix": [5, 3], "x": 11.75, "y": 2.25, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"matrix": [5, 4], "x": 9.25, "y": 3.25},
+                {"matrix": [5, 5], "x": 10.25, "y": 3.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [6, 1], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.75, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 3], "x": 4, "y": 4.25, "w": 2.75},
+                {"matrix": [6, 4], "x": 6.75, "y": 4.25, "w": 2.25},
+                {"matrix": [6, 5], "x": 9, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 6], "x": 10.25, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 7], "x": 11.5, "y": 4.25, "w": 1.5}
             ]
         }
     }
+
 }
diff --git a/keyboards/reviung/reviung53/reviung53.h b/keyboards/reviung/reviung53/reviung53.h
deleted file mode 100644
index 23ae04500f..0000000000
--- a/keyboards/reviung/reviung53/reviung53.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2021 gtips (@gtips)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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( \
-              K02, K03, K04, K05, K06, K07, K40, K41, K42, K43,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K44, K45, K46, K47, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K50, K51, K52, K53, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K54, K55, K56,\
-    K60, K61, K62, K63, K64, K65, K66, K67 \
-) { \
-    { KC_NO, KC_NO, K02,   K03,   K04,   K05,   K06,   K07 }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17 }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27 }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37 }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47 }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   KC_NO }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67 } \
-}