rework mod-tap keys

swap eql, pipe.
clean up layers
2025-04-11 15:47:04 -04:00 · 2024-02-22 13:51:06 -05:00 · 2024-02-22 12:34:50 -05:00 · 2024-02-22 09:36:07 -05:00 · 2024-02-21 13:59:09 -05:00 · 2024-02-21 13:56:05 -05:00
498 changed files with 19910 additions and 711 deletions
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -35,7 +35,7 @@ jobs:

    - name: Get changed files
      id: file_changes
-      uses: tj-actions/changed-files@v40
+      uses: tj-actions/changed-files@v42

    - name: Run qmk formatters
      shell: 'bash {0}'
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:

    - name: Get changed files
      id: file_changes
-      uses: tj-actions/changed-files@v40
+      uses: tj-actions/changed-files@v42

    - name: Print info
      run: |
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
 *.lst
 *.map
 *.o
+*.a
+*.so
+*.dylib
+*.dll
+*.la
 *.stackdump
 *.sym

--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -333,27 +333,26 @@ will give the _NAV layer as a reference to it's self. All other layers
 will have the default for their combo reference layer. If the default
 is not set, all other layers will reference themselves.

-    ```c
-    #define COMBO_REF_DEFAULT _MY_COMBO_LAYER
-    ...
+```c
+#define COMBO_REF_DEFAULT _MY_COMBO_LAYER

-    uint8_t combo_ref_from_layer(uint8_t layer){
-        switch (get_highest_layer(layer_state)){
-            case _DVORAK: return _QWERTY;
-            case _NAV: return _NAV;
-            default: return _MY_COMBO_LAYER;
-        }
-        return layer;  // important if default is not in case.
+uint8_t combo_ref_from_layer(uint8_t layer){
+    switch (get_highest_layer(layer_state)){
+        case _DVORAK: return _QWERTY;
+        case _NAV: return _NAV;
+        default: return _MY_COMBO_LAYER;
    }
-    ```
+    return layer;  // important if default is not in case.
+}
+```

 The equivalent definition using the combo macros is this:

-    ```c
-    COMBO_REF_LAYER(_DVORAK, _QWERTY)
-    COMBO_REF_LAYER(_NAV, _NAV)
-    DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
-    ```
+```c
+COMBO_REF_LAYER(_DVORAK, _QWERTY)
+COMBO_REF_LAYER(_NAV, _NAV)
+DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
+```
    

 ## User callbacks
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -82,10 +82,10 @@ Your `keymap.c` will then need an encoder mapping defined (for four layers and t
 ```c
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_LOWER] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
-    [_RAISE] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),           ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  },
-    [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),          ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
+    [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
+    [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),           ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  },
+    [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),          ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
 };
 #endif
 ```
--- a/docs/feature_rawhid.md
+++ b/docs/feature_rawhid.md
@@ -28,7 +28,7 @@ To send data to the keyboard, you must first find a library for communicating wi
 * **Node.js:** [node-hid](https://github.com/node-hid/node-hid)
 * **C/C++:** [hidapi](https://github.com/libusb/hidapi)
 * **Java:** [purejavahidapi](https://github.com/nyholku/purejavahidapi) and [hid4java](https://github.com/gary-rowe/hid4java)
-* **Python:** [pyhidapi](https://pypi.org/project/hid/)
+* **Python:** [pyhidapi](https://pypi.org/project/hid/) and [pywinusb](https://pypi.org/project/pywinusb)

 Please refer to these libraries' own documentation for instructions on usage. Remember to close the device once you are finished with it!

--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -125,7 +125,7 @@ At the top of the file you'll find this:

 These are some handy definitions we can use when building our keymap and our custom function. The `GRAVE_MODS` definition will be used later in our custom function, and the following `_BL`, `_FL`, and `_CL` defines make it easier to refer to each of our layers.

-Note: You may also find some older keymap files may also have a define(s) for `_______` and/or `XXXXXXX`. These can be used in place for `KC_TRNS` and `KC_NO` respectively, making it easier to see what keys a layer is overriding. These definitions are now unecessary, as they are included by default.
+Note: You may also find some older keymap files may also have a define(s) for `_______` and/or `XXXXXXX`. These can be used in place for `KC_TRNS` and `KC_NO` respectively, making it easier to see what keys a layer is overriding. These definitions are now unnecessary, as they are included by default.

 ### Layers and Keymaps

--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -39,12 +39,13 @@ If there are any inconsistencies with these recommendations, you're best off [cr

 ## Keymap PRs

-!> Note that personal keymap submissions will no longer be accepted. This section applies to manufacturer-supported keymaps.
+!> Note that personal keymap submissions will no longer be accepted. This section applies to manufacturer-supported keymaps. Please see this [issue](https://github.com/qmk/qmk_firmware/issues/22724) for more information.

- `#include QMK_KEYBOARD_H` preferred to including specific board files
- prefer layer `enum`s to `#define`s
- custom keycode `enum`s must have first entry `= SAFE_RANGE`
- terminating backslash (`\`) in lines of LAYOUT macro parameters is superfluous and should be removed
+- PRs for vendor specific keymaps will be permitted. The naming convention for these should be `default_${vendor}`, `via_${vendor}` i.e. `via_clueboard`.
+    - vendor specific keymaps do not necessarily need to be "vanilla" and can be more richly featured than `default` or `via` stock keymaps.
+- #include QMK_KEYBOARD_H preferred to including specific board files
+- prefer layer enums to #defines
+- custom keycode enums must have first entry = SAFE_RANGE
 - some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap

 ## Keyboard PRs
--- a/keyboards/1upkeyboards/pi60_rgb_v2/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/info.json
@@ -0,0 +1,258 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "pi60_rgb_v2",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5612",
+        "vid": "0x6F75"
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true,
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["GP25", "GP1", "GP15", "GP4", "GP5", "GP14", "GP6", "GP7", "GP8", "GP13", "GP12", "GP9", "GP11", "GP10"],
+        "rows": ["GP29", "GP27", "GP26", "GP17", "GP16"]
+    },
+    "rgb_matrix": {
+        "max_brightness": 125,
+        "sleep": true,
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_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": 4, "y": 5, "flags": 2},
+            {"matrix": [0, 0], "x": 8, "y": 7, "flags": 1},
+            {"matrix": [0, 1], "x": 23, "y": 7, "flags": 4},
+            {"x": 30, "y": 7, "flags": 2},
+            {"matrix": [0, 2], "x": 37, "y": 7, "flags": 4},
+            {"x": 45, "y": 7, "flags": 2},
+            {"matrix": [0, 3], "x": 52, "y": 7, "flags": 4},
+            {"x": 60, "y": 7, "flags": 2},
+            {"matrix": [0, 4], "x": 67, "y": 7, "flags": 4},
+            {"x": 75, "y": 7, "flags": 2},
+            {"matrix": [0, 5], "x": 82, "y": 7, "flags": 4},
+            {"x": 90, "y": 7, "flags": 2},
+            {"matrix": [0, 6], "x": 97, "y": 7, "flags": 4},
+            {"x": 105, "y": 7, "flags": 2},
+            {"matrix": [0, 7], "x": 112, "y": 7, "flags": 4},
+            {"x": 120, "y": 7, "flags": 2},
+            {"matrix": [0, 8], "x": 127, "y": 7, "flags": 4},
+            {"x": 135, "y": 7, "flags": 2},
+            {"matrix": [0, 9], "x": 142, "y": 7, "flags": 4},
+            {"x": 149, "y": 7, "flags": 2},
+            {"matrix": [0, 10], "x": 157, "y": 7, "flags": 4},
+            {"x": 164, "y": 7, "flags": 2},
+            {"matrix": [0, 11], "x": 172, "y": 7, "flags": 4},
+            {"x": 179, "y": 7, "flags": 2},
+            {"matrix": [0, 12], "x": 187, "y": 7, "flags": 4},
+            {"x": 198, "y": 7, "flags": 2},
+            {"matrix": [0, 13], "x": 209, "y": 7, "flags": 1},
+            {"x": 220, "y": 7, "flags": 2},
+            {"x": 220, "y": 19, "flags": 2},
+            {"matrix": [1, 13], "x": 213, "y": 19, "flags": 1},
+            {"matrix": [1, 12], "x": 194, "y": 19, "flags": 4},
+            {"matrix": [1, 11], "x": 179, "y": 19, "flags": 4},
+            {"matrix": [1, 10], "x": 164, "y": 19, "flags": 4},
+            {"matrix": [1, 9], "x": 149, "y": 19, "flags": 4},
+            {"matrix": [1, 8], "x": 134, "y": 19, "flags": 4},
+            {"matrix": [1, 7], "x": 119, "y": 19, "flags": 4},
+            {"matrix": [1, 6], "x": 105, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 90, "y": 19, "flags": 4},
+            {"matrix": [1, 4], "x": 75, "y": 19, "flags": 4},
+            {"matrix": [1, 3], "x": 60, "y": 19, "flags": 4},
+            {"matrix": [1, 2], "x": 45, "y": 19, "flags": 4},
+            {"matrix": [1, 1], "x": 30, "y": 19, "flags": 4},
+            {"matrix": [1, 0], "x": 11, "y": 19, "flags": 1},
+            {"x": 4, "y": 19, "flags": 2},
+            {"x": 4, "y": 32, "flags": 2},
+            {"matrix": [2, 0], "x": 13, "y": 32, "flags": 1},
+            {"matrix": [2, 1], "x": 34, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 49, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 64, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 79, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 94, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 123, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 138, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 153, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 168, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 183, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 207, "y": 32, "flags": 1},
+            {"x": 220, "y": 32, "flags": 2},
+            {"x": 220, "y": 45, "flags": 2},
+            {"matrix": [3, 13], "x": 203, "y": 45, "flags": 1},
+            {"matrix": [3, 10], "x": 175, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 161, "y": 45, "flags": 4},
+            {"matrix": [3, 8], "x": 146, "y": 45, "flags": 4},
+            {"matrix": [3, 7], "x": 135, "y": 45, "flags": 4},
+            {"matrix": [3, 6], "x": 116, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 101, "y": 45, "flags": 4},
+            {"matrix": [3, 4], "x": 86, "y": 45, "flags": 4},
+            {"matrix": [3, 3], "x": 71, "y": 45, "flags": 4},
+            {"matrix": [3, 2], "x": 56, "y": 45, "flags": 4},
+            {"matrix": [3, 1], "x": 41, "y": 45, "flags": 4},
+            {"matrix": [3, 0], "x": 17, "y": 45, "flags": 1},
+            {"x": 4, "y": 45, "flags": 2},
+            {"x": 4, "y": 57, "flags": 2},
+            {"matrix": [4, 0], "x": 9, "y": 57, "flags": 1},
+            {"x": 15, "y": 57, "flags": 2},
+            {"x": 23, "y": 57, "flags": 2},
+            {"matrix": [4, 1], "x": 28, "y": 57, "flags": 1},
+            {"x": 34, "y": 57, "flags": 2},
+            {"x": 41, "y": 57, "flags": 2},
+            {"matrix": [4, 2], "x": 47, "y": 57, "flags": 1},
+            {"x": 53, "y": 57, "flags": 2},
+            {"x": 67, "y": 57, "flags": 2},
+            {"x": 71, "y": 57, "flags": 1},
+            {"x": 81, "y": 57, "flags": 2},
+            {"x": 95, "y": 57, "flags": 2},
+            {"matrix": [4, 5], "x": 103, "y": 57, "flags": 1},
+            {"x": 110, "y": 57, "flags": 2},
+            {"x": 125, "y": 57, "flags": 2},
+            {"x": 134, "y": 57, "flags": 1},
+            {"x": 139, "y": 57, "flags": 2},
+            {"x": 153, "y": 57, "flags": 2},
+            {"matrix": [4, 9], "x": 159, "y": 57, "flags": 1},
+            {"x": 165, "y": 57, "flags": 2},
+            {"x": 172, "y": 57, "flags": 2},
+            {"matrix": [4, 10], "x": 177, "y": 57, "flags": 1},
+            {"x": 183, "y": 57, "flags": 2},
+            {"x": 190, "y": 57, "flags": 2},
+            {"matrix": [4, 12], "x": 196, "y": 57, "flags": 1},
+            {"x": 202, "y": 57, "flags": 2},
+            {"x": 209, "y": 57, "flags": 2},
+            {"matrix": [4, 13], "x": 215, "y": 57, "flags": 1},
+            {"x": 220, "y": 57, "flags": 2}
+        ]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP28"
+    },
+    "community_layouts" : ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "RAlt", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
+                {"label": "RGui", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "FN", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "RCtrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        }
+    }
+}
--- a/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 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_60_ansi(
+         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_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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                               KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+    )
+};
--- a/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 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_60_ansi(
+         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_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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                               KC_RALT, KC_RGUI,   MO(1), KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi(
+         KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
--- a/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/rules.mk
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/1upkeyboards/pi60_rgb_v2/readme.md
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/readme.md
@@ -0,0 +1,24 @@
+# 1up pi60 rgb v2
+
+![1up pi60 rgb v2](https://i.imgur.com/H1tRGZh.png)
+
+The pi60 RGB v2 is a 60% pcb from 1upkeyboards. This keyboard features an ANSI layout hot swap PCB with per-key in-switch RGB lighting as well as RGB underglow. The controller is a Raspberry Pi rp2040 microcontroller.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/pi60_rgb_v2:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/pi60_rgb_v2: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 (usually the top left key or Escape) and plug in the keyboard
+* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard
--- a/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
--- a/keyboards/4pplet/waffling60/rev_e_iso/config.h
+++ b/keyboards/4pplet/waffling60/rev_e_iso/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+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 WS2812_EXTERNAL_PULLUP
+
--- a/keyboards/4pplet/waffling60/rev_e_iso/info.json
+++ b/keyboards/4pplet/waffling60/rev_e_iso/info.json
@@ -0,0 +1,408 @@
+{
+    "manufacturer": "4pplet",
+    "keyboard_name": "waffling60 Rev E ISO HS",
+    "maintainer": "4pplet",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 17
+    },
+    "url": "https://github.com/4pplet/waffling60",
+    "usb": {
+        "device_version": "0.0.5",
+        "pid": "0x0016",
+        "vid": "0x4444"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": [
+        "60_iso_tsangan_split_bs_rshift", 
+        "60_iso_wkl_split_bs_rshift"
+     ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": [1, 13], "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": [2, 12], "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, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"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_iso_tsangan_split_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": [1, 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": [2, 12], "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_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": [1, 13], "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": [2, 12], "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_60_iso_wkl_split_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": [1, 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": [2, 12], "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, 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, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_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": [1, 13], "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": [2, 12], "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, 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, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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] = {
+// main layer
+[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_NO, KC_BSPC,
+  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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_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_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  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_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_NUHS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            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_BRID, KC_BRIU) }
+};
+#endif
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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] = {
+// main layer
+[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_BSLS, KC_BSPC,
+  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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
+  KC_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_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  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_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            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_BRID, KC_BRIU) }
+};
+#endif
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md
+++ b/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Waffling60 Rev E ISO
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │1D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2D  │
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│40   │41 │42   │44         │46 │48         │4B   │4C │4D   │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40   │41 │46                                     │4C │4D   │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
--- a/keyboards/4pplet/waffling60/rev_e_iso/readme.md
+++ b/keyboards/4pplet/waffling60/rev_e_iso/readme.md
@@ -0,0 +1,26 @@
+# waffling60 Rev. E ISO
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. Revision E adds underglow and rotary encoder support.
+
+More info: https://github.com/4pplet/waffling60
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_e_iso:default
+
+Flashing example for this keyboard:
+
+    make 4pplet/waffling60/rev_e_iso: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
+
+How to enter bootloader (DFU):
+* Short the reset-header (labled BL/RESET) on the back of the PCB for about 2 seconds for the keyboard to enter DFU. When in DFU, it's ready to flash the firmware. If using a APM MCU it will not automatically reset after flash. Simply short the reset-header for a very short time to just reset the PCB, alternatively unplug and repluck the USB-cable to the keyboard.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
--- a/keyboards/4pplet/waffling60/rev_e_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -349,6 +349,322 @@
                {"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_iso_625u_space": {
+            "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.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 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.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "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_iso_625u_space_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": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 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.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "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_iso_7u_space": {
+            "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.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 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.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "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_iso_7u_space_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": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 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.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "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}
--- a/keyboards/artifact/lvl/rev_hs01/config.h
+++ b/keyboards/artifact/lvl/rev_hs01/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2024 Yiancar-Designs
+
+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
+
+/* RGB Light */
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 5  
+
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
--- a/keyboards/artifact/lvl/rev_hs01/halconf.h
+++ b/keyboards/artifact/lvl/rev_hs01/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
--- a/keyboards/artifact/lvl/rev_hs01/info.json
+++ b/keyboards/artifact/lvl/rev_hs01/info.json
@@ -0,0 +1,232 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "LvL Type-01/80",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "sat": 0
+        },
+        "led_count": 1
+    },
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4C56",
+        "vid": "0x8968"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A9"
+    },
+    "community_layouts": ["tkl_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "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": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "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.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "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": [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": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "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": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "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": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "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.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "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": [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": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"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, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
--- a/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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_tkl_ansi_tsangan( /* Base */
+    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,
+    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_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_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT)
+};
--- a/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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_tkl_ansi_tsangan( /* Base */
+    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,
+    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_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_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT)
+};
--- a/keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/artifact/lvl/rev_hs01/mcuconf.h
+++ b/keyboards/artifact/lvl/rev_hs01/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
--- a/keyboards/artifact/lvl/rev_hs01/readme.md
+++ b/keyboards/artifact/lvl/rev_hs01/readme.md
@@ -0,0 +1,32 @@
+# LvL Type-01/80
+
+This is a standard TKL layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A TKL keyboard with STM32F072CB
+* Hardware Availability: https://artifact-industries.com 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make artifact/lvl/rev_hs01: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make artifact/lvl/rev_hs01:<keymap>:flash`)
--- a/keyboards/artifact/lvl/rev_hs01/rev_hs01.c
+++ b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c
@@ -0,0 +1,21 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 "quantum.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    setPinOutputOpenDrain(LED_CAPS_LOCK_PIN);
+}
--- a/keyboards/artifact/lvl/rev_hs01/rules.mk
+++ b/keyboards/artifact/lvl/rev_hs01/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
--- a/keyboards/atreus62/info.json
+++ b/keyboards/atreus62/info.json
@@ -4,7 +4,7 @@
  "url": "",
  "maintainer": "qmk",
  "usb": {
-    "vid": "0xFEED",
+    "vid": "0x5072",
    "pid": "0x6062",
    "device_version": "0.0.1"
  },
--- a/keyboards/atreus62/keymaps/via/keymap.c
+++ b/keyboards/atreus62/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2024 Tommi Pääkkö (@Glenf)
+ *
+ * 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 {
+    _DEFAULT,
+    _NAV,
+    _RESET,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_DEFAULT] = LAYOUT( /* qwerty */
+    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_BSLS,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC ,
+    KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT ,
+    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LBRC ,
+    KC_LCTL,  KC_LGUI, KC_LALT, KC_GRV,  MO(_NAV),KC_BSPC, KC_DEL,   KC_ENT,   KC_SPC,  KC_EQL,  KC_MINS, KC_QUOT, KC_ENT,  KC_RGUI
+  ),
+
+  [_NAV] = LAYOUT(
+    TO(_DEFAULT),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11  ,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_F12,  KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS ,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS ,
+    TO(_RESET),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [_RESET] = LAYOUT(
+    TO(_DEFAULT),  KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,                     KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO   ,
+    KC_NO  ,       KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,                     KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO   ,
+    KC_NO  ,       KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,                     KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO   ,
+    KC_NO  ,       KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,                     KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO   ,
+    KC_NO  ,       KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,  KC_NO  ,  KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , QK_BOOT
+  )
+
+};
--- a/keyboards/atreus62/keymaps/via/rules.mk
+++ b/keyboards/atreus62/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/bastardkb/skeletyl/readme.md
+++ b/keyboards/bastardkb/skeletyl/readme.md
@@ -20,8 +20,8 @@ qmk compile -kb bastardkb/skeletyl/{VERSION}/elitec -km {KEYMAP}
 | --------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
 | v1 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km via`      |
 | v2 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km via`      |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km via`  |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km via`  |
+| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky_2 -km default`   | `qmk compile -kb bastardkb/skeletyl/v2/splinky_2 -km via`   |
+| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky_3 -km default`   | `qmk compile -kb bastardkb/skeletyl/v2/splinky_3 -km via`   |
 | v2 (STeMCell)   | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km default`    | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km via`    |

 This keyboard is made to be used with the Miryoku layout, do not use the default keymap.
--- a/keyboards/binepad/bnk9/config.h
+++ b/keyboards/binepad/bnk9/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 binepad (@binepad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3  // enable 1:1 resolution
+
+// Default PIO0 cases flickering in this board.  Setting to PIO1 resolves this issue.
+#define WS2812_PIO_USE_PIO1
+
+// Timing for SK6812
+#define WS2812_T1H 650
--- a/keyboards/binepad/bnk9/info.json
+++ b/keyboards/binepad/bnk9/info.json
@@ -0,0 +1,86 @@
+{
+    "manufacturer": "binepad",
+    "keyboard_name": "BNK9",
+    "maintainer": "binepad",
+    "board": "GENERIC_RP_RP2040",
+    "bootloader": "rp2040",
+    "bootloader_instructions": "Hold down the key at (0x0) in the matrix (the 'knob' / rotary encoder) and plug in the keyboard.",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP13", "pin_b": "GP14"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP1", "GP2", "GP3"],
+        "rows": ["GP12", "GP4", "GP5", "GP6"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_pinwheel": true,
+            "cycle_up_down": true,
+            "jellybean_raindrops": true,
+            "riverflow": true,
+            "solid_reactive": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "starlight": true,
+            "starlight_dual_hue": true,
+            "starlight_dual_sat": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [1, 0], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [2, 2], "x": 144, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 112, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 80, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 80, "y": 64, "flags": 4},
+            {"matrix": [3, 1], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [3, 2], "x": 144, "y": 64, "flags": 4}
+        ],
+        "led_process_limit": 9,
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "url": "https://www.binepad.com/product-page/bnk9",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4E39",
+        "vid": "0x4249"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP11"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Knob", "matrix": [0, 0], "x": 0, "y": 0, "w": 3, "h": 3, "encoder": 0},
+                {"label": "1", "matrix": [1, 0], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [1, 1], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [2, 0], "x": 3.25, "y": 1},
+                {"label": "5", "matrix": [2, 1], "x": 4.25, "y": 1},
+                {"label": "6", "matrix": [2, 2], "x": 5.25, "y": 1},
+                {"label": "7", "matrix": [3, 0], "x": 3.25, "y": 2},
+                {"label": "8", "matrix": [3, 1], "x": 4.25, "y": 2},
+                {"label": "9", "matrix": [3, 2], "x": 5.25, "y": 2}
+            ]
+        }
+    }
+}
--- a/keyboards/binepad/bnk9/keymaps/default/keymap.c
+++ b/keyboards/binepad/bnk9/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// 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_P1,    KC_P2,    KC_P3,
+        KC_P4,    KC_P5,    KC_P6,
+        KC_P7,    KC_P8,    LT(1, KC_P9)
+    ),
+    [1] = LAYOUT(
+        RGB_TOG,
+        RGB_HUI,  RGB_SAI,  RGB_SPI,
+        RGB_HUD,  RGB_SAD,  RGB_SPD,
+        RGB_RMOD, RGB_MOD,  _______
+    )
+};
+
+#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(RGB_VAD, RGB_VAI) }
+};
+
+#endif
--- a/keyboards/binepad/bnk9/keymaps/default/rules.mk
+++ b/keyboards/binepad/bnk9/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/binepad/bnk9/keymaps/via/keymap.c
+++ b/keyboards/binepad/bnk9/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+// 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_P1,    KC_P2,    KC_P3,
+        KC_P4,    KC_P5,    KC_P6,
+        KC_P7,    KC_P8,    LT(1, KC_P9)
+    ),
+    [1] = LAYOUT(
+        RGB_TOG,
+        RGB_HUI,  RGB_SAI,  RGB_SPI,
+        RGB_HUD,  RGB_SAD,  RGB_SPD,
+        RGB_RMOD, RGB_MOD,  _______
+    )
+};
+
+#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(RGB_VAD, RGB_VAI) }
+};
+
+#endif
--- a/keyboards/binepad/bnk9/keymaps/via/rules.mk
+++ b/keyboards/binepad/bnk9/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/binepad/bnk9/readme.md
+++ b/keyboards/binepad/bnk9/readme.md
@@ -0,0 +1,27 @@
+# BINEPAD BNK9
+
+![BINEPAD BNK9](https://i.imgur.com/FrkVRhhh.jpg)
+
+A 3x3 macropad with a large rotary encoder.
+
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported: BINPAD BNK9
+* Hardware Availability: [binepad.com](https://www.binepad.com/product-page/bnk9)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make binepad/bnk9:default
+
+Flashing example for this keyboard:
+
+    make binepad/bnk9: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 (0x0) in the matrix (the 'knob' / rotary encoder) 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` *in VIA)* if it is available.
--- a/keyboards/binepad/bnk9/rules.mk
+++ b/keyboards/binepad/bnk9/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/buildakb/mw60/info.json
+++ b/keyboards/buildakb/mw60/info.json
@@ -0,0 +1,945 @@
+{
+    "manufacturer": "Maelkworks",
+    "keyboard_name": "mw60",
+    "maintainer": "Maelkk",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "C6", "B6", "B5", "F5", "B4", "D7", "D6", "D4", "D5", "D3", "F6", "D2"],
+        "rows": ["E6", "D1", "F7", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x4A56"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k405", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+                {"label": "k407", "matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.5},
+                {"label": "k409", "matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
--- a/keyboards/buildakb/mw60/keymaps/default/keymap.c
+++ b/keyboards/buildakb/mw60/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2023 Maelkk
+ *
+ * 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_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_BSLS,  KC_BSPC,
+    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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC,                   KC_SPC,           KC_SPC, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
+    [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_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
--- a/keyboards/buildakb/mw60/keymaps/via/keymap.c
+++ b/keyboards/buildakb/mw60/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2023 Maelkk
+ *
+ * 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_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_BSLS,  KC_BSPC,
+    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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC,                   KC_SPC,           KC_SPC, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
+    [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_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
--- a/keyboards/buildakb/mw60/keymaps/via/rules.mk
+++ b/keyboards/buildakb/mw60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/buildakb/mw60/readme.md
+++ b/keyboards/buildakb/mw60/readme.md
@@ -0,0 +1,24 @@
+# MW60 PCB
+
+![MW60 PCB](https://i.imgur.com/5E48mAPh.jpg)
+
+A simple standard 60% PCB available in hotswap and solderable variants
+
+-   Keyboard Maintainer: [Maelkk](https://github.com/Aeonstrife)
+-   Hardware Supported: MW60 PCB
+-   Hardware Availability: [sandkeys.me](https://sandkeys.me/product/petals-60-addon-pcbs/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make buildakb/mw60:default
+
+Flashing example for this keyboard:
+
+    make buildakb/mw60:default:flash
+
+To reset into bootloader mode:
+
+While plugged in, press the RESET switch located on the back of the pcb.
+The keyboard should now be in bootloader mode.
+
+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).
--- a/keyboards/buildakb/mw60/rules.mk
+++ b/keyboards/buildakb/mw60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/chlx/ppr_merro60/config.h
+++ b/keyboards/chlx/ppr_merro60/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com>
+
+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
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
--- a/keyboards/chlx/ppr_merro60/info.json
+++ b/keyboards/chlx/ppr_merro60/info.json
@@ -0,0 +1,957 @@
+{
+    "manufacturer": "chlx bsmt",
+    "keyboard_name": "ppr.merro60",
+    "maintainer": "gaclee3b",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0,
+        "scroll_lock": "F0"
+    },
+    "matrix_pins": {
+        "rows": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"],
+        "cols": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"]
+    },
+    "processor": "atmega32u4",
+    "url": "www.github.com/gaclee3b",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x0603",
+        "vid": "0x4358"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"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": [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},
+                {"matrix": [5, 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": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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": [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},
+                {"matrix": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"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": [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},
+                {"matrix": [5, 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": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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": [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},
+                {"matrix": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"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": [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},
+                {"matrix": [5, 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": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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": [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},
+                {"matrix": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": [5, 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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "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, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"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},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+                {"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, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [8, 3], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
--- a/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_ansi(
+  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_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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[1] = LAYOUT_60_ansi(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_ansi_split_bs_rshift(
+  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_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_ansi_tsangan(
+  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_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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_tsangan(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                            _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_ansi_wkl(
+  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_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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL,                            KC_LALT,          KC_SPC,                             KC_RALT,          KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______,                            _______,          _______,                            _______,          _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_ansi_wkl_split_bs_rshift(
+  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_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,                            KC_LALT,          KC_SPC,                             KC_RALT,          KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______,                            _______,          _______,                            _______,          _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_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_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_UP,   KC_ENT,
+  KC_LSFT, KC_LEFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT,
+  KC_LCTL, KC_LGUI,                   KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[1] = LAYOUT_all(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______, _______, _______, _______,          _______, _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_hhkb(
+  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_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          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_LALT,                   KC_LGUI,          KC_SPC,                             KC_RGUI, KC_RALT),
+
+[1] = LAYOUT_60_hhkb(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+           _______,                   _______,          _______,                            _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_iso(
+  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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_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,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_60_iso(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_60_tsangan_hhkb(
+  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_BSPC,
+  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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_tsangan_hhkb(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______,          _______,                            _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
+++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+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_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_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_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, KC_RGHT,
+  KC_LCTL, KC_LGUI,                   KC_LALT, MO(1),   KC_SPC,  KC_LSCR,          KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[1] = LAYOUT_all(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______, _______, _______, _______,          _______, _______, _______, _______),
+};
--- a/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
+++ b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/chlx/ppr_merro60/readme.md
+++ b/keyboards/chlx/ppr_merro60/readme.md
@@ -0,0 +1,28 @@
+# ppr.merro60
+
+![ppr.merro60 PCB](https://i.imgur.com/xyQA68Xh.jpg)
+
+- Standard 60% format keyboard PCB with USB-C and unified daughterboard compatibility.
+- Modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount.
+- Additional center flex cut.
+- Meant to be manufactured in 1.2mm thickness.
+
+* Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b)
+* Hardware Supported: chlx PCB ppr.merro60.x.x.x
+
+Make example for this keyboard (after setting up your build environment):
+
+    make chlx/ppr_merro60:default
+
+Flashing example for this keyboard:
+
+    make chlx/ppr_merro60: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 bootloader mode by any of the following options -
+- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard
+- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region
+- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot)
--- a/keyboards/chlx/ppr_merro60/rules.mk
+++ b/keyboards/chlx/ppr_merro60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/crkbd/keymaps/allemangd/config.h
+++ b/keyboards/crkbd/keymaps/allemangd/config.h
@@ -0,0 +1,49 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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 EE_HANDS
+#define USE_SERIAL_PD2
+
+#define LAYER_STATE_8BIT
+
+#undef MANUFACTURER
+#define MANUFACTURER "allemangd"
+#undef PRODUCT
+#define PRODUCT "Corne"
+
+#define OLED_DISABLE_TIMEOUT
+#define OLED_BRIGHTNESS 128
+
+#define ENABLE_COMPILE_KEYCODE
+
+#define FORCE_NKRO
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 4
+
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM 160
+
+#define NO_ACTION_ONESHOT
+#define NO_MUSIC_NODE
+
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
--- a/keyboards/crkbd/keymaps/allemangd/keymap.c
+++ b/keyboards/crkbd/keymaps/allemangd/keymap.c
@@ -0,0 +1,89 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+
+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
+
+#include "allemangd.h"
+
+#define UNWRAP_LAYOUT(...) LAYOUT_split_3x6_3(__VA_ARGS__)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_DVORAK] = UNWRAP_LAYOUT(
+   KC_TAB, __DVORAK_L1________________________________,                      __DVORAK_R1________________________________, KC_BSPC,
+   KC_ESC, __DVORAK_L2________________________________,                      __DVORAK_R2________________________________, KC_MINS,
+  KC_LSFT, __DVORAK_L3________________________________,                      __DVORAK_R3________________________________, KC_RSFT,
+                                       KC_DEL, TL_LOWR,  KC_ENT,     KC_SPC, TL_UPPR,  KC_APP
+),
+
+[_LOWER] = UNWRAP_LAYOUT(
+  _______, __LOWER_L1_________________________________,                      __LOWER_R1_________________________________, _______,
+  _______, __LOWER_L2_________________________________,                      __LOWER_R2_________________________________, _______,
+  _______, __LOWER_L3_________________________________,                      __LOWER_R3_________________________________, _______,
+                                      _______, _______, _______,    _______, _______, _______
+),
+
+[_RAISE] = UNWRAP_LAYOUT(
+   KC_GRV, __RAISE_L1_________________________________,                      __RAISE_R1_________________________________, _______,
+  _______, __RAISE_L2_________________________________,                      __RAISE_R2_________________________________, _______,
+  _______, __RAISE_L3_________________________________,                      __RAISE_R3_________________________________, _______,
+                                      _______, _______, _______,    _______, _______, _______
+),
+
+[_ADJUST] = UNWRAP_LAYOUT(
+  QK_MAKE, __ADJUST_L1________________________________,                      __ADJUST_R1________________________________, QK_BOOT,
+  KC_VRSN, __ADJUST_L2________________________________,                      __ADJUST_R2________________________________, KC_PSCR,
+  _______, __ADJUST_L3________________________________,                      __ADJUST_R3________________________________, _______,
+                                      _______, _______, _______,    _______, _______, _______
+),
+
+};
+// clang-format on
+
+static void oled_render_layer_state(void) {
+    oled_write_P(PSTR("layer: "), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_ln_P(PSTR("dvorak"), false);
+            break;
+        case 1:
+            oled_write_ln_P(PSTR("lower"), false);
+            break;
+        case 2:
+            oled_write_ln_P(PSTR("raise"), false);
+            break;
+        case 3:
+            oled_write_ln_P(PSTR("adjust"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("undef"), false);
+            break;
+    }
+}
+
+void oled_render_logo(void);
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+    } else {
+        oled_render_logo();
+    }
+    return false;
+}
--- a/keyboards/crkbd/keymaps/allemangd/rules.mk
+++ b/keyboards/crkbd/keymaps/allemangd/rules.mk
@@ -0,0 +1,5 @@
+BOOTLOADER 			= caterina
+
+BLUETOOTH_ENABLE	= no
+OLED_ENABLE 		= yes
+OLED_DRIVER 		= ssd1306
--- a/keyboards/crkbd/keymaps/mb_via/readme.md
+++ b/keyboards/crkbd/keymaps/mb_via/readme.md
@@ -1,12 +0,0 @@
-# Default Via keyboard for the Corne R2G by Mechboards UK
-
-![r2g](https://cdn.shopify.com/s/files/1/0582/0242/3501/products/HelidoxCorneR2GPCB_1800x1800.png)
-
-Corne R2G is an eddition of the classic CRKBD by footsan remade to feature a full smd assembly
-
-In this fold can be found the default via enabled keymap that can be in conjunction 
-
-Flash example for this Keymap:  
-```sh
-qmk flash -kb crkbd/r2g -km mb_via
-```
--- a/keyboards/crkbd/keymaps/via_mechboards/config.h
+++ b/keyboards/crkbd/keymaps/via_mechboards/config.h
--- a/keyboards/crkbd/keymaps/via_mechboards/keymap.c
+++ b/keyboards/crkbd/keymaps/via_mechboards/keymap.c
--- a/keyboards/crkbd/keymaps/via_mechboards/readme.md
+++ b/keyboards/crkbd/keymaps/via_mechboards/readme.md
@@ -0,0 +1,10 @@
+# Default Via keymap for the Corne R2G by Mechboards UK
+
+Corne R2G is an edition of the classic CRKBD by foostan remade to feature full smd assembly
+
+In this folder can be found the default via enabled keymap that can be in conjunction with the mechboards R2G PCB.
+
+Flash example for this Keymap:  
+```sh
+qmk flash -kb crkbd/r2g -km via_mechboards
+```
--- a/keyboards/crkbd/keymaps/via_mechboards/rules.mk
+++ b/keyboards/crkbd/keymaps/via_mechboards/rules.mk
--- a/keyboards/darmoshark/k3/config.h
+++ b/keyboards/darmoshark/k3/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
--- a/keyboards/darmoshark/k3/halconf.h
+++ b/keyboards/darmoshark/k3/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
--- a/keyboards/darmoshark/k3/info.json
+++ b/keyboards/darmoshark/k3/info.json
@@ -0,0 +1,183 @@
+{
+    "manufacturer": "Darmoshark",
+    "keyboard_name": "K3 QMK",
+    "maintainer": "Proceee",
+    "url": "",
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xC001",
+        "pid": "0x3667",
+        "suspend_wakeup_delay": 1000
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 4096
+        }
+    },
+    "matrix_pins": {
+        "rows": ["B13", "A1", "A2", "A3", "A4", "B7"],
+        "cols": ["B1", "C7", "C13", "B9"]
+    },
+    "indicators": {
+        "num_lock": "C5",
+        "on_state": 1
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "default":{
+          "val": 80
+        },
+        "sleep": true,
+        "center_point": [24, 32],
+        "max_brightness": 140,
+        "animations": {
+            "solid_color": true,
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "layout": [
+            { "flags": 4, "matrix":[0,2], "x": 32, "y": 0},
+            { "flags": 4, "matrix":[0,3], "x": 48, "y": 0},
+
+            { "flags": 4, "matrix":[1,3], "x": 48, "y": 13},
+            { "flags": 4, "matrix":[2,3], "x": 48, "y": 26},
+            { "flags": 4, "matrix":[4,3], "x": 48, "y": 51},
+
+            { "flags": 4, "matrix":[5,2], "x": 48, "y": 64},
+            { "flags": 4, "matrix":[4,2], "x": 32, "y": 51},
+            { "flags": 4, "matrix":[3,2], "x": 32, "y": 38},
+            { "flags": 4, "matrix":[2,2], "x": 32, "y": 26},
+            { "flags": 4, "matrix":[1,2], "x": 32, "y": 13},
+
+            { "flags": 4, "matrix":[1,1], "x":  16, "y": 13},
+            { "flags": 4, "matrix":[2,1], "x":  16, "y": 26},
+            { "flags": 4, "matrix":[3,1], "x":  16, "y": 38},
+            { "flags": 4, "matrix":[4,1], "x":  16, "y": 51},
+
+            { "flags": 4, "matrix":[5,1], "x":  0, "y": 64},
+            { "flags": 4, "matrix":[4,0], "x":  0, "y": 51},
+            { "flags": 4, "matrix":[3,0], "x":  0, "y": 38},
+            { "flags": 4, "matrix":[2,0], "x":  0, "y": 26},
+            { "flags": 4, "matrix":[1,0], "x":  0, "y": 13},
+            { "flags": 4, "matrix":[0,0], "x":  0, "y": 0},
+
+            { "flags": 4, "matrix":[0,1], "x":  16, "y": 0},
+
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64}
+        ]
+    },
+    "community_layouts": ["numpad_6x4"],
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "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":[1,0], "x": 0, "y": 1 },
+                { "matrix":[1,1], "x": 1, "y": 1 },
+                { "matrix":[1,2], "x": 2, "y": 1 },
+                { "matrix":[1,3], "x": 3, "y": 1 },
+
+                { "matrix":[2,0], "x": 0, "y": 2 },
+                { "matrix":[2,1], "x": 1, "y": 2 },
+                { "matrix":[2,2], "x": 2, "y": 2 },
+
+                { "matrix":[3,0], "x": 0, "y": 3 },
+                { "matrix":[3,1], "x": 1, "y": 3 },
+                { "matrix":[3,2], "x": 2, "y": 3 },
+                { "matrix":[2,3], "x": 3, "y": 2, "h": 2 },
+
+                { "matrix":[4,0], "x": 0, "y": 4 },
+                { "matrix":[4,1], "x": 1, "y": 4 },
+                { "matrix":[4,2], "x": 2, "y": 4 },
+
+                { "matrix":[5,1],  "x": 0, "y": 5, "w": 2 },
+                { "matrix":[5,2],  "x": 2, "y": 5 },
+                { "matrix":[4,3], "x": 3, "y": 4, "h": 2 }
+            ]
+        }
+    }
+}
--- a/keyboards/darmoshark/k3/keymaps/default/keymap.c
+++ b/keyboards/darmoshark/k3/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_numpad_6x4(
+        KC_ESC,   KC_TAB,   KC_BSPC,  MO(1),
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_P7,    KC_P8,    KC_P9,
+        KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_P1,    KC_P2,    KC_P3,
+        KC_P0,              KC_PDOT,  KC_PENT
+    ),
+
+    [1] = LAYOUT_numpad_6x4(
+        EE_CLR,   _______,  RGB_MOD,  _______,
+        KC_CALC,  _______,  _______,  RGB_VAD,
+        _______,  RGB_SPI,  _______,
+        _______,  _______,  _______,  RGB_VAI,
+        _______,  RGB_SPD,  _______,
+        _______,            RGB_TOG,  _______
+    )
+};
--- a/keyboards/darmoshark/k3/keymaps/via/config.h
+++ b/keyboards/darmoshark/k3/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
--- a/keyboards/darmoshark/k3/keymaps/via/keymap.c
+++ b/keyboards/darmoshark/k3/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_numpad_6x4(
+        KC_ESC,   KC_TAB,   KC_BSPC,  MO(1),
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_P7,    KC_P8,    KC_P9,
+        KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_P1,    KC_P2,    KC_P3,
+        KC_P0,              KC_PDOT,  KC_PENT
+    ),
+
+    [1] = LAYOUT_numpad_6x4(
+        EE_CLR,   _______,  RGB_MOD,  _______,
+        KC_CALC,  _______,  _______,  RGB_VAD,
+        _______,  RGB_SPI,  _______,
+        _______,  _______,  _______,  RGB_VAI,
+        _______,  RGB_SPD,  _______,
+        _______,            RGB_TOG,  _______
+    )
+};
--- a/keyboards/darmoshark/k3/keymaps/via/rules.mk
+++ b/keyboards/darmoshark/k3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/darmoshark/k3/mcuconf.h
+++ b/keyboards/darmoshark/k3/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
--- a/keyboards/darmoshark/k3/readme.md
+++ b/keyboards/darmoshark/k3/readme.md
@@ -0,0 +1,23 @@
+# K3 QMK
+
+* Keyboard Maintainer: [Proceee](https://github.com/Proceee)
+* Hardware Supported: [Darmoshark](http://www.Darmoshark.cn)
+* Hardware Availability: [Darmoshark](http://www.Darmoshark.cn)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make darmoshark/k3:default
+
+Flashing example for this keyboard:
+
+    make darmoshark/k3: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
--- a/keyboards/darmoshark/k3/rules.mk
+++ b/keyboards/darmoshark/k3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/dnworks/numpad/config.h
+++ b/keyboards/dnworks/numpad/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
--- a/keyboards/dnworks/numpad/info.json
+++ b/keyboards/dnworks/numpad/info.json
@@ -0,0 +1,73 @@
+{
+    "manufacturer": "dnworks",
+    "keyboard_name": "DN Numpad Rev1",
+    "maintainer": "itsme-zeix",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP5", "GP6", "GP7", "GP25"],
+        "rows": ["GP11", "GP4", "GP3", "GP2", "GP1", "GP0", "GP24"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x2937",
+        "vid": "0x4C23"
+    },
+    "community_layouts": ["numpad_6x4", "ortho_6x4"],
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [6, 3], "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
+            ]
+        },
+        "LAYOUT_ortho_6x4": {
+            "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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [6, 3], "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
+        }
+    }
+}
--- a/keyboards/dnworks/numpad/keymaps/default/keymap.c
+++ b/keyboards/dnworks/numpad/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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_6x4(
+        KC_ESC,  KC_APP,  KC_TAB,  KC_BSPC,
+    
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    ),
+};
--- a/keyboards/dnworks/numpad/keymaps/via/keymap.c
+++ b/keyboards/dnworks/numpad/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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_6x4(
+        KC_ESC,  KC_APP,  KC_TAB,  KC_BSPC,
+    
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    ),
+};
--- a/keyboards/dnworks/numpad/keymaps/via/rules.mk
+++ b/keyboards/dnworks/numpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/dnworks/numpad/matrix_diagram.md
+++ b/keyboards/dnworks/numpad/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for dnworks numpad rev1
+
+```
+Top Left 2u
+┌───────┐┌───────┐
+│00     ││02     │ Top Right 2u
+└───────┘└───────┘
+┌───┬───┬───┬───┐
+│00 │01 │02 │03 │
+└───┴───┴───┴───┘
+┌───┬───┬───┬───┐
+│10 │11 │12 │63 │
+├───┼───┼───┼───┤ ┌───┐
+│20 │21 │22 │   │ │23 │
+├───┼───┼───┤33 │ ├───┤ Split Plus
+│30 │31 │32 │   │ │33 │
+├───┼───┼───┼───┤ └───┘ ┌───┐
+│40 │41 │42 │   │       │43 │
+├───┴───┼───┤53 │       ├───┤ Split Enter
+│50     │52 │   │       │53 │
+└───────┴───┴───┘       └───┘
+┌───┬───┐
+│50 │51 │ Split Zero
+└───┴───┘
+```
--- a/keyboards/dnworks/numpad/readme.md
+++ b/keyboards/dnworks/numpad/readme.md
@@ -0,0 +1,27 @@
+# DN Numpad Rev1
+
+![DN Numpad Rev1](https://i.imgur.com/OpklWTih.png)
+
+PCB that supports the numpad designed by dnworks.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: DN Numpad Rev1
+* Hardware Availability: dnworks.co
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dnworks/numpad:default
+
+Flashing example for this keyboard:
+
+    make dnworks/numpad: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 top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the `RESET` button twice or short the `USB_BOOT` and `GND` pads and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
--- a/keyboards/dnworks/numpad/rules.mk
+++ b/keyboards/dnworks/numpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/doio/kb04/info.json
+++ b/keyboards/doio/kb04/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "DOIO",
+    "keyboard_name": "KB04-01",
+    "maintainer": "filmstarr",
+    "bootloader": "stm32duino",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
+            
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1}
+        ],
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "url": "https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0401",
+        "vid": "0xD010"
+    },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "1!", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "2@", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "3#", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "4$", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "Encoder", "matrix": [0, 4], "x": 1.5, "y": 1}
+            ]
+        }
+    }
+}
--- a/keyboards/doio/kb04/keymaps/default/keymap.c
+++ b/keyboards/doio/kb04/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 filmstarr <https://github.com/filmstarr>
+ *
+ * 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 layer_names {
+    _LAY0,
+    _LAY1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+       L0:
+       ┌───┬───┬───┬───┐   ┌───┐
+       │MO1│Prv│Ply│Nxt│   │Mut│
+       └───┴───┴───┴───┘   └───┘
+       L1:
+       ┌───┬───┬───┬───┐   ┌───┐
+       │   │Hud│Tog│Mod│   │   │
+       └───┴───┴───┴───┘   └───┘
+*/
+    [_LAY0] = LAYOUT(
+        MO(_LAY1),   KC_MPRV,    KC_MPLY,    KC_MNXT,     KC_MUTE
+    ),
+    [_LAY1] = LAYOUT(
+        KC_TRNS,     RGB_HUD,    RGB_TOG,    RGB_MOD,     KC_TRNS
+    )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
--- a/keyboards/doio/kb04/keymaps/default/rules.mk
+++ b/keyboards/doio/kb04/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/doio/kb04/keymaps/via/keymap.c
+++ b/keyboards/doio/kb04/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 filmstarr <https://github.com/filmstarr>
+ *
+ * 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 layer_names {
+    _LAY0,
+    _LAY1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+       L0:
+       ┌───┬───┬───┬───┐   ┌───┐
+       │MO1│Prv│Ply│Nxt│   │Mut│
+       └───┴───┴───┴───┘   └───┘
+       L1:
+       ┌───┬───┬───┬───┐   ┌───┐
+       │   │Hud│Tog│Mod│   │   │
+       └───┴───┴───┴───┘   └───┘
+*/
+    [_LAY0] = LAYOUT(
+        MO(_LAY1),   KC_MPRV,    KC_MPLY,    KC_MNXT,     KC_MUTE
+    ),
+    [_LAY1] = LAYOUT(
+        KC_TRNS,     RGB_HUD,    RGB_TOG,    RGB_MOD,     KC_TRNS
+    )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
--- a/keyboards/doio/kb04/keymaps/via/rules.mk
+++ b/keyboards/doio/kb04/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/doio/kb04/readme.md
+++ b/keyboards/doio/kb04/readme.md
@@ -0,0 +1,27 @@
+# doio/kb04
+
+![doio/kb04](https://i.imgur.com/lqABZw4h.png)
+
+A macropad that have 4-key keyboard made by DOIO, which controlled by an APM32F103CBT6 chipset. The keyboard features per-key RGB and 1 encoder.
+
+* Keyboard Maintainer: [filmstarr](https://github.com/filmstarr)
+* Hardware Supported: DOIO Knob Board - KB04
+* Hardware Availability: [keebmonkey.com](https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb doio/kb04 -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb doio/kb04 -km 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 (1! key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
--- a/keyboards/doio/kb04/rules.mk
+++ b/keyboards/doio/kb04/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
--- a/Show More
+++ b/Show More