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

18 files changed, 632 insertions, 878 deletions

diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json
index 74cbf358c1..493ba6fca2 100644
--- a/keyboards/rart/rart45/info.json
+++ b/keyboards/rart/rart45/info.json
@@ -22,63 +22,67 @@
   "layouts": {
     "LAYOUT_all": {
       "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": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 12, "y": 0 },
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [4, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [4, 1], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0},
+        {"matrix": [4, 2], "x": 5, "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": 7, "y": 1 },
-        {"x": 8, "y": 1 },
-        {"x": 9, "y": 1 },
-        {"x": 10, "y": 1 },
-        {"x": 11, "y": 1 },
-        {"x": 12, "y": 1 },
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [4, 3], "x": 8, "y": 0},
+        {"matrix": [0, 4], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+        {"matrix": [4, 5], "x": 12, "y": 0},
 
-        {"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": 7, "y": 2 },
-        {"x": 8, "y": 2 },
-        {"x": 9, "y": 2 },
-        {"x": 10, "y": 2 },
-        {"x": 11, "y": 2 },
-        {"x": 12, "y": 2 },
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [5, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [5, 1], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1},
+        {"matrix": [5, 2], "x": 5, "y": 1},
 
-        {"x": 0, "y": 3 },
-        {"x": 1, "y": 3 },
-        {"x": 2, "y": 3 },
-        {"x": 3, "y": 3 },
-        {"x": 4, "y": 3 },
-        {"x": 5, "y": 3 },
-        {"x": 7, "y": 3 },
-        {"x": 8, "y": 3 },
-        {"x": 9, "y": 3 },
-        {"x": 10, "y": 3 },
-        {"x": 11, "y": 3 },
-        {"x": 12, "y": 3 },
+        {"matrix": [1, 3], "x": 7, "y": 1},
+        {"matrix": [5, 3], "x": 8, "y": 1},
+        {"matrix": [1, 4], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [1, 5], "x": 11, "y": 1},
+        {"matrix": [5, 5], "x": 12, "y": 1},
 
-        {"x": 2.875, "y": 4, "w":1.25},
-        {"x": 4.125, "y": 4, "w":1.25 },
-        {"x": 5.375, "y": 4, "w":2.25 },
-        {"x": 7.625, "y": 4, "w":1.25 },
-        {"x": 8.875, "y": 4, "w":1.25 }
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [6, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [6, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [6, 2], "x": 5, "y": 2},
+
+        {"matrix": [2, 3], "x": 7, "y": 2},
+        {"matrix": [6, 3], "x": 8, "y": 2},
+        {"matrix": [2, 4], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [2, 5], "x": 11, "y": 2},
+        {"matrix": [6, 5], "x": 12, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+
+        {"matrix": [3, 3], "x": 7, "y": 3},
+        {"matrix": [7, 3], "x": 8, "y": 3},
+        {"matrix": [3, 4], "x": 9, "y": 3},
+        {"matrix": [7, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3},
+        {"matrix": [7, 5], "x": 12, "y": 3},
+
+        {"matrix": [8, 0], "x": 2.875, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 4.125, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 5.375, "y": 4, "w": 2.25},
+        {"matrix": [8, 3], "x": 7.625, "y": 4, "w": 1.25},
+        {"matrix": [8, 4], "x": 8.875, "y": 4, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/rart/rart45/rart45.h b/keyboards/rart/rart45/rart45.h
deleted file mode 100644
index 99ac9acd93..0000000000
--- a/keyboards/rart/rart45/rart45.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Alabahuy
- * 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( \
-    K00, K40, K01, K41, K02, K42,   K03, K43, K04, K44, K05, K45, \
-    K10, K50, K11, K51, K12, K52,   K13, K53, K14, K54, K15, K55, \
-    K20, K60, K21, K61, K22, K62,   K23, K63, K24, K64, K25, K65, \
-    K30, K70, K31, K71, K32, K72,   K33, K73, K34, K74, K35, K75, \
-                   K80, K81,     K82,    K83, K84 \
-) \
-{ \
-    { 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, K65   }, \
-    { K70, K71, K72, K73, K74, K75   }, \
-    { K80, K81, K82, K83, K84, KC_NO }, \
-}
diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index 0ec558c67b..08c3a1a7a5 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -21,79 +21,78 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-      
-                {"label" : "Esc", "x":0, "y":0},
-                {"label" : "1", "x":1, "y":0},
-                {"label" : "2", "x":2, "y":0},
-                {"label" : "3", "x":3, "y":0},
-                {"label" : "4", "x":4, "y":0},
-                {"label" : "5", "x":5, "y":0},
-                {"label" : "6", "x":6, "y":0},
-                {"label" : "7", "x":7, "y":0},
-                {"label" : "8", "x":8, "y":0},
-                {"label" : "9", "x":9, "y":0},
-                {"label" : "0", "x":10, "y":0},
-                {"label" : "-", "x":11, "y":0},
-                {"label" : "=", "x":12, "y":0},
-                {"label" : "|", "x":13, "y":0},
-                {"label" : "Backspace", "x":14, "y":0},
-                {"label" : "Page up", "x":15, "y":0},
-    
-                {"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" : "Page  down", "x":15, "y":1},
-       
-                {"label" : "Caps lock", "x":0, "y":2, "w":1.75},
-                {"label" : "A", "x":1.75, "y":2},
-                {"label" : "S", "x":2.75, "y":2},
-                {"label" : "D", "x":3.75, "y":2},
-                {"label" : "F", "x":4.75, "y":2},
-                {"label" : "G", "x":5.75, "y":2},
-                {"label" : "H", "x":6.75, "y":2},
-                {"label" : "J", "x":7.75, "y":2},
-                {"label" : "K", "x":8.75, "y":2},
-                {"label" : "L", "x":9.75, "y":2},
-                {"label" : ";", "x":10.75, "y":2},
-                {"label" : "'", "x":11.75, "y":2},
-                {"label" : "Enter", "x":12.75, "y":2, "w":2.25},
-                {"label" : "Home", "x":15, "y":2},
-    
-                {"label" : "Shift", "x":0, "y":3, "w":2.25},
-                {"label" : "Z", "x":2.25, "y":3},
-                {"label" : "X", "x":3.25, "y":3},
-                {"label" : "C", "x":4.25, "y":3},
-                {"label" : "V", "x":5.25, "y":3},
-                {"label" : "B", "x":6.25, "y":3},
-                {"label" : "N", "x":7.25, "y":3},
-                {"label" : "M", "x":8.25, "y":3},
-                {"label" : ",", "x":9.25, "y":3},
-                {"label" : ".", "x":10.25, "y":3},
-                {"label" : "/", "x":11.25, "y":3},
-                {"label" : "Shift", "x":12.25, "y":3, "w":1.75},
-                {"label" : "Up", "x":14, "y":3},
-                {"label" : "End", "x":15, "y":3},
-       
-                {"label" : "Ctrl", "x":0, "y":4, "w":1.25},
-                {"label" : "Windows", "x":1.25, "y":4, "w":1.25},
-                {"label" : "Alt", "x":2.5, "y":4, "w":1.25},
-                {"label" : "Space", "x":3.75, "y":4, "w":6.25},
-                {"label" : "Alt", "x":10, "y":4, "w":1.5},
-                {"label" : "Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label" : "Left", "x":13, "y":4 },
-                {"label" : "Down", "x":14, "y":4 },
-                {"label" : "Right", "x":15, "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, "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": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"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": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"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": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/rart/rart67/rart67.h b/keyboards/rart/rart67/rart67.h
deleted file mode 100644
index a31b6f4090..0000000000
--- a/keyboards/rart/rart67/rart67.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#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( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B,           K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03,   K04,   K05,   K06,   K07,   K08,   K09, K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16,   K17,   K18,   K19, K1A, K1B, K1C,   KC_NO, K1E, K1F }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26,   K27,   K28,   K29, K2A, K2B, KC_NO, KC_NO, K2E, K2F }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36,   K37,   K38,   K39, K3A, K3B, KC_NO, KC_NO, K3E, K3F }, \
-    { K40, K41, K42, KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, KC_NO, K4E, K4F }, \
-}
-
diff --git a/keyboards/rart/rart67m/info.json b/keyboards/rart/rart67m/info.json
index 0a20310392..3996762943 100644
--- a/keyboards/rart/rart67m/info.json
+++ b/keyboards/rart/rart67m/info.json
@@ -18,74 +18,74 @@
     "layouts": {
         "LAYOUT_all": {
             "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":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 6], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14, "y": 3},
+                {"matrix": [7, 6], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4, "w":1.5},
-                {"x":3, "y":4, "w":7},
-                {"x":10, "y":4, "w":1.5},
-                {"x":11.5, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 7], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [1, 7], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 3, "y": 4, "w": 7},
+                {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [5, 7], "x": 13, "y": 4},
+                {"matrix": [6, 7], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/rart/rart67m/rart67m.h b/keyboards/rart/rart67m/rart67m.h
deleted file mode 100644
index 6547a1fa30..0000000000
--- a/keyboards/rart/rart67m/rart67m.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Alabahuy
- *
- * 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_all(\
-  K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
-  K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
-  K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, \
-  K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
-  K07, K17,                K27,                K37, K47, K57, K67, K77 \
-) { \
-  { K00, K01, 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, K57 }, \
-  { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-  { K70, K71, K72, K73, K74, K75, K76, K77 } \
-}
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 7003bb36a6..393e0a4c35 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -31,96 +31,107 @@
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
-            "LAYOUT_all": {
+        "LAYOUT_all": {
             "layout": [
-                {"label" : "Esc", "x":0, "y":0},
-                {"label" : "F1", "x":1.25, "y":0},
-                {"label" : "F2", "x":2.25, "y":0},
-                {"label" : "F3", "x":3.25, "y":0},
-                {"label" : "F4", "x":4.25, "y":0},
-                {"label" : "F5", "x":5.5, "y":0},
-                {"label" : "F6", "x":6.5, "y":0},
-                {"label" : "F7", "x":7.5, "y":0},
-                {"label" : "F8", "x":8.5, "y":0},
-                {"label" : "F9", "x":9.75, "y":0},
-                {"label" : "F10", "x":10.75, "y":0},
-                {"label" : "F11", "x":11.75, "y":0},
-                {"label" : "F12", "x":12.75, "y":0},
-                {"label" : "Delete", "x":14, "y":0},
-                {"label" : "Encoder", "x":15.5, "y":0},
-               
-                {"label" : "`", "x":0, "y":1.25},
-                {"label" : "1", "x":1, "y":1.25},
-                {"label" : "2", "x":2, "y":1.25},
-                {"label" : "3", "x":3, "y":1.25},
-                {"label" : "4", "x":4, "y":1.25},
-                {"label" : "5", "x":5, "y":1.25},
-                {"label" : "6", "x":6, "y":1.25},
-                {"label" : "7", "x":7, "y":1.25},
-                {"label" : "8", "x":8, "y":1.25},
-                {"label" : "9", "x":9, "y":1.25},
-                {"label" : "0", "x":10, "y":1.25},
-                {"label" : "-", "x":11, "y":1.25},
-                {"label" : "=", "x":12, "y":1.25},
-                {"label" : "Backspace", "x":13, "y":1.25, "w":2},
-                {"label" : "Page up", "x":15.5, "y":1.25},
-              
-                {"label" : "Tab", "x":0, "y":2.25, "w":1.5},
-                {"label" : "Q", "x":1.5, "y":2.25},
-                {"label" : "W", "x":2.5, "y":2.25},
-                {"label" : "E", "x":3.5, "y":2.25},
-                {"label" : "R", "x":4.5, "y":2.25},
-                {"label" : "T", "x":5.5, "y":2.25},
-                {"label" : "Y", "x":6.5, "y":2.25},
-                {"label" : "U", "x":7.5, "y":2.25},
-                {"label" : "I", "x":8.5, "y":2.25},
-                {"label" : "O", "x":9.5, "y":2.25},
-                {"label" : "P", "x":10.5, "y":2.25},
-                {"label" : "[", "x":11.5, "y":2.25},
-                {"label" : "]", "x":12.5, "y":2.25},
-                {"label" : "|", "x":13.5, "y":2.25, "w":1.5},
-                {"label" : "Page  down", "x":15.5, "y":2.25},
-              
-                {"label" : "Caps lock", "x":0, "y":3.25, "w":1.75},
-                {"label" : "A", "x":1.75, "y":3.25},
-                {"label" : "S", "x":2.75, "y":3.25},
-                {"label" : "D", "x":3.75, "y":3.25},
-                {"label" : "F", "x":4.75, "y":3.25},
-                {"label" : "G", "x":5.75, "y":3.25},
-                {"label" : "H", "x":6.75, "y":3.25},
-                {"label" : "J", "x":7.75, "y":3.25},
-                {"label" : "K", "x":8.75, "y":3.25},
-                {"label" : "L", "x":9.75, "y":3.25},
-                {"label" : ";", "x":10.75, "y":3.25},
-                {"label" : "'", "x":11.75, "y":3.25},
-                {"label" : "Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label" : "Home", "x":15.5, "y":3.25},
-             
-                {"label" : "Shift", "x":0, "y":4.25, "w":2.25},
-                {"label" : "Z", "x":2.25, "y":4.25},
-                {"label" : "X", "x":3.25, "y":4.25},
-                {"label" : "C", "x":4.25, "y":4.25},
-                {"label" : "V", "x":5.25, "y":4.25},
-                {"label" : "B", "x":6.25, "y":4.25},
-                {"label" : "N", "x":7.25, "y":4.25},
-                {"label" : "M", "x":8.25, "y":4.25},
-                {"label" : ",", "x":9.25, "y":4.25},
-                {"label" : ".", "x":10.25, "y":4.25},
-                {"label" : "/", "x":11.25, "y":4.25},
-                {"label" : "Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label" : "Up", "x":14.25, "y":4.5},
-                {"label" : "End", "x":15.5, "y":4.25},
-               
-                {"label" : "Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label" : "Windows", "x":1.25, "y":5.25, "w":1.25},
-                {"label" : "Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label" : "Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label" : "Alt", "x":10, "y":5.25 },
-                {"label" : "Windows","x":11, "y":5.25 },
-                {"label" : "Ctrl", "x":12, "y":5.25 },
-                {"label" : "Left", "x":13.25, "y":5.5 },
-                {"label" : "Down", "x":14.25, "y":5.5 },
-                {"label" : "Right", "x":15.25, "y":5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "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, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25},
+                {"matrix": [5, 9], "x": 11, "y": 5.25},
+                {"matrix": [5, 10], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rart/rart75hs/rart75hs.c b/keyboards/rart/rart75hs/rart75hs.c
deleted file mode 100644
index 58f43c87e3..0000000000
--- a/keyboards/rart/rart75hs/rart75hs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2022 Alabahuy
- * 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/>.
- */
-#include "rart75hs.h"
diff --git a/keyboards/rart/rart75hs/rart75hs.h b/keyboards/rart/rart75hs/rart75hs.h
deleted file mode 100644
index f3b25df1b6..0000000000
--- a/keyboards/rart/rart75hs/rart75hs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Alabahuy
- * 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 LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08,      K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,           K4E, K4F, \
-    K50, K51, K52,      K54,                K58, K59, K5A, K5B,           K5E, K5F  \
-) \
-{ \
-    { K00, K01, K02, K03,   K04, K05,   K06,   K07,   K08,   KC_NO, K0A, K0B, K0C,   K0D,   K0E,   K0F }, \
-    { K10, K11, K12, K13,   K14, K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   KC_NO, K1F }, \
-    { K20, K21, K22, K23,   K24, K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
-    { K30, K31, K32, K33,   K34, K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C,   KC_NO, KC_NO, K3F }, \
-    { K40, K41, K42, K43,   K44, K45,   K46,   K47,   K48,   K49,   K4A, K4B, KC_NO, KC_NO, K4E,   K4F }, \
-    { K50, K51, K52, KC_NO, K54, KC_NO, KC_NO, KC_NO, K58,   K59,   K5A, K5B, KC_NO, KC_NO, K5E,   K5F }, \
-}
diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json
index 41142d0f73..554d9d04f5 100644
--- a/keyboards/rart/rart75m/info.json
+++ b/keyboards/rart/rart75m/info.json
@@ -23,94 +23,106 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":1.5, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-
-                {"x":1.5, "y":1.25},
-                {"x":2.5, "y":1.25},
-                {"x":3.5, "y":1.25},
-                {"x":4.5, "y":1.25},
-                {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25},
-                {"x":7.5, "y":1.25},
-                {"x":8.5, "y":1.25},
-                {"x":9.5, "y":1.25},
-                {"x":10.5, "y":1.25},
-                {"x":11.5, "y":1.25},
-                {"x":12.5, "y":1.25},
-                {"x":13.5, "y":1.25},
-                {"x":14.5, "y":1.25, "w":2},
-                {"x":17, "y":1},
-
-                {"x":1.5, "y":2.25, "w":1.5},
-                {"x":3, "y":2.25},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.25},
-                {"x":6, "y":2.25},
-                {"x":7, "y":2.25},
-                {"x":8, "y":2.25},
-                {"x":9, "y":2.25},
-                {"x":10, "y":2.25},
-                {"x":11, "y":2.25},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2.25},
-                {"x":14, "y":2.25},
-                {"x":15, "y":2.25, "w":1.5},
-                {"x":17, "y":2.25},
-
-                {"x":0, "y":3.25},
-                {"x":1.5, "y":3.25, "w":1.75},
-                {"x":3.25, "y":3.25},
-                {"x":4.25, "y":3.25},
-                {"x":5.25, "y":3.25},
-                {"x":6.25, "y":3.25},
-                {"x":7.25, "y":3.25},
-                {"x":8.25, "y":3.25},
-                {"x":9.25, "y":3.25},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25},
-                {"x":13.25, "y":3.25},
-                {"x":14.25, "y":3.25, "w":2.25},
-                {"x":17, "y":3.25},
-
-                {"x":0, "y":4.25},
-                {"x":1.5, "y":4.25, "w":2.25},
-                {"x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25},
-                {"x":5.75, "y":4.25},
-                {"x":6.75, "y":4.25},
-                {"x":7.75, "y":4.25},
-                {"x":8.75, "y":4.25},
-                {"x":9.75, "y":4.25},
-                {"x":10.75, "y":4.25},
-                {"x":11.75, "y":4.25},
-                {"x":12.75, "y":4.25},
-                {"x":13.75, "y":4.25, "w":1.75},
-                {"x":15.75, "y":4.5},
-                {"x":17, "y":4.25},
-               
-                {"x":0, "y":5.25},
-                {"x":1.5, "y":5.25, "w":1.25},
-                {"x":2.75, "y":5.25, "w":1.25},
-                {"x":4, "y":5.25, "w":1.25},
-                {"x":5.25, "y":5.25, "w":6.25},
-                {"x":11.5, "y":5.25, "w":1.5},
-                {"x":13, "y":5.25, "w":1.5},
-                {"x":14.75, "y":5.5 },
-                {"x":15.75, "y":5.5 },
-                {"x":16.75, "y":5.5 }
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 6, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 14.5, "y": 1.25, "w": 2},
+
+                {"matrix": [5, 13], "x": 17, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 2], "x": 4, "y": 2.25},
+                {"matrix": [2, 3], "x": 5, "y": 2.25},
+                {"matrix": [2, 4], "x": 6, "y": 2.25},
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.25},
+                {"matrix": [2, 7], "x": 9, "y": 2.25},
+                {"matrix": [2, 8], "x": 10, "y": 2.25},
+                {"matrix": [2, 9], "x": 11, "y": 2.25},
+                {"matrix": [2, 10], "x": 12, "y": 2.25},
+                {"matrix": [2, 11], "x": 13, "y": 2.25},
+                {"matrix": [2, 12], "x": 14, "y": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 17, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"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": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [5, 11], "x": 17, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.75, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.75, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 15.75, "y": 4.5},
+
+                {"matrix": [5, 10], "x": 17, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 5.25, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 13, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 14.75, "y": 5.5},
+                {"matrix": [5, 8], "x": 15.75, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.75, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rart/rart75m/rart75m.c b/keyboards/rart/rart75m/rart75m.c
index 7c9014386e..2fcb6396c9 100644
--- a/keyboards/rart/rart75m/rart75m.c
+++ b/keyboards/rart/rart75m/rart75m.c
@@ -12,7 +12,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 "rart75m.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/rart/rart75m/rart75m.h b/keyboards/rart/rart75m/rart75m.h
deleted file mode 100644
index 7b45b61a68..0000000000
--- a/keyboards/rart/rart75m/rart75m.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Alabahuy
- *
- * 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_all(\
-       K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-       K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K5D, \
-       K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K5C, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K5B, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D, K5A, \
-  K50, K51, K52, K53,                K54,                K55, K56, K57, K58, K59 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \
-  { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D } \
-}
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index 22ff437b2c..a8f79ec042 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -26,104 +26,113 @@
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
-            "LAYOUT_all": {
+        "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-               
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-              
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-              
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-             
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":15.25, "y":4.25},
-                {"x":16.25, "y":4.25},
-                {"x":17.25, "y":4.25},
-               
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5 },
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25 },
-                {"x":16.25, "y":5.25 },
-                {"x":17.25, "y":5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "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.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/rart/rart80/rart80.h b/keyboards/rart/rart80/rart80.h
deleted file mode 100644
index e50ef380cf..0000000000
--- a/keyboards/rart/rart80/rart80.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 Alabahuy
- * 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_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E, K4F, K4G, \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json
index d50a593b02..55bbd49565 100644
--- a/keyboards/rart/rartand/info.json
+++ b/keyboards/rart/rartand/info.json
@@ -22,61 +22,61 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "x": 0, "y": 0, "w":1.5 },
-        { "x": 1.5, "y": 0 },
-        { "x": 2.5, "y": 0 },
-        { "x": 3.5, "y": 0 },
-        { "x": 4.5, "y": 0 },
-        { "x": 5.5, "y": 0 },
-        { "x": 6.5, "y": 0 },
-        { "x": 7.5, "y": 0 },
-        { "x": 8.5, "y": 0 },
-        { "x": 9.5, "y": 0 },
-        { "x": 10.5, "y": 0 },
-        { "x": 11.5, "y": 0 },
-        { "x": 12.5, "y": 0 },
-        { "x": 13.5, "y": 0, "w":1.5 },
+        {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+        {"matrix": [1, 0], "x": 1.5, "y": 0},
+        {"matrix": [0, 1], "x": 2.5, "y": 0},
+        {"matrix": [1, 1], "x": 3.5, "y": 0},
+        {"matrix": [0, 2], "x": 4.5, "y": 0},
+        {"matrix": [1, 2], "x": 5.5, "y": 0},
+        {"matrix": [0, 3], "x": 6.5, "y": 0},
+        {"matrix": [1, 3], "x": 7.5, "y": 0},
+        {"matrix": [0, 4], "x": 8.5, "y": 0},
+        {"matrix": [1, 4], "x": 9.5, "y": 0},
+        {"matrix": [0, 5], "x": 10.5, "y": 0},
+        {"matrix": [1, 5], "x": 11.5, "y": 0},
+        {"matrix": [0, 6], "x": 12.5, "y": 0},
+        {"matrix": [1, 6], "x": 13.5, "y": 0, "w": 1.5},
 
-        {"x": 0, "y": 1, "w":1.75 },
-        {"x": 1.75, "y": 1 },
-        {"x": 2.75, "y": 1 },
-        {"x": 3.75, "y": 1 },
-        {"x": 4.75, "y": 1 },
-        {"x": 5.75, "y": 1 },
-        {"x": 6.75, "y": 1 },
-        {"x": 7.75, "y": 1 },
-        {"x": 8.75, "y": 1 },
-        {"x": 9.75, "y": 1 },
-        {"x": 10.75, "y": 1 },
-        {"x": 11.75, "y": 1 },
-        {"x": 12.75, "y": 1, "w":2.25 },
+        {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+        {"matrix": [3, 0], "x": 1.75, "y": 1},
+        {"matrix": [2, 1], "x": 2.75, "y": 1},
+        {"matrix": [3, 1], "x": 3.75, "y": 1},
+        {"matrix": [2, 2], "x": 4.75, "y": 1},
+        {"matrix": [3, 2], "x": 5.75, "y": 1},
+        {"matrix": [2, 3], "x": 6.75, "y": 1},
+        {"matrix": [3, 3], "x": 7.75, "y": 1},
+        {"matrix": [2, 4], "x": 8.75, "y": 1},
+        {"matrix": [3, 4], "x": 9.75, "y": 1},
+        {"matrix": [2, 5], "x": 10.75, "y": 1},
+        {"matrix": [3, 5], "x": 11.75, "y": 1},
+        {"matrix": [3, 6], "x": 12.75, "y": 1, "w": 2.25},
 
-        {"x": 0, "y": 2, "w":1.25 },
-        {"x": 1.25, "y": 2 },
-        {"x": 2.25, "y": 2 },
-        {"x": 3.25, "y": 2 },
-        {"x": 4.25, "y": 2 },
-        {"x": 5.25, "y": 2 },
-        {"x": 6.25, "y": 2 },
-        {"x": 7.25, "y": 2 },
-        {"x": 8.25, "y": 2 },
-        {"x": 9.25, "y": 2 },
-        {"x": 10.25, "y": 2 },
-        {"x": 11.25, "y": 2, "w":1.75 },
-        {"x": 13, "y": 2 },
-        {"x": 14, "y": 2 },
+        {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.25},
+        {"matrix": [5, 0], "x": 1.25, "y": 2},
+        {"matrix": [4, 1], "x": 2.25, "y": 2},
+        {"matrix": [5, 1], "x": 3.25, "y": 2},
+        {"matrix": [4, 2], "x": 4.25, "y": 2},
+        {"matrix": [5, 2], "x": 5.25, "y": 2},
+        {"matrix": [4, 3], "x": 6.25, "y": 2},
+        {"matrix": [5, 3], "x": 7.25, "y": 2},
+        {"matrix": [4, 4], "x": 8.25, "y": 2},
+        {"matrix": [5, 4], "x": 9.25, "y": 2},
+        {"matrix": [4, 5], "x": 10.25, "y": 2},
+        {"matrix": [5, 5], "x": 11.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 6], "x": 13, "y": 2},
+        {"matrix": [5, 6], "x": 14, "y": 2},
 
-        {"x": 0, "y": 3, "w":1.25 },
-        {"x": 1.25, "y": 3, "w":1.25 },
-        {"x": 2.5, "y": 3, "w":1.25 },
-        {"x": 3.75, "y": 3, "w":2.25 },
-        {"x": 6, "y": 3, "w":1.25 },
-        {"x": 7.25, "y": 3, "w":2.75 },
-        {"x": 10, "y": 3 },
-        {"x": 11, "y": 3 },
-        {"x": 12, "y": 3 },
-        {"x": 13, "y": 3 },
-        {"x": 14, "y": 3 }
+        {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
+        {"matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
+        {"matrix": [6, 2], "x": 3.75, "y": 3, "w": 2.25},
+        {"matrix": [6, 3], "x": 6, "y": 3, "w": 1.25},
+        {"matrix": [6, 4], "x": 7.25, "y": 3, "w": 2.75},
+        {"matrix": [7, 4], "x": 10, "y": 3},
+        {"matrix": [6, 5], "x": 11, "y": 3},
+        {"matrix": [7, 5], "x": 12, "y": 3},
+        {"matrix": [6, 6], "x": 13, "y": 3},
+        {"matrix": [7, 6], "x": 14, "y": 3}
       ]
     }
   }
diff --git a/keyboards/rart/rartand/rartand.h b/keyboards/rart/rartand/rartand.h
deleted file mode 100644
index c2750822e8..0000000000
--- a/keyboards/rart/rartand/rartand.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Alabahuy
- * 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 LAYOUT_all( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35,      K36, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, \
-    K60, K70, K61,      K62,   K63,    K64,      K74, K65, K75, K66, K76 \
-) \
-{ \
-    { K00, K01,   K02,   K03,   K04, K05, K06   }, \
-    { K10, K11,   K12,   K13,   K14, K15, K16   }, \
-    { K20, K21,   K22,   K23,   K24, K25, KC_NO }, \
-    { K30, K31,   K32,   K33,   K34, K35, K36   }, \
-    { K40, K41,   K42,   K43,   K44, K45, K46   }, \
-    { K50, K51,   K52,   K53,   K54, K55, K56   }, \
-    { K60, K61,   K62,   K63,   K64, K65, K66   }, \
-    { K70, KC_NO, KC_NO, KC_NO, K74, K75, K76   }, \
-}
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index c8b2497285..dffbabae75 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -28,77 +28,87 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label" : " ", "x":0, "y":0},
-                {"label" : "Esc", "x":1.25, "y":0},
-                {"label" : "1", "x":2.25, "y":0},
-                {"label" : "2", "x":3.25, "y":0},
-                {"label" : "3", "x":4.25, "y":0},
-                {"label" : "4", "x":5.25, "y":0},
-                {"label" : "5", "x":6.25, "y":0},
-                {"label" : "6", "x":7.25, "y":0},
-                {"label" : "7", "x":9.25, "y":0},
-                {"label" : "8", "x":10.25, "y":0},
-                {"label" : "9", "x":11.25, "y":0},
-                {"label" : "0", "x":12.25, "y":0},
-                {"label" : "-", "x":13.25, "y":0},
-                {"label" : "=", "x":14.25, "y":0},
-                {"label" : "|", "x":15.25, "y":0},
-                {"label" : "Delete", "x":16.25, "y":0},
-    
-                {"label" : " ", "x":0, "y":1},
-                {"label" : "Tab", "x":1.25, "y":1, "w":1.5},
-                {"label" : "Q", "x":2.75, "y":1},
-                {"label" : "W", "x":3.75, "y":1},
-                {"label" : "E", "x":4.75, "y":1},
-                {"label" : "R", "x":5.75, "y":1},
-                {"label" : "T", "x":6.75, "y":1},
-                {"label" : "Y", "x":8.75, "y":1},
-                {"label" : "U", "x":9.75, "y":1},
-                {"label" : "I", "x":10.75, "y":1},
-                {"label" : "O", "x":11.75, "y":1},
-                {"label" : "P", "x":12.75, "y":1},
-                {"label" : "[", "x":13.75, "y":1},
-                {"label" : "]", "x":14.75, "y":1},
-                {"label" : "|", "x":15.75, "y":1, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label" : " ", "x":0, "y":2},
-                {"label" : "Caps lock", "x":1.25, "y":2, "w":1.75},
-                {"label" : "A", "x":3, "y":2},
-                {"label" : "S", "x":4, "y":2},
-                {"label" : "D", "x":5, "y":2},
-                {"label" : "F", "x":6, "y":2},
-                {"label" : "G", "x":7, "y":2},
-                {"label" : "H", "x":9, "y":2},
-                {"label" : "J", "x":10, "y":2},
-                {"label" : "K", "x":11, "y":2},
-                {"label" : "L", "x":12, "y":2},
-                {"label" : ";", "x":13, "y":2},
-                {"label" : "'", "x":14, "y":2},
-                {"label" : "Enter", "x":15, "y":2, "w":2.25},
-    
-                {"label" : "Shift", "x":1.25, "y":3, "w":2.25},
-                {"label" : "Z", "x":3.5, "y":3},
-                {"label" : "X", "x":4.5, "y":3},
-                {"label" : "C", "x":5.5, "y":3},
-                {"label" : "V", "x":6.5, "y":3},
-                {"label" : "B", "x":7.5, "y":3},
-                {"label" : "N", "x":9.5, "y":3},
-                {"label" : "M", "x":10.5, "y":3},
-                {"label" : ",", "x":11.5, "y":3},
-                {"label" : ".", "x":12.5, "y":3},
-                {"label" : "/", "x":13.5, "y":3},
-                {"label" : "Shift", "x":14.5, "y":3, "w":1.75},
-                {"label" : "Up", "x":16.5, "y":3.25},
-       
-                {"label" : "Ctrl", "x":1.25, "y":4, "w":1.25},
-                {"label" : "Alt", "x":4.25, "y":4, "w":1.25},
-                {"label" : "Space", "x":5.5, "y":4, "w":2},
-                {"label" : "Fn", "x":7.5, "y":4},
-                {"label" : "Space", "x":9.5, "y":4, "w":2.75},
-                {"label" : "Ctrl", "x":12.25, "y":4, "w":1.5},
-                {"label" : "Left", "x":15.5, "y":4.25 },
-                {"label" : "Down", "x":16.5, "y":4.25 },
-                {"label" : "Right", "x":17.5, "y":4.25 }   
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [1, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [2, 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, 13], "x": 14.75, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"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": [3, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2},
+                {"matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [4, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 14], "x": 16.5, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.5, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/rart/rartlice/rartlice.h b/keyboards/rart/rartlice/rartlice.h
deleted file mode 100644
index ea8b130e4c..0000000000
--- a/keyboards/rart/rartlice/rartlice.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#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( \
-  K00, K01, K02, K03, K04, K14, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K24, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K34, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-       K31, K32, K33, K44, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
-       K41,      K43,      K45, K46,      K48,      K4A,      K4C, K4D, K4E  \
-) \
-{ \
-  { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO }, \
-  { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E   }, \
-  { KC_NO, K41,   KC_NO, K43,   K44,   K45,   K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D,   K4E   }, \
-}