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

11 files changed, 303 insertions, 337 deletions

diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
index 255d4e85e2..0c92f469ae 100644
--- a/keyboards/nacly/sodium42/info.json
+++ b/keyboards/nacly/sodium42/info.json
@@ -21,55 +21,55 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.75},
-                {"x": 1, "y": 0.5},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.25},
-                {"x": 4, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 1},
 
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 0.5},
-                {"x": 10.75, "y": 0},
-                {"x": 11.75, "y": 0.5},
-                {"x": 12.75, "y": 0.75},
+                {"matrix": [4, 4], "x": 8.75, "y": 1},
+                {"matrix": [4, 3], "x": 9.75, "y": 0.5},
+                {"matrix": [4, 2], "x": 10.75, "y": 0},
+                {"matrix": [4, 1], "x": 11.75, "y": 0.5},
+                {"matrix": [4, 0], "x": 12.75, "y": 0.75},
 
-                {"x": 0, "y": 1.75},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 2},
 
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 1.5},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1.5},
-                {"x": 12.75, "y": 1.75},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 3], "x": 9.75, "y": 1.5},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 1], "x": 11.75, "y": 1.5},
+                {"matrix": [5, 0], "x": 12.75, "y": 1.75},
 
-                {"x": 0, "y": 2.75},
-                {"x": 1, "y": 2.5},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.25},
-                {"x": 4, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 3},
 
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 2.5},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2.5},
-                {"x": 12.75, "y": 2.75},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [6, 3], "x": 9.75, "y": 2.5},
+                {"matrix": [6, 2], "x": 10.75, "y": 2},
+                {"matrix": [6, 1], "x": 11.75, "y": 2.5},
+                {"matrix": [6, 0], "x": 12.75, "y": 2.75},
 
-                {"x": 0, "y": 3.75},
-                {"x": 1, "y": 3.5},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3.25},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [3, 5], "x": 5, "y": 4.5},
 
-                {"x": 7.75, "y": 4.5},
-                {"x": 8.75, "y": 4},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.75}
+                {"matrix": [7, 5], "x": 7.75, "y": 4.5},
+                {"matrix": [7, 4], "x": 8.75, "y": 4},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 10.75, "y": 3},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 0], "x": 12.75, "y": 3.75}
             ]
         }
     }
diff --git a/keyboards/nacly/sodium42/sodium42.h b/keyboards/nacly/sodium42/sodium42.h
deleted file mode 100644
index 427b6f4d43..0000000000
--- a/keyboards/nacly/sodium42/sodium42.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 NaCly
- *
- * 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(\
-    L00, L01, L02, L03, L04,                            R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14,                            R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24,                            R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34,  L35,                     R35, R34, R33, R32, R31, R30 \
-)\
-    {\
-        { L00, L01, L02, L03, L04, KC_NO }, \
-        { L10, L11, L12, L13, L14, KC_NO }, \
-        { L20, L21, L22, L23, L24, KC_NO }, \
-        { L30, L31, L32, L33, L34, L35       }, \
-\
-        { R00, R01, R02, R03, R04, KC_NO }, \
-        { R10, R11, R12, R13, R14, KC_NO }, \
-        { R20, R21, R22, R23, R24, KC_NO }, \
-        { R30, R31, R32, R33, R34, R35      }  \
-}
diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
index 182162e39f..920a2f946f 100644
--- a/keyboards/nacly/sodium50/info.json
+++ b/keyboards/nacly/sodium50/info.json
@@ -21,63 +21,63 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.75},
-                {"x": 1, "y": 0.75},
-                {"x": 2, "y": 0.5},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.25},
-                {"x": 5, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 1},
 
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 0.5},
-                {"x": 11.75, "y": 0},
-                {"x": 12.75, "y": 0.5},
-                {"x": 13.75, "y": 0.75},
-                {"x": 14.75, "y": 0.75},
+                {"matrix": [4, 5], "x": 9.75, "y": 1},
+                {"matrix": [4, 4], "x": 10.75, "y": 0.5},
+                {"matrix": [4, 3], "x": 11.75, "y": 0},
+                {"matrix": [4, 2], "x": 12.75, "y": 0.5},
+                {"matrix": [4, 1], "x": 13.75, "y": 0.75},
+                {"matrix": [4, 0], "x": 14.75, "y": 0.75},
 
-                {"x": 0, "y": 1.75},
-                {"x": 1, "y": 1.75},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 2},
 
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 1.5},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1.5},
-                {"x": 13.75, "y": 1.75},
-                {"x": 14.75, "y": 1.75},
+                {"matrix": [5, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 4], "x": 10.75, "y": 1.5},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 2], "x": 12.75, "y": 1.5},
+                {"matrix": [5, 1], "x": 13.75, "y": 1.75},
+                {"matrix": [5, 0], "x": 14.75, "y": 1.75},
 
-                {"x": 0, "y": 2.75},
-                {"x": 1, "y": 2.75},
-                {"x": 2, "y": 2.5},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2.25},
-                {"x": 5, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 3},
 
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 2.5},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2.5},
-                {"x": 13.75, "y": 2.75},
-                {"x": 14.75, "y": 2.75},
+                {"matrix": [6, 5], "x": 9.75, "y": 3},
+                {"matrix": [6, 4], "x": 10.75, "y": 2.5},
+                {"matrix": [6, 3], "x": 11.75, "y": 2},
+                {"matrix": [6, 2], "x": 12.75, "y": 2.5},
+                {"matrix": [6, 1], "x": 13.75, "y": 2.75},
+                {"matrix": [6, 0], "x": 14.75, "y": 2.75},
 
-                {"x": 0, "y": 3.75},
-                {"x": 1, "y": 3.75},
-                {"x": 2, "y": 3.5},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3.25},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 4},
+                {"matrix": [3, 6], "x": 6, "y": 4.5},
 
-                {"x": 8.75, "y": 4.5},
-                {"x": 9.75, "y": 4},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 3.75},
-                {"x": 14.75, "y": 3.75}
+                {"matrix": [7, 6], "x": 8.75, "y": 4.5},
+                {"matrix": [7, 5], "x": 9.75, "y": 4},
+                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 11.75, "y": 3},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 13.75, "y": 3.75},
+                {"matrix": [7, 0], "x": 14.75, "y": 3.75}
             ]
         }
     }
diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h
deleted file mode 100644
index 384867f193..0000000000
--- a/keyboards/nacly/sodium50/sodium50.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 NaCly
- *
- * 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(\
-    L00, L01, L02, L03, L04, L05,                       R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,                       R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,                       R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35, L36,             R36, R35, R34, R33, R32, R31, R30 \
-)\
-    {\
-        { L00, L01, L02, L03, L04, L05, KC_NO }, \
-        { L10, L11, L12, L13, L14, L15, KC_NO }, \
-        { L20, L21, L22, L23, L24, L25, KC_NO }, \
-        { L30, L31, L32, L33, L34, L35, L36       }, \
-\
-        { R00, R01, R02, R03, R04, R05, KC_NO }, \
-        { R10, R11, R12, R13, R14, R15, KC_NO }, \
-        { R20, R21, R22, R23, R24, R25, KC_NO }, \
-        { R30, R31, R32, R33, R34, R35, R36       } \
-}
diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
index 07e380569b..8632bfabdf 100644
--- a/keyboards/nacly/sodium62/info.json
+++ b/keyboards/nacly/sodium62/info.json
@@ -21,77 +21,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.75},
-                {"x": 1, "y": 0.75},
-                {"x": 2, "y": 0.5},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.25},
-                {"x": 5, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 1},
 
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 0.5},
-                {"x": 11.75, "y": 0},
-                {"x": 12.75, "y": 0.5},
-                {"x": 13.75, "y": 0.75},
-                {"x": 14.75, "y": 0.75},
+                {"matrix": [5, 5], "x": 9.75, "y": 1},
+                {"matrix": [5, 4], "x": 10.75, "y": 0.5},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0.5},
+                {"matrix": [5, 1], "x": 13.75, "y": 0.75},
+                {"matrix": [5, 0], "x": 14.75, "y": 0.75},
 
-                {"x": 0, "y": 1.75},
-                {"x": 1, "y": 1.75},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 2},
 
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 1.5},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1.5},
-                {"x": 13.75, "y": 1.75},
-                {"x": 14.75, "y": 1.75},
+                {"matrix": [6, 5], "x": 9.75, "y": 2},
+                {"matrix": [6, 4], "x": 10.75, "y": 1.5},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 2], "x": 12.75, "y": 1.5},
+                {"matrix": [6, 1], "x": 13.75, "y": 1.75},
+                {"matrix": [6, 0], "x": 14.75, "y": 1.75},
 
-                {"x": 0, "y": 2.75},
-                {"x": 1, "y": 2.75},
-                {"x": 2, "y": 2.5},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2.25},
-                {"x": 5, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 3},
 
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 2.5},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2.5},
-                {"x": 13.75, "y": 2.75},
-                {"x": 14.75, "y": 2.75},
+                {"matrix": [7, 5], "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "x": 10.75, "y": 2.5},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 2], "x": 12.75, "y": 2.5},
+                {"matrix": [7, 1], "x": 13.75, "y": 2.75},
+                {"matrix": [7, 0], "x": 14.75, "y": 2.75},
 
-                {"x": 0, "y": 3.75},
-                {"x": 1, "y": 3.75},
-                {"x": 2, "y": 3.5},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3.25},
-                {"x": 5, "y": 4},
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 4},
 
-                {"x": 9.75, "y": 4},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 3.75},
-                {"x": 14.75, "y": 3.75},
+                {"matrix": [8, 5], "x": 9.75, "y": 4},
+                {"matrix": [8, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [8, 1], "x": 13.75, "y": 3.75},
+                {"matrix": [8, 0], "x": 14.75, "y": 3.75},
 
-                {"x": 0, "y": 4.75},
-                {"x": 1, "y": 4.75},
-                {"x": 2, "y": 4.5},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4.25},
-                {"x": 5, "y": 5},
-                {"x": 6, "y": 5.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.75},
+                {"matrix": [4, 1], "x": 1, "y": 4.75},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.25},
+                {"matrix": [4, 5], "x": 5, "y": 5},
+                {"matrix": [4, 6], "x": 6, "y": 5.5},
 
-                {"x": 8.75, "y": 5.5},
-                {"x": 9.75, "y": 5},
-                {"x": 10.75, "y": 4.5},
-                {"x": 11.75, "y": 4},
-                {"x": 12.75, "y": 4.5},
-                {"x": 13.75, "y": 4.75},
-                {"x": 14.75, "y": 4.75}
+                {"matrix": [9, 6], "x": 8.75, "y": 5.5},
+                {"matrix": [9, 5], "x": 9.75, "y": 5},
+                {"matrix": [9, 4], "x": 10.75, "y": 4.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4},
+                {"matrix": [9, 2], "x": 12.75, "y": 4.5},
+                {"matrix": [9, 1], "x": 13.75, "y": 4.75},
+                {"matrix": [9, 0], "x": 14.75, "y": 4.75}
             ]
         }
     }
diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c
index d418313374..55d8c3c558 100644
--- a/keyboards/nacly/sodium62/sodium62.c
+++ b/keyboards/nacly/sodium62/sodium62.c
@@ -13,7 +13,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 "sodium62.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/nacly/sodium62/sodium62.h b/keyboards/nacly/sodium62/sodium62.h
deleted file mode 100644
index 7db1002333..0000000000
--- a/keyboards/nacly/sodium62/sodium62.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2022 NaCly
- *
- * 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(\
-    L00, L01, L02, L03, L04, L05,                       R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,                       R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,                       R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35,                       R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42, L43, L44, L45, L46,             R46, R45, R44, R43, R42, R41, R40  \
-)\
-    {\
-        { L00, L01, L02, L03, L04, L05, KC_NO }, \
-        { L10, L11, L12, L13, L14, L15, KC_NO }, \
-        { L20, L21, L22, L23, L24, L25, KC_NO }, \
-        { L30, L31, L32, L33, L34, L35, KC_NO }, \
-        { L40, L41, L42, L43, L44, L45, L46       }, \
-\
-        { R00, R01, R02, R03, R04, R05, KC_NO }, \
-        { R10, R11, R12, R13, R14, R15, KC_NO }, \
-        { R20, R21, R22, R23, R24, R25, KC_NO }, \
-        { R30, R31, R32, R33, R34, R35, KC_NO }, \
-        { R40, R41, R42, R43, R44, R45, R46      }  \
-}
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
index e8361decda..5c61b6f5fe 100644
--- a/keyboards/nacly/splitreus62/info.json
+++ b/keyboards/nacly/splitreus62/info.json
@@ -23,7 +23,79 @@
     "bootloader": "caterina",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}]
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0.6},
+          {"matrix": [0, 1], "x": 1, "y": 0.6},
+          {"matrix": [0, 2], "x": 2, "y": 0.35},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0.35},
+          {"matrix": [0, 5], "x": 5, "y": 0.7},
+
+          {"matrix": [6, 5], "x": 9, "y": 0.7},
+          {"matrix": [6, 4], "x": 10, "y": 0.35},
+          {"matrix": [6, 3], "x": 11, "y": 0},
+          {"matrix": [6, 2], "x": 12, "y": 0.35},
+          {"matrix": [6, 1], "x": 13, "y": 0.6},
+          {"matrix": [6, 0], "x": 14, "y": 0.6},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.6},
+          {"matrix": [1, 1], "x": 1, "y": 1.6},
+          {"matrix": [1, 2], "x": 2, "y": 1.35},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1.35},
+          {"matrix": [1, 5], "x": 5, "y": 1.7},
+
+          {"matrix": [7, 5], "x": 9, "y": 1.7},
+          {"matrix": [7, 4], "x": 10, "y": 1.35},
+          {"matrix": [7, 3], "x": 11, "y": 1},
+          {"matrix": [7, 2], "x": 12, "y": 1.35},
+          {"matrix": [7, 1], "x": 13, "y": 1.6},
+          {"matrix": [7, 0], "x": 14, "y": 1.6},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.6},
+          {"matrix": [2, 1], "x": 1, "y": 2.6},
+          {"matrix": [2, 2], "x": 2, "y": 2.35},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2.35},
+          {"matrix": [2, 5], "x": 5, "y": 2.7},
+
+          {"matrix": [8, 5], "x": 9, "y": 2.7},
+          {"matrix": [8, 4], "x": 10, "y": 2.35},
+          {"matrix": [8, 3], "x": 11, "y": 2},
+          {"matrix": [8, 2], "x": 12, "y": 2.35},
+          {"matrix": [8, 1], "x": 13, "y": 2.6},
+          {"matrix": [8, 0], "x": 14, "y": 2.6},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.6},
+          {"matrix": [3, 1], "x": 1, "y": 3.6},
+          {"matrix": [3, 2], "x": 2, "y": 3.35},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3.35},
+          {"matrix": [3, 5], "x": 5, "y": 3.7},
+
+          {"matrix": [9, 5], "x": 9, "y": 3.7},
+          {"matrix": [9, 4], "x": 10, "y": 3.35},
+          {"matrix": [9, 3], "x": 11, "y": 3},
+          {"matrix": [9, 2], "x": 12, "y": 3.35},
+          {"matrix": [9, 1], "x": 13, "y": 3.6},
+          {"matrix": [9, 0], "x": 14, "y": 3.6},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.6},
+          {"matrix": [4, 1], "x": 1, "y": 4.6},
+          {"matrix": [4, 2], "x": 2, "y": 4.35},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4.35},
+          {"matrix": [4, 5], "x": 5, "y": 4.7},
+          {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5},
+
+          {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5},
+          {"matrix": [10, 5], "x": 9, "y": 4.7},
+          {"matrix": [10, 4], "x": 10, "y": 4.35},
+          {"matrix": [10, 3], "x": 11, "y": 4},
+          {"matrix": [10, 2], "x": 12, "y": 4.35},
+          {"matrix": [10, 1], "x": 13, "y": 4.6},
+          {"matrix": [10, 0], "x": 14, "y": 4.6}
+        ]
       }
     }
-  }
+}
diff --git a/keyboards/nacly/splitreus62/splitreus62.h b/keyboards/nacly/splitreus62/splitreus62.h
deleted file mode 100644
index bc6c2a9131..0000000000
--- a/keyboards/nacly/splitreus62/splitreus62.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(\
-    L00, L01, L02, L03, L04, L05,                       R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,                       R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,                       R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35,                       R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42, L43, L44, L45, L55,             R55, R45, R44, R43, R42, R41, R40  \
-)\
-    {\
-        { L00, L01, L02, L03, L04, L05 },     \
-        { L10, L11, L12, L13, L14, L15 },     \
-        { L20, L21, L22, L23, L24, L25 },     \
-        { L30, L31, L32, L33, L34, L35 },     \
-        { L40, L41, L42, L43, L44, L45 },     \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55 },   \
-\
-        { R00, R01, R02, R03, R04, R05 },    \
-        { R10, R11, R12, R13, R14, R15 },    \
-        { R20, R21, R22, R23, R24, R25 },    \
-        { R30, R31, R32, R33, R34, R35 },    \
-        { R40, R41, R42, R43, R44, R45 },    \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R55 }   \
-}
diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json
index 82e284ebe7..383825414b 100644
--- a/keyboards/nacly/ua62/info.json
+++ b/keyboards/nacly/ua62/info.json
@@ -17,7 +17,79 @@
     "bootloader": "caterina",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}]
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0.6},
+          {"matrix": [0, 1], "x": 1, "y": 0.6},
+          {"matrix": [0, 2], "x": 2, "y": 0.35},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0.35},
+          {"matrix": [0, 5], "x": 5, "y": 0.7},
+
+          {"matrix": [0, 7], "x": 9, "y": 0.7},
+          {"matrix": [0, 8], "x": 10, "y": 0.35},
+          {"matrix": [0, 9], "x": 11, "y": 0},
+          {"matrix": [0, 10], "x": 12, "y": 0.35},
+          {"matrix": [0, 11], "x": 13, "y": 0.6},
+          {"matrix": [0, 12], "x": 14, "y": 0.6},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.6},
+          {"matrix": [1, 1], "x": 1, "y": 1.6},
+          {"matrix": [1, 2], "x": 2, "y": 1.35},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1.35},
+          {"matrix": [1, 5], "x": 5, "y": 1.7},
+
+          {"matrix": [1, 7], "x": 9, "y": 1.7},
+          {"matrix": [1, 8], "x": 10, "y": 1.35},
+          {"matrix": [1, 9], "x": 11, "y": 1},
+          {"matrix": [1, 10], "x": 12, "y": 1.35},
+          {"matrix": [1, 11], "x": 13, "y": 1.6},
+          {"matrix": [1, 12], "x": 14, "y": 1.6},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.6},
+          {"matrix": [2, 1], "x": 1, "y": 2.6},
+          {"matrix": [2, 2], "x": 2, "y": 2.35},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2.35},
+          {"matrix": [2, 5], "x": 5, "y": 2.7},
+
+          {"matrix": [2, 7], "x": 9, "y": 2.7},
+          {"matrix": [2, 8], "x": 10, "y": 2.35},
+          {"matrix": [2, 9], "x": 11, "y": 2},
+          {"matrix": [2, 10], "x": 12, "y": 2.35},
+          {"matrix": [2, 11], "x": 13, "y": 2.6},
+          {"matrix": [2, 12], "x": 14, "y": 2.6},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.6},
+          {"matrix": [3, 1], "x": 1, "y": 3.6},
+          {"matrix": [3, 2], "x": 2, "y": 3.35},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3.35},
+          {"matrix": [3, 5], "x": 5, "y": 3.7},
+
+          {"matrix": [3, 7], "x": 9, "y": 3.7},
+          {"matrix": [3, 8], "x": 10, "y": 3.35},
+          {"matrix": [3, 9], "x": 11, "y": 3},
+          {"matrix": [3, 10], "x": 12, "y": 3.35},
+          {"matrix": [3, 11], "x": 13, "y": 3.6},
+          {"matrix": [3, 12], "x": 14, "y": 3.6},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.6},
+          {"matrix": [4, 1], "x": 1, "y": 4.6},
+          {"matrix": [4, 2], "x": 2, "y": 4.35},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4.35},
+          {"matrix": [4, 5], "x": 5, "y": 4.7},
+          {"matrix": [4, 6], "x": 6, "y": 3.95, "h": 1.5},
+
+          {"matrix": [3, 6], "x": 8, "y": 3.95, "h": 1.5},
+          {"matrix": [4, 7], "x": 9, "y": 4.7},
+          {"matrix": [4, 8], "x": 10, "y": 4.35},
+          {"matrix": [4, 9], "x": 11, "y": 4},
+          {"matrix": [4, 10], "x": 12, "y": 4.35},
+          {"matrix": [4, 11], "x": 13, "y": 4.6},
+          {"matrix": [4, 12], "x": 14, "y": 4.6}
+        ]
       }
     }
-  }
+}
diff --git a/keyboards/nacly/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h
deleted file mode 100644
index 4509bbff3d..0000000000
--- a/keyboards/nacly/ua62/ua62.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 NaCly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b,  \
-    k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,  \
-    k30,  k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,  \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35,   k47, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45,   k46, k48, k49, k4a, k4b, k4c, k4d }, \
-}