Remove oversize binaries (#21976)

This stops a situation where a user could end up flashing oversize firmware soft bricking hardware.

.github/labeler.yml

@@ -40,3 +40,7 @@ translation:
   - docs/ru-ru/**/*
 CI:
   - .github/**/*
+dd:
+  - data/constants/**/*
+  - data/mappings/**/*
+  - data/schemas/**/*

.github/workflows/api.yml

@@ -25,7 +25,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
         persist-credentials: false

.github/workflows/auto_tag.yml

@@ -27,7 +27,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/ci_builds.yml

@@ -33,7 +33,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         ref: ${{ github.event.inputs.branch || github.ref }}

.github/workflows/cli.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 

.github/workflows/develop_update.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 

.github/workflows/feature_branch_update.yml

@@ -21,7 +21,7 @@ jobs:
         - riot
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/format.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/format_push.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/regen.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run qmk generators
       run: |

.github/workflows/regen_push.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run qmk generators
       run: |

.github/workflows/unit_test.yml

@@ -26,7 +26,7 @@ jobs:
     container: ghcr.io/qmk/qmk_cli
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Install dependencies

.gitignore

@@ -95,6 +95,7 @@ secrets.tar
 # Python things
 __pycache__
 .python-version
+.venv
 
 # Prerequisites for updating ChibiOS
 /util/fmpp*

builddefs/common_rules.mk

@@ -392,6 +392,8 @@ check-size:
 	if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \
 		$(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \
 		if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then \
+			$(REMOVE) $(TARGET).$(FIRMWARE_FORMAT); \
+			$(REMOVE) $(BUILD_DIR)/$(TARGET).{hex,bin,uf2}; \
 		    printf "\n * $(MSG_FILE_TOO_BIG)"; $(PRINT_ERROR_PLAIN); \
 		else \
 		    if [ $(FREE_SIZE) -lt $(SIZE_MARGIN) ]; then \

docs/qmk_custom_dark.css

@@ -2,9 +2,13 @@
     background-color: #555;
 }
 
-.markdown-section p.tip,
 .markdown-section tr:nth-child(2n) {
- background-color:#444;
+    background-color:#444;
+}
+
+.markdown-section p.tip {
+    background-color:#555;
+    color:#FFF;
 }
 
 .markdown-section tr {
@@ -16,7 +20,7 @@
 }
 
 .markdown-section p.tip code {
-    background-color: #555;
+    background-color: #333;
     color: #fff;
 }
 

keyboards/1upkeyboards/1upsuper16v3/config.h

@@ -0,0 +1,22 @@
+/* Copyright 2023 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 48
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

keyboards/1upkeyboards/1upsuper16v3/info.json

@@ -0,0 +1,164 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "1upsuper16v3",
+    "maintainer": "ziptyze",
+    "bootloader": "rp2040",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP20", "pin_b": "GP21"},
+            {"pin_a": "GP25", "pin_b": "GP26"},
+            {"pin_a": "GP2", "pin_b": "GP3"},
+            {"pin_a": "GP6", "pin_b": "GP7"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP23", "GP24", "GP4", "GP5"],
+            ["GP19", "GP27", "GP1", "GP8"],
+            ["GP18", "GP28", "GP0", "GP9"],
+            ["GP17", "GP16", "GP15", "GP11"]
+        ]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "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_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"x": 99, "y": 1, "flags": 2},
+            {"x": 70, "y": 1, "flags": 2},
+            {"x": 42, "y": 1, "flags": 2},
+            {"x": 14, "y": 1, "flags": 2},
+            {"x": 4, "y": 4, "flags": 2},
+            {"x": 4, "y": 12, "flags": 2},
+            {"matrix": [0, 0], "x": 28, "y": 8, "flags": 4},
+            {"matrix": [0, 1], "x": 84, "y": 8, "flags": 4},
+            {"x": 4, "y": 20, "flags": 2},
+            {"x": 4, "y": 28, "flags": 2},
+            {"matrix": [1, 0], "x": 28, "y": 24, "flags": 4},
+            {"matrix": [1, 1], "x": 84, "y": 24, "flags": 4},
+            {"x": 4, "y": 36, "flags": 2},
+            {"x": 4, "y": 44, "flags": 2},
+            {"matrix": [2, 0], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [2, 1], "x": 84, "y": 40, "flags": 4},
+            {"x": 4, "y": 52, "flags": 2},
+            {"x": 4, "y": 60, "flags": 2},
+            {"x": 14, "y": 63, "flags": 2},
+            {"matrix": [3, 0], "x": 28, "y": 56, "flags": 4},
+            {"x": 42, "y": 63, "flags": 2},
+            {"x": 70, "y": 63, "flags": 2},
+            {"matrix": [3, 1], "x": 84, "y": 56, "flags": 4},
+            {"x": 99, "y": 63, "flags": 2},
+            {"x": 126, "y": 63, "flags": 2},
+            {"matrix": [3, 2], "x": 140, "y": 56, "flags": 4},
+            {"x": 154, "y": 63, "flags": 2},
+            {"x": 182, "y": 63, "flags": 2},
+            {"matrix": [3, 3], "x": 196, "y": 56, "flags": 4},
+            {"x": 210, "y": 63, "flags": 2},
+            {"x": 220, "y": 60, "flags": 2},
+            {"x": 220, "y": 52, "flags": 2},
+            {"x": 220, "y": 44, "flags": 2},
+            {"matrix": [2, 3], "x": 196, "y": 40, "flags": 4},
+            {"matrix": [2, 2], "x": 140, "y": 40, "flags": 4},
+            {"x": 220, "y": 36, "flags": 2},
+            {"x": 220, "y": 28, "flags": 2},
+            {"matrix": [1, 3], "x": 196, "y": 24, "flags": 4},
+            {"matrix": [1, 2], "x": 140, "y": 24, "flags": 4},
+            {"x": 220, "y": 20, "flags": 2},
+            {"x": 220, "y": 12, "flags": 2},
+            {"matrix": [0, 3], "x": 196, "y": 8, "flags": 4},
+            {"matrix": [0, 2], "x": 140, "y": 8, "flags": 4},
+            {"x": 220, "y": 4, "flags": 2},
+            {"x": 210, "y": 1, "flags": 2},
+            {"x": 182, "y": 1, "flags": 2},
+            {"x": 154, "y": 1, "flags": 2},
+            {"x": 126, "y": 1, "flags": 2}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5610",
+        "vid": "0x6F75"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "community_layouts": ["ortho_4x4"],
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                {"label": "00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "10", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "11", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "20", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "21", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "30", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "31", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "32", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "33", "matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}

keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c

@@ -0,0 +1,39 @@
+/* Copyright 2023 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x4(
+        KC_P7, KC_P8, KC_P9,   KC_PMNS,
+        KC_P4, KC_P5, KC_P6,   KC_PPLS,
+        KC_P1, KC_P2, KC_P3,   KC_PSLS,
+        MO(1), KC_P0, KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+        RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif

keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/1upkeyboards/1upsuper16v3/keymaps/via/keymap.c

@@ -0,0 +1,39 @@
+/* Copyright 2023 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x4(
+        KC_P7, KC_P8, KC_P9,   KC_PMNS,
+        KC_P4, KC_P5, KC_P6,   KC_PPLS,
+        KC_P1, KC_P2, KC_P3,   KC_PSLS,
+        MO(1), KC_P0, KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+        RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif

keyboards/1upkeyboards/1upsuper16v3/keymaps/via/rules.mk

@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes

keyboards/1upkeyboards/1upsuper16v3/readme.md

@@ -0,0 +1,22 @@
+# 1upSuper16v3
+
+This keyboard is the Super16v3 from 1upkeyboards, a 4x4 macropad with the option for up to four encoders in the top row.  Notable features include in-switch per-key addressable RGB LEDs and thirty two 1mm underglow RGB LEDs; for bright and smooth lighting effects. The Super16v3 utilises an rp2040 microcontroller, wired using direct pins.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/1upsuper16v3:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/1upsuper16v3: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 in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix. For this keyboard it is the top left button
+* **Physical reset button**: Hold the button on the back of the PCB and plug in the keyboard

keyboards/abko/ak84bt/info.json

@@ -126,23 +126,27 @@
         "pid": "0x4321",
         "vid": "0x7654"
     },
+    "layout_aliases": {
+        "LAYOUT_75_ansi": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_75_ansi": {
+        "LAYOUT": {
             "layout": [
                 {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-                {"label": "END", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "END", "matrix": [0, 15], "x": 15, "y": 0},
+
                 {"label": "GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
                 {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
                 {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
@@ -157,7 +161,8 @@
                 {"label": "MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
                 {"label": "EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
                 {"label": "BSPC", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"label": "HOME", "matrix": [1, 14], "x": 16.5, "y": 1.25},
+                {"label": "HOME", "matrix": [1, 14], "x": 15, "y": 1.25},
+
                 {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -172,7 +177,8 @@
                 {"label": "LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"label": "RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"label": "BSLS", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "DEL", "matrix": [2, 14], "x": 16.5, "y": 2.25},
+                {"label": "DEL", "matrix": [2, 14], "x": 15, "y": 2.25},
+
                 {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -185,8 +191,9 @@
                 {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"label": "SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"label": "QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "ENT", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-                {"label": "PGUP", "matrix": [3, 14], "x": 16.5, "y": 3.25},
+                {"label": "ENT", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "PGUP", "matrix": [3, 14], "x": 15, "y": 3.25},
+
                 {"label": "LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
@@ -199,18 +206,19 @@
                 {"label": "DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"label": "SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"label": "RSFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "UP", "matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"label": "PGDN", "matrix": [4, 14], "x": 16.5, "y": 4.25},
+                {"label": "UP", "matrix": [4, 13], "x": 14, "y": 4.25},
+                {"label": "PGDN", "matrix": [4, 14], "x": 15, "y": 4.25},
+
                 {"label": "LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"label": "LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"label": "LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
                 {"label": "SPC", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "RALT", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "MO(1)", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "RCTL", "matrix": [5, 11], "x": 13, "y": 5.25, "w": 1.25},
-                {"label": "LEFT", "matrix": [5, 12], "x": 14.25, "y": 5.25},
-                {"label": "DOWN", "matrix": [5, 13], "x": 15.25, "y": 5.25},
-                {"label": "RGHT", "matrix": [5, 14], "x": 16.5, "y": 5.25}
+                {"label": "RALT", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "MO(1)", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "RCTL", "matrix": [5, 11], "x": 12, "y": 5.25},
+                {"label": "LEFT", "matrix": [5, 12], "x": 13, "y": 5.25},
+                {"label": "DOWN", "matrix": [5, 13], "x": 14, "y": 5.25},
+                {"label": "RGHT", "matrix": [5, 14], "x": 15, "y": 5.25}
             ]
         }
     }

keyboards/abko/ak84bt/keymaps/default/keymap.c

@@ -23,7 +23,7 @@ enum layer_names
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  
-    [_BASE] = LAYOUT_75_ansi(    
+    [_BASE] = LAYOUT(    
     KC_ESC,           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_END,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,       KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
     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,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_PGDN,
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                   KC_RALT, MO(_FnLay), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [_FnLay] = LAYOUT_75_ansi(
+    [_FnLay] = LAYOUT(
     QK_BOOT,          KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY,  KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL,          XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,

keyboards/ah/haven65/info.json

@@ -44,8 +44,14 @@
             "twinkle": true
         }
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": [
+        "65_ansi_blocker"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
               { "label": "Esc",             "matrix":[0,0],"x": 0, "y": 0 },
               { "label": "1",               "matrix":[0,1],"x": 1, "y": 0 },

keyboards/ah/haven65/keymaps/default/keymap.c

@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = LAYOUT_65_ansi_blocker(
       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_BACKSPACE,  KC_HOME,
       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_INS,
       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_DEL,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT(
+  [1] = LAYOUT_65_ansi_blocker(
       KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11, KC_F12,  KC_TRNS,  KC_TRNS,
       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,

keyboards/ah/haven65/keymaps/via/keymap.c

@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = LAYOUT_65_ansi_blocker(
       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_BACKSPACE,  KC_HOME,
       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_INS,
       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_DEL,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT(
+  [1] = LAYOUT_65_ansi_blocker(
       KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11, KC_F12,  KC_TRNS,  KC_TRNS,
       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,

keyboards/ah/haven80/hotswap/info.json

@@ -9,8 +9,14 @@
         "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"],
         "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi_tsangan"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
               { "label": "Esc",             "matrix":[0,0],"x": 0, "y": 0 },
               { "label": "F1",              "matrix":[0,1],"x": 1.25, "y": 0 },
@@ -21,90 +27,90 @@
               { "label": "F6",              "matrix":[0,6],"x": 6.5, "y": 0 },
               { "label": "F7",              "matrix":[0,7],"x": 7.5, "y": 0 },
               { "label": "F8",              "matrix":[5,8],"x": 8.5, "y": 0 },
-              { "label": "F9",              "matrix":[5,7],"x": 9.5, "y": 0 },
+              { "label": "F9",              "matrix":[5,7],"x": 9.75, "y": 0 },
               { "label": "F10",             "matrix":[5,6],"x": 10.75, "y": 0 },
               { "label": "F11",             "matrix":[5,5],"x": 11.75, "y": 0 },
               { "label": "F12",             "matrix":[5,4],"x": 12.75, "y": 0 },
-              { "label": "F13",             "matrix":[5,3],"x": 13.75, "y": 0 },
+              { "label": "F13",             "matrix":[5,3],"x": 14, "y": 0 },
               { "label": "Prtsc",           "matrix":[5,2],"x": 15.25, "y": 0 },
               { "label": "Scrlk",           "matrix":[5,1],"x": 16.25, "y": 0 },
               { "label": "Pause",           "matrix":[5,0],"x": 17.25, "y": 0 },
 
-              { "label": "～",              "matrix":[1,0],"x": 0, "y": 1.5 },
-              { "label": "1",               "matrix":[1,1],"x": 1, "y": 1.5 },
-              { "label": "2",               "matrix":[1,2],"x": 2, "y": 1.5 },
-              { "label": "3",               "matrix":[1,3],"x": 3, "y": 1.5 },
-              { "label": "4",               "matrix":[1,4],"x": 4, "y": 1.5 },
-              { "label": "5",               "matrix":[1,5],"x": 5, "y": 1.5 },
-              { "label": "6",               "matrix":[1,6],"x": 6, "y": 1.5 },
-              { "label": "7",               "matrix":[1,7],"x": 7, "y": 1.5 },
-              { "label": "8",               "matrix":[1,8],"x": 8, "y": 1.5 },
-              { "label": "9",               "matrix":[6,8],"x": 9, "y": 1.5 },
-              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.5 },
-              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.5 },
-              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.5 },
-              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
-              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.5 },
-              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.5 },
-              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "y": 1.5 },
+              { "label": "～",              "matrix":[1,0],"x": 0, "y": 1.25 },
+              { "label": "1",               "matrix":[1,1],"x": 1, "y": 1.25 },
+              { "label": "2",               "matrix":[1,2],"x": 2, "y": 1.25 },
+              { "label": "3",               "matrix":[1,3],"x": 3, "y": 1.25 },
+              { "label": "4",               "matrix":[1,4],"x": 4, "y": 1.25 },
+              { "label": "5",               "matrix":[1,5],"x": 5, "y": 1.25 },
+              { "label": "6",               "matrix":[1,6],"x": 6, "y": 1.25 },
+              { "label": "7",               "matrix":[1,7],"x": 7, "y": 1.25 },
+              { "label": "8",               "matrix":[1,8],"x": 8, "y": 1.25 },
+              { "label": "9",               "matrix":[6,8],"x": 9, "y": 1.25 },
+              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.25 },
+              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.25 },
+              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.25 },
+              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.25, "w": 2 },
+              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.25 },
+              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.25 },
+              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "y": 1.25 },
 
-              { "label": "tab",             "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 },
-              { "label": "q",               "matrix":[2,1],"x": 1.5, "y": 2.5 },
-              { "label": "w",               "matrix":[2,2],"x": 2.5, "y": 2.5 },
-              { "label": "e",               "matrix":[2,3],"x": 3.5, "y": 2.5 },
-              { "label": "r",               "matrix":[2,4],"x": 4.5, "y": 2.5 },
-              { "label": "t",               "matrix":[2,5],"x": 5.5, "y": 2.5 },
-              { "label": "y",               "matrix":[2,6],"x": 6.5, "y": 2.5 },
-              { "label": "u",               "matrix":[2,7],"x": 7.5, "y": 2.5 },
-              { "label": "i",               "matrix":[2,8],"x": 8.5, "y": 2.5 },
-              { "label": "o",               "matrix":[7,8],"x": 9.5, "y": 2.5 },
-              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.5 },
-              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.5 },
-              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.5 },
-              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
-              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.5 },
-              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.5 },
-              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.5 },
+              { "label": "tab",             "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 },
+              { "label": "q",               "matrix":[2,1],"x": 1.5, "y": 2.25 },
+              { "label": "w",               "matrix":[2,2],"x": 2.5, "y": 2.25 },
+              { "label": "e",               "matrix":[2,3],"x": 3.5, "y": 2.25 },
+              { "label": "r",               "matrix":[2,4],"x": 4.5, "y": 2.25 },
+              { "label": "t",               "matrix":[2,5],"x": 5.5, "y": 2.25 },
+              { "label": "y",               "matrix":[2,6],"x": 6.5, "y": 2.25 },
+              { "label": "u",               "matrix":[2,7],"x": 7.5, "y": 2.25 },
+              { "label": "i",               "matrix":[2,8],"x": 8.5, "y": 2.25 },
+              { "label": "o",               "matrix":[7,8],"x": 9.5, "y": 2.25 },
+              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.25 },
+              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.25 },
+              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.25 },
+              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.25, "w": 1.5 },
+              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.25 },
+              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.25 },
+              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.25 },
 
-              { "label": "capslock",        "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 },
-              { "label": "a",               "matrix":[3,1],"x": 1.75, "y": 3.5 },
-              { "label": "s",               "matrix":[3,2],"x": 2.75, "y": 3.5 },
-              { "label": "d",               "matrix":[3,3],"x": 3.75, "y": 3.5 },
-              { "label": "f",               "matrix":[3,4],"x": 4.75, "y": 3.5 },
-              { "label": "g",               "matrix":[3,5],"x": 5.75, "y": 3.5 },
-              { "label": "h",               "matrix":[3,6],"x": 6.75, "y": 3.5 },
-              { "label": "j",               "matrix":[3,7],"x": 7.75, "y": 3.5 },
-              { "label": "k",               "matrix":[3,8],"x": 8.75, "y": 3.5 },
-              { "label": "l",               "matrix":[8,8],"x": 9.75, "y": 3.5 },
-              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.5 },
-              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.5 },
-              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
+              { "label": "capslock",        "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 },
+              { "label": "a",               "matrix":[3,1],"x": 1.75, "y": 3.25 },
+              { "label": "s",               "matrix":[3,2],"x": 2.75, "y": 3.25 },
+              { "label": "d",               "matrix":[3,3],"x": 3.75, "y": 3.25 },
+              { "label": "f",               "matrix":[3,4],"x": 4.75, "y": 3.25 },
+              { "label": "g",               "matrix":[3,5],"x": 5.75, "y": 3.25 },
+              { "label": "h",               "matrix":[3,6],"x": 6.75, "y": 3.25 },
+              { "label": "j",               "matrix":[3,7],"x": 7.75, "y": 3.25 },
+              { "label": "k",               "matrix":[3,8],"x": 8.75, "y": 3.25 },
+              { "label": "l",               "matrix":[8,8],"x": 9.75, "y": 3.25 },
+              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.25 },
+              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.25 },
+              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.25, "w": 2.25 },
 
-              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
-              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.5 },
-              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.5 },
-              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.5 },
-              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.5 },
-              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.5 },
-              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.5 },
-              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.5 },
-              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.5 },
-              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.5 },
-              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.5 },
-              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
-              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.5 },
+              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.25, "w": 2.25 },
+              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.25 },
+              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.25 },
+              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.25 },
+              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.25 },
+              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.25 },
+              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.25 },
+              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.25 },
+              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.25 },
+              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.25 },
+              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.25 },
+              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.25, "w": 2.75 },
+              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.25 },
 
-              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
-              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.5 },
-              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
-              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
-              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
-              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
-              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
-              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.5 },
-              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.5 },
-              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.5 }
+              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.25, "w": 1.5 },
+              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.25 },
+              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
+              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
+              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
+              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
+              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
+              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.25 },
+              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.25 },
+              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.25 }
            ]
         }
-    },
+    }
 }

keyboards/ah/haven80/keymaps/default/keymap.c

@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = LAYOUT_tkl_f13_ansi_tsangan(
       KC_ESC,  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_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,

keyboards/ah/haven80/keymaps/via/keymap.c

@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = LAYOUT_tkl_f13_ansi_tsangan(
       KC_ESC,  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_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,

keyboards/ah/haven80/solder/info.json

@@ -9,8 +9,17 @@
         "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"],
         "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_iso_tsangan",
+        "tkl_f13_iso_tsangan_split_bs_rshift"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
               { "label": "Esc",             "matrix":[0,0],"x": 0, "y": 0 },
               { "label": "F1",              "matrix":[0,1],"x": 1.25, "y": 0 },
@@ -21,90 +30,384 @@
               { "label": "F6",              "matrix":[0,6],"x": 6.5, "y": 0 },
               { "label": "F7",              "matrix":[0,7],"x": 7.5, "y": 0 },
               { "label": "F8",              "matrix":[5,8],"x": 8.5, "y": 0 },
-              { "label": "F9",              "matrix":[5,7],"x": 9.5, "y": 0 },
+              { "label": "F9",              "matrix":[5,7],"x": 9.75, "y": 0 },
               { "label": "F10",             "matrix":[5,6],"x": 10.75, "y": 0 },
               { "label": "F11",             "matrix":[5,5],"x": 11.75, "y": 0 },
               { "label": "F12",             "matrix":[5,4],"x": 12.75, "y": 0 },
-              { "label": "F13",             "matrix":[5,3],"x": 13.75, "y": 0 },
+              { "label": "F13",             "matrix":[5,3],"x": 14, "y": 0 },
               { "label": "Prtsc",           "matrix":[5,2],"x": 15.25, "y": 0 },
               { "label": "Scrlk",           "matrix":[5,1],"x": 16.25, "y": 0 },
               { "label": "Pause",           "matrix":[5,0],"x": 17.25, "y": 0 },
 
-              { "label": "～",              "matrix":[1,0],"x": 0, "y": 1.5 },
-              { "label": "1",               "matrix":[1,1],"x": 1, "y": 1.5 },
-              { "label": "2",               "matrix":[1,2],"x": 2, "y": 1.5 },
-              { "label": "3",               "matrix":[1,3],"x": 3, "y": 1.5 },
-              { "label": "4",               "matrix":[1,4],"x": 4, "y": 1.5 },
-              { "label": "5",               "matrix":[1,5],"x": 5, "y": 1.5 },
-              { "label": "6",               "matrix":[1,6],"x": 6, "y": 1.5 },
-              { "label": "7",               "matrix":[1,7],"x": 7, "y": 1.5 },
-              { "label": "8",               "matrix":[1,8],"x": 8, "y": 1.5 },
-              { "label": "9",               "matrix":[6,8],"x": 9, "y": 1.5 },
-              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.5 },
-              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.5 },
-              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.5 },
-              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
-              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.5 },
-              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.5 },
-              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "y": 1.5 },
+              { "label": "～",              "matrix":[1,0],"x": 0, "y": 1.25 },
+              { "label": "1",               "matrix":[1,1],"x": 1, "y": 1.25 },
+              { "label": "2",               "matrix":[1,2],"x": 2, "y": 1.25 },
+              { "label": "3",               "matrix":[1,3],"x": 3, "y": 1.25 },
+              { "label": "4",               "matrix":[1,4],"x": 4, "y": 1.25 },
+              { "label": "5",               "matrix":[1,5],"x": 5, "y": 1.25 },
+              { "label": "6",               "matrix":[1,6],"x": 6, "y": 1.25 },
+              { "label": "7",               "matrix":[1,7],"x": 7, "y": 1.25 },
+              { "label": "8",               "matrix":[1,8],"x": 8, "y": 1.25 },
+              { "label": "9",               "matrix":[6,8],"x": 9, "y": 1.25 },
+              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.25 },
+              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.25 },
+              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.25 },
+              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.25, "w": 2 },
+              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.25 },
+              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.25 },
+              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "y": 1.25 },
 
-              { "label": "tab",             "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 },
-              { "label": "q",               "matrix":[2,1],"x": 1.5, "y": 2.5 },
-              { "label": "w",               "matrix":[2,2],"x": 2.5, "y": 2.5 },
-              { "label": "e",               "matrix":[2,3],"x": 3.5, "y": 2.5 },
-              { "label": "r",               "matrix":[2,4],"x": 4.5, "y": 2.5 },
-              { "label": "t",               "matrix":[2,5],"x": 5.5, "y": 2.5 },
-              { "label": "y",               "matrix":[2,6],"x": 6.5, "y": 2.5 },
-              { "label": "u",               "matrix":[2,7],"x": 7.5, "y": 2.5 },
-              { "label": "i",               "matrix":[2,8],"x": 8.5, "y": 2.5 },
-              { "label": "o",               "matrix":[7,8],"x": 9.5, "y": 2.5 },
-              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.5 },
-              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.5 },
-              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.5 },
-              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
-              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.5 },
-              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.5 },
-              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.5 },
+              { "label": "tab",             "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 },
+              { "label": "q",               "matrix":[2,1],"x": 1.5, "y": 2.25 },
+              { "label": "w",               "matrix":[2,2],"x": 2.5, "y": 2.25 },
+              { "label": "e",               "matrix":[2,3],"x": 3.5, "y": 2.25 },
+              { "label": "r",               "matrix":[2,4],"x": 4.5, "y": 2.25 },
+              { "label": "t",               "matrix":[2,5],"x": 5.5, "y": 2.25 },
+              { "label": "y",               "matrix":[2,6],"x": 6.5, "y": 2.25 },
+              { "label": "u",               "matrix":[2,7],"x": 7.5, "y": 2.25 },
+              { "label": "i",               "matrix":[2,8],"x": 8.5, "y": 2.25 },
+              { "label": "o",               "matrix":[7,8],"x": 9.5, "y": 2.25 },
+              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.25 },
+              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.25 },
+              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.25 },
+              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.25, "w": 1.5 },
+              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.25 },
+              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.25 },
+              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.25 },
 
-              { "label": "capslock",        "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 },
-              { "label": "a",               "matrix":[3,1],"x": 1.75, "y": 3.5 },
-              { "label": "s",               "matrix":[3,2],"x": 2.75, "y": 3.5 },
-              { "label": "d",               "matrix":[3,3],"x": 3.75, "y": 3.5 },
-              { "label": "f",               "matrix":[3,4],"x": 4.75, "y": 3.5 },
-              { "label": "g",               "matrix":[3,5],"x": 5.75, "y": 3.5 },
-              { "label": "h",               "matrix":[3,6],"x": 6.75, "y": 3.5 },
-              { "label": "j",               "matrix":[3,7],"x": 7.75, "y": 3.5 },
-              { "label": "k",               "matrix":[3,8],"x": 8.75, "y": 3.5 },
-              { "label": "l",               "matrix":[8,8],"x": 9.75, "y": 3.5 },
-              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.5 },
-              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.5 },
-              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
+              { "label": "capslock",        "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 },
+              { "label": "a",               "matrix":[3,1],"x": 1.75, "y": 3.25 },
+              { "label": "s",               "matrix":[3,2],"x": 2.75, "y": 3.25 },
+              { "label": "d",               "matrix":[3,3],"x": 3.75, "y": 3.25 },
+              { "label": "f",               "matrix":[3,4],"x": 4.75, "y": 3.25 },
+              { "label": "g",               "matrix":[3,5],"x": 5.75, "y": 3.25 },
+              { "label": "h",               "matrix":[3,6],"x": 6.75, "y": 3.25 },
+              { "label": "j",               "matrix":[3,7],"x": 7.75, "y": 3.25 },
+              { "label": "k",               "matrix":[3,8],"x": 8.75, "y": 3.25 },
+              { "label": "l",               "matrix":[8,8],"x": 9.75, "y": 3.25 },
+              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.25 },
+              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.25 },
+              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.25, "w": 2.25 },
 
-              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
-              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.5 },
-              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.5 },
-              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.5 },
-              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.5 },
-              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.5 },
-              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.5 },
-              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.5 },
-              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.5 },
-              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.5 },
-              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.5 },
-              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
-              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.5 },
+              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.25, "w": 2.25 },
+              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.25 },
+              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.25 },
+              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.25 },
+              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.25 },
+              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.25 },
+              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.25 },
+              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.25 },
+              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.25 },
+              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.25 },
+              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.25 },
+              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.25, "w": 2.75 },
+              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.25 },
 
-              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
-              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.5 },
-              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
-              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
-              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
-              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
-              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
-              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.5 },
-              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.5 },
-              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.5 }
+              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.25, "w": 1.5 },
+              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.25 },
+              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
+              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
+              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
+              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
+              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
+              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.25 },
+              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.25 },
+              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.25 }
            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [5, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [5, 7], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 6], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 5], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 4], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 2], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 1], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [6, 8], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 3], "x": 14, "y": 1.25},
+                {"label": "insert", "matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"label": "home", "matrix": [6, 1], "x": 16.25, "y": 1.25},
+                {"label": "pg up", "matrix": [6, 0], "x": 17.25, "y": 1.25},
+
+                {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "o", "matrix": [7, 8], "x": 9.5, "y": 2.25},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"label": "|", "matrix": [7, 4], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "delete", "matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"label": "end", "matrix": [7, 1], "x": 16.25, "y": 2.25},
+                {"label": "pg dn", "matrix": [7, 0], "x": 17.25, "y": 2.25},
+
+                {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "l", "matrix": [8, 8], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.25},
+                {"label": "enter", "matrix": [8, 5], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "x", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "c", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "v", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "b", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "n", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "m", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [9, 8], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [9, 7], "x": 11.25, "y": 4.25},
+                {"label": "rightshift", "matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "rightshift", "matrix": [9, 5], "x": 14, "y": 4.25},
+                {"label": "up", "matrix": [8, 1], "x": 16.25, "y": 4.25},
+
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"label": "ralt", "matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "left", "matrix": [9, 2], "x": 15.25, "y": 5.25},
+                {"label": "down", "matrix": [9, 1], "x": 16.25, "y": 5.25},
+                {"label": "right", "matrix": [9, 0], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [5, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [5, 7], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 6], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 5], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 4], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 2], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 1], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [6, 8], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.25, "w": 2},
+                {"label": "insert", "matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"label": "home", "matrix": [6, 1], "x": 16.25, "y": 1.25},
+                {"label": "pg up", "matrix": [6, 0], "x": 17.25, "y": 1.25},
+
+                {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "o", "matrix": [7, 8], "x": 9.5, "y": 2.25},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"label": "delete", "matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"label": "end", "matrix": [7, 1], "x": 16.25, "y": 2.25},
+                {"label": "pg dn", "matrix": [7, 0], "x": 17.25, "y": 2.25},
+
+                {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "l", "matrix": [8, 8], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [7, 4], "x": 12.75, "y": 3.25},
+                {"label": "enter", "matrix": [8, 5], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [9, 3], "x": 1.25, "y": 4.25},
+                {"label": "z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "x", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "c", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "v", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "b", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "n", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "m", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [9, 8], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [9, 7], "x": 11.25, "y": 4.25},
+                {"label": "rightshift", "matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "up", "matrix": [8, 1], "x": 16.25, "y": 4.25},
+
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"label": "ralt", "matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "left", "matrix": [9, 2], "x": 15.25, "y": 5.25},
+                {"label": "down", "matrix": [9, 1], "x": 16.25, "y": 5.25},
+                {"label": "right", "matrix": [9, 0], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [5, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [5, 7], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 6], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 5], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 4], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 2], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 1], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [6, 8], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 3], "x": 14, "y": 1.25},
+                {"label": "insert", "matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"label": "home", "matrix": [6, 1], "x": 16.25, "y": 1.25},
+                {"label": "pg up", "matrix": [6, 0], "x": 17.25, "y": 1.25},
+
+                {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "o", "matrix": [7, 8], "x": 9.5, "y": 2.25},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"label": "delete", "matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"label": "end", "matrix": [7, 1], "x": 16.25, "y": 2.25},
+                {"label": "pg dn", "matrix": [7, 0], "x": 17.25, "y": 2.25},
+
+                {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "l", "matrix": [8, 8], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [7, 4], "x": 12.75, "y": 3.25},
+                {"label": "enter", "matrix": [8, 5], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [9, 3], "x": 1.25, "y": 4.25},
+                {"label": "z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "x", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "c", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "v", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "b", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "n", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "m", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [9, 8], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [9, 7], "x": 11.25, "y": 4.25},
+                {"label": "rightshift", "matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "rightshift", "matrix": [9, 5], "x": 14, "y": 4.25},
+                {"label": "up", "matrix": [8, 1], "x": 16.25, "y": 4.25},
+
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"label": "ralt", "matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "left", "matrix": [9, 2], "x": 15.25, "y": 5.25},
+                {"label": "down", "matrix": [9, 1], "x": 16.25, "y": 5.25},
+                {"label": "right", "matrix": [9, 0], "x": 17.25, "y": 5.25}
+            ]
         }
-    },
+    }
 }

keyboards/alpine65/readme.md

@@ -4,7 +4,7 @@
 
 This is the QMK firmware repository for the Alpine65, a 65% hotswap keyboard designed by Bitmap Designs and Gondolindrim.
 
-The Alpine65 has entered GB and sucessfully finalized in november 2020; there is no further way to buy an Alpine65 other than the secondhand market. The IC page for the keyboard can be found [here](https://https://geekhack.org/index.php?topic=106974).
+The Alpine65 has entered GB and sucessfully finalized in november 2020; there is no further way to buy an Alpine65 other than the secondhand market. The IC page for the keyboard can be found [here](https://geekhack.org/index.php?topic=106974).
 
 ## How to compile
 

keyboards/anavi/macropad12/info.json

@@ -43,8 +43,11 @@
     "backlight": {
         "pin": "GP26"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x3"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},

keyboards/anavi/macropad12/keymaps/default/keymap.c

@@ -8,7 +8,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_ortho_4x3(
         KC_1, KC_2, KC_3,
         KC_4, KC_5, KC_6,
         KC_7, KC_8, KC_9,

keyboards/binepad/pixie/config.h

@@ -0,0 +1,6 @@
+// Copyright 2023 binepad (@binepad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3  // enable 1:1 resolution

keyboards/binepad/pixie/info.json

@@ -0,0 +1,49 @@
+{
+    "manufacturer": "binepad",
+    "keyboard_name": "PIXIE",
+    "url": "http://binepad.com",
+    "maintainer": "binepad",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "usb": {
+        "vid": "0x4249",
+        "pid": "0x5078",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["GP19", "GP4"],
+        "rows": ["GP28", "GP5"]
+    },
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "GP18",
+                "pin_b": "GP17"
+            },
+            {
+                "pin_a": "GP20",
+                "pin_b": "GP21"
+            }
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 1.25 }
+            ]
+        }
+    }
+}

keyboards/binepad/pixie/keymaps/default/keymap.c

@@ -0,0 +1,22 @@
+// Copyright 2023 Binepad (@binpad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_MUTE, KC_MPLY,
+        KC_MPRV, KC_MNXT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {
+        ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
+        ENCODER_CCW_CW(KC_WH_U, KC_WH_D)
+    }
+};
+
+#endif

keyboards/binepad/pixie/keymaps/default/rules.mk

@@ -0,0 +1,2 @@
+
+ENCODER_MAP_ENABLE = yes

keyboards/binepad/pixie/keymaps/via/keymap.c

@@ -0,0 +1,22 @@
+// Copyright 2023 Binepad (@binpad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_MUTE, KC_MPLY,
+        KC_MPRV, KC_MNXT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {
+        ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
+        ENCODER_CCW_CW(KC_WH_U, KC_WH_D)
+    }
+};
+
+#endif

keyboards/binepad/pixie/keymaps/via/rules.mk

@@ -0,0 +1,3 @@
+
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

keyboards/binepad/pixie/readme.md

@@ -0,0 +1,27 @@
+# BINEPAD PIXIE
+
+![BINEPAD PIXIE](https://i.imgur.com/OnQnkdUh.jpeg)
+
+*A 2x2 macropad with 2x rotary encoders*
+
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported: BINPAD PIXIE
+* Hardware Availability: [binepad.com](https://www.binepad.com/pixie)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make binepad/pixie:default
+
+Flashing example for this keyboard:
+
+    make binepad/pixie: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 in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (010) in the matrix (the bottom left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the PCB button located on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` or `RESET` if it is available

keyboards/binepad/pixie/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank

keyboards/cannonkeys/bastion60/info.json

@@ -49,7 +49,16 @@
         "driver": "vendor",
         "pin": "GP7"
     },
-    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso_tsangan"],
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
@@ -183,6 +192,354 @@
                 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
         "LAYOUT_60_iso_tsangan": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -212,7 +569,6 @@
                 {"matrix": [1, 10], "x": 10.5, "y": 1},
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -226,6 +582,7 @@
                 {"matrix": [2, 10], "x": 10.75, "y": 2},
                 {"matrix": [2, 11], "x": 11.75, "y": 2},
                 {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3},
                 {"matrix": [3, 2], "x": 2.25, "y": 3},
@@ -248,6 +605,77 @@
                 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},

keyboards/cannonkeys/bastion60/matrix_diagram.md

@@ -0,0 +1,24 @@
+# Matrix Diagram for CannonKeys Bastion60
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```

keyboards/cannonkeys/bastion65/info.json

@@ -49,8 +49,21 @@
         "driver": "vendor",
         "pin": "GP7"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -124,6 +137,610 @@
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 14], "x": 15, "y": 4}
             ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }

keyboards/cannonkeys/bastion65/keymaps/default/keymap.c

@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_BASE] = LAYOUT_all(
     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_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_END,
     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_PGUP,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     QK_GESC, 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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,

keyboards/cannonkeys/bastion65/keymaps/via/keymap.c

@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_BASE] = LAYOUT_all(
     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_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_END,
     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_PGUP,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     QK_GESC, 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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,

keyboards/cannonkeys/bastion65/matrix_diagram.md

@@ -0,0 +1,27 @@
+# Matrix Diagram for CannonKeys Bastion65
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+│40   │41 │42   │45         │46 │49         │4B   │ │4C │4D │4E │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┘ └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│40  │41  │42  │46                      │4A  │4B  │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+```

keyboards/cannonkeys/bastion75/info.json

@@ -49,8 +49,11 @@
             "rainbow_swirl": true
         }
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 1], "x": 1.5, "y": 0 },
@@ -138,6 +141,730 @@
                 { "matrix": [5, 13], "x": 14, "y": 5.25 },
                 { "matrix": [5, 14], "x": 15, "y": 5.25 }
             ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "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": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
         }
     }
-}
+}

keyboards/cannonkeys/bastion75/keymaps/default/keymap.c

@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_BASE] = LAYOUT_all(
     KC_ESC,  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_MPLY,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL, KC_HOME,
     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_END,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     QK_GESC, 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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

keyboards/cannonkeys/bastion75/keymaps/via/keymap.c

@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_BASE] = LAYOUT_all(
     KC_ESC,  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_MPLY,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL, KC_HOME,
     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_END,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     QK_GESC, 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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

keyboards/cannonkeys/bastion75/matrix_diagram.md

@@ -0,0 +1,27 @@
+# Matrix Diagram for CannonKeys Bastion75
+
+```
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+│00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │1E │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐3D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │3E │   │2D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+│50   │51 │52   │55         │56 │59         │5B   │ │5C │5D │5E │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┘ └───┴───┴───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│50   │51 │52   │56                         │5B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│50  │51  │52  │56                      │5A  │5B  │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+```

keyboards/cannonkeys/bastiontkl/matrix_diagram.md

@@ -0,0 +1,27 @@
+# Matrix Diagram for CannonKeys BastionTKL
+
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │ F12 Row
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C ││1E │1F │1G │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐3D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                │2D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```

keyboards/cannonkeys/meetuppad2023/info.json

@@ -0,0 +1,40 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Meetup Pad 2023",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B0"],
+        "rows": ["B1", "A7"]
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x2023",
+        "vid": "0xCA04"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 0, "y": 2},
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [1, 3], "x": 0, "y": 3},
+                {"matrix": [0, 3], "x": 1, "y": 3}
+            ]
+        }
+    }
+}

keyboards/cannonkeys/meetuppad2023/keymaps/default/keymap.c

@@ -0,0 +1,20 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_1, KC_2,
+    KC_3, KC_4,
+    KC_5, KC_6,
+    KC_7, MO(1)
+  ),
+
+  [1] = LAYOUT(
+    QK_BOOT, KC_8,
+    KC_9, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  )
+};

keyboards/cannonkeys/meetuppad2023/keymaps/via/keymap.c

@@ -0,0 +1,35 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    MYMACRO = QK_KB_0,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    MYMACRO, KC_1,
+    KC_2, KC_3,
+    KC_4, KC_5,
+    KC_6, MO(1)
+  ),
+
+  [1] = LAYOUT(
+    QK_BOOT, KC_7,
+    KC_8, KC_9,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    case MYMACRO:
+        if (record->event.pressed) {
+            SEND_STRING("I went to the CannonKeys 2023 meetup and all I got was this macropad");
+        }
+        break;
+    }
+    return true;
+};

keyboards/cannonkeys/meetuppad2023/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/cannonkeys/meetuppad2023/readme.md

@@ -0,0 +1,18 @@
+# CannonKeys Meetup Pad 2023
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/meetuppad2023:default
+
+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 in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top right on this board) and plug in the keyboard
+* **Physical reset button**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/cannonkeys/meetuppad2023/rules.mk

@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

keyboards/chosfox/cf81/info.json

@@ -252,7 +252,7 @@
                 { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
                 { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
 
                 { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@@ -261,9 +261,9 @@
                 { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 },
                 { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 },
-                { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 },
-                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 },
-                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 }
+                { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
             ]
         }
     }

keyboards/chosfox/cf81/keymaps/default/keymap.c

@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },

keyboards/chosfox/cf81/keymaps/via/keymap.c

@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },

keyboards/cipulot/ec_theca/info.json

@@ -23,98 +23,15 @@
         },
         "vid": "0x6369"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi",
+        "LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
+    },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_tsangan"
+    ],
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
-                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label": "5,1", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label": "5,2", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label": "5,5", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "5,10", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label": "5,11", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label": "5,12", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label": "5,13", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
-            ]
-        },
         "LAYOUT_tkl_ansi": {
             "layout": [
                 { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
@@ -296,7 +213,7 @@
                 { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_tkl_ansi_tsangan_wkl": {
+        "LAYOUT_tkl_ansi_wkl": {
             "layout": [
                 { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
                 { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },

keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c

@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
-    [0] = LAYOUT_tkl_ansi_tsangan_wkl(
+    [0] = LAYOUT_tkl_ansi_wkl(
     KC_ESC,   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_PSCR,  KC_SCRL,   KC_PAUS,
     KC_GRV,   KC_1,     KC_2,     KC_3,   KC_4,   KC_5,    KC_6,   KC_7,   KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,    KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,
     KC_TAB,   KC_Q,     KC_W,     KC_E,   KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,   KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LCTL,            KC_LALT,                  KC_SPC,                                      KC_RALT,            KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
-    [1] = LAYOUT_tkl_ansi_tsangan_wkl(
+    [1] = LAYOUT_tkl_ansi_wkl(
     QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,

keyboards/custommk/evo70_r2/info.json

@@ -59,88 +59,256 @@
         "levels": 17,
         "pin": "A6"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"Encoder", "matrix": [1, 0], "x":0.5, "y":0},
-                {"label":"Esc", "matrix": [0, 0], "x":2.5, "y":0},
-                {"label":"1", "matrix": [0, 2], "x":3.5, "y":0},
-                {"label":"2", "matrix": [0, 3], "x":4.5, "y":0},
-                {"label":"3", "matrix": [0, 4], "x":5.5, "y":0},
-                {"label":"4", "matrix": [0, 5], "x":6.5, "y":0},
-                {"label":"5", "matrix": [0, 6], "x":7.5, "y":0},
-                {"label":"6", "matrix": [0, 7], "x":8.5, "y":0},
-                {"label":"7", "matrix": [0, 8], "x":9.5, "y":0},
-                {"label":"8", "matrix": [0, 9], "x":10.5, "y":0},
-                {"label":"9", "matrix": [0, 10], "x":11.5, "y":0},
-                {"label":"0", "matrix": [0, 11], "x":12.5, "y":0},
-                {"label":"-", "matrix": [0, 12], "x":13.5, "y":0},
-                {"label":"=", "matrix": [0, 13], "x":14.5, "y":0},
-                {"label":"Backspace", "matrix": [0, 14], "x":15.5, "y":0, "w":2},
-                {"label":"Delete", "matrix": [0, 15], "x":17.5, "y":0},
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
 
-                {"label":"Tab", "matrix": [1, 1], "x":2.5, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 2], "x":4, "y":1},
-                {"label":"W", "matrix": [1, 3], "x":5, "y":1},
-                {"label":"E", "matrix": [1, 4], "x":6, "y":1},
-                {"label":"R", "matrix": [1, 5], "x":7, "y":1},
-                {"label":"T", "matrix": [1, 6], "x":8, "y":1},
-                {"label":"Y", "matrix": [1, 7], "x":9, "y":1},
-                {"label":"U", "matrix": [1, 8], "x":10, "y":1},
-                {"label":"I", "matrix": [1, 9], "x":11, "y":1},
-                {"label":"O", "matrix": [1, 10], "x":12, "y":1},
-                {"label":"P", "matrix": [1, 11], "x":13, "y":1},
-                {"label":"[", "matrix": [1, 12], "x":14, "y":1},
-                {"label":"]", "matrix": [1, 13], "x":15, "y":1},
-                {"label":"\\", "matrix": [1, 14], "x":16, "y":1, "w":1.5},
-                {"label":"PgUp", "matrix": [1, 15], "x":17.5, "y":1},
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
 
-                {"label":"F1", "matrix": [2, 2], "x":0, "y":2},
-                {"label":"F2", "matrix": [2, 0], "x":1, "y":2},
-                {"label":"Caps Lock", "matrix": [2, 1], "x":2.5, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 3], "x":4.25, "y":2},
-                {"label":"S", "matrix": [2, 4], "x":5.25, "y":2},
-                {"label":"D", "matrix": [2, 5], "x":6.25, "y":2},
-                {"label":"F", "matrix": [2, 6], "x":7.25, "y":2},
-                {"label":"G", "matrix": [2, 7], "x":8.25, "y":2},
-                {"label":"H", "matrix": [2, 8], "x":9.25, "y":2},
-                {"label":"J", "matrix": [2, 9], "x":10.25, "y":2},
-                {"label":"K", "matrix": [2, 10], "x":11.25, "y":2},
-                {"label":"L", "matrix": [2, 11], "x":12.25, "y":2},
-                {"label":";", "matrix": [2, 12], "x":13.25, "y":2},
-                {"label":"'", "matrix": [2, 13], "x":14.25, "y":2},
-                {"label":"Enter", "matrix": [2, 14], "x":15.25, "y":2, "w":2.25},
-                {"label":"PgDn", "matrix": [2, 15], "x":17.5, "y":2},
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
 
-                {"label":"F3", "matrix": [3, 1], "x":0, "y":3},
-                {"label":"F4", "matrix": [3, 0], "x":1, "y":3},
-                {"label":"Shift", "matrix": [3, 2], "x":2.5, "y":3, "w":1.25},
-                {"label":"\u2298", "matrix": [0, 1], "x":3.75, "y":3, "w":1},
-                {"label":"Z", "matrix": [3, 3], "x":4.75, "y":3},
-                {"label":"X", "matrix": [3, 4], "x":5.75, "y":3},
-                {"label":"C", "matrix": [3, 5], "x":6.75, "y":3},
-                {"label":"V", "matrix": [3, 6], "x":7.75, "y":3},
-                {"label":"B", "matrix": [3, 7], "x":8.75, "y":3},
-                {"label":"N", "matrix": [3, 8], "x":9.75, "y":3},
-                {"label":"M", "matrix": [3, 9], "x":10.75, "y":3},
-                {"label":",", "matrix": [3, 10], "x":11.75, "y":3},
-                {"label":".", "matrix": [3, 11], "x":12.75, "y":3},
-                {"label":"/", "matrix": [3, 12], "x":13.75, "y":3},
-                {"label":"Shift", "matrix": [3, 13], "x":14.75, "y":3, "w":1.75},
-                {"label":"Up", "matrix": [3, 14], "x":16.5, "y":3},
-                {"label":"End", "matrix": [3, 15], "x":17.5, "y":3},
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
 
-                {"label":"F5", "matrix": [4, 3], "x":0, "y":4},
-                {"label":"F6", "matrix": [4, 0], "x":1, "y":4},
-                {"label":"Ctrl", "matrix": [4, 1], "x":2.5, "y":4, "w":1.25},
-                {"label":"GUI", "matrix": [4, 2], "x":3.75, "y":4, "w":1.25},
-                {"label":"Alt", "matrix": [4, 4], "x":5, "y":4, "w":1.25},
-                {"label":"Space", "matrix": [4, 7], "x":6.25, "y":4, "w":6.25},
-                {"label":"Alt", "matrix": [4, 10], "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "matrix": [4, 11], "x":13.75, "y":4, "w":1.25},
-                {"label":"Left", "matrix": [4, 13], "x":15.5, "y":4},
-                {"label":"Down", "matrix": [4, 14], "x":16.5, "y":4},
-                {"label":"Right", "matrix": [4, 15], "x":17.5, "y":4}
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "#", "matrix": [1, 14], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
             ]
         }
     },
@@ -149,4 +317,4 @@
             { "pin_a": "B7",  "pin_b": "A4", "resolution": 2}
         ]
     }
-}
+}

keyboards/custommk/evo70_r2/keymaps/default/keymap.c

@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_all(
 			KC_ESC,	      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_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_F1,   KC_F2,   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, 

keyboards/custommk/evo70_r2/keymaps/via/keymap.c

@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_all(
 			KC_ESC,	      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_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_F1,   KC_F2,   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, 

keyboards/custommk/evo70_r2/matrix_diagram.md

@@ -0,0 +1,18 @@
+# Matrix Diagram for customMK EVO70 R2
+
+```
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+  │10 │  │00 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E     │0F │
+  └───┘  ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤      ┌─────┐
+         │11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
+┌───┬───┐├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2E  │ ISO Enter
+│22 │20 ││21    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E      │2F │   │1E │    │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│31 │30 ││32  │01 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │3F │
+├───┼───┤├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│43 │40 ││41  │42  │44  │47                      │4A  │4B  │ │4D │4E │4F │
+└───┴───┘└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+         ┌────────┐
+         │32      │ 2.25u LShift
+         └────────┘
+```

keyboards/dnworks/frltkl/info.json

@@ -26,8 +26,15 @@
         "rows": ["GP4","GP3","GP2","GP1","GP29","GP28","GP19","GP20","GP10","GP11"],
         "cols": ["GP26","GP25","GP24","GP23","GP22","GP21","GP6","GP5","GP0"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "tkl_nofrow_ansi",
+        "tkl_nofrow_iso"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "matrix": [1, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 0], "x": 1, "y": 0 },
@@ -108,6 +115,956 @@
                 { "matrix": [9, 8], "x": 16.25, "y": 4 },
                 { "matrix": [8, 8], "x": 17.25, "y": 4 }
             ]
-        }        
+        },
+        "LAYOUT_tkl_nofrow_ansi": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_wkl": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_tsangan": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_wkl": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        }
     }
 }

keyboards/dnworks/frltkl/keymaps/default/keymap.c

@@ -17,14 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_BSLS, KC_INS,  KC_HOME, KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
   KC_LSFT, KC_NUBS, 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_UP, 
   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT),
   
-[1] = LAYOUT(
+[1] = LAYOUT_all(
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,         

keyboards/dnworks/frltkl/keymaps/via/keymap.c

@@ -17,14 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_BSLS, KC_INS,  KC_HOME, KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
   KC_LSFT, KC_NUBS, 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_UP, 
   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT),
   
-[1] = LAYOUT(
+[1] = LAYOUT_all(
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,         

keyboards/dnworks/frltkl/matrix_diagram.md

@@ -0,0 +1,21 @@
+# Matrix Diagram for dnworks DN FRLTKL
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │00 │11 │01 │12 │02 │13 │03 │14 │04 │15 │05 │16 │06 │17 ││07 │18 │08 │    │06     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │37   ││27 │38 │28 │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐46  │ ISO Enter
+│40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46      │                │37 │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│60  │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │77 │    │68 │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│80  │90  │81  │93                      │85  │95  │86  │97  ││87 │98 │88 │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│60      │ 2.25u LShift             2.75u RShift │66        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│80   │90 │81   │93                         │95   │86 │97   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```

keyboards/doio/kb16/kb16.c

@@ -20,6 +20,11 @@
 // OLED animation
 #include "./lib/logo.h"
 
+// Default timeout for displaying boot logo.
+#ifndef OLED_LOGO_TIMEOUT
+    #define OLED_LOGO_TIMEOUT 5000
+#endif
+
 #ifdef OLED_ENABLE
     uint16_t startup_timer; 
 
@@ -32,16 +37,14 @@
     bool oled_task_kb(void) {
         static bool finished_logo = false;
 
-        if ((timer_elapsed(startup_timer) < 5000) && !finished_logo) {
+        if ((timer_elapsed(startup_timer) < OLED_LOGO_TIMEOUT) && !finished_logo) {
             render_logo();
         } else {
             finished_logo = true;
-			
             if (!oled_task_user()) {
                 return false;
             }
         }
-
         return true;
     }
 #endif

keyboards/ferris/keymaps/test/keymap.c

@@ -7,7 +7,13 @@ void matrix_init_user(void) {
   //debug_mouse=true;
 }
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DB_TOGG, KC_P2, KC_P3)
+	[0] = LAYOUT(
+        KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,
+        KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN,
+        KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+                          KC_1, KC_2, KC_3, KC_4
+    )
 };
-
+// clang-format on

keyboards/gmmk/gmmk2/p65/iso/info.json

@@ -40,8 +40,8 @@
                 {"matrix": [8, 7], "x": 10, "y": 0},
                 {"matrix": [8, 6], "x": 11, "y": 0},
                 {"matrix": [6, 6], "x": 12, "y": 0},
-                {"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25},
-                {"matrix": [2, 5], "x": 15.25, "y": 0},
+                {"matrix": [7, 1], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 5], "x": 15, "y": 0},
 
                 {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 0], "x": 1.5, "y": 1},
@@ -56,8 +56,8 @@
                 {"matrix": [8, 0], "x": 10.5, "y": 1},
                 {"matrix": [8, 1], "x": 11.5, "y": 1},
                 {"matrix": [6, 1], "x": 12.5, "y": 1},
-                {"matrix": [8, 4], "x": 13.5, "y": 1, "w": 1.75, "h": 2},
-                {"matrix": [2, 6], "x": 15.25, "y": 1},
+                {"matrix": [8, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 6], "x": 15, "y": 1},
 
                 {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [1, 2], "x": 1.75, "y": 2},
@@ -72,7 +72,7 @@
                 {"matrix": [8, 2], "x": 10.75, "y": 2},
                 {"matrix": [8, 3], "x": 11.75, "y": 2},
                 {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [6, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 5], "x": 15, "y": 2},
 
                 {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [0, 2], "x": 1.25, "y": 3},
@@ -87,8 +87,8 @@
                 {"matrix": [7, 4], "x": 10.25, "y": 3},
                 {"matrix": [8, 5], "x": 11.25, "y": 3},
                 {"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 5], "x": 14.25, "y": 3},
-                {"matrix": [0, 1], "x": 15.25, "y": 3},
+                {"matrix": [3, 5], "x": 14, "y": 3},
+                {"matrix": [0, 1], "x": 15, "y": 3},
 
                 {"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25},
@@ -97,9 +97,9 @@
                 {"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25},
                 {"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25},
 
-                {"matrix": [0, 3], "x": 13.25, "y": 4},
-                {"matrix": [7, 3], "x": 14.25, "y": 4},
-                {"matrix": [0, 5], "x": 15.25, "y": 4}
+                {"matrix": [0, 3], "x": 13, "y": 4},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [0, 5], "x": 15, "y": 4}
             ]
         }
     }

keyboards/gmmk/gmmk2/p96/ansi/info.json

@@ -43,103 +43,103 @@
 
                 {"matrix": [13, 0], "x": 14, "y": 0},
 
-                {"matrix": [0, 6], "x": 15.5, "y": 0},
-                {"matrix": [1, 6], "x": 16.5, "y": 0},
-                {"matrix": [2, 6], "x": 17.5, "y": 0},
-                {"matrix": [3, 6], "x": 18.5, "y": 0},
+                {"matrix": [0, 6], "x": 15.25, "y": 0},
+                {"matrix": [1, 6], "x": 16.25, "y": 0},
+                {"matrix": [2, 6], "x": 17.25, "y": 0},
+                {"matrix": [3, 6], "x": 18.25, "y": 0},
 
-                {"matrix": [0, 1], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-                {"matrix": [4, 1], "x": 4, "y": 1},
-                {"matrix": [5, 1], "x": 5, "y": 1},
-                {"matrix": [6, 1], "x": 6, "y": 1},
-                {"matrix": [7, 1], "x": 7, "y": 1},
-                {"matrix": [8, 1], "x": 8, "y": 1},
-                {"matrix": [9, 1], "x": 9, "y": 1},
-                {"matrix": [10, 1], "x": 10, "y": 1},
-                {"matrix": [11, 1], "x": 11, "y": 1},
-                {"matrix": [12, 1], "x": 12, "y": 1},
-                {"matrix": [13, 1], "x": 13, "y": 1, "w": 2},
+                {"matrix": [0, 1], "x": 0, "y": 1.125},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1.125},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.125},
+                {"matrix": [5, 1], "x": 5, "y": 1.125},
+                {"matrix": [6, 1], "x": 6, "y": 1.125},
+                {"matrix": [7, 1], "x": 7, "y": 1.125},
+                {"matrix": [8, 1], "x": 8, "y": 1.125},
+                {"matrix": [9, 1], "x": 9, "y": 1.125},
+                {"matrix": [10, 1], "x": 10, "y": 1.125},
+                {"matrix": [11, 1], "x": 11, "y": 1.125},
+                {"matrix": [12, 1], "x": 12, "y": 1.125},
+                {"matrix": [13, 1], "x": 13, "y": 1.125, "w": 2},
 
-                {"matrix": [4, 6], "x": 15.5, "y": 1},
-                {"matrix": [5, 6], "x": 16.5, "y": 1},
-                {"matrix": [6, 6], "x": 17.5, "y": 1},
-                {"matrix": [7, 6], "x": 18.5, "y": 1},
+                {"matrix": [4, 6], "x": 15.25, "y": 1.125},
+                {"matrix": [5, 6], "x": 16.25, "y": 1.125},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.125},
+                {"matrix": [7, 6], "x": 18.25, "y": 1.125},
 
-                {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2},
-                {"matrix": [5, 2], "x": 5.5, "y": 2},
-                {"matrix": [6, 2], "x": 6.5, "y": 2},
-                {"matrix": [7, 2], "x": 7.5, "y": 2},
-                {"matrix": [8, 2], "x": 8.5, "y": 2},
-                {"matrix": [9, 2], "x": 9.5, "y": 2},
-                {"matrix": [10, 2], "x": 10.5, "y": 2},
-                {"matrix": [11, 2], "x": 11.5, "y": 2},
-                {"matrix": [12, 2], "x": 12.5, "y": 2},
-                {"matrix": [13, 2], "x": 13.5, "y": 2, "w": 1.25},
+                {"matrix": [0, 2], "x": 0, "y": 2.125, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.125},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.125},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.125},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.125},
+                {"matrix": [7, 2], "x": 7.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 8.5, "y": 2.125},
+                {"matrix": [9, 2], "x": 9.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 10.5, "y": 2.125},
+                {"matrix": [11, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 12.5, "y": 2.125},
+                {"matrix": [13, 2], "x": 13.5, "y": 2.125, "w": 1.5},
 
-                {"matrix": [8, 6], "x": 15.5, "y": 2},
-                {"matrix": [9, 6], "x": 16.5, "y": 2},
-                {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5},
-                {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2},
+                {"matrix": [8, 6], "x": 15.25, "y": 2.125},
+                {"matrix": [9, 6], "x": 16.25, "y": 2.125},
+                {"matrix": [10, 6], "x": 17.25, "y": 2.125},
+                {"matrix": [11, 6], "x": 18.25, "y": 2.125, "h": 2},
 
-                {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [1, 3], "x": 1.75, "y": 3},
-                {"matrix": [2, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [4, 3], "x": 4.75, "y": 3},
-                {"matrix": [5, 3], "x": 5.75, "y": 3},
-                {"matrix": [6, 3], "x": 6.75, "y": 3},
-                {"matrix": [7, 3], "x": 7.75, "y": 3},
-                {"matrix": [8, 3], "x": 8.75, "y": 3},
-                {"matrix": [9, 3], "x": 9.75, "y": 3},
-                {"matrix": [10, 3], "x": 10.75, "y": 3},
-                {"matrix": [11, 3], "x": 11.75, "y": 3},
-                {"matrix": [13, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [0, 3], "x": 0, "y": 3.125, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.125},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.125},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.125},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.125},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.125},
+                {"matrix": [8, 3], "x": 8.75, "y": 3.125},
+                {"matrix": [9, 3], "x": 9.75, "y": 3.125},
+                {"matrix": [10, 3], "x": 10.75, "y": 3.125},
+                {"matrix": [11, 3], "x": 11.75, "y": 3.125},
+                {"matrix": [13, 3], "x": 12.75, "y": 3.125, "w": 2.25},
 
-                {"matrix": [10, 7], "x": 15.5, "y": 3},
-                {"matrix": [11, 7], "x": 16.5, "y": 3},
-                {"matrix": [12, 7], "x": 17.5, "y": 3},
+                {"matrix": [10, 7], "x": 15.25, "y": 3.125},
+                {"matrix": [11, 7], "x": 16.25, "y": 3.125},
+                {"matrix": [12, 7], "x": 17.25, "y": 3.125},
 
-                {"matrix": [0, 4], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 4},
-                {"matrix": [3, 4], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [5, 4], "x": 5.25, "y": 4},
-                {"matrix": [6, 4], "x": 6.25, "y": 4},
-                {"matrix": [7, 4], "x": 7.25, "y": 4},
-                {"matrix": [8, 4], "x": 8.25, "y": 4},
-                {"matrix": [9, 4], "x": 9.25, "y": 4},
-                {"matrix": [10, 4], "x": 10.25, "y": 4},
-                {"matrix": [11, 4], "x": 11.25, "y": 4},
-                {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [0, 4], "x": 0, "y": 4.125, "w": 2.25},
+                {"matrix": [2, 4], "x": 2.25, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.25, "y": 4.125},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.125},
+                {"matrix": [5, 4], "x": 5.25, "y": 4.125},
+                {"matrix": [6, 4], "x": 6.25, "y": 4.125},
+                {"matrix": [7, 4], "x": 7.25, "y": 4.125},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.125},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.125},
+                {"matrix": [10, 4], "x": 10.25, "y": 4.125},
+                {"matrix": [11, 4], "x": 11.25, "y": 4.125},
+                {"matrix": [13, 4], "x": 12.25, "y": 4.125, "w": 1.75},
 
-                {"matrix": [1, 7], "x": 14.25, "y": 4},
+                {"matrix": [1, 7], "x": 14.125, "y": 4.25},
 
-                {"matrix": [6, 7], "x": 15.5, "y": 4},
-                {"matrix": [7, 7], "x": 16.5, "y": 4},
-                {"matrix": [8, 7], "x": 17.5, "y": 4},
-                {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.125},
+                {"matrix": [7, 7], "x": 16.25, "y": 4.125},
+                {"matrix": [8, 7], "x": 17.25, "y": 4.125},
+                {"matrix": [9, 7], "x": 18.25, "y": 4.125, "h": 2},
 
-                {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [9, 5], "x": 10, "y": 5},
-                {"matrix": [10, 5], "x": 11, "y": 5},
-                {"matrix": [12, 5], "x": 12, "y": 5},
+                {"matrix": [0, 5], "x": 0, "y": 5.125, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.125, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.125, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.125, "w": 6.25},
+                {"matrix": [9, 5], "x": 10, "y": 5.125},
+                {"matrix": [10, 5], "x": 11, "y": 5.125},
+                {"matrix": [12, 5], "x": 12, "y": 5.125},
 
-                {"matrix": [0, 7], "x": 13.25, "y": 5},
-                {"matrix": [2, 7], "x": 14.25, "y": 5},
-                {"matrix": [3, 7], "x": 15.25, "y": 5},
+                {"matrix": [0, 7], "x": 13.125, "y": 5.25},
+                {"matrix": [2, 7], "x": 14.125, "y": 5.25},
+                {"matrix": [3, 7], "x": 15.125, "y": 5.25},
 
-                {"matrix": [4, 7], "x": 16.5, "y": 5},
-                {"matrix": [5, 7], "x": 17.5, "y": 5}
+                {"matrix": [4, 7], "x": 16.25, "y": 5.125},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.125}
             ]
         }
     }

keyboards/idank/sweeq/config.h

@@ -0,0 +1,6 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define MASTER_RIGHT

keyboards/idank/sweeq/info.json

@@ -0,0 +1,80 @@
+{
+    "url": "https://github.com/idank/keyboards/tree/main/sweeq",
+    "maintainer": "idank",
+    "keyboard_name": "Sweeq",
+    "manufacturer": "idank",
+    "development_board": "promicro",
+    "usb": {
+        "vid": "0xC3AB",
+        "pid": "0x3139",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": [ "F4", "F5", "F6", "F7", "B1" ],
+        "rows": [ "D4", "C6", "D7", "E6" ]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x": 0, "y": 0.93, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+                {"x": 7, "y": 0.42, "matrix": [4, 4]},
+                {"x": 8, "y": 0.28, "matrix": [4, 3]},
+                {"x": 9, "y": 0, "matrix": [4, 2]},
+                {"x": 10, "y": 0.31, "matrix": [4, 1]},
+                {"x": 11, "y": 0.93, "matrix": [4, 0]},
+
+                {"x": 0, "y": 1.93, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+                {"x": 7, "y": 1.42, "matrix": [5, 4]},
+                {"x": 8, "y": 1.28, "matrix": [5, 3]},
+                {"x": 9, "y": 1, "matrix": [5, 2]},
+                {"x": 10, "y": 1.31, "matrix": [5, 1]},
+                {"x": 11, "y": 1.93, "matrix": [5, 0]},
+
+                {"x": 0, "y": 2.93, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+                {"x": 7, "y": 2.42, "matrix": [6, 4]},
+                {"x": 8, "y": 2.28, "matrix": [6, 3]},
+                {"x": 9, "y": 2, "matrix": [6, 2]},
+                {"x": 10, "y": 2.31, "matrix": [6, 1]},
+                {"x": 11, "y": 2.93, "matrix": [6, 0]},
+
+                {"x": 3.5, "y": 3.75, "matrix": [3, 3]},
+                {"x": 4.5, "y": 4, "matrix": [3, 4]},
+
+                {"x": 6.5, "y": 4, "matrix": [7, 4]},
+                {"x": 7.5, "y": 3.75, "matrix": [7, 3]}
+            ]
+        }
+    }
+}

keyboards/idank/sweeq/keymaps/default/config.h

@@ -0,0 +1,21 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+// Set the mouse settings to a comfortable speed/accuracy trade-off,
+// assuming a screen refresh rate of 60 Htz or higher
+// The default is 50. This makes the mouse ~3 times faster and more accurate
+#define MOUSEKEY_INTERVAL 16
+// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
+// give it more time to accelerate to max speed to retain precise control over short distances.
+#define MOUSEKEY_TIME_TO_MAX 40
+// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
+#define MOUSEKEY_DELAY 100
+// It makes sense to use the same delay for the mouseweel
+#define MOUSEKEY_WHEEL_DELAY 100
+// The default is 100
+#define MOUSEKEY_WHEEL_INTERVAL 50
+// The default is 40
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
+
+#define QUICK_TAP_TERM 0

keyboards/idank/sweeq/keymaps/default/keymap.json

@@ -0,0 +1,107 @@
+{
+    "version": 1,
+    "notes": "sweeq default keymap",
+    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+    "keyboard": "idank/sweeq",
+    "keymap": "default",
+    "layout": "LAYOUT_split_3x5_2",
+    "layers": [
+        ["KC_Q"        , "KC_W"        , "KC_E"           , "KC_R"          , "KC_T",
+         "KC_Y"        , "KC_U"        , "KC_I"           , "KC_O"          , "KC_P",
+
+         "LSFT_T(KC_A)", "LT(5,KC_S)"  , "LT(1,KC_D)"     , "LT(3,KC_F)"    , "KC_G",
+         "KC_H"        , "LT(4,KC_J)"  , "LT(2,KC_K)"     , "LT(6,KC_L)"    , "LSFT_T(KC_SCLN)",
+
+         "KC_Z"        , "LCTL_T(KC_X)", "LALT_T(KC_C)"   , "KC_V"          , "KC_B",
+         "KC_N"        , "KC_M"        , "LALT_T(KC_COMM)", "LCTL_T(KC_DOT)", "KC_SLSH",
+
+         "KC_P0"       , "KC_BSPC",
+         "LT(7,KC_SPC)", "KC_P1"
+        ],
+        ["KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_BTN1"     , "KC_WH_U"        , "KC_BTN2"       , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_BTN2"     , "KC_NO"          , "KC_BTN1"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_MS_L"     , "KC_MS_D"        , "KC_MS_U"       , "KC_MS_R",
+
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_WH_L"     , "KC_WH_D"        , "KC_WH_R"       , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"
+        ],
+        ["KC_TRNS"     , "KC_TRNS"     , "KC_PGUP"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_LEFT"     , "KC_UP"       , "KC_DOWN"        , "KC_RGHT"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_LGUI"     , "KC_NO"          , "LCTL(KC_LALT)" , "LCA(KC_LSFT)",
+
+         "KC_TRNS"     , "KC_HOME"     , "KC_PGDN"        , "KC_END"        , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"
+        ],
+        ["KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_UNDS"     , "KC_PIPE"        , "KC_QUOT"       , "KC_TRNS",
+
+         "KC_CIRC"     , "KC_ASTR"     , "KC_AMPR"        , "KC_NO"         , "KC_TRNS",
+         "KC_HASH"     , "KC_TILD"     , "KC_SLSH"        , "KC_DQUO"       , "KC_DLR",
+
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_MINS"     , "KC_BSLS"        , "KC_GRV"        , "KC_TRNS",
+
+         "RGB_RMOD"    , "KC_TRNS",
+         "KC_TRNS"     , "RGB_MOD"
+        ],
+        ["KC_TRNS"     , "KC_COLN"     , "KC_LT"          , "KC_GT"         , "KC_SCLN",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_LCBR"     , "KC_RCBR"     , "KC_LPRN"        , "KC_RPRN"       , "KC_AT",
+         "KC_TRNS"     , "KC_NO"       , "KC_EQL"         , "KC_PLUS"       , "KC_PERC",
+
+         "KC_TRNS"     , "KC_EXLM"     , "KC_LBRC"        , "KC_RBRC"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_VOLD"     , "KC_TRNS",
+         "KC_TRNS"     , "KC_VOLU"
+        ],
+        ["KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_F7"       , "KC_F8"          , "KC_F9"         , "KC_F10",
+
+         "KC_TRNS"     , "KC_NO"       , "LCTL(KC_LALT)"  , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_F4"       , "KC_F5"          , "KC_F6"         , "KC_F11",
+
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+         "KC_TRNS"     , "KC_F1"       , "KC_F2"          , "KC_F3"         , "KC_F12",
+
+         "KC_TRNS"     , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"
+        ],
+        ["KC_PSLS"     , "KC_7"        , "KC_8"           , "KC_9"          , "KC_PPLS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_0"        , "KC_1"        , "KC_2"           , "KC_3"          , "KC_PMNS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_NO"         , "KC_TRNS",
+
+         "KC_PAST"     , "KC_4"        , "KC_5"           , "KC_6"          , "KC_PEQL",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"
+        ],
+        ["KC_TRNS"     , "KC_TRNS"     , "KC_COLN"        , "KC_ESC"        , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_DEL",
+
+         "KC_TRNS"     , "KC_PERC"     , "KC_SLSH"        , "KC_ENT"        , "KC_TRNS",
+         "DF(1)"       , "KC_LGUI"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_EXLM"       , "KC_TRNS",
+         "DF(0)"       , "KC_TRNS"     , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)", "QK_BOOT",
+
+         "KC_TRNS"     , "KC_TAB",
+         "KC_NO"       , "KC_TRNS"
+        ]
+    ],
+    "author": "idank"
+}

keyboards/idank/sweeq/keymaps/default/readme.md

@@ -0,0 +1 @@
+See the readme of the Ferris [default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default).

keyboards/idank/sweeq/keymaps/via/config.h

@@ -0,0 +1,7 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Good defaults for home row modifiers
+#define TAPPING_TERM 230

keyboards/idank/sweeq/keymaps/via/keymap.c

@@ -0,0 +1,36 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define KC_CTSC RCTL_T(KC_SCLN)
+#define KC_CTLA LCTL_T(KC_A)
+#define KC_LSHZ LSFT_T(KC_Z)
+#define KC_RLSH RSFT_T(KC_SLSH)
+#define KC_SPM2 LT(2, KC_SPC)
+#define KC_BSM1 LT(1, KC_BSPC)
+#define KC_GUTA GUI_T(KC_TAB)
+#define KC_CLGV CTL_T(KC_GRV)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,
+    KC_CTLA, KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN,
+    KC_LSHZ, KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,  KC_COMM, KC_DOT, KC_RLSH,
+                                    KC_CLGV, KC_BSM1, KC_SPM2, KC_GUTA
+  ),
+
+  [1] = LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    QK_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, QK_BOOT,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  )
+};

keyboards/idank/sweeq/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

keyboards/idank/sweeq/readme.md

@@ -0,0 +1,31 @@
+# Sweeq
+
+![sweeq](https://i.imgur.com/TGSyHHxh.png)
+
+*Sweeq is a Ferris Sweep clone that uses diodes, instead of the latter's direct pin matrix.*
+
+The primary goal is to free up the SDA/SCL pins so they can be used by auxiliary devices such as a trackball, trackpoint or an OLED screen.
+
+Other than the diode changes and the ability to use hotswap sockets, this keyboard is identical to the original Sweep.
+
+* Keyboard Maintainer: [@idank](https://github.com/idank)
+* Hardware Supported: [sweeq](https://github.com/idank/keyboards/tree/main/sweeq)
+* Hardware Availability: *[holykeebs](https://holykeebs.com)*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idank/sweeq:default
+
+Flashing example for this keyboard:
+
+    make idank/sweeq: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 in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/idank/sweeq/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank

keyboards/kiserdesigns/madeline/config.h

@@ -0,0 +1,25 @@
+/* Copyright 2021 Noah Kiser (NCKiser)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+#define RP2040_FLASH_GENERIC_03H

keyboards/kiserdesigns/madeline/info.json

@@ -0,0 +1,77 @@
+{
+    "manufacturer": "rubybuilds",
+    "keyboard_name": "Madeline",
+    "maintainer": "NCKiser",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP13", "pin_b": "GP15"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3"],
+        "rows": ["GP5", "GP4", "GP12", "GP7"]
+    },
+    "processor": "RP2040",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "url": "https://qmk.fm/keyboards",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6D64",
+        "vid": "0x5242"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0, "w": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 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, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
+        }
+    }
+}

keyboards/kiserdesigns/madeline/keymaps/default/keymap.c

@@ -0,0 +1,53 @@
+/* Copyright 2021 Noah Kiser (NCKiser)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _NUM_SYM
+};
+
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+        KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_ENT,
+        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,
+        KC_LCTL, KC_LALT, KC_BSPC, KC_NUM_SPC, KC_RGUI, KC_RCTL
+    ),
+
+    [_NUM_SYM] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_ESC, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_BSPC,
+        KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
+    };
+#endif

keyboards/kiserdesigns/madeline/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/kiserdesigns/madeline/readme.md

@@ -0,0 +1,23 @@
+# Madeline
+
+![Madeline](https://i.imgur.com/MBT5kg2h.jpg)
+
+*A cool QAZ-Alice hybrid designed based on the Adalyn by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [Rossman360](https://github.com/Rossman360)*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Madeline PCB, rp2040
+* Hardware Availability: kb.rubybuilds.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/madeline:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/madeline: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 in 3 ways:
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly double-tap the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/kiserdesigns/madeline/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank

keyboards/macro1/keymaps/default/keymap.c

@@ -41,24 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
 		KC_KP_4, KC_KP_5,     KC_KP_6, 
 		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
-		KC_KP_0, KC_KP_DOT),
-
-	[1] = LAYOUT_numpad(
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS),
-
-	[2] = LAYOUT_numpad(
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS), };
-
+		KC_KP_0, KC_KP_DOT)
+};
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
+};
+#endif
 
 

keyboards/nullbitsco/snap/keymaps/bongo_reactive/keymap.c

@@ -92,7 +92,7 @@ static void render_status(void) {
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_state) {
+    if (persistent_led_state.raw != led_state.raw) {
         persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);

keyboards/nullbitsco/snap/keymaps/oled/keymap.c

@@ -119,7 +119,7 @@ static void render_status(void) {
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_state) {
+    if (persistent_led_state.raw != led_state.raw) {
         persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);

keyboards/nullbitsco/snap/keymaps/typehud/keymap.c

@@ -99,7 +99,7 @@ static void render_status(void) {
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_state) {
+    if (persistent_led_state.raw != led_state.raw) {
         persistent_led_state = led_state;
 
         oled_write_ln_P(PSTR("            "), false);