Alf X2 Layout Macro Additions (#20495)

* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_ansi_split_bs_rshift

* add LAYOUT_ansi

* refactor hhkb_60 keymap

Refactor the `hhkb_60` keymap to use the `LAYOUT_ansi_split_bs_rshift` macro.

3 files changed, 254 insertions, 79 deletions

diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index 974484db19..e15b07c2fb 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -28,79 +28,227 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [4, 4], "x": 1.5, "y": 0},
-                {"matrix": [4, 8], "x": 2.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 1},
-                {"matrix": [0, 3], "x": 3, "y": 1},
-                {"matrix": [0, 4], "x": 4, "y": 1},
-                {"matrix": [0, 5], "x": 5, "y": 1},
-                {"matrix": [0, 6], "x": 6, "y": 1},
-                {"matrix": [0, 7], "x": 7, "y": 1},
-                {"matrix": [0, 8], "x": 8, "y": 1},
-                {"matrix": [0, 9], "x": 9, "y": 1},
-                {"matrix": [0, 10], "x": 10, "y": 1},
-                {"matrix": [0, 11], "x": 11, "y": 1},
-                {"matrix": [0, 12], "x": 12, "y": 1},
-                {"matrix": [0, 13], "x": 13, "y": 1},
-                {"matrix": [0, 14], "x": 14, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2},
-                {"matrix": [1, 3], "x": 2.5, "y": 2},
-                {"matrix": [1, 4], "x": 3.5, "y": 2},
-                {"matrix": [1, 5], "x": 4.5, "y": 2},
-                {"matrix": [1, 6], "x": 5.5, "y": 2},
-                {"matrix": [1, 7], "x": 6.5, "y": 2},
-                {"matrix": [1, 8], "x": 7.5, "y": 2},
-                {"matrix": [1, 9], "x": 8.5, "y": 2},
-                {"matrix": [1, 10], "x": 9.5, "y": 2},
-                {"matrix": [1, 11], "x": 10.5, "y": 2},
-                {"matrix": [1, 12], "x": 11.5, "y": 2},
-                {"matrix": [1, 13], "x": 12.5, "y": 2},
-                {"matrix": [1, 14], "x": 13.5, "y": 2, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 3},
-                {"matrix": [2, 3], "x": 2.75, "y": 3},
-                {"matrix": [2, 4], "x": 3.75, "y": 3},
-                {"matrix": [2, 5], "x": 4.75, "y": 3},
-                {"matrix": [2, 6], "x": 5.75, "y": 3},
-                {"matrix": [2, 7], "x": 6.75, "y": 3},
-                {"matrix": [2, 8], "x": 7.75, "y": 3},
-                {"matrix": [2, 9], "x": 8.75, "y": 3},
-                {"matrix": [2, 10], "x": 9.75, "y": 3},
-                {"matrix": [2, 11], "x": 10.75, "y": 3},
-                {"matrix": [2, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 4},
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [3, 5], "x": 5, "y": 4},
-                {"matrix": [3, 6], "x": 6, "y": 4},
-                {"matrix": [3, 7], "x": 7, "y": 4},
-                {"matrix": [3, 8], "x": 8, "y": 4},
-                {"matrix": [3, 9], "x": 9, "y": 4},
-                {"matrix": [3, 10], "x": 10, "y": 4},
-                {"matrix": [3, 11], "x": 11, "y": 4},
-                {"matrix": [3, 12], "x": 12, "y": 4},
-                {"matrix": [3, 13], "x": 13, "y": 4},
-                {"matrix": [3, 14], "x": 14, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 5},
-                {"matrix": [4, 11], "x": 11, "y": 5},
-                {"matrix": [4, 12], "x": 12, "y": 5},
-                {"matrix": [4, 13], "x": 13, "y": 5},
-                {"matrix": [4, 14], "x": 14, "y": 5}
+                {"label": "Volume Up", "matrix": [4, 4], "x": 1.5, "y": 0},
+                {"label": "Volume Down", "matrix": [4, 8], "x": 2.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "\u2298", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4},
+                {"label": "\u2298", "matrix": [3, 1], "x": 1, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11, "y": 4},
+                {"label": "\u2298", "matrix": [3, 12], "x": 12, "y": 4},
+                {"label": "Shift", "matrix": [3, 13], "x": 13, "y": 4},
+                {"label": "\u2298", "matrix": [3, 14], "x": 14, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 5},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 5},
+                {"label": "\u2298", "matrix": [4, 12], "x": 12, "y": 5},
+                {"label": "Menu", "matrix": [4, 13], "x": 13, "y": 5},
+                {"label": "Ctrl", "matrix": [4, 14], "x": 14, "y": 5}
+            ]
+        },
+
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Volume Up", "matrix": [4, 4], "x": 1.5, "y": 0},
+                {"label": "Volume Down", "matrix": [4, 8], "x": 2.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 4, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 13], "x": 12.5, "y": 5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 5, "w": 1.25}
+            ]
+        },
+
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Volume Up", "matrix": [4, 4], "x": 1.5, "y": 0},
+                {"label": "Volume Down", "matrix": [4, 8], "x": 2.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "\u2298", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2298", "matrix": [3, 14], "x": 14, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 13], "x": 12.5, "y": 5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 5, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/alf/x2/keymaps/hhkb_60/keymap.c b/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
index 2e261d1a28..6345591d64 100644
--- a/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
+++ b/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
@@ -18,22 +18,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_all(
+    [0] = LAYOUT_ansi_split_bs_rshift(
                  KC_VOLU, KC_VOLD,
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT, MO(1),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, XXXXXXX, KC_APP,  KC_RCTL
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
     ),
 
-    [1] = LAYOUT_all(
+    [1] = LAYOUT_ansi_split_bs_rshift(
                  KC_MNXT, KC_MPRV,
         KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
     ),
 
 };
diff --git a/keyboards/alf/x2/matrix_diagram.md b/keyboards/alf/x2/matrix_diagram.md
new file mode 100644
index 0000000000..45859e862a
--- /dev/null
+++ b/keyboards/alf/x2/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for Alf X2
+
+```
+      ┌───┬───┐
+      │44 │48 │
+      └───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │      │0E     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+│10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │        │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐    │ ISO Enter
+│20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │     │   │    │
+├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤   ┌─┴───┴────┤                ┌──────┬───┐
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │   │3D        │ 2.75u RShift   │3D    │3E │ 1.75u/1u RShift
+├───┴┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤   └──────────┘                └──────┴───┘
+│40  │41  │43  │46                      │4A │4B │4C │4D │4E │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│40  │41  │43  │46                      │4A  │4B  │4D  │4E  │ Standard
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │43   │46                         │4B   │4D │4E   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```