Move remaining `LAYOUT`s to data driven (#20422)

4 files changed, 607 insertions, 224 deletions

diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json
index d2dbd00a3d..1e7594df44 100644
--- a/keyboards/basekeys/slice/rev1/info.json
+++ b/keyboards/basekeys/slice/rev1/info.json
@@ -20,16 +20,358 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         },
-         "LAYOUT_split_backspace": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"BS", "x":15.32, "y":0}, {"label":"BS", "x":16.32, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+        "LAYOUT_split_backspace": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0},
+                {"matrix": [5, 8], "x": 16.32, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         },
-       "LAYOUT_split_left_space": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+        "LAYOUT_split_left_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         },
-       "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"BS", "x":15.32, "y":0}, {"label":"BS", "x":16.32, "y":0}, {"label":"BS", "x":17.32, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3}, {"label":"Shift", "x":15.97, "y":3}, {"label":"Shift", "x":16.97, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0},
+                {"matrix": [5, 7], "x": 16.32, "y": 0},
+                {"matrix": [5, 8], "x": 17.32, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3},
+                {"matrix": [8, 7], "x": 15.97, "y": 3},
+                {"matrix": [8, 8], "x": 16.97, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4},
+                {"matrix": [4, 5], "x": 6.75, "y": 4},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/basekeys/slice/rev1/rev1.h b/keyboards/basekeys/slice/rev1/rev1.h
deleted file mode 100644
index f4d631eb6b..0000000000
--- a/keyboards/basekeys/slice/rev1/rev1.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Slice Rev1.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------------        --------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 |        | R00 | R01 | R02 | R03 | R04 | R05 |  R06R07R08  |
- * |------------------------------------------------      ------------------------------------------------------+
- * | L10 |   L11  | L12 | L13 | L14 | L15 | L16 |         | R10 | R11 | R12 | R13 | R14 | R15 | R16 |    R37    |
- * |----------------------------------------------        ------------------------------------------------------+
- * | L20 |   L21   | L22 | L23 | L24 | L25 | L26 |          | R20 | R21 | R22 | R23 | R24 | R25 |      R26      |
- * |-------------------------------------------------   --------------------------------------------------------+
- * | L30 |    L31     | L32 | L33 | L34 | L35 | L36 |   | R30 | R31 | R32 | R33 | R34 | R34 | R35 |  R36R37R38  |
- * |-------------------------------------------------   --------------------------------------------------------'
- * | L40 |  L41  |  L42  |          L43 | L44L45L46 |    |   R40   | R41 |                |  R42  |  R43  | R44 |
- * |-------------------------------------------------    -------------------------------------------------------'
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05,      R07,  \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, R38,\
-    L40, L41, L42, L43,      L45,                R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43, KC_NO,   L45, KC_NO,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05, KC_NO,     R07,   KC_NO },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   KC_NO,     R38 }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-
-#define LAYOUT_all( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05, R06, R07, R08, \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, R37, R38,\
-    L40, L41, L42, L43, L44, L45, L46,           R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43,   L44,   L45,   L46,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,     R07,     R08 },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,     R37,     R38 }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-
-#define LAYOUT_split_backspace( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05, R06,       R08, \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36,       R38,\
-    L40, L41, L42, L43,      L45,                R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43, KC_NO,   L45, KC_NO,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   KC_NO,     R08 },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   KC_NO,     R38 }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-
-
-#define LAYOUT_split_left_space( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05,      R07, \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36,     R38,\
-    L40, L41, L42, L43, L44,      L46,           R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43,   L44, KC_NO,   L46,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05, KC_NO,     R07,   KC_NO },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   KC_NO,     R38 }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-
-
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index d8791c7be5..66eaee5c40 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -23,13 +23,268 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         },
         "LAYOUT_split_left_space": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
+                {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
+                {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
deleted file mode 100644
index 0b0ea725e7..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Slice Rev1.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------------        --------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 |        | R00 | R01 | R02 | R03 | R04 | R05 |     R06     |
- * |------------------------------------------------      ------------------------------------------------------+
- * | L10 |   L11  | L12 | L13 | L14 | L15 | L16 |         | R10 | R11 | R12 | R13 | R14 | R15 | R16 |    R37    |
- * |----------------------------------------------        ------------------------------------------------------+
- * | L20 |   L21   | L22 | L23 | L24 | L25 | L26 |          | R20 | R21 | R22 | R23 | R24 | R25 |      R26      |
- * |-------------------------------------------------   --------------------------------------------------------+
- * | L30 |    L31     | L32 | L33 | L34 | L35 | L36 |   | R30 | R31 | R32 | R33 | R34 | R34 | R35 |  R36  | R37 |
- * |-------------------------------------------------   --------------------------------------------------------'
- * | L40 |  L41  |  L42  |          L43 | L44L45L46 |    |   R40   | R41 |                |  R42  |  R43  | R44 |
- * |-------------------------------------------------    -------------------------------------------------------'
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05, R06,  \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, R37,\
-    L40, L41, L42, L43,      L45,                R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43, KC_NO,   L45, KC_NO,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   KC_NO,   KC_NO },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,     R37,   KC_NO }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-
-#define LAYOUT_split_left_space( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, R37,\
-    L40, L41, L42, L43, L44,      L46,           R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43,   L44, KC_NO,   L46,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   KC_NO,   KC_NO },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,     R37,   KC_NO }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-
-#define LAYOUT_all( \
-    L00, L01, L02, L03, L04, L05, L06, L07,      R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, R37,\
-    L40, L41, L42, L43, L44, L45, L46,           R40, R41, R42, R43, R44 \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,     KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16,   KC_NO,   KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26,   KC_NO,   KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36,   KC_NO,   KC_NO }, \
-    { L40,   L41,   L42,   L43,   L44,   L45,   L46,   KC_NO,   KC_NO },  \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   KC_NO,   KC_NO },  \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,     R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO,   KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,     R37,   KC_NO }, \
-    { R40,   R41,   R42,   R43,   R44, KC_NO, KC_NO,   KC_NO,   KC_NO } \
-  }
-