Wilba Tech WT65-XT: rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_tsangan (#20873)

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_tsangan

* readme.md: update maintainer username

5 files changed, 97 insertions, 94 deletions

diff --git a/keyboards/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/info.json
index 22effb4b87..c977624dd9 100644
--- a/keyboards/wilba_tech/wt65_xt/info.json
+++ b/keyboards/wilba_tech/wt65_xt/info.json
@@ -15,95 +15,98 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_tsangan"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
 
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-                {"matrix": [0, 10], "x": 10.5, "y": 0},
-                {"matrix": [0, 11], "x": 11.5, "y": 0},
-                {"matrix": [0, 12], "x": 12.5, "y": 0},
-                {"matrix": [0, 13], "x": 13.5, "y": 0},
-                {"matrix": [0, 14], "x": 14.5, "y": 0},
-                {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
 
-                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-                {"matrix": [1, 12], "x": 13, "y": 1},
-                {"matrix": [1, 13], "x": 14, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
 
-                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [2, 7], "x": 8.25, "y": 2},
-                {"matrix": [2, 8], "x": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-                {"matrix": [2, 12], "x": 13.25, "y": 2},
-                {"matrix": [2, 13], "x": 14.25, "y": 2},
-                {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2},
 
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
 
-                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 3},
-                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3},
+                {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
 
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 3], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
 
-                {"matrix": [4, 14], "x": 15.5, "y": 4},
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4}
+                {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c
index 49cd2cc769..3fad870bb7 100644
--- a/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
-	[0] = LAYOUT_all(
+	[0] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_F1,   KC_F2,      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_BSPC,          KC_HOME,
 		KC_F3,   KC_F4,      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_PGUP,
 		KC_F5,   KC_F6,      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,                    KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
 
 	// Fn1 Layer
-	[1] = LAYOUT_all(
+	[1] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS, KC_TRNS,    KC_GRV,  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_DEL,           KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Fn2 Layer
 /*
-	[2] = LAYOUT_all(
+	[2] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		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, KC_TRNS, KC_TRNS,                   KC_TRNS,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 	// Fn3 Layer
 /*
-	[3] = LAYOUT_all(
+	[3] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		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, KC_TRNS, KC_TRNS,                   KC_TRNS,
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c
index 10586938d3..047d4d7e11 100644
--- a/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
-	[0] = LAYOUT_all(
+	[0] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_F1,   KC_F2,      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_BSPC,          KC_HOME,
 		KC_F3,   KC_F4,      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_PGUP,
 		KC_F5,   KC_F6,      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,                    KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
 
 	// Fn1 Layer
-	[1] = LAYOUT_all(
+	[1] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS, KC_TRNS,    KC_GRV,  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_DEL,           KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
@@ -34,7 +34,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),
 
 	// Fn2 Layer
-	[2] = LAYOUT_all(
+	[2] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		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, KC_TRNS,                   KC_TRNS,
@@ -42,7 +42,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),
 
 	// Fn3 Layer
-	[3] = LAYOUT_all(
+	[3] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		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, KC_TRNS,                   KC_TRNS,
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c b/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c
index b0dfa3e03c..64b24e9bf4 100644
--- a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c
+++ b/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c
@@ -173,7 +173,7 @@ const char *VC_HAND_VALUES[_OS_MODES_MAX] = {SS_LCTL(SS_LSFT("k")), SS_LCTL(SS_L
 const char *SCRNSHT_VALUES[_OS_MODES_MAX] = {SS_LGUI(SS_LSFT("s")), SS_LCMD(SS_LSFT("4"))};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT_all(
+	[_QWERTY] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_ESC,      KC_LLCK,    KC_GRAVE,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_BSPC,          KC_HOME,
 		KC_PLATFORM, KC_MPLY,    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_PGUP,
 		KC_SCRNSHT,  KC_YIDDISH, 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_PGDN,
@@ -232,37 +232,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *   .    ≲ 2272  ≳ 2273  ≰ 2270  ≱ 2271
    *   /                            ⊘ 2298
    */
-	[_YIDDISH] = LAYOUT_all(
+	[_YIDDISH] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS,  KC_TRNS,    H(05f3), 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, H(05e7), H(05e9), H(05e2), H(05e8), H(05d8), H(05f2), H(05d5), H(05d9), H(05d5), H(05e4), KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(05d0), H(05e1), H(05d3), H(fb4e), H(05d2), H(05d4), H(05d7), H(05db), H(05dc), KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(05d6), H(05e6), H(05db), H(05f0), H(05d1), H(05e0), H(05de), 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),
-	[_SHIFTYIDDISH] = LAYOUT_all(
+	[_SHIFTYIDDISH] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS,  KC_TRNS,    H(05f4), 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, H(fb4a), H(fb1f), H(05f1), KC_TRNS, H(fb2f), H(05e3), KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,  KC_TRNS,    KC_TRNS, H(fb2e), H(05ea), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, H(fb4d), H(05da), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, H(05e5), H(05da), H(fb4c), KC_TRNS, H(05df), H(05dd), 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),
-	[_GREEK] = LAYOUT_all(
+	[_GREEK] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS,  KC_TRNS,    XXXXXXX, H(2081), H(2082), H(2083), H(2084), H(2085), H(2086), H(2087), H(2088), H(2089), H(2080), H(208b), H(208a), KC_TRNS,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(03b8), H(03c9), H(03b5), H(03c1), H(03c4), H(03c8), H(03c5), H(03b9), H(03bf), H(03c0), XXXXXXX, XXXXXXX, XXXXXXX,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(03b1), H(03c3), H(03b4), H(03c6), H(03b3), H(03b7), XXXXXXX, H(03ba), H(03bb), H(2026), H(00b7), KC_TRNS,                   KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(03b6), H(03be), H(03c7), XXXXXXX, H(03b2), H(03bd), H(03bc), H(226a), H(2272), XXXXXXX, 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),
-	[_SHIFTGREEK] = LAYOUT_all(
+	[_SHIFTGREEK] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS,  KC_TRNS,    XXXXXXX, H(00b9), H(00b2), H(00b3), H(2074), H(2075), H(2076), H(2077), H(2078), H(2079), H(2070), H(207b), H(208b), KC_TRNS,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(0398), H(03a9), H(0395), H(03a1), H(03a4), H(03a8), H(03a5), H(0399), H(039f), H(03a0), XXXXXXX, XXXXXXX, XXXXXXX,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(0391), H(03a3), H(0394), H(03a6), H(0393), H(0397), H(03d1), H(039a), H(039b), H(22ef), H(2022), KC_TRNS,                   KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(0396), H(039e), H(03a7), H(03c2), H(0392), H(039d), H(039c), H(226b), H(2273), XXXXXXX, 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),
-	[_CADET] = LAYOUT_all(
+	[_CADET] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS,  KC_TRNS,    XXXXXXX, H(00a1), H(00ab), H(00a3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(00b0), XXXXXXX, H(2205), H(00ac), H(2260), KC_TRNS,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(211a), XXXXXXX, H(2203), H(211d), XXXXXXX, H(2228), H(222a), H(221e), XXXXXXX, H(2261), H(00b1), H(2248), H(223c),          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(2200), H(2208), H(2282), H(2286), H(2287), H(2190), H(2193), H(2191), H(2192), H(2194), H(2234), KC_TRNS,                   KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(2124), H(2718), H(2102), H(2714), XXXXXXX, H(2115), XXXXXXX, H(2202), H(2270), XXXXXXX, 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),
-	[_SHIFTCADET] = LAYOUT_all(
+	[_SHIFTCADET] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		KC_TRNS,  KC_TRNS,    XXXXXXX, H(00bf), H(00bb), H(20ac), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(2297), XXXXXXX, XXXXXXX, H(2296), H(2295), KC_TRNS,          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, H(2204), XXXXXXX, XXXXXXX, H(2227), H(2229), H(2135), XXXXXXX, H(2262), H(2213), H(2249), H(2241),          KC_TRNS,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, H(212b), H(2209), H(2284), H(2288), H(2289), H(21d0), H(21d3), H(21d1), H(21d2), H(21d4), H(2299), KC_TRNS,                   KC_TRNS,
@@ -270,7 +270,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),
   // The function layer mostly contains the accent marks, but also has a few meta-control
   // operations. The accent marks are placed by analogy with Mac OS.
-	[_FUNCTION] = LAYOUT_all(
+	[_FUNCTION] = LAYOUT_65_xt_ansi_blocker_tsangan(
 		QK_BOOT,  KC_TRNS,    KC_CGRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,          XXXXXXX,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, KC_CAGU, XXXXXXX, XXXXXXX, XXXXXXX, KC_CDIA, KC_CCIR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
 		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,
diff --git a/keyboards/wilba_tech/wt65_xt/readme.md b/keyboards/wilba_tech/wt65_xt/readme.md
index 980f914216..f0164d93b5 100644
--- a/keyboards/wilba_tech/wt65_xt/readme.md
+++ b/keyboards/wilba_tech/wt65_xt/readme.md
@@ -6,7 +6,7 @@ WT65-XT is a keyboard PCB supporting 65% layout with left side macro keys.
 
 First produced by [Rama Works Foundry](https://r.works) for [ION Keyboards Zenith](https://r.works/zenith)
 
-* Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)
+* Keyboard Maintainer: [Wilba](https://github.com/wilba)
 * Hardware Supported: wilba.tech WT65-XT
 * Hardware Availability: [wilba.tech](https://wilba.tech/)