Xelus Valor FRL TKL Layout Additions (#20893)

* add matrix_diagram.md

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_ansi_split_bs_rshift

* add LAYOUT_ansi

4 files changed, 197 insertions, 92 deletions

diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json
index 422966f115..fee349b989 100644
--- a/keyboards/xelus/valor_frl_tkl/info.json
+++ b/keyboards/xelus/valor_frl_tkl/info.json
@@ -6,94 +6,184 @@
         "vid": "0x5845",
         "pid": "0x4654"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi_split_bs_rshift"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_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": 9, "y": 0},
-                {"matrix": [0, 8], "x": 10, "y": 0},
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-                {"matrix": [0, 13], "x": 15, "y": 0},
-                {"matrix": [2, 13], "x": 16, "y": 0},
-
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-                {"matrix": [0, 15], "x": 18.25, "y": 0},
-                {"matrix": [0, 16], "x": 19.25, "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": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 17.25, "y": 1},
-                {"matrix": [1, 15], "x": 18.25, "y": 1},
-                {"matrix": [1, 16], "x": 19.25, "y": 1},
-
-                {"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": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 12], "x": 14.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": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16, "y": 3},
-
-                {"matrix": [3, 15], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 14], "x": 17.25, "y": 4},
-                {"matrix": [4, 15], "x": 18.25, "y": 4},
-                {"matrix": [4, 16], "x": 19.25, "y": 4}
+                {"label": "`", "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": 9, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 14], "x": 17.25, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 18.25, "y": 0},
+                {"label": "Page Up", "matrix": [0, 16], "x": 19.25, "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": 8.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 12.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 13.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 14.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 14], "x": 17.25, "y": 1},
+                {"label": "End", "matrix": [1, 15], "x": 18.25, "y": 1},
+                {"label": "Page Down", "matrix": [1, 16], "x": 19.25, "y": 1},
+
+                {"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": 8.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 14.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": "B", "matrix": [3, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.25, "y": 3, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [3, 15], "x": 18.25, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 4], "x": 4.5, "y": 4, "w": 2},
+                {"label": "Fn", "matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 15.5, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 14], "x": 17.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 15], "x": 18.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 16], "x": 19.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "`", "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": 9, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [0, 13], "x": 15, "y": 0},
+                {"label": "Backspace", "matrix": [2, 13], "x": 16, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 14], "x": 17.25, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 18.25, "y": 0},
+                {"label": "Page Up", "matrix": [0, 16], "x": 19.25, "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": 8.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 12.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 13.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 14.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 14], "x": 17.25, "y": 1},
+                {"label": "End", "matrix": [1, 15], "x": 18.25, "y": 1},
+                {"label": "Page Down", "matrix": [1, 16], "x": 19.25, "y": 1},
+
+                {"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": 8.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 14.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": "B", "matrix": [3, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "GUI", "matrix": [3, 13], "x": 16, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 15], "x": 18.25, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 4], "x": 4.5, "y": 4, "w": 2},
+                {"label": "Fn", "matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 15.5, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 14], "x": 17.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 15], "x": 18.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 16], "x": 19.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c b/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c
index c7b3a1818f..0140b4e34e 100644
--- a/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c
+++ b/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
+  [0] = LAYOUT_ansi_split_bs_rshift(
     KC_GRV,  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_DEL,  KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,
     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_BSLS,           KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_RCTL,                    KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT_all(
+  [1] = LAYOUT_ansi_split_bs_rshift(
     KC_TRNS, 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_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c b/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c
index d73d3c646f..bee549e911 100644
--- a/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c
+++ b/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
+  [0] = LAYOUT_ansi_split_bs_rshift(
     KC_GRV,  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_DEL,  KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,
     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_BSLS,           KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_RCTL,                    KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT_all(
+  [1] = LAYOUT_ansi_split_bs_rshift(
     KC_TRNS, 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_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT_all(
+  [2] = LAYOUT_ansi_split_bs_rshift(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT_all(
+  [3] = LAYOUT_ansi_split_bs_rshift(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/xelus/valor_frl_tkl/matrix_diagram.md b/keyboards/xelus/valor_frl_tkl/matrix_diagram.md
new file mode 100644
index 0000000000..09299f052f
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/matrix_diagram.md
@@ -0,0 +1,15 @@
+# Matrix Diagram for Xelus Valor FRL TKL (Rev1, Rev2.0, and Rev2.1)
+
+```
+┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐   ┌───────┐
+│00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │2D ││0E │0F │0G │   │0D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤   └───────┘
+│10   │11 │12 │13 │14 │15 │         │16 │17 │18 │19 │1A │1B │1C │1D   ││1E │1F │1G │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+│20    │21 │22 │23 │24 │25 │         │26 │27 │28 │29 │2A │2B │2C      │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       ┌──────────┐
+│30      │31 │32 │33 │34 │35 │     │36 │37 │38 │39 │3A │3B │3C    │3D │    │3F │       │3C        │ 2.75u RShift
+├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤┌───┼───┼───┐   └──────────┘
+│40   │     │42   │44     │45  │   │47        │49   │           │4C   ││4E │4F │4G │
+└─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘└───┴───┴───┘
+```