Move Alice and Ergodox layouts to data driven (#20340)

18 files changed, 2265 insertions, 843 deletions

diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index f9680e47d5..42b16d6398 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -6,302 +6,5 @@
         "vid": "0x4D4C",
         "device_version": "0.0.1"
     },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layouts": {
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0},
-                {"label":"K0E", "x":17.5, "y":0},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K4D", "x":17.5, "y":3},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0, "w":2},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K4D", "x":17.5, "y":3},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0},
-                {"label":"K0E", "x":17.5, "y":0},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":2.75},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0, "w":2},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":2.75},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        }
-    }
+    "community_layouts": ["alice", "alice_split_bs"]
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index 81adcf57e4..92ff0d8952 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -15,5 +15,330 @@
         "caps_lock": "B2",
         "num_lock": "C15",
         "scroll_lock": "B9"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
index a86b1e5dd5..5f01f322df 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index afb0b3d017..16e0ea109d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -20,5 +20,330 @@
         "caps_lock": "B2",
         "num_lock": "C15",
         "scroll_lock": "B9"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 78bca55b8e..e51e92ed6f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index c47435ec3d..8fa908858d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -22,5 +22,314 @@
     },
     "ws2812": {
         "driver": "spi"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index ad9c7c4db0..b7e03d0f1e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev3.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
deleted file mode 100644
index 28c373ad85..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2021 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K41, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K43, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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,   KC_NO, K2D, KC_NO   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D,\
-    K41, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K43, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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, KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D, KC_NO   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K41, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K43, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO, K2D,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K41, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K43, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
index a6efa3810a..9a2a280c10 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
@@ -4,5 +4,330 @@
     },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
index 60d20c4a29..a5ebef5b87 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
@@ -11,5 +11,330 @@
     },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index 925b7cd213..b6ee0c5b67 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -8,5 +8,330 @@
             {"pin_a": "A4", "pin_b": "A3"},
             {"pin_a": "B7", "pin_b": "B6"}
         ]
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index e385d5ef1a..5ac0db3260 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -20,5 +20,330 @@
         "caps_lock": "E6",
         "num_lock": "D7",
         "scroll_lock": "F7"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
deleted file mode 100644
index 71bb49409d..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K4C, K3C, K3D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4D \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D, KC_NO   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K4C, K3C, K3D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4D \
-) { \
-    { 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,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D, KC_NO   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K4C, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4D  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D,   KC_NO }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K4C, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4D  \
-) { \
-    { 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,   KC_NO, K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D,   KC_NO }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs