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

6 files changed, 253 insertions, 499 deletions

diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json
index 36022287d2..e088a5b777 100644
--- a/keyboards/wolf/kuku65/info.json
+++ b/keyboards/wolf/kuku65/info.json
@@ -18,283 +18,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "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
-                },
-                {
-                    "x": 15,
-                    "y": 1
-                },
-                {
-                    "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
-                },
-                {
-                    "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
-                },
-                {
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 11.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "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, "w": 2},
+
+                {"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, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "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, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/wolf/kuku65/kuku65.h b/keyboards/wolf/kuku65/kuku65.h
deleted file mode 100644
index d8ad847274..0000000000
--- a/keyboards/wolf/kuku65/kuku65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-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"
-
-/* kuku65 Keymap Definitions */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    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,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, KC_NO }, \
-    { 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,   KC_NO, K2D, K2E   }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36,   K37,   K38,   K39, K3A, K3B,   K3C,   K3D, K3E   }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D, K4E   }  \
-}
diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json
index 4a7c080606..00e5e55c36 100644
--- a/keyboards/wolf/ryujin/info.json
+++ b/keyboards/wolf/ryujin/info.json
@@ -17,7 +17,81 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,5", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"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": [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, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"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, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/wolf/ryujin/ryujin.h b/keyboards/wolf/ryujin/ryujin.h
deleted file mode 100644
index bd7a3ecddd..0000000000
--- a/keyboards/wolf/ryujin/ryujin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-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"
-
-/* Keymap Definitions */
-#define LAYOUT( \
-    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,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K45,                     K4A, K4B, 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, KC_NO }, \
-    { K20, K21, K22, K23,   K24,   K25, K26,   K27,   K28,   K29,   K2A, K2B, K2C, K2D, K2E   }, \
-    { K30, K31, K32, K33,   K34,   K35, K36,   K37,   K38,   K39,   K3A, K3B, K3C, K3D, K3E   }, \
-    { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E   }  \
-}
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
index 526422d945..96c2fce48f 100644
--- a/keyboards/wolf/sabre/info.json
+++ b/keyboards/wolf/sabre/info.json
@@ -26,100 +26,113 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":8.75, "y":0},
-                {"label":"F6", "x":9.75, "y":0},
-                {"label":"F7", "x":10.75, "y":0},
-                {"label":"F8", "x":11.75, "y":0},
-                {"label":"F9", "x":13, "y":0},
-                {"label":"F10", "x":14, "y":0},
-                {"label":"F11", "x":15, "y":0},
-                {"label":"F12", "x":16, "y":0},
-                {"label":"Print Screen", "x":17.25, "y":0},
-                {"label":"Scroll Lock", "x":18.25, "y":0},
-                {"label":"Pause", "x":19.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "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":9, "y":1.25},
-                {"label":"8*", "x":10, "y":1.25},
-                {"label":"9(", "x":11, "y":1.25},
-                {"label":"0)", "x":12, "y":1.25},
-                {"label":"-_", "x":13, "y":1.25},
-                {"label":"=+", "x":14, "y":1.25},
-                {"label":"BackSpace", "x":15, "y":1.25, "w":2},
-                {"label":"Insert", "x":17.25, "y":1.25},
-                {"label":"Home", "x":18.25, "y":1.25},
-                {"label":"Page Up", "x":19.25, "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":8.5, "y":2.25},
-                {"label":"U", "x":9.5, "y":2.25},
-                {"label":"I", "x":10.5, "y":2.25},
-                {"label":"O", "x":11.5, "y":2.25},
-                {"label":"P", "x":12.5, "y":2.25},
-                {"label":"[{", "x":13.5, "y":2.25},
-                {"label":"]}", "x":14.5, "y":2.25},
-                {"label":"\\|", "x":15.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":17.25, "y":2.25},
-                {"label":"End", "x":18.25, "y":2.25},
-                {"label":"Page Down", "x":19.25, "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":8.75, "y":3.25},
-                {"label":"J", "x":9.75, "y":3.25},
-                {"label":"K", "x":10.75, "y":3.25},
-                {"label":"L", "x":11.75, "y":3.25},
-                {"label":";:", "x":12.75, "y":3.25},
-                {"label":"'@", "x":13.75, "y":3.25},
-                {"label":"Enter", "x":14.75, "y":3.25, "w":2.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":"B", "x":8.25, "y":4.25},
-                {"label":"N", "x":9.25, "y":4.25},
-                {"label":"M", "x":10.25, "y":4.25},
-                {"label":",<", "x":11.25, "y":4.25},
-                {"label":".>", "x":12.25, "y":4.25},
-                {"label":"/?", "x":13.25, "y":4.25},
-                {"label":"Shift", "x":14.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":16, "y":4.25},
-                {"label":"\u2191", "x":18.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":5.25},
-                {"label":"Space", "x":5, "y":5.25, "w":2.25},
-                {"label":"Space", "x":8.25, "y":5.25, "w":2.75},
-                {"label":"Alt", "x":11, "y":5.25},
-                {"label":"GUI", "x":12, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "x":14.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":17.25, "y":5.25},
-                {"label":"\u2193", "x":18.25, "y":5.25},
-                {"label":"\u2192", "x":19.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "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": [1, 3], "x": 8.75, "y": 0},
+                {"matrix": [0, 4], "x": 9.75, "y": 0},
+                {"matrix": [1, 4], "x": 10.75, "y": 0},
+                {"matrix": [0, 5], "x": 11.75, "y": 0},
+
+                {"matrix": [1, 5], "x": 13, "y": 0},
+                {"matrix": [0, 6], "x": 14, "y": 0},
+                {"matrix": [1, 6], "x": 15, "y": 0},
+                {"matrix": [0, 7], "x": 16, "y": 0},
+
+                {"matrix": [1, 7], "x": 17.25, "y": 0},
+                {"matrix": [0, 8], "x": 18.25, "y": 0},
+                {"matrix": [1, 8], "x": 19.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+
+                {"matrix": [3, 3], "x": 9, "y": 1.25},
+                {"matrix": [2, 4], "x": 10, "y": 1.25},
+                {"matrix": [3, 4], "x": 11, "y": 1.25},
+                {"matrix": [2, 5], "x": 12, "y": 1.25},
+                {"matrix": [3, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 6], "x": 14, "y": 1.25},
+                {"matrix": [3, 6], "x": 15, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 18.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 19.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [4, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 13.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 14.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 17.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 18.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 19.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+
+                {"matrix": [6, 3], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 13.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+
+                {"matrix": [8, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 13.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 16, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 4, "y": 5.25},
+                {"matrix": [10, 2], "x": 5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [11, 3], "x": 8.25, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 4], "x": 11, "y": 5.25},
+                {"matrix": [10, 5], "x": 12, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 14.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 19.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/wolf/sabre/sabre.h b/keyboards/wolf/sabre/sabre.h
deleted file mode 100644
index adc9872cc3..0000000000
--- a/keyboards/wolf/sabre/sabre.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-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"
-
-/*
- * ┌───┐   ┌───┬───┬───┬───┐         ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
- * │00 │   │01 │11 │02 │12 │         │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │
- * └───┘   └───┴───┴───┴───┘         └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
- * │20 │30 │21 │31 │22 │32 │23 │       │33 │24 │34 │25 │35 │26 │36     │ │37 │28 │38 │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │40   │50 │41 │51 │42 │52 │       │43 │53 │44 │54 │45 │55 │46 │56   │ │57 │48 │58 │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │60    │70 │61 │71 │62 │72 │       │63 │73 │64 │74 │65 │75 │76      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌──────────┐
- * │80      │90 │81 │91 │82 │92 │   │83 │93 │84 │94 │85 │95 │86    │96 │     │88 │       │86        │ 2.75u RShift
- * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┤   ├───┴───┴──┬┴──┬┴───┴┬──┴┬────┬┴───┘ ┌───┼───┼───┐   └──────────┘
- * │A0   │   │B0   │A1 │A2      │   │B3        │B4 │A5   │   │A6  │      │B7 │A8 │B8 │
- * └─────┘   └─────┴───┴────────┘   └──────────┴───┴─────┘   └────┘      └───┴───┴───┘
- *           ┌───┬─────┐                       ┌─────┬───┐
- *           │B0 │A1   │                       │B4   │A5 │
- *           └───┴─────┘                       └─────┴───┘
- *           ┌────┬────┐                       ┌────┬────┐
- *           │B0  │A1  │                       │B4  │A5  │
- *           └────┴────┘                       └────┴────┘
- */
-
-/* sabre Keymap Definitions */
-#define LAYOUT( \
-    K00,      K01, K11, K02, K12,      K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,      K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                     \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96,           K88,      \
-    KA0, KB0, KA1,      KA2,           KB3,      KB4, KA5,      KA6,           KB7, KA8, KB8  \
-) { \
-    { K00,   K01,   K02,   KC_NO, K04,   K05,   K06,   K07,   K08   }, \
-    { KC_NO, K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO, K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   KC_NO, KC_NO, KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, KC_NO }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, K88   }, \
-    { K90,   K91,   K92,   K93,   K94,   K95,   K96,   KC_NO, KC_NO }, \
-    { KA0,   KA1,   KA2,   KC_NO, KC_NO, KA5,   KA6,   KC_NO, KA8   }, \
-    { KB0,   KC_NO, KC_NO, KB3,   KB4,   KC_NO, KC_NO, KB7,   KB8   }  \
-}