Add missing gpio include to ps2 vendor (#22063 )

Adding support for the Pteron56 (PCB) keyboard (#21731 )
Wolf Ziggurat Layout Additions (#22053 )
2023-09-18 19:55:51 +01:00 · 2023-09-18 13:52:48 +01:00 · 2023-09-17 21:57:03 -07:00 · 2023-09-17 21:26:13 -07:00 · 2023-09-17 20:50:14 -07:00 · 2023-09-17 20:17:51 -07:00
29 changed files with 2159 additions and 399 deletions
--- a/keyboards/artemis/paragon/hotswap/info.json
+++ b/keyboards/artemis/paragon/hotswap/info.json
@@ -3,6 +3,11 @@
        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "B3", "B6", "B5", "B4", "D7", "D4", "D6"],
        "rows": ["D2", "D1", "D0", "B2", "B1", "C6"]
    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D3", "pin_b": "D5", "resolution": 2 }
+        ]
+    },
    "layouts": {
        "LAYOUT_ansi_rwkl": {
            "layout": [
--- a/keyboards/artemis/paragon/info.json
+++ b/keyboards/artemis/paragon/info.json
@@ -18,11 +18,6 @@
    },
    "processor": "atmega32u4",
    "url": "",
-    "encoder": {
-        "rotary": [
-            { "pin_a": "D3", "pin_b": "D5", "resolution": 2 }
-        ]
-    },
    "usb": {
        "device_version": "1.0.0",
        "pid": "0x3449",
--- a/keyboards/artemis/paragon/soldered/info.json
+++ b/keyboards/artemis/paragon/soldered/info.json
@@ -3,6 +3,11 @@
        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B3", "D0", "D1", "D2", "D3", "D7", "D5"],
        "rows": ["B2", "C7", "C6", "B6", "B5", "B4"]
    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D4", "pin_b": "D6", "resolution": 2 }
+        ]
+    },
    "layouts": {
        "LAYOUT_ansi_rwkl": {
            "layout": [
--- a/keyboards/controllerworks/city42/info.json
+++ b/keyboards/controllerworks/city42/info.json
@@ -23,32 +23,50 @@
    "processor": "RP2040",
    "rgb_matrix": {
        "animations": {
+            "solid_color": true,
            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
            "band_pinwheel_sat": true,
            "band_pinwheel_val": true,
-            "band_sat": true,
            "band_spiral_sat": true,
            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
            "cycle_all": true,
            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,           
            "cycle_pinwheel": true,
            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
            "hue_breathing": true,
            "hue_pendulum": true,
            "hue_wave": true,
-            "rainbow_moving_chevron": true,
-            "raindrops": true,
-            "solid_reactive": true,
-            "solid_reactive_multinexus": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
            "solid_reactive_simple": true,
-            "solid_splash": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
            "splash": true,
-            "typing_heatmap": true
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
        },
        "driver": "ws2812",
        "layout": [
--- a/keyboards/geistmaschine/macropod/config.h
+++ b/keyboards/geistmaschine/macropod/config.h
@@ -19,3 +19,6 @@
   IO expander setup would allow up to 1x16 + 1 from the MCU */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 17
+
+/* Fix for Apple Silicon Macs struggling to detect board after suspend/sleep */
+#define USB_SUSPEND_WAKEUP_DELAY 200
--- a/keyboards/geistmaschine/macropod/info.json
+++ b/keyboards/geistmaschine/macropod/info.json
@@ -15,7 +15,7 @@
        "command": false,
        "console": false,
        "extrakey": true,
-        "mousekey": false,
+        "mousekey": true,
        "nkro": false,
        "encoder": true
    },
--- a/keyboards/kraken_jones/pteron56/info.json
+++ b/keyboards/kraken_jones/pteron56/info.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "pteron56",
+    "manufacturer": "Kraken-jokes",
+    "url": "https://github.com/kraken-jokes/pteron-pcb",
+    "maintainer": "Kraken-jokes",
+    "usb": {
+        "vid": "0x6D4B",
+        "pid": "0x7056",
+        "device_version": "0.2.0"
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "rows": ["D3", "D2", "F4", "D4", "B5"],
+        "cols": ["E6", "B4", "D7", "C6", "D0", "D1", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT":{
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75}, 
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25}, 
+                {"matrix": [0, 3], "x": 3, "y": 0.0}, 
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [0, 6], "x": 9.8, "y": 0.5}, 
+                {"matrix": [0, 7], "x": 10.8, "y": 0.25}, 
+                {"matrix": [0, 8], "x": 11.8, "y": 0}, 
+                {"matrix": [0, 9], "x": 12.8, "y": 0.25}, 
+                {"matrix": [0, 10], "x": 13.8, "y": 0.75},
+                {"matrix": [0, 11], "x": 14.8, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [1, 6], "x": 9.8, "y": 1.5},
+                {"matrix": [1, 7], "x": 10.8, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.8, "y": 1},
+                {"matrix": [1, 9], "x": 12.8, "y": 1.25}, 
+                {"matrix": [1, 10], "x": 13.8, "y": 1.75},
+                {"matrix": [1, 11], "x": 14.8, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [2, 6], "x": 9.8, "y": 2.5},
+                {"matrix": [2, 7], "x": 10.8, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.8, "y": 2},
+                {"matrix": [2, 9], "x": 12.8, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.8, "y": 2.75},
+                {"matrix": [2, 11], "x": 14.8, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 3.5},
+
+                {"matrix": [3, 6], "x": 9.8, "y": 3.5},
+                {"matrix": [3, 7], "x": 10.8, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.8, "y": 3},
+                {"matrix": [3, 9], "x": 12.8, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.8, "y": 3.75},
+                {"matrix": [3, 11], "x": 14.8, "y": 3.75},
+                
+                {"matrix": [4, 0], "x": 3.9, "y": 4.5},
+                {"matrix": [4, 1], "x": 4.9, "y": 4.6},
+                {"matrix": [4, 2], "x": 5.9, "y": 4.85},
+                {"matrix": [4, 3], "x": 6.9, "y": 5.35},
+                
+                {"matrix": [4, 8], "x": 7.9, "y": 5.35},
+                {"matrix": [4, 9], "x": 8.9, "y": 4.85},
+                {"matrix": [4, 10], "x": 9.9, "y": 4.6},
+                {"matrix": [4, 11], "x": 10.9, "y": 4.5}
+            ]
+        }
+    }
+}
--- a/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
+++ b/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright (C) 2023 @kraken-jokes
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define L1_GUI LT(1,KC_LGUI)
+#define L1_DEL LT(1,KC_DEL)
+#define L2_APP LT(2,KC_APP)
+#define L2_ALT LT(2,KC_LALT)
+#define PRTSC LGUI(LSFT(KC_S))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL, 
+        KC_BSPC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, 
+        KC_RBRC, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT, 
+                          L1_GUI,  KC_LCTL, KC_LSFT, L2_ALT,          L1_DEL,  KC_SPC,  L2_APP,  KC_TAB
+    ),
+
+    [1] = LAYOUT(
+        KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 
+        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_VOLU, KC_HOME, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U,         KC_PGUP, KC_UP,   KC_PGDN, KC_MENU, KC_RBRC, KC_TRNS, 
+        KC_VOLD, KC_END,  KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,         KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_BSLS, KC_TRNS, 
+                          KC_TRNS, KC_LCTL, KC_LSFT, KC_LALT,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        QK_BOOT, KC_SLEP, KC_WAKE, KC_TRNS, KC_PWR,  KC_TRNS,         KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSPC, 
+        KC_GRV,  KC_WBAK, KC_WFWD, KC_WSCH, KC_FIND, KC_TRNS,         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PSLS, KC_PAST, 
+        KC_DEL,  KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_P4,   KC_P5,   KC_P6,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_LBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_P1,   KC_P2,   KC_P3,   KC_PDOT, KC_TRNS, KC_TRNS,
+                          KC_TRNS, KC_TRNS, PRTSC,   KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_P0
+    ),
+};
--- a/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c
+++ b/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+// Copyright (C) 2023 @kraken-jokes
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define L1_GUI LT(1,KC_LGUI)
+#define L1_DEL LT(1,KC_DEL)
+#define L2_APP LT(2,KC_APP)
+#define L2_ALT LT(2,KC_LALT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL, 
+        KC_BSPC, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, 
+        KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT, 
+                          L1_GUI,  KC_LCTL, KC_LSFT,  L2_ALT,          L1_DEL,  KC_SPC,  L2_APP,  KC_TAB
+    ),
+
+    [1] = LAYOUT(
+        KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,   KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 
+        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_VOLU, KC_HOME, KC_BTN1, KC_MS_U, KC_BTN2,  KC_WH_U,         KC_PGUP, KC_UP,   KC_PGDN, KC_MENU, KC_RBRC, KC_TRNS, 
+        KC_VOLD, KC_END,  KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D,         KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_BSLS, KC_TRNS, 
+                          KC_TRNS, KC_LCTL, KC_LSFT,  KC_LALT,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        QK_BOOT, KC_SLEP, KC_WAKE, KC_TRNS, KC_PWR,   KC_TRNS,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, 
+        KC_DEL,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_MSEL, KC_MYCM, KC_PSLS, KC_PAST, 
+        RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, RGB_M_P,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                          KC_TRNS, KC_TRNS, KC_LSFT,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT
+    ),
+
+};
--- a/keyboards/kraken_jones/pteron56/keymaps/via/rules.mk
+++ b/keyboards/kraken_jones/pteron56/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/kraken_jones/pteron56/readme.md
+++ b/keyboards/kraken_jones/pteron56/readme.md
@@ -0,0 +1,31 @@
+# Pteron56
+
+![Pteron56](https://i.imgur.com/kt1RSi9h.jpg)
+
+The Pteron56 is a 56-key vertically staggered ortholinear keyboard with a 15 degree inward tilt per hand. 
+
+Initially developed by [FSund](https://github.com/fsund), this keyboard was designed to potentially reduce wrist and typing strain by offsetting the keys in a manner that mimics the natural stagger of the human hand with 4 thumb keys per side arranged around an ~85mm arc to mimic the swimg of one's mighty thumbs.
+
+Users have reported reduced finger movement, reduced wrist movement, and better typing comfort and swiftness with the Pteron layouts compared to a standard keyboard. 
+
+* Keyboard Maintainer: [Alex Moore](https://github.com/kraken-jokes)
+* Hardware Supported:
+    * PCB: Pteron56v0.2, Pteron56v0.2hsu, Pteron56v0.3, Pteron56v0.4e
+    * MCU: Pro-Micro, Elite-C
+* Hardware Availability: moorekeys.etsy.com. Open source though so it varies.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pteron56:default
+
+Flashing example for this keyboard:
+
+    make pteron56:default:flash
+  
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader thusly:
+* **Keycode in layout**: Press and hold the right most thumb key on the left side (LT(2(KC_ALT)) and while that is held, hit the top left key on the left side of the keyboard (KC_ESC) which will reset the board and enter bootloader mode. 
+Thumb and pinky is my method, but do what you will.
--- a/keyboards/kraken_jones/pteron56/rules.mk
+++ b/keyboards/kraken_jones/pteron56/rules.mk
@@ -0,0 +1 @@
+# File is intentionally blank
--- a/keyboards/viktus/styrka_topre/info.json
+++ b/keyboards/viktus/styrka_topre/info.json
@@ -26,93 +26,19 @@
        "cols": ["B5", "B4", "D7", "D6", "F6", "F5", "F4", "C7", "C6", "B6", "F7", "B1", "B2", "B3", "B7", "F1", "F0", "E6"],
        "rows": ["A7", "A6", "A4", "A5", "A3"]
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_split_bs",
+        "LAYOUT_2u_6u": "LAYOUT_65_xt_ansi_blocker",
+        "LAYOUT_2u_7u": "LAYOUT_65_xt_ansi_blocker_tsangan",
+        "LAYOUT_split_6u": "LAYOUT_65_xt_ansi_blocker_split_bs",
+        "LAYOUT_split_7u": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs"
+    },
    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K002", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K003", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K004", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K005", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K006", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K007", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K008", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K009", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K00A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K00B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K00C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K00D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K00E", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "K00F", "matrix": [0, 15], "x": 15, "y": 0},
-                {"label": "K010", "matrix": [0, 16], "x": 16, "y": 0},
-                {"label": "K011", "matrix": [0, 17], "x": 17, "y": 0},
-                {"label": "K100", "matrix": [1, 0], "x": 18, "y": 0},
-                {"label": "K101", "matrix": [1, 1], "x": 19, "y": 0},
-                {"label": "K102", "matrix": [1, 2], "x": 20, "y": 0},
-                {"label": "K103", "matrix": [1, 3], "x": 21, "y": 0},
-                {"label": "K104", "matrix": [1, 4], "x": 22, "y": 0},
-                {"label": "K105", "matrix": [1, 5], "x": 23, "y": 0},
-                {"label": "K106", "matrix": [1, 6], "x": 24, "y": 0},
-                {"label": "K107", "matrix": [1, 7], "x": 25, "y": 0},
-                {"label": "K108", "matrix": [1, 8], "x": 26, "y": 0},
-                {"label": "K109", "matrix": [1, 9], "x": 27, "y": 0},
-                {"label": "K10A", "matrix": [1, 10], "x": 28, "y": 0},
-                {"label": "K10B", "matrix": [1, 11], "x": 29, "y": 0},
-                {"label": "K10C", "matrix": [1, 12], "x": 30, "y": 0},
-                {"label": "K10D", "matrix": [1, 13], "x": 31, "y": 0},
-                {"label": "K10E", "matrix": [1, 14], "x": 32, "y": 0},
-                {"label": "K110", "matrix": [1, 16], "x": 33, "y": 0},
-                {"label": "K111", "matrix": [1, 17], "x": 34, "y": 0},
-                {"label": "K200", "matrix": [2, 0], "x": 35, "y": 0},
-                {"label": "K201", "matrix": [2, 1], "x": 36, "y": 0},
-                {"label": "K202", "matrix": [2, 2], "x": 37, "y": 0},
-                {"label": "K203", "matrix": [2, 3], "x": 38, "y": 0},
-                {"label": "K204", "matrix": [2, 4], "x": 39, "y": 0},
-                {"label": "K205", "matrix": [2, 5], "x": 40, "y": 0},
-                {"label": "K206", "matrix": [2, 6], "x": 41, "y": 0},
-                {"label": "K207", "matrix": [2, 7], "x": 42, "y": 0},
-                {"label": "K208", "matrix": [2, 8], "x": 43, "y": 0},
-                {"label": "K209", "matrix": [2, 9], "x": 44, "y": 0},
-                {"label": "K20A", "matrix": [2, 10], "x": 45, "y": 0},
-                {"label": "K20B", "matrix": [2, 11], "x": 46, "y": 0},
-                {"label": "K20C", "matrix": [2, 12], "x": 47, "y": 0},
-                {"label": "K20D", "matrix": [2, 13], "x": 48, "y": 0},
-                {"label": "K20F", "matrix": [2, 15], "x": 49, "y": 0},
-                {"label": "K211", "matrix": [2, 17], "x": 50, "y": 0},
-                {"label": "K300", "matrix": [3, 0], "x": 51, "y": 0},
-                {"label": "K301", "matrix": [3, 1], "x": 52, "y": 0},
-                {"label": "K302", "matrix": [3, 2], "x": 53, "y": 0},
-                {"label": "K304", "matrix": [3, 4], "x": 54, "y": 0},
-                {"label": "K305", "matrix": [3, 5], "x": 55, "y": 0},
-                {"label": "K306", "matrix": [3, 6], "x": 56, "y": 0},
-                {"label": "K307", "matrix": [3, 7], "x": 57, "y": 0},
-                {"label": "K308", "matrix": [3, 8], "x": 58, "y": 0},
-                {"label": "K309", "matrix": [3, 9], "x": 59, "y": 0},
-                {"label": "K30A", "matrix": [3, 10], "x": 60, "y": 0},
-                {"label": "K30B", "matrix": [3, 11], "x": 61, "y": 0},
-                {"label": "K30C", "matrix": [3, 12], "x": 62, "y": 0},
-                {"label": "K30D", "matrix": [3, 13], "x": 63, "y": 0},
-                {"label": "K30E", "matrix": [3, 14], "x": 64, "y": 0},
-                {"label": "K310", "matrix": [3, 16], "x": 65, "y": 0},
-                {"label": "K311", "matrix": [3, 17], "x": 66, "y": 0},
-                {"label": "K400", "matrix": [4, 0], "x": 67, "y": 0},
-                {"label": "K401", "matrix": [4, 1], "x": 68, "y": 0},
-                {"label": "K402", "matrix": [4, 2], "x": 69, "y": 0},
-                {"label": "K403", "matrix": [4, 3], "x": 70, "y": 0},
-                {"label": "K404", "matrix": [4, 4], "x": 71, "y": 0},
-                {"label": "K408", "matrix": [4, 8], "x": 72, "y": 0},
-                {"label": "K40C", "matrix": [4, 12], "x": 73, "y": 0},
-                {"label": "K40D", "matrix": [4, 13], "x": 74, "y": 0},
-                {"label": "K40E", "matrix": [4, 14], "x": 75, "y": 0},
-                {"label": "K410", "matrix": [4, 16], "x": 76, "y": 0},
-                {"label": "K411", "matrix": [4, 17], "x": 77, "y": 0}
-            ]
-        },
-        "LAYOUT_2u_6u": {
+        "LAYOUT_65_xt_ansi_blocker": {
            "layout": [
                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0},
+
                {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -128,8 +54,10 @@
                {"label": "K00E", "matrix": [0, 14], "x": 14.25, "y": 0},
                {"label": "K010", "matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
                {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -145,8 +73,10 @@
                {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -161,8 +91,10 @@
                {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -177,23 +109,26 @@
                {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "K403", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "K408", "matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4},
-                {"label": "K40D", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "K408", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6},
+                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+                {"label": "K40D", "matrix": [4, 13], "x": 13.75, "y": 4},
                {"label": "K40E", "matrix": [4, 14], "x": 15.25, "y": 4},
                {"label": "K410", "matrix": [4, 16], "x": 16.25, "y": 4},
                {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4}
            ]
        },
-        "LAYOUT_2u_7u": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
            "layout": [
                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0},
+
                {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -209,8 +144,10 @@
                {"label": "K00E", "matrix": [0, 14], "x": 14.25, "y": 0},
                {"label": "K010", "matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
                {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -226,8 +163,10 @@
                {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -242,8 +181,10 @@
                {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -258,8 +199,10 @@
                {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
+
                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
                {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
@@ -270,11 +213,11 @@
                {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4}
            ]
        },
-
-        "LAYOUT_split_6u": {
+        "LAYOUT_65_xt_ansi_blocker_split_bs": {
            "layout": [
                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0},
+
                {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -291,8 +234,10 @@
                {"label": "K00F", "matrix": [0, 15], "x": 15.25, "y": 0},
                {"label": "K010", "matrix": [0, 16], "x": 16.25, "y": 0},
                {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -308,8 +253,10 @@
                {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -324,8 +271,10 @@
                {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -340,23 +289,26 @@
                {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "K403", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "K408", "matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4},
-                {"label": "K40D", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "K408", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6},
+                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+                {"label": "K40D", "matrix": [4, 13], "x": 13.75, "y": 4},
                {"label": "K40E", "matrix": [4, 14], "x": 15.25, "y": 4},
                {"label": "K410", "matrix": [4, 16], "x": 16.25, "y": 4},
                {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4}
            ]
        },
-        "LAYOUT_split_7u": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
            "layout": [
                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0},
+
                {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -373,8 +325,10 @@
                {"label": "K00F", "matrix": [0, 15], "x": 15.25, "y": 0},
                {"label": "K010", "matrix": [0, 16], "x": 16.25, "y": 0},
                {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -390,8 +344,10 @@
                {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -406,8 +362,10 @@
                {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -422,8 +380,10 @@
                {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
+
                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
                {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
--- a/keyboards/viktus/styrka_topre/keymaps/default/keymap.c
+++ b/keyboards/viktus/styrka_topre/keymaps/default/keymap.c
@@ -17,11 +17,11 @@
 #include QMK_KEYBOARD_H

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_2u_7u(
-        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_DEL,
-        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,
-        KC_F7, KC_F8,   KC_LSFT,          KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,    KC_END,
-        KC_F9, KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                            KC_RCTL,          KC_LEFT, KC_DOWN,  KC_RIGHT
+    [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_DEL,
+        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,
+        KC_F7,   KC_F8,      KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
    )
 };
--- a/keyboards/viktus/styrka_topre/keymaps/via/keymap.c
+++ b/keyboards/viktus/styrka_topre/keymaps/via/keymap.c
@@ -17,11 +17,11 @@
 #include QMK_KEYBOARD_H

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_2u_7u(
-        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_DEL,
-        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,
-        KC_F7, KC_F8,   KC_LSFT,          KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,    KC_END,
-        KC_F9, KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                            KC_RCTL,          KC_LEFT, KC_DOWN,  KC_RIGHT
+    [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_DEL,
+        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,
+        KC_F7,   KC_F8,      KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
    )
 };
--- a/keyboards/viktus/styrka_topre/matrix_diagram.md
+++ b/keyboards/viktus/styrka_topre/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Viktus Design LLC Styrka - Topre
+
+```
+                                                             ┌───────┐
+                                                2u Backspace │0G     │
+                                                             └───────┘
+┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 ││02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │0G │0H │
+├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10 │11 ││12   │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1G   │1H │
+├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20 │21 ││22    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F      │2H │
+├───┼───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30 │31 ││32      │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E    │3G │3H │
+├───┼───┤├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
+│40 │41 ││42   │43 │44   │48                     │4C   │4D │ │4E │4G │4H │
+└───┴───┘└─────┴───┴─────┴───────────────────────┴─────┴───┘ └───┴───┴───┘
+         ┌─────┬───┬─────┬───────────────────────────┬─────┐
+         │42   │43 │44   │48                         │4D   │ Blocker Tsangan
+         └─────┴───┴─────┴───────────────────────────┴─────┘
+```
--- a/keyboards/wolf/neely65/info.json
+++ b/keyboards/wolf/neely65/info.json
@@ -23,86 +23,186 @@
        "pid": "0x0071",
        "vid": "0x5453"
    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs"
+    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan_wkl": {
            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "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 },
-                { "matrix": [2, 14], "x": 16.5, "y": 0 },
-                { "matrix": [0, 16], "x": 17.5, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1 },
-                { "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], "w": 1.5, "x": 16, "y": 1 },
-                { "matrix": [1, 16], "x": 17.5, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2 },
-                { "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, 15], "w": 2.25, "x": 15.25, "y": 2 },
-                { "matrix": [2, 16], "x": 17.5, "y": 2 },
-                { "matrix": [3, 0], "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "w": 2.25, "x": 2.5, "y": 3 },
-                { "matrix": [3, 3], "x": 4.75, "y": 3 },
-                { "matrix": [3, 4], "x": 5.75, "y": 3 },
-                { "matrix": [3, 5], "x": 6.75, "y": 3 },
-                { "matrix": [3, 6], "x": 7.75, "y": 3 },
-                { "matrix": [3, 7], "x": 8.75, "y": 3 },
-                { "matrix": [3, 8], "x": 9.75, "y": 3 },
-                { "matrix": [3, 9], "x": 10.75, "y": 3 },
-                { "matrix": [3, 10], "x": 11.75, "y": 3 },
-                { "matrix": [3, 11], "x": 12.75, "y": 3 },
-                { "matrix": [3, 12], "x": 13.75, "y": 3 },
-                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3 },
-                { "matrix": [3, 15], "x": 16.5, "y": 3 },
-                { "matrix": [3, 16], "x": 17.5, "y": 3 },
-                { "matrix": [4, 0], "x": 0, "y": 4 },
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "matrix": [4, 4], "w": 1.5, "x": 4.75, "y": 4 },
-                { "matrix": [4, 7], "w": 7, "x": 6.25, "y": 4 },
-                { "matrix": [4, 12], "w": 1.5, "x": 13.25, "y": 4 },
-                { "matrix": [4, 14], "x": 15.5, "y": 4 },
-                { "matrix": [4, 15], "x": 16.5, "y": 4 },
-                { "matrix": [4, 16], "x": 17.5, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"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},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"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},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"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, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "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},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 13.25, "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}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"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},
+                {"matrix": [2, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"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},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"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, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "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},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 13.25, "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}
            ]
        }
    }
-}
+}
--- a/keyboards/wolf/neely65/keymaps/default/keymap.c
+++ b/keyboards/wolf/neely65/keymaps/default/keymap.c
@@ -5,19 +5,19 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(
-        QK_GESC, 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_F1, KC_F2,
-        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_F3, KC_F4,
-        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_DEL,  KC_ENT,  KC_PGDN, KC_F5, KC_F6,
-        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_END,  KC_F7, KC_F8,
-        KC_LCTL,       KC_LALT,                   KC_SPC,                                      KC_RALT,          MO(1),   KC_RCTL, KC_APP,  KC_F9, KC_F10
+    [0] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        KC_F1,   KC_F2,      QK_GESC, 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_DEL,  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,
+        KC_F7,   KC_F8,      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_END,
+        KC_F9,   KC_F10,     KC_LCTL,          KC_LALT,                            KC_SPC,                             KC_RALT,          MO(1),   KC_RCTL, KC_APP
    ),

-    [1] = LAYOUT(
-        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_AUDIO_VOL_UP,      KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_DOWN,    KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK,  KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MEDIA_NEXT_TRACK,  KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_AUDIO_MUTE,        KC_TRNS, KC_TRNS
+    [1] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        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_VOLU,
+        KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
+        KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MPRV,
+        KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT,
+        KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
    )
-};
+};
--- a/keyboards/wolf/neely65/keymaps/via/keymap.c
+++ b/keyboards/wolf/neely65/keymaps/via/keymap.c
@@ -5,19 +5,19 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(
-        QK_GESC, 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_F1, KC_F2,
-        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_F3, KC_F4,
-        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_DEL,  KC_ENT,  KC_PGDN, KC_F5, KC_F6,
-        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_END,  KC_F7, KC_F8,
-        KC_LCTL,       KC_LALT,                   KC_SPC,                                      KC_RALT,          MO(1),   KC_RCTL, KC_APP,  KC_F9, KC_F10
+    [0] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        KC_F1,   KC_F2,      QK_GESC, 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_DEL,  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,
+        KC_F7,   KC_F8,      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_END,
+        KC_F9,   KC_F10,     KC_LCTL,          KC_LALT,                            KC_SPC,                             KC_RALT,          MO(1),   KC_RCTL, KC_APP
    ),

-    [1] = LAYOUT(
-        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_AUDIO_VOL_UP,      KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_DOWN,    KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK,  KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MEDIA_NEXT_TRACK,  KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_AUDIO_MUTE,        KC_TRNS, KC_TRNS
+    [1] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        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_VOLU,
+        KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
+        KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MPRV,
+        KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT,
+        KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
    )
-};
+};
--- a/keyboards/wolf/neely65/matrix_diagram.md
+++ b/keyboards/wolf/neely65/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for Neely Neely65
+
+```
+                                                              ┌───────┐
+                                                 2u Backspace │0F     │
+                                                              └───────┘
+┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │ │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │2E │0G │
+├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│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 │2D │2F      │2G │
+├───┼───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30 │31 │ │32      │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E    │3F │3G │
+├───┼───┤ ├─────┬──┼───┴─┬─┴───┴───┴───┴───┴───┴───┴─┬─┴───┼──┬───┼───┼───┤
+│40 │41 │ │42   │  │44   │47                         │4C   │  │4E │4F │4G │
+└───┴───┘ └─────┘  └─────┴───────────────────────────┴─────┘  └───┴───┴───┘
+```
--- a/keyboards/wolf/silhouette/info.json
+++ b/keyboards/wolf/silhouette/info.json
--- a/keyboards/wolf/silhouette/keymaps/default/keymap.c
+++ b/keyboards/wolf/silhouette/keymaps/default/keymap.c
@@ -5,7 +5,7 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
        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_DEL,    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_NUHS, KC_ENT,         
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
    ),

-    [1] = LAYOUT(
+    [1] = LAYOUT_all(
        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_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         
--- a/keyboards/wolf/silhouette/keymaps/via/keymap.c
+++ b/keyboards/wolf/silhouette/keymaps/via/keymap.c
@@ -5,7 +5,7 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
        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_DEL,    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_NUHS, KC_ENT,         
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
    ),

-    [1] = LAYOUT(
+    [1] = LAYOUT_all(
        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_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         
--- a/keyboards/wolf/silhouette/matrix_diagram.md
+++ b/keyboards/wolf/silhouette/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for 4GT Silhouette
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2E ││0E │0F │0G │    │0D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   ││1E │1F │1G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │                │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │    │3F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│40  │41  │42  │47                      │4A  │4B  │4C  │4D  ││4E │4F │4G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │47                         │4B   │4C │4D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
--- a/keyboards/wolf/ziggurat/info.json
+++ b/keyboards/wolf/ziggurat/info.json
@@ -23,89 +23,466 @@
        "pid": "0x0084",
        "vid": "0x5453"
    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [1, 0], "x": 1, "y": 0 },
-                { "matrix": [0, 1], "x": 2.25, "y": 0 },
-                { "matrix": [1, 1], "x": 3.25, "y": 0 },
-                { "matrix": [0, 2], "x": 4.25, "y": 0 },
-                { "matrix": [1, 2], "x": 5.25, "y": 0 },
-                { "matrix": [0, 3], "x": 6.25, "y": 0 },
-                { "matrix": [1, 3], "x": 7.25, "y": 0 },
-                { "matrix": [0, 4], "x": 8.25, "y": 0 },
-                { "matrix": [1, 4], "x": 9.25, "y": 0 },
-                { "matrix": [0, 5], "x": 10.25, "y": 0 },
-                { "matrix": [1, 5], "x": 11.25, "y": 0 },
-                { "matrix": [0, 6], "x": 12.25, "y": 0 },
-                { "matrix": [1, 6], "x": 13.25, "y": 0 },
-                { "matrix": [7, 6], "x": 14.25, "y": 0 },
-                { "matrix": [0, 7], "x": 15.25, "y": 0 },
-                { "matrix": [1, 7], "x": 16.25, "y": 0 },
-                { "matrix": [0, 8], "x": 17.25, "y": 0 },
-                { "matrix": [2, 0], "x": 0, "y": 1 },
-                { "matrix": [3, 0], "x": 1, "y": 1 },
-                { "matrix": [2, 1], "w": 1.5, "x": 2.25, "y": 1 },
-                { "matrix": [3, 1], "x": 3.75, "y": 1 },
-                { "matrix": [2, 2], "x": 4.75, "y": 1 },
-                { "matrix": [3, 2], "x": 5.75, "y": 1 },
-                { "matrix": [2, 3], "x": 6.75, "y": 1 },
-                { "matrix": [3, 3], "x": 7.75, "y": 1 },
-                { "matrix": [2, 4], "x": 8.75, "y": 1 },
-                { "matrix": [3, 4], "x": 9.75, "y": 1 },
-                { "matrix": [2, 5], "x": 10.75, "y": 1 },
-                { "matrix": [3, 5], "x": 11.75, "y": 1 },
-                { "matrix": [2, 6], "x": 12.75, "y": 1 },
-                { "matrix": [3, 6], "x": 13.75, "y": 1 },
-                { "matrix": [2, 7], "x": 14.75, "y": 1 },
-                { "matrix": [3, 7], "w": 1.5, "x": 15.75, "y": 1 },
-                { "matrix": [2, 8], "x": 17.25, "y": 1 },
-                { "matrix": [4, 0], "x": 0, "y": 2 },
-                { "matrix": [5, 0], "x": 1, "y": 2 },
-                { "matrix": [4, 1], "w": 1.75, "x": 2.25, "y": 2 },
-                { "matrix": [5, 1], "x": 4, "y": 2 },
-                { "matrix": [4, 2], "x": 5, "y": 2 },
-                { "matrix": [5, 2], "x": 6, "y": 2 },
-                { "matrix": [4, 3], "x": 7, "y": 2 },
-                { "matrix": [5, 3], "x": 8, "y": 2 },
-                { "matrix": [4, 4], "x": 9, "y": 2 },
-                { "matrix": [5, 4], "x": 10, "y": 2 },
-                { "matrix": [4, 5], "x": 11, "y": 2 },
-                { "matrix": [5, 5], "x": 12, "y": 2 },
-                { "matrix": [4, 6], "x": 13, "y": 2 },
-                { "matrix": [5, 6], "x": 14, "y": 2 },
-                { "matrix": [4, 7], "x": 19, "y": 2 },
-                { "matrix": [5, 7], "w": 2.25, "x": 15, "y": 2 },
-                { "matrix": [4, 8], "x": 17.25, "y": 2 },
-                { "matrix": [6, 0], "x": 0, "y": 3 },
-                { "matrix": [7, 0], "x": 1, "y": 3 },
-                { "matrix": [6, 1], "w": 1.25, "x": 2.25, "y": 3 },
-                { "matrix": [7, 1], "x": 3.5, "y": 3 },
-                { "matrix": [9, 2], "x": 4.5, "y": 3 },
-                { "matrix": [6, 2], "x": 5.5, "y": 3 },
-                { "matrix": [7, 2], "x": 6.5, "y": 3 },
-                { "matrix": [6, 3], "x": 7.5, "y": 3 },
-                { "matrix": [7, 3], "x": 8.5, "y": 3 },
-                { "matrix": [6, 4], "x": 9.5, "y": 3 },
-                { "matrix": [7, 4], "x": 10.5, "y": 3 },
-                { "matrix": [6, 5], "x": 11.5, "y": 3 },
-                { "matrix": [7, 5], "x": 12.5, "y": 3 },
-                { "matrix": [6, 6], "x": 13.5, "y": 3 },
-                { "matrix": [6, 7], "w": 1.75, "x": 14.5, "y": 3 },
-                { "matrix": [7, 7], "x": 16.25, "y": 3 },
-                { "matrix": [6, 8], "x": 17.25, "y": 3 },
-                { "matrix": [8, 0], "x": 0, "y": 4 },
-                { "matrix": [9, 0], "x": 1, "y": 4 },
-                { "matrix": [8, 1], "w": 1.5, "x": 2.25, "y": 4 },
-                { "matrix": [9, 1], "x": 3.75, "y": 4 },
-                { "matrix": [8, 2], "w": 1.5, "x": 4.75, "y": 4 },
-                { "matrix": [8, 4], "w": 7, "x": 6.25, "y": 4 },
-                { "matrix": [8, 6], "w": 1.5, "x": 13.25, "y": 4 },
-                { "matrix": [8, 7], "x": 15.25, "y": 4 },
-                { "matrix": [9, 7], "x": 16.25, "y": 4 },
-                { "matrix": [8, 8], "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2, "w": 1.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_iso_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
            ]
        }
    }
-}
+}
--- a/keyboards/wolf/ziggurat/keymaps/default/keymap.c
+++ b/keyboards/wolf/ziggurat/keymaps/default/keymap.c
@@ -6,7 +6,7 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
        KC_F1, KC_F6,       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_BSPC, KC_HOME,
        KC_F2, KC_F7,       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_F3, KC_F8,       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_NUHS, KC_ENT,  KC_PGDN,
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_F5, KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    ),

-    [1] = LAYOUT(
+    [1] = LAYOUT_all(
        KC_F1, KC_F6,       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_DEL,  _______,
        KC_F2, KC_F7,       _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
        KC_F3, KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
--- a/keyboards/wolf/ziggurat/keymaps/via/keymap.c
+++ b/keyboards/wolf/ziggurat/keymaps/via/keymap.c
@@ -6,7 +6,7 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
        KC_F1, KC_F6,       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_BSPC, KC_HOME,
        KC_F2, KC_F7,       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_F3, KC_F8,       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_NUHS, KC_ENT,  KC_PGDN,
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_F5, KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    ),

-    [1] = LAYOUT(
+    [1] = LAYOUT_all(
        KC_F1, KC_F6,       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_DEL,  _______,
        KC_F2, KC_F7,       _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
        KC_F3, KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
--- a/keyboards/wolf/ziggurat/matrix_diagram.md
+++ b/keyboards/wolf/ziggurat/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Laminar Ziggurat
+
+```
+                                                             ┌───────┐
+                                                2u Backspace │17     │
+                                                             └───────┘
+┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │10 ││01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │76 │07 │17 │08 │
+├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│20 │30 ││21   │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │37   │28 │      │     │
+├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐57  │ ISO Enter
+│40 │50 ││41    │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │57      │48 │   │47 │    │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│60 │70 ││61  │71 │92 │62 │72 │63 │73 │64 │74 │65 │75 │66 │67    │77 │68 │
+├───┼───┤├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+│80 │90 ││81   │91 │82   │84                         │86   │ │87 │97 │88 │
+└───┴───┘└─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
+         ┌────────┐
+         │61      │ 2.25u LShift
+         └────────┘
+```
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
@@ -1,6 +1,7 @@
 // Copyright 2022 Marek Kraus (@gamelaster)
 // SPDX-License-Identifier: GPL-2.0-or-later

+#include "gpio.h"
 #include "hardware/pio.h"
 #include "hardware/clocks.h"
 #include "ps2.h"
Author	SHA1	Message	Date
Dasky	16f2a3e2f8	Add missing gpio include to ps2 vendor (#22063 )	2023-09-18 19:55:51 +01:00
Filip Sund	48b4ce6ddb	Adding support for the Pteron56 (PCB) keyboard (#21731 )	2023-09-18 13:52:48 +01:00
James Young	cd095c817e	Wolf Ziggurat Layout Additions (#22053 ) * Add layout/matrix diagram [docs] * Friendly-format `info.json` [style] * Touch-up layout data Move the ISO Hash key to the main key area. [chore] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_65_xt_ansi_blocker_tsangan` [enhancement] * Add `LAYOUT_65_xt_iso_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_65_xt_iso_blocker_tsangan` [enhancement]	2023-09-17 21:57:03 -07:00
James Young	6ba53f661a	Wolf Silhouette Community Layout Support (#22052 ) * Add layout/matrix diagram [docs] * Friendly-format `info.json` [style] * Touch-up layout data Move the ISO Hash key to the main key area. [chore] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add `LAYOUT_tkl_nofrow_ansi_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_nofrow_ansi` [enhancement] * Add `LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_nofrow_ansi_tsangan` [enhancement] * Add `LAYOUT_tkl_nofrow_ansi_wkl_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_nofrow_ansi_wkl` [enhancement] * Add `LAYOUT_tkl_nofrow_iso_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_nofrow_iso` [enhancement] * Add `LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_nofrow_iso_tsangan` [enhancement] * Add `LAYOUT_tkl_nofrow_iso_wkl_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_nofrow_iso_wkl` [enhancement] * Enable Community Layout support [enhancement]	2023-09-17 21:26:13 -07:00
James Young	25df4ba6bd	Wolf Neely65 Touch-Up (#22045 ) * Add layout/matrix diagram [docs] * Friendly-format `info.json` [style] * Touch-up keymaps - grid-align keycodes - use QMK-native keycode aliases [refactor] * Fix keymaps Fix keycodes being assigned out of order with respect to `info.json`. - move XT function keys to left side - move keycodes for position [2, 14] from Home Row to Number Row [bugfix] * Rename `LAYOUT` to `LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs` [refactor] * Add `LAYOUT_65_xt_ansi_blocker_tsangan_wkl` [enhancement]	2023-09-17 20:50:14 -07:00
James Young	b5181e3d06	Viktus Styrka Topre Layout Standardization and Touch-Up (#22044 ) * Add layout/matrix diagram [docs] * Alias `LAYOUT_all` to `LAYOUT_split_6u` `LAYOUT_all` and `LAYOUT_split_6u` represent the same matrix positions and sequence, so implement the former as an alias. [refactor] * Touch-up keymaps - grid-align keycodes - use QMK-native keycode aliases [chore] * Friendly-format `info.json` [style] * Correct layout data Correct key sizes/positioning on the bottom row. [chore] * Rename `LAYOUT_2u_6u` to `LAYOUT_65_xt_ansi_blocker` [refactor] * Rename `LAYOUT_2u_7u` to `LAYOUT_65_xt_ansi_blocker_tsangan` [refactor] * Rename `LAYOUT_split_6u` to `LAYOUT_65_xt_ansi_blocker_split_bs` [refactor] * Rename `LAYOUT_split_7u` to `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs` [refactor]	2023-09-17 20:17:51 -07:00
Controller Works	6129f5f68b	Add all RGB Matrix Animations to city42 (#21992 )	2023-09-17 11:41:26 -06:00
Moritz Plattner	652c5a9410	geistmaschine/macropod: fix issues waking up after suspend on apple devices (#22023 )	2023-09-17 11:35:29 -06:00
Yak	9f9ad95fb4	Fix paragon encoder pinout for soldered version (#22043 )	2023-09-17 11:32:44 -06:00