Merge remote-tracking branch 'origin/master' into develop

7 files changed, 259 insertions, 6 deletions

diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json
index 241f1cbe44..f6adb3db42 100644
--- a/keyboards/xelus/rs60/info.json
+++ b/keyboards/xelus/rs60/info.json
@@ -7,6 +7,7 @@
         "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": [
@@ -74,6 +75,213 @@
                 {"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}
+            ]
         }
     }
 }
diff --git a/keyboards/xelus/rs60/rev1/rev1.h b/keyboards/xelus/rs60/rev1/rev1.h
index 9b8e841de5..e5f6bf8797 100644
--- a/keyboards/xelus/rs60/rev1/rev1.h
+++ b/keyboards/xelus/rs60/rev1/rev1.h
@@ -19,6 +19,23 @@
 
 #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, \
diff --git a/keyboards/xelus/rs60/rev1/rules.mk b/keyboards/xelus/rs60/rev1/rules.mk
index bcb2b171f5..cdac239154 100644
--- a/keyboards/xelus/rs60/rev1/rules.mk
+++ b/keyboards/xelus/rs60/rev1/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = 60_ansi_split_bs_rshift
diff --git a/keyboards/xelus/rs60/rev2_0/rev2_0.h b/keyboards/xelus/rs60/rev2_0/rev2_0.h
index dd43418964..5c9dba5a6c 100644
--- a/keyboards/xelus/rs60/rev2_0/rev2_0.h
+++ b/keyboards/xelus/rs60/rev2_0/rev2_0.h
@@ -19,6 +19,23 @@
 
 #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, \
diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
index df66f7dd37..221b9d4c01 100644
--- a/keyboards/xelus/rs60/rev2_0/rules.mk
+++ b/keyboards/xelus/rs60/rev2_0/rules.mk
@@ -24,5 +24,3 @@ KEYBOARD_SHARED_EP = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-LAYOUTS = 60_ansi_split_bs_rshift
diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.h b/keyboards/xelus/rs60/rev2_1/rev2_1.h
index dd43418964..5c9dba5a6c 100644
--- a/keyboards/xelus/rs60/rev2_1/rev2_1.h
+++ b/keyboards/xelus/rs60/rev2_1/rev2_1.h
@@ -19,6 +19,23 @@
 
 #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, \
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
index da1f821141..86f893cb2f 100644
--- a/keyboards/xelus/rs60/rev2_1/rules.mk
+++ b/keyboards/xelus/rs60/rev2_1/rules.mk
@@ -25,5 +25,3 @@ KEYBOARD_SHARED_EP = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-LAYOUTS = 60_ansi_split_bs_rshift