Remove `FLIP_HALF` layouts and move to data driven (#20588)

5 files changed, 307 insertions, 752 deletions

diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 07135b5be0..a513674a56 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -28,206 +28,53 @@
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-                {
-                    "label": "Q",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "W",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "E",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "T",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "Y",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "U",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "I",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "P",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "A",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "S",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "D",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "G",
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "label": "H",
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "label": "J",
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "label": "K",
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "label": "Z",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "X",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "C",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "B",
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "label": "N",
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "label": "M",
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "label": ",",
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "label": ".",
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "label": "/",
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "Win",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "Alt",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "label": "Lower",
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "label": "backspace",
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "label": "space",
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "label": "Upper",
-                    "x": 7,
-                    "y": 3
-                },
-                {
-                    "label": "Alt",
-                    "x": 8,
-                    "y": 3
-                },
-                {
-                    "label": "App",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 10,
-                    "y": 3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [4, 4], "x": 6, "y": 0},
+                {"matrix": [4, 3], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 1], "x": 9, "y": 0},
+                {"matrix": [4, 0], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [5, 4], "x": 6, "y": 1},
+                {"matrix": [5, 3], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 1], "x": 9, "y": 1},
+                {"matrix": [5, 0], "x": 10, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [6, 4], "x": 6, "y": 2},
+                {"matrix": [6, 3], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 1], "x": 9, "y": 2},
+                {"matrix": [6, 0], "x": 10, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [7, 4], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 1], "x": 9, "y": 3},
+                {"matrix": [7, 0], "x": 10, "y": 3}
             ]
         }
     }
diff --git a/keyboards/marksard/rhymestone/rev1/rev1.c b/keyboards/marksard/rhymestone/rev1/rev1.c
index d41694c1d9..06ea367707 100644
--- a/keyboards/marksard/rhymestone/rev1/rev1.c
+++ b/keyboards/marksard/rhymestone/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev1.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/marksard/rhymestone/rev1/rev1.h b/keyboards/marksard/rhymestone/rev1/rev1.h
deleted file mode 100644
index 855e288df3..0000000000
--- a/keyboards/marksard/rhymestone/rev1/rev1.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2020 marksard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#ifndef FLIP_HALF
-// Standard Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT_ortho_4x10( \
-  L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
-  L30, L31, L32, L33, L34, R30, R31, R32, R33, R34  \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { R34, R33, R32, R31, R30 }, \
-  }
-#else
-// Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
-#define LAYOUT_ortho_4x10( \
-  L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
-  L30, L31, L32, L33, L34, R30, R31, R32, R33, R34  \
-  ) \
-  { \
-    { L04, L03, L02, L01, L00 }, \
-    { L14, L13, L12, L11, L10 }, \
-    { L24, L23, L22, L21, L20 }, \
-    { L34, L33, L32, L31, L30 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { R34, R33, R32, R31, R30 }, \
-  }
-#endif
-
-#ifdef USE_HASHTWENTY // The HashTwenty is Alpha version of The Rhymestone
-#undef LAYOUT_ortho_4x10
-// HashTwenty layout
-#define LAYOUT_ortho_4x10( \
-  L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
-  L30, L31, L32, L33, L34, R30, R31, R32, R33, R34  \
-  ) \
-  { \
-    { L04, L03, L02, L01, L00 }, \
-    { L14, L13, L12, L11, L10 }, \
-    { L24, L23, L22, L21, L20 }, \
-    { L34, L33, L32, L31, L30 }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }, \
-    { R20, R21, R22, R23, R24 }, \
-    { R30, R31, R32, R33, R34 }, \
-  }
-#endif
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index 6b24cc27e3..7af207e5b7 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
@@ -21,258 +21,265 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT_base": {
-      "layout": [
-        {
-          "label": "Esc",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "Q",
-          "x": 2.25,
-          "y": 0
-        },
-        {
-          "label": "W",
-          "x": 3.25,
-          "y": 0
-        },
-        {
-          "label": "E",
-          "x": 4.25,
-          "y": 0
-        },
-        {
-          "label": "R",
-          "x": 5.25,
-          "y": 0
-        },
-        {
-          "label": "T",
-          "x": 6.25,
-          "y": 0
-        },
-        {
-          "label": "Y",
-          "x": 7.75,
-          "y": 0
-        },
-        {
-          "label": "U",
-          "x": 8.75,
-          "y": 0
-        },
-        {
-          "label": "I",
-          "x": 9.75,
-          "y": 0
-        },
-        {
-          "label": "O",
-          "x": 10.75,
-          "y": 0
-        },
-        {
-          "label": "P",
-          "x": 11.75,
-          "y": 0
-        },
-        {
-          "label": "-",
-          "x": 13.75,
-          "y": 0
-        },
-        {
-          "label": "Tab",
-          "x": 1,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "A",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "S",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "D",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "F",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "G",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "H",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "J",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "K",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "L",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": ":",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "Enter",
-          "x": 12.5,
-          "y": 1,
-          "w": 2.25
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 2,
-          "w": 2.25
-        },
-        {
-          "label": "Z",
-          "x": 2.25,
-          "y": 2
-        },
-        {
-          "label": "X",
-          "x": 3.25,
-          "y": 2
-        },
-        {
-          "label": "C",
-          "x": 4.25,
-          "y": 2
-        },
-        {
-          "label": "V",
-          "x": 5.25,
-          "y": 2
-        },
-        {
-          "label": "B",
-          "x": 6.25,
-          "y": 2
-        },
-        {
-          "label": "N",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "M",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "<",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": ">",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "?",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "\u2191",
-          "x": 12.75,
-          "y": 2
-        },
-        {
-          "label": "Ctrl",
-          "x": 0.75,
-          "y": 3,
-          "w": 1.25
-        },
-        {
-          "label": "Win",
-          "x": 2,
-          "y": 3,
-          "w": 1.25
-        },
-        {
-          "label": "Alt",
-          "x": 3.25,
-          "y": 3,
-          "w": 1.25
-        },
-        {
-          "label": "Lower",
-          "x": 4.5,
-          "y": 3
-        },
-        {
-          "label": "BackSpace",
-          "x": 5.5,
-          "y": 3,
-          "w": 2
-        },
-        {
-          "x": 7.5,
-          "y": 3,
-          "w": 2
-        },
-        {
-          "label": "Raise",
-          "x": 9.5,
-          "y": 3
-        },
-        {
-          "label": "Menu",
-          "x": 10.5,
-          "y": 3,
-          "w": 1.25
-        },
-        {
-          "label": "\u2190",
-          "x": 11.75,
-          "y": 3
-        },
-        {
-          "label": "\u2193",
-          "x": 12.75,
-          "y": 3
-        },
-        {
-          "label": "\u2192",
-          "x": 13.75,
-          "y": 3
-        },
-        {
-          "label": "_",
-          "x": 12.75,
-          "y": 0
+    "layouts": {
+        "LAYOUT_base": {
+            "layout": [
+                {"matrix": [4, 5], "x": 1, "y": 0},
+                {"matrix": [4, 4], "x": 2.25, "y": 0},
+                {"matrix": [4, 3], "x": 3.25, "y": 0},
+                {"matrix": [4, 2], "x": 4.25, "y": 0},
+                {"matrix": [4, 1], "x": 5.25, "y": 0},
+                {"matrix": [4, 0], "x": 6.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+                {"matrix": [0, 3], "x": 9.75, "y": 0},
+                {"matrix": [0, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 1], "x": 11.75, "y": 0},
+                {"matrix": [0, 0], "x": 13.75, "y": 0},
+
+                {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 0], "x": 6.5, "y": 1},
+
+                {"matrix": [1, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 3], "x": 9.5, "y": 1},
+                {"matrix": [1, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
+
+                {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 2},
+                {"matrix": [6, 3], "x": 3.25, "y": 2},
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [6, 1], "x": 5.25, "y": 2},
+                {"matrix": [6, 0], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [2, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [2, 1], "x": 11.75, "y": 2},
+                {"matrix": [2, 0], "x": 12.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
+
+                {"matrix": [3, 5], "x": 9.5, "y": 3},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 11.75, "y": 3},
+                {"matrix": [3, 2], "x": 12.75, "y": 3},
+                {"matrix": [3, 1], "x": 13.75, "y": 3},
+
+                {"matrix": [3, 0], "x": 12.75, "y": 0}
+            ]
+        },
+        "LAYOUT_full": {
+            "layout": [
+                {"matrix": [4, 5], "x": 0, "y": 0},
+                {"matrix": [4, 4], "x": 1, "y": 0},
+                {"matrix": [4, 3], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [4, 1], "x": 4, "y": 0},
+                {"matrix": [4, 0], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [0, 3], "x": 8, "y": 0},
+                {"matrix": [0, 2], "x": 9, "y": 0},
+                {"matrix": [0, 1], "x": 10, "y": 0},
+                {"matrix": [0, 0], "x": 11, "y": 0},
+
+                {"matrix": [12, 5], "x": 12, "y": 0},
+                {"matrix": [12, 4], "x": 13, "y": 0},
+                {"matrix": [12, 3], "x": 14, "y": 0},
+                {"matrix": [12, 2], "x": 15, "y": 0},
+                {"matrix": [12, 1], "x": 16, "y": 0},
+                {"matrix": [12, 0], "x": 17, "y": 0},
+
+                {"matrix": [8, 5], "x": 18, "y": 0},
+                {"matrix": [8, 4], "x": 19, "y": 0},
+                {"matrix": [8, 3], "x": 20, "y": 0},
+                {"matrix": [8, 2], "x": 21, "y": 0},
+                {"matrix": [8, 1], "x": 22, "y": 0},
+                {"matrix": [8, 0], "x": 23, "y": 0},
+
+                {"matrix": [5, 5], "x": 24, "y": 0},
+                {"matrix": [5, 4], "x": 25, "y": 0},
+                {"matrix": [5, 3], "x": 26, "y": 0},
+                {"matrix": [5, 2], "x": 27, "y": 0},
+                {"matrix": [5, 1], "x": 28, "y": 0},
+                {"matrix": [5, 0], "x": 29, "y": 0},
+
+                {"matrix": [1, 5], "x": 30, "y": 0},
+                {"matrix": [1, 4], "x": 31, "y": 0},
+                {"matrix": [1, 3], "x": 32, "y": 0},
+                {"matrix": [1, 2], "x": 33, "y": 0},
+                {"matrix": [1, 1], "x": 34, "y": 0},
+                {"matrix": [1, 0], "x": 35, "y": 0},
+
+                {"matrix": [13, 5], "x": 36, "y": 0},
+                {"matrix": [13, 4], "x": 37, "y": 0},
+                {"matrix": [13, 3], "x": 38, "y": 0},
+                {"matrix": [13, 2], "x": 39, "y": 0},
+                {"matrix": [13, 1], "x": 40, "y": 0},
+                {"matrix": [13, 0], "x": 41, "y": 0},
+
+                {"matrix": [9, 5], "x": 42, "y": 0},
+                {"matrix": [9, 4], "x": 43, "y": 0},
+                {"matrix": [9, 3], "x": 44, "y": 0},
+                {"matrix": [9, 2], "x": 45, "y": 0},
+                {"matrix": [9, 1], "x": 46, "y": 0},
+                {"matrix": [9, 0], "x": 47, "y": 0},
+
+                {"matrix": [6, 5], "x": 48, "y": 0},
+                {"matrix": [6, 4], "x": 49, "y": 0},
+                {"matrix": [6, 3], "x": 50, "y": 0},
+                {"matrix": [6, 2], "x": 51, "y": 0},
+                {"matrix": [6, 1], "x": 52, "y": 0},
+                {"matrix": [6, 0], "x": 53, "y": 0},
+
+                {"matrix": [2, 5], "x": 54, "y": 0},
+                {"matrix": [2, 4], "x": 55, "y": 0},
+                {"matrix": [2, 3], "x": 56, "y": 0},
+                {"matrix": [2, 2], "x": 57, "y": 0},
+                {"matrix": [2, 1], "x": 58, "y": 0},
+                {"matrix": [2, 0], "x": 59, "y": 0},
+
+                {"matrix": [14, 5], "x": 60, "y": 0},
+                {"matrix": [14, 4], "x": 61, "y": 0},
+                {"matrix": [14, 3], "x": 62, "y": 0},
+                {"matrix": [14, 2], "x": 63, "y": 0},
+                {"matrix": [14, 1], "x": 64, "y": 0},
+                {"matrix": [14, 0], "x": 65, "y": 0},
+
+                {"matrix": [10, 5], "x": 66, "y": 0},
+                {"matrix": [10, 4], "x": 67, "y": 0},
+                {"matrix": [10, 3], "x": 68, "y": 0},
+                {"matrix": [10, 2], "x": 69, "y": 0},
+                {"matrix": [10, 1], "x": 70, "y": 0},
+                {"matrix": [10, 0], "x": 71, "y": 0},
+
+                {"matrix": [7, 5], "x": 72, "y": 0},
+                {"matrix": [7, 4], "x": 73, "y": 0},
+                {"matrix": [7, 3], "x": 74, "y": 0},
+                {"matrix": [7, 2], "x": 75, "y": 0},
+                {"matrix": [7, 1], "x": 76, "y": 0},
+                {"matrix": [7, 0], "x": 77, "y": 0},
+
+                {"matrix": [3, 5], "x": 78, "y": 0},
+                {"matrix": [3, 4], "x": 79, "y": 0},
+                {"matrix": [3, 3], "x": 80, "y": 0},
+                {"matrix": [3, 2], "x": 81, "y": 0},
+                {"matrix": [3, 1], "x": 82, "y": 0},
+                {"matrix": [3, 0], "x": 83, "y": 0},
+
+                {"matrix": [15, 5], "x": 84, "y": 0},
+                {"matrix": [15, 4], "x": 85, "y": 0},
+                {"matrix": [15, 3], "x": 86, "y": 0},
+                {"matrix": [15, 2], "x": 87, "y": 0},
+                {"matrix": [15, 1], "x": 88, "y": 0},
+                {"matrix": [15, 0], "x": 89, "y": 0},
+
+                {"matrix": [11, 5], "x": 90, "y": 0},
+                {"matrix": [11, 4], "x": 91, "y": 0},
+                {"matrix": [11, 3], "x": 92, "y": 0},
+                {"matrix": [11, 2], "x": 93, "y": 0},
+                {"matrix": [11, 1], "x": 94, "y": 0},
+                {"matrix": [11, 0], "x": 95, "y": 0}
+            ]
+        },
+        "LAYOUT_rs": {
+            "layout": [
+                {"matrix": [4, 5], "x": 0, "y": 0},
+                {"matrix": [4, 4], "x": 1, "y": 0},
+                {"matrix": [4, 3], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [4, 1], "x": 4, "y": 0},
+                {"matrix": [4, 0], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [0, 3], "x": 8, "y": 0},
+                {"matrix": [0, 2], "x": 9, "y": 0},
+                {"matrix": [0, 1], "x": 10, "y": 0},
+                {"matrix": [0, 0], "x": 11, "y": 0},
+
+                {"matrix": [8, 0], "x": 12, "y": 0},
+                {"matrix": [8, 1], "x": 13, "y": 0},
+                {"matrix": [8, 2], "x": 14, "y": 0},
+                {"matrix": [8, 3], "x": 15, "y": 0},
+                {"matrix": [8, 4], "x": 16, "y": 0},
+
+                {"matrix": [5, 5], "x": 17, "y": 0},
+                {"matrix": [5, 4], "x": 18, "y": 0},
+                {"matrix": [5, 3], "x": 19, "y": 0},
+                {"matrix": [5, 2], "x": 20, "y": 0},
+                {"matrix": [5, 1], "x": 21, "y": 0},
+                {"matrix": [5, 0], "x": 22, "y": 0},
+
+                {"matrix": [1, 5], "x": 23, "y": 0},
+                {"matrix": [1, 4], "x": 24, "y": 0},
+                {"matrix": [1, 3], "x": 25, "y": 0},
+                {"matrix": [1, 2], "x": 26, "y": 0},
+                {"matrix": [1, 1], "x": 27, "y": 0},
+                {"matrix": [1, 0], "x": 28, "y": 0},
+
+                {"matrix": [9, 0], "x": 29, "y": 0},
+                {"matrix": [9, 1], "x": 30, "y": 0},
+                {"matrix": [9, 2], "x": 31, "y": 0},
+                {"matrix": [9, 3], "x": 32, "y": 0},
+                {"matrix": [9, 4], "x": 33, "y": 0},
+
+                {"matrix": [6, 5], "x": 34, "y": 0},
+                {"matrix": [6, 4], "x": 35, "y": 0},
+                {"matrix": [6, 3], "x": 36, "y": 0},
+                {"matrix": [6, 2], "x": 37, "y": 0},
+                {"matrix": [6, 1], "x": 38, "y": 0},
+                {"matrix": [6, 0], "x": 39, "y": 0},
+
+                {"matrix": [2, 5], "x": 40, "y": 0},
+                {"matrix": [2, 4], "x": 41, "y": 0},
+                {"matrix": [2, 3], "x": 42, "y": 0},
+                {"matrix": [2, 2], "x": 43, "y": 0},
+                {"matrix": [2, 1], "x": 44, "y": 0},
+                {"matrix": [2, 0], "x": 45, "y": 0},
+
+                {"matrix": [10, 0], "x": 46, "y": 0},
+                {"matrix": [10, 1], "x": 47, "y": 0},
+                {"matrix": [10, 2], "x": 48, "y": 0},
+                {"matrix": [10, 3], "x": 49, "y": 0},
+                {"matrix": [10, 4], "x": 50, "y": 0},
+
+                {"matrix": [7, 5], "x": 51, "y": 0},
+                {"matrix": [7, 4], "x": 52, "y": 0},
+                {"matrix": [7, 3], "x": 53, "y": 0},
+                {"matrix": [7, 2], "x": 54, "y": 0},
+                {"matrix": [7, 1], "x": 55, "y": 0},
+                {"matrix": [7, 0], "x": 56, "y": 0},
+
+                {"matrix": [3, 5], "x": 57, "y": 0},
+                {"matrix": [3, 4], "x": 58, "y": 0},
+                {"matrix": [3, 3], "x": 59, "y": 0},
+                {"matrix": [3, 2], "x": 60, "y": 0},
+                {"matrix": [3, 1], "x": 61, "y": 0},
+
+                {"matrix": [11, 0], "x": 62, "y": 0},
+                {"matrix": [11, 1], "x": 63, "y": 0},
+                {"matrix": [11, 2], "x": 64, "y": 0},
+                {"matrix": [11, 3], "x": 65, "y": 0},
+                {"matrix": [11, 4], "x": 66, "y": 0},
+
+                {"matrix": [3, 0], "x": 67, "y": 0}
+            ]
         }
-      ]
     }
-  }
 }
diff --git a/keyboards/marksard/treadstone48/rev1/rev1.h b/keyboards/marksard/treadstone48/rev1/rev1.h
deleted file mode 100644
index 7534796422..0000000000
--- a/keyboards/marksard/treadstone48/rev1/rev1.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Copyright 2020 marksard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// full Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT_full( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R00, R01, R02, R03, R04, R05, R40, R41, R42, R43, R44, R45, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, R10, R11, R12, R13, R14, R15, R50, R51, R52, R53, R54, R55, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R20, R21, R22, R23, R24, R25, R60, R61, R62, R63, R64, R65, \
-  L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, R30, R31, R32, R33, R34, R35, R70, R71, R72, R73, R74, R75 \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 }, \
-    { R45, R44, R43, R42, R41, R40 }, \
-    { R55, R54, R53, R52, R51, R50 }, \
-    { R65, R64, R63, R62, R61, R60 }, \
-    { R75, R74, R73, R72, R71, R70 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { R35, R34, R33, R32, R31, R30 }, \
-  }
-
-#define K_N KC_NO
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Treadstone48.
-// L75 is ExtraKey
-//////////////////////////////////////////////////////////////////////////////
-#define LAYOUT_base( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
-  L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75  \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-  }
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Rhymestone to Treadstone48.
-// L75 is ExtraKey
-//////////////////////////////////////////////////////////////////////////////
-#define LAYOUT_rs( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
-  L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, R70, R71, R72, R73, R74, L75  \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 }, \
-    { R40, R41, R42, R43, R44, K_N }, \
-    { R50, R51, R52, R53, R54, K_N }, \
-    { R60, R61, R62, R63, R64, K_N }, \
-    { R70, R71, R72, R73, R74, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-  }
-
-// When use right hand side of the Rhymestone.
-#ifdef RHYMESTONE_RIGHTHAND
-#undef LAYOUT_rs
-#define LAYOUT_rs( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
-  L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, R70, R71, R72, R73, R74, L75  \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 }, \
-    { R44, R43, R42, R41, R40, K_N }, \
-    { R54, R53, R52, R51, R50, K_N }, \
-    { R64, R63, R62, R61, R60, K_N }, \
-    { R74, R73, R72, R71, R70, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-  }
-#endif
-//////////////////////////////////////////////////////////////////////////////
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Alpha version keymap.
-// L30 is ExtraKey
-//////////////////////////////////////////////////////////////////////////////
-#ifdef ANGELINA_KEYMAP
-#undef LAYOUT_base
-#undef LAYOUT_rs
-
-#define LAYOUT_base( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
-  L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, L30  \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-  }
-
-
-#define LAYOUT_rs( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
-  L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, R70, R71, R72, R73, R74, L30  \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 }, \
-    { R40, R41, R42, R43, R44, K_N }, \
-    { R50, R51, R52, R53, R54, K_N }, \
-    { R60, R61, R62, R63, R64, K_N }, \
-    { R70, R71, R72, R73, R74, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-    { K_N, K_N, K_N, K_N, K_N, K_N }, \
-  }
-#endif
-//////////////////////////////////////////////////////////////////////////////