Move 60% layouts to data driven (#20477)

13 files changed, 979 insertions, 627 deletions

diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json
index f6adb3db42..98b545a9e8 100644
--- a/keyboards/xelus/rs60/info.json
+++ b/keyboards/xelus/rs60/info.json
@@ -7,281 +7,5 @@
         "vid": "0x5845",
         "pid": "0x5253"
     },
-    "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"],
-    "layouts": {
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"\\", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Backspace", "x":13.5, "y":1, "w":1.5},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Fn", "x":14, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label":"Esc", "matrix":[0, 0], "x":0, "y":0},
-                {"label":"1", "matrix":[0, 1], "x":1, "y":0},
-                {"label":"2", "matrix":[0, 2], "x":2, "y":0},
-                {"label":"3", "matrix":[0, 3], "x":3, "y":0},
-                {"label":"4", "matrix":[0, 4], "x":4, "y":0},
-                {"label":"5", "matrix":[0, 5], "x":5, "y":0},
-                {"label":"6", "matrix":[0, 6], "x":6, "y":0},
-                {"label":"7", "matrix":[0, 7], "x":7, "y":0},
-                {"label":"8", "matrix":[0, 8], "x":8, "y":0},
-                {"label":"9", "matrix":[0, 9], "x":9, "y":0},
-                {"label":"0", "matrix":[0, 10], "x":10, "y":0},
-                {"label":"-", "matrix":[0, 11], "x":11, "y":0},
-                {"label":"=", "matrix":[0, 12], "x":12, "y":0},
-                {"label":"Backspace", "matrix":[0, 13], "x":13, "y":0, "w":2},
-
-                {"label":"Tab", "matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix":[1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix":[1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix":[1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix":[1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix":[1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix":[1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix":[1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix":[1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix":[1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix":[1, 10], "x":10.5, "y":1},
-                {"label":"[", "matrix":[1, 11], "x":11.5, "y":1},
-                {"label":"]", "matrix":[1, 12], "x":12.5, "y":1},
-                {"label":"\\", "matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
-
-                {"label":"Caps Lock", "matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix":[2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix":[2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix":[2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix":[2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix":[2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix":[2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix":[2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix":[2, 9], "x":9.75, "y":2},
-                {"label":";", "matrix":[2, 10], "x":10.75, "y":2},
-                {"label":"'", "matrix":[2, 11], "x":11.75, "y":2},
-                {"label":"Enter", "matrix":[2, 12], "x":12.75, "y":2, "w":2.25},
-
-                {"label":"Shift", "matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"label":"Z", "matrix":[3, 1], "x":2.25, "y":3},
-                {"label":"X", "matrix":[3, 2], "x":3.25, "y":3},
-                {"label":"C", "matrix":[3, 3], "x":4.25, "y":3},
-                {"label":"V", "matrix":[3, 4], "x":5.25, "y":3},
-                {"label":"B", "matrix":[3, 5], "x":6.25, "y":3},
-                {"label":"N", "matrix":[3, 6], "x":7.25, "y":3},
-                {"label":"M", "matrix":[3, 7], "x":8.25, "y":3},
-                {"label":",", "matrix":[3, 8], "x":9.25, "y":3},
-                {"label":".", "matrix":[3, 9], "x":10.25, "y":3},
-                {"label":"/", "matrix":[3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix":[3, 12], "x":12.25, "y":3, "w":2.75},
-
-                {"label":"Ctrl", "matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "matrix":[4, 5], "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "matrix":[4, 9], "x":10, "y":4, "w":1.25},
-                {"label":"GUI", "matrix":[4, 10], "x":11.25, "y":4, "w":1.25},
-                {"label":"Fn", "matrix":[4, 12], "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "matrix":[4, 13], "x":13.75, "y":4, "w":1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label":"Esc", "matrix":[0, 0], "x":0, "y":0},
-                {"label":"1", "matrix":[0, 1], "x":1, "y":0},
-                {"label":"2", "matrix":[0, 2], "x":2, "y":0},
-                {"label":"3", "matrix":[0, 3], "x":3, "y":0},
-                {"label":"4", "matrix":[0, 4], "x":4, "y":0},
-                {"label":"5", "matrix":[0, 5], "x":5, "y":0},
-                {"label":"6", "matrix":[0, 6], "x":6, "y":0},
-                {"label":"7", "matrix":[0, 7], "x":7, "y":0},
-                {"label":"8", "matrix":[0, 8], "x":8, "y":0},
-                {"label":"9", "matrix":[0, 9], "x":9, "y":0},
-                {"label":"0", "matrix":[0, 10], "x":10, "y":0},
-                {"label":"-", "matrix":[0, 11], "x":11, "y":0},
-                {"label":"=", "matrix":[0, 12], "x":12, "y":0},
-                {"label":"Backspace", "matrix":[0, 13], "x":13, "y":0, "w":2},
-
-                {"label":"Tab", "matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix":[1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix":[1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix":[1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix":[1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix":[1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix":[1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix":[1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix":[1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix":[1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix":[1, 10], "x":10.5, "y":1},
-                {"label":"[", "matrix":[1, 11], "x":11.5, "y":1},
-                {"label":"]", "matrix":[1, 12], "x":12.5, "y":1},
-                {"label":"\\", "matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
-
-                {"label":"Caps Lock", "matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix":[2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix":[2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix":[2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix":[2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix":[2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix":[2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix":[2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix":[2, 9], "x":9.75, "y":2},
-                {"label":";", "matrix":[2, 10], "x":10.75, "y":2},
-                {"label":"'", "matrix":[2, 11], "x":11.75, "y":2},
-                {"label":"Enter", "matrix":[2, 12], "x":12.75, "y":2, "w":2.25},
-
-                {"label":"Shift", "matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"label":"Z", "matrix":[3, 1], "x":2.25, "y":3},
-                {"label":"X", "matrix":[3, 2], "x":3.25, "y":3},
-                {"label":"C", "matrix":[3, 3], "x":4.25, "y":3},
-                {"label":"V", "matrix":[3, 4], "x":5.25, "y":3},
-                {"label":"B", "matrix":[3, 5], "x":6.25, "y":3},
-                {"label":"N", "matrix":[3, 6], "x":7.25, "y":3},
-                {"label":"M", "matrix":[3, 7], "x":8.25, "y":3},
-                {"label":",", "matrix":[3, 8], "x":9.25, "y":3},
-                {"label":".", "matrix":[3, 9], "x":10.25, "y":3},
-                {"label":"/", "matrix":[3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix":[3, 12], "x":12.25, "y":3, "w":2.75},
-
-                {"label":"Ctrl", "matrix":[4, 0], "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "matrix":[4, 1], "x":1.5, "y":4},
-                {"label":"Alt", "matrix":[4, 2], "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "matrix":[4, 5], "x":4, "y":4, "w":7},
-                {"label":"Alt", "matrix":[4, 10], "x":11, "y":4, "w":1.5},
-                {"label":"Fn", "matrix":[4, 12], "x":12.5, "y":4},
-                {"label":"Ctrl", "matrix":[4, 13], "x":13.5, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label":"Esc", "matrix":[0, 0], "x":0, "y":0},
-                {"label":"1", "matrix":[0, 1], "x":1, "y":0},
-                {"label":"2", "matrix":[0, 2], "x":2, "y":0},
-                {"label":"3", "matrix":[0, 3], "x":3, "y":0},
-                {"label":"4", "matrix":[0, 4], "x":4, "y":0},
-                {"label":"5", "matrix":[0, 5], "x":5, "y":0},
-                {"label":"6", "matrix":[0, 6], "x":6, "y":0},
-                {"label":"7", "matrix":[0, 7], "x":7, "y":0},
-                {"label":"8", "matrix":[0, 8], "x":8, "y":0},
-                {"label":"9", "matrix":[0, 9], "x":9, "y":0},
-                {"label":"0", "matrix":[0, 10], "x":10, "y":0},
-                {"label":"-", "matrix":[0, 11], "x":11, "y":0},
-                {"label":"=", "matrix":[0, 12], "x":12, "y":0},
-                {"label":"\\", "matrix":[0, 13], "x":13, "y":0},
-                {"label":"Delete", "matrix":[2, 13], "x":14, "y":0},
-
-                {"label":"Tab", "matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix":[1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix":[1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix":[1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix":[1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix":[1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix":[1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix":[1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix":[1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix":[1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix":[1, 10], "x":10.5, "y":1},
-                {"label":"[", "matrix":[1, 11], "x":11.5, "y":1},
-                {"label":"]", "matrix":[1, 12], "x":12.5, "y":1},
-                {"label":"Backspace", "matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
-
-                {"label":"Caps Lock", "matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix":[2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix":[2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix":[2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix":[2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix":[2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix":[2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix":[2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix":[2, 9], "x":9.75, "y":2},
-                {"label":";", "matrix":[2, 10], "x":10.75, "y":2},
-                {"label":"'", "matrix":[2, 11], "x":11.75, "y":2},
-                {"label":"Enter", "matrix":[2, 12], "x":12.75, "y":2, "w":2.25},
-
-                {"label":"Shift", "matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"label":"Z", "matrix":[3, 1], "x":2.25, "y":3},
-                {"label":"X", "matrix":[3, 2], "x":3.25, "y":3},
-                {"label":"C", "matrix":[3, 3], "x":4.25, "y":3},
-                {"label":"V", "matrix":[3, 4], "x":5.25, "y":3},
-                {"label":"B", "matrix":[3, 5], "x":6.25, "y":3},
-                {"label":"N", "matrix":[3, 6], "x":7.25, "y":3},
-                {"label":"M", "matrix":[3, 7], "x":8.25, "y":3},
-                {"label":",", "matrix":[3, 8], "x":9.25, "y":3},
-                {"label":".", "matrix":[3, 9], "x":10.25, "y":3},
-                {"label":"/", "matrix":[3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix":[3, 12], "x":12.25, "y":3, "w":1.75},
-                {"label":"Fn", "matrix":[3, 13], "x":14, "y":3},
-
-                {"label":"Ctrl", "matrix":[4, 0], "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "matrix":[4, 1], "x":1.5, "y":4},
-                {"label":"Alt", "matrix":[4, 2], "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "matrix":[4, 5], "x":4, "y":4, "w":7},
-                {"label":"Alt", "matrix":[4, 10], "x":11, "y":4, "w":1.5},
-                {"label":"Fn", "matrix":[4, 12], "x":12.5, "y":4},
-                {"label":"Ctrl", "matrix":[4, 13], "x":13.5, "y":4, "w":1.5}
-            ]
-        }
-    }
+    "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"]
 }
diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json
index fb410ee861..bfc36db1c4 100644
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -11,5 +11,285 @@
         "caps_lock": "B0"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/xelus/rs60/rev1/rev1.h b/keyboards/xelus/rs60/rev1/rev1.h
deleted file mode 100644
index e5f6bf8797..0000000000
--- a/keyboards/xelus/rs60/rev1/rev1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │   │0D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
- * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3B │3C    │3D │   │3C        │ 2.75u RShift
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
- * │40  │41  │42  │45                      │49  │4A  │4C  │4D  │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
- * │40   │41 │42   │45                         │4A   │4C │4D   │ Tsangan/WKL/HHKB
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,      K3B, K3C, K3D, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D }  \
-}
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
index f524bd938c..0e9e0d8e9b 100644
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -11,5 +11,285 @@
         "caps_lock": "A1"
     },
     "processor": "STM32F401",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+